[qmapshack] 01/06: Imported Upstream version 1.7.0

Bas Couwenberg sebastic at debian.org
Tue Sep 13 08:47:38 UTC 2016


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

sebastic pushed a commit to branch master
in repository qmapshack.

commit 8c9bf12cc6db7118babca861f73447439c9c5299
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 13 09:50:31 2016 +0200

    Imported Upstream version 1.7.0
---
 .hgsub                                             |    1 -
 .hgsubstate                                        |    1 -
 CMakeLists.txt                                     |    4 +-
 CMakeLists.txt.user                                |    4 +-
 CPackConfig.cmake                                  |    2 +-
 changelog.txt                                      |   18 +
 cmake/Modules/FindGDAL.cmake                       |    3 +
 cmake/Modules/FindPROJ.cmake                       |    2 +
 cmake/Modules/FindROUTINO.cmake                    |    3 +
 doc/.hgignore                                      |   18 +
 doc/BugFeatures.html                               |   41 +
 doc/BuildWindowsVisualStudio.html                  |  224 +++
 doc/BuildWindowsVisualStudio.md                    |  229 +++
 doc/DeveloperCodingGuideline.html                  |   96 ++
 doc/DeveloperCodingGuideline.md                    |   92 ++
 doc/DeveloperCommitCode.html                       |   13 +
 doc/DeveloperCommitCode.md                         |   19 +
 doc/DeveloperTranslate.html                        |   44 +
 doc/DeveloperTranslate.md                          |   44 +
 doc/DocBasicsMapDem.html                           |  214 +++
 doc/DocBasicsMapDem.md                             |  184 +++
 doc/DocCmdOptions.html                             |   64 +
 doc/DocCmdOptions.md                               |   42 +
 doc/DocControlMapDem.html                          |  101 ++
 doc/DocControlMapDem.md                            |   98 ++
 doc/DocFaq.html                                    |  198 +++
 doc/DocFaq.md                                      |  212 +++
 doc/DocFix.sh                                      |   71 +
 doc/DocGetQMapShack.html                           |  105 ++
 doc/DocGetQMapShack.md                             |  108 ++
 doc/DocGettingStarted.html                         |   47 +
 doc/DocGettingStarted.md                           |   60 +
 doc/DocGisDatabase.html                            |   13 +
 doc/DocGisDatabase.md                              |   19 +
 doc/DocGisDatabaseAddRemove.html                   |   99 ++
 doc/DocGisDatabaseAddRemove.md                     |  100 ++
 doc/DocGisDatabaseFoldersItems.html                |   22 +
 doc/DocGisDatabaseFoldersItems.md                  |   37 +
 doc/DocGisDatabaseLostFound.html                   |   16 +
 doc/DocGisDatabaseLostFound.md                     |   25 +
 doc/DocGisDatabaseWorkspaceDatabase.html           |   12 +
 doc/DocGisDatabaseWorkspaceDatabase.md             |   17 +
 doc/DocGisDevices.html                             |   58 +
 doc/DocGisDevices.md                               |   70 +
 doc/DocGisHowToRouting.html                        |  134 ++
 doc/DocGisHowToSaveYourWork.html                   |  111 ++
 doc/DocGisItems.html                               |   53 +
 doc/DocGisItems.md                                 |   59 +
 doc/DocGisItemsArea.html                           |   39 +
 doc/DocGisItemsArea.md                             |   37 +
 doc/DocGisItemsEditMultiple.html                   |  136 ++
 doc/DocGisItemsEditMultiple.md                     |   67 +
 doc/DocGisItemsNew.html                            |   34 +
 doc/DocGisItemsNew.md                              |   41 +
 doc/DocGisItemsRte.html                            |   54 +
 doc/DocGisItemsRte.md                              |   69 +
 doc/DocGisItemsTrk2.html                           |  213 +++
 doc/DocGisItemsTrk2.md                             |  153 ++
 doc/DocGisItemsWpt.html                            |  132 ++
 doc/DocGisItemsWpt.md                              |   73 +
 doc/DocHandleGpxFiles.html                         |   36 +
 doc/DocHandleGpxFiles.md                           |   41 +
 doc/DocInstallMapDem.html                          |   59 +
 doc/DocInstallMapDem.md                            |   53 +
 doc/DocMain.html                                   |   56 +
 doc/DocMain.md                                     |   52 +
 doc/DocMapsTipsTricks.html                         |  288 ++++
 doc/DocMapsTipsTricks.md                           |  317 ++++
 doc/DocPlayground.md                               |   24 +
 doc/DocSearchGoogle.html                           |   16 +
 doc/DocSearchGoogle.md                             |   25 +
 doc/DocUseCaseMotorcycleNavigation.html            |  113 ++
 doc/DocWorkingWithProjects.html                    |   12 +
 doc/DocWorkingWithProjects.md                      |   17 +
 doc/Home.html                                      |   76 +
 doc/Home.md                                        |   82 +
 doc/HtmlMake.py                                    |  156 ++
 doc/IGN.wmts                                       |  445 ++++++
 doc/LinkCheck.sh                                   |  170 ++
 doc/Makefile                                       |  157 ++
 doc/NavBar.sh                                      |  186 +++
 doc/QuickWayToPrepareRasterMapForQMapShack.html    |   54 +
 doc/QuickWayToPrepareRasterMapForQMapShack.md      |   68 +
 doc/README.txt                                     |  378 +++++
 doc/ReportBugs.html                                |   48 +
 doc/ReportBugs.md                                  |   53 +
 doc/RequestFeatures.md                             |   33 +
 doc/TroubleShooting.html                           |   82 +
 doc/TroubleShooting.md                             |  101 ++
 doc/Ubuntu-14.04-HowTo.html                        |   47 +
 doc/Ubuntu-14.04-HowTo.md                          |   53 +
 doc/fix.time                                       |    1 +
 doc/images/DocBasicsMapDem/qmapshack1.png          |  Bin 0 -> 184129 bytes
 doc/images/DocControlMapDem/maproom1.png           |  Bin 0 -> 331907 bytes
 doc/images/DocControlMapDem/maproom10.png          |  Bin 0 -> 780674 bytes
 doc/images/DocControlMapDem/maproom2.png           |  Bin 0 -> 312760 bytes
 doc/images/DocControlMapDem/maproom3.png           |  Bin 0 -> 30491 bytes
 doc/images/DocControlMapDem/maproom5.png           |  Bin 0 -> 181551 bytes
 doc/images/DocControlMapDem/maproom6.png           |  Bin 0 -> 7860 bytes
 doc/images/DocControlMapDem/maproom7.png           |  Bin 0 -> 13852 bytes
 doc/images/DocControlMapDem/maproom7.svg           |  354 +++++
 doc/images/DocControlMapDem/maproom8.png           |  Bin 0 -> 15811 bytes
 doc/images/DocControlMapDem/maproom8.svg           |  372 +++++
 doc/images/DocGettingStarted/maproom1.png          |  Bin 0 -> 72030 bytes
 doc/images/DocGettingStarted/maproom1_1.png        |  Bin 0 -> 52188 bytes
 doc/images/DocGettingStarted/maproom2.png          |  Bin 0 -> 27104 bytes
 doc/images/DocGettingStarted/maproom3.png          |  Bin 0 -> 22347 bytes
 doc/images/DocGettingStarted/maproom4.png          |  Bin 0 -> 154109 bytes
 doc/images/DocGettingStarted/maproom6.png          |  Bin 0 -> 405576 bytes
 doc/images/DocGisDatabaseAddRemove/Add.png         |  Bin 0 -> 350 bytes
 doc/images/DocGisDatabaseAddRemove/PathBlue.png    |  Bin 0 -> 535 bytes
 doc/images/DocGisDatabaseAddRemove/maproom1.png    |  Bin 0 -> 27119 bytes
 doc/images/DocGisDatabaseAddRemove/maproom2.png    |  Bin 0 -> 7063 bytes
 doc/images/DocGisDatabaseAddRemove/maproom3.png    |  Bin 0 -> 9273 bytes
 doc/images/DocGisDatabaseAddRemove/maproom4.png    |  Bin 0 -> 31819 bytes
 doc/images/DocGisDatabaseAddRemove/maproom5.png    |  Bin 0 -> 17538 bytes
 doc/images/DocGisDatabaseFolderItems/maproom1.png  |  Bin 0 -> 18842 bytes
 doc/images/DocGisDatabaseFolderItems/maproom3.png  |  Bin 0 -> 57511 bytes
 doc/images/DocGisDatabaseFolderItems/maproom4.png  |  Bin 0 -> 25238 bytes
 doc/images/DocGisDatabaseFolderItems/maproom5.png  |  Bin 0 -> 39268 bytes
 doc/images/DocGisDatabaseFolderItems/maproom6.png  |  Bin 0 -> 14666 bytes
 doc/images/DocGisDatabaseFolderItems/maproom7.png  |  Bin 0 -> 53188 bytes
 doc/images/DocGisDatabaseFolderItems/maproom8.png  |  Bin 0 -> 22024 bytes
 doc/images/DocGisDatabaseLostFound/maproom1.png    |  Bin 0 -> 18081 bytes
 doc/images/DocGisDatabaseLostFound/maproom2.png    |  Bin 0 -> 17394 bytes
 doc/images/DocGisDatabaseLostFound/maproom4.png    |  Bin 0 -> 69409 bytes
 doc/images/DocGisDatabaseLostFound/maproom5.png    |  Bin 0 -> 45917 bytes
 doc/images/DocGisDatabaseLostFound/maproom6.png    |  Bin 0 -> 44594 bytes
 .../DocGisDatabaseWorkspaceDatabase/maproom2.png   |  Bin 0 -> 120831 bytes
 .../DocGisDatabaseWorkspaceDatabase/maproom2.svg   |  847 ++++++++++
 doc/images/DocGisDevices/qmapshack2.png            |  Bin 0 -> 47033 bytes
 doc/images/DocGisDevices/qmapshack4.png            |  Bin 0 -> 79817 bytes
 doc/images/DocGisDevices/qmapshack5.png            |  Bin 0 -> 29075 bytes
 doc/images/DocGisDevices/qmapshack6.png            |  Bin 0 -> 23002 bytes
 doc/images/DocGisItems/maproom1.png                |  Bin 0 -> 55875 bytes
 doc/images/DocGisItems/maproom2.png                |  Bin 0 -> 19093 bytes
 doc/images/DocGisItems/maproom3.png                |  Bin 0 -> 17793 bytes
 doc/images/DocGisItems/maproom4.png                |  Bin 0 -> 33655 bytes
 doc/images/DocGisItems/maproom5.png                |  Bin 0 -> 25634 bytes
 doc/images/DocGisItemsArea/maproom1.png            |  Bin 0 -> 96765 bytes
 doc/images/DocGisItemsArea/maproom2.png            |  Bin 0 -> 13840 bytes
 doc/images/DocGisItemsArea/maproom3.png            |  Bin 0 -> 57014 bytes
 doc/images/DocGisItemsEditMultiple/Add.png         |  Bin 0 -> 400 bytes
 doc/images/DocGisItemsEditMultiple/Apply_small.png |  Bin 0 -> 682 bytes
 doc/images/DocGisItemsEditMultiple/AreaMove.png    |  Bin 0 -> 2814 bytes
 doc/images/DocGisItemsEditMultiple/DeleteOne.png   |  Bin 0 -> 1133 bytes
 .../DocGisItemsEditMultiple/DeleteOne_small.png    |  Bin 0 -> 369 bytes
 doc/images/DocGisItemsEditMultiple/LineMove.png    |  Bin 0 -> 1784 bytes
 doc/images/DocGisItemsEditMultiple/PointMove.png   |  Bin 0 -> 1518 bytes
 doc/images/DocGisItemsEditMultiple/Redo.png        |  Bin 0 -> 1344 bytes
 doc/images/DocGisItemsEditMultiple/SelectRange.png |  Bin 0 -> 1129 bytes
 doc/images/DocGisItemsEditMultiple/Undo.png        |  Bin 0 -> 1370 bytes
 doc/images/DocGisItemsEditMultiple/qms1.png        |  Bin 0 -> 12023 bytes
 doc/images/DocGisItemsEditMultiple/qms2.png        |  Bin 0 -> 93250 bytes
 doc/images/DocGisItemsEditMultiple/qms2.svg        | 1680 ++++++++++++++++++++
 doc/images/DocGisItemsNew/maproom1.png             |  Bin 0 -> 9247 bytes
 doc/images/DocGisItemsNew/maproom2.png             |  Bin 0 -> 17938 bytes
 doc/images/DocGisItemsNew/maproom3.png             |  Bin 0 -> 15045 bytes
 doc/images/DocGisItemsNew/maproom4.png             |  Bin 0 -> 38983 bytes
 doc/images/DocGisItemsNew/maproom5.png             |  Bin 0 -> 23057 bytes
 doc/images/DocGisItemsRte/Apply.png                |  Bin 0 -> 3238 bytes
 doc/images/DocGisItemsRte/Copy.png                 |  Bin 0 -> 649 bytes
 doc/images/DocGisItemsRte/DeleteOne.png            |  Bin 0 -> 1133 bytes
 doc/images/DocGisItemsRte/EditDetails.png          |  Bin 0 -> 2565 bytes
 doc/images/DocGisItemsRte/LineMove.png             |  Bin 0 -> 1784 bytes
 doc/images/DocGisItemsRte/Reset.png                |  Bin 0 -> 1896 bytes
 doc/images/DocGisItemsRte/RteInstr.png             |  Bin 0 -> 1518 bytes
 doc/images/DocGisItemsRte/qms1.png                 |  Bin 0 -> 122823 bytes
 doc/images/DocGisItemsRte/qms2.png                 |  Bin 0 -> 120055 bytes
 doc/images/DocGisItemsRte/qms3.png                 |  Bin 0 -> 35890 bytes
 doc/images/DocGisItemsRte/qms4.png                 |  Bin 0 -> 16165 bytes
 doc/images/DocGisItemsRte/qms5.png                 |  Bin 0 -> 39207 bytes
 doc/images/DocGisItemsRte/qms6.png                 |  Bin 0 -> 21521 bytes
 doc/images/DocGisItemsTrk/Activity.png             |  Bin 0 -> 2217 bytes
 doc/images/DocGisItemsTrk/ActivityTab.png          |  Bin 0 -> 27213 bytes
 doc/images/DocGisItemsTrk/Combine.png              |  Bin 0 -> 979 bytes
 doc/images/DocGisItemsTrk/Copy.png                 |  Bin 0 -> 649 bytes
 doc/images/DocGisItemsTrk/DeleteOne.png            |  Bin 0 -> 1133 bytes
 doc/images/DocGisItemsTrk/DetailsDialog.png        |  Bin 0 -> 93274 bytes
 doc/images/DocGisItemsTrk/EditDetails.png          |  Bin 0 -> 2565 bytes
 doc/images/DocGisItemsTrk/FilterEelvation.png      |  Bin 0 -> 38017 bytes
 doc/images/DocGisItemsTrk/FilterExtensions.png     |  Bin 0 -> 28208 bytes
 doc/images/DocGisItemsTrk/FilterPoints.png         |  Bin 0 -> 36560 bytes
 doc/images/DocGisItemsTrk/FilterSplit.png          |  Bin 0 -> 26695 bytes
 doc/images/DocGisItemsTrk/FilterTab.png            |  Bin 0 -> 14313 bytes
 doc/images/DocGisItemsTrk/FilterTime.png           |  Bin 0 -> 41188 bytes
 doc/images/DocGisItemsTrk/GraphArea.png            |  Bin 0 -> 64156 bytes
 doc/images/DocGisItemsTrk/GraphsTab.png            |  Bin 0 -> 22313 bytes
 doc/images/DocGisItemsTrk/HistoryTab.png           |  Bin 0 -> 35940 bytes
 doc/images/DocGisItemsTrk/InfoTab.png              |  Bin 0 -> 20722 bytes
 doc/images/DocGisItemsTrk/LineMove.png             |  Bin 0 -> 1784 bytes
 doc/images/DocGisItemsTrk/Lock.png                 |  Bin 0 -> 932 bytes
 doc/images/DocGisItemsTrk/PointHide.png            |  Bin 0 -> 1175 bytes
 doc/images/DocGisItemsTrk/PointShow.png            |  Bin 0 -> 869 bytes
 doc/images/DocGisItemsTrk/PointsTab.png            |  Bin 0 -> 27640 bytes
 doc/images/DocGisItemsTrk/Reverse.png              |  Bin 0 -> 1088 bytes
 doc/images/DocGisItemsTrk/Save.png                 |  Bin 0 -> 364 bytes
 doc/images/DocGisItemsTrk/SelectRange.png          |  Bin 0 -> 1129 bytes
 doc/images/DocGisItemsTrk/StyleTab.png             |  Bin 0 -> 24536 bytes
 doc/images/DocGisItemsTrk/Tainted.png              |  Bin 0 -> 1182 bytes
 doc/images/DocGisItemsTrk/TrkCut.png               |  Bin 0 -> 2422 bytes
 doc/images/DocGisItemsTrk/TrkProfile.png           |  Bin 0 -> 1359 bytes
 doc/images/DocGisItemsTrk/Zoom.png                 |  Bin 0 -> 1154 bytes
 doc/images/DocGisItemsTrk/maproom1.png             |  Bin 0 -> 602263 bytes
 doc/images/DocGisItemsWpt/AddImage.png             |  Bin 0 -> 1490 bytes
 doc/images/DocGisItemsWpt/Bubble.png               |  Bin 0 -> 851 bytes
 doc/images/DocGisItemsWpt/Copy.png                 |  Bin 0 -> 591 bytes
 doc/images/DocGisItemsWpt/DelImage.png             |  Bin 0 -> 1384 bytes
 doc/images/DocGisItemsWpt/DeleteOne.png            |  Bin 0 -> 1075 bytes
 doc/images/DocGisItemsWpt/EditDetails.png          |  Bin 0 -> 2507 bytes
 doc/images/DocGisItemsWpt/Lock.png                 |  Bin 0 -> 932 bytes
 doc/images/DocGisItemsWpt/Move.png                 |  Bin 0 -> 9212 bytes
 doc/images/DocGisItemsWpt/PinRed.png               |  Bin 0 -> 535 bytes
 doc/images/DocGisItemsWpt/Projection.png           |  Bin 0 -> 19102 bytes
 doc/images/DocGisItemsWpt/Tainted.png              |  Bin 0 -> 1182 bytes
 doc/images/DocGisItemsWpt/WptBubble.png            |  Bin 0 -> 77707 bytes
 doc/images/DocGisItemsWpt/WptDetails.png           |  Bin 0 -> 91506 bytes
 doc/images/DocGisItemsWpt/WptHighlight.png         |  Bin 0 -> 8190 bytes
 doc/images/DocGisItemsWpt/WptMove.png              |  Bin 0 -> 1479 bytes
 doc/images/DocGisItemsWpt/WptProj.png              |  Bin 0 -> 1181 bytes
 doc/images/DocHandleGpxFiles/maproom1.png          |  Bin 0 -> 6535 bytes
 doc/images/DocHandleGpxFiles/maproom2.png          |  Bin 0 -> 5780 bytes
 doc/images/DocHandleGpxFiles/maproom3.png          |  Bin 0 -> 74901 bytes
 doc/images/DocHandleGpxFiles/maproom4.png          |  Bin 0 -> 8281 bytes
 doc/images/DocSearchGoogle/maproom1.png            |  Bin 0 -> 4132 bytes
 doc/images/DocSearchGoogle/maproom2.png            |  Bin 0 -> 6616 bytes
 doc/images/DocSearchGoogle/maproom3.png            |  Bin 0 -> 12294 bytes
 doc/images/DocSearchGoogle/maproom4.png            |  Bin 0 -> 19735 bytes
 doc/images/DocWorkingWithProjects/maproom1.png     |  Bin 0 -> 8034 bytes
 doc/images/maproom1.png                            |  Bin 0 -> 452927 bytes
 doc/nav.time                                       |    1 +
 doc/playground/DocGisHowToRouting.md               |  196 +++
 doc/playground/DocGisHowToSaveYourWork.md          |  181 +++
 doc/playground/DocUseCaseMotorcycleNavigation.md   |  168 ++
 src/CMakeLists.txt                                 |    6 +-
 src/gis/CGisListDB.cpp                             |  276 +++-
 src/gis/CGisListDB.h                               |   12 +
 src/gis/CGisListWks.cpp                            |   90 +-
 src/gis/CGisListWks.h                              |   14 +
 src/gis/CGisWidget.cpp                             |   11 +-
 src/gis/IGisItem.cpp                               |   39 +-
 src/gis/IGisItem.h                                 |   11 +-
 src/gis/IGisLine.cpp                               |   13 +-
 src/gis/IGisLine.h                                 |    3 +
 src/gis/db/CDBFolderLostFound.h                    |    2 +
 src/gis/db/CDBFolderMysql.cpp                      |   21 +-
 src/gis/db/CDBFolderMysql.h                        |    3 +
 src/gis/db/CDBFolderSqlite.cpp                     |   23 +-
 src/gis/db/CDBFolderSqlite.h                       |    3 +
 src/gis/db/CDBItem.cpp                             |   20 +-
 src/gis/db/CDBItem.h                               |   24 +-
 src/gis/db/CDBProject.cpp                          |   97 +-
 src/gis/db/CDBProject.h                            |    4 +-
 src/gis/db/CLostFoundProject.cpp                   |   22 +-
 src/gis/db/CSearchDatabase.cpp                     |  293 ++++
 .../CSelectActivity.h => db/CSearchDatabase.h}     |   35 +-
 src/gis/db/CSelectDBFolder.cpp                     |    5 +
 src/gis/db/CSelectSaveAction.cpp                   |    4 +-
 src/gis/db/IDBFolder.cpp                           |   95 +-
 src/gis/db/IDBFolder.h                             |   26 +
 src/gis/db/IDBFolderSql.h                          |    1 +
 src/gis/db/IDBMysql.cpp                            |  142 +-
 src/gis/db/IDBMysql.h                              |    2 +
 src/gis/db/IDBSqlite.cpp                           |  189 ++-
 src/gis/db/IDBSqlite.h                             |    3 +
 src/gis/db/ISearchDatabase.ui                      |   96 ++
 src/gis/db/macros.h                                |    2 +-
 src/gis/fit/CFitProject.cpp                        |    2 +
 src/gis/fit/CFitProject.h                          |    1 +
 src/gis/fit/decoder/CFitCrcState.h                 |    1 +
 src/gis/fit/decoder/CFitHeaderState.h              |    1 +
 src/gis/fit/decoder/CFitRecordContentState.h       |    1 +
 src/gis/gpx/CGpxProject.cpp                        |   23 +-
 src/gis/ovl/CGisItemOvlArea.cpp                    |   46 +-
 src/gis/ovl/CGisItemOvlArea.h                      |    7 +-
 src/gis/ovl/CScrOptOvlArea.cpp                     |    2 +-
 src/gis/prj/CDetailsPrj.cpp                        |   63 +-
 src/gis/prj/IDetailsPrj.ui                         |    5 -
 src/gis/prj/IGisProject.cpp                        |  116 +-
 src/gis/prj/IGisProject.h                          |   43 +-
 src/gis/qms/CQmsProject.cpp                        |    2 +-
 src/gis/qms/serialization.cpp                      |   45 +-
 src/gis/rte/CCreateRouteFromWpt.cpp                |    4 +-
 src/gis/rte/CDetailsRte.cpp                        |    2 +-
 src/gis/rte/CGisItemRte.cpp                        |   44 +-
 src/gis/rte/CGisItemRte.h                          |    8 +-
 src/gis/rte/CScrOptRte.cpp                         |    2 +-
 src/gis/slf/CSlfProject.cpp                        |    2 +
 src/gis/tnv/CTwoNavProject.cpp                     |    3 +-
 src/gis/trk/CActivityTrk.cpp                       |  473 +++---
 src/gis/trk/CActivityTrk.h                         |   19 +-
 src/gis/trk/CDetailsTrk.cpp                        |   65 +-
 src/gis/trk/CDetailsTrk.h                          |    3 +-
 src/gis/trk/CGisItemTrk.cpp                        |   61 +-
 src/gis/trk/CGisItemTrk.h                          |   14 +-
 src/gis/trk/CScrOptTrk.cpp                         |    2 +-
 src/gis/trk/CSelectActivity.cpp                    |   72 -
 src/gis/trk/IDetailsTrk.ui                         |   34 +-
 src/gis/trk/ISelectActivity.ui                     |   28 -
 src/gis/wpt/CGisItemWpt.cpp                        |   43 +-
 src/gis/wpt/CGisItemWpt.h                          |    8 +-
 src/gis/wpt/CScrOptWpt.cpp                         |    2 +-
 src/helpers/CSelectCopyAction.cpp                  |    4 +-
 src/icons/32x32/SearchDatabase.png                 |  Bin 0 -> 2033 bytes
 src/icons/32x32/SortName.png                       |  Bin 0 -> 658 bytes
 src/icons/48x48/SearchDatabase.png                 |  Bin 0 -> 3133 bytes
 src/icons/48x48/SortName.png                       |  Bin 0 -> 946 bytes
 src/icons/SearchDatabase.svg                       |  178 +++
 src/icons/SortName.svg                             |   90 ++
 src/locale/qmapshack.ts                            | 1118 ++++++++-----
 src/locale/qmapshack_cs.ts                         | 1176 +++++++++-----
 src/locale/qmapshack_de.ts                         | 1116 ++++++++-----
 src/locale/qmapshack_es.ts                         | 1120 ++++++++-----
 src/locale/qmapshack_fr.ts                         | 1119 ++++++++-----
 src/locale/qmapshack_nl.ts                         | 1117 ++++++++-----
 src/map/cache/CDiskCache.cpp                       |   15 +-
 src/mouse/CMouseRangeTrk.cpp                       |    8 +-
 src/mouse/CMouseRangeTrk.h                         |    2 +-
 src/mouse/CScrOptRangeTrk.cpp                      |   14 +-
 src/mouse/CScrOptRangeTrk.h                        |    8 +
 src/plot/IPlot.cpp                                 |    7 +-
 src/plot/IPlot.h                                   |    2 +-
 src/qlgt/CQmsDb.cpp                                |    5 +-
 src/resources.qrc                                  |    4 +
 src/widgets/CTextEditWidget.cpp                    |   19 +-
 src/widgets/CTextEditWidgetSelMenu.cpp             |    6 +-
 src/widgets/CTextEditWidgetSelMenu.h               |    6 +-
 327 files changed, 18066 insertions(+), 3255 deletions(-)

diff --git a/.hgsub b/.hgsub
deleted file mode 100644
index e5ee4aa..0000000
--- a/.hgsub
+++ /dev/null
@@ -1 +0,0 @@
-doc = https://bitbucket.org/maproom/qmapshack/wiki
diff --git a/.hgsubstate b/.hgsubstate
deleted file mode 100644
index 3b6bae8..0000000
--- a/.hgsubstate
+++ /dev/null
@@ -1 +0,0 @@
-aafe914bb3e60e0cbf61df26153f679536dbf66d doc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac0fc3f..3f541c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,8 +24,8 @@ endif(WIN32)
 set(APPLICATION_NAME qmapshack)
 
 set(APPLICATION_VERSION_MAJOR "1")
-set(APPLICATION_VERSION_MINOR "6")
-set(APPLICATION_VERSION_PATCH "3")
+set(APPLICATION_VERSION_MINOR "7")
+set(APPLICATION_VERSION_PATCH "0")
 
 add_definitions(-DVER_MAJOR=${APPLICATION_VERSION_MAJOR} -DVER_MINOR=${APPLICATION_VERSION_MINOR} -DVER_STEP=${APPLICATION_VERSION_PATCH} -DAPPLICATION_NAME=${PROJECT_NAME})
 
diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user
index ea4ab98..837fd7f 100644
--- a/CMakeLists.txt.user
+++ b/CMakeLists.txt.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.0, 2016-07-14T12:57:02. -->
+<!-- Written by QtCreator 4.0.0, 2016-09-13T08:29:39. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -70,7 +70,7 @@
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
     <valuelist type="QVariantList" key="CMake.Configuration">
      <value type="QString">CMAKE_BUILD_TYPE:STRING=Debug</value>
-     <value type="QString">CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable}</value>
+     <value type="QString">CMAKE_CXX_COMPILER:STRING=/usr/bin/g++-5</value>
      <value type="QString">CMAKE_C_COMPILER:FILEPATH=/usr/bin/cc</value>
      <value type="QString">CMAKE_INSTALL_PREFIX:PATH=/usr/</value>
      <value type="QString">QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}</value>
diff --git a/CPackConfig.cmake b/CPackConfig.cmake
index 4b0a063..f65b49b 100644
--- a/CPackConfig.cmake
+++ b/CPackConfig.cmake
@@ -18,7 +18,7 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSI
 
 ### source package settings
 set(CPACK_SOURCE_GENERATOR "TGZ")
-set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;[.]hg/;.gitignore;/build/;tags;cscope.*;[.]rej$;[.]orig$;svn-commit[.]")
+set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;[.]hg/;[.]hgsub;[.]hgsubstate;.gitignore;/build/;tags;cscope.*;[.]rej$;[.]orig$;svn-commit[.]")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
 
 include(CPack)
diff --git a/changelog.txt b/changelog.txt
index 314bc69..b525314 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,21 @@
+V 1.7.0
+* Add: Function to search the database
+* Add: Sort items in projects by time or name
+* Add: "Copy To..." for projects
+* Add: Include waypoint name when creating of a route from waypoints
+* Add: Database: Add menu item to copy projects from one folder to another
+* Add: Database: Add menu item to move projects from one folder to another
+* Fix: No HTML tags for empty strings
+* Fix: Checkmark for new folders to prevent deleting data by chance.
+* Clean up code for track activities for futur improvements
+* [Issue #154]Font size for project description
+* [Issue #157] Issue when "Save as" a project from Garmin device
+* [Issue #159] File-/Projectnames with dots get truncated
+* [Issue #158] QMS incompabilities on different platforms
+* [Issue #160] Update of diary after adding a waypoint takes very long time
+* [Issue #102] Allow renaming of Groups, Projects, ...
+
+
 V 1.6.3
 * Add FreeBSD support
 * Enhance editor for descriptions and comments.
diff --git a/cmake/Modules/FindGDAL.cmake b/cmake/Modules/FindGDAL.cmake
index e85b063..9fb206d 100644
--- a/cmake/Modules/FindGDAL.cmake
+++ b/cmake/Modules/FindGDAL.cmake
@@ -29,10 +29,12 @@ endif(WIN32)
         /usr/local/include
         /opt/local/include
         /sw/include
+        ${CMAKE_INSTALL_PREFIX}/include
         /usr/include/gdal
         /usr/local/include/gdal
         /opt/local/include/gdal
         /sw/include/gdal
+        ${CMAKE_INSTALL_PREFIX}/include/gdal
         ${CMAKE_SOURCE_DIR}/Win32/GDAL/include
     PATH_SUFFIXES
         gdal
@@ -59,6 +61,7 @@ endif(WIN32)
       /usr/local/lib
       /opt/local/lib
       /sw/lib
+      ${CMAKE_INSTALL_PREFIX}/lib
       ${CMAKE_SOURCE_DIR}/Win32/GDAL/lib
   )
 
diff --git a/cmake/Modules/FindPROJ.cmake b/cmake/Modules/FindPROJ.cmake
index b73e355..1c13909 100644
--- a/cmake/Modules/FindPROJ.cmake
+++ b/cmake/Modules/FindPROJ.cmake
@@ -30,6 +30,7 @@ endif(WIN32)
         /usr/local/include
         /opt/local/include
         /sw/include
+        ${CMAKE_INSTALL_PREFIX}/include
         ${CMAKE_SOURCE_DIR}/Win32/GDAL/include
     PATH_SUFFIXES
         proj4
@@ -49,6 +50,7 @@ endif(WIN32)
         /usr/local/lib
         /opt/local/lib
         /sw/lib
+        ${CMAKE_INSTALL_PREFIX}/lib
         ${CMAKE_SOURCE_DIR}/Win32/GDAL/lib
   )
   mark_as_advanced(LIBPROJ_LIBRARY)
diff --git a/cmake/Modules/FindROUTINO.cmake b/cmake/Modules/FindROUTINO.cmake
index 3ba76ed..622b71f 100644
--- a/cmake/Modules/FindROUTINO.cmake
+++ b/cmake/Modules/FindROUTINO.cmake
@@ -28,6 +28,7 @@ else (ROUTINO_LIBRARIES AND ROUTINO_INCLUDE_DIRS AND ROUTINO_XML_PATH)
             /usr/local/include
             /opt/local/include
             /sw/include
+            ${CMAKE_INSTALL_PREFIX}/include
             ${ROUTINO_DEV_PATH}/include/
     )
     mark_as_advanced(ROUTINO_INCLUDE_DIR)
@@ -40,6 +41,7 @@ else (ROUTINO_LIBRARIES AND ROUTINO_INCLUDE_DIRS AND ROUTINO_XML_PATH)
             /usr/local/lib
             /opt/local/lib
             /sw/lib
+            ${CMAKE_INSTALL_PREFIX}/include
             ${ROUTINO_DEV_PATH}/lib
     )
     mark_as_advanced(LIBROUTINO_LIBRARY)
@@ -53,6 +55,7 @@ else (ROUTINO_LIBRARIES AND ROUTINO_INCLUDE_DIRS AND ROUTINO_XML_PATH)
             /usr/share/routino
             /usr/local/share/routino
             /opt/local/share/routino
+            ${CMAKE_INSTALL_PREFIX}/share/routino
             ${ROUTINO_DEV_PATH}/xml/
     )
     mark_as_advanced(ROUTINO_XML_PATH)
diff --git a/doc/.hgignore b/doc/.hgignore
new file mode 100644
index 0000000..b96f14b
--- /dev/null
+++ b/doc/.hgignore
@@ -0,0 +1,18 @@
+syntax: glob
+
+#
+# Exclude Emacs backup and autosave files:
+
+*~
+\#*\#
+.\#*
+
+#
+# Exclude the "*.html" target files created from the "*md" source files:
+
+*.html
+
+#
+# Exclude the "*.time" time stamp files used by the make file:
+
+*.time
diff --git a/doc/BugFeatures.html b/doc/BugFeatures.html
new file mode 100644
index 0000000..a63ef4d
--- /dev/null
+++ b/doc/BugFeatures.html
@@ -0,0 +1,41 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#bugs-features">Bugs & Features</a><ul>
+<li><a href="#bugs">Bugs</a></li>
+<li><a href="#features">Features</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="bugs-features">Bugs & Features</h1>
+<p>There is an issue tracker, that can be used for that kind of stuff. It’s open to anonymous access. However if you register to BitBucket you will be informed when ever there is a change of your topic. Sometimes I will ask for more information. If you miss these questions and there is <strong>no feedback in a reasonable time</strong>, I will <strong>delete the request</strong> without further attention.</p>
+<p><strong>Do not assign an issue to anyone!</strong> The issue will be assigned when someone volunteers to solve it. </p>
+<h2 id="bugs">Bugs</h2>
+<p>If you have found a bug file a bug report on the <a href="https://bitbucket.org/maproom/qmapshack/issues?status=new&status=open">Issues</a> page. </p>
+<ol>
+<li><strong>Consider fixing it yourself.</strong> For example bad spelling, confusing names or explanations and bad translations can be fixed by everyone. Use Qt5 Linguist to edit the translations. Linguist will tell you the source file containing the string, too. By that you can change the original string in the source code. </li>
+</ol>
+<p>Please make sure to provide:</p>
+<ol>
+<li>Information about the <strong>operating system and the software’s version</strong>. You find this in the menu “?” -> About</li>
+<li>Give a <strong>detailed report</strong> about what is broken</li>
+<li>Give instructions about <strong>how to reproduce</strong> the problem</li>
+<li>If <strong>additional data</strong> is needed give <strong>real links</strong> to that data. A mellow description where to find it is not sufficient.</li>
+<li>If the application crashes and you are using Linux try to create a backtrace. <a href="TroubleShooting.html#create-a-backtrace-of-a-crash-on-linux">See instructions</a></li>
+</ol>
+<p>All bugs will get some attention. Due to vacations this might take up to 2 weeks. If there is no answer after that period make yourself heard via email.</p>
+<h2 id="features">Features</h2>
+<p>Your <strong>best chance</strong> to get a new feature is to<strong> implement it on your own</strong>. If you want someone else to do the work for you open an <a href="https://bitbucket.org/maproom/qmapshack/issues?status=new&status=open">Issue</a>. Do not assign it to anyone. If someone volunteers to implement it the issue will be assigned. To increase your chances consider the following:</p>
+<ol>
+<li>Give a detailed description of what you want and why you think it’s of a general interest. Just because software XYZ does it, is a bad reason. </li>
+<li>Sketch in detail how you think the feature should be integrated into the GUI or the workflow. </li>
+<li>If your request requires eye candy like icons, make a suggestion how the icons should look like or provide the icons as SVG. If you want certain colors, name them and give a reason for your choice. </li>
+</ol>
+<p>It’s ok if you do not know how to code C++. But always keep in mind you ask someone to spend his/her time for you. Thus try to prepare  as much as possible the stuff that does not need programming skills. And if someone implemented a feature for you it would be more than fair of you to test it faithfully and to add a nice documentation about it in the Wiki. </p>
+<hr />
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
\ No newline at end of file
diff --git a/doc/BuildWindowsVisualStudio.html b/doc/BuildWindowsVisualStudio.html
new file mode 100644
index 0000000..8d979da
--- /dev/null
+++ b/doc/BuildWindowsVisualStudio.html
@@ -0,0 +1,224 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DeveloperCodingGuideline.html">Prev</a> (Coding Guideline) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Add translations) <a href="DeveloperTranslate.html">Next</a></p>
+<hr />
+<h1 id="compiling-and-building-qmapshack-for-windows">Compiling and Building QMapShack for Windows</h1>
+<h2 id="foreword">Foreword</h2>
+<p>The following description explains how the QMapShack windows binaries provided for download at https://bitbucket.org/maproom/qmapshack/downloads are created.</p>
+<p>I try to keep a balance between providing a complete but still reasonably compact description.
+So, depending on the setup of your development machine (e.g. language settings) you might have to make some adaptations which may not be described here in full detail. 
+So please be prepared for some improvizatizon, e.g. when adapting path names or resolving start menu entries.</p>
+<p>Of course, there might be other ways to create windows binaries, e.g. with other compiler tool chains. If you succeed, you are encouraged to create a build description on a separate Wiki page.</p>
+<h2 id="general-remarks">General remarks</h2>
+<p>QMapShack for Windows (short: QMS) is build with Visual Studio 2013 as <em>64bit</em> application.</p>
+<ul>
+<li>Ensure to have the 64bit option selected in all build steps.</li>
+<li>Currently, no <em>32bit</em> version is officially supported. 
+  It should still be possible to build a 32bit version using analogous steps.
+  But you might have problems with memory limitations on large maps and you will be on your own when it comes to bug fixing.</li>
+</ul>
+<p>Note: You don’t have to buy Visual Studio 2013. The free-of-charge Visual Studio 2013 Community-Edition works, too. Instead of Visual Studio 2013, Visual Studio 2015 should also work. Maybe we switch to 2015 sooner or later due to its improved C++-11 support (https://msdn.microsoft.com/library/hh567368.aspx#featurelist)</p>
+<h2 id="required-tools-for-building-and-installing">Required tools for building and installing</h2>
+<ul>
+<li>Microsoft Visual Studio 2013 (short: VS2013)
+  Ensure that you have the latest update installed, see https://support.microsoft.com/en-us/kb/2829760</li>
+<li>CMake 3.0 or later, available at http://www.cmake.org/</li>
+<li>Qt5.5 or later from http://qt-project.org/downloads</li>
+<li>The mingw64 toolchain (http://mingw-w64.org) is needed to compile the routino library.
+  For installation, follow the instructions at the beginning of the build_routino.bat which you can find in \msvc_64 directory</li>
+<li>NSIS, available at http://nsis.sourceforge.net/Main_Page
+  only required if you want to create the installer  </li>
+</ul>
+<h2 id="compile-instructions">Compile instructions</h2>
+<h3 id="c1-compile-the-gdal-library-httpwwwgdalorg">C1.) Compile the GDAL library, http://www.gdal.org/</h3>
+<p>Build instructions inspired by 
+  http://trac.osgeo.org/gdal/wiki/BuildingOnWindows, 
+  http://dominoc925.blogspot.de/2013/03/build-64-bit-gdal-for-windows.html</p>
+<ul>
+<li>Download the source code of the version 1.11 (or latest) 
+  from http://trac.osgeo.org/gdal/wiki/DownloadSource and unzip</li>
+<li>In nmake.opt, adapt the following lines, 
+  according to your build environment [my settings are given as example]</li>
+</ul>
+<div class="codehilite"><pre>  <span class="n">MSVC_VER</span><span class="o">=</span><span class="mi">1800</span>
+  <span class="err">#</span> <span class="n">NOTE</span><span class="o">:</span> <span class="n">MSVC_VER</span><span class="o">=</span><span class="mi">1800</span> <span class="n">corresponds</span> <span class="n">to</span> <span class="n">Visual</span> <span class="n">Studio</span> <span class="mi">2013</span>
+  <span class="n">GDAL_HOME</span> <span class="o">=</span> <span class="s">"M:\lib\gdal"</span>
+  <span class="err">#</span> <span class="n">NOTE</span><span class="o">:</span> <span class="n">GDAL_HOME</span> <span class="n">specifies</span> <span class="n">where</span> <span class="n">the</span> <span class="n">build</span> <span class="n">results</span> <span class="n">will</span> <span class="n">be</span> <span class="n">stored</span>
+  <span class="err">#</span> <span class="n">NOTE</span><span class="o">:</span> <span class="n">try</span> <span class="n">to</span> <span class="n">avoid</span> <span class="n">path</span> <span class="n">names</span> <span class="n">with</span> <span class="n">spaces</span> <span class="n">and</span> <span class="n">non</span><span class="o">-</span><span class="n">ASCII</span> <span class="n">characters</span> <span class="n">and</span> <span class="n">in</span> <span class="k">case< [...]
+  <span class="n">WIN64</span><span class="o">=</span><span class="n">YES</span>
+</pre></div>
+
+
+<ul>
+<li>On the Windows Desktop:
+  select Start | All Programs | Microsoft Visual Studio 2013 | Visual Studio Tools | VS 2013 x64 Native Tools Command Prompt.</li>
+<li>in the command prompt:
+  change directory to the extracted GDAL source code root folder</li>
+</ul>
+<div class="codehilite"><pre>  <span class="n">nmake</span> <span class="o">/</span><span class="n">f</span> <span class="n">makefile</span><span class="p">.</span><span class="n">vc</span>
+  <span class="n">nmake</span> <span class="o">/</span><span class="n">f</span> <span class="n">makefile</span><span class="p">.</span><span class="n">vc</span> <span class="n">devinstall</span>
+</pre></div>
+
+
+<h3 id="c2-compile-the-proj-library-httptracosgeoorgproj">C2.) Compile the PROJ library http://trac.osgeo.org/proj/</h3>
+<ul>
+<li>Download the source code of the version 4.8 (or latest) 
+  from http://trac.osgeo.org/proj/ and unzip it</li>
+<li>In nmake.opt, adapt the following lines, 
+  according to your build environment [my settings are given as example]</li>
+</ul>
+<div class="codehilite"><pre>  <span class="n">INSTDIR</span><span class="o">=</span><span class="n">M</span><span class="o">:</span><span class="err">\</span><span class="n">lib</span><span class="err">\</span><span class="n">PROJ</span>
+</pre></div>
+
+
+<ul>
+<li>On the Windows Desktop:
+    => select Start | All Programs | Microsoft Visual Studio 2013 | Visual Studio Tools | VS 2013 x64 Native Tools Command Prompt.</li>
+<li>in the command prompt:
+    => change directory to the extracted PROJ4 source code root folder
+    => nmake /f makefile.vc
+    => nmake /f makefile.vc install-all</li>
+</ul>
+<h3 id="c3-compile-the-routino-library-httpwwwroutinoorg">C3.) Compile the routino library http://www.routino.org</h3>
+<ul>
+<li>Get the latest version from the SVN trunk http://www.routino.org/download/</li>
+</ul>
+<div class="codehilite"><pre>  <span class="n">svn</span> <span class="n">co</span> <span class="n">http</span><span class="o">:</span><span class="c1">//routino.org/svn/trunk routino</span>
+</pre></div>
+
+
+<p>Note: you might have to install TortoiseSVN or any other svn client</p>
+<ul>
+<li>Adapt, use and follow instructions found in build_routino.bat
+  which you can find in \msvc_64 directory of your QMS source directory</li>
+<li>It may be necessary to switch off antivirus software before compilation (Avast has been reported to block compilation by one user)</li>
+</ul>
+<h3 id="c4-install-qt55-httpqt-projectorg">C4.) Install Qt5.5 http://qt-project.org</h3>
+<ul>
+<li>Download and run the Qt5 Windows Online Installer 
+  from http://qt-project.org/downloads</li>
+<li>Install for VS2013, x64</li>
+</ul>
+<p>Note: QMS should compile with Qt5.4 as well but Qt5.4 has a nasty bug in list scrolling. Qt5.6 on the other hand will not work as QWebkit is used in QMS which has been removed from Qt5.6.</p>
+<p>Note: if you prefer offline installation you can choose the right package 
+  in OFFLINE INSTALLERS section of that page</p>
+<h3 id="c5-get-the-qmapshack-source-from-the-repository-eg">C5.) Get the QMapShack source from the repository, e.g.</h3>
+<div class="codehilite"><pre>   <span class="n">hg</span> <span class="n">clone</span> <span class="n">https</span><span class="o">:</span><span class="c1">//bitbucket.org/maproom/qmapshack QMapShack  </span>
+</pre></div>
+
+
+<p>Note: you might have to install TortoiseHG or any other mercurial client </p>
+<h3 id="c6-start-the-cmake-gui-you-did-install-cmake-before-didnt-you">C6.) Start the CMake GUI (you did install CMake before, didn’t you)</h3>
+<ul>
+<li>Enter the path to the source directory (which has been created by cloning the hg repository in the previous step)</li>
+<li>Enter the path where you want to build the binaries (should be a new directory)</li>
+<li>Select “Visual Studio 12 2013 Win64” and “Native Compilers”</li>
+<li>Configure <ul>
+<li>In the first run there will be errors. </li>
+<li>Now enter the directories where you have installed Qt5, GDAL, 
+  PROJ.4, routino to the respective variables.</li>
+<li>Only change the UPDATE_TRANSLATIONS option in you know what you are doing. See the <a href="DeveloperTranslate.html">DeveloperTranslate Wiki page</a> for details.</li>
+<li>After that, Configure again.</li>
+<li>Note: in case that you only get some warnings, you anyway can try to GENERATE</li>
+</ul>
+</li>
+<li>Generate</li>
+</ul>
+<h3 id="c7-open-the-generated-buildqmapshacksln-with-vs2013">C7.) Open the generated  build\QMapShack.sln with VS2013</h3>
+<ul>
+<li>Change solution configuration type to “Release”</li>
+<li>Set the qmapshack project as start project (may not be necessary)</li>
+<li>Right-Click on the ALL_BUILD project and select build to start the compilation</li>
+</ul>
+<h2 id="creating-a-windows-binary-installer">Creating a Windows binary installer</h2>
+<h3 id="i1-download-the-vc-redistributable-installer">I1.) Download the VC redistributable installer</h3>
+<p>from http://www.microsoft.com/en-us/download/details.aspx?id=40784
+Note: in case the redistributable files are already installed in your system, 
+this step is not necessary.</p>
+<h3 id="i2-optional-download-libmysqldll-from-mariadb">I2.) [Optional] Download libmysql.dll from mariadb</h3>
+<p>Download mariadb-10.1.11-winx64.zip (large file - ca 260MB) from 
+  https://downloads.mariadb.org/mariadb/10.1.11/ and extract libmysql.dll.
+  Or copy libmysql.dll from an existing QMS installation
+  This library is only needed at runtime for mysql/mariadb support</p>
+<p>Note: If you don’t download/copy it, you have to comment out the respective 
+  lines in the copyfiles.bat and QMapShack_Installer.nsi scripts which are described 
+  in the next steps.</p>
+<h3 id="i3-copy-all-required-files-to-intermediate-directory">I3.) Copy all required files to intermediate directory</h3>
+<ul>
+<li>Edit the file copyfiles.bat which you can find in \msvc_64 directory of 
+  your QMS source directory and adapt the directories <ul>
+<li>where you have installed Qt5</li>
+<li>where your self compiled binaries of routino, GDAL and PROJ4 are </li>
+<li>where the runtime libraries from mingw/msys are</li>
+<li>where the libmysql.dll is</li>
+<li>Path to the build directory which you have specified in the CMake GUI</li>
+</ul>
+</li>
+<li>Execute the copyfiles.bat </li>
+<li>The copyfiles.bat script will create a new directory “Files” which has 
+  exactly the same content as the final installation directory created 
+  by the NSIS installer will have.</li>
+<li>QMapShack does not have any dependencies out of its own installation 
+  directory. So instead of creating an NSIS installer in the next step 
+  you could just copy this directory to an other machine for a quick deployment</li>
+<li>[optional] Test whether the deployment is complete: 
+  double-click on Files/qmapshack.exe
+  ==> QMapShack should start up and be fully operational without any restrictions</li>
+</ul>
+<h3 id="i4-create-the-installer-with-nsis30b1">I4.) Create the installer with NSIS(3.0b1)</h3>
+<ul>
+<li>Run the QMapShack_Installer.nsi script e.g via right click on script file 
+  and choosing “Compile NSIS Script” from contextual menu.</li>
+</ul>
+<p>Note: there also are the options to run the script on command prompt with 
+commandline version(makensis.exe). 
+Or you can start windows version (makensisw.exe) to run the script.</p>
+<h2 id="troubleshooting">TroubleShooting</h2>
+<p>If QMapShack does not behave as you expect, please have a look at the <a href="TroubleShooting.html">TroubleShooting Wiki Page</a>. If this does not help you to understand the problem, you can try to dig deeper by debugging as described in the next section.</p>
+<h2 id="debugging-with-vs2013">Debugging with VS2013</h2>
+<p>For bug fixing you might want to run QMapShack with the VS2013 debugger.
+This requires some additional configuration</p>
+<h3 id="d1-set-the-solution-configuration-type-to-relwithdebinfo">D1.) Set the solution configuration type to “RelWithDebInfo”</h3>
+<p>Note: you would expect the solution configuration “Debug” to be used.
+But with “Debug” you will get a crash in pj_init_plus() shortly after
+start as described in 
+http://stackoverflow.com/questions/19197791/projapi-gis-library-heap-overflow
+The reason for this problem is currently unknown. Any help is welcome.</p>
+<h3 id="d2-right-click-on-the-project-qmapshack-and-open-the-settings-dialog">D2.) Right-click on the project qmapshack and open the settings dialog</h3>
+<ul>
+<li>In C/C++->Optimization: deactivate optimization (/Od)</li>
+<li>In Debugging->Environment set the path such that all required .dll’s are found
+  (see http://stackoverflow.com/questions/2119539/visual-studio-how-to-set-path-to-dll)
+  The path depends on where you have installed/compiled Qt5, gdal, proj.4, routino
+  In my case this is </li>
+</ul>
+<div class="codehilite"><pre>  <span class="n">PATH</span><span class="o">=%</span><span class="n">PATH</span><span class="o">%</span><span class="p">;</span><span class="n">M</span><span class="o">:</span><span class="err">\</span><span class="n">lib</span><span class="err">\</span><span class="n">gdal</span><span class="err">\</span><span class="n">bin</span><span class="p">;</span><span class="n">M</span><span class="o">:</span><span class="err">\</span><span class="n">lib</span><span [...]
+</pre></div>
+
+
+<h3 id="d3-compile">D3.) Compile</h3>
+<ul>
+<li>Right-Click on the ALL_BUILD project and select build to start the compilation</li>
+</ul>
+<h3 id="d4-rundebug-preparations">D4.) Run/Debug preparations</h3>
+<p>Now you can in principle run QMapShack with the VS2013 debugger: 
+step through, inspect variables, see the debug output</p>
+<p>But as QMapShack expects some configuration files for gdal and routino in the
+directory where it’s executable is placed. 
+If those files are not there, you will get some strange error messages such as 
+“the specified XML file is not found” at startup and the functionality for 
+map/coordinate transformations will be limited.</p>
+<p>The easiest way to provide these files is to copy the whole content of the 
+Files directory created by copyfiles.bat as described in step I2)
+<em>except the qmapshack.exe</em> to the directory where you RelWithDebInfo executable 
+has been created (build\bin\RelWithDebInfo).</p>
+<p>Note: If you really copy all those files, then you can skip the step to set the 
+PATH as described in step D2). Alternatively you can set the path as described and
+only copy all those configuration files and resources (i.e. all files which are 
+not .dll’s + all directories)</p>
+<h3 id="d5-rundebug">D5.) Run/Debug</h3>
+<p>Congratulations: all preparations finished.
+Now you can <em>really</em> start debugging!</p>
+<hr />
+<p><a href="DeveloperCodingGuideline.html">Prev</a> (Coding Guideline) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Add translations) <a href="DeveloperTranslate.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/BuildWindowsVisualStudio.md b/doc/BuildWindowsVisualStudio.md
new file mode 100644
index 0000000..2e9e2af
--- /dev/null
+++ b/doc/BuildWindowsVisualStudio.md
@@ -0,0 +1,229 @@
+[Prev](DeveloperCodingGuideline) (Coding Guideline) | [Home](Home) | [Manual](DocMain) | (Add translations) [Next](DeveloperTranslate)
+- - -
+[TOC]
+- - -
+
+# Compiling and Building QMapShack for Windows
+
+## Foreword
+
+The following description explains how the QMapShack windows binaries provided for download at https://bitbucket.org/maproom/qmapshack/downloads are created.
+
+I try to keep a balance between providing a complete but still reasonably compact description.
+So, depending on the setup of your development machine (e.g. language settings) you might have to make some adaptations which may not be described here in full detail. 
+So please be prepared for some improvizatizon, e.g. when adapting path names or resolving start menu entries.
+
+Of course, there might be other ways to create windows binaries, e.g. with other compiler tool chains. If you succeed, you are encouraged to create a build description on a separate Wiki page.
+
+## General remarks
+
+QMapShack for Windows (short: QMS) is build with Visual Studio 2013 as _64bit_ application.
+
+- Ensure to have the 64bit option selected in all build steps.
+- Currently, no _32bit_ version is officially supported. 
+  It should still be possible to build a 32bit version using analogous steps.
+  But you might have problems with memory limitations on large maps and you will be on your own when it comes to bug fixing.
+
+Note: You don't have to buy Visual Studio 2013. The free-of-charge Visual Studio 2013 Community-Edition works, too. Instead of Visual Studio 2013, Visual Studio 2015 should also work. Maybe we switch to 2015 sooner or later due to its improved C++-11 support (https://msdn.microsoft.com/library/hh567368.aspx#featurelist)
+
+## Required tools for building and installing
+
+- Microsoft Visual Studio 2013 (short: VS2013)
+  Ensure that you have the latest update installed, see https://support.microsoft.com/en-us/kb/2829760
+- CMake 3.0 or later, available at http://www.cmake.org/
+- Qt5.5 or later from http://qt-project.org/downloads
+- The mingw64 toolchain (http://mingw-w64.org) is needed to compile the routino library.
+  For installation, follow the instructions at the beginning of the build_routino.bat which you can find in \msvc_64 directory
+- NSIS, available at http://nsis.sourceforge.net/Main_Page
+  only required if you want to create the installer  
+
+## Compile instructions
+
+### C1.) Compile the GDAL library, http://www.gdal.org/
+Build instructions inspired by 
+  http://trac.osgeo.org/gdal/wiki/BuildingOnWindows, 
+  http://dominoc925.blogspot.de/2013/03/build-64-bit-gdal-for-windows.html
+
+- Download the source code of the version 1.11 (or latest) 
+  from http://trac.osgeo.org/gdal/wiki/DownloadSource and unzip
+- In nmake.opt, adapt the following lines, 
+  according to your build environment [my settings are given as example]
+~~~~
+  MSVC_VER=1800
+  # NOTE: MSVC_VER=1800 corresponds to Visual Studio 2013
+  GDAL_HOME = "M:\lib\gdal"
+  # NOTE: GDAL_HOME specifies where the build results will be stored
+  # NOTE: try to avoid path names with spaces and non-ASCII characters and in case of trouble try without quotes
+  WIN64=YES
+~~~~
+   
+- On the Windows Desktop:
+  select Start | All Programs | Microsoft Visual Studio 2013 | Visual Studio Tools | VS 2013 x64 Native Tools Command Prompt.
+- in the command prompt:
+  change directory to the extracted GDAL source code root folder
+~~~~
+  nmake /f makefile.vc
+  nmake /f makefile.vc devinstall
+~~~~
+	
+### C2.) Compile the PROJ library http://trac.osgeo.org/proj/
+
+- Download the source code of the version 4.8 (or latest) 
+  from http://trac.osgeo.org/proj/ and unzip it
+- In nmake.opt, adapt the following lines, 
+  according to your build environment [my settings are given as example]
+~~~~
+  INSTDIR=M:\lib\PROJ
+~~~~
+- On the Windows Desktop:
+	=> select Start | All Programs | Microsoft Visual Studio 2013 | Visual Studio Tools | VS 2013 x64 Native Tools Command Prompt.
+- in the command prompt:
+	=> change directory to the extracted PROJ4 source code root folder
+	=> nmake /f makefile.vc
+	=> nmake /f makefile.vc install-all
+
+### C3.) Compile the routino library http://www.routino.org
+- Get the latest version from the SVN trunk http://www.routino.org/download/
+~~~~
+  svn co http://routino.org/svn/trunk routino
+~~~~  
+Note: you might have to install TortoiseSVN or any other svn client
+
+- Adapt, use and follow instructions found in build_routino.bat
+  which you can find in \msvc_64 directory of your QMS source directory
+- It may be necessary to switch off antivirus software before compilation (Avast has been reported to block compilation by one user)
+    
+### C4.) Install Qt5.5 http://qt-project.org
+- Download and run the Qt5 Windows Online Installer 
+  from http://qt-project.org/downloads
+- Install for VS2013, x64
+
+Note: QMS should compile with Qt5.4 as well but Qt5.4 has a nasty bug in list scrolling. Qt5.6 on the other hand will not work as QWebkit is used in QMS which has been removed from Qt5.6.
+  
+  Note: if you prefer offline installation you can choose the right package 
+  in OFFLINE INSTALLERS section of that page
+  
+### C5.) Get the QMapShack source from the repository, e.g. 
+~~~~
+   hg clone https://bitbucket.org/maproom/qmapshack QMapShack  
+~~~~
+Note: you might have to install TortoiseHG or any other mercurial client 
+   
+### C6.) Start the CMake GUI (you did install CMake before, didn't you)
+- Enter the path to the source directory (which has been created by cloning the hg repository in the previous step)
+- Enter the path where you want to build the binaries (should be a new directory)
+- Select "Visual Studio 12 2013 Win64" and "Native Compilers"
+- Configure 
+    - In the first run there will be errors. 
+    - Now enter the directories where you have installed Qt5, GDAL, 
+      PROJ.4, routino to the respective variables.
+    - Only change the UPDATE_TRANSLATIONS option in you know what you are doing. See the [DeveloperTranslate Wiki page](DeveloperTranslate) for details.
+    - After that, Configure again.
+    - Note: in case that you only get some warnings, you anyway can try to GENERATE
+- Generate
+
+### C7.) Open the generated  build\QMapShack.sln with VS2013
+- Change solution configuration type to "Release"
+- Set the qmapshack project as start project (may not be necessary)
+- Right-Click on the ALL_BUILD project and select build to start the compilation
+
+
+## Creating a Windows binary installer
+
+### I1.) Download the VC redistributable installer 
+  from http://www.microsoft.com/en-us/download/details.aspx?id=40784
+Note: in case the redistributable files are already installed in your system, 
+this step is not necessary.
+
+### I2.) [Optional] Download libmysql.dll from mariadb
+  Download mariadb-10.1.11-winx64.zip (large file - ca 260MB) from 
+  https://downloads.mariadb.org/mariadb/10.1.11/ and extract libmysql.dll.
+  Or copy libmysql.dll from an existing QMS installation
+  This library is only needed at runtime for mysql/mariadb support
+
+  Note: If you don't download/copy it, you have to comment out the respective 
+  lines in the copyfiles.bat and QMapShack_Installer.nsi scripts which are described 
+  in the next steps.
+
+### I3.) Copy all required files to intermediate directory
+-  Edit the file copyfiles.bat which you can find in \msvc_64 directory of 
+  your QMS source directory and adapt the directories 
+    - where you have installed Qt5
+    - where your self compiled binaries of routino, GDAL and PROJ4 are 
+    - where the runtime libraries from mingw/msys are
+    - where the libmysql.dll is
+    - Path to the build directory which you have specified in the CMake GUI
+-  Execute the copyfiles.bat 
+- The copyfiles.bat script will create a new directory "Files" which has 
+  exactly the same content as the final installation directory created 
+  by the NSIS installer will have.
+- QMapShack does not have any dependencies out of its own installation 
+  directory. So instead of creating an NSIS installer in the next step 
+  you could just copy this directory to an other machine for a quick deployment
+- [optional] Test whether the deployment is complete: 
+  double-click on Files/qmapshack.exe
+  ==> QMapShack should start up and be fully operational without any restrictions
+
+### I4.) Create the installer with NSIS(3.0b1)
+- Run the QMapShack_Installer.nsi script e.g via right click on script file 
+  and choosing "Compile NSIS Script" from contextual menu.
+
+Note: there also are the options to run the script on command prompt with 
+commandline version(makensis.exe). 
+Or you can start windows version (makensisw.exe) to run the script.
+
+## TroubleShooting
+If QMapShack does not behave as you expect, please have a look at the [TroubleShooting Wiki Page](TroubleShooting). If this does not help you to understand the problem, you can try to dig deeper by debugging as described in the next section.
+
+  
+## Debugging with VS2013
+
+For bug fixing you might want to run QMapShack with the VS2013 debugger.
+This requires some additional configuration
+
+### D1.) Set the solution configuration type to "RelWithDebInfo"
+Note: you would expect the solution configuration "Debug" to be used.
+But with "Debug" you will get a crash in pj_init_plus() shortly after
+start as described in 
+http://stackoverflow.com/questions/19197791/projapi-gis-library-heap-overflow
+The reason for this problem is currently unknown. Any help is welcome.
+
+### D2.) Right-click on the project qmapshack and open the settings dialog
+- In C/C++->Optimization: deactivate optimization (/Od)
+- In Debugging->Environment set the path such that all required .dll's are found
+  (see http://stackoverflow.com/questions/2119539/visual-studio-how-to-set-path-to-dll)
+  The path depends on where you have installed/compiled Qt5, gdal, proj.4, routino
+  In my case this is 
+~~~~
+  PATH=%PATH%;M:\lib\gdal\bin;M:\lib\PROJ\bin;M:\src\routino_pkg\lib;C:\Qt5\5.5\msvc2013_64\bin
+~~~~
+
+### D3.) Compile
+- Right-Click on the ALL_BUILD project and select build to start the compilation
+
+### D4.) Run/Debug preparations
+Now you can in principle run QMapShack with the VS2013 debugger: 
+step through, inspect variables, see the debug output
+
+But as QMapShack expects some configuration files for gdal and routino in the
+directory where it's executable is placed. 
+If those files are not there, you will get some strange error messages such as 
+"the specified XML file is not found" at startup and the functionality for 
+map/coordinate transformations will be limited.
+
+The easiest way to provide these files is to copy the whole content of the 
+Files directory created by copyfiles.bat as described in step I2)
+_except the qmapshack.exe_ to the directory where you RelWithDebInfo executable 
+has been created (build\bin\RelWithDebInfo).
+
+Note: If you really copy all those files, then you can skip the step to set the 
+PATH as described in step D2). Alternatively you can set the path as described and
+only copy all those configuration files and resources (i.e. all files which are 
+not .dll's + all directories)
+
+### D5.) Run/Debug 
+Congratulations: all preparations finished.
+Now you can _really_ start debugging!
+
+- - -
+[Prev](DeveloperCodingGuideline) (Coding Guideline) | [Home](Home) | [Manual](DocMain) | (Add translations) [Next](DeveloperTranslate)
diff --git a/doc/DeveloperCodingGuideline.html b/doc/DeveloperCodingGuideline.html
new file mode 100644
index 0000000..5e5b8af
--- /dev/null
+++ b/doc/DeveloperCodingGuideline.html
@@ -0,0 +1,96 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DeveloperCommitCode.html">Prev</a> (Commit Code) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Compile Instructions for Windows) <a href="BuildWindowsVisualStudio.html">Next</a></p>
+<hr />
+<h1 id="coding-guideline">Coding Guideline</h1>
+<p>No one likes them but it helps to read and maintain the code. Thus please stick to them:</p>
+<ul>
+<li>Indentation is 4 spaces</li>
+<li>Brackets are on a new line each:</li>
+</ul>
+<div class="codehilite"><pre>  <span class="p">...</span>
+    <span class="k">if</span><span class="p">(</span><span class="n">item</span> <span class="o">==</span> <span class="n">nullptr</span><span class="p">)</span>
+    <span class="p">{</span>
+        <span class="k">return</span><span class="p">;</span>
+    <span class="p">}</span>
+  <span class="p">...</span>
+</pre></div>
+
+
+<ul>
+<li>Use camel case with first character lower case on variables.</li>
+</ul>
+<div class="codehilite"><pre>    <span class="kt">int</span> <span class="n">n</span><span class="p">;</span>
+    <span class="kt">int</span> <span class="n">maxBrownFoxes</span><span class="p">;</span>
+</pre></div>
+
+
+<ul>
+<li>
+<p>Use the Qt types (qreal, quint8, qint8, etc) exclusively, as all other definitions might not be portable.</p>
+</li>
+<li>
+<p>Use the Qt wrappers for C/C++ API (qAbs(), qMin(), etc) exclusively as all other definitions might not be portable.</p>
+</li>
+<li>
+<p>Classes start with a capital ‘C’</p>
+</li>
+</ul>
+<div class="codehilite"><pre>    <span class="k">class</span> <span class="nc">CMyClass</span>
+</pre></div>
+
+
+<ul>
+<li>Base (interface) classes start with a capital ‘I’</li>
+</ul>
+<div class="codehilite"><pre>    <span class="k">class</span> <span class="nc">IItem</span>
+    <span class="p">{</span>
+        <span class="p">....</span>
+    <span class="p">};</span>
+
+    <span class="k">class</span> <span class="nc">CMyItemX</span> <span class="o">:</span> <span class="k">public</span> <span class="n">IItem</span>
+    <span class="p">{</span>
+        <span class="c1">// I think you get the idea.</span>
+    <span class="p">}</span>
+</pre></div>
+
+
+<ul>
+<li>Structures are lowercase and have a trailing ‘_t’</li>
+</ul>
+<div class="codehilite"><pre>   <span class="k">struct</span> <span class="kt">my_funny_data_t</span>
+   <span class="p">{</span>
+       <span class="p">....</span>
+   <span class="p">};</span>
+</pre></div>
+
+
+<ul>
+<li>Enumerations are lowercase and have a trailing ‘_e’. Enumeration items start with a ‘e’ and are camel case. It helps if the enumeration name is repeated in the item.</li>
+</ul>
+<div class="codehilite"><pre>   <span class="k">enum</span> <span class="n">my_enum_e</span>
+   <span class="p">{</span>
+        <span class="n">eMyEnumThing1</span>
+       <span class="p">,</span><span class="n">eMyEnumThing2</span>
+   <span class="p">};</span>
+</pre></div>
+
+
+<ul>
+<li>
+<p>Use the <code>override</code> keyword where ever appropriate. When using GCC 5.1 and more recent the compiler will throw a warning. This is important because it prevents us from producing some nasty bugs.</p>
+</li>
+<li>
+<p>As we use the keyword <code>override</code> we do not have to use <code>virtual</code>, too. This is just redundant and of no real use anyway.</p>
+</li>
+<li>
+<p>Use <code>const</code> keyword on methods. Best practice is to use right on the spot for every method. And remove it the moment the method really alters the object’s data.</p>
+</li>
+<li>
+<p>Use <code>nullptr</code> for checking pointers against null, avoid using <code>0</code> or <code>NULL</code> for pointers</p>
+</li>
+</ul>
+<p>I think that’s it. Just look at the code and try to mimic the coding style as good as you can. A bit of discipline really helps to maintain the beast.</p>
+<hr />
+<p><a href="DeveloperCommitCode.html">Prev</a> (Commit Code) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Compile Instructions for Windows) <a href="BuildWindowsVisualStudio.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DeveloperCodingGuideline.md b/doc/DeveloperCodingGuideline.md
new file mode 100644
index 0000000..099afe6
--- /dev/null
+++ b/doc/DeveloperCodingGuideline.md
@@ -0,0 +1,92 @@
+[Prev](DeveloperCommitCode) (Commit Code) | [Home](Home) | [Manual](DocMain) | (Compile Instructions for Windows) [Next](BuildWindowsVisualStudio)
+- - -
+[TOC]
+- - -
+
+# Coding Guideline
+
+No one likes them but it helps to read and maintain the code. Thus please stick to them:
+
+* Indentation is 4 spaces
+* Brackets are on a new line each:
+ 
+```
+#!c++
+  ...
+    if(item == nullptr)
+    {
+        return;
+    }
+  ...
+```
+* Use camel case with first character lower case on variables.
+
+```
+#!c++
+
+    int n;
+    int maxBrownFoxes;
+```
+
+* Use the Qt types (qreal, quint8, qint8, etc) exclusively, as all other definitions might not be portable.
+
+* Use the Qt wrappers for C/C++ API (qAbs(), qMin(), etc) exclusively as all other definitions might not be portable.
+
+* Classes start with a capital 'C'
+
+```
+#!c++
+
+    class CMyClass
+```
+* Base (interface) classes start with a capital 'I'
+
+```
+#!c++
+
+    class IItem
+    {
+        ....
+    };
+
+    class CMyItemX : public IItem
+    {
+        // I think you get the idea.
+    }
+```
+
+* Structures are lowercase and have a trailing '_t'
+
+```
+#!c++
+   struct my_funny_data_t
+   {
+       ....
+   };
+```
+
+* Enumerations are lowercase and have a trailing '_e'. Enumeration items start with a 'e' and are camel case. It helps if the enumeration name is repeated in the item.
+```
+#!c++
+   enum my_enum_e
+   {
+        eMyEnumThing1
+       ,eMyEnumThing2
+   };
+```
+
+* Use the `override` keyword where ever appropriate. When using GCC 5.1 and more recent the compiler will throw a warning. This is important because it prevents us from producing some nasty bugs.
+
+* As we use the keyword `override` we do not have to use `virtual`, too. This is just redundant and of no real use anyway.
+
+* Use `const` keyword on methods. Best practice is to use right on the spot for every method. And remove it the moment the method really alters the object's data.
+
+* Use `nullptr` for checking pointers against null, avoid using `0` or `NULL` for pointers
+
+I think that's it. Just look at the code and try to mimic the coding style as good as you can. A bit of discipline really helps to maintain the beast.
+
+
+
+
+- - -
+[Prev](DeveloperCommitCode) (Commit Code) | [Home](Home) | [Manual](DocMain) | (Compile Instructions for Windows) [Next](BuildWindowsVisualStudio)
diff --git a/doc/DeveloperCommitCode.html b/doc/DeveloperCommitCode.html
new file mode 100644
index 0000000..c5919d5
--- /dev/null
+++ b/doc/DeveloperCommitCode.html
@@ -0,0 +1,13 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocFaq.html">Prev</a> (Frequently Asked Questions) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Coding Guideline) <a href="DeveloperCodingGuideline.html">Next</a></p>
+<hr />
+<h1 id="commit-code">Commit Code</h1>
+<p><em>Please do not send patches!</em> Use a pull request. In the past patches proved to be very unreliable. Either they conflicted with the moving forward state of the repository or there where some line break quirks between Windows and Linux. </p>
+<p>Anyway a pull request is a much cleaner way for you to develop your feature. And for us to review and merge the request.</p>
+<h2 id="pull-request">Pull Request</h2>
+<p>BitBucket offers you to fork the QMapShack repository. By that you have your own repository and you can do whatever you want to do. There is also a function to keep your fork in sync with the main repository. Once you are done and you think the stuff should really go into the main repository, you can start a pull request. </p>
+<p>This request will be reviewed. Maybe it needs a few fixes. Anyway, if the code has been reviewed and obviously does not break anything, it will be merged into the main repository. </p>
+<hr />
+<p><a href="DocFaq.html">Prev</a> (Frequently Asked Questions) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Coding Guideline) <a href="DeveloperCodingGuideline.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DeveloperCommitCode.md b/doc/DeveloperCommitCode.md
new file mode 100644
index 0000000..b6fba81
--- /dev/null
+++ b/doc/DeveloperCommitCode.md
@@ -0,0 +1,19 @@
+[Prev](DocPlayground) (Playground - start your new Wiki page) | [Home](Home) | [Manual](DocMain) | (Coding Guideline) [Next](DeveloperCodingGuideline)
+- - -
+[TOC]
+- - -
+
+# Commit Code #
+
+*Please do not send patches!* Use a pull request. In the past patches proved to be very unreliable. Either they conflicted with the moving forward state of the repository or there where some line break quirks between Windows and Linux. 
+
+Anyway a pull request is a much cleaner way for you to develop your feature. And for us to review and merge the request.
+
+## Pull Request
+
+BitBucket offers you to fork the QMapShack repository. By that you have your own repository and you can do whatever you want to do. There is also a function to keep your fork in sync with the main repository. Once you are done and you think the stuff should really go into the main repository, you can start a pull request. 
+
+This request will be reviewed. Maybe it needs a few fixes. Anyway, if the code has been reviewed and obviously does not break anything, it will be merged into the main repository. 
+
+- - -
+[Prev](DocPlayground) (Playground - start your new Wiki page) | [Home](Home) | [Manual](DocMain) | (Coding Guideline) [Next](DeveloperCodingGuideline)
diff --git a/doc/DeveloperTranslate.html b/doc/DeveloperTranslate.html
new file mode 100644
index 0000000..553ad19
--- /dev/null
+++ b/doc/DeveloperTranslate.html
@@ -0,0 +1,44 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="BuildWindowsVisualStudio.html">Prev</a> (Compile Instructions for Windows) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
+<hr />
+<h1 id="howto-enabledisable-source-translations-extraction">HOWTO enable/disable source translations extraction</h1>
+<p>We now have the ability to choose when to update (extract) the
+translations from the sources files within CMake. It’s controlled by the <code>UPDATE_TRANSLATIONS</code> CMake command line option. It defaults to <code>OFF</code>. Translations are always compiled (.ts to .qm)</p>
+<p>To update the translations just set the CMake command line option <code>UPDATE_TRANSLATIONS</code> to <code>ON</code>. E.g.: </p>
+<div class="codehilite"><pre><span class="err">cmake</span> <span class="err">-DUPDATE_TRANSLATIONS=ON</span> <span class="err">..</span>
+<span class="err">make</span>
+</pre></div>
+
+
+<p>The translations are extracted and also compiled. To return to the compilation only mode just set the <code>UPDATE_TRANSLATIONS</code> option to <code>OFF</code>. E.g.:</p>
+<div class="codehilite"><pre><span class="err">cmake</span> <span class="err">-DCMAKE_UPDATE_TRANSLATIONS=OFF</span> <span class="err">..</span>
+</pre></div>
+
+
+<p><strong>Warning</strong>: For all other generators than Makefile: When <code>UPDATE_TRANSLATIONS</code> is enabled a clean command will also clean the generated .ts files. So, after extracting the translations sources it’s advisable to set <code>UPDATE_TRANSLATIOS</code> to <code>OFF</code> right away.</p>
+<h1 id="howto-translate-qmapshackdesktop-unix-like-only">HOWTO translate qmapshack.desktop (UNIX like only)</h1>
+<p>The qmapshack.desktop file contains the info that appears in the panel menus. It can also be translated. The process is different from the .ts files tough. Let’s say we want to localize it to German (de):</p>
+<ul>
+<li>Create an <code>qmapashack_de.desktop</code> in the src/locale directory with the following contents:</li>
+</ul>
+<div class="codehilite"><pre><span class="cp">#Translations</span>
+<span class="n">Name</span><span class="p">[</span><span class="n">de</span><span class="p">]</span><span class="o">=</span><span class="n">QMapShack</span>
+<span class="n">GenericName</span><span class="p">[</span><span class="n">de</span><span class="p">]</span><span class="o">=</span><span class="n">GPS</span> <span class="n">Daten</span><span class="o">-</span> <span class="n">und</span> <span class="n">Kartenverwaltung</span>
+</pre></div>
+
+
+<ul>
+<li>The reference (English) strings are at <code>src/qmapshack.desktop.in</code>:</li>
+</ul>
+<div class="codehilite"><pre><span class="n">Name</span><span class="o">=</span><span class="n">QMapShack</span>
+<span class="n">GenericName</span><span class="o">=</span><span class="n">GPS</span> <span class="n">device</span> <span class="n">mapping</span> <span class="n">utility</span>
+</pre></div>
+
+
+<ul>
+<li>To translate it to other language change the <code>de</code> in the filename and in the file itself to the language code you are translating for.</li>
+</ul>
+<hr />
+<p><a href="BuildWindowsVisualStudio.html">Prev</a> (Compile Instructions for Windows) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
\ No newline at end of file
diff --git a/doc/DeveloperTranslate.md b/doc/DeveloperTranslate.md
new file mode 100644
index 0000000..483e17d
--- /dev/null
+++ b/doc/DeveloperTranslate.md
@@ -0,0 +1,44 @@
+[Prev](BuildWindowsVisualStudio) (Compile Instructions for Windows) | [Home](Home) | [Manual](DocMain) | () Next
+- - -
+[TOC]
+- - -
+
+# HOWTO enable/disable source translations extraction #
+We now have the ability to choose when to update (extract) the
+translations from the sources files within CMake. It's controlled by the `UPDATE_TRANSLATIONS` CMake command line option. It defaults to `OFF`. Translations are always compiled (.ts to .qm)
+    
+To update the translations just set the CMake command line option `UPDATE_TRANSLATIONS` to `ON`. E.g.: 
+```
+#!cmake
+cmake -DUPDATE_TRANSLATIONS=ON ..
+make
+
+```
+The translations are extracted and also compiled. To return to the compilation only mode just set the `UPDATE_TRANSLATIONS` option to `OFF`. E.g.:
+
+```
+#!cmake
+cmake -DCMAKE_UPDATE_TRANSLATIONS=OFF ..
+```
+    
+**Warning**: For all other generators than Makefile: When `UPDATE_TRANSLATIONS` is enabled a clean command will also clean the generated .ts files. So, after extracting the translations sources it's advisable to set `UPDATE_TRANSLATIOS` to `OFF` right away.
+
+# HOWTO translate qmapshack.desktop (UNIX like only) #
+The qmapshack.desktop file contains the info that appears in the panel menus. It can also be translated. The process is different from the .ts files tough. Let's say we want to localize it to German (de):
+
+* Create an `qmapashack_de.desktop` in the src/locale directory with the following contents:
+
+```
+#Translations
+Name[de]=QMapShack
+GenericName[de]=GPS Daten- und Kartenverwaltung
+```
+* The reference (English) strings are at `src/qmapshack.desktop.in`:
+```
+Name=QMapShack
+GenericName=GPS device mapping utility
+```
+* To translate it to other language change the `de` in the filename and in the file itself to the language code you are translating for.
+
+- - -
+[Prev](BuildWindowsVisualStudio) (Compile Instructions for Windows) | [Home](Home) | [Manual](DocMain) | () Next
diff --git a/doc/DocBasicsMapDem.html b/doc/DocBasicsMapDem.html
new file mode 100644
index 0000000..bded9a2
--- /dev/null
+++ b/doc/DocBasicsMapDem.html
@@ -0,0 +1,214 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocInstallMapDem.html">Prev</a> (Install Maps & DEM Data) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Control maps and DEM files) <a href="DocControlMapDem.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#basic-knowledge-about-maps-and-dem-files">Basic knowledge about maps and DEM files</a><ul>
+<li><a href="#vector-maps">Vector Maps</a></li>
+<li><a href="#raster-maps">Raster Maps</a></li>
+<li><a href="#online-maps">Online Maps</a></li>
+<li><a href="#dem-files">DEM Files</a></li>
+<li><a href="#projection-and-scaling">Projection and Scaling</a></li>
+<li><a href="#gdal-vrt-maps">GDAL *.vrt Maps</a></li>
+<li><a href="#wmts-maps">WMTS Maps</a></li>
+<li><a href="#tms-maps">TMS Maps</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<hr />
+<h1 id="basic-knowledge-about-maps-and-dem-files">Basic knowledge about maps and DEM files</h1>
+<p>QMapShack supports the following map formats:</p>
+<h3 id="vector-maps">Vector Maps</h3>
+<table>
+<thead>
+<tr>
+<th>Ext.</th>
+<th>Comment</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>.img</td>
+<td>Garmin Map Image. This must be the same file as used on the devices. A collection with a *tdb file and several *img files won’t do.</td>
+</tr>
+</tbody>
+</table>
+<h3 id="raster-maps">Raster Maps</h3>
+<table>
+<thead>
+<tr>
+<th>Ext.</th>
+<th>Comment</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>*.vrt</td>
+<td>GDAL Virtual File. This is a wrapper format for all files supported by GDAL. (see details below)</td>
+</tr>
+<tr>
+<td>*.jnx</td>
+<td>Garmin Birds Eye.</td>
+</tr>
+<tr>
+<td>*.rmap</td>
+<td>CompeGPS Map Container. Just a very reduced feature set is supported. The tile format must be JPEG. The projection can be Mercator or Gauss Krueger 4/3</td>
+</tr>
+</tbody>
+</table>
+<h3 id="online-maps">Online Maps</h3>
+<table>
+<thead>
+<tr>
+<th>Ext.</th>
+<th>Comment</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>*.wmts</td>
+<td>The WMTS server’s WMTSCapabilities.xml sheet renamed to a unique name. (see details below)</td>
+</tr>
+<tr>
+<td>*.tms</td>
+<td>This is a small XML file to define all data needed to access TMS serves. (see details below)</td>
+</tr>
+</tbody>
+</table>
+<h3 id="dem-files">DEM Files</h3>
+<table>
+<thead>
+<tr>
+<th>Ext.</th>
+<th>Comment</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>*.vrt</td>
+<td>GDAL Virtual File. This is a wrapper format for all files supported by GDAL. (see details below)</td>
+</tr>
+</tbody>
+</table>
+<h2 id="projection-and-scaling">Projection and Scaling</h2>
+<p>The default basic projection used by QMapShack is Mercator. The geographic datum is WGS84. However you can use maps with different projections and datums as QMapShack will re-project them on-the-fly. The same applies to the scale. 
+QMapShack uses a fixed logarithmic scale. All maps will be re-scaled to this scale on-the-fly. </p>
+<p>It is also possible to change the basic projection via “View->Setup Map Workspace”.</p>
+<h2 id="gdal-vrt-maps">GDAL *.vrt Maps</h2>
+<p>All raster maps handled by GDAL have to be wrapped by a virtual map. You can do this with <em>gdalbuildvrt</em>. 
+A virtual map can contain one or several map files (you can replace *.tif with any other extension supported by GDAL, e.g. *.hgt).</p>
+<pre class="codehilite"><code>gdalbuildvrt My_Map_Name.vrt path1/file1.tif path2/file2.tif</code></pre>
+
+
+<p>If you have a lot of files you can use wildcards:</p>
+<pre class="codehilite"><code>gdalbuildvrt My_Map_Name.vrt path1/*.tif</code></pre>
+
+
+<p>If you use the wacky console of Windows you have to do this in two steps:</p>
+<pre class="codehilite"><code>for %f in (*.tif) DO echo %f >> hgt_list.txt
+gdalbuildvrtMy_Map_Name.vrt -input_file_list hgt_list.txt</code></pre>
+
+
+<p>You can define a no data value, too. This is quite useful for DEM data that does not cover a complete rectangular area:</p>
+<pre class="codehilite"><code>gdalbuildvrt -vrtnodata 32767  ASTER_GDEM2_Europe.vrt europe/*.tif</code></pre>
+
+
+<p><strong>Important:</strong> All files must have the same color mode and the same projection/datum/scaling.</p>
+<p>If the files are large it will take a lot of memory and time to display them in the outer zoom levels. 
+You might consider to use gdaladdo to add overview levels to the files. </p>
+<pre class="codehilite"><code>gdaladdo My_Map_Name.vrt 2 4 8 16</code></pre>
+
+
+<p>This will create a file <em>My_Map_Name.vrt.ovr</em> next to <em>My_Map_Name.vrt</em> containing scaled overviews by factor 
+<em>2 4 8 16</em>.</p>
+<h2 id="wmts-maps">WMTS Maps</h2>
+<p>A Web Map Tile Service (WMTS) is a standard protocol for serving pre-rendered georeferenced map tiles over the Internet (says Wikipedia). The capabilities of a WMTS server are defines in a XML document named WMTSCapabilities.xml. It can be found on the server:</p>
+<pre class="codehilite"><code>http://<server_address>/<optional_path>/1.0.0/WMTSCapabilities.xml</code></pre>
+
+
+<p>For example there is a variety of free world wide WMTS map from <a href="http://services.arcgisonline.com/arcgis/rest/services">Arcgis</a>. The capability sheet of the topo map can be found at:</p>
+<pre class="codehilite"><code>http://services.arcgisonline.com/arcgis/rest/services/World_Topo_Map/MapServer/WMTS/1.0.0/WMTSCapabilities.xml</code></pre>
+
+
+<p>Or satellite images:</p>
+<pre class="codehilite"><code>http://services.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/WMTS/1.0.0/WMTSCapabilities.xml</code></pre>
+
+
+<p>To use the map you download the XML file and rename it, let’s say: <em>World_Topo.wmts</em>. Move the file into QMapShack’s map path and you can use the map online.</p>
+<p>For some servers, the “capabilities” XML sheet may need some hand tuning (comparing with the above working ones from Arcgis may greatly help in fixing it). For example, there is some detailed info about French IGN WMTS server in the <a href="DocMapsTipsTricks.html">“maps tips & tricks”</a> section.</p>
+<h2 id="tms-maps">TMS Maps</h2>
+<p>To access TMS servers you have to define a few properties via XML file.  This is an example for definition file with two layers.</p>
+<div class="codehilite"><pre><span class="nt"><TMS></span>
+ <span class="nt"><Title></span>OSM D-Land TK 50<span class="nt"></Title></span>
+ <span class="nt"><MinZoomLevel></span>3<span class="nt"></MinZoomLevel></span>
+ <span class="nt"><MaxZoomLevel></span>18<span class="nt"></MaxZoomLevel></span>
+ <span class="nt"><Layer</span> <span class="na">idx=</span><span class="s">"0"</span><span class="nt">></span>
+  <span class="nt"><Title></span>Open Topo Map<span class="nt"></Title></span>
+  <span class="nt"><ServerUrl></span>http://a.tile.opentopomap.org/%1/%2/%3.png<span class="nt"></ServerUrl></span>
+  <span class="nt"><MinZoomLevel></span>3<span class="nt"></MinZoomLevel></span>
+  <span class="nt"><MaxZoomLevel></span>11<span class="nt"></MaxZoomLevel></span>
+ <span class="nt"></Layer></span>
+ <span class="nt"><Layer</span> <span class="na">idx=</span><span class="s">"1"</span><span class="nt">></span>
+  <span class="nt"><Title></span>Trails<span class="nt"></Title></span>
+  <span class="nt"><ServerUrl></span>http://tile.waymarkedtrails.org/hiking/%1/%2/%3.png<span class="nt"></ServerUrl></span>
+  <span class="nt"><MinZoomLevel></span>3<span class="nt"></MinZoomLevel></span>
+  <span class="nt"><MaxZoomLevel></span>9<span class="nt"></MaxZoomLevel></span>
+ <span class="nt"></Layer></span>
+ <span class="nt"><RawHeader></span>
+   <span class="nt"><Value</span> <span class="na">name=</span><span class="s">"User-Agent"</span><span class="nt">></span>Whatever<span class="nt"></Value></span>
+ <span class="nt"></RawHeader></span>
+ <span class="nt"><Copyright></span>Map data: (c) OpenStreetMap contributors, ODbL | Rendering: (c) OpenTopoMap, CC-BY-SA | Trails by tile.waymarkedtrails.org <span class="nt"></Copyright></span>
+<span class="nt"></TMS></span>
+</pre></div>
+
+
+<p><strong><Title></strong> This tag is currently of no use and just for backward compatibility to QLandkarte</p>
+<p><strong><Copyright></strong> A copyright notice for the maps displayed.</p>
+<p><strong><RawHeader></strong> An optional list of name/value pairs to be inserted into the HTTP header of the request. Some servers want to see special value here.</p>
+<p><strong><MinZoomLevel></strong> Can be 0..17. 0 is the most detailed level. Below this level tiles from the specified level will be taken and scaled.</p>
+<p><strong><MaxZoomLevel></strong> Can be 1..18. 1 is the most detailed level. Above this level the map will not be drawn.</p>
+<p>MinZoomLevel and MaxZoomLevel will be taken as default for the layers. <em>Note</em>: zoom level = 18 - map level</p>
+<p><strong><Layer idx=”0”></strong> Specifies a layer. <strong>idx</strong> gives the order to display layers. 0 is first.</p>
+<p>On each layer you can define:</p>
+<p><strong><Title></strong> A name for the layer. If no title is given “Layer” with the index number is used.</p>
+<p><strong><ServerUrl></strong> This is the servers URL with placeholders. %1 is for the map level (z), %2 for the column (x) and %3 for the row (y). If the URL contains special characters you have to escape them according to the HTML specification, e.g. & becomes &amp;</p>
+<p><strong><MinZoomLevel></strong> Override the default MinZoomLevel for this layer. Can be 0..17. 0 is the most detailed level. Below this level tiles from the specified level will be taken and scaled.</p>
+<p><strong><MaxZoomLevel></strong> Override the default MaxZoomLevel for this layer. Can be 1..18. 1 is the most detailed level. Above this level the map will not be drawn.</p>
+<p>Next to the normal TMS naming scheme for URLs the URL can be formed by a bit of JavaScript. Here is an example for Microsoft’s Bing:</p>
+<div class="codehilite"><pre><span class="nt"><TMS></span>
+<span class="nt"><Title></span>Bing<span class="nt"></Title></span>
+<span class="nt"><Layer</span> <span class="na">idx=</span><span class="s">"0"</span><span class="nt">></span>
+<span class="nt"><Script></span><span class="cp"><![CDATA[</span>
+<span class="cp">(</span>
+<span class="cp">function convert(z1, x1, y1)</span>
+<span class="cp">{</span>
+<span class="cp">  serverpart = 0</span>
+<span class="cp">  serverpart = (serverpart + 1) % 4;</span>
+<span class="cp">  function encodeQuadTree(zoom, tilex, tiley)</span>
+<span class="cp">  {</span>
+<span class="cp">    var tileNum = []</span>
+<span class="cp">    for (var i = zoom - 1; i >= 0; i--)</span>
+<span class="cp">    {</span>
+<span class="cp">      var num = (tilex % 2) | ((tiley % 2) << 1);</span>
+<span class="cp">      tileNum[i] = new String(num);</span>
+<span class="cp">      tilex >>= 1;</span>
+<span class="cp">      tiley >>= 1;</span>
+<span class="cp">    }</span>
+<span class="cp">    return tileNum.join("");</span>
+<span class="cp">  }</span>
+<span class="cp">  return "http://ecn.t" + serverpart + ".tiles.virtualearth.net/tiles/a" + encodeQuadTree(z1,x1,y1) + ".jpeg?g=1036";</span>
+<span class="cp">}</span>
+<span class="cp">)</span>
+<span class="cp">]]></span><span class="nt"></Script></span>
+<span class="nt"></Layer></span>
+<span class="nt"><Copyright></span>Microsoft - Bing<span class="nt"></Copyright></span>
+<span class="nt"></TMS></span>
+</pre></div>
+
+
+<p>Instead of a <strong><ServerUrl></strong> the layer has a <strong><Script></strong> tag with JavaScript code.</p>
+<hr />
+<p><a href="DocInstallMapDem.html">Prev</a> (Install Maps & DEM Data) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Control maps and DEM files) <a href="DocControlMapDem.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocBasicsMapDem.md b/doc/DocBasicsMapDem.md
new file mode 100644
index 0000000..6677c4e
--- /dev/null
+++ b/doc/DocBasicsMapDem.md
@@ -0,0 +1,184 @@
+[Prev](DocInstallMapDem) (Install Maps & DEM Data) | [Home](Home) | [Manual](DocMain) | (Control maps and DEM files) [Next](DocControlMapDem)
+- - -
+[TOC]
+- - -
+
+# Basic knowledge about maps and DEM files
+
+QMapShack supports the following map formats:
+
+### Vector Maps
+
+ Ext.   | Comment
+--------|-------------
+.img    | Garmin Map Image. This must be the same file as used on the devices. A collection with a \*tdb file and several \*img files won't do.
+
+### Raster Maps
+
+ Ext.   | Comment
+--------|-------------
+*.vrt   | GDAL Virtual File. This is a wrapper format for all files supported by GDAL. (see details below)
+*.jnx   | Garmin Birds Eye.
+*.rmap  | CompeGPS Map Container. Just a very reduced feature set is supported. The tile format must be JPEG. The projection can be Mercator or Gauss Krueger 4/3
+
+### Online Maps
+
+ Ext.   | Comment
+--------|-------------
+*.wmts | The WMTS server's WMTSCapabilities.xml sheet renamed to a unique name. (see details below)
+*.tms | This is a small XML file to define all data needed to access TMS serves. (see details below)
+
+### DEM Files
+ 
+ Ext.   | Comment
+--------|-------------
+*.vrt | GDAL Virtual File. This is a wrapper format for all files supported by GDAL. (see details below)
+
+
+## Projection and Scaling
+
+The default basic projection used by QMapShack is Mercator. The geographic datum is WGS84. However you can use maps with different projections and datums as QMapShack will re-project them on-the-fly. The same applies to the scale. 
+QMapShack uses a fixed logarithmic scale. All maps will be re-scaled to this scale on-the-fly. 
+
+It is also possible to change the basic projection via "View->Setup Map Workspace".
+
+## GDAL *.vrt Maps
+
+All raster maps handled by GDAL have to be wrapped by a virtual map. You can do this with _gdalbuildvrt_. 
+A virtual map can contain one or several map files (you can replace \*.tif with any other extension supported by GDAL, e.g. \*.hgt).
+
+    gdalbuildvrt My_Map_Name.vrt path1/file1.tif path2/file2.tif
+
+If you have a lot of files you can use wildcards:
+
+    gdalbuildvrt My_Map_Name.vrt path1/*.tif
+
+If you use the wacky console of Windows you have to do this in two steps:
+
+    for %f in (*.tif) DO echo %f >> hgt_list.txt
+    gdalbuildvrtMy_Map_Name.vrt -input_file_list hgt_list.txt
+
+You can define a no data value, too. This is quite useful for DEM data that does not cover a complete rectangular area:
+
+    gdalbuildvrt -vrtnodata 32767  ASTER_GDEM2_Europe.vrt europe/*.tif
+
+**Important:** All files must have the same color mode and the same projection/datum/scaling.
+
+If the files are large it will take a lot of memory and time to display them in the outer zoom levels. 
+You might consider to use gdaladdo to add overview levels to the files. 
+
+    gdaladdo My_Map_Name.vrt 2 4 8 16
+
+This will create a file _My_Map_Name.vrt.ovr_ next to _My_Map_Name.vrt_ containing scaled overviews by factor 
+_2 4 8 16_.
+
+
+## WMTS Maps
+
+A Web Map Tile Service (WMTS) is a standard protocol for serving pre-rendered georeferenced map tiles over the Internet (says Wikipedia). The capabilities of a WMTS server are defines in a XML document named WMTSCapabilities.xml. It can be found on the server:
+
+    http://<server_address>/<optional_path>/1.0.0/WMTSCapabilities.xml
+
+For example there is a variety of free world wide WMTS map from [Arcgis](http://services.arcgisonline.com/arcgis/rest/services). The capability sheet of the topo map can be found at:
+
+    http://services.arcgisonline.com/arcgis/rest/services/World_Topo_Map/MapServer/WMTS/1.0.0/WMTSCapabilities.xml
+
+Or satellite images:
+
+    http://services.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/WMTS/1.0.0/WMTSCapabilities.xml
+
+To use the map you download the XML file and rename it, let's say: _World_Topo.wmts_. Move the file into QMapShack's map path and you can use the map online.
+
+For some servers, the "capabilities" XML sheet may need some hand tuning (comparing with the above working ones from Arcgis may greatly help in fixing it). For example, there is some detailed info about French IGN WMTS server in the ["maps tips & tricks"](DocMapsTipsTricks) section.
+
+## TMS Maps
+
+To access TMS servers you have to define a few properties via XML file.  This is an example for definition file with two layers.
+
+```
+#!xml
+<TMS>
+ <Title>OSM D-Land TK 50</Title>
+ <MinZoomLevel>3</MinZoomLevel>
+ <MaxZoomLevel>18</MaxZoomLevel>
+ <Layer idx="0">
+  <Title>Open Topo Map</Title>
+  <ServerUrl>http://a.tile.opentopomap.org/%1/%2/%3.png</ServerUrl>
+  <MinZoomLevel>3</MinZoomLevel>
+  <MaxZoomLevel>11</MaxZoomLevel>
+ </Layer>
+ <Layer idx="1">
+  <Title>Trails</Title>
+  <ServerUrl>http://tile.waymarkedtrails.org/hiking/%1/%2/%3.png</ServerUrl>
+  <MinZoomLevel>3</MinZoomLevel>
+  <MaxZoomLevel>9</MaxZoomLevel>
+ </Layer>
+ <RawHeader>
+   <Value name="User-Agent">Whatever</Value>
+ </RawHeader>
+ <Copyright>Map data: (c) OpenStreetMap contributors, ODbL | Rendering: (c) OpenTopoMap, CC-BY-SA | Trails by tile.waymarkedtrails.org </Copyright>
+</TMS>
+```
+**<Title>** This tag is currently of no use and just for backward compatibility to QLandkarte
+
+**<Copyright>** A copyright notice for the maps displayed.
+
+**<RawHeader>** An optional list of name/value pairs to be inserted into the HTTP header of the request. Some servers want to see special value here.
+
+**<MinZoomLevel>** Can be 0..17. 0 is the most detailed level. Below this level tiles from the specified level will be taken and scaled.
+
+**<MaxZoomLevel>** Can be 1..18. 1 is the most detailed level. Above this level the map will not be drawn.
+
+MinZoomLevel and MaxZoomLevel will be taken as default for the layers. _Note_: zoom level = 18 - map level
+
+**<Layer idx="0">** Specifies a layer. **idx** gives the order to display layers. 0 is first.
+
+On each layer you can define:
+
+**<Title>** A name for the layer. If no title is given "Layer" with the index number is used.
+  
+**<ServerUrl>** This is the servers URL with placeholders. %1 is for the map level (z), %2 for the column (x) and %3 for the row (y). If the URL contains special characters you have to escape them according to the HTML specification, e.g. & becomes &
+
+**<MinZoomLevel>** Override the default MinZoomLevel for this layer. Can be 0..17. 0 is the most detailed level. Below this level tiles from the specified level will be taken and scaled.
+
+**<MaxZoomLevel>** Override the default MaxZoomLevel for this layer. Can be 1..18. 1 is the most detailed level. Above this level the map will not be drawn.
+
+Next to the normal TMS naming scheme for URLs the URL can be formed by a bit of JavaScript. Here is an example for Microsoft's Bing:
+
+```
+#!xml
+<TMS>
+<Title>Bing</Title>
+<Layer idx="0">
+<Script><![CDATA[
+(
+function convert(z1, x1, y1)
+{
+  serverpart = 0
+  serverpart = (serverpart + 1) % 4;
+  function encodeQuadTree(zoom, tilex, tiley)
+  {
+    var tileNum = []
+    for (var i = zoom - 1; i >= 0; i--)
+    {
+      var num = (tilex % 2) | ((tiley % 2) << 1);
+      tileNum[i] = new String(num);
+      tilex >>= 1;
+      tiley >>= 1;
+    }
+    return tileNum.join("");
+  }
+  return "http://ecn.t" + serverpart + ".tiles.virtualearth.net/tiles/a" + encodeQuadTree(z1,x1,y1) + ".jpeg?g=1036";
+}
+)
+]]></Script>
+</Layer>
+<Copyright>Microsoft - Bing</Copyright>
+</TMS>
+```
+Instead of a **<ServerUrl>** the layer has a **<Script>** tag with JavaScript code.
+
+
+
+- - -
+[Prev](DocInstallMapDem) (Install Maps & DEM Data) | [Home](Home) | [Manual](DocMain) | (Control maps and DEM files) [Next](DocControlMapDem)
diff --git a/doc/DocCmdOptions.html b/doc/DocCmdOptions.html
new file mode 100644
index 0000000..d2b6702
--- /dev/null
+++ b/doc/DocCmdOptions.html
@@ -0,0 +1,64 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocGettingStarted.html">Prev</a> (Getting started) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Maps & Digital Elevation Model (DEM)) <a href="DocInstallMapDem.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#list-of-options">List of options</a></li>
+</ul>
+</div>
+<h1 id="list-of-options">List of options</h1>
+<table>
+<thead>
+<tr>
+<th align="center">Switch</th>
+<th align="center">Parameter</th>
+<th>Comment</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td align="center"><em>-d</em></td>
+<td align="center"></td>
+<td>enable debug output on the console (<em>stdout</em>, *nix only)</td>
+</tr>
+<tr>
+<td align="center"><em>-f</em></td>
+<td align="center"></td>
+<td>enable debug output and write it to the file <em>%temp%\org.qlandkarte.QMapShack.log</em> (Windows only).</td>
+</tr>
+<tr>
+<td align="center"><em>-c</em></td>
+<td align="center"><em><filename></em></td>
+<td>read/write the configuration from/to a configuration file.</td>
+</tr>
+</tbody>
+</table>
+<p>If you start the application without the <em>-c</em> option the configuration will be stored wherever your system stores application configurations otherwise it is stored in <em><filename></em> at the end of a QMapShack run.</p>
+<p>Remark for Windows users:</p>
+<p>There is no default configuration file. Instead, the default configuration is saved in the registry branch
+“HKCU\Software\QLandkarte\QMapShack”.</p>
+<p>If the configuration file does not yet exist then QMapShack is started with its default layout (configuration) shown at the top of this page and the configuration is written to the file at the end of the QMapShack run.</p>
+<p>The configuration file keeps information about</p>
+<ul>
+<li>
+<p>the databases used, </p>
+</li>
+<li>
+<p>the routing information used,</p>
+</li>
+<li>
+<p>the map views with their structure,</p>
+</li>
+<li>
+<p>other user interface properties.</p>
+</li>
+</ul>
+<p>Configuration files are standard INI-files and can be edited (be careful!).</p>
+<p>The <em>-c</em> option is pretty handy if you start QMapShack from a memory stick and want to take your
+configuration with you. </p>
+<p>It is handy too for the definition of a top level basic data structure. The user can define and use different configuration files and in doing so define separate data and map sets (e.g. referring to different countries).
+As a consequence QMapShack starts much faster due to the fact that less map data must be loaded.</p>
+<hr />
+<p><a href="DocGettingStarted.html">Prev</a> (Getting started) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Maps & Digital Elevation Model (DEM)) <a href="DocInstallMapDem.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocCmdOptions.md b/doc/DocCmdOptions.md
new file mode 100644
index 0000000..271b197
--- /dev/null
+++ b/doc/DocCmdOptions.md
@@ -0,0 +1,42 @@
+[Prev](DocGettingStarted) (Getting started) | [Home](Home) | [Manual](DocMain) | (Maps & Digital Elevation Model (DEM)) [Next](DocInstallMapDem)
+- - -
+[TOC]
+- - -
+
+# List of options
+
+| Switch | Parameter  | Comment                                        |
+|:------:|:----------:|------------------------------------------------|
+|*-d*    |            | enable debug output on the console (*stdout*, *nix only) |
+|*-f*    |            | enable debug output and write it to the file *%temp%\org.qlandkarte.QMapShack.log* (Windows only). |
+|*-c*    |*<filename>*| read/write the configuration from/to a configuration file.|
+ 
+If you start the application without the *-c* option the configuration will be stored wherever your system stores application configurations otherwise it is stored in *<filename>* at the end of a QMapShack run.
+
+Remark for Windows users:
+
+There is no default configuration file. Instead, the default configuration is saved in the registry branch
+"HKCU\Software\QLandkarte\QMapShack".
+
+If the configuration file does not yet exist then QMapShack is started with its default layout (configuration) shown at the top of this page and the configuration is written to the file at the end of the QMapShack run.
+ 
+The configuration file keeps information about
+
+* the databases used, 
+ 
+* the routing information used,
+
+* the map views with their structure,
+
+* other user interface properties.
+
+Configuration files are standard INI-files and can be edited (be careful!).
+
+The *-c* option is pretty handy if you start QMapShack from a memory stick and want to take your
+configuration with you. 
+
+It is handy too for the definition of a top level basic data structure. The user can define and use different configuration files and in doing so define separate data and map sets (e.g. referring to different countries).
+As a consequence QMapShack starts much faster due to the fact that less map data must be loaded.
+
+- - -
+[Prev](DocGettingStarted) (Getting started) | [Home](Home) | [Manual](DocMain) | (Maps & Digital Elevation Model (DEM)) [Next](DocInstallMapDem)
diff --git a/doc/DocControlMapDem.html b/doc/DocControlMapDem.html
new file mode 100644
index 0000000..f25e7ac
--- /dev/null
+++ b/doc/DocControlMapDem.html
@@ -0,0 +1,101 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocBasicsMapDem.html">Prev</a> (Basics about maps and DEM files) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Maps: Tips and Tricks) <a href="DocMapsTipsTricks.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#control-of-maps-and-dem-files">Control of Maps and DEM Files</a><ul>
+<li><a href="#draw-order">Draw Order</a></li>
+<li><a href="#map-properties">Map Properties</a><ul>
+<li><a href="#workspace">Workspace</a></li>
+<li><a href="#map-and-dem">Map and DEM</a></li>
+<li><a href="#vector-maps">Vector Maps</a></li>
+<li><a href="#online-maps">Online Maps</a></li>
+<li><a href="#dem-files">DEM Files</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="control-of-maps-and-dem-files">Control of Maps and DEM Files</h1>
+<p>The render engine of QMapShack is quite flexible and lets you create map stacks with
+maps of different binary geographic datum, projection and binary format. Additionally 
+it adds elevation information to the displayed maps if DEM data is loaded. The DEM data 
+is completely independent from the loaded map. However the same concepts as for maps 
+apply.</p>
+<p>By opening additional workspaces you can have several different map stacks. This allows 
+you to quickly view your data on different maps.</p>
+<h2 id="draw-order">Draw Order</h2>
+<ul>
+<li>
+<p>Maps are handled by the topmost item fist, down to the bottom item last. Thus 
+the item at the bottom of the list will overlay all other items</p>
+</li>
+<li>
+<p>DEM files are handled by the topmost item fist, down to the bottom item last. Doing
+an elevation data query the first match will stop the query. Thus the topmost item wins. 
+Doing hill shading or similar the item at the bottom will overlay all other items.</p>
+</li>
+<li>
+<p>The draw order can be changed by moving the item in the list via drag-n-drop.</p>
+</li>
+</ul>
+<p><img alt="Alt text" src="images/DocControlMapDem/maproom1.png" /> <img alt="Alt text" src="images/DocControlMapDem/maproom2.png" /></p>
+<h2 id="map-properties">Map Properties</h2>
+<h3 id="workspace">Workspace</h3>
+<p>Some properties are set globally for all workspaces. You find them below the <em>View</em> menu. </p>
+<p><img alt="Alt text" src="images/DocControlMapDem/maproom3.png" /></p>
+<ul>
+<li><strong>Add Map View</strong> Add a new <em>View</em> to display your data over a selection of maps. <em>Hint:</em> The default name of a view can be edited in a configuration file.</li>
+<li><strong>Clone Map View</strong> Clone the current view.</li>
+</ul>
+<p>The properties for the views:</p>
+<ul>
+<li><strong>Show Scale</strong> A scalebar will be drawn in the right bottom corner of the map.</li>
+<li><strong>Show Grid</strong>  A grid is drawn over the map. To setup the grid for the current visible workspace select <strong>Setup Grid</strong></li>
+<li><strong>POI Text</strong>   This applies to vector maps only. If inactive all labels on point of interest are not drawn.</li>
+<li><strong>Map Tool Tip</strong> This applies to vector maps only. If active a tool tip with information about the element below the mouse cursor is displayed. If the map does not have any information at the position of the mouse cursor then nothing is displayed.</li>
+<li><strong>Night / Day </strong> This applies to vector maps only. Switch between night and day color scheme. This must be defined within the map, else nothing will happen.</li>
+</ul>
+<p>Not really map related but workspace related:</p>
+<ul>
+<li><strong>Flip Mouse Wheel</strong> This will change the zoom in and zoom out direction.</li>
+<li><strong>Ext. Profile</strong> Switch on the extended profile view in an own window.</li>
+<li><strong>Setup Map Font</strong> This will change the font used for any text drawn on the map.</li>
+<li><strong>Setup Units</strong> Change the unit system to metric, imperial or nautical</li>
+<li><strong>Setup Grid</strong> Setup the projection of the grid overlay.</li>
+<li><strong>Setup Map Workspace</strong> Setup the projection of the current workspace. The default is Mercator/WGS84.</li>
+<li><strong>Setup Time Zone</strong> Setup the current timezone or automatic time zone selection.</li>
+</ul>
+<h3 id="map-and-dem">Map and DEM</h3>
+<p>If you expand a map or DEM item you can see the  property setup of this item for the current workspace.</p>
+<p><img alt="Alt text" src="images/DocControlMapDem/maproom5.png" /></p>
+<ol>
+<li>
+<p>The slider on the top controls the opacity. </p>
+</li>
+<li>
+<p>With the bar and the two buttons you can control the range of scale the map is visible. The blue square on the bar indicates the actual scale. Zoom to the minimum scale you want to see the map and press the left button. Now zoom to the maximum scale to display the map and press the right button. The green bar will indicate the range of visibility now.</p>
+</li>
+</ol>
+<h3 id="vector-maps">Vector Maps</h3>
+<p>Vector maps have additional properties.</p>
+<p><img alt="Alt text" src="images/DocControlMapDem/maproom6.png" /></p>
+<p>Use the check boxes to control what major map elements are displayed. For example you can overlay your raster map with a vector map and display the points of interest only, to add more information to your map. </p>
+<h3 id="online-maps">Online Maps</h3>
+<p><img alt="Alt text" src="images/DocControlMapDem/maproom8.png" /></p>
+<ol>
+<li>The path to the tile cache. Each map has it’s own path. The default is  <em>“<home_dir>/.QMapShack/<map_file_name>”</em></li>
+<li>The maximum tile cache size.</li>
+<li>The maximum age of the tiles in the cache</li>
+<li>If the map has more than one layer you can enable/disable the layers</li>
+</ol>
+<h3 id="dem-files">DEM Files</h3>
+<p>DEM Files have additional properties.</p>
+<p><img alt="Alt text" src="images/DocControlMapDem/maproom7.png" /></p>
+<p><em>Hillshading</em> (1) will overlay the map with a gray shaded relief. You can fine tune the contrast of the hillshading with the slider (2). <em>Slope</em> (3) will overlay the map with a color pattern for certain ranges of slopes. The patter reflects the ranges defined by the so called <a href="http://www.alpenverein.de/bergsport/sicherheit/skitouren-schneeschuh-sicher-im-schnee/dav-snowcard_aid_10619.html">DAV Snow Card</a>. This is a scheme to evaluate the risk of a snow avalanc [...]
+<p><img alt="Alt text" src="images/DocControlMapDem/maproom10.png" /></p>
+<hr />
+<p><a href="DocBasicsMapDem.html">Prev</a> (Basics about maps and DEM files) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Maps: Tips and Tricks) <a href="DocMapsTipsTricks.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocControlMapDem.md b/doc/DocControlMapDem.md
new file mode 100644
index 0000000..d35cde2
--- /dev/null
+++ b/doc/DocControlMapDem.md
@@ -0,0 +1,98 @@
+[Prev](DocBasicsMapDem) (Basics about maps and DEM files) | [Home](Home) | [Manual](DocMain) | (Maps: Tips and Tricks) [Next](DocMapsTipsTricks)
+- - -
+[TOC]
+- - -
+
+# Control of Maps and DEM Files
+
+The render engine of QMapShack is quite flexible and lets you create map stacks with
+maps of different binary geographic datum, projection and binary format. Additionally 
+it adds elevation information to the displayed maps if DEM data is loaded. The DEM data 
+is completely independent from the loaded map. However the same concepts as for maps 
+apply.
+
+By opening additional workspaces you can have several different map stacks. This allows 
+you to quickly view your data on different maps.
+
+## Draw Order
+
+* Maps are handled by the topmost item fist, down to the bottom item last. Thus 
+the item at the bottom of the list will overlay all other items
+
+* DEM files are handled by the topmost item fist, down to the bottom item last. Doing
+an elevation data query the first match will stop the query. Thus the topmost item wins. 
+Doing hill shading or similar the item at the bottom will overlay all other items.
+
+* The draw order can be changed by moving the item in the list via drag-n-drop.
+
+![Alt text](images/DocControlMapDem/maproom1.png) ![Alt text](images/DocControlMapDem/maproom2.png)
+
+## Map Properties
+
+### Workspace
+
+Some properties are set globally for all workspaces. You find them below the _View_ menu. 
+
+![Alt text](images/DocControlMapDem/maproom3.png)
+
+* **Add Map View** Add a new _View_ to display your data over a selection of maps. *Hint:* The default name of a view can be edited in a configuration file.
+* **Clone Map View** Clone the current view.
+
+The properties for the views:
+
+* **Show Scale** A scalebar will be drawn in the right bottom corner of the map.
+* **Show Grid**  A grid is drawn over the map. To setup the grid for the current visible workspace select **Setup Grid**
+* **POI Text**   This applies to vector maps only. If inactive all labels on point of interest are not drawn.
+* **Map Tool Tip** This applies to vector maps only. If active a tool tip with information about the element below the mouse cursor is displayed. If the map does not have any information at the position of the mouse cursor then nothing is displayed.
+* **Night / Day ** This applies to vector maps only. Switch between night and day color scheme. This must be defined within the map, else nothing will happen.
+
+Not really map related but workspace related:
+
+* **Flip Mouse Wheel** This will change the zoom in and zoom out direction.
+* **Ext. Profile** Switch on the extended profile view in an own window.
+* **Setup Map Font** This will change the font used for any text drawn on the map.
+* **Setup Units** Change the unit system to metric, imperial or nautical
+* **Setup Grid** Setup the projection of the grid overlay.
+* **Setup Map Workspace** Setup the projection of the current workspace. The default is Mercator/WGS84.
+* **Setup Time Zone** Setup the current timezone or automatic time zone selection.
+
+### Map and DEM
+
+If you expand a map or DEM item you can see the  property setup of this item for the current workspace.
+
+![Alt text](images/DocControlMapDem/maproom5.png)
+
+1. The slider on the top controls the opacity. 
+
+2. With the bar and the two buttons you can control the range of scale the map is visible. The blue square on the bar indicates the actual scale. Zoom to the minimum scale you want to see the map and press the left button. Now zoom to the maximum scale to display the map and press the right button. The green bar will indicate the range of visibility now.
+
+### Vector Maps
+
+Vector maps have additional properties.
+
+![Alt text](images/DocControlMapDem/maproom6.png)
+
+Use the check boxes to control what major map elements are displayed. For example you can overlay your raster map with a vector map and display the points of interest only, to add more information to your map. 
+
+### Online Maps
+
+![Alt text](images/DocControlMapDem/maproom8.png)
+
+1. The path to the tile cache. Each map has it's own path. The default is  _"<home_dir>/.QMapShack/<map_file_name>"_
+2. The maximum tile cache size.
+3. The maximum age of the tiles in the cache
+4. If the map has more than one layer you can enable/disable the layers
+
+### DEM Files
+
+DEM Files have additional properties.
+
+![Alt text](images/DocControlMapDem/maproom7.png)
+
+_Hillshading_ (1) will overlay the map with a gray shaded relief. You can fine tune the contrast of the hillshading with the slider (2). _Slope_ (3) will overlay the map with a color pattern for certain ranges of slopes. The patter reflects the ranges defined by the so called [DAV Snow Card](http://www.alpenverein.de/bergsport/sicherheit/skitouren-schneeschuh-sicher-im-schnee/dav-snowcard_aid_10619.html). This is a scheme to evaluate the risk of a snow avalanche commonly used in the Euro [...]
+
+![Alt text](images/DocControlMapDem/maproom10.png)
+
+
+- - -
+[Prev](DocBasicsMapDem) (Basics about maps and DEM files) | [Home](Home) | [Manual](DocMain) | (Maps: Tips and Tricks) [Next](DocMapsTipsTricks)
diff --git a/doc/DocFaq.html b/doc/DocFaq.html
new file mode 100644
index 0000000..c66cae4
--- /dev/null
+++ b/doc/DocFaq.html
@@ -0,0 +1,198 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocGisDevices.html">Prev</a> (GPS Devices) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Commit Code) <a href="DeveloperCommitCode.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#frequently-asked-questions">Frequently Asked Questions</a><ul>
+<li><a href="#how-are-qms-data-items-organised">How are QMS data items organised?</a></li>
+<li><a href="#is-there-an-easy-way-to-select-all-the-contents-of-one-project-to-drag-them-into-another">Is there an easy way to “select all” the contents of one project to drag them into another?</a></li>
+<li><a href="#is-there-a-way-to-merge-projects-together">Is there a way to merge projects together?</a></li>
+<li><a href="#how-to-find-location-of-database-file-used-in-qmapshack">How to find location of database file used in QMapShack?</a></li>
+<li><a href="#is-there-a-possibility-to-display-small-roadstracks-in-a-vector-map-without-zooming-in-too-much">Is there a possibility to display small roads/tracks in a vector map without zooming in too much?</a></li>
+<li><a href="#is-there-a-possibility-to-choose-the-preferred-road-class-when-routing">Is there a possibility to choose the preferred road class when routing?</a></li>
+<li><a href="#can-i-run-several-qms-instances-at-the-same-time">Can I run several QMS instances at the same time?</a></li>
+<li><a href="#user-relevant-qmapshack-directories-windows-version">User-relevant QMapShack directories (Windows version)</a></li>
+<li><a href="#what-is-the-maximum-routino-databases-file-size-that-can-be-handled-by-the-qmapshack-windows-version">What is the maximum Routino databases file size that can be handled by the QMapShack Windows version?</a></li>
+<li><a href="#how-to-use-russian-military-and-similar-raster-maps-with-qmapshack">How to use Russian military and similar raster maps with QMapShack?</a></li>
+<li><a href="#why-is-a-raster-map-not-displayed">Why is a raster map not displayed?</a></li>
+<li><a href="#how-to-edit-the-elevation-of-a-track-point-manually">How to edit the elevation of a track point manually?</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="frequently-asked-questions">Frequently Asked Questions</h1>
+<hr />
+<h2 id="how-are-qms-data-items-organised">How are QMS data items organised?</h2>
+<p>(inspired by and partially copied from <a href="http://permalink.gmane.org/gmane.comp.gis.qlandkartegt.user/2744">QMS newsgroup</a>)</p>
+<p>In the following <strong>data item</strong> means <strong>waypoint</strong>, <strong>track</strong>, <strong>route</strong>, or <strong>area</strong>.</p>
+<p>There are 3 physical storage types used in QMS for saving data items:</p>
+<ul>
+<li><code>GPX</code> files (common data format)</li>
+<li><code>QMS</code> files (proprietary efficient binary data format)</li>
+<li><code>SQLite</code> or <code>MySQL</code> databases</li>
+</ul>
+<p>If selected in the menu <code>Projects - Setup Workspace</code> data is saved automatically at the end of a QMS run and 
+regularly after some user-defined time interval.
+A backup of databases is recommended from time to time.</p>
+<p>All QMS data items belong to a <strong>project</strong>. </p>
+<p>In the case of a <code>GPX</code> or <code>QMS</code> file all data in the file belong to one project
+which can be loaded into the QMS workspace and saved from here to the file.</p>
+<p>QMS allows the use of one or more databases. </p>
+<p>Each database consists of a tree. Each node of the tree is either a <strong>folder</strong> or a <strong>data item</strong>.
+Nodes on the highest level must be folders.</p>
+<p>There are 3 types of folders:</p>
+<ul>
+<li><strong>Group</strong> (displayed with a blue icon),</li>
+<li><strong>Project</strong> (displayed with a green icon),</li>
+<li><strong>Other</strong> (displayed with an orange icon)</li>
+</ul>
+<p>In addition to this there is a special <strong>Lost & Found</strong> folder. Deleted data items are kept in this folder.
+Data can be restored from this folder or deleted. No recovery is possible anymore in the last case.</p>
+<p>Group folders can not contain data items. Only folders can be child nodes of a group folder. Thus, group folders
+can be used to group projects.</p>
+<p><em>Project</em> and <em>other</em> folders can have folders and data items as child nodes.</p>
+<p>Folders of type <em>other</em> have the same features like those of type <em>project</em>. Their main purpose is
+to distinguish visibly between basic data of a project and secondary data in it.</p>
+<p>If in the following discussion the term <em>project</em> is used, then this includes also the term <em>other</em>.</p>
+<p>The described database structure can be seen in the QMS database view. Here projects and data items can be selected
+with the help of a checkbox for display in the QMS workspace.</p>
+<p>With this database organisation several projects can be saved in one database.</p>
+<p>Data items are saved only once in database. They can be referenced in various projects within a given database.</p>
+<p><em>Example of data organisation:</em></p>
+<p>A group folder (blue) with each hike track and its waypoints in a project folder (green). 
+Additionally, a green <em>summary</em> folder 
+that contains again all tracks from the other green folders. As the tracks are just referenced by the
+folders they are not stored several times as would have done with <code>GPX</code> or <code>QMS</code> files.</p>
+<p>Other advantages of the use of databases are the possibility</p>
+<ul>
+<li>to load just a few data items of a project into the workspace. With a <code>GPX</code> file everything in the file is completely loaded into the workspace,</li>
+<li>to search for data items with a given text string using the context menu entry <code>Search database</code> of the database (starting with QMS version 1.6.3.post).</li>
+</ul>
+<p>When creating a new reference to a data item QMS offers the choice either to create simply a reference or a 
+clone (a copy) of the data item.</p>
+<h2 id="is-there-an-easy-way-to-select-all-the-contents-of-one-project-to-drag-them-into-another">Is there an easy way to “select all” the contents of one project to drag them into another?</h2>
+<h2 id="is-there-a-way-to-merge-projects-together">Is there a way to merge projects together?</h2>
+<p><strong>Source:</strong> <a href="http://article.gmane.org/gmane.comp.gis.qlandkartegt.user/2612">gmane.comp.gis.qlandkartegt</a></p>
+<p>With QMapShack version 1.6.1 or later:</p>
+<ul>
+<li>Load all stuff you want to have in a single project into the workspace (possibly resulting in several new projects)</li>
+<li>Right click on the map window and choose “Select Items on Map”</li>
+<li>Follow the instructions displayed and select what ever data you want to have in one project.</li>
+<li>When the selection is finished, copy everything into the destination project.</li>
+<li>Remove all unnecessary projects from the workspace</li>
+</ul>
+<p>If you use a database you do not have to load all data of a project.
+You can load only the items needed. Additionally, if you store a newly created
+project into the database you do not need to clone (duplicate) the data.</p>
+<h2 id="how-to-find-location-of-database-file-used-in-qmapshack">How to find location of database file used in QMapShack?</h2>
+<p>Move the mouse pointer on the database name in the main window. A bubble box appears and shows the physical name of the
+database file.</p>
+<h2 id="is-there-a-possibility-to-display-small-roadstracks-in-a-vector-map-without-zooming-in-too-much">Is there a possibility to display small roads/tracks in a vector map without zooming in too much?</h2>
+<p><strong>Source:</strong> <a href="http://www.naviboard.de/vb/showthread.php?t=59676">www.naviboard.de</a></p>
+<p>This problem appears with a vector map like <a href="http://www.freizeitkarte-osm.de/">Freizeitkarte</a> where smaller 
+roads/tracks are only visible at a zoom level where the overview gets lost.</p>
+<p>There is no such possibility in QMapShack. The detail levels for vector map data are defined by the map author and can’t be
+changed within QMapShack.</p>
+<p>Users reported about the following ways to improve the visibility of small roads:</p>
+<ul>
+<li>Choose the menu item <code>View - Setup Map View - Projections&Datum</code></li>
+<li>Append to the given configuration string one of the following strings:</li>
+<li><code>+lat_ts=60</code> This sets the <em>latitude of true scale</em> for a Mercator projection. The closer you get to the polar regions the more the map will be skewed horizontally in comparison to the vertical scale. At the <em>latitude of true scale</em> (usually 0 for the equator) the scales are equal.</li>
+<li><code>+k_0=0.3</code> (<strong>Source:</strong> <a href="http://permalink.gmane.org/gmane.comp.gis.qlandkartegt.user/2688">gmane.comp.gis.qlandkartegt</a>)  This is an additional scale factor on the normal scale. A value of 1.0 will have no effect. Try to increase or decrease the given value to get the wanted result</li>
+</ul>
+<h2 id="is-there-a-possibility-to-choose-the-preferred-road-class-when-routing">Is there a possibility to choose the preferred road class when routing?</h2>
+<p><strong>Source:</strong> 
+ * <a href="http://www.naviboard.de/vb/showthread.php?t=59418">www.naviboard.de</a>
+ * <a href="http://permalink.gmane.org/gmane.comp.gis.qlandkartegt.user/2626">gmane.comp.gis.qlandkartegt.user</a></p>
+<p>Routing in QMapShack depends on the <a href="http://routino.org">Routino</a> package and this package does not offer an option to select a preferred road type.</p>
+<p>Routing profiles are saved in an XML-file (/usr/share/routino/profiles.xml). Here the preferences/weights of 
+different road types can be modified by the user.</p>
+<p>On Routino’s homepage there is an online version where fine
+tuning of all parameters can be tried. Once done there one can take over the values into the local <code>profiles.xml</code> file.</p>
+<h2 id="can-i-run-several-qms-instances-at-the-same-time">Can I run several QMS instances at the same time?</h2>
+<p>As a general rule don’t do this. QMS saves workspace information in the file <code>workspace.db</code>. There is only one such
+file for all QMS instances. If this file is used by several QMS instances at the same time then the 
+QMS workspace data behaviour is unpredictable.</p>
+<h2 id="user-relevant-qmapshack-directories-windows-version">User-relevant QMapShack directories (Windows version)</h2>
+<ul>
+<li>Directories relative to location of <code>qmapshack.exe</code>:<ul>
+<li><code>.\translations</code>: language files</li>
+<li><code>.\routino-xml</code>: routino configuration files including <code>profiles.xml</code></li>
+</ul>
+</li>
+<li>Other directories:<ul>
+<li><code>c:\Users\yor_user_name\AppData\Local\Temp\org.qlandkarte.QMapShack.log</code>: logfile written if command line option
+  <code>-f</code>is used</li>
+<li><code>c:\Users\your_user_name\.QMapShack</code>: tile caches for online maps</li>
+<li><code>c:\Users\your_user_name\.config\QLandkarte\workspace.db</code>: backup of last used workspace - used when QMapShack is restarted</li>
+</ul>
+</li>
+</ul>
+<h2 id="what-is-the-maximum-routino-databases-file-size-that-can-be-handled-by-the-qmapshack-windows-version">What is the maximum Routino databases file size that can be handled by the QMapShack Windows version?</h2>
+<p>Due to limitations in the Windows POSIX API Routino can’t handle files larger than 4GB.</p>
+<h2 id="how-to-use-russian-military-and-similar-raster-maps-with-qmapshack">How to use Russian military and similar raster maps with QMapShack?</h2>
+<p><strong>Source:</strong> Newsgroup thread <a href="https://sourceforge.net/p/qlandkartegt/mailman/message/34518807/">sourceforge.net/p/qlandkartegt</a></p>
+<ul>
+<li>
+<p>Calibrated Russian military and other raster maps can be downloaded from various locations.
+One of the well known servers is <a href="http://loadmap.net">loadmap.net</a>. When downloading a map tile 2 files are created:
+a GIF file with the raster map and an <code>OZIExplorer</code> MAP file with calibration data.</p>
+</li>
+<li>
+<p>QMapShack supports the use of raster maps via VRT-files. These files can be created with the <code>GDALBuildVRT</code>tool
+which can also be accessed from within QMapShack.
+Doing so leads for the above mentioned maps to an error message indicating that
+georeference data can’t be found within the MAP files. </p>
+</li>
+<li>
+<p>To make the raster map usable for QMapShack the following procedure (described for a Windows installation) can be used:</p>
+<ul>
+<li>Ensure that the <code>GDAL</code> toolset and the <code>proj.dll</code> are in the QMapShack installation directory.</li>
+<li>Add this directory to the PATH environment variable</li>
+<li>Ensure that the <code>data</code> subdirectory of the QMapShack installation directory is properly installed</li>
+<li>Add this directory to the GDAL_DATA environment variable</li>
+<li>Run </li>
+</ul>
+<p><code>gdalwarp -of VRT full_path_to_your_raster_map.map full_path_to_your_raster_map.vrt</code></p>
+<ul>
+<li><em>Remark:</em> It is unclear why <code>GDALBuildVRT</code> does not find the georeference information. </li>
+<li>Add the directory where the new VRT-file is located to your QMapShack map paths.</li>
+</ul>
+</li>
+<li>
+<p><em>Hint for Ubuntu users:</em> Raster maps may have borders. There is an Ubuntu tool to crop semi-automatically the map or a whole series of maps in such a way that the borders are not visible when loaded into QMapShack. Link to the tool: <a href="https://github.com/h4tr3d/geocrop">github.com/h4tr3d/geocrop</a>. Description of usage: </p>
+<ul>
+<li><a href="http://htrd.su/wiki/start?btng[post][tags]=qmapshack">http://htrd.su/wiki</a> (Russian). This link leads also to a short Russian description of the basic QMapShack features.</li>
+<li><a href="QuickWayToPrepareRasterMapForQMapShack.html">Quick way to prepare raster map for QMapShack</a></li>
+</ul>
+</li>
+</ul>
+<h2 id="why-is-a-raster-map-not-displayed">Why is a raster map not displayed?</h2>
+<p><strong>Source:</strong> <a href="http://permalink.gmane.org/gmane.comp.gis.qlandkartegt.user/2624">http://permalink.gmane.org/gmane.comp.gis.qlandkartegt.user/2624</a></p>
+<p>Consider the following hints:
+<em> Use <code>gdalinfo</code> to verify if the required vrt file provides proper information. Keep in mind that the vrt file 
+  is just an XML wrapper around your
+  real raster map file. It stores a path to that file. If the path changes
+  the vrt has to be created again.
+</em> If the map is loaded correctly but drawing is suppressed because it
+  would take too long, the map boundary is still visible as a black frame. 
+* If you have a layer of raster maps reading the files and scaling the content to an upper zoomlevel is 
+  getting more and more resource intensive the more you zoom out. To avoid endless map loading, QMS will 
+  skip the map if the effort to display it is getting too large.
+  However if QMS detects overview levels attached to the map it will use them. <code>gdaladdo</code> is the tool to do so. 
+  Things are getting a bit more difficult for insane large map collections. <code>gdaladdo</code> will create an overview 
+  file over all maps combined in the vrt file. That might get too large. In this case you have to create single
+  overview files and combine them in a vrt. </p>
+<h2 id="how-to-edit-the-elevation-of-a-track-point-manually">How to edit the elevation of a track point manually?</h2>
+<ul>
+<li>Open the edit window for the track, </li>
+<li>ensure that track data can be edited (open lock in description part of edit window - if lock is closed, click it!)</li>
+<li>go to the <em>Points</em> tab, </li>
+<li>find the track point to be edited, </li>
+<li>double-click in the elevation column,</li>
+<li>set the new elevation in the pop-up window.</li>
+</ul>
+<hr />
+<p><a href="DocGisDevices.html">Prev</a> (GPS Devices) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Commit Code) <a href="DeveloperCommitCode.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocFaq.md b/doc/DocFaq.md
new file mode 100644
index 0000000..817a6ae
--- /dev/null
+++ b/doc/DocFaq.md
@@ -0,0 +1,212 @@
+[Prev](DocGisDevices) (GPS Devices) | [Home](Home) | [Manual](DocMain) | (Playground - start your new Wiki page) [Next](DocPlayground)
+- - -
+[TOC]
+- - -
+
+# Frequently Asked Questions
+
+********
+
+## How are QMS data items organised?
+
+(inspired by and partially copied from [QMS newsgroup](http://permalink.gmane.org/gmane.comp.gis.qlandkartegt.user/2744))
+
+In the following **data item** means **waypoint**, **track**, **route**, or **area**.
+
+There are 3 physical storage types used in QMS for saving data items:
+
+* `GPX` files (common data format)
+* `QMS` files (proprietary efficient binary data format)
+* `SQLite` or `MySQL` databases
+
+If selected in the menu `Projects - Setup Workspace` data is saved automatically at the end of a QMS run and 
+regularly after some user-defined time interval.
+A backup of databases is recommended from time to time.
+
+All QMS data items belong to a **project**. 
+
+In the case of a `GPX` or `QMS` file all data in the file belong to one project
+which can be loaded into the QMS workspace and saved from here to the file.
+
+QMS allows the use of one or more databases. 
+
+Each database consists of a tree. Each node of the tree is either a **folder** or a **data item**.
+Nodes on the highest level must be folders.
+
+There are 3 types of folders:
+
+* **Group** (displayed with a blue icon),
+* **Project** (displayed with a green icon),
+* **Other** (displayed with an orange icon)
+
+In addition to this there is a special **Lost & Found** folder. Deleted data items are kept in this folder.
+Data can be restored from this folder or deleted. No recovery is possible anymore in the last case.
+
+Group folders can not contain data items. Only folders can be child nodes of a group folder. Thus, group folders
+can be used to group projects.
+
+_Project_ and _other_ folders can have folders and data items as child nodes.
+
+Folders of type _other_ have the same features like those of type _project_. Their main purpose is
+to distinguish visibly between basic data of a project and secondary data in it.
+
+If in the following discussion the term _project_ is used, then this includes also the term _other_.
+
+The described database structure can be seen in the QMS database view. Here projects and data items can be selected
+with the help of a checkbox for display in the QMS workspace.
+
+With this database organisation several projects can be saved in one database.
+
+Data items are saved only once in database. They can be referenced in various projects within a given database.
+
+_Example of data organisation:_
+
+A group folder (blue) with each hike track and its waypoints in a project folder (green). 
+Additionally, a green _summary_ folder 
+that contains again all tracks from the other green folders. As the tracks are just referenced by the
+folders they are not stored several times as would have done with `GPX` or `QMS` files.
+
+Other advantages of the use of databases are the possibility
+
+* to load just a few data items of a project into the workspace. With a `GPX` file everything in the file is completely loaded into the workspace,
+* to search for data items with a given text string using the context menu entry `Search database` of the database (starting with QMS version 1.6.3.post).
+
+When creating a new reference to a data item QMS offers the choice either to create simply a reference or a 
+clone (a copy) of the data item.
+
+## Is there an easy way to "select all" the contents of one project to drag them into another? 
+## Is there a way to merge projects together?
+
+**Source:** [gmane.comp.gis.qlandkartegt](http://article.gmane.org/gmane.comp.gis.qlandkartegt.user/2612)
+
+With QMapShack version 1.6.1 or later:
+
+  * Load all stuff you want to have in a single project into the workspace (possibly resulting in several new projects)
+  * Right click on the map window and choose "Select Items on Map"
+  * Follow the instructions displayed and select what ever data you want to have in one project.
+  * When the selection is finished, copy everything into the destination project.
+  * Remove all unnecessary projects from the workspace
+
+If you use a database you do not have to load all data of a project.
+You can load only the items needed. Additionally, if you store a newly created
+project into the database you do not need to clone (duplicate) the data.
+
+## How to find location of database file used in QMapShack?
+
+Move the mouse pointer on the database name in the main window. A bubble box appears and shows the physical name of the
+database file.
+
+
+## Is there a possibility to display small roads/tracks in a vector map without zooming in too much?
+
+**Source:** [www.naviboard.de](http://www.naviboard.de/vb/showthread.php?t=59676)
+
+This problem appears with a vector map like [Freizeitkarte](http://www.freizeitkarte-osm.de/) where smaller 
+roads/tracks are only visible at a zoom level where the overview gets lost.
+
+There is no such possibility in QMapShack. The detail levels for vector map data are defined by the map author and can't be
+changed within QMapShack.
+
+Users reported about the following ways to improve the visibility of small roads:
+
+* Choose the menu item `View - Setup Map View - Projections&Datum`
+* Append to the given configuration string one of the following strings:
+  * `+lat_ts=60` This sets the *latitude of true scale* for a Mercator projection. The closer you get to the polar regions the more the map will be skewed horizontally in comparison to the vertical scale. At the *latitude of true scale* (usually 0 for the equator) the scales are equal.
+  * `+k_0=0.3` (**Source:** [gmane.comp.gis.qlandkartegt](http://permalink.gmane.org/gmane.comp.gis.qlandkartegt.user/2688))  This is an additional scale factor on the normal scale. A value of 1.0 will have no effect. Try to increase or decrease the given value to get the wanted result
+## Is there a possibility to choose the preferred road class when routing?
+
+**Source:** 
+ * [www.naviboard.de](http://www.naviboard.de/vb/showthread.php?t=59418)
+ * [gmane.comp.gis.qlandkartegt.user](http://permalink.gmane.org/gmane.comp.gis.qlandkartegt.user/2626)
+
+Routing in QMapShack depends on the [Routino](http://routino.org) package and this package does not offer an option to select a preferred road type.
+
+Routing profiles are saved in an XML-file (/usr/share/routino/profiles.xml). Here the preferences/weights of 
+different road types can be modified by the user.
+
+On Routino's homepage there is an online version where fine
+tuning of all parameters can be tried. Once done there one can take over the values into the local `profiles.xml` file.
+
+
+## Can I run several QMS instances at the same time?
+
+As a general rule don't do this. QMS saves workspace information in the file `workspace.db`. There is only one such
+file for all QMS instances. If this file is used by several QMS instances at the same time then the 
+QMS workspace data behaviour is unpredictable.
+
+## User-relevant QMapShack directories (Windows version)
+
+* Directories relative to location of `qmapshack.exe`:
+    * `.\translations`: language files
+    * `.\routino-xml`: routino configuration files including `profiles.xml`
+* Other directories:
+    * `c:\Users\yor_user_name\AppData\Local\Temp\org.qlandkarte.QMapShack.log`: logfile written if command line option
+      `-f`is used
+    * `c:\Users\your_user_name\.QMapShack`: tile caches for online maps
+    * `c:\Users\your_user_name\.config\QLandkarte\workspace.db`: backup of last used workspace - used when QMapShack is restarted
+    
+    
+## What is the maximum Routino databases file size that can be handled by the QMapShack Windows version?
+
+Due to limitations in the Windows POSIX API Routino can't handle files larger than 4GB.
+
+
+## How to use Russian military and similar raster maps with QMapShack?
+
+**Source:** Newsgroup thread [sourceforge.net/p/qlandkartegt](https://sourceforge.net/p/qlandkartegt/mailman/message/34518807/)
+
+* Calibrated Russian military and other raster maps can be downloaded from various locations.
+One of the well known servers is [loadmap.net](http://loadmap.net). When downloading a map tile 2 files are created:
+a GIF file with the raster map and an `OZIExplorer` MAP file with calibration data.
+
+* QMapShack supports the use of raster maps via VRT-files. These files can be created with the `GDALBuildVRT`tool
+which can also be accessed from within QMapShack.
+Doing so leads for the above mentioned maps to an error message indicating that
+georeference data can't be found within the MAP files. 
+
+* To make the raster map usable for QMapShack the following procedure (described for a Windows installation) can be used:
+    * Ensure that the `GDAL` toolset and the `proj.dll` are in the QMapShack installation directory.
+    * Add this directory to the PATH environment variable
+    * Ensure that the `data` subdirectory of the QMapShack installation directory is properly installed
+    * Add this directory to the GDAL_DATA environment variable
+    * Run 
+    
+    `gdalwarp -of VRT full_path_to_your_raster_map.map full_path_to_your_raster_map.vrt`
+
+    * _Remark:_ It is unclear why `GDALBuildVRT` does not find the georeference information. 
+    * Add the directory where the new VRT-file is located to your QMapShack map paths.
+    
+* _Hint for Ubuntu users:_ Raster maps may have borders. There is an Ubuntu tool to crop semi-automatically the map or a whole series of maps in such a way that the borders are not visible when loaded into QMapShack. Link to the tool: [github.com/h4tr3d/geocrop](https://github.com/h4tr3d/geocrop). Description of usage: 
+    * [http://htrd.su/wiki](http://htrd.su/wiki/start?btng[post][tags]=qmapshack) (Russian). This link leads also to a short Russian description of the basic QMapShack features.
+    * [Quick way to prepare raster map for QMapShack](QuickWayToPrepareRasterMapForQMapShack)
+
+## Why is a raster map not displayed?   
+  
+**Source:** [http://permalink.gmane.org/gmane.comp.gis.qlandkartegt.user/2624](http://permalink.gmane.org/gmane.comp.gis.qlandkartegt.user/2624)
+
+Consider the following hints:
+* Use `gdalinfo` to verify if the required vrt file provides proper information. Keep in mind that the vrt file 
+  is just an XML wrapper around your
+  real raster map file. It stores a path to that file. If the path changes
+  the vrt has to be created again.
+* If the map is loaded correctly but drawing is suppressed because it
+  would take too long, the map boundary is still visible as a black frame. 
+* If you have a layer of raster maps reading the files and scaling the content to an upper zoomlevel is 
+  getting more and more resource intensive the more you zoom out. To avoid endless map loading, QMS will 
+  skip the map if the effort to display it is getting too large.
+  However if QMS detects overview levels attached to the map it will use them. `gdaladdo` is the tool to do so. 
+  Things are getting a bit more difficult for insane large map collections. `gdaladdo` will create an overview 
+  file over all maps combined in the vrt file. That might get too large. In this case you have to create single
+  overview files and combine them in a vrt. 
+  
+## How to edit the elevation of a track point manually?
+
+* Open the edit window for the track, 
+* ensure that track data can be edited (open lock in description part of edit window - if lock is closed, click it!)
+* go to the _Points_ tab, 
+* find the track point to be edited, 
+* double-click in the elevation column,
+* set the new elevation in the pop-up window.
+
+- - -
+[Prev](DocGisDevices) (GPS Devices) | [Home](Home) | [Manual](DocMain) | (Playground - start your new Wiki page) [Next](DocPlayground)
diff --git a/doc/DocFix.sh b/doc/DocFix.sh
new file mode 100755
index 0000000..9962610
--- /dev/null
+++ b/doc/DocFix.sh
@@ -0,0 +1,71 @@
+#! /usr/bin/sh
+
+########################################################################
+########################################################################
+##                                                                    ##
+## Copyright (C) 2016 Rainer Woitok, Rainer.Woitok at Gmail.Com          ##
+##                                                                    ##
+## This shell script is free software: you can redistribute it and/or ##
+## modify it  under the terms  of the  GNU General  Public License as ##
+## published by the Free Software Foundation, either version 3 of the ##
+## License, or (at your option) any later version.                    ##
+##                                                                    ##
+## This program is  distributed in the hope that  it will be  useful, ##
+## but  WITHOUT ANY WARRANTY;  without  even the implied warranty  of ##
+## MERCHANTABILITY or FITNESS FOR A  PARTICULAR PURPOSE.  See the GNU ##
+## General Public License for more details.                           ##
+##                                                                    ##
+## You should have received a copy  of the GNU General Public License ##
+## along with this program.  If not, see                              ##
+##                                                                    ##
+##        <http://www.gnu.org/licenses/>                              ##
+##                                                                    ##
+########################################################################
+########################################################################
+#
+# Make the "*.md" Markdown source file specified as argument locally us-
+# able.
+#
+#                                                    R Woitok 2016-03-04
+#
+########################################################################
+
+gawk '#
+      # If the current input file is not "Home.md" and if its first line
+      # does neither start with the "Home" link  nor with the new navig-
+      # ation bar,  insert the "Home" link  at the top of the file (this
+      # is enough for the line to be recognized later by script "NavBar.
+      # sh" and to be correctly updated to its final state):
+
+      ++i == 1 && FILENAME != "Home.md" && \
+      ! /^([[](Home|Prev)[]]|Prev [(][)])/ {
+          printf "[Home](Home)\n\n"
+                                           }
+
+      { #
+        # In the reference to the "Ubuntu*" file  use its new blank free
+        # name:
+
+        sub("[]][(][^)]*Ubuntu[^)]*[)]","](Ubuntu-14.04-HowTo)")
+
+        #
+        # Replace URLs  pointing into the  documentation wiki  with URLs
+        # pointing to the corresponding local files:
+
+        sub("https://bitbucket.org/maproom/qmapshack/wiki/","")
+
+        #
+        # Remove prefixes  "markdown-header-" from header identifiers in
+        # URLs:
+
+        sub("#markdown-header-","#")
+
+        print        # Finally output the possibly modified source line.
+      }' "$1" > "$1.out" &&
+
+if cmp  -s "$1" "$1.out"                          # File did not change,
+then rm -f      "$1.out"                        # so remove output file.
+else mv         "$1.out" "$1"  # Move output file back to original file.
+fi
+
+exit 0
diff --git a/doc/DocGetQMapShack.html b/doc/DocGetQMapShack.html
new file mode 100644
index 0000000..6160754
--- /dev/null
+++ b/doc/DocGetQMapShack.html
@@ -0,0 +1,105 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocMain.html">Prev</a> (Manual) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Getting started) <a href="DocGettingStarted.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#install-qmapshack">Install QMapShack</a><ul>
+<li><a href="#windows">Windows</a></li>
+<li><a href="#os-x">OS X</a></li>
+<li><a href="#linux">Linux</a><ul>
+<li><a href="#from-distributions-package-system">From distribution’s package system</a></li>
+<li><a href="#from-source">From Source</a><ul>
+<li><a href="#prerequisites">Prerequisites</a></li>
+<li><a href="#obtaining-the-source">Obtaining the Source</a></li>
+<li><a href="#compiling-and-installing">Compiling and Installing</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="install-qmapshack">Install QMapShack</h1>
+<h2 id="windows">Windows</h2>
+<p>For 64 bit Windows there is a binary installer available <a href="https://bitbucket.org/maproom/qmapshack/downloads">in the download section</a>.
+There is also an outdated version for 32 bit Windows. To get up-to-date 32 bit binaries it needs someone maintaining it.</p>
+<p>If you want to compile QMapShack for Windows have a look at <a href="BuildWindowsVisualStudio.html">“Compiling and Building QMapShack for Windows”</a> in the source tree.</p>
+<h2 id="os-x">OS X</h2>
+<p>A binary bundle is available <a href="https://bitbucket.org/maproom/qmapshack/downloads">in the download section</a>.
+The binary is build with compatibility for Mac OS X 10.5 (Leopard) and later. The build is done with the Xcode 7.0.1 and tested on OS-X 10.10.5 (Yosemite) and partly on OS-X 10.11 (El Capitan).</p>
+<p>The application can also be installed through cask (homebrew addition).
+Installing homebrew and cask, if not already done: </p>
+<pre class="codehilite"><code>ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+brew install caskroom/cask/brew-cask</code></pre>
+
+
+<p>Installing QMapShack (latest provided version):</p>
+<pre class="codehilite"><code>brew cask install qmapshack</code></pre>
+
+
+<p>Update QMapShack to the latest version:</p>
+<pre class="codehilite"><code>brew cask install qmapshack --force</code></pre>
+
+
+<h2 id="linux">Linux</h2>
+<p><strong>Check out your distribution’s package system. Probably there is a binary package already.</strong></p>
+<h3 id="from-distributions-package-system">From distribution’s package system</h3>
+<p>Many distributions come with a prebuilt version of QMapShack.</p>
+<p>Installing via official repository is the preferred way of installing QMapShack.
+Below a (non-exhaustive) list of Linux Distributions shipping QMapShack:</p>
+<ul>
+<li><a href="https://packages.debian.org/testing/qmapshack">Debian</a></li>
+<li><a href="http://packages.ubuntu.com/xenial/qmapshack">Ubuntu</a></li>
+<li><a href="https://software.opensuse.org/package/qmapshack">OpenSUSE</a></li>
+<li><a href="https://aur.archlinux.org/packages/qmapshack/">Arch</a></li>
+<li><a href="https://admin.fedoraproject.org/pkgdb/package/rpms/qmapshack/">Fedora</a></li>
+</ul>
+<p>Refer your distributions manual on howto install packages from using the package system.</p>
+<h3 id="from-source">From Source</h3>
+<h4 id="prerequisites">Prerequisites</h4>
+<p>To compile QMapShack, you need to have installed:</p>
+<ul>
+<li><a href="https://www.qt.io/">Qt5</a> (at least 5.4)</li>
+<li><a href="http://www.gdal.org/">GDAL</a></li>
+<li><a href="https://github.com/OSGeo/proj.4/wiki">Proj4</a></li>
+<li><a href="http://www.routino.org/">Routino</a> (at least 3.0)</li>
+<li>CMake/Make</li>
+<li>a C++ compiler (supporting C++11)</li>
+</ul>
+<p>Prefer installing those dependencies via the distribution’s package system.
+You also need to <strong>install the development packages</strong> in order to build QMapShack</p>
+<p><a href="Ubuntu-14.04-HowTo.html">Click here</a> for additional instructions on howto install on Ubuntu 14.04.</p>
+<h4 id="obtaining-the-source">Obtaining the Source</h4>
+<p>The <strong>latest stable release</strong> <a href="https://bitbucket.org/maproom/qmapshack/downloads">can be downloaded here</a>.
+You have to download and unpack the *tar.gz files.</p>
+<p>If you want to use the cutting edge you need <em>Mercurial</em> to access the repository.
+A GUI for <em>Mercurial</em> is <a href="http://tortoisehg.bitbucket.org/">TortoiseHg</a>.</p>
+<p>Keep in mind: <strong><em>The cutting edge may be less stable and/or contain bugs</em></strong></p>
+<p>Clone the QMapShack repo into a folder QMapShack by executing:</p>
+<pre class="codehilite"><code>hg clone https://bitbucket.org/maproom/qmapshack QMapShack</code></pre>
+
+
+<p>To update the code to the cutting edge change to the folder <code>QMapShack</code> and execute:</p>
+<pre class="codehilite"><code>hg pull
+hg update</code></pre>
+
+
+<h4 id="compiling-and-installing">Compiling and Installing</h4>
+<p>Create a new directory <code>build_QMapShack</code> (if it does not exist yet)</p>
+<pre class="codehilite"><code>mkdir build_QMapShack</code></pre>
+
+
+<p>And run:</p>
+<pre class="codehilite"><code>cmake ../QMapShack
+make</code></pre>
+
+
+<p>And install the application with:</p>
+<pre class="codehilite"><code>sudo make install</code></pre>
+
+
+<hr />
+<p><a href="DocMain.html">Prev</a> (Manual) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Getting started) <a href="DocGettingStarted.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocGetQMapShack.md b/doc/DocGetQMapShack.md
new file mode 100644
index 0000000..c66e04e
--- /dev/null
+++ b/doc/DocGetQMapShack.md
@@ -0,0 +1,108 @@
+[Prev](DocMain) (Manual) | [Home](Home) | [Manual](DocMain) | (Getting started) [Next](DocGettingStarted)
+- - -
+[TOC]
+- - -
+
+# Install QMapShack
+
+## Windows
+
+For 64 bit Windows there is a binary installer available [in the download section](https://bitbucket.org/maproom/qmapshack/downloads).
+There is also an outdated version for 32 bit Windows. To get up-to-date 32 bit binaries it needs someone maintaining it.
+
+If you want to compile QMapShack for Windows have a look at ["Compiling and Building QMapShack for Windows"](BuildWindowsVisualStudio) in the source tree.
+
+## OS X
+
+A binary bundle is available [in the download section](https://bitbucket.org/maproom/qmapshack/downloads).
+The binary is build with compatibility for Mac OS X 10.5 (Leopard) and later. The build is done with the Xcode 7.0.1 and tested on OS-X 10.10.5 (Yosemite) and partly on OS-X 10.11 (El Capitan).
+
+The application can also be installed through cask (homebrew addition).
+Installing homebrew and cask, if not already done: 
+
+    ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+    brew install caskroom/cask/brew-cask
+
+Installing QMapShack (latest provided version):
+
+    brew cask install qmapshack
+
+Update QMapShack to the latest version:
+
+    brew cask install qmapshack --force 
+   
+## Linux
+
+**Check out your distribution's package system. Probably there is a binary package already.**
+
+
+### From distribution's package system
+
+Many distributions come with a prebuilt version of QMapShack.
+
+Installing via official repository is the preferred way of installing QMapShack.
+Below a (non-exhaustive) list of Linux Distributions shipping QMapShack:
+
+* [Debian](https://packages.debian.org/testing/qmapshack)
+* [Ubuntu](http://packages.ubuntu.com/xenial/qmapshack)
+* [OpenSUSE](https://software.opensuse.org/package/qmapshack)
+* [Arch](https://aur.archlinux.org/packages/qmapshack/)
+* [Fedora](https://admin.fedoraproject.org/pkgdb/package/rpms/qmapshack/)
+
+Refer your distributions manual on howto install packages from using the package system.
+
+### From Source
+
+#### Prerequisites
+
+To compile QMapShack, you need to have installed:
+
+* [Qt5](https://www.qt.io/) (at least 5.4)
+* [GDAL](http://www.gdal.org/)
+* [Proj4](https://github.com/OSGeo/proj.4/wiki)
+* [Routino](http://www.routino.org/) (at least 3.0)
+* CMake/Make
+* a C++ compiler (supporting C++11)
+
+Prefer installing those dependencies via the distribution's package system.
+You also need to **install the development packages** in order to build QMapShack
+
+[Click here](Ubuntu-14.04-HowTo) for additional instructions on howto install on Ubuntu 14.04.
+
+#### Obtaining the Source
+
+The **latest stable release** [can be downloaded here](https://bitbucket.org/maproom/qmapshack/downloads).
+You have to download and unpack the \*tar.gz files.
+
+If you want to use the cutting edge you need _Mercurial_ to access the repository.
+A GUI for _Mercurial_ is [TortoiseHg](http://tortoisehg.bitbucket.org/).
+
+Keep in mind: **_The cutting edge may be less stable and/or contain bugs_**
+
+Clone the QMapShack repo into a folder QMapShack by executing:
+
+    hg clone https://bitbucket.org/maproom/qmapshack QMapShack
+
+To update the code to the cutting edge change to the folder `QMapShack` and execute:
+
+    hg pull
+    hg update
+
+#### Compiling and Installing
+
+Create a new directory `build_QMapShack` (if it does not exist yet)
+
+    mkdir build_QMapShack
+
+And run:
+
+    cmake ../QMapShack
+    make
+
+
+And install the application with:
+
+    sudo make install
+
+- - -
+[Prev](DocMain) (Manual) | [Home](Home) | [Manual](DocMain) | (Getting started) [Next](DocGettingStarted)
diff --git a/doc/DocGettingStarted.html b/doc/DocGettingStarted.html
new file mode 100644
index 0000000..bcf9d64
--- /dev/null
+++ b/doc/DocGettingStarted.html
@@ -0,0 +1,47 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocGetQMapShack.html">Prev</a> (Install QMapShack) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Command line parameters) <a href="DocCmdOptions.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#getting-started">Getting started</a><ul>
+<li><a href="#add-maps">Add maps</a></li>
+<li><a href="#add-digital-elevation-model">Add digital elevation model</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="getting-started">Getting started</h1>
+<p>This is what you get on the first start-up. </p>
+<p><img alt="Alt text" src="images/DocGettingStarted/maproom1.png" /></p>
+<p>All windows around the map workspace are docking windows. In other words you can move and re-group them as you like.</p>
+<p><img alt="Alt text" src="images/DocGettingStarted/maproom1_1.png" /></p>
+<p>On first start-up you will see an empty workspace and empty lists for maps and elevation data.</p>
+<h2 id="add-maps">Add maps</h2>
+<p>For the impatient ones: There is big button to install a few online map. </p>
+<p>For the more lettered ones: You do not add a map file directly to QMapShack. You add the path containing one or more files. There can be several paths containing maps. To add a path you select <em>File->Setup Map Paths</em></p>
+<p><img alt="Alt text" src="images/DocGettingStarted/maproom2.png" /></p>
+<p>Use the <em>”+” button</em> to add a new path. To remove paths you select one or more and pres the <em>trashcan button</em>. If you leave the dialog with <em>Ok</em> the map list will be updated:</p>
+<p><img alt="Alt text" src="images/DocGettingStarted/maproom3.png" /></p>
+<p>However the right hand canvas is still empty. To actually display a map you have to activate it by a right click on the entry in the list and selecting <em>Activate</em>. You can activate several maps
+at a time. And you can use drag-n-drop to move the activated maps in the list. The top most 
+map is drawn first. The one at the bottom of the active list is drawn last.</p>
+<p>To move the viewport use the left mouse button in a press and drag action. Use the mouse wheel 
+to zoom in and out. Alternatively you can use the arrow keys to move the map and the +/- keys
+to zoom. </p>
+<p><img alt="Alt text" src="images/DocGettingStarted/maproom4.png" /></p>
+<p>To read more about maps see <a href="DocBasicsMapDem.html"><em>Basics about maps and DEM files</em></a> and
+<a href="DocControlMapDem.html"><em>Control maps and DEM files</em></a></p>
+<h2 id="add-digital-elevation-model">Add digital elevation model</h2>
+<p>If you want to know the elevation at the mouse cursor’s position or you want to overlay some hill shading you need Digital Elevation Model (DEM) data.</p>
+<p>Adding files for the Digital Elevation Model (DEM) is very similar to adding maps. This time
+you have to select  <em>File->Setup DEM Paths</em>. As with the maps, you have to activate a DEM file before it is used by QMapShack. You do this by a right click on the DEM file entry in the list and selecting <em>Activate</em>. </p>
+<p>You can change the order of the active files via drag-n-drop. An elevation query will be done 
+in the order of the files. First the top most file will be queried. On success the value will be 
+used. If it fails the next file is used. And so on. Consequently you place your most accurate DEM files on top of the list.</p>
+<p><img alt="Alt text" src="images/DocGettingStarted/maproom6.png" /></p>
+<p>To read more about DEM files see <a href="DocBasicsMapDem.html"><em>Basics about maps and DEM files</em></a> and
+<a href="DocControlMapDem.html"><em>Control maps and DEM files</em></a></p>
+<hr />
+<p><a href="DocGetQMapShack.html">Prev</a> (Install QMapShack) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Command line parameters) <a href="DocCmdOptions.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocGettingStarted.md b/doc/DocGettingStarted.md
new file mode 100644
index 0000000..0521735
--- /dev/null
+++ b/doc/DocGettingStarted.md
@@ -0,0 +1,60 @@
+[Prev](DocGetQMapShack) (Install QMapShack) | [Home](Home) | [Manual](DocMain) | (Command line parameters) [Next](DocCmdOptions)
+- - -
+[TOC]
+- - -
+
+# Getting started
+
+This is what you get on the first start-up. 
+
+![Alt text](images/DocGettingStarted/maproom1.png)
+
+All windows around the map workspace are docking windows. In other words you can move and re-group them as you like.
+
+![Alt text](images/DocGettingStarted/maproom1_1.png)
+
+On first start-up you will see an empty workspace and empty lists for maps and elevation data.
+
+## Add maps
+
+For the impatient ones: There is big button to install a few online map. 
+
+For the more lettered ones: You do not add a map file directly to QMapShack. You add the path containing one or more files. There can be several paths containing maps. To add a path you select _File->Setup Map Paths_
+
+![Alt text](images/DocGettingStarted/maproom2.png)
+
+Use the _"+" button_ to add a new path. To remove paths you select one or more and pres the _trashcan button_. If you leave the dialog with _Ok_ the map list will be updated:
+
+![Alt text](images/DocGettingStarted/maproom3.png)
+
+However the right hand canvas is still empty. To actually display a map you have to activate it by a right click on the entry in the list and selecting _Activate_. You can activate several maps
+at a time. And you can use drag-n-drop to move the activated maps in the list. The top most 
+map is drawn first. The one at the bottom of the active list is drawn last.
+
+To move the viewport use the left mouse button in a press and drag action. Use the mouse wheel 
+to zoom in and out. Alternatively you can use the arrow keys to move the map and the +/- keys
+to zoom. 
+
+![Alt text](images/DocGettingStarted/maproom4.png)
+
+To read more about maps see [_Basics about maps and DEM files_](DocBasicsMapDem) and
+[_Control maps and DEM files_](DocControlMapDem)
+
+## Add digital elevation model
+
+If you want to know the elevation at the mouse cursor's position or you want to overlay some hill shading you need Digital Elevation Model (DEM) data.
+
+Adding files for the Digital Elevation Model (DEM) is very similar to adding maps. This time
+you have to select  _File->Setup DEM Paths_. As with the maps, you have to activate a DEM file before it is used by QMapShack. You do this by a right click on the DEM file entry in the list and selecting _Activate_. 
+
+You can change the order of the active files via drag-n-drop. An elevation query will be done 
+in the order of the files. First the top most file will be queried. On success the value will be 
+used. If it fails the next file is used. And so on. Consequently you place your most accurate DEM files on top of the list.
+
+![Alt text](images/DocGettingStarted/maproom6.png)
+
+To read more about DEM files see [_Basics about maps and DEM files_](DocBasicsMapDem) and
+[_Control maps and DEM files_](DocControlMapDem)
+
+- - -
+[Prev](DocGetQMapShack) (Install QMapShack) | [Home](Home) | [Manual](DocMain) | (Command line parameters) [Next](DocCmdOptions)
diff --git a/doc/DocGisDatabase.html b/doc/DocGisDatabase.html
new file mode 100644
index 0000000..2b21726
--- /dev/null
+++ b/doc/DocGisDatabase.html
@@ -0,0 +1,13 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocGisItemsEditMultiple.html">Prev</a> (Edit items with multiple points (tracks, routes, areas)) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Workspace and Database) <a href="DocGisDatabaseWorkspaceDatabase.html">Next</a></p>
+<hr />
+<h1 id="database">Database</h1>
+<p>The GIS Data view is split into half. The upper half contains the list of currently loaded projects. See <a href="DocGisItems.html"><em>Tracks, Waypoints & Co</em></a> to learn more about the GIS Data Workspace in general.</p>
+<p>The lower half is the database list. A database is a single file that holds your data like a file system with a few advantages. The data in the database is grouped in folders. Blue folders are for grouping several projects. Green folders are like projects. Think of them like a GPX file. The orange folders are like projects, too. Usually you want to use them to keep some secondary data below a green folder. </p>
+<p>Whereas blue folders are just to structure data in the database, the green and orange ones can be loaded like files into the workspace. Different to files it is also possible to load just single selected items into the workspace.</p>
+<p>As another difference to a filesystem items are not stored in several files. The are just stored once and linked to several folders. Therefore if you edit an item in one project the changes will apply to all other locations the item is referenced. If you do not want this, you have to clone the item. A clone is a completely independent copy of an item. </p>
+<p>This applies to a single database. You can load several databases. If you copy an item from one database to another the copies are as well independent as a clone within the same database.</p>
+<hr />
+<p><a href="DocGisItemsEditMultiple.html">Prev</a> (Edit items with multiple points (tracks, routes, areas)) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Workspace and Database) <a href="DocGisDatabaseWorkspaceDatabase.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocGisDatabase.md b/doc/DocGisDatabase.md
new file mode 100644
index 0000000..cd0c461
--- /dev/null
+++ b/doc/DocGisDatabase.md
@@ -0,0 +1,19 @@
+[Prev](DocGisItemsEditMultiple) (Edit items with multiple points (tracks, routes, areas)) | [Home](Home) | [Manual](DocMain) | (Workspace and Database) [Next](DocGisDatabaseWorkspaceDatabase)
+- - -
+[TOC]
+- - -
+
+# Database
+
+The GIS Data view is split into half. The upper half contains the list of currently loaded projects. See [_Tracks, Waypoints & Co_](DocGisItems) to learn more about the GIS Data Workspace in general.
+
+The lower half is the database list. A database is a single file that holds your data like a file system with a few advantages. The data in the database is grouped in folders. Blue folders are for grouping several projects. Green folders are like projects. Think of them like a GPX file. The orange folders are like projects, too. Usually you want to use them to keep some secondary data below a green folder. 
+
+Whereas blue folders are just to structure data in the database, the green and orange ones can be loaded like files into the workspace. Different to files it is also possible to load just single selected items into the workspace.
+
+As another difference to a filesystem items are not stored in several files. The are just stored once and linked to several folders. Therefore if you edit an item in one project the changes will apply to all other locations the item is referenced. If you do not want this, you have to clone the item. A clone is a completely independent copy of an item. 
+
+This applies to a single database. You can load several databases. If you copy an item from one database to another the copies are as well independent as a clone within the same database.
+
+- - -
+[Prev](DocGisItemsEditMultiple) (Edit items with multiple points (tracks, routes, areas)) | [Home](Home) | [Manual](DocMain) | (Workspace and Database) [Next](DocGisDatabaseWorkspaceDatabase)
diff --git a/doc/DocGisDatabaseAddRemove.html b/doc/DocGisDatabaseAddRemove.html
new file mode 100644
index 0000000..3c8bca3
--- /dev/null
+++ b/doc/DocGisDatabaseAddRemove.html
@@ -0,0 +1,99 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocGisDatabaseWorkspaceDatabase.html">Prev</a> (Workspace and Database) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Folders and Items) <a href="DocGisDatabaseFoldersItems.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#addremove-a-database">Add/Remove a Database</a><ul>
+<li><a href="#sqlite">SQLite</a></li>
+<li><a href="#mysql-565">MySQL (>= 5.6.5 )</a></li>
+</ul>
+</li>
+<li><a href="#multi-user-access">Multi-user Access</a></li>
+</ul>
+</div>
+<h1 id="addremove-a-database">Add/Remove a Database</h1>
+<p>To add a database you do a right click with your mouse on some empty space in the database list. You will get a context menu with an option to add a database:</p>
+<p><img alt="maproom2" src="images/DocGisDatabaseAddRemove/maproom2.png" /></p>
+<p>You can choose between a SQLite database or a MySQL database. For a single user or an installation on a laptop with no permanent access to a network, SQLite is the better choice. If you want multiple users to access the data via network, MySQL is the option to go.</p>
+<p>To remove a database you do a right click on the root entry of the database. </p>
+<p><img alt="maproom2" src="images/DocGisDatabaseAddRemove/maproom3.png" /></p>
+<p>This will remove the database from the database list, but not from your hard disk. You can load it later again.  </p>
+<h2 id="sqlite">SQLite</h2>
+<p><img alt="maproom2" src="images/DocGisDatabaseAddRemove/maproom1.png" /></p>
+<p>The provided name must be unique. </p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><img alt="maproom2" src="images/DocGisDatabaseAddRemove/Add.png" /></td>
+<td>Create a new database file</td>
+</tr>
+<tr>
+<td><img alt="maproom2" src="images/DocGisDatabaseAddRemove/PathBlue.png" /></td>
+<td>Add an existing database file</td>
+</tr>
+</tbody>
+</table>
+<h2 id="mysql-565">MySQL (>= 5.6.5 )</h2>
+<p>To use MySQL as database you need to enter some commands on the server first. To enter the MySQL console from the command line you do:</p>
+<div class="codehilite"><pre>mysql -u root -p
+</pre></div>
+
+
+<p>You need at least one user with full access rights, as QMapShack will create the database structure on the first start.</p>
+<div class="codehilite"><pre><span class="k">create</span> <span class="n">user</span> <span class="s1">'django'</span><span class="o">@</span><span class="s1">'172.16.1.5'</span> <span class="n">identified</span> <span class="k">by</span> <span class="s1">'1234'</span><span class="p">;</span>
+<span class="k">grant</span> <span class="k">all</span> <span class="n">privileges</span> <span class="k">on</span> <span class="o">*</span><span class="p">.</span><span class="o">*</span> <span class="k">to</span> <span class="s1">'django'</span><span class="o">@</span><span class="s1">'172.16.1.5'</span> <span class="k">with</span> <span class="k">grant</span> <span class="k">option</span><span class="p">;</span>
+</pre></div>
+
+
+<p>Replace “django” with your user name. “172.16.1.5” with the address of your PC. And “1234” with a reasonable password. <strong>Note: This is a very basic but fail safe setup. Please refer to the manual of your MySQL server for a more sophisticated setup.</strong></p>
+<p>Keep in mind that every time QMapShack tells you that it has to migrate the database only a user with full access rights may perform the migration.</p>
+<p>Next you want to create a database, e.g. MyData:</p>
+<div class="codehilite"><pre><span class="k">create</span> <span class="k">database</span> <span class="n">MyData</span><span class="p">;</span>
+</pre></div>
+
+
+<p>You can remove a database, e.g. if something went wrong during the first start:</p>
+<div class="codehilite"><pre><span class="k">drop</span> <span class="k">database</span> <span class="n">MyData</span><span class="p">;</span>
+</pre></div>
+
+
+<p>Now it’s time to add the database in QMapShack.</p>
+<p><img alt="maproom2" src="images/DocGisDatabaseAddRemove/maproom4.png" /></p>
+<p>The provided database name must be the one of the MySQL database (e.g. MyData)</p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><strong>Server</strong></td>
+<td>A host name or an IP address of the MySQL server</td>
+</tr>
+<tr>
+<td><strong>User</strong></td>
+<td>A user login for the server</td>
+</tr>
+<tr>
+<td><strong>Password</strong></td>
+<td>The user’s password for the server</td>
+</tr>
+</tbody>
+</table>
+<h1 id="multi-user-access">Multi-user Access</h1>
+<p>The database can be used by multiple users at the same time. QMapShack will detect conflicts if items have been changed by two users at the same time and offer options for mitigation.  </p>
+<p>To see changes in the database by someone else as soon as they are saved to the database you can enable a UDP broadcast package based notification system. As notifications are distributed by QMapShack this will only work if all instances are in the same local network. To enable notifications you have to select <em>Project->Setup Workspace</em> from the menu.</p>
+<p><img alt="maproom2" src="images/DocGisDatabaseAddRemove/maproom5.png" /></p>
+<p>Make sure your personal firewall allows UDP traffic on the given port.</p>
+<hr />
+<p><a href="DocGisDatabaseWorkspaceDatabase.html">Prev</a> (Workspace and Database) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Folders and Items) <a href="DocGisDatabaseFoldersItems.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocGisDatabaseAddRemove.md b/doc/DocGisDatabaseAddRemove.md
new file mode 100644
index 0000000..aff5363
--- /dev/null
+++ b/doc/DocGisDatabaseAddRemove.md
@@ -0,0 +1,100 @@
+[Prev](DocGisDatabaseWorkspaceDatabase) (Workspace and Database) | [Home](Home) | [Manual](DocMain) | (Folders and Items) [Next](DocGisDatabaseFoldersItems)
+- - -
+[TOC]
+- - -
+
+# Add/Remove a Database
+
+To add a database you do a right click with your mouse on some empty space in the database list. You will get a context menu with an option to add a database:
+
+![maproom2](images/DocGisDatabaseAddRemove/maproom2.png)
+
+You can choose between a SQLite database or a MySQL database. For a single user or an installation on a laptop with no permanent access to a network, SQLite is the better choice. If you want multiple users to access the data via network, MySQL is the option to go.
+
+To remove a database you do a right click on the root entry of the database. 
+
+![maproom2](images/DocGisDatabaseAddRemove/maproom3.png)
+
+This will remove the database from the database list, but not from your hard disk. You can load it later again.  
+
+## SQLite
+
+![maproom2](images/DocGisDatabaseAddRemove/maproom1.png)
+
+The provided name must be unique. 
+
+| | |
+|-|-|
+|![maproom2](images/DocGisDatabaseAddRemove/Add.png)| Create a new database file|
+|![maproom2](images/DocGisDatabaseAddRemove/PathBlue.png)| Add an existing database file|
+
+
+
+## MySQL (>= 5.6.5 ) 
+
+To use MySQL as database you need to enter some commands on the server first. To enter the MySQL console from the command line you do:
+
+
+```
+#!bash
+
+mysql -u root -p
+```
+
+You need at least one user with full access rights, as QMapShack will create the database structure on the first start.
+
+
+```
+#!mysql
+
+create user 'django'@'172.16.1.5' identified by '1234';
+grant all privileges on *.* to 'django'@'172.16.1.5' with grant option;
+```
+
+Replace "django" with your user name. "172.16.1.5" with the address of your PC. And "1234" with a reasonable password. **Note: This is a very basic but fail safe setup. Please refer to the manual of your MySQL server for a more sophisticated setup.**
+
+Keep in mind that every time QMapShack tells you that it has to migrate the database only a user with full access rights may perform the migration.
+
+Next you want to create a database, e.g. MyData:
+
+
+```
+#!mysql
+
+create database MyData;
+```
+
+You can remove a database, e.g. if something went wrong during the first start:
+
+
+```
+#!mysql
+
+drop database MyData;
+```
+
+Now it's time to add the database in QMapShack.
+
+
+![maproom2](images/DocGisDatabaseAddRemove/maproom4.png)
+
+The provided database name must be the one of the MySQL database (e.g. MyData)
+
+| | |
+|-|-|
+|**Server**| A host name or an IP address of the MySQL server|
+|**User**| A user login for the server|
+|**Password**| The user's password for the server|
+
+# Multi-user Access
+
+The database can be used by multiple users at the same time. QMapShack will detect conflicts if items have been changed by two users at the same time and offer options for mitigation.  
+
+To see changes in the database by someone else as soon as they are saved to the database you can enable a UDP broadcast package based notification system. As notifications are distributed by QMapShack this will only work if all instances are in the same local network. To enable notifications you have to select *Project->Setup Workspace* from the menu.
+
+![maproom2](images/DocGisDatabaseAddRemove/maproom5.png)
+
+Make sure your personal firewall allows UDP traffic on the given port.
+
+- - -
+[Prev](DocGisDatabaseWorkspaceDatabase) (Workspace and Database) | [Home](Home) | [Manual](DocMain) | (Folders and Items) [Next](DocGisDatabaseFoldersItems)
diff --git a/doc/DocGisDatabaseFoldersItems.html b/doc/DocGisDatabaseFoldersItems.html
new file mode 100644
index 0000000..7d3c64d
--- /dev/null
+++ b/doc/DocGisDatabaseFoldersItems.html
@@ -0,0 +1,22 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocGisDatabaseAddRemove.html">Prev</a> (Add/Remove a Database) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (‘Lost & Found’ Folder) <a href="DocGisDatabaseLostFound.html">Next</a></p>
+<hr />
+<h1 id="folders-and-items">Folders and Items</h1>
+<p>You can add or delete folders by a right click on the parent folder/database. Simply select from the context menu:</p>
+<p><img alt="maproom2" src="images/DocGisDatabaseFolderItems/maproom1.png" /></p>
+<p>If you add a folder you have to select a name and a type:</p>
+<p><img alt="maproom2" src="images/DocGisDatabaseFolderItems/maproom6.png" /></p>
+<p>This will create an empty folder in the database. To add items to the folder check the folder’s checkbox. This will load it into the workspace. Now you can copy items from other projects into the empty folder.</p>
+<p><img alt="maproom2" src="images/DocGisDatabaseFolderItems/maproom3.png" /></p>
+<p>The items won’t be stored into the database unless you explicitly save the changes to the database folder. With ‘Save As…’ you can export the database folder into a file.</p>
+<p><img alt="maproom2" src="images/DocGisDatabaseFolderItems/maproom4.png" /></p>
+<p>After saving  the project you will see the list of items in the database view. You load and unload single items by their checkboxes. The folders checkbox will  load or unload all items within the folder, but no subfolders.</p>
+<p><img alt="maproom2" src="images/DocGisDatabaseFolderItems/maproom5.png" /></p>
+<p>If you delete items in a database project from the workspace the items are not deleted in the database. Just removed from the workspace. To delete the items in the database you have to select and to delete them in the database view.</p>
+<p><img alt="maproom2" src="images/DocGisDatabaseFolderItems/maproom7.png" /></p>
+<p>If the items are not referenced by another folder they will be moved into the ‘Lost & Found’ folder.</p>
+<p><img alt="maproom2" src="images/DocGisDatabaseFolderItems/maproom8.png" /></p>
+<hr />
+<p><a href="DocGisDatabaseAddRemove.html">Prev</a> (Add/Remove a Database) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (‘Lost & Found’ Folder) <a href="DocGisDatabaseLostFound.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocGisDatabaseFoldersItems.md b/doc/DocGisDatabaseFoldersItems.md
new file mode 100644
index 0000000..a04d51a
--- /dev/null
+++ b/doc/DocGisDatabaseFoldersItems.md
@@ -0,0 +1,37 @@
+[Prev](DocGisDatabaseAddRemove) (Add/Remove a Database) | [Home](Home) | [Manual](DocMain) | ('Lost & Found' Folder) [Next](DocGisDatabaseLostFound)
+- - -
+[TOC]
+- - -
+
+# Folders and Items
+
+You can add or delete folders by a right click on the parent folder/database. Simply select from the context menu:
+
+![maproom2](images/DocGisDatabaseFolderItems/maproom1.png)
+
+If you add a folder you have to select a name and a type:
+
+![maproom2](images/DocGisDatabaseFolderItems/maproom6.png)
+
+This will create an empty folder in the database. To add items to the folder check the folder's checkbox. This will load it into the workspace. Now you can copy items from other projects into the empty folder.
+
+![maproom2](images/DocGisDatabaseFolderItems/maproom3.png)
+
+The items won't be stored into the database unless you explicitly save the changes to the database folder. With 'Save As...' you can export the database folder into a file.
+
+![maproom2](images/DocGisDatabaseFolderItems/maproom4.png)
+
+After saving  the project you will see the list of items in the database view. You load and unload single items by their checkboxes. The folders checkbox will  load or unload all items within the folder, but no subfolders.
+
+![maproom2](images/DocGisDatabaseFolderItems/maproom5.png)
+
+If you delete items in a database project from the workspace the items are not deleted in the database. Just removed from the workspace. To delete the items in the database you have to select and to delete them in the database view.
+
+![maproom2](images/DocGisDatabaseFolderItems/maproom7.png)
+
+If the items are not referenced by another folder they will be moved into the 'Lost & Found' folder.
+
+![maproom2](images/DocGisDatabaseFolderItems/maproom8.png)
+
+- - -
+[Prev](DocGisDatabaseAddRemove) (Add/Remove a Database) | [Home](Home) | [Manual](DocMain) | ('Lost & Found' Folder) [Next](DocGisDatabaseLostFound)
diff --git a/doc/DocGisDatabaseLostFound.html b/doc/DocGisDatabaseLostFound.html
new file mode 100644
index 0000000..ef7dce6
--- /dev/null
+++ b/doc/DocGisDatabaseLostFound.html
@@ -0,0 +1,16 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocGisDatabaseFoldersItems.html">Prev</a> (Folders and Items) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (GPS Devices) <a href="DocGisDevices.html">Next</a></p>
+<hr />
+<h1 id="lost-found-folder">‘Lost & Found’ Folder</h1>
+<p>When deleting an item from a database folder the item is not deleted itself. Just the relation with that folder. All items with no relation to any folder are collected in the Lost & Found folder. Only if you delete the item form this folder it is deleted permanently. You can do this by either emptying the complete folder or by deleting selected items.</p>
+<p><img alt="maproom2" src="images/DocGisDatabaseLostFound/maproom1.png" /> <img alt="maproom2" src="images/DocGisDatabaseLostFound/maproom2.png" /></p>
+<p>If you want to restore deleted items you have to load the Lost & Found folder into the workspace. </p>
+<p><img alt="maproom2" src="images/DocGisDatabaseLostFound/maproom4.png" /></p>
+<p>Next you copy the items you want to restore to another project. </p>
+<p><img alt="maproom2" src="images/DocGisDatabaseLostFound/maproom5.png" /></p>
+<p>This will not affect the database until you save the project.</p>
+<p><img alt="maproom2" src="images/DocGisDatabaseLostFound/maproom6.png" /></p>
+<hr />
+<p><a href="DocGisDatabaseFoldersItems.html">Prev</a> (Folders and Items) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (GPS Devices) <a href="DocGisDevices.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocGisDatabaseLostFound.md b/doc/DocGisDatabaseLostFound.md
new file mode 100644
index 0000000..fdb8136
--- /dev/null
+++ b/doc/DocGisDatabaseLostFound.md
@@ -0,0 +1,25 @@
+[Prev](DocGisDatabaseFoldersItems) (Folders and Items) | [Home](Home) | [Manual](DocMain) | (GPS Devices) [Next](DocGisDevices)
+- - -
+[TOC]
+- - -
+
+# 'Lost & Found' Folder
+
+When deleting an item from a database folder the item is not deleted itself. Just the relation with that folder. All items with no relation to any folder are collected in the Lost & Found folder. Only if you delete the item form this folder it is deleted permanently. You can do this by either emptying the complete folder or by deleting selected items.
+
+![maproom2](images/DocGisDatabaseLostFound/maproom1.png) ![maproom2](images/DocGisDatabaseLostFound/maproom2.png)
+
+If you want to restore deleted items you have to load the Lost & Found folder into the workspace. 
+
+![maproom2](images/DocGisDatabaseLostFound/maproom4.png)
+
+Next you copy the items you want to restore to another project. 
+
+![maproom2](images/DocGisDatabaseLostFound/maproom5.png)
+
+This will not affect the database until you save the project.
+
+![maproom2](images/DocGisDatabaseLostFound/maproom6.png)
+
+- - -
+[Prev](DocGisDatabaseFoldersItems) (Folders and Items) | [Home](Home) | [Manual](DocMain) | (GPS Devices) [Next](DocGisDevices)
diff --git a/doc/DocGisDatabaseWorkspaceDatabase.html b/doc/DocGisDatabaseWorkspaceDatabase.html
new file mode 100644
index 0000000..46c5967
--- /dev/null
+++ b/doc/DocGisDatabaseWorkspaceDatabase.html
@@ -0,0 +1,12 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocGisDatabase.html">Prev</a> (Database) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Add/Remove a Database) <a href="DocGisDatabaseAddRemove.html">Next</a></p>
+<hr />
+<h1 id="the-workspace-and-the-database">The Workspace and the Database</h1>
+<p><img alt="maproom2" src="images/DocGisDatabaseWorkspaceDatabase/maproom2.png" /></p>
+<p>To work with the database you have to keep a single fundamental rule in mind. The database view is to load, unload and delete items from the database only. Everything else like adding/copying/editing data is done in the workspace. Thus you have to load the item into the workspace first. And after you have done your work you have to save it into the database.</p>
+<p>For example if you want to copy an item from one database folder to another, you have to load both folders into the workspace, copy the item and save the folder with the item added. </p>
+<p>If you delete an item from a database project in the workspace it’s not deleted from the database. It’s just removed from the workspace. You have to delete it explicitly in the database view. If the item is not referenced by any other folder in the database it is moved to the ‘Lost & Found’ folder. </p>
+<hr />
+<p><a href="DocGisDatabase.html">Prev</a> (Database) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Add/Remove a Database) <a href="DocGisDatabaseAddRemove.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocGisDatabaseWorkspaceDatabase.md b/doc/DocGisDatabaseWorkspaceDatabase.md
new file mode 100644
index 0000000..9ce04f8
--- /dev/null
+++ b/doc/DocGisDatabaseWorkspaceDatabase.md
@@ -0,0 +1,17 @@
+[Prev](DocGisDatabase) (Database) | [Home](Home) | [Manual](DocMain) | (Add/Remove a Database) [Next](DocGisDatabaseAddRemove)
+- - -
+[TOC]
+- - -
+
+# The Workspace and the Database
+
+![maproom2](images/DocGisDatabaseWorkspaceDatabase/maproom2.png)
+
+To work with the database you have to keep a single fundamental rule in mind. The database view is to load, unload and delete items from the database only. Everything else like adding/copying/editing data is done in the workspace. Thus you have to load the item into the workspace first. And after you have done your work you have to save it into the database.
+
+For example if you want to copy an item from one database folder to another, you have to load both folders into the workspace, copy the item and save the folder with the item added. 
+
+If you delete an item from a database project in the workspace it's not deleted from the database. It's just removed from the workspace. You have to delete it explicitly in the database view. If the item is not referenced by any other folder in the database it is moved to the 'Lost & Found' folder. 
+
+- - -
+[Prev](DocGisDatabase) (Database) | [Home](Home) | [Manual](DocMain) | (Add/Remove a Database) [Next](DocGisDatabaseAddRemove)
diff --git a/doc/DocGisDevices.html b/doc/DocGisDevices.html
new file mode 100644
index 0000000..165eba7
--- /dev/null
+++ b/doc/DocGisDevices.html
@@ -0,0 +1,58 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocGisDatabaseLostFound.html">Prev</a> (‘Lost & Found’ Folder) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Frequently Asked Questions) <a href="DocFaq.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#working-with-gps-devices">Working with GPS Devices</a></li>
+<li><a href="#remark-about-garmin-gpsmap-60csx-and-similar-devices">Remark about Garmin GPSmap 60CSx and similar devices</a></li>
+</ul>
+</div>
+<h1 id="working-with-gps-devices">Working with GPS Devices</h1>
+<p>QMapShack supports data exchange with several GPS outdoor units. All newer Garmin devices accessible with mass storage mode will work. And all devices based on the CompeGPS software TwoNav, that are accessible as mass storage.</p>
+<p><strong>Linux:</strong> Make sure you have installed the UDisks2 package.<br />
+<strong>Windows:</strong> Supported from version 1.0.0 on.</p>
+<p><strong>Garmin</strong>: If you want to see your device’s SD memory card you have to copy the file <em>GarminDevice.xml</em> from the internal <em>Garmin</em> folder to the <em>Garmin</em> folder on your SD memory card.</p>
+<p>After you plugged your device to the PC and switched it to mass storage mode you should see something link this:</p>
+<p><img alt="maproom2" src="images/DocGisDevices/qmapshack2.png" /></p>
+<p>Each memory of the device is listed  in the workspace. If data is found on the device it will be attached as project to it’s device entry.</p>
+<p>The important part to understand is that a project on the device is stored differently than on the workspace. For example devices won’t be able to deal with the idea of hidden track points. Or it simply has no way to store all the information QMapShack is able to store. That is why projects have to be copied via the device entry to the device. And consequently projects on the device can’t be copied to the workspace. This would lead to a project clash that is hard to resolv [...]
+<p><img alt="maproom2" src="images/DocGisDevices/qmapshack4.png" /></p>
+<p>That understood you copy projects by drag-n-drop  to the device entry you want to store them. And after the tour you copy items like track recordings by drag-n-drop to what ever project on the workspace you want them. </p>
+<p><img alt="maproom2" src="images/DocGisDevices/qmapshack5.png" /></p>
+<p>The context menu for items on devices is working, too. However with a limited range of options, as the items on the device are considered as read-only. Copy them to the workspace to change them ore to derive other items from them. Next to drag-n-drop you can use the copy option from the menu.</p>
+<p><img alt="maproom2" src="images/DocGisDevices/qmapshack6.png" /></p>
+<p>The context menu for the projects is working, too. Note that <em>Close</em> is replaced <em>Delete</em>. This will delete the project from your device’s memory.</p>
+<h1 id="remark-about-garmin-gpsmap-60csx-and-similar-devices">Remark about Garmin GPSmap 60CSx and similar devices</h1>
+<p>If the following <em>GarminDevice.xml</em> file is copied to the <em>Garmin</em> folder of the SD memory card
+then the tracks written by the device on its memory card are shown in QMapShack as described above.</p>
+<div class="codehilite"><pre><span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
+<span class="nt"><Device</span> <span class="na">xmlns=</span><span class="s">"http://www.garmin.com/xmlschemas/GarminDevice/v2"</span> 
+<span class="na">xmlns:xsi=</span><span class="s">"http://www.w3.org/2001/XMLSchema-instance"</span> 
+<span class="na">xsi:schemaLocation=</span><span class="s">"http://www.garmin.com/xmlschemas/GarminDevice/v2 http://www.garmin.com/xmlschemas/GarminDevicev2.xsd"</span><span class="nt">></span>
+  <span class="nt"><Model></span>
+    <span class="nt"><PartNumber></span>000-BBBB-00<span class="nt"></PartNumber></span>
+    <span class="nt"><Description></span>GPSmap 60CSx<span class="nt"></Description></span>
+  <span class="nt"></Model></span>
+  <span class="nt"><Id></span>12345678<span class="nt"></Id></span>
+  <span class="nt"><MassStorageMode></span>
+    <span class="nt"><DataType></span>
+      <span class="nt"><Name></span>GPSData<span class="nt"></Name></span>
+      <span class="nt"><File></span>
+        <span class="nt"><Specification></span>
+          <span class="nt"><Identifier></span>http://www.topografix.com/GPX/1/1<span class="nt"></Identifier></span>
+          <span class="nt"><Documentation></span>http://www.topografix.com/GPX/1/1/gpx.xsd<span class="nt"></Documentation></span>
+        <span class="nt"></Specification></span>
+        <span class="nt"><Location></span>
+          <span class="nt"><Path></span>.<span class="nt"></Path></span>
+        <span class="nt"></Location></span>
+      <span class="nt"></File></span>
+    <span class="nt"></DataType></span>
+  <span class="nt"></MassStorageMode></span>
+<span class="nt"></Device></span>
+</pre></div>
+
+
+<hr />
+<p><a href="DocGisDatabaseLostFound.html">Prev</a> (‘Lost & Found’ Folder) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Frequently Asked Questions) <a href="DocFaq.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocGisDevices.md b/doc/DocGisDevices.md
new file mode 100644
index 0000000..6a55c07
--- /dev/null
+++ b/doc/DocGisDevices.md
@@ -0,0 +1,70 @@
+[Prev](DocGisDatabaseLostFound) ('Lost & Found' Folder) | [Home](Home) | [Manual](DocMain) | (Frequently Asked Questions) [Next](DocFaq)
+- - -
+[TOC]
+- - -
+
+# Working with GPS Devices
+
+QMapShack supports data exchange with several GPS outdoor units. All newer Garmin devices accessible with mass storage mode will work. And all devices based on the CompeGPS software TwoNav, that are accessible as mass storage.
+
+**Linux:** Make sure you have installed the UDisks2 package.  
+**Windows:** Supported from version 1.0.0 on.
+
+**Garmin**: If you want to see your device's SD memory card you have to copy the file _GarminDevice.xml_ from the internal _Garmin_ folder to the _Garmin_ folder on your SD memory card.
+
+After you plugged your device to the PC and switched it to mass storage mode you should see something link this:
+
+![maproom2](images/DocGisDevices/qmapshack2.png)
+
+Each memory of the device is listed  in the workspace. If data is found on the device it will be attached as project to it's device entry.
+
+The important part to understand is that a project on the device is stored differently than on the workspace. For example devices won't be able to deal with the idea of hidden track points. Or it simply has no way to store all the information QMapShack is able to store. That is why projects have to be copied via the device entry to the device. And consequently projects on the device can't be copied to the workspace. This would lead to a project clash that is hard to resolve and very like [...]
+
+![maproom2](images/DocGisDevices/qmapshack4.png)
+
+That understood you copy projects by drag-n-drop  to the device entry you want to store them. And after the tour you copy items like track recordings by drag-n-drop to what ever project on the workspace you want them. 
+
+![maproom2](images/DocGisDevices/qmapshack5.png)
+
+The context menu for items on devices is working, too. However with a limited range of options, as the items on the device are considered as read-only. Copy them to the workspace to change them ore to derive other items from them. Next to drag-n-drop you can use the copy option from the menu.
+
+![maproom2](images/DocGisDevices/qmapshack6.png)
+
+The context menu for the projects is working, too. Note that _Close_ is replaced _Delete_. This will delete the project from your device's memory.
+
+# Remark about Garmin GPSmap 60CSx and similar devices
+
+If the following _GarminDevice.xml_ file is copied to the _Garmin_ folder of the SD memory card
+then the tracks written by the device on its memory card are shown in QMapShack as described above.
+
+```
+<?xml version="1.0" encoding="UTF-8"?>
+<Device xmlns="http://www.garmin.com/xmlschemas/GarminDevice/v2" 
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xsi:schemaLocation="http://www.garmin.com/xmlschemas/GarminDevice/v2 http://www.garmin.com/xmlschemas/GarminDevicev2.xsd">
+  <Model>
+    <PartNumber>000-BBBB-00</PartNumber>
+    <Description>GPSmap 60CSx</Description>
+  </Model>
+  <Id>12345678</Id>
+  <MassStorageMode>
+    <DataType>
+      <Name>GPSData</Name>
+      <File>
+        <Specification>
+          <Identifier>http://www.topografix.com/GPX/1/1</Identifier>
+          <Documentation>http://www.topografix.com/GPX/1/1/gpx.xsd</Documentation>
+        </Specification>
+        <Location>
+          <Path>.</Path>
+        </Location>
+      </File>
+    </DataType>
+  </MassStorageMode>
+</Device>
+```
+
+
+
+- - -
+[Prev](DocGisDatabaseLostFound) ('Lost & Found' Folder) | [Home](Home) | [Manual](DocMain) | (Frequently Asked Questions) [Next](DocFaq)
diff --git a/doc/DocGisHowToRouting.html b/doc/DocGisHowToRouting.html
new file mode 100644
index 0000000..68d2228
--- /dev/null
+++ b/doc/DocGisHowToRouting.html
@@ -0,0 +1,134 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#routing-quick-start">Routing Quick Start</a></li>
+<li><a href="#manipulating-a-route">Manipulating a Route</a><ul>
+<li><a href="#route-context-menu">route context menu</a></li>
+<li><a href="#issue-named-route-points">Issue: named route points</a></li>
+<li><a href="#manually-create-edit-and-move-a-waypoint">Manually create, edit and move a waypoint</a></li>
+<li><a href="#import-waypoints">Import Waypoints</a></li>
+<li><a href="#import-routes">Import Routes</a></li>
+<li><a href="#send-route-to-device">Send Route to Device</a></li>
+<li><a href="#gotchas-and-tricks">Gotchas and Tricks</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="routing-quick-start">Routing Quick Start</h1>
+<p>Activate a proper map. OpenStreetMap as installed by “I want maps” will do perfectly.</p>
+<p>Activate <strong>Menu -> Project -> Add empty project</strong>  </p>
+<p><strong>kiozen: Images are stored in the correct folder of the images folder. Keep in mind that the Wiki can be converted into a stand alone HTML document by the scripts. Therefore all stuff has to be in this repository.</strong></p>
+<p><img alt="projmenu.png" src="https://bitbucket.org/repo/L5qerE/images/1188753088-projmenu.png" /></p>
+<p>and give it a proper name. Leave qms project type unless you know why not.</p>
+<p><img alt="proj_new.png" src="https://bitbucket.org/repo/L5qerE/images/2189981266-proj_new.png" /></p>
+<p>Activate <strong>Menu -> Project -> Search Google</strong> if not yet open.</p>
+<p>Type some search term for your address into the “Google Project” field. You may expand the left triangle to see your results. If you get “Error:”, try to change or refine your search term. Usually, a road and a town should give reasonable results. Right click on your result, activate “copy to” and select your project name given in the first step. If your search yields multiple results, select the one desired.</p>
+<p>This way, you collect <strong>waypoints</strong> in your project.
+Repeat the steps for all waypoints your route is desired to pass.</p>
+<p>Use <strong>shift-<click></strong> or <strong>ctrl-<click></strong> to select some or all of your waypoints in the project. Be sure to select at least two waypoints and no other objects.
+In the context menu (right mouse button), select “Create Route”. </p>
+<p><img alt="rte_create.png" src="https://bitbucket.org/repo/L5qerE/images/541772100-rte_create.png" /></p>
+<p>You can now adjust the sequence in which the route should pass your waypoints.</p>
+<p><img alt="rte_cr_rearrange.png" src="https://bitbucket.org/repo/L5qerE/images/3043379165-rte_cr_rearrange.png" /></p>
+<p>Continue with OK, enter a route name in the next window and select your project in the following window.</p>
+<p>QMapShack automagically will calculate the route according to your current routing preferences, which more or less may take some time.</p>
+<p>Double click your route to zoom your map view to the whole route.</p>
+<p><img alt="ge_must_see.jpg" src="https://bitbucket.org/repo/L5qerE/images/2544969820-ge_must_see.jpg" /></p>
+<p>Click on the route between the waypoints to display route properties</p>
+<p><img alt="rte_properties.png" src="https://bitbucket.org/repo/L5qerE/images/866504795-rte_properties.png" /></p>
+<p>Save your project if you want to use the results later.</p>
+<h1 id="manipulating-a-route">Manipulating a Route</h1>
+<h3 id="route-context-menu">route context menu</h3>
+<p><img alt="rte_context.png" src="https://bitbucket.org/repo/L5qerE/images/3754465212-rte_context.png" /></p>
+<p>“<strong>Edit…</strong>”, “<strong>Copy to…</strong> ” and “<strong>Delete</strong>” are generic object functions and do what their name promises.</p>
+<p>“<strong>Route Instructions</strong>”: highlight route and see routing instructions.</p>
+<p>“<strong>Reset Route</strong>” removes the calculated pathway and returns to waypoints linked by straight lines of flight.</p>
+<p>“<strong>Calculate</strong>” restores the calculated pathway or recalculates it according to your (maybe changed) routing preferences.</p>
+<p><strong>kiozen: Local documents are referenced like this:</strong></p>
+<p>See <a href="DocGisItemsRte.html">here</a>
+how to configure your routing engine. It is strongly encouraged to <strong>use</strong> offline <strong>routino</strong> routing, if you want to use serious route planning - both for performance reasons and to limit load on MapQuest online routing.</p>
+<p>“<strong>Convert to Track</strong>” creates a track with a large number of points (“breadcrumb track”) which remains independent of the routing engine, the router map and the routing properties (available in version 1.6.2). If your GPS device supports routing by track, this will deliver exactly what you have planned. Be aware, that from track data, you cannot easily replan your route on the GPS device.</p>
+<p>“<strong>Edit route</strong>” .....
+This allows you to add/delete/move maypoints to your route. See here
+DocGisItemsEditMultiple
+for a detailled description of the dialogue.</p>
+<p>You may notice that the routepoints have lost their relation to the waypoints from which they were initially created. Moving a routepoint does not change the waypoint it was derived from.</p>
+<h3 id="issue-named-route-points">Issue: named route points</h3>
+<p>The routepoints do not inherit their name or description from the waypoints they were generated from.
+There is a bug report/feature request on this in the issue list:
+https://bitbucket.org/maproom/qmapshack/issues/127/create-a-route-from-waypoints-does-not-add</p>
+<h3 id="manually-create-edit-and-move-a-waypoint">Manually create, edit and move a waypoint</h3>
+<p>If you are not always happy with the results of the “Google Search” function, you may manually fine tune your waypoints before deriving a route from them. See here for detailed instructions:
+DocGisItemsNew#waypoint</p>
+<h3 id="import-waypoints">Import Waypoints</h3>
+<p>The GPX file format is a widely used de facto standard for GIS data exchange. Many GIS data sources may produce GPX directly, which can be used in the “File -> Load GIS” dialogue.</p>
+<p>If not, the GPS “swiss army knife” <strong>gpsbabel</strong>  may help to convert nearyly any relevant GIS data format into GPX. 
+For details, read the manual you may find here: https://www.gpsbabel.org/htmldoc-1.4.4/gpsbabel-1.4.4.pdf</p>
+<p>For example, take this little csv formatted text file, saved as “wpts-test5.csv”:</p>
+<div class="codehilite"><pre><span class="mf">49.43226</span><span class="p">,</span><span class="mf">11.09153</span> <span class="p">,</span> <span class="n">N</span><span class="err">ü</span><span class="n">rnberg</span> <span class="n">Hermundurenstra</span><span class="err">ß</span><span class="n">e</span> <span class="mi">17</span>
+<span class="mf">49.73233</span><span class="p">,</span><span class="mf">11.07244</span> <span class="p">,</span> <span class="n">Forchheim</span> <span class="n">Hugo</span><span class="o">-</span><span class="n">Post</span><span class="o">-</span><span class="n">Stra</span><span class="err">ß</span><span class="n">e</span> <span class="mi">84</span>
+<span class="mf">49.42029</span><span class="p">,</span><span class="mf">11.89065</span> <span class="p">,</span> <span class="n">K</span><span class="err">ü</span><span class="n">mmersbruck</span> <span class="n">Grasiger</span> <span class="n">Weg</span>
+<span class="mf">49.15800</span><span class="p">,</span><span class="mf">11.71157</span> <span class="p">,</span> <span class="n">parsberg</span> <span class="n">lindlbergstra</span><span class="err">ß</span><span class="n">e</span>
+<span class="mf">49.43226</span><span class="p">,</span><span class="mf">11.09153</span> <span class="p">,</span> <span class="n">N</span><span class="err">ü</span><span class="n">rnberg</span> <span class="n">Hermundurenstra</span><span class="err">ß</span><span class="n">e</span> <span class="mi">17</span>
+</pre></div>
+
+
+<p>Call gpsbabel like this to convert this to a gpx with waypoints:</p>
+<div class="codehilite"><pre><span class="n">gpsbabel</span> <span class="o">-</span><span class="n">i</span> <span class="n">csv</span> <span class="o">-</span><span class="n">f</span> <span class="n">wpts</span><span class="o">-</span><span class="n">test5</span><span class="p">.</span><span class="n">csv</span>  <span class="o">-</span><span class="n">o</span> <span class="n">gpx</span> <span class="o">-</span><span class="n">F</span> <span class="n">wpts</span><span class="o">-</span [...]
+</pre></div>
+
+
+<p>Short explanation of the options:</p>
+<ul>
+<li><em>-i csv</em> : input file format</li>
+<li><em>-f wpts-test5.csv</em> : input file name</li>
+<li><em>-o gpx</em> : output file format</li>
+<li><em>-F wpts-test5-wpt.gpx</em> : output file name</li>
+</ul>
+<p>Open the output file in QMapShack with “File -> Load GIS Data” yields </p>
+<p><img alt="import-wpt-list.png" src="https://bitbucket.org/repo/L5qerE/images/995727279-import-wpt-list.png" /></p>
+<p>and</p>
+<p><img alt="import-wpt-map.jpg" src="https://bitbucket.org/repo/L5qerE/images/3896244447-import-wpt-map.jpg" /></p>
+<p>As you see, the coordinates and the descriptive labels of the waypoints are imported.</p>
+<h3 id="import-routes">Import Routes</h3>
+<p>To import the points as routepoints instead, call this:</p>
+<div class="codehilite"><pre><span class="n">gpsbabel</span> <span class="o">-</span><span class="n">i</span> <span class="n">csv</span> <span class="o">-</span><span class="n">f</span> <span class="n">wpts</span><span class="o">-</span><span class="n">test5</span><span class="p">.</span><span class="n">csv</span> <span class="o">-</span><span class="n">x</span>  <span class="n">transform</span><span class="p">,</span><span class="n">rte</span><span class="o">=</span><span class="n">wpt< [...]
+</pre></div>
+
+
+<p>which differs from above command by the gpsbabel filter options</p>
+<ul>
+<li><em>-x transform,rte=wpt</em> : transform the (way-)points found in input to routepoints</li>
+<li><em>-x nuketypes,waypoints</em> : remove the waypoints from the output</li>
+</ul>
+<p>This will display in QMapShack as</p>
+<p><img alt="import-rtpt-list.png" src="https://bitbucket.org/repo/L5qerE/images/2542930625-import-rtpt-list.png" /></p>
+<p>and in the map as path of flight:</p>
+<p><img alt="import-rtpt-map.jpg" src="https://bitbucket.org/repo/L5qerE/images/1051625912-import-rtpt-map.jpg" /></p>
+<p>Call “Calculate route” to get:</p>
+<p><img alt="import-rtpt-map-calc.jpg" src="https://bitbucket.org/repo/L5qerE/images/1950590911-import-rtpt-map-calc.jpg" /></p>
+<p>Notice that the routepoints now have kept their labels, as opposed to their anonymous behavior when QMapShack derives routepoints from waypoints.</p>
+<p>As soon as you call “Edit Route”, e.g. to move points, you get a warning </p>
+<p><img alt="edit-warning.png" src="https://bitbucket.org/repo/L5qerE/images/2327772757-edit-warning.png" /></p>
+<p>If you continue, the edited route points now have lost their description.</p>
+<p><strong>kiozen: Keep in mind that once these issues are fixed this statement will be obsolete and misleading. And it’s very likely that no one will take care of fixing the text. Therefore it’s ok to mention and reference the issue once. But avoid hidden references like that.</strong></p>
+<p>This property is consistently transferred to the mobile GPS device.</p>
+<p>???#### screenshots from device ?? 
+not here, better in the issue case ########</p>
+<h3 id="send-route-to-device">Send Route to Device</h3>
+<p>Save your project, plug your device and call “<strong>send to device</strong>” in the project context menu. Be aware that all objects in the project - waypoints, routes and tracks - are sent to the device. If this is not what you want, create a new project and copy only desired items into this. Send this project to the device, then.</p>
+<p>See here
+DocGisDevices
+for more infos about exchanging data with mobile GPS devices.</p>
+<h3 id="gotchas-and-tricks">Gotchas and Tricks</h3>
+<p>Be aware that your device presumably uses different maps, routing preferences and routing engine than QMapShack / routino does. While the routepoints are fixed by coordinates, the calculated route between them may differ significantly.</p>
+<p>One way to prevent this is to convert your route to a track and send this to your device. However, this is not flexible for rerouting if you deviate from your preplanned route for whatever reason and want to find back to it.</p>
+<p>You also may add addional waypoints to your route, using the “edit route” functionality. This let’s you “nail down” your route to the desired pathway. Be sure to select “nails” as close to your target pathway as possible. Otherwise, your device might navigate you to artificial stepaways just to collect an imaginary flag. Some devices, e.g. the Garmin zumo motorcycle navigators, have a “skip next route point” function for this reason.</p>
+<p>You also may send waypoints as such to your device. However, many devices will add them to their list of favorites. So this may be clobbered with supplementary way points you are not permanently interested in.</p>
+<p>The best solution would be to share the same map, routing engine and routing preference setting between workstation and mobile device. Any reports on such solutions are welcome … where? on the mailing list????</p>
+<hr />
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
\ No newline at end of file
diff --git a/doc/DocGisHowToSaveYourWork.html b/doc/DocGisHowToSaveYourWork.html
new file mode 100644
index 0000000..562b6f0
--- /dev/null
+++ b/doc/DocGisHowToSaveYourWork.html
@@ -0,0 +1,111 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
+<hr />
+<h1 id="how-to-save-your-work">How to save your work</h1>
+<p><em>(pen-pen-ultimate version -  should be fine for me)</em></p>
+<p>We suppose you want to keep your work save:</p>
+<ul>
+<li>frequently save memory resident data to disk to provide against system (power, memory, hardware, software …) failure</li>
+<li>keep copies of your disk content to provide against media failure</li>
+<li>keep different versions of your files to prevent against user mistakes</li>
+</ul>
+<p>You will have some system and strategies in place to do backup. You <strong>want to know what, where, and when data is stored by QMapShack</strong> to include this into your existing backup, and to know what to do in case of recovery.</p>
+<p>Basically, you have three distinct realms of storable work:</p>
+<ul>
+<li>your maps, including the map view</li>
+<li>your project files</li>
+<li>your workspace</li>
+</ul>
+<h1 id="maps-and-views">Maps and views</h1>
+<p>You don’t edit maps in QMapShack. Maps are huge and may eat up lots of backup resources. They may be easily recovered from the internet. Enough reason for some special considerations regarding map backup.</p>
+<p>QMapShack reads its maps from the configured MapPaths.</p>
+<p>Recall the map organization:
+DocBasicsMapDem</p>
+<h3 id="online-maps">Online maps</h3>
+<p>The essential information to backup for online maps are their <strong>definition files</strong>. They are located in your configured MapPaths.</p>
+<p>If you installed your initial maps from the “I want maps” buttons, they are named</p>
+<div class="codehilite"><pre><span class="n">OpenCycleMap</span><span class="p">.</span><span class="n">tms</span>  <span class="n">OpenStreetMap</span><span class="p">.</span><span class="n">tms</span>  <span class="n">OSM_Topo</span><span class="p">.</span><span class="n">tms</span>  <span class="n">WorldSat</span><span class="p">.</span><span class="n">wmts</span>  <span class="n">WorldTopo</span><span class="p">.</span><span class="n">wmts</span>
+</pre></div>
+
+
+<p>When browsing through maps, QMapShack maintains a local <strong>tile cache</strong>. This has limited life time and is automagically rebuilt if missing. It may contain some hundreds MB. Consider to exclude the tile cache from backup.</p>
+<p>Default location is</p>
+<div class="codehilite"><pre><span class="o">~/</span><span class="p">.</span><span class="n">QMapShack</span><span class="o">/</span>
+</pre></div>
+
+
+<p>You can change the path of the tile cache via
+ <em>File -> Setup Map Paths</em> - 
+Directly at the top of the window (“Root path of the tile cache for online maps:”).</p>
+<h3 id="local-maps-dems-and-routing-database">Local Maps, DEMs and routing database</h3>
+<p>… are usually are <strong>huge</strong> (easily some GB). They <strong>will not change</strong> while working with QMapShack. Thus you may consider them for special treatment on backup. 
+You may keep online maps and offline maps in different paths to ease this.</p>
+<h3 id="map-views">Map Views</h3>
+<p>.. determine how your currently visible maps - including your visible data - are <strong>displayed</strong>. Recall DocControlMapDem</p>
+<p>The view is different and independent from your GIS data as organized in projects.</p>
+<p>QMapShack does not save a view by default. 
+The “File ->  Store Map View” and the “File ->  Load Map View” allow you to select specific locations. </p>
+<p>It depends on your style of work, whether backing up views is worth any special consideration at all.</p>
+<h1 id="your-projects">Your Projects</h1>
+<p>The <strong>project</strong> is the place <strong>where your own personal data</strong> - basically in the form of waypoints, tracks and routes - <strong>lives in</strong>. Presumably this will be the data you really want to take care of.</p>
+<p>In terms of storage, projects may be implemented as:</p>
+<ul>
+<li>qms files, the QMapShack internal format</li>
+<li>gpx files, the most common format for exchanging GIS Data </li>
+<li>in databases,</li>
+<li>on the storage of your satnav device </li>
+</ul>
+<h3 id="backup-of-single-project-files">Backup of single project files</h3>
+<p>See here DocHandleGpxFiles for further details on the handling of GIS files.</p>
+<p>For both .gpx and .qms files, there is a <strong>1:1 relation between project and file</strong>. This keeps backup procedures simple and straightforward. However, it leaves you the responsibility to keep your data in sync  between different projects=files if you roll back to a different version of your work.</p>
+<p>There is one important difference between .qms an .gpx files with regard to backup: The <strong>.qms format</strong> includes object history and <strong>allows a roll back of changes</strong> on a per object basis. This feature is not available in gpx files, because it would break the main purpose of <strong>gpx</strong>, it’s <strong>exchangeability</strong>: there is simply no standard in the gpx definitions for rollback histories. </p>
+<p>So, if you want to combine the advantage of both worlds, save your work in a qms “master copy” (or in a database) and only produce gmx files for the sake of exchange. In the right-click context menu of the project, there is a “<strong>save as…</strong>” dialogue which allows you <strong>to switch</strong> between <strong>.gpx</strong> and <strong>.qms</strong> format for this purpose. </p>
+<h3 id="backup-of-databases">Backup of databases</h3>
+<p>Databases are, like qms files, a  QMapShack internal format not supposed to be disassembled by the causal end user.
+See here DocGisDatabase for more on databases.</p>
+<p>In a database, multiple projects are stored in one database file. So if you backup versions of this database, all the projects within will be restored in a consistent way, if you switch to an earlier version. This means on the other hand, that you cannot easily roll back selectively. To do so, you have to open both old and new version and manually copy selected content between them as desired.</p>
+<h3 id="data-on-mobile-device">Data on mobile device</h3>
+<p>Don’t consider your mobile satnav device as a sure location for backup, even if it looks like a memory stick when you plug it into your workstation. </p>
+<p><em>(The following is derived from tests with singular GARMIN nuvi and zumo units. File system organization differs not only between manufacturers, but also between device series and models. Your <strong>milegae</strong> may vary.<strong>WHAT DO YOU MEAN BY THAT?</strong>)</em></p>
+<p>In the directory tree of a plugged Garmin device, you find the <strong>directory “GPX”</strong> similar to this:</p>
+<p><img alt="wiki-garmin.png" src="https://bitbucket.org/repo/L5qerE/images/2180082863-wiki-garmin.png" /></p>
+<p>This contains most information on your device as it refers to QMapShack projects. You may frequently copy them to your Workstation and include it into your backup scheme. The gpx files can be opened as QMapShack projects or any other compatible application.</p>
+<p>We do <strong>not recommend to write directly onto the device</strong> using file level access, unless you do not know what to do. Enjoy the great work the QMS programmers have delivered and <strong>use QMapShack device access</strong> functionality instead. There are quite some items in a GPX file that the standard allows but may upset your device. You have been warned.</p>
+<p>See here DocGisDevices for further information on device access.</p>
+<p>We also do not discuss the other directories, as they are not immediately related to QMS work. There is a plethora of forum entries around, full of tips and good and bad experiences. Good luck trying!</p>
+<p>There is one important thing to mention on mass storage devices: The <strong>risk of premature plugoff</strong> . In other applications, data may still reside in <strong>write cache</strong> RAM only, while the app is displaying successful writing. In Linux, you have to unmount a device, in WIN, you call “safe remove” to make sure the write cache is synced to the device.</p>
+<p>To avoid this, QMapShack implements its own handling of device mounting.
+<em>If you access a device via the icon in the workspace QMapShack will take care about mounting and unmounting the device. Simply plugin the device and wait until QMapShack recognized it. The device is unmounted <strong>unless</strong> QMapShack is actively reading/writing it (<strong>Cursor is an hourglass</strong>). Once done <strong>you can unplug</strong> the device without any further action.</em> </p>
+<p>This automounting of QMapShack may interfere with your OS mounting behavior and produce some warning. But following above rule, you should be on the safe side and not loose any data. If not, its time to file a bug.</p>
+<h1 id="your-workspace">Your Workspace</h1>
+<p>The workspace is the place where QMapShack keeps your actions <strong>while you are working</strong> with it. This is distinct from the concept of project files, where your data conceptually resides before you begin after you are done.</p>
+<p>Data in your file based projects is only stored in your files if you select “save” in the project file line’s context menu.</p>
+<p>If you make any changes to any object (as shown here 
+DocGisItemsEditMultiple 
+in detail), both your edited object and the project it belongs to is marked by an asterisk * in the Data Window with the project tree:</p>
+<p><img alt="wiki-projtree.png" src="https://bitbucket.org/repo/L5qerE/images/4285409798-wiki-projtree.png" /></p>
+<p>This asterisk indicate you that your current changes are not yet written to save storage. At least not yet to the final place in the project file they belong to.</p>
+<p>The good news: there is an periodic <strong>autosave feature</strong> for all these pending changes in your workspace. You can configure it by the menu path <strong>“Project -> setup Workspace”</strong> which gives you:</p>
+<p><img alt="wiki-setupws.png" src="https://bitbucket.org/repo/L5qerE/images/4061261758-wiki-setupws.png" /></p>
+<p>Your workspace is also saved upon clear exit of QMapShack, so all your changes you made are still available after a restart. Thus you can still continue editing, roll back to an earlier stage and/or safe your data objects finally to the project file they are supposed to belong to.</p>
+<p>But beware - your very last changes are lost after some crash of QMapShack. There is no way to manually trigger the saving of the workspace. So if you think five minutes is too risky on your system, or for your style of work, you may decrease the value. </p>
+<p>It is not intended that users play around with the stored workspace. 
+So, if we provide the path here ( ~/.config/QLandkarte/ on linux systems) , this is only for backup purposes.
+If you need instantaneous save or consistent roll back, use one of the concepts outlined above.</p>
+<h3 id="workflow-for-database-based-items">Workflow for Database based items</h3>
+<p>The workflow for database based items is as follows:
+You load any project from the database by activating the associated tickbox in the database window.</p>
+<p><img alt="wiki-db.png" src="https://bitbucket.org/repo/L5qerE/images/1993398614-wiki-db.png" /></p>
+<p>Thus, it’s folder is opened as a project in 
+the workspace with the item attached. The project name is qualified by  @, followed by the parent folder in the database.</p>
+<p>If you edit the item you will see the 
+asterisk that it has been changed - as for file based items. If you save the project, the item will be 
+changed in the database.</p>
+<p>The sync. function is to update your workspace if someone else is changing 
+items on another instance of QMapShack. This includes saving local changes and 
+reloading all items in the workspace. On a conflict the user is asked which 
+version to keep.</p>
+<hr />
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
\ No newline at end of file
diff --git a/doc/DocGisItems.html b/doc/DocGisItems.html
new file mode 100644
index 0000000..7f11718
--- /dev/null
+++ b/doc/DocGisItems.html
@@ -0,0 +1,53 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocSearchGoogle.html">Prev</a> (Search Google) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Create new tracks, waypoints etc.) <a href="DocGisItemsNew.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#waypoints-tracks-co-a-general-word-about-gis-items">Waypoints, Tracks & Co (A general word about GIS items)</a><ul>
+<li><a href="#cluttered-items">Cluttered items</a></li>
+<li><a href="#draw-order-copy-items">Draw Order & Copy Items</a></li>
+<li><a href="#history-of-changes-undoredo">History of Changes & Undo/Redo</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="waypoints-tracks-co-a-general-word-about-gis-items">Waypoints, Tracks & Co (A general word about GIS items)</h1>
+<p>There are artificial items that are created on your computer. And there are items recorded in the field. The artificial ones are based on assumptions of maps and what you think the world looks like. And the ones from the field are created in reality, with an error typical to the GPS.</p>
+<p>Both sources of information have their caveats. As long as you know the origin of the data you are able to do your own assumptions on the reliability. However if artificial and real sources get mixed without notice this can lead to very misleading results. </p>
+<p>Take the recording of a mountain trip, for example. On certain sections the signal conditions might be very bad. But you want to distribute that track. What are you doing now? You can replace the bad section by some artificial data, or move the track points to what ever position you believe that is right. But is that right? Is that a reliable source for anyone else to follow? Or would it be better to simply delete those bad points, showing the user that there is no good data for that  [...]
+<p>Anyway QMapShack is following a certain policy on that topic:</p>
+<ul>
+<li>
+<p>If data is not created within QMapShack, it is locked. The user can unlock the data, but the data is marked as tainted. If data is tainted it will loose significant information. A track, for example, will loose it’s timestamps, as timestamps don’t make any sense if you have moved track points.</p>
+</li>
+<li>
+<p>Data created within QMapShack can be changed without tainting the element. </p>
+</li>
+<li>
+<p>Each item does have a history. The history records each change with a timestamp.</p>
+</li>
+</ul>
+<h2 id="cluttered-items">Cluttered items</h2>
+<p>Sometimes several items have the same coordinate or are very close by. That makes it hard to select a single one. If several items are highlighted (up to 8), simply do a left button click with your mouse. Each item will be shown in a circle with it’s icon. Click on the circle you want. Or somewhere on the map to cancel the selection.</p>
+<p><img alt="maproom1.png" src="images/DocGisItems/maproom1.png" /></p>
+<h2 id="draw-order-copy-items">Draw Order & Copy Items</h2>
+<p>All GIS items are grouped by projects. Currently a project equals to a GPX file. Within a project the items are grouped by their type:</p>
+<ol>
+<li>Tracks</li>
+<li>Routes</li>
+<li>Waypoints</li>
+</ol>
+<p>This order can’t be changed. However you can change the order of items within a group. Items are drawn top most item first, bottom item last. Use drag-n-drop to change that order. For example you want to move a track. Left click on the item keeping the mouse button pressed and move the item. An indicator line will show you where the item will be inserted:</p>
+<p><img alt="maproom2.png" src="images/DocGisItems/maproom2.png" /></p>
+<p>If you release the mouse button the item will be placed at the new location:</p>
+<p><img alt="maproom3.png" src="images/DocGisItems/maproom3.png" /></p>
+<p>Of course you can use drag-n-drop between projects, too. In this case the item is not moved. A complete copy is created including a new key, making the new item a unique one.</p>
+<p><img alt="maproom4.png" src="images/DocGisItems/maproom4.png" /></p>
+<h2 id="history-of-changes-undoredo">History of Changes & Undo/Redo</h2>
+<p>Each item has a <em>History of Changes</em>. You will find it in the <em>Edit Details</em> dialog. The <em>History of Changes</em> list is also an <em>Undo/Redo</em> list. You can click on one of the entries and the item will change to that state. </p>
+<p><img alt="maproom5.png" src="images/DocGisItems/maproom5.png" /></p>
+<p>When saving the data to a QMS file the <em>History of Changes</em> is stored completely. If stored to a GPX file only the informational part is stored and there is no way to restore one of the entries. </p>
+<hr />
+<p><a href="DocSearchGoogle.html">Prev</a> (Search Google) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Create new tracks, waypoints etc.) <a href="DocGisItemsNew.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocGisItems.md b/doc/DocGisItems.md
new file mode 100644
index 0000000..f60892d
--- /dev/null
+++ b/doc/DocGisItems.md
@@ -0,0 +1,59 @@
+[Prev](DocSearchGoogle) (Search Google) | [Home](Home) | [Manual](DocMain) | (Create new tracks, waypoints etc.) [Next](DocGisItemsNew)
+- - -
+[TOC]
+- - -
+
+# Waypoints, Tracks & Co (A general word about GIS items)
+
+There are artificial items that are created on your computer. And there are items recorded in the field. The artificial ones are based on assumptions of maps and what you think the world looks like. And the ones from the field are created in reality, with an error typical to the GPS.
+
+Both sources of information have their caveats. As long as you know the origin of the data you are able to do your own assumptions on the reliability. However if artificial and real sources get mixed without notice this can lead to very misleading results. 
+
+Take the recording of a mountain trip, for example. On certain sections the signal conditions might be very bad. But you want to distribute that track. What are you doing now? You can replace the bad section by some artificial data, or move the track points to what ever position you believe that is right. But is that right? Is that a reliable source for anyone else to follow? Or would it be better to simply delete those bad points, showing the user that there is no good data for that sec [...]
+
+Anyway QMapShack is following a certain policy on that topic:
+
+* If data is not created within QMapShack, it is locked. The user can unlock the data, but the data is marked as tainted. If data is tainted it will loose significant information. A track, for example, will loose it's timestamps, as timestamps don't make any sense if you have moved track points.
+
+* Data created within QMapShack can be changed without tainting the element. 
+
+* Each item does have a history. The history records each change with a timestamp.
+
+## Cluttered items
+
+Sometimes several items have the same coordinate or are very close by. That makes it hard to select a single one. If several items are highlighted (up to 8), simply do a left button click with your mouse. Each item will be shown in a circle with it's icon. Click on the circle you want. Or somewhere on the map to cancel the selection.
+
+![maproom1.png](images/DocGisItems/maproom1.png)
+
+## Draw Order & Copy Items
+
+All GIS items are grouped by projects. Currently a project equals to a GPX file. Within a project the items are grouped by their type:
+
+1. Tracks
+2. Routes
+3. Waypoints
+
+This order can't be changed. However you can change the order of items within a group. Items are drawn top most item first, bottom item last. Use drag-n-drop to change that order. For example you want to move a track. Left click on the item keeping the mouse button pressed and move the item. An indicator line will show you where the item will be inserted:
+
+![maproom2.png](images/DocGisItems/maproom2.png)
+
+If you release the mouse button the item will be placed at the new location:
+
+![maproom3.png](images/DocGisItems/maproom3.png)
+
+Of course you can use drag-n-drop between projects, too. In this case the item is not moved. A complete copy is created including a new key, making the new item a unique one.
+
+![maproom4.png](images/DocGisItems/maproom4.png)
+
+## History of Changes & Undo/Redo
+
+Each item has a _History of Changes_. You will find it in the _Edit Details_ dialog. The _History of Changes_ list is also an _Undo/Redo_ list. You can click on one of the entries and the item will change to that state. 
+
+![maproom5.png](images/DocGisItems/maproom5.png)
+
+When saving the data to a QMS file the _History of Changes_ is stored completely. If stored to a GPX file only the informational part is stored and there is no way to restore one of the entries. 
+
+
+
+- - -
+[Prev](DocSearchGoogle) (Search Google) | [Home](Home) | [Manual](DocMain) | (Create new tracks, waypoints etc.) [Next](DocGisItemsNew)
diff --git a/doc/DocGisItemsArea.html b/doc/DocGisItemsArea.html
new file mode 100644
index 0000000..c3ad3c2
--- /dev/null
+++ b/doc/DocGisItemsArea.html
@@ -0,0 +1,39 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocGisItemsWpt.html">Prev</a> (Waypoints) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Edit items with multiple points (tracks, routes, areas)) <a href="DocGisItemsEditMultiple.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#area-overlay">Area Overlay</a><ul>
+<li><a href="#view-edit-details">View / Edit Details</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="area-overlay">Area Overlay</h1>
+<p>An area overlay is a polygon to mark an area on a map. Commonly used by search and rescue.</p>
+<p><img alt="maproom1.png" src="images/DocGisItemsArea/maproom1.png" /></p>
+<p>Of course you can try to play Tetris with area overlays, too.</p>
+<p>If you click on the highlighted area you get a short on-screen-summary and a few options:</p>
+<p><img alt="maproom2.png" src="images/DocGisItemsArea/maproom2.png" /></p>
+<ol>
+<li>View / Edit area - See the full details about the area in a dialog with the option to edit the data.</li>
+<li>Delete the area</li>
+<li>Change the coordinates of the area. See <a href="DocGisItemsEditMultiple.html">“Edit items with multiple points (tracks, routes, areas)”</a> for more details.</li>
+</ol>
+<h2 id="view-edit-details">View / Edit Details</h2>
+<p><img alt="maproom3.png" src="images/DocGisItemsArea/maproom3.png" /></p>
+<ol>
+<li>The area name. Simply click on the highlighted name to edit.</li>
+<li>As mentioned in Waypoints, Tracks & Co items are locked, when imported into QMapShack. You can edit them all the same if you unlock them by pressing the lock button.</li>
+<li>The color of the area polygon. </li>
+<li>The fill pattern of the are. Next to some criss-cross patterns this can be solid or none.</li>
+<li>The border with of the area polygon. </li>
+<li>The compete area polygon can be drawn with 30% or 100% opacity.</li>
+<li>Add a comment or a description by clicking on the highlighted string. </li>
+<li>The coordinates of the area (read only)</li>
+<li>This is the history list showing all changes applied to the area.</li>
+</ol>
+<hr />
+<p><a href="DocGisItemsWpt.html">Prev</a> (Waypoints) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Edit items with multiple points (tracks, routes, areas)) <a href="DocGisItemsEditMultiple.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocGisItemsArea.md b/doc/DocGisItemsArea.md
new file mode 100644
index 0000000..3ed22cb
--- /dev/null
+++ b/doc/DocGisItemsArea.md
@@ -0,0 +1,37 @@
+[Prev](DocGisItemsWpt) (Waypoints) | [Home](Home) | [Manual](DocMain) | (Edit items with multiple points (tracks, routes, areas)) [Next](DocGisItemsEditMultiple)
+- - -
+[TOC]
+- - -
+
+# Area Overlay
+
+An area overlay is a polygon to mark an area on a map. Commonly used by search and rescue.
+
+![maproom1.png](images/DocGisItemsArea/maproom1.png)
+
+Of course you can try to play Tetris with area overlays, too.
+
+If you click on the highlighted area you get a short on-screen-summary and a few options:
+
+![maproom2.png](images/DocGisItemsArea/maproom2.png)
+
+1. View / Edit area - See the full details about the area in a dialog with the option to edit the data.
+2. Delete the area
+3. Change the coordinates of the area. See ["Edit items with multiple points (tracks, routes, areas)"](DocGisItemsEditMultiple) for more details.
+
+## View / Edit Details
+
+![maproom3.png](images/DocGisItemsArea/maproom3.png)
+
+1. The area name. Simply click on the highlighted name to edit.
+2. As mentioned in Waypoints, Tracks & Co items are locked, when imported into QMapShack. You can edit them all the same if you unlock them by pressing the lock button.
+3. The color of the area polygon. 
+4. The fill pattern of the are. Next to some criss-cross patterns this can be solid or none.
+5. The border with of the area polygon. 
+6. The compete area polygon can be drawn with 30% or 100% opacity.
+7. Add a comment or a description by clicking on the highlighted string. 
+8. The coordinates of the area (read only)
+9. This is the history list showing all changes applied to the area.
+
+- - -
+[Prev](DocGisItemsWpt) (Waypoints) | [Home](Home) | [Manual](DocMain) | (Edit items with multiple points (tracks, routes, areas)) [Next](DocGisItemsEditMultiple)
diff --git a/doc/DocGisItemsEditMultiple.html b/doc/DocGisItemsEditMultiple.html
new file mode 100644
index 0000000..356c280
--- /dev/null
+++ b/doc/DocGisItemsEditMultiple.html
@@ -0,0 +1,136 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocGisItemsArea.html">Prev</a> (Areas) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Database) <a href="DocGisDatabase.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#edit-items-with-multiple-points-tracks-routes-areasvalid-from-version-130-or-later">Edit items with multiple points (tracks, routes, areas)(valid from version 1.3.0 or later)</a><ul>
+<li><a href="#saving-data">Saving data</a></li>
+<li><a href="#edit-line">Edit line</a></li>
+<li><a href="#routing">Routing</a></li>
+<li><a href="#undoredo">Undo/Redo</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="edit-items-with-multiple-points-tracks-routes-areasvalid-from-version-130-or-later">Edit items with multiple points (tracks, routes, areas)(valid from version 1.3.0 or later)</h1>
+<p><img alt="maproom2" src="images/DocGisItemsEditMultiple/AreaMove.png" /> <img alt="maproom2" src="images/DocGisItemsEditMultiple/LineMove.png" /> To edit the line of those items you have to switch into line edit mode. This will create a copy of the line. The copy can be changed and changes have to be saved to the original item or new item is created. Please be aware that especially for tracks additional data like timestamps and elevation will be lost when saving the changed line to th [...]
+<p>The line looks like:</p>
+<p><img alt="maproom2" src="images/DocGisItemsEditMultiple/qms2.png" /></p>
+<p>The points that can be changed are marked by large black squares. The square under the mouse cursor is highlighted by a red square. Sub-points, introduced by auto-routing, are marked with small black dots. The first point of a line has a yellow frame. The last a green one.</p>
+<p>In line edit mode several buttons are displayed on-screen. </p>
+<p><img alt="maproom2" src="images/DocGisItemsEditMultiple/qms1.png" /></p>
+<h2 id="saving-data">Saving data</h2>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><strong>Save to original</strong></td>
+<td>This will replace the original data by the one of the edited line. The edited line only holds the coordinates and the elevation from DEM files if one is loaded for the area. Especially a track can contain much more information for each point if it is a real recording. Therefore QMapShack is the wrong tool to spoof your track recordings. It’s only good to visualize real tracks and draw and edit artificial ones.</td>
+</tr>
+<tr>
+<td><strong>Save as new</strong></td>
+<td>Create a new GIS item.</td>
+</tr>
+<tr>
+<td><strong>Abort</strong></td>
+<td>Leave the line edit mode without a change.</td>
+</tr>
+</tbody>
+</table>
+<p>Points and sub-points are stored different depending on the GIS item:</p>
+<p><strong>Track</strong> - On save all sub-points are converted to real points. </p>
+<p><strong>Area</strong> -  On save all sub-points are converted to real points. </p>
+<p><strong>Route</strong> - On save all points are stored as route waypoints. All sub-points are stored as intermediate route points. No navigation information is generated or stored. </p>
+<h2 id="edit-line">Edit line</h2>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><img alt="maproom2" src="images/DocGisItemsEditMultiple/PointMove.png" /></td>
+<td>Move a point</td>
+<td><code>CTRL+M</code> Move the mouse cursor over a point until it is highlighted. A left click will make the point stick to the mouse cursor. A right click will abort the operation. A second left click will drop the point at the new position. If routing is enabled the lines to and from the point are updated by sub-lines .</td>
+</tr>
+<tr>
+<td><img alt="maproom2" src="images/DocGisItemsEditMultiple/Add.png" /></td>
+<td>Add a point</td>
+<td><code>CTRL++</code> Add a point to a line segment or at the start or end of the line. Move the mouse cursor over a line segment or a point to highlight it. A left click will add a new point that sticks to the mouse cursor.  A right click will abort the operation. A second left click will drop the point at the new position. If routing is enabled the lines to and from the point are updated by sub-lines.</td>
+</tr>
+<tr>
+<td><img alt="maproom2" src="images/DocGisItemsEditMultiple/SelectRange.png" /></td>
+<td>Select a range of points</td>
+<td><code>CTRL+R</code> Select the first and last point with a left click of your mouse. You will get two options to choose from. <img alt="maproom2" src="images/DocGisItemsEditMultiple/DeleteOne_small.png" /> Delete all points between the first and the last selected point. <img alt="maproom2" src="images/DocGisItemsEditMultiple/Apply_small.png" /> Calculate a route between the first and the last point. Make sure the routing mode and router are setup properly to make it work.</td>
+</tr>
+<tr>
+<td><img alt="maproom2" src="images/DocGisItemsEditMultiple/DeleteOne.png" /></td>
+<td>Delete</td>
+<td><code>CTRL+D</code> Remove a highlighted point by a left click. If routing is enabled the lines to and from the point are updated by sub-lines.</td>
+</tr>
+</tbody>
+</table>
+<h2 id="routing">Routing</h2>
+<p>When creating a track or a route different routing modes can be used and selected by the next buttons. The modes are described in the following table. If auto-routing is used then a properly configured offline router must be selected before the start of track/route creation process. The selected router (routing database)
+should have the routing information for the region used in the map.</p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><strong>0</strong></td>
+<td><code>CTRL+O</code> No routing selected. Points are connected by a straight line.</td>
+</tr>
+<tr>
+<td><strong>A</strong></td>
+<td><code>CTRL+A</code> Auto-routing. The points are connected by sublines derived by the router.</td>
+</tr>
+<tr>
+<td><strong>V</strong></td>
+<td><code>CTRL+V</code> Vector-routing. To use vector-routing a vector map must be active for the area. The points are connected by the points of a polyline in the vector map. It is important that the first and the second line is part of the polygon. Else a straight line is used.</td>
+</tr>
+</tbody>
+</table>
+<p>The routing mode can be changed during the track/route creation by pressing the keys described.</p>
+<h2 id="undoredo">Undo/Redo</h2>
+<p>While in line edit mode all changes can be undone.</p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><img alt="maproom2" src="images/DocGisItemsEditMultiple/Undo.png" /></td>
+<td>Undo last operation</td>
+</tr>
+<tr>
+<td><img alt="maproom2" src="images/DocGisItemsEditMultiple/Redo.png" /></td>
+<td>Redo last operation</td>
+</tr>
+<tr>
+<td>- - -</td>
+<td></td>
+</tr>
+<tr>
+<td><a href="DocGisItemsArea.html">Prev</a> (Areas)</td>
+<td><a href="Home.html">Home</a></td>
+</tr>
+</tbody>
+</table>
\ No newline at end of file
diff --git a/doc/DocGisItemsEditMultiple.md b/doc/DocGisItemsEditMultiple.md
new file mode 100644
index 0000000..482fbbc
--- /dev/null
+++ b/doc/DocGisItemsEditMultiple.md
@@ -0,0 +1,67 @@
+[Prev](DocGisItemsArea) (Areas) | [Home](Home) | [Manual](DocMain) | (Database) [Next](DocGisDatabase)
+- - -
+[TOC]
+- - -
+
+# Edit items with multiple points (tracks, routes, areas)(valid from version 1.3.0 or later)
+
+![maproom2](images/DocGisItemsEditMultiple/AreaMove.png) ![maproom2](images/DocGisItemsEditMultiple/LineMove.png) To edit the line of those items you have to switch into line edit mode. This will create a copy of the line. The copy can be changed and changes have to be saved to the original item or new item is created. Please be aware that especially for tracks additional data like timestamps and elevation will be lost when saving the changed line to the original item.
+
+The line looks like:
+
+![maproom2](images/DocGisItemsEditMultiple/qms2.png)
+
+The points that can be changed are marked by large black squares. The square under the mouse cursor is highlighted by a red square. Sub-points, introduced by auto-routing, are marked with small black dots. The first point of a line has a yellow frame. The last a green one.
+
+In line edit mode several buttons are displayed on-screen. 
+
+![maproom2](images/DocGisItemsEditMultiple/qms1.png)
+
+## Saving data ##
+
+| | |
+|-|-|
+|**Save to original**| This will replace the original data by the one of the edited line. The edited line only holds the coordinates and the elevation from DEM files if one is loaded for the area. Especially a track can contain much more information for each point if it is a real recording. Therefore QMapShack is the wrong tool to spoof your track recordings. It's only good to visualize real tracks and draw and edit artificial ones.|
+|**Save as new**|Create a new GIS item.|
+|**Abort**|Leave the line edit mode without a change.|
+
+
+Points and sub-points are stored different depending on the GIS item:
+
+**Track** - On save all sub-points are converted to real points. 
+
+**Area** -  On save all sub-points are converted to real points. 
+
+**Route** - On save all points are stored as route waypoints. All sub-points are stored as intermediate route points. No navigation information is generated or stored. 
+
+## Edit line ##
+| | | |
+|-|-|-|
+|![maproom2](images/DocGisItemsEditMultiple/PointMove.png)| Move a point| `CTRL+M` Move the mouse cursor over a point until it is highlighted. A left click will make the point stick to the mouse cursor. A right click will abort the operation. A second left click will drop the point at the new position. If routing is enabled the lines to and from the point are updated by sub-lines .|
+|![maproom2](images/DocGisItemsEditMultiple/Add.png)| Add a point| `CTRL++` Add a point to a line segment or at the start or end of the line. Move the mouse cursor over a line segment or a point to highlight it. A left click will add a new point that sticks to the mouse cursor.  A right click will abort the operation. A second left click will drop the point at the new position. If routing is enabled the lines to and from the point are updated by sub-lines.|
+|![maproom2](images/DocGisItemsEditMultiple/SelectRange.png)| Select a range of points| `CTRL+R` Select the first and last point with a left click of your mouse. You will get two options to choose from. ![maproom2](images/DocGisItemsEditMultiple/DeleteOne_small.png) Delete all points between the first and the last selected point. ![maproom2](images/DocGisItemsEditMultiple/Apply_small.png) Calculate a route between the first and the last point. Make sure the routing mode and router are se [...]
+|![maproom2](images/DocGisItemsEditMultiple/DeleteOne.png)|Delete|`CTRL+D` Remove a highlighted point by a left click. If routing is enabled the lines to and from the point are updated by sub-lines.|
+
+## Routing ##
+When creating a track or a route different routing modes can be used and selected by the next buttons. The modes are described in the following table. If auto-routing is used then a properly configured offline router must be selected before the start of track/route creation process. The selected router (routing database)
+should have the routing information for the region used in the map.
+
+| | |
+|-|-|
+|**0**| `CTRL+O` No routing selected. Points are connected by a straight line.|
+|**A**| `CTRL+A` Auto-routing. The points are connected by sublines derived by the router.|
+|**V**| `CTRL+V` Vector-routing. To use vector-routing a vector map must be active for the area. The points are connected by the points of a polyline in the vector map. It is important that the first and the second line is part of the polygon. Else a straight line is used.|
+
+The routing mode can be changed during the track/route creation by pressing the keys described.
+
+## Undo/Redo ##
+
+While in line edit mode all changes can be undone.
+
+| | |
+|-|-|
+|![maproom2](images/DocGisItemsEditMultiple/Undo.png)| Undo last operation|
+|![maproom2](images/DocGisItemsEditMultiple/Redo.png)| Redo last operation|
+
+- - -
+[Prev](DocGisItemsArea) (Areas) | [Home](Home) | [Manual](DocMain) | (Database) [Next](DocGisDatabase)
diff --git a/doc/DocGisItemsNew.html b/doc/DocGisItemsNew.html
new file mode 100644
index 0000000..fb4a15e
--- /dev/null
+++ b/doc/DocGisItemsNew.html
@@ -0,0 +1,34 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocGisItems.html">Prev</a> (Tracks, Waypoints & Co) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Tracks) <a href="DocGisItemsTrk2.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#create-new-tracks-waypoints-etc">Create new tracks, waypoints etc.</a><ul>
+<li><a href="#waypoint">Waypoint</a></li>
+<li><a href="#track">Track</a></li>
+<li><a href="#area">Area</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="create-new-tracks-waypoints-etc">Create new tracks, waypoints etc.</h1>
+<p>You can create your own GIS items in QMapShack by a simple right mouse click on the canvas.</p>
+<p><img alt="start" src="images/DocGisItemsNew/maproom1.png" /></p>
+<p>Select the item to add from the menu.</p>
+<h2 id="waypoint">Waypoint</h2>
+<p>The default position of a new waypoint will be the right click position of the mouse cursor. The first dialog will show you the coordinates and you can change them if necessary.</p>
+<p><img alt="start" src="images/DocGisItemsNew/maproom2.png" /></p>
+<p>Next you will be asked for a name. If you add more waypoints the name will be appended by a counter.  If you append the name with a number, the number will be incremented by the next new waypoint.</p>
+<p><img alt="start" src="images/DocGisItemsNew/maproom3.png" /></p>
+<p>Now you have to select an icon for your waypoint. The last selected icon will be marked as default.</p>
+<p><img alt="start" src="images/DocGisItemsNew/maproom4.png" /></p>
+<p>Finally you have to select a project for your new waypoint. You can select from a list of already loaded projects or create a new one.</p>
+<p><img alt="start" src="images/DocGisItemsNew/maproom5.png" /></p>
+<h2 id="track">Track</h2>
+<p>If you select a track as new element the mouse position will be taken as first track point and the mouse cursor will enter the line edit mode. See  <a href="DocGisItemsEditMultiple.html">“Edit items with multiple points (tracks, routes, areas)”</a> for more details.</p>
+<h2 id="area">Area</h2>
+<p>If you select an area as new element the mouse position will be taken as first point and the mouse cursor will enter the line edit mode. See  <a href="DocGisItemsEditMultiple.html">“Edit items with multiple points (tracks, routes, areas)”</a> for more details.</p>
+<hr />
+<p><a href="DocGisItems.html">Prev</a> (Tracks, Waypoints & Co) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Tracks) <a href="DocGisItemsTrk2.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocGisItemsNew.md b/doc/DocGisItemsNew.md
new file mode 100644
index 0000000..e83b6fe
--- /dev/null
+++ b/doc/DocGisItemsNew.md
@@ -0,0 +1,41 @@
+[Prev](DocGisItems) (Tracks, Waypoints & Co) | [Home](Home) | [Manual](DocMain) | (Tracks) [Next](DocGisItemsTrk2)
+- - -
+[TOC]
+- - -
+
+# Create new tracks, waypoints etc.
+
+You can create your own GIS items in QMapShack by a simple right mouse click on the canvas.
+
+![start](images/DocGisItemsNew/maproom1.png)
+
+Select the item to add from the menu.
+
+## Waypoint
+
+The default position of a new waypoint will be the right click position of the mouse cursor. The first dialog will show you the coordinates and you can change them if necessary.
+
+![start](images/DocGisItemsNew/maproom2.png)
+
+Next you will be asked for a name. If you add more waypoints the name will be appended by a counter.  If you append the name with a number, the number will be incremented by the next new waypoint.
+
+![start](images/DocGisItemsNew/maproom3.png)
+
+Now you have to select an icon for your waypoint. The last selected icon will be marked as default.
+
+![start](images/DocGisItemsNew/maproom4.png)
+
+Finally you have to select a project for your new waypoint. You can select from a list of already loaded projects or create a new one.
+
+![start](images/DocGisItemsNew/maproom5.png)
+
+## Track
+
+If you select a track as new element the mouse position will be taken as first track point and the mouse cursor will enter the line edit mode. See  ["Edit items with multiple points (tracks, routes, areas)"](DocGisItemsEditMultiple) for more details.
+
+## Area
+
+If you select an area as new element the mouse position will be taken as first point and the mouse cursor will enter the line edit mode. See  ["Edit items with multiple points (tracks, routes, areas)"](DocGisItemsEditMultiple) for more details.
+
+- - -
+[Prev](DocGisItems) (Tracks, Waypoints & Co) | [Home](Home) | [Manual](DocMain) | (Tracks) [Next](DocGisItemsTrk2)
diff --git a/doc/DocGisItemsRte.html b/doc/DocGisItemsRte.html
new file mode 100644
index 0000000..e9c76c9
--- /dev/null
+++ b/doc/DocGisItemsRte.html
@@ -0,0 +1,54 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocGisItemsTrk2.html">Prev</a> (Tracks) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Waypoints) <a href="DocGisItemsWpt.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#routes">Routes</a></li>
+<li><a href="#routing-engines">Routing Engines</a><ul>
+<li><a href="#routino">Routino</a><ul>
+<li><a href="#create-own-routino-database">Create Own Routino database</a></li>
+</ul>
+</li>
+<li><a href="#mapquest">MapQuest</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="routes">Routes</h1>
+<p>A route is a collection of waypoints with an order. The path between each point is usually a straight line. With routing information a path using the street network can be derived. The calculation can be done by a server (online routing) or with a local database (offline routing).</p>
+<p><img alt="maproom1.png" src="images/DocGisItemsRte/qms1.png" /> <img alt="maproom1.png" src="images/DocGisItemsRte/qms2.png" /></p>
+<p>If you click on the highlighted route you get a short on-screen-summary and a few options:</p>
+<p><img alt="maproom1.png" src="images/DocGisItemsRte/qms3.png" /></p>
+<p><img alt="maproom1.png" src="images/DocGisItemsRte/EditDetails.png" /> Edit details about route.</p>
+<p><img alt="maproom1.png" src="images/DocGisItemsRte/Copy.png" /> Copy the route into another project.</p>
+<p><img alt="maproom1.png" src="images/DocGisItemsRte/DeleteOne.png" /> Delete the route from the project.</p>
+<p><img alt="maproom1.png" src="images/DocGisItemsRte/RteInstr.png" /> Highlight route and see instructions.</p>
+<p><img alt="maproom1.png" src="images/DocGisItemsRte/Apply.png" /> Calculate the route. The current router selection and configuration is used. </p>
+<p><img alt="maproom1.png" src="images/DocGisItemsRte/Reset.png" /> Reset the route to waypoints connected with straight lines.</p>
+<p><img alt="maproom1.png" src="images/DocGisItemsRte/LineMove.png" /> Edit the route. Move waypoints, add waypoints, delete waypoints.</p>
+<h1 id="routing-engines">Routing Engines</h1>
+<p>Currently Routino is supported as offline router and MapQuest as online routing service.</p>
+<h2 id="routino">Routino</h2>
+<p><img alt="maproom1.png" src="images/DocGisItemsRte/qms4.png" /></p>
+<p>Routino is an offline router written by Andrew M. Bishop. See the project’s <a href="http://routino.org/">homepage</a> for more details. As it is working without an Internet connection it needs routing data locally installed. A database needs 4 files:</p>
+<div class="codehilite"><pre>*-nodes.mem
+*-relations.mem
+*-segments.mem
+*-ways.mem
+</pre></div>
+
+
+<p>Replace the “*” with a name of the database, e.g. “Europe” or “North_America”. This will be the name displayed on the GUI. The “_” will be replaced by ” “.</p>
+<p>To create a database use planetsplitter from the Routino package. Currently this is installed with the QMapShack installation. Please refer to the <a href="http://routino.org/documentation/usage.html">online documentation</a> on how to use planetsplitter.</p>
+<p>There is also a ready to use collection of database files for <a href="https://jeepxj.de/pub/routino/">download</a>. You have to un-zip the files into a directory and use QMapShack’s Routino setup to register the path. Click the blue folder to do so.</p>
+<h3 id="create-own-routino-database">Create Own Routino database</h3>
+<p>A Routino database is created from OSM data. The used file format is *pbf. You find these files at <a href="http://download.geofabrik.de/">GeoFabrik</a>.</p>
+<p><img alt="maproom1.png" src="images/DocGisItemsRte/qms5.png" /></p>
+<p>Add one or more *pbf files to the input list. Select an output path and name prefix. Press start to compile a new database.</p>
+<h2 id="mapquest">MapQuest</h2>
+<p><img alt="maproom1.png" src="images/DocGisItemsRte/qms6.png" /></p>
+<p>MapQuest is an online resource. It will answer to up to 15.000 requests each month without a charge. If that limit is exceeded the requests from all QMapShack users it will stop working until the end of the month. Compared to Routino MapQuest is better for car routes. For hikes and bike tours Routino is prefered. </p>
+<hr />
+<p><a href="DocGisItemsTrk2.html">Prev</a> (Tracks) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Waypoints) <a href="DocGisItemsWpt.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocGisItemsRte.md b/doc/DocGisItemsRte.md
new file mode 100644
index 0000000..c57c614
--- /dev/null
+++ b/doc/DocGisItemsRte.md
@@ -0,0 +1,69 @@
+[Prev](DocGisItemsTrk2) (Tracks) | [Home](Home) | [Manual](DocMain) | (Waypoints) [Next](DocGisItemsWpt)
+- - -
+[TOC]
+- - -
+
+# Routes
+
+A route is a collection of waypoints with an order. The path between each point is usually a straight line. With routing information a path using the street network can be derived. The calculation can be done by a server (online routing) or with a local database (offline routing).
+
+![maproom1.png](images/DocGisItemsRte/qms1.png) ![maproom1.png](images/DocGisItemsRte/qms2.png)
+
+If you click on the highlighted route you get a short on-screen-summary and a few options:
+
+![maproom1.png](images/DocGisItemsRte/qms3.png)
+
+![maproom1.png](images/DocGisItemsRte/EditDetails.png) Edit details about route.
+
+![maproom1.png](images/DocGisItemsRte/Copy.png) Copy the route into another project.
+
+![maproom1.png](images/DocGisItemsRte/DeleteOne.png) Delete the route from the project.
+
+![maproom1.png](images/DocGisItemsRte/RteInstr.png) Highlight route and see instructions.
+
+![maproom1.png](images/DocGisItemsRte/Apply.png) Calculate the route. The current router selection and configuration is used. 
+
+![maproom1.png](images/DocGisItemsRte/Reset.png) Reset the route to waypoints connected with straight lines.
+
+![maproom1.png](images/DocGisItemsRte/LineMove.png) Edit the route. Move waypoints, add waypoints, delete waypoints.
+
+# Routing Engines #
+
+Currently Routino is supported as offline router and MapQuest as online routing service.
+
+## Routino ##
+
+![maproom1.png](images/DocGisItemsRte/qms4.png)
+
+Routino is an offline router written by Andrew M. Bishop. See the project's [homepage](http://routino.org/) for more details. As it is working without an Internet connection it needs routing data locally installed. A database needs 4 files:
+
+```
+#!text
+*-nodes.mem
+*-relations.mem
+*-segments.mem
+*-ways.mem
+```
+
+Replace the "*" with a name of the database, e.g. "Europe" or "North_America". This will be the name displayed on the GUI. The "_" will be replaced by " ".
+
+To create a database use planetsplitter from the Routino package. Currently this is installed with the QMapShack installation. Please refer to the [online documentation](http://routino.org/documentation/usage.html) on how to use planetsplitter.
+
+There is also a ready to use collection of database files for [download](https://jeepxj.de/pub/routino/). You have to un-zip the files into a directory and use QMapShack's Routino setup to register the path. Click the blue folder to do so.
+
+### Create Own Routino database ###
+
+A Routino database is created from OSM data. The used file format is *pbf. You find these files at [GeoFabrik](http://download.geofabrik.de/).
+
+![maproom1.png](images/DocGisItemsRte/qms5.png)
+
+Add one or more *pbf files to the input list. Select an output path and name prefix. Press start to compile a new database.
+
+## MapQuest ##
+
+![maproom1.png](images/DocGisItemsRte/qms6.png)
+
+MapQuest is an online resource. It will answer to up to 15.000 requests each month without a charge. If that limit is exceeded the requests from all QMapShack users it will stop working until the end of the month. Compared to Routino MapQuest is better for car routes. For hikes and bike tours Routino is prefered. 
+
+- - -
+[Prev](DocGisItemsTrk2) (Tracks) | [Home](Home) | [Manual](DocMain) | (Waypoints) [Next](DocGisItemsWpt)
diff --git a/doc/DocGisItemsTrk2.html b/doc/DocGisItemsTrk2.html
new file mode 100644
index 0000000..76ae10d
--- /dev/null
+++ b/doc/DocGisItemsTrk2.html
@@ -0,0 +1,213 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocGisItemsNew.html">Prev</a> (Create new tracks, waypoints etc.) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Routes) <a href="DocGisItemsRte.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#tracks">Tracks</a><ul>
+<li><a href="#track-details-dialog">Track Details Dialog</a><ul>
+<li><a href="#graph-area">Graph Area</a></li>
+<li><a href="#info">Info</a></li>
+<li><a href="#style">Style</a></li>
+<li><a href="#graphs">Graphs</a></li>
+<li><a href="#activity">Activity</a></li>
+<li><a href="#points">Points</a></li>
+<li><a href="#filter">Filter</a></li>
+<li><a href="#history">History</a></li>
+</ul>
+</li>
+<li><a href="#track-filter">Track Filter</a><ul>
+<li><a href="#points_1">Points</a></li>
+<li><a href="#elevation">Elevation</a></li>
+<li><a href="#timestamps">Timestamps</a></li>
+<li><a href="#extensions">Extensions</a></li>
+<li><a href="#split-track">Split Track</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="tracks">Tracks</h1>
+<p>A track is a list of points recorded while moving along. Tracks are also created artificially to be used for navigation and planning.</p>
+<p><img alt="maproom1.png" src="images/DocGisItemsTrk/maproom1.png" /></p>
+<p>If you click on the track line in the map view you open a short on-screen-summary and a few options:</p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><img alt="maproom1.png" src="images/DocGisItemsTrk/EditDetails.png" /></td>
+<td>Edit/Show Details</td>
+<td>Show details of the track and edit data attached to the track. <a href="DocGisItemsTrk2.html#track-details-dialog">More…</a></td>
+</tr>
+<tr>
+<td><img alt="maproom1.png" src="images/DocGisItemsTrk/Copy.png" /></td>
+<td>Copy</td>
+<td>Copy the track into another project.</td>
+</tr>
+<tr>
+<td><img alt="maproom1.png" src="images/DocGisItemsTrk/DeleteOne.png" /></td>
+<td>Delete</td>
+<td>Delete the track.</td>
+</tr>
+<tr>
+<td><img alt="maproom1.png" src="images/DocGisItemsTrk/TrkProfile.png" /></td>
+<td>Profile</td>
+<td>Highlight the track and show the on-screen track profile. The key combination “ctrl+e” will make the profile a sizable and movable widget. Use the same key combination to switch back.</td>
+</tr>
+<tr>
+<td><img alt="maproom1.png" src="images/DocGisItemsTrk/SelectRange.png" /></td>
+<td>Range</td>
+<td>Select a range of track points for information about that range and some additional functions (hide, show, activity, copy)</td>
+</tr>
+<tr>
+<td><img alt="maproom1.png" src="images/DocGisItemsTrk/LineMove.png" /></td>
+<td>Edit</td>
+<td>Edit the line of the track by moving track points. See <a href="DocGisItemsEditMultiple.html">Edit items with multiple points (tracks, routes, areas)</a> for details.</td>
+</tr>
+<tr>
+<td><img alt="maproom1.png" src="images/DocGisItemsTrk/Reverse.png" /></td>
+<td>Reverse</td>
+<td>Create a reversed copy of the track.</td>
+</tr>
+<tr>
+<td><img alt="maproom1.png" src="images/DocGisItemsTrk/Combine.png" /></td>
+<td>Combine</td>
+<td>Combine this track with other tracks in the project</td>
+</tr>
+<tr>
+<td><img alt="maproom1.png" src="images/DocGisItemsTrk/TrkCut.png" /></td>
+<td>Cut</td>
+<td>Cut the track at the selected point. You can use that to delete points at the start or the end of the track. Or to split a track into stages.</td>
+</tr>
+</tbody>
+</table>
+<h2 id="track-details-dialog">Track Details Dialog</h2>
+<p><img alt="maproom1.png" src="images/DocGisItemsTrk/DetailsDialog.png" /></p>
+<p>The dialog has 3 areas:</p>
+<p>1) The graph area with up to three graphs. The profile graph on top is static and can’t be changed. The other two graphs can display arbitrary track properties.</p>
+<p>2) The track information area on the left bottom. It displays the same information as the on-screen summary. There are two icons:</p>
+<ul>
+<li><img alt="maproom1.png" src="images/DocGisItemsTrk/Lock.png" /> If he lock is closed the track is read only. To edit track data you have to press it.</li>
+<li><img alt="maproom1.png" src="images/DocGisItemsTrk/Tainted.png" /> If the track has been imported and was changed it is considered as tainted. If the ink spot is visible you know the track has been altered.</li>
+</ul>
+<p>Note about displayed cumulative elevation gain :
+As this value is derived from raw data, some filtering is necessary to avoid exaggerated results.
+Because measured elevation often fluctuates even when GPSr is placed at a constant elevation, it would make no sense to take into account each measured bump.
+It was decided in QMS to use a threshold of 5 meters : elevation is accumulated only if elevation grows more than 5 meters.</p>
+<p>3) In the tab widget on the right bottom you will find more information about the track and various tools to edit the track data and how it is presented.</p>
+<h3 id="graph-area">Graph Area</h3>
+<p><img alt="maproom1.png" src="images/DocGisItemsTrk/GraphArea.png" /></p>
+<p>If you move the mouse over the graph area you will see some information about the current point in the text field on top. You can start a selection with a left click of your mouse. You define the end of the range by a second click. This will give you some additional information about the selected range and a few options to apply to the range.</p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><img alt="maproom1.png" src="images/DocGisItemsTrk/PointHide.png" /></td>
+<td>Hide</td>
+<td>Hide the selected track points</td>
+</tr>
+<tr>
+<td><img alt="maproom1.png" src="images/DocGisItemsTrk/PointShow.png" /></td>
+<td>Show</td>
+<td>Show all track points between the first and last point of the selection</td>
+</tr>
+<tr>
+<td><img alt="maproom1.png" src="images/DocGisItemsTrk/Activity.png" /></td>
+<td>Activity</td>
+<td>Mark the selected track points to be part of a activity to be selected</td>
+</tr>
+<tr>
+<td><img alt="maproom1.png" src="images/DocGisItemsTrk/Copy.png" /></td>
+<td>Copy</td>
+<td>Copy selected track points as a new track</td>
+</tr>
+</tbody>
+</table>
+<p>Another left click on the graph will abort. Doing a right click on the graph will display a context menu:</p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><img alt="maproom1.png" src="images/DocGisItemsTrk/Zoom.png" /></td>
+<td>Reset zoom</td>
+<td>You can zoom on the x-axis with your mouse wheel. This can be reset by this menu item</td>
+</tr>
+<tr>
+<td><img alt="maproom1.png" src="images/DocGisItemsTrk/SelectRange.png" /></td>
+<td>Abort selection</td>
+<td>This is another way to stop the range selection</td>
+</tr>
+<tr>
+<td><img alt="maproom1.png" src="images/DocGisItemsTrk/Save.png" /></td>
+<td>Save</td>
+<td>Save the graph as image.</td>
+</tr>
+</tbody>
+</table>
+<h3 id="info">Info</h3>
+<p><img alt="maproom1.png" src="images/DocGisItemsTrk/InfoTab.png" /></p>
+<p>In the info tab you can see a small representation of your track. The red dot is the current position selected by the mouse on the graphs. You can edit the description and comment. Or add Web links. On some devices the link can be used to reference additional data.</p>
+<h3 id="style">Style</h3>
+<p><img alt="maproom1.png" src="images/DocGisItemsTrk/StyleTab.png" /></p>
+<p>In the style tab you can setup how the track is drawn on the map. You can select the color of the track. This selection is portable to most of the applications/devices. Alternatively you can select a track point property to colorize the track. This selection will be saved with the track, but is not portable to any other application/device.</p>
+<h3 id="graphs">Graphs</h3>
+<p><img alt="maproom1.png" src="images/DocGisItemsTrk/GraphsTab.png" /></p>
+<p>In the graph tab you can select how many graphs are displayed and what track point property to display. Graph 1 will always show the track’s profile. </p>
+<h3 id="activity">Activity</h3>
+<p><img alt="maproom1.png" src="images/DocGisItemsTrk/ActivityTab.png" /></p>
+<p>The idea behind the activities is to differentiate the track statistics of a track. On some recordings you might have used several different vehicles. This influences the average speed etc. By assigning activities you get statistics per activity. </p>
+<p>Usually you select an activity for the complete track by checking one of the activities in this tab. Next you use the mouse to select a range of the track and apply another activity to that range.</p>
+<h3 id="points">Points</h3>
+<p><img alt="maproom1.png" src="images/DocGisItemsTrk/PointsTab.png" /></p>
+<p>This is a simple table of recorded data with the most common properties. It’s just informational and has no other function.</p>
+<h3 id="filter">Filter</h3>
+<p><img alt="maproom1.png" src="images/DocGisItemsTrk/FilterTab.png" /></p>
+<p>In the filter tab you can apply algorithms to alter the visibility, elevation and timestamps of your track. More <a href="DocGisItemsTrk2.html#track-filter">details on filters</a> here</p>
+<h3 id="history">History</h3>
+<p><img alt="maproom1.png" src="images/DocGisItemsTrk/HistoryTab.png" /></p>
+<p>In the history tab you can see all changes applied to your track. You can revert the track data to a certain state by selecting the entry in the history. To cut the history at a selected state do a right click.</p>
+<h2 id="track-filter">Track Filter</h2>
+<p>Track filter are little macros that process on the track’s data to enhance it. They are grouped by function. To apply a filter press the button with the gear. Most filter results can be reverted by the <a href="DocGisItemsTrk2.html#history">history</a></p>
+<h3 id="points_1">Points</h3>
+<p>With these filters you can weed out bad points or reduce the number of track points without changing the overall appearance of your track.</p>
+<p><img alt="maproom1.png" src="images/DocGisItemsTrk/FilterPoints.png" /></p>
+<h3 id="elevation">Elevation</h3>
+<p>Elevation filter can smooth your profile, fix an offset or even add artificial elevation data from a file.</p>
+<p><img alt="maproom1.png" src="images/DocGisItemsTrk/FilterEelvation.png" /></p>
+<h3 id="timestamps">Timestamps</h3>
+<p>You can obscure timestamps if you want to publish a track and keep as much privacy as possible. Add timestamps to your planned tracks.</p>
+<p><img alt="maproom1.png" src="images/DocGisItemsTrk/FilterTime.png" /></p>
+<h3 id="extensions">Extensions</h3>
+<p>You can remove a track point extension e.g. your heart rate if you want to publish your tracks.</p>
+<p><img alt="maproom1.png" src="images/DocGisItemsTrk/FilterExtensions.png" /></p>
+<h3 id="split-track">Split Track</h3>
+<p>Cut a track into several tracks using its track segments.</p>
+<p>Tracks consist of one or more track segments. Each track point belongs to a track segment. </p>
+<p>Sources of track segments can be</p>
+<ul>
+<li>tracks imported into QMapShack consisting of several track segments (e.g. in GPX files),</li>
+<li>track operations within QMapShack (e.g. combining several tracks into one).</li>
+</ul>
+<p><img alt="maproom1.png" src="images/DocGisItemsTrk/FilterSplit.png" /></p>
+<hr />
+<p><a href="DocGisItemsNew.html">Prev</a> (Create new tracks, waypoints etc.) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Routes) <a href="DocGisItemsRte.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocGisItemsTrk2.md b/doc/DocGisItemsTrk2.md
new file mode 100644
index 0000000..1aa4038
--- /dev/null
+++ b/doc/DocGisItemsTrk2.md
@@ -0,0 +1,153 @@
+[Prev](DocGisItemsNew) (Create new tracks, waypoints etc.) | [Home](Home) | [Manual](DocMain) | (Routes) [Next](DocGisItemsRte)
+- - -
+[TOC]
+- - -
+
+# Tracks #
+
+A track is a list of points recorded while moving along. Tracks are also created artificially to be used for navigation and planning.
+
+![maproom1.png](images/DocGisItemsTrk/maproom1.png)
+
+If you click on the track line in the map view you open a short on-screen-summary and a few options:
+
+|   |   |   |
+|---|---|---|
+| ![maproom1.png](images/DocGisItemsTrk/EditDetails.png)  | Edit/Show Details | Show details of the track and edit data attached to the track. [More...](DocGisItemsTrk2#track-details-dialog)|
+| ![maproom1.png](images/DocGisItemsTrk/Copy.png)         | Copy              | Copy the track into another project.  |
+| ![maproom1.png](images/DocGisItemsTrk/DeleteOne.png)    | Delete            | Delete the track. |
+| ![maproom1.png](images/DocGisItemsTrk/TrkProfile.png)   | Profile           | Highlight the track and show the on-screen track profile. The key combination "ctrl+e" will make the profile a sizable and movable widget. Use the same key combination to switch back.|
+| ![maproom1.png](images/DocGisItemsTrk/SelectRange.png)  | Range             | Select a range of track points for information about that range and some additional functions (hide, show, activity, copy) |
+| ![maproom1.png](images/DocGisItemsTrk/LineMove.png)     | Edit              | Edit the line of the track by moving track points. See [Edit items with multiple points (tracks, routes, areas)](DocGisItemsEditMultiple) for details.|
+| ![maproom1.png](images/DocGisItemsTrk/Reverse.png)      | Reverse           | Create a reversed copy of the track.|
+| ![maproom1.png](images/DocGisItemsTrk/Combine.png)      | Combine           | Combine this track with other tracks in the project |
+| ![maproom1.png](images/DocGisItemsTrk/TrkCut.png)       | Cut               | Cut the track at the selected point. You can use that to delete points at the start or the end of the track. Or to split a track into stages. |
+
+## Track Details Dialog ##
+
+![maproom1.png](images/DocGisItemsTrk/DetailsDialog.png)
+
+The dialog has 3 areas:
+
+1) The graph area with up to three graphs. The profile graph on top is static and can't be changed. The other two graphs can display arbitrary track properties.
+
+2) The track information area on the left bottom. It displays the same information as the on-screen summary. There are two icons:
+
+   * ![maproom1.png](images/DocGisItemsTrk/Lock.png) If he lock is closed the track is read only. To edit track data you have to press it.
+   * ![maproom1.png](images/DocGisItemsTrk/Tainted.png) If the track has been imported and was changed it is considered as tainted. If the ink spot is visible you know the track has been altered.
+
+Note about displayed cumulative elevation gain :
+As this value is derived from raw data, some filtering is necessary to avoid exaggerated results.
+Because measured elevation often fluctuates even when GPSr is placed at a constant elevation, it would make no sense to take into account each measured bump.
+It was decided in QMS to use a threshold of 5 meters : elevation is accumulated only if elevation grows more than 5 meters.
+
+3) In the tab widget on the right bottom you will find more information about the track and various tools to edit the track data and how it is presented.
+
+### Graph Area ###
+
+![maproom1.png](images/DocGisItemsTrk/GraphArea.png)
+
+If you move the mouse over the graph area you will see some information about the current point in the text field on top. You can start a selection with a left click of your mouse. You define the end of the range by a second click. This will give you some additional information about the selected range and a few options to apply to the range.
+
+|   |   |   |
+|---|---|---|
+|![maproom1.png](images/DocGisItemsTrk/PointHide.png)|Hide| Hide the selected track points|
+|![maproom1.png](images/DocGisItemsTrk/PointShow.png)|Show| Show all track points between the first and last point of the selection |
+|![maproom1.png](images/DocGisItemsTrk/Activity.png)|Activity| Mark the selected track points to be part of a activity to be selected|
+|![maproom1.png](images/DocGisItemsTrk/Copy.png)|Copy| Copy selected track points as a new track|
+
+Another left click on the graph will abort. Doing a right click on the graph will display a context menu:
+
+|   |   |   |
+|---|---|---|
+|![maproom1.png](images/DocGisItemsTrk/Zoom.png)|Reset zoom|You can zoom on the x-axis with your mouse wheel. This can be reset by this menu item|
+|![maproom1.png](images/DocGisItemsTrk/SelectRange.png)|Abort selection| This is another way to stop the range selection|
+|![maproom1.png](images/DocGisItemsTrk/Save.png)|Save| Save the graph as image.|
+
+### Info ###
+
+![maproom1.png](images/DocGisItemsTrk/InfoTab.png)
+
+In the info tab you can see a small representation of your track. The red dot is the current position selected by the mouse on the graphs. You can edit the description and comment. Or add Web links. On some devices the link can be used to reference additional data.
+
+### Style ###
+
+![maproom1.png](images/DocGisItemsTrk/StyleTab.png)
+
+In the style tab you can setup how the track is drawn on the map. You can select the color of the track. This selection is portable to most of the applications/devices. Alternatively you can select a track point property to colorize the track. This selection will be saved with the track, but is not portable to any other application/device.
+
+### Graphs ###
+
+![maproom1.png](images/DocGisItemsTrk/GraphsTab.png)
+
+In the graph tab you can select how many graphs are displayed and what track point property to display. Graph 1 will always show the track's profile. 
+
+### Activity ###
+
+![maproom1.png](images/DocGisItemsTrk/ActivityTab.png)
+
+The idea behind the activities is to differentiate the track statistics of a track. On some recordings you might have used several different vehicles. This influences the average speed etc. By assigning activities you get statistics per activity. 
+
+Usually you select an activity for the complete track by checking one of the activities in this tab. Next you use the mouse to select a range of the track and apply another activity to that range.
+
+### Points ###
+
+![maproom1.png](images/DocGisItemsTrk/PointsTab.png)
+
+This is a simple table of recorded data with the most common properties. It's just informational and has no other function.
+
+### Filter ###
+
+![maproom1.png](images/DocGisItemsTrk/FilterTab.png)
+
+In the filter tab you can apply algorithms to alter the visibility, elevation and timestamps of your track. More [details on filters](DocGisItemsTrk2#track-filter) here
+
+### History ###
+
+![maproom1.png](images/DocGisItemsTrk/HistoryTab.png)
+
+In the history tab you can see all changes applied to your track. You can revert the track data to a certain state by selecting the entry in the history. To cut the history at a selected state do a right click.
+
+## Track Filter ##
+
+Track filter are little macros that process on the track's data to enhance it. They are grouped by function. To apply a filter press the button with the gear. Most filter results can be reverted by the [history](DocGisItemsTrk2#history)
+
+### Points ###
+
+With these filters you can weed out bad points or reduce the number of track points without changing the overall appearance of your track.
+
+![maproom1.png](images/DocGisItemsTrk/FilterPoints.png)
+
+### Elevation ###
+
+Elevation filter can smooth your profile, fix an offset or even add artificial elevation data from a file.
+
+![maproom1.png](images/DocGisItemsTrk/FilterEelvation.png)
+
+### Timestamps ###
+
+You can obscure timestamps if you want to publish a track and keep as much privacy as possible. Add timestamps to your planned tracks.
+
+![maproom1.png](images/DocGisItemsTrk/FilterTime.png)
+
+### Extensions ###
+
+You can remove a track point extension e.g. your heart rate if you want to publish your tracks.
+
+![maproom1.png](images/DocGisItemsTrk/FilterExtensions.png)
+
+### Split Track ###
+
+Cut a track into several tracks using its track segments.
+
+Tracks consist of one or more track segments. Each track point belongs to a track segment. 
+
+Sources of track segments can be
+ 
+* tracks imported into QMapShack consisting of several track segments (e.g. in GPX files),
+* track operations within QMapShack (e.g. combining several tracks into one).
+
+![maproom1.png](images/DocGisItemsTrk/FilterSplit.png)
+
+- - -
+[Prev](DocGisItemsNew) (Create new tracks, waypoints etc.) | [Home](Home) | [Manual](DocMain) | (Routes) [Next](DocGisItemsRte)
diff --git a/doc/DocGisItemsWpt.html b/doc/DocGisItemsWpt.html
new file mode 100644
index 0000000..1c8f427
--- /dev/null
+++ b/doc/DocGisItemsWpt.html
@@ -0,0 +1,132 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocGisItemsRte.html">Prev</a> (Routes) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Areas) <a href="DocGisItemsArea.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#waypoints">Waypoints</a><ul>
+<li><a href="#view-edit-details">View / Edit Details</a><ul>
+<li><a href="#custom-icons">Custom Icons</a></li>
+<li><a href="#the-photo-album">The Photo Album</a></li>
+</ul>
+</li>
+<li><a href="#move-waypoint">Move Waypoint</a></li>
+<li><a href="#project-waypoint">Project Waypoint</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="waypoints">Waypoints</h1>
+<p>A waypoint is a coordinate with data attached. This can be a point of interest, a geocache or a georeferenced image. If you move the mouse close enough to a waypoint it gets highlighted by a red circle:</p>
+<p><img alt="Waypoint Highlight" src="images/DocGisItemsWpt/WptHighlight.png" /></p>
+<p>If you click on the highlighted waypoint you get a short on-screen-summary and a few options:</p>
+<p><img alt="WptBubble.png" src="images/DocGisItemsWpt/WptBubble.png" /></p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><img alt="Edit/Details" src="images/DocGisItemsWpt/EditDetails.png" /></td>
+<td>Edit/Show Details</td>
+<td><a href="#view-edit-details">Show details of the waypoint and edit attached data.</a></td>
+</tr>
+<tr>
+<td><img alt="Copy" src="images/DocGisItemsWpt/Copy.png" /></td>
+<td>Copy</td>
+<td>Copy the waypoint into another project.</td>
+</tr>
+<tr>
+<td><img alt="Delete" src="images/DocGisItemsWpt/DeleteOne.png" /></td>
+<td>Delete</td>
+<td>Delete the waypoint. This also deletes data associated with the waypoint, such as photos.</td>
+</tr>
+<tr>
+<td><img alt="Show Bubble" src="images/DocGisItemsWpt/Bubble.png" /></td>
+<td>Show Bubble</td>
+<td>When enabled, the waypoint’s content is shown as a static bubble.</td>
+</tr>
+<tr>
+<td><img alt="Move" src="images/DocGisItemsWpt/WptMove.png" /></td>
+<td>Move</td>
+<td><a href="#move-waypoint">Move the waypoint to another location.</a></td>
+</tr>
+<tr>
+<td><img alt="Project" src="images/DocGisItemsWpt/WptProj.png" /></td>
+<td>Project</td>
+<td><a href="#project-waypoint">Project the waypoint - This is copying the waypoint and to move to copy a given distance and bearing</a></td>
+</tr>
+</tbody>
+</table>
+<h2 id="view-edit-details"><img alt="EditDetails" src="images/DocGisItemsWpt/EditDetails.png" /> View / Edit Details</h2>
+<p><img alt="Waypoint Details" src="images/DocGisItemsWpt/WptDetails.png" /></p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><img alt="Icon" src="images/DocGisItemsWpt/PinRed.png" /></td>
+<td>Icon</td>
+<td>Shows the currently selected Icon / provides a list of available Icon when clicked</td>
+</tr>
+<tr>
+<td><img alt="Tainted" src="images/DocGisItemsWpt/Tainted.png" /></td>
+<td>Tainted</td>
+<td>When shown, the Waypoint was imported and modified (for details see <a href="DocGisItems.html">Waypoints, Tracks & Co</a>)</td>
+</tr>
+<tr>
+<td><img alt="Lock" src="images/DocGisItemsWpt/Lock.png" /></td>
+<td>Locked</td>
+<td>When shown, the Waypoint is locked - that is cannot be modified until unlocked (for details see <a href="DocGisItems.html">Waypoints, Tracks & Co</a>)</td>
+</tr>
+</tbody>
+</table>
+<p>In addition, the waypoint’s position, elevation and a text browser to display links, description and comment are shown.
+These can be changed by clicking on the blue, underlined labels.</p>
+<h3 id="custom-icons">Custom Icons</h3>
+<p>QMapShack ships with a bunch of default icons, which are likely to be displayed correctly on the most GPS devices.</p>
+<p>If you want to use your own icons, you need to add them to <em>~/.config/QLandkarte/WaypointIcons/</em> (<strong>tbd: path Windows/OSX?</strong>)</p>
+<p>When adding an icon <em>Photo.png</em>, the icon will be listed as <em>Photo</em> in QMapShack.</p>
+<h3 id="the-photo-album">The Photo Album</h3>
+<p>In addition to general information, such as position, name and a description, QMapShack allows attaching photos to a waypoint.
+This functionality comes with several limitations, as it is primarily meant to provide a quick overview over the specific location - it is not intended to organize your collection of photos.</p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><img alt="Add Image" src="images/DocGisItemsWpt/AddImage.png" /></td>
+<td>Add (a) new image(s)</td>
+<td>Imports one or more new images. <strong>Photos are scaled down on import</strong></td>
+</tr>
+<tr>
+<td><img alt="Del Image" src="images/DocGisItemsWpt/DelImage.png" /></td>
+<td>Delete selected image</td>
+<td>Remove selected image (i.e. the image with the yellow frame)</td>
+</tr>
+</tbody>
+</table>
+<p><strong>Photos are not exported to GPX.</strong> Use either a Database or the QMS format for saving photos along with waypoints.</p>
+<h2 id="move-waypoint"><img alt="WptMove" src="images/DocGisItemsWpt/WptMove.png" /> Move Waypoint</h2>
+<p>When moving the waypoint the cursor will be locked to move mode. On a right mouse button click the move action is aborted. On a left mouse button click the waypoint is dropped at the new position. If the cursor is close to the viewport’s border, the map is moved. </p>
+<p><img alt="Move Waypoint" src="images/DocGisItemsWpt/Move.png" /></p>
+<h2 id="project-waypoint"><img alt="WptProj" src="images/DocGisItemsWpt/WptProj.png" /> Project Waypoint</h2>
+<p>Different to moving the waypoint this will create a clone of the waypoint. You have to give an explicit distance and bearing the waypoint is moved. You might want to change the icon and the name.</p>
+<p><img alt="Project Waypoint" src="images/DocGisItemsWpt/Projection.png" /></p>
+<hr />
+<p><a href="DocGisItemsRte.html">Prev</a> (Routes) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Areas) <a href="DocGisItemsArea.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocGisItemsWpt.md b/doc/DocGisItemsWpt.md
new file mode 100644
index 0000000..a5c0031
--- /dev/null
+++ b/doc/DocGisItemsWpt.md
@@ -0,0 +1,73 @@
+[Prev](DocGisItemsRte) (Routes) | [Home](Home) | [Manual](DocMain) | (Areas) [Next](DocGisItemsArea)
+- - -
+[TOC]
+- - -
+
+# Waypoints
+
+A waypoint is a coordinate with data attached. This can be a point of interest, a geocache or a georeferenced image. If you move the mouse close enough to a waypoint it gets highlighted by a red circle:
+
+![Waypoint Highlight](images/DocGisItemsWpt/WptHighlight.png)
+
+If you click on the highlighted waypoint you get a short on-screen-summary and a few options:
+
+![WptBubble.png](images/DocGisItemsWpt/WptBubble.png)
+
+
+|   |   |   |
+|---|---|---|
+| ![Edit/Details](images/DocGisItemsWpt/EditDetails.png) | Edit/Show Details | [Show details of the waypoint and edit attached data.](#view-edit-details)   |
+| ![Copy](images/DocGisItemsWpt/Copy.png)                | Copy              | Copy the waypoint into another project. |
+| ![Delete](images/DocGisItemsWpt/DeleteOne.png)         | Delete            | Delete the waypoint. This also deletes data associated with the waypoint, such as photos. |
+| ![Show Bubble](images/DocGisItemsWpt/Bubble.png)       | Show Bubble       | When enabled, the waypoint's content is shown as a static bubble. |
+| ![Move](images/DocGisItemsWpt/WptMove.png)             | Move              | [Move the waypoint to another location.](#move-waypoint) |
+| ![Project](images/DocGisItemsWpt/WptProj.png)          | Project           | [Project the waypoint - This is copying the waypoint and to move to copy a given distance and bearing](#project-waypoint) |
+
+
+## ![EditDetails](images/DocGisItemsWpt/EditDetails.png) View / Edit Details
+
+![Waypoint Details](images/DocGisItemsWpt/WptDetails.png)
+
+|   |   |   |
+|---|---|---|
+| ![Icon](images/DocGisItemsWpt/PinRed.png)     | Icon    | Shows the currently selected Icon / provides a list of available Icon when clicked |
+| ![Tainted](images/DocGisItemsWpt/Tainted.png) | Tainted | When shown, the Waypoint was imported and modified (for details see [Waypoints, Tracks & Co](DocGisItems)) |
+| ![Lock](images/DocGisItemsWpt/Lock.png)       | Locked  | When shown, the Waypoint is locked - that is cannot be modified until unlocked (for details see [Waypoints, Tracks & Co](DocGisItems)) |
+
+In addition, the waypoint's position, elevation and a text browser to display links, description and comment are shown.
+These can be changed by clicking on the blue, underlined labels.
+
+### Custom Icons
+QMapShack ships with a bunch of default icons, which are likely to be displayed correctly on the most GPS devices.
+
+If you want to use your own icons, you need to add them to *~/.config/QLandkarte/WaypointIcons/* (**tbd: path Windows/OSX?**)
+
+When adding an icon *Photo.png*, the icon will be listed as *Photo* in QMapShack.
+
+### The Photo Album
+
+In addition to general information, such as position, name and a description, QMapShack allows attaching photos to a waypoint.
+This functionality comes with several limitations, as it is primarily meant to provide a quick overview over the specific location - it is not intended to organize your collection of photos.
+
+|   |   |   |
+|---|---|---|
+| ![Add Image](images/DocGisItemsWpt/AddImage.png) | Add (a) new image(s)  | Imports one or more new images. **Photos are scaled down on import** |
+| ![Del Image](images/DocGisItemsWpt/DelImage.png) | Delete selected image | Remove selected image (i.e. the image with the yellow frame) |
+
+**Photos are not exported to GPX.** Use either a Database or the QMS format for saving photos along with waypoints.
+
+## ![WptMove](images/DocGisItemsWpt/WptMove.png) Move Waypoint
+
+When moving the waypoint the cursor will be locked to move mode. On a right mouse button click the move action is aborted. On a left mouse button click the waypoint is dropped at the new position. If the cursor is close to the viewport's border, the map is moved. 
+
+![Move Waypoint](images/DocGisItemsWpt/Move.png)
+
+
+## ![WptProj](images/DocGisItemsWpt/WptProj.png) Project Waypoint
+
+Different to moving the waypoint this will create a clone of the waypoint. You have to give an explicit distance and bearing the waypoint is moved. You might want to change the icon and the name.
+
+![Project Waypoint](images/DocGisItemsWpt/Projection.png)
+
+- - -
+[Prev](DocGisItemsRte) (Routes) | [Home](Home) | [Manual](DocMain) | (Areas) [Next](DocGisItemsArea)
diff --git a/doc/DocHandleGpxFiles.html b/doc/DocHandleGpxFiles.html
new file mode 100644
index 0000000..8917869
--- /dev/null
+++ b/doc/DocHandleGpxFiles.html
@@ -0,0 +1,36 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocWorkingWithProjects.html">Prev</a> (Working with Projects) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Search Google) <a href="DocSearchGoogle.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#handle-gpx-and-qms-files">Handle GPX and QMS Files</a><ul>
+<li><a href="#load-gpx-files">Load GPX Files</a></li>
+<li><a href="#data-view">Data view</a></li>
+<li><a href="#save-gpx-files">Save GPX Files</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="handle-gpx-and-qms-files">Handle GPX and QMS Files</h1>
+<p>Despite all deficiencies, GPS manufacturers support this format. A common format is a good approach in general, but TopoGrafix, the company behind GPX, fails miserably to evolve their format to the needs of today’s GPS systems. Anyway, GPX is it to be. QMapShack does support the GPX definition version 1.1 and some of the proprietary extensions to GPX. And it adds a few more. But due to the sheer rank growth of extensions, caused by a lack of guidance, it can’t support ever [...]
+<p>QMS is QMapShack’s own binary format. You will never loose information using it, but of course it is not compatible to any other application. </p>
+<h2 id="load-gpx-files">Load GPX Files</h2>
+<p>There are two ways to load GPX or QMS files. </p>
+<p>1) When you start QMapShack from the command line you can add a list of GPX and QMS files</p>
+<pre class="codehilite"><code>qmapshack file1.gpx file2.qms</code></pre>
+
+
+<p>2) Use the menu <em>File->Load GIS Data</em> (GIS = Geographic Information Systems)</p>
+<p><img alt="Alt text" src="images/DocHandleGpxFiles/maproom1.png" /></p>
+<h2 id="data-view">Data view</h2>
+<p>Each file will create a new top level item in the data view’s workspace list. </p>
+<p><img alt="Alt text" src="images/DocHandleGpxFiles/maproom2.png" /></p>
+<p>If you expand the item you can see the elements like waypoints, tracks, routes and so on. If you let the mouse hover over an element you get more information.</p>
+<p><img alt="Alt text" src="images/DocHandleGpxFiles/maproom3.png" /></p>
+<h2 id="save-gpx-files">Save GPX Files</h2>
+<p>You can either save all files in the workspace via <em>Save All GIS Data</em>. Or you can save a single file by a right click on the item in the data view’s workspace list.</p>
+<p><img alt="Alt text" src="images/DocHandleGpxFiles/maproom4.png" /></p>
+<hr />
+<p><a href="DocWorkingWithProjects.html">Prev</a> (Working with Projects) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Search Google) <a href="DocSearchGoogle.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocHandleGpxFiles.md b/doc/DocHandleGpxFiles.md
new file mode 100644
index 0000000..e089c4d
--- /dev/null
+++ b/doc/DocHandleGpxFiles.md
@@ -0,0 +1,41 @@
+[Prev](DocWorkingWithProjects) (Working with Projects) | [Home](Home) | [Manual](DocMain) | (Search Google) [Next](DocSearchGoogle)
+- - -
+[TOC]
+- - -
+
+# Handle GPX and QMS Files
+
+Despite all deficiencies, GPS manufacturers support this format. A common format is a good approach in general, but TopoGrafix, the company behind GPX, fails miserably to evolve their format to the needs of today's GPS systems. Anyway, GPX is it to be. QMapShack does support the GPX definition version 1.1 and some of the proprietary extensions to GPX. And it adds a few more. But due to the sheer rank growth of extensions, caused by a lack of guidance, it can't support everything. Keep th [...]
+
+QMS is QMapShack's own binary format. You will never loose information using it, but of course it is not compatible to any other application. 
+
+## Load GPX Files
+
+There are two ways to load GPX or QMS files. 
+
+1) When you start QMapShack from the command line you can add a list of GPX and QMS files
+
+    qmapshack file1.gpx file2.qms
+    
+2) Use the menu _File->Load GIS Data_ (GIS = Geographic Information Systems)
+
+![Alt text](images/DocHandleGpxFiles/maproom1.png)
+
+## Data view
+
+Each file will create a new top level item in the data view's workspace list. 
+
+![Alt text](images/DocHandleGpxFiles/maproom2.png)
+
+If you expand the item you can see the elements like waypoints, tracks, routes and so on. If you let the mouse hover over an element you get more information.
+
+![Alt text](images/DocHandleGpxFiles/maproom3.png)
+
+## Save GPX Files
+
+You can either save all files in the workspace via _Save All GIS Data_. Or you can save a single file by a right click on the item in the data view's workspace list.
+
+![Alt text](images/DocHandleGpxFiles/maproom4.png)
+
+- - -
+[Prev](DocWorkingWithProjects) (Working with Projects) | [Home](Home) | [Manual](DocMain) | (Search Google) [Next](DocSearchGoogle)
diff --git a/doc/DocInstallMapDem.html b/doc/DocInstallMapDem.html
new file mode 100644
index 0000000..403798d
--- /dev/null
+++ b/doc/DocInstallMapDem.html
@@ -0,0 +1,59 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocCmdOptions.html">Prev</a> (Command line parameters) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Basics about maps and DEM files) <a href="DocBasicsMapDem.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#install-maps-dem">Install Maps & DEM</a><ul>
+<li><a href="#organization-of-maps-dem">Organization of Maps & DEM</a></li>
+<li><a href="#installing-maps">Installing Maps</a></li>
+<li><a href="#installing-raster-maps-or-dem-data">Installing Raster Maps or DEM Data</a></li>
+</ul>
+</li>
+<li><a href="#sources-of-maps-and-dem-files">Sources of Maps and DEM files</a><ul>
+<li><a href="#maps">Maps</a></li>
+<li><a href="#dem">DEM</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<hr />
+<h1 id="install-maps-dem">Install Maps & DEM</h1>
+<p>QMapShack is not a commercial software, providing installable, ready made maps and DEM packages. The project does not have the man power and financial resources to provide that kind of stuff. However we think it’s really simple to install maps & DEM after you have read this.</p>
+<h2 id="organization-of-maps-dem">Organization of Maps & DEM</h2>
+<p>Maps & DEM data should be organized in folders on your system. One for maps and one for the DEM data. For example:</p>
+<div class="codehilite"><pre><myglobal_path>/QMapShackData/Maps
+<myglobal_path>/QMapShackData/DEM
+</pre></div>
+
+
+<p>You have to register these paths with <strong><em>File->Setup Map Paths</em></strong> and <strong><em>File->Setup DEM Paths</em></strong> in QMapShack. QMapShack will scan these paths for map and DEM files and lists them in the two list boxes for maps and DEM data. The filename will be the entry name. Underscores get replaced by a space.</p>
+<h2 id="installing-maps">Installing Maps</h2>
+<p>You can start with the online maps provided by the “Help! I want maps!” button. Basically this will ask you for a path, copy some map files into the path and update the map list. If you have a Garmin device copy the *.img and *.jnx maps on the device to the maps folder. That should give you quite a fine collection of maps to be used by QMapShack.</p>
+<h2 id="installing-raster-maps-or-dem-data">Installing Raster Maps or DEM Data</h2>
+<p>Usually this kind of data is very large. And because it is large, it is split into several files. But, as we have learned, QMapShack needs a single file to be listed. That is the point where GDAL’s virtual file format (*.vrt) jumps in. This is just a text file that defines what files in your folder should be taken as single data set. It sounds more complicated than it really is, because QMapShack provides you a tool. Open it with <strong><em>Tool->VRT Builder</em></strong>.</p>
+<p><img alt="Alt text" src="images/DocBasicsMapDem/qmapshack1.png" /></p>
+<ol>
+<li>Download or copy files into your map or DEM path. You can create a sub-folder to keep the file chaos to a minimum. </li>
+<li>Select all the files you want to combine to one map or DEM data set. Use the tool button with the green folder.</li>
+<li>Select a target filename. Use the tool button with the blue folder. Of course this should be in your map or DEM path.</li>
+<li>Press the start button and watch.</li>
+</ol>
+<p>When done you can reload the map or DEM list by a right click on the list. Choose <strong><em>Reload Maps</em></strong> or <strong><em>Reload DEM</em></strong>. The new map should be listed. Don’t forget: You have to activate a map if you want to see it (right click on the map entry in the list!).</p>
+<p>If you want to know more about the details of creating a *.vrt file jump <a href="DocBasicsMapDem.html#gdal-vrt-maps">here</a></p>
+<hr />
+<h1 id="sources-of-maps-and-dem-files">Sources of Maps and DEM files</h1>
+<h2 id="maps">Maps</h2>
+<ul>
+<li>A nice collection of Garmin vector maps can be found at <a href="http://www.freizeitkarte-osm.de/"><em>Freizeitkarte OSM</em></a>. Next to ready to use maps they publish their tool chain, too. With the tool chain you can produce your own OSM based maps for any region. </li>
+<li>You can use the <a href="https://sourceforge.net/projects/qlandkartegt/files/WMS%20Maps/">*.tms files</a> from QLankdarte GT (Note: the *.xml ones won’t work)</li>
+</ul>
+<h2 id="dem">DEM</h2>
+<ul>
+<li>Still the best place to look for DEM data is <a href="http://www.viewfinderpanoramas.org/">VIEWFINDER PANORAMAS</a>. </li>
+<li>For Europe the EEA offers <a href="http://www.eea.europa.eu/data-and-maps/data/eu-dem">DEM files with quite good resolution</a>. </li>
+<li>For Austria you can download quite high detailed data <a href="https://www.data.gv.at/katalog/dataset/d88a1246-9684-480b-a480-ff63286b35b7">here</a>.</li>
+</ul>
+<hr />
+<p><a href="DocCmdOptions.html">Prev</a> (Command line parameters) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Basics about maps and DEM files) <a href="DocBasicsMapDem.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocInstallMapDem.md b/doc/DocInstallMapDem.md
new file mode 100644
index 0000000..493fc1e
--- /dev/null
+++ b/doc/DocInstallMapDem.md
@@ -0,0 +1,53 @@
+[Prev](DocCmdOptions) (Command line parameters) | [Home](Home) | [Manual](DocMain) | (Basics about maps and DEM files) [Next](DocBasicsMapDem)
+- - -
+[TOC]
+- - -
+
+# Install Maps & DEM
+
+QMapShack is not a commercial software, providing installable, ready made maps and DEM packages. The project does not have the man power and financial resources to provide that kind of stuff. However we think it's really simple to install maps & DEM after you have read this.
+
+## Organization of Maps & DEM
+
+Maps & DEM data should be organized in folders on your system. One for maps and one for the DEM data. For example:
+
+```
+#!bash
+<myglobal_path>/QMapShackData/Maps
+<myglobal_path>/QMapShackData/DEM
+```
+You have to register these paths with ***File->Setup Map Paths*** and ***File->Setup DEM Paths*** in QMapShack. QMapShack will scan these paths for map and DEM files and lists them in the two list boxes for maps and DEM data. The filename will be the entry name. Underscores get replaced by a space.
+
+## Installing Maps
+
+You can start with the online maps provided by the "Help! I want maps!" button. Basically this will ask you for a path, copy some map files into the path and update the map list. If you have a Garmin device copy the \*.img and \*.jnx maps on the device to the maps folder. That should give you quite a fine collection of maps to be used by QMapShack.
+
+## Installing Raster Maps or DEM Data
+
+Usually this kind of data is very large. And because it is large, it is split into several files. But, as we have learned, QMapShack needs a single file to be listed. That is the point where GDAL's virtual file format (\*.vrt) jumps in. This is just a text file that defines what files in your folder should be taken as single data set. It sounds more complicated than it really is, because QMapShack provides you a tool. Open it with ***Tool->VRT Builder***.
+
+![Alt text](images/DocBasicsMapDem/qmapshack1.png)
+
+0. Download or copy files into your map or DEM path. You can create a sub-folder to keep the file chaos to a minimum. 
+1. Select all the files you want to combine to one map or DEM data set. Use the tool button with the green folder.
+2. Select a target filename. Use the tool button with the blue folder. Of course this should be in your map or DEM path.
+3. Press the start button and watch.
+
+When done you can reload the map or DEM list by a right click on the list. Choose ***Reload Maps*** or ***Reload DEM***. The new map should be listed. Don't forget: You have to activate a map if you want to see it (right click on the map entry in the list!).
+
+If you want to know more about the details of creating a \*.vrt file jump [here](DocBasicsMapDem#gdal-vrt-maps)
+
+---
+# Sources of Maps and DEM files
+
+## Maps
+* A nice collection of Garmin vector maps can be found at [_Freizeitkarte OSM_](http://www.freizeitkarte-osm.de/). Next to ready to use maps they publish their tool chain, too. With the tool chain you can produce your own OSM based maps for any region. 
+* You can use the [\*.tms files](https://sourceforge.net/projects/qlandkartegt/files/WMS%20Maps/) from QLankdarte GT (Note: the \*.xml ones won't work)
+
+## DEM
+* Still the best place to look for DEM data is [VIEWFINDER PANORAMAS](http://www.viewfinderpanoramas.org/). 
+* For Europe the EEA offers [DEM files with quite good resolution](http://www.eea.europa.eu/data-and-maps/data/eu-dem). 
+* For Austria you can download quite high detailed data [here](https://www.data.gv.at/katalog/dataset/d88a1246-9684-480b-a480-ff63286b35b7).
+
+- - -
+[Prev](DocCmdOptions) (Command line parameters) | [Home](Home) | [Manual](DocMain) | (Basics about maps and DEM files) [Next](DocBasicsMapDem)
diff --git a/doc/DocMain.html b/doc/DocMain.html
new file mode 100644
index 0000000..eba76d1
--- /dev/null
+++ b/doc/DocMain.html
@@ -0,0 +1,56 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Install QMapShack) <a href="DocGetQMapShack.html">Next</a></p>
+<hr />
+<h1 id="qmapshack-manual">QMapShack Manual</h1>
+<p><img alt="start" src="images/maproom1.png" /></p>
+<p><strong>Note</strong>: As the software is subject to a constant development progress, this manual will
+always reflect just a snapshot of the current state. Screenshots seen in this manual might 
+not reflect the current appearance of the program. The manual will be updated if there are 
+large changes to the GUI. However smaller changes will be ignored. </p>
+<h2 id="user">User</h2>
+<ul>
+<li><a href="DocGetQMapShack.html">Install QMapShack</a></li>
+<li><a href="DocGettingStarted.html">Getting started</a></li>
+<li><a href="DocCmdOptions.html">Command line parameters</a></li>
+<li><a href="DocInstallMapDem.html">Maps & Digital Elevation Model (DEM)</a><ul>
+<li><a href="DocInstallMapDem.html">Install Maps & DEM Data</a></li>
+<li><a href="DocBasicsMapDem.html">Basics about maps and DEM files</a></li>
+<li><a href="DocControlMapDem.html">Control maps and DEM files</a></li>
+<li><a href="DocMapsTipsTricks.html">Maps: Tips and Tricks</a></li>
+</ul>
+</li>
+<li><a href="DocWorkingWithProjects.html">Working with Projects</a><ul>
+<li><a href="DocHandleGpxFiles.html">Handle GPX and QMS files</a></li>
+<li><a href="DocSearchGoogle.html">Search Google</a></li>
+</ul>
+</li>
+<li><a href="DocGisItems.html">Tracks, Waypoints & Co</a><ul>
+<li><a href="DocGisItemsNew.html">Create new tracks, waypoints etc.</a></li>
+<li><a href="DocGisItemsTrk2.html">Tracks</a></li>
+<li><a href="DocGisItemsRte.html">Routes</a></li>
+<li><a href="DocGisItemsWpt.html">Waypoints</a></li>
+<li><a href="DocGisItemsArea.html">Areas</a></li>
+<li><a href="DocGisItemsEditMultiple.html">Edit items with multiple points (tracks, routes, areas)</a></li>
+</ul>
+</li>
+<li><a href="DocGisDatabase.html">Database</a><ul>
+<li><a href="DocGisDatabaseWorkspaceDatabase.html">Workspace and Database</a></li>
+<li><a href="DocGisDatabaseAddRemove.html">Add/Remove a Database</a></li>
+<li><a href="DocGisDatabaseFoldersItems.html">Folders and Items</a></li>
+<li><a href="DocGisDatabaseLostFound.html">‘Lost & Found’ Folder</a></li>
+</ul>
+</li>
+<li><a href="DocGisDevices.html">GPS Devices</a></li>
+<li><a href="DocFaq.html">Frequently Asked Questions</a></li>
+</ul>
+<h2 id="developer-translators">Developer & Translators</h2>
+<ul>
+<li><a href="DeveloperCommitCode.html">Commit Code</a></li>
+<li><a href="DeveloperCodingGuideline.html">Coding Guideline</a></li>
+<li><a href="BuildWindowsVisualStudio.html">Compile Instructions for Windows</a></li>
+<li><a href="DeveloperTranslate.html">Add translations</a></li>
+</ul>
+<hr />
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Install QMapShack) <a href="DocGetQMapShack.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocMain.md b/doc/DocMain.md
new file mode 100644
index 0000000..9d0ed38
--- /dev/null
+++ b/doc/DocMain.md
@@ -0,0 +1,52 @@
+Prev () | [Home](Home) | [Manual](DocMain) | (Install QMapShack) [Next](DocGetQMapShack)
+- - -
+[TOC]
+- - -
+
+# QMapShack Manual
+
+![start](images/maproom1.png)
+
+**Note**: As the software is subject to a constant development progress, this manual will
+always reflect just a snapshot of the current state. Screenshots seen in this manual might 
+not reflect the current appearance of the program. The manual will be updated if there are 
+large changes to the GUI. However smaller changes will be ignored. 
+
+## User
+
+* [Install QMapShack](DocGetQMapShack)
+* [Getting started](DocGettingStarted)
+* [Command line parameters](DocCmdOptions)
+* [Maps & Digital Elevation Model (DEM)](DocInstallMapDem)
+    * [Install Maps & DEM Data](DocInstallMapDem)
+    * [Basics about maps and DEM files](DocBasicsMapDem)
+    * [Control maps and DEM files](DocControlMapDem)
+    * [Maps: Tips and Tricks](DocMapsTipsTricks)
+* [Working with Projects](DocWorkingWithProjects)
+    * [Handle GPX and QMS files](DocHandleGpxFiles)
+    * [Search Google](DocSearchGoogle)
+* [Tracks, Waypoints & Co](DocGisItems)
+    * [Create new tracks, waypoints etc.](DocGisItemsNew)
+    * [Tracks](DocGisItemsTrk2)
+    * [Routes](DocGisItemsRte)
+    * [Waypoints](DocGisItemsWpt)
+    * [Areas](DocGisItemsArea)
+    * [Edit items with multiple points (tracks, routes, areas)](DocGisItemsEditMultiple)
+* [Database](DocGisDatabase)
+    * [Workspace and Database](DocGisDatabaseWorkspaceDatabase)
+    * [Add/Remove a Database](DocGisDatabaseAddRemove)
+    * [Folders and Items](DocGisDatabaseFoldersItems)
+    * ['Lost & Found' Folder](DocGisDatabaseLostFound)
+* [GPS Devices](DocGisDevices)
+* [Frequently Asked Questions](DocFaq)
+* [Playground - start your new Wiki page](DocPlayground)
+
+## Developer & Translators
+
+* [Commit Code](DeveloperCommitCode)
+* [Coding Guideline](DeveloperCodingGuideline)
+* [Compile Instructions for Windows](BuildWindowsVisualStudio)
+* [Add translations](DeveloperTranslate)
+
+- - -
+Prev () | [Home](Home) | [Manual](DocMain) | (Install QMapShack) [Next](DocGetQMapShack)
diff --git a/doc/DocMapsTipsTricks.html b/doc/DocMapsTipsTricks.html
new file mode 100644
index 0000000..5927e73
--- /dev/null
+++ b/doc/DocMapsTipsTricks.html
@@ -0,0 +1,288 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocControlMapDem.html">Prev</a> (Control maps and DEM files) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Working with Projects) <a href="DocWorkingWithProjects.html">Next</a></p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#maps-tips-tricks">Maps: Tips & Tricks</a><ul>
+<li><a href="#backdoor-to-use-a-wms-server-as-tms-server">Backdoor to use a WMS server as TMS server</a><ul>
+<li><a href="#use-arcgis-server-like-a-tms-server">Use ArcGIS Server like a TMS Server</a></li>
+</ul>
+</li>
+<li><a href="#wmts-configuration-to-access-french-ign-maps-geoportail">WMTS configuration to access French IGN maps (“Géoportail”)</a></li>
+<li><a href="#contour-lines">Contour lines</a><ul>
+<li><a href="#vector-map-in-garmin-img-format">Vector map in Garmin IMG format</a></li>
+<li><a href="#raster-contour-line-layer">Raster contour line layer</a></li>
+</ul>
+</li>
+<li><a href="#using-openmtbmaporg-velomaporg-in-qmapshack-linux-only">Using openmtbmap.org & velomap.org in QMapShack (Linux only)</a><ul>
+<li><a href="#script">Script</a><ul>
+<li><a href="#configuration">Configuration</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="#tms-configuration-for-nz-topo">TMS Configuration for NZ Topo</a></li>
+<li><a href="#russian-raster-maps-ex-military-aka-genshtab-maps-of-the-general-staff-non-classified-maps-and-so-on">(Russian) Raster maps (ex-military (aka “Genshtab” /Maps of the General Staff/), non-classified maps and so on)</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="maps-tips-tricks">Maps: Tips & Tricks</h1>
+<p>If you have a hot tip for free maps or a spiffy trick about what to do with maps add few words here.</p>
+<h2 id="backdoor-to-use-a-wms-server-as-tms-server">Backdoor to use a WMS server as TMS server</h2>
+<p>QMapShack’s TMS file specification allows Java Script to build URLs. This can be used to build a WMS URL if the WMS server supports the projection commonly used for TMS. This is either EPSG:3857 or EPSG:900913.</p>
+<p>This is an example how to do it. You have to replace the URL before <strong>&BBOX=” + bbox + “&WIDTH=256&HEIGHT=256</strong> with what ever is needed for the WMS server. This might be a bit tricky.</p>
+<div class="codehilite"><pre><span class="nt"><TMS></span>
+<span class="nt"><Layer</span> <span class="na">idx=</span><span class="s">"0"</span><span class="nt">></span>
+<span class="nt"><Title></span>NRW DTK Sammeldienst<span class="nt"></Title></span>
+<span class="nt"><Script></span><span class="cp"><![CDATA[(</span>
+<span class="cp">function convert(z1,x1,y1)</span>
+<span class="cp">{ function M(n){return 256*n*(156543.03392804062/(1<<z1))-20037508.342789244}</span>
+<span class="cp">  y=(1<<z1)-1-y1;</span>
+<span class="cp">  bbox=M(x1)+','+M(y)+','+M(x1+1)+','+M(y+1);</span>
+<span class="cp">  return "http://www.wms.nrw.de/geobasis/wms_nw_dtk?LAYERS=nw_dtk_col&FORMAT=image/png&SRS=EPSG:3857&EXCEPTIONS=application/vnd.ogc.se_inimage&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&BBOX=" + bbox + "&WIDTH=256&HEIGHT=256";</span>
+<span class="cp">}</span>
+<span class="cp">)]]></span><span class="nt"></Script></span>
+<span class="nt"></Layer></span>
+<span class="nt"><Copyright></span>Geobasis NRW 2015<span class="nt"></Copyright></span>
+<span class="nt"></TMS></span>
+</pre></div>
+
+
+<p>The official documentation of WMS standard can be found on <a href="http://www.opengeospatial.org/standards/wms">http://www.opengeospatial.org/standards/wms</a>.</p>
+<p>The following version loads the French BRGM WMS tiles (adapted from QLandkarteGT xml config file) :</p>
+<div class="codehilite"><pre><span class="nt"><TMS></span>
+<span class="nt"><Layer</span> <span class="na">idx=</span><span class="s">"0"</span><span class="nt">></span>
+<span class="nt"><Title></span>IGN BRGM France<span class="nt"></Title></span>
+<span class="nt"><Script></span><span class="cp"><![CDATA[(</span>
+<span class="cp">function convert(z1,x1,y1)</span>
+<span class="cp">{ function M(n){return 256*n*(156543.03392804062/(1<<z1))-20037508.342789244}</span>
+<span class="cp">  y=(1<<z1)-1-y1;</span>
+<span class="cp">  bbox=M(x1)+','+M(y)+','+M(x1+1)+','+M(y+1);</span>
+<span class="cp">  return "http://mapsref.brgm.fr/wxs/refcom-brgm/refign?LAYERS=FONDS_SCAN&FORMAT=image/png&SRS=EPSG:3857&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&BBOX=" + bbox + "&WIDTH=256&HEIGHT=256";</span>
+<span class="cp">}</span>
+<span class="cp">)]]></span><span class="nt"></Script></span>
+<span class="nt"></Layer></span>
+<span class="nt"><Copyright></span>France IGN BRGM<span class="nt"></Copyright></span>
+<span class="nt"></TMS></span>
+</pre></div>
+
+
+<h3 id="use-arcgis-server-like-a-tms-server">Use ArcGIS Server like a TMS Server</h3>
+<p>The same logic can be implemented on the <strong>export</strong> command of ArcGIS server maps. Here is an example URL:</p>
+<div class="codehilite"><pre><span class="s">"http://www.pcn.minambiente.it/arcgis/rest/services/immagini/IGM_25000/MapServer/export?dpi=96&transparent=true&format=png8&bbox="</span> <span class="o">+</span> <span class="n">bbox</span> <span class="o">+</span> <span class="s">" &bboxSR=3857&imageSR=3857&size=256,256&f=image"</span>
+</pre></div>
+
+
+<p>In most cases the request will work as expected, even though the native projection wouldn’t be 3857 (Web Mercator).
+For documentation of export command refer to:<a href="http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Export_Map/02r3000000v7000000/">http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Export_Map/02r3000000v7000000/</a>.</p>
+<hr />
+<h2 id="wmts-configuration-to-access-french-ign-maps-geoportail">WMTS configuration to access French IGN maps (“Géoportail”)</h2>
+<p>As an individual, you can apply for a free non-commercial access to the French IGN WMTS servers (for example through their “Géoportail API”, but also works with other WMTS clients like QGIS and QMapShack). Lots of thanks to them for this free access because their maps are truly awesome. The original source of information about this is at the following URL (in French):</p>
+<p>http://dogeo.fr/wmts_ign/</p>
+<p>The terms of use enforce a few restrictions listed at the following URL:</p>
+<p><a href="http://professionnels.ign.fr/licence-api-geoportail-libre-et-gratuite">http://professionnels.ign.fr/licence-api-geoportail-libre-et-gratuite</a></p>
+<p>You can register for this free “licence géoservices IGN pour usage grand public” at the following URL:</p>
+<p><a href="http://professionnels.ign.fr/api-web">http://professionnels.ign.fr/api-web</a></p>
+<p>You will be prompted to select which layers you want. Although the same procedure probably applies to any of the available layers, the process described here has only been tried with the map layer called “cartes IGN” (or “GEOGRAPHICALGRIDSYSTEMS.MAPS” on the WMTS server).</p>
+<p>Note that you will also need to provide your IP address (external IP: that is the IP of your internet router) during the application process. Usually you can easily find this IP in your router status page, or alternatively you can visit websites such as this one:</p>
+<p><a href="http://tell-my-ip.com/">http://tell-my-ip.com/</a></p>
+<p>The WMTS access may be denied if you try to connect from another IP (and this may be a problem if your ISP keeps changing your IP). This problem can be diagnosed by trying to access a map tile directly from a web browser (use the sample URL below). In case of IP mismatch you will obtain an error message saying “wrong IP address” instead of the map tile. The registered IP can be modified on the “IGN Espace Pro” website, under your account, you should click on &l [...]
+before the new IP is actually activated.</p>
+<p>Shortly after your order (less than one hour), you will receive a confirmation e-mail, and you will be able to retrieve a personal ID (24 character key) from your personal account on the IGN website.</p>
+<p>You can test the WMTS access directly in your web browser by fetching a random map tile, for example:</p>
+<p><a href="https://wxs.ign.fr/[YOUR_ID]/wmts?LAYER=GEOGRAPHICALGRIDSYSTEMS.MAPS&EXCEPTIONS=text/xml&FORMAT=image/jpeg&SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&STYLE=normal&TILEMATRIXSET=PM&&TILEMATRIX=1&TILECOL=0&TILEROW=0">https://wxs.ign.fr/<strong>[YOUR_ID]</strong>/wmts?LAYER=GEOGRAPHICALGRIDSYSTEMS.MAPS&EXCEPTIONS=text/xml&FORMAT=image/jpeg&SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&STYLE=normal&TILEMATRIXSET [...]
+<p>(don’t forget to replace <strong>[YOUR_ID]</strong> with your actual 24 character personal key)</p>
+<p>The WMTS “capabilities” can then be fetched at the following URL:</p>
+<p><a href="https://wxs.ign.fr/[YOUR_ID]/geoportail/wmts?SERVICE=WMTS&REQUEST=GetCapabilities">https://wxs.ign.fr/<strong>[YOUR_ID]</strong>/geoportail/wmts?SERVICE=WMTS&REQUEST=GetCapabilities</a></p>
+<p>(don’t forget to replace <strong>[YOUR_ID]</strong> with your actual 24 character personal key)</p>
+<p>Unfortunately, unlike other WMTS servers, this capabilities file does not directly work in QMapShack (although it works “as is” in QGIS). To work around this, you will have to modify it with a text editor to include a <ResourceURL> line at the end of the layer description (just before the </Layer> directive) for the “GEOGRAPHICALGRIDSYSTEMS.MAPS” layer (must be adjusted and tested for other layers).</p>
+<p><strong>Download: <a href="IGN.wmts">IGN.wmts</a></strong></p>
+<p>(again, don’t forget to replace the 3 occurrences of <strong>[YOUR_ID]</strong> with your actual 24 character personal key)</p>
+<p>Note that this file was working as of September 22, 2015 but may stop working in the future in case IGN changes its WMTS server configuration.</p>
+<hr />
+<h2 id="contour-lines">Contour lines</h2>
+<p>There are two ways to add a transparent contour line layer to your map view:</p>
+<ul>
+<li>vector map in Garmin IMG format</li>
+<li>raster map with transparent contour line tiles </li>
+</ul>
+<h3 id="vector-map-in-garmin-img-format">Vector map in Garmin IMG format</h3>
+<p>Some maps for Garmin devices provide a separate img file with contour lines. Add this file to your QMS map directory and you can use it as contour line overlay in map views. </p>
+<p>Sources for vector contour line maps:</p>
+<ul>
+<li><a href="http://garmin.opentopomap.org/#download">OpenTopoMap</a>: the “Garmin” file contains both a base map and a contour line map in img format</li>
+<li><a href="http://extract.bbbike.org/?lang=en">BBBike</a>: allows to create a contour line file for a custom area. </li>
+<li><a href="https://www.velomap.org">Velomap</a>: download the .exe file and chose “install a separate contour lines only map” during the installation process.</li>
+</ul>
+<h3 id="raster-contour-line-layer">Raster contour line layer</h3>
+<p>Some TMS tile servers provide contour line only layers. To use such a layer in QMS, add a *.tms file to your map directory. </p>
+<p>Sample TMS file for the contour line layer from <a href="http://www.opensnowmap.org">OpenSnowMap</a>:</p>
+<div class="codehilite"><pre><span class="nt"><TMS></span>
+ <span class="nt"><Title></span>OpenSnowMap Contour Lines<span class="nt"></Title></span>
+ <span class="nt"><MinZoomLevel></span>1<span class="nt"></MinZoomLevel></span>
+ <span class="nt"><MaxZoomLevel></span>1024<span class="nt"></MaxZoomLevel></span>
+ <span class="nt"><Layer</span> <span class="na">idx=</span><span class="s">"0"</span><span class="nt">></span>
+     <span class="nt"><ServerUrl></span>http://www.opensnowmap.org/opensnowmap-overlay/%1/%2/%3.png<span class="nt"></ServerUrl></span>
+ <span class="nt"></Layer></span>
+ <span class="nt"><Copyright></span>Openstreetmap contributors | Rendering: www.opensnowmap.org | DEM: ASTER GDEM is a product of METI and NASA
+SRTM V4.1 from CGIAR-CSI EU-DEM: Produced using Copernicus data and information funded by the European Union <span class="nt"></Copyright></span>
+<span class="nt"></TMS></span>
+</pre></div>
+
+
+<p>Other sources for transparent contour line tiles:</p>
+<ul>
+<li>OpenMapSurfer from GIScience at Heidelberg University <br />
+<code><ServerUrl>http://129.206.74.245:8006/tms_il.ashx?x=%2&amp;y=%3&amp;z=%1</ServerUrl></code></li>
+</ul>
+<hr />
+<h2 id="using-openmtbmaporg-velomaporg-in-qmapshack-linux-only">Using openmtbmap.org & velomap.org in QMapShack (Linux only)</h2>
+<p>In order to use openmtbmap.org or velomap.org maps within QMapShack you first need to create a gmapsupp.img from the map tiles. 
+For Windows user, there is an integrated batchfile, which will do all necessary steps; so this tutorial is for Linux users. More information you may find <a href="https://openmtbmap.org/de/tutorials/mkgmap/">here</a>.</p>
+<p>In Linux, please check if package p7zip-full is installed – we need it to unpack the .exe file. Open the console and execute <em>sudo apt-get install p7zip-full</em> . We need <a href="http://www.mkgmap.org.uk/">Mkgmap</a>, too. Also Java is required.</p>
+<ol>
+<li>Download openmtbmap-ALPS and the latest version of mkgmap</li>
+<li>Create a folder like ~/openmtbmap_alps and unzip your downloaded version</li>
+<li>Open the .exe file and extract all files called 6528xxxx.img (maptiles) and 7528xxxx (contour lines), and a typ file (the layout of the map). For this sample we choose <em>widealp.TYP</em> </li>
+</ol>
+<p>The folder should now contain all map tiles, the contour lines, the layout file and the extracted files from mkgmap.</p>
+<p>Now start your console, browse to your folder and copy the following code: </p>
+<div class="codehilite"><pre>java  -Xmx2048M -jar --index --family-id<span class="o">=</span>6528 --description<span class="o">=</span><span class="s2">"openmtbmap_alps"</span> --series-name<span class="o">=</span><span class="s2">"openmtbmap_alps"</span> --family-name<span class="o">=</span><span class="s2">"openmtbmap_alps"</span> --product-id<span class="o">=</span>1 --gmapsupp 6*.img 7*.img widealp.TYP
+</pre></div>
+
+
+<p>Then press <Enter> and a gmapsupp.img will be created, which you can easily rename to opentmtbmap_alps.img. Now copy this file onto your GPS unit and in your QMapShack maps folder as well.</p>
+<p>If you would like do it with some other layout, simply replace the *.TYP (f.e. easyalps.TYP). 
+If you prefer another country be careful: all 6x.img and 7x.img must be from the particular openmtbmap country file! Also don’t forget to replace the –family-id with the one from your country.</p>
+<p>This is really a quick way, to integrate your favorite openmtbmaps or velomaps into QMapShack.</p>
+<p>If you prefer a GUI: you can still use QLandkarteGT for creating gmapsupp.img, too. </p>
+<p>Links (with further information and some tutorials):</p>
+<ul>
+<li><a href="https://openmtbmap.org/">openmtbmap.org</a></li>
+<li><a href="https://velomap.org/">velomap.org</a></li>
+<li><a href="http://www.mkgmap.org.uk/">Mkgmap</a></li>
+</ul>
+<h3 id="script">Script</h3>
+<p>If you want to update your maps regularly you might consider using the script below.
+The script requires the following tools to be installed:</p>
+<ul>
+<li><code>wget</code> (downloading)</li>
+<li><code>7z</code> (extraction)</li>
+<li><code>mkgmap</code> (creation of gmapsupp.img)</li>
+</ul>
+<h4 id="configuration">Configuration</h4>
+<p>The script below is configured to download the OpenMTBMap for Bavaria, convert it to <code>OpenMTBMap_<date>.img</code> using traddby.TYP and move it to <code>~/.qmapshack_maps/</code>.</p>
+<p>If this does not match your requirements, you will need to adopt the values <em>FILESRC</em>, <em>IMGFMT</em>, <em>QMSMAPDIR</em> and <em>TYPE</em>:</p>
+<ul>
+<li>
+<p><em>FILESRC</em>: <a href="http://ftp5.gwdg.de/pub/misc/openstreetmap/openmtbmap/odbl/">Navigate here</a>, find the file you want to download and write the URL to <em>FILESRC</em></p>
+</li>
+<li>
+<p><em>IMGFMT</em>: Name of the resulting file, see <code>man 1 date</code></p>
+</li>
+<li>
+<p><em>QMSMAPDIR</em>: Path to your QMS-Map folder (<code>~</code> will not work, use <code>${HOME}</code> instead)</p>
+</li>
+</ul>
+<p>Depending on your system’s configuration you will need to change <em>MKGMAP</em> to allow proper execution of <code>mkgmap</code> (see section above).</p>
+<div class="codehilite"><pre><span class="c">#! /bin/sh</span>
+
+<span class="c"># configuration</span>
+
+<span class="nv">FILESRC</span><span class="o">=</span><span class="s2">"http://ftp5.gwdg.de/pub/misc/openstreetmap/openmtbmap/odbl/germany/mtbbayern.exe"</span>
+<span class="nv">IMGFMT</span><span class="o">=</span><span class="s2">"OpenMTBMap_%Y-%m-%d.img"</span>
+<span class="nv">QMSMAPDIR</span><span class="o">=</span><span class="s2">"${HOME}/.qmapshack_maps/"</span>
+<span class="nv">TYPE</span><span class="o">=</span><span class="s2">"traddby.TYP"</span>
+<span class="nv">MKGMAP</span><span class="o">=</span><span class="s2">"mkgmap"</span>
+
+<span class="c"># code starts here, no changes below here required</span>
+
+error_check<span class="o">()</span> <span class="o">{</span>
+    <span class="k">if</span> <span class="o">[</span> <span class="nv">$1</span> !<span class="o">=</span> 0 <span class="o">]</span>; <span class="k">then</span>
+<span class="k">        </span><span class="nb">echo</span> <span class="k">${</span><span class="nv">red</span><span class="k">}</span>ERROR<span class="k">${</span><span class="nv">NC</span><span class="k">}</span>
+        <span class="nb">exit </span>1
+    <span class="k">else</span>
+<span class="k">        </span><span class="nb">echo</span> <span class="k">${</span><span class="nv">green</span><span class="k">}</span>OK<span class="k">${</span><span class="nv">NC</span><span class="k">}</span>
+    <span class="k">fi</span>
+<span class="o">}</span>
+
+tool_check<span class="o">()</span> <span class="o">{</span>
+    which <span class="nv">$1</span> 2>&1 1>/dev/null
+    <span class="k">if</span> <span class="o">[</span> <span class="nv">$?</span> !<span class="o">=</span> 0 <span class="o">]</span>; <span class="k">then</span>
+<span class="k">        </span><span class="nb">echo</span> <span class="k">${</span><span class="nv">red</span><span class="k">}</span>ERROR: <span class="nv">$1</span> missing<span class="k">${</span><span class="nv">NC</span><span class="k">}</span>
+        <span class="nb">exit </span>1
+    <span class="k">fi</span>
+<span class="o">}</span>
+
+<span class="nv">red</span><span class="o">=</span><span class="s2">"\033[0;31m"</span>
+<span class="nv">green</span><span class="o">=</span><span class="s2">"\033[0;32m"</span>
+<span class="nv">NC</span><span class="o">=</span><span class="s2">"\033[0m"</span>
+
+<span class="nv">TMP</span><span class="o">=</span><span class="sb">`</span>mktemp<span class="sb">`</span>
+<span class="k">if</span> <span class="o">[</span> ! -f <span class="s2">"${TMP}"</span> <span class="o">]</span>; <span class="k">then</span>
+<span class="k">    </span><span class="nb">echo</span> <span class="k">${</span><span class="nv">red</span><span class="k">}</span>ERROR: failed to get temp. file<span class="k">${</span><span class="nv">NC</span><span class="k">}</span>
+    <span class="nb">exit </span>1
+<span class="k">fi</span>
+
+tool_check <span class="s2">"wget"</span>
+tool_check <span class="s2">"7z"</span>
+<span class="k">${</span><span class="nv">MKGMAP</span><span class="k">}</span> >/dev/null 2>&1
+<span class="k">if</span> <span class="o">[</span> <span class="nv">$?</span> !<span class="o">=</span> 0 <span class="o">]</span>; <span class="k">then</span>
+<span class="k">    </span><span class="nb">echo</span> <span class="k">${</span><span class="nv">red</span><span class="k">}</span>ERROR: mkgmap can<span class="se">\'</span>t be executed<span class="k">${</span><span class="nv">NC</span><span class="k">}</span>
+    <span class="nb">echo</span> <span class="k">${</span><span class="nv">red</span><span class="k">}</span>ERROR: make sure MKGMAP is <span class="nb">set </span>properly in script configuration<span class="k">${</span><span class="nv">NC</span><span class="k">}</span>
+    <span class="nb">exit </span>1
+<span class="k">fi</span>
+
+<span class="nb">echo</span> -n <span class="s2">" * Downloading... "</span>
+wget -q -O <span class="s2">"$TMP"</span> <span class="s2">"$FILESRC"</span>
+error_check <span class="nv">$?</span>
+
+<span class="nb">echo</span> -n <span class="s2">" * Decompressing... "</span>
+7z e -o<span class="s2">"${TMP}_"</span> <span class="k">${</span><span class="nv">TMP</span><span class="k">}</span> >/dev/null
+error_check <span class="nv">$?</span>
+
+<span class="nv">FILETIME</span><span class="o">=</span><span class="sb">`</span>stat -c %Y <span class="k">${</span><span class="nv">TMP</span><span class="k">}</span><span class="sb">`</span>
+<span class="nv">IMGFILE</span><span class="o">=</span><span class="sb">`</span>date -d@<span class="k">${</span><span class="nv">FILETIME</span><span class="k">}</span> +<span class="s2">"${IMGFMT}"</span><span class="sb">`</span>
+
+<span class="nb">echo</span> -n <span class="s2">" * Building ${IMGFILE}... "</span>
+<span class="nb">cd</span> <span class="s2">"${TMP}_"</span>
+<span class="nv">FID</span><span class="o">=</span><span class="sb">`</span>ls -x 7*.img | cut -c1-4<span class="sb">`</span>
+<span class="k">${</span><span class="nv">MKGMAP</span><span class="k">}</span> --show-profiles<span class="o">=</span>1 --product-id<span class="o">=</span>1 --family-id<span class="o">=</span><span class="k">${</span><span class="nv">FID</span><span class="k">}</span> --index --gmapsupp 6*.img 7*.img <span class="k">${</span><span class="nv">TYPE</span><span class="k">}</span> >/dev/null
+error_check <span class="nv">$?</span>
+
+<span class="nb">echo</span> -n <span class="s2">" * Moving gmapsupp.img to ${QMSMAPDIR}... "</span>
+mv <span class="s2">"${TMP}_/gmapsupp.img"</span> <span class="s2">"${QMSMAPDIR}/${IMGFILE}"</span>
+error_check <span class="nv">$?</span>
+
+<span class="nb">echo</span> -n <span class="s2">" * Cleanup... "</span>
+rm -rf <span class="s2">"${TMP}"</span> <span class="s2">"${TMP}_"</span>
+error_check <span class="nv">$?</span>
+</pre></div>
+
+
+<h2 id="tms-configuration-for-nz-topo">TMS Configuration for NZ Topo</h2>
+<p>Script converts to OSGEO TMS (http://www.maptiler.org/google-maps-coordinates-tile-bounds-projection/)
+(Optimized by KartenFreak, thank you)</p>
+<div class="codehilite"><pre><span class="nt"><TMS></span>
+    <span class="nt"><Title></span>NZTopo<span class="nt"></Title></span>
+    <span class="nt"><MinZoomLevel></span>6<span class="nt"></MinZoomLevel></span>
+    <span class="nt"><MaxZoomLevel></span>15<span class="nt"></MaxZoomLevel></span>
+    <span class="nt"><Layer</span> <span class="na">idx=</span><span class="s">"0"</span><span class="nt">></span>
+        <span class="nt"><Title></span>NZTopo<span class="nt"></Title></span>
+        <span class="nt"><Script></span><span class="cp"><![</span><span class="nx">CDATA</span><span class="err">[</span><span class="p">(</span>
+        <span class="nx">function</span> <span class="nb">convert</span><span class="p">(</span><span class="nx">z1</span><span class="p">,</span><span class="nx">x1</span><span class="p">,</span><span class="nb">y1</span><span class="p">)</span>
+        <span class="p">{</span>  <span class="k">return</span> <span class="s2">"http://nz1.nztopomaps.com/"</span> <span class="o">+</span> <span class="nx">z1</span> <span class="o">+</span> <span class="s2">"/"</span> <span class="o">+</span> <span class="nx">x1</span> <span class="o">+</span> <span class="s2">"/"</span> <span class="o">+</span> <span class="p">((</span><span class="mi">1</span><span class="o"><<</span><span class="nx">z1</span><sp [...]
+        <span class="p">}</span>
+        <span class="p">)</span><span class="cp">]]></span><span class="nt"></Script></span>
+    <span class="nt"></Layer></span>
+<span class="nt"></TMS></span>
+</pre></div>
+
+
+<h2 id="russian-raster-maps-ex-military-aka-genshtab-maps-of-the-general-staff-non-classified-maps-and-so-on">(Russian) Raster maps (ex-military (aka “Genshtab” /Maps of the General Staff/), non-classified maps and so on)</h2>
+<p><a href="QuickWayToPrepareRasterMapForQMapShack.html">Quick way to prepare raster map for QMapShack</a></p>
+<hr />
+<p><a href="DocControlMapDem.html">Prev</a> (Control maps and DEM files) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Working with Projects) <a href="DocWorkingWithProjects.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocMapsTipsTricks.md b/doc/DocMapsTipsTricks.md
new file mode 100644
index 0000000..86fc641
--- /dev/null
+++ b/doc/DocMapsTipsTricks.md
@@ -0,0 +1,317 @@
+[Prev](DocControlMapDem) (Control maps and DEM files) | [Home](Home) | [Manual](DocMain) | (Working with Projects) [Next](DocWorkingWithProjects)
+- - -
+[TOC]
+- - -
+
+# Maps: Tips & Tricks
+
+If you have a hot tip for free maps or a spiffy trick about what to do with maps add few words here.
+
+## Backdoor to use a WMS server as TMS server
+
+QMapShack's TMS file specification allows Java Script to build URLs. This can be used to build a WMS URL if the WMS server supports the projection commonly used for TMS. This is either EPSG:3857 or EPSG:900913.
+
+This is an example how to do it. You have to replace the URL before **&BBOX=" + bbox + "&WIDTH=256&HEIGHT=256** with what ever is needed for the WMS server. This might be a bit tricky.
+```
+#!XML
+<TMS>
+<Layer idx="0">
+<Title>NRW DTK Sammeldienst</Title>
+<Script><![CDATA[(
+function convert(z1,x1,y1)
+{ function M(n){return 256*n*(156543.03392804062/(1<<z1))-20037508.342789244}
+  y=(1<<z1)-1-y1;
+  bbox=M(x1)+','+M(y)+','+M(x1+1)+','+M(y+1);
+  return "http://www.wms.nrw.de/geobasis/wms_nw_dtk?LAYERS=nw_dtk_col&FORMAT=image/png&SRS=EPSG:3857&EXCEPTIONS=application/vnd.ogc.se_inimage&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&BBOX=" + bbox + "&WIDTH=256&HEIGHT=256";
+}
+)]]></Script>
+</Layer>
+<Copyright>Geobasis NRW 2015</Copyright>
+</TMS>
+
+```
+The official documentation of WMS standard can be found on [http://www.opengeospatial.org/standards/wms](http://www.opengeospatial.org/standards/wms).
+
+The following version loads the French BRGM WMS tiles (adapted from QLandkarteGT xml config file) :
+```
+#!XML
+<TMS>
+<Layer idx="0">
+<Title>IGN BRGM France</Title>
+<Script><![CDATA[(
+function convert(z1,x1,y1)
+{ function M(n){return 256*n*(156543.03392804062/(1<<z1))-20037508.342789244}
+  y=(1<<z1)-1-y1;
+  bbox=M(x1)+','+M(y)+','+M(x1+1)+','+M(y+1);
+  return "http://mapsref.brgm.fr/wxs/refcom-brgm/refign?LAYERS=FONDS_SCAN&FORMAT=image/png&SRS=EPSG:3857&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&BBOX=" + bbox + "&WIDTH=256&HEIGHT=256";
+}
+)]]></Script>
+</Layer>
+<Copyright>France IGN BRGM</Copyright>
+</TMS>
+
+```
+
+### Use ArcGIS Server like a TMS Server
+The same logic can be implemented on the **export** command of ArcGIS server maps. Here is an example URL:
+
+```
+"http://www.pcn.minambiente.it/arcgis/rest/services/immagini/IGM_25000/MapServer/export?dpi=96&transparent=true&format=png8&bbox=" + bbox + " &bboxSR=3857&imageSR=3857&size=256,256&f=image"
+```
+In most cases the request will work as expected, even though the native projection wouldn't be 3857 (Web Mercator).
+For documentation of export command refer to:
+[http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Export_Map/02r3000000v7000000/](http://resources.arcgis.com/en/help/arcgis-rest-api/index.html#/Export_Map/02r3000000v7000000/).
+
+---
+
+## WMTS configuration to access French IGN maps ("Géoportail")
+
+As an individual, you can apply for a free non-commercial access to the French IGN WMTS servers (for example through their "Géoportail API", but also works with other WMTS clients like QGIS and QMapShack). Lots of thanks to them for this free access because their maps are truly awesome. The original source of information about this is at the following URL (in French):
+
+http://dogeo.fr/wmts_ign/
+
+The terms of use enforce a few restrictions listed at the following URL:
+
+[http://professionnels.ign.fr/licence-api-geoportail-libre-et-gratuite](http://professionnels.ign.fr/licence-api-geoportail-libre-et-gratuite)
+
+You can register for this free "licence géoservices IGN pour usage grand public" at the following URL:
+
+[http://professionnels.ign.fr/api-web](http://professionnels.ign.fr/api-web)
+
+You will be prompted to select which layers you want. Although the same procedure probably applies to any of the available layers, the process described here has only been tried with the map layer called "cartes IGN" (or "GEOGRAPHICALGRIDSYSTEMS.MAPS" on the WMTS server).
+
+Note that you will also need to provide your IP address (external IP: that is the IP of your internet router) during the application process. Usually you can easily find this IP in your router status page, or alternatively you can visit websites such as this one:
+
+[http://tell-my-ip.com/](http://tell-my-ip.com/)
+
+The WMTS access may be denied if you try to connect from another IP (and this may be a problem if your ISP keeps changing your IP). This problem can be diagnosed by trying to access a map tile directly from a web browser (use the sample URL below). In case of IP mismatch you will obtain an error message saying "wrong IP address" instead of the map tile. The registered IP can be modified on the "IGN Espace Pro" website, under your account, you should click on "mes commandes" and then "mod [...]
+before the new IP is actually activated.
+
+Shortly after your order (less than one hour), you will receive a confirmation e-mail, and you will be able to retrieve a personal ID (24 character key) from your personal account on the IGN website.
+
+You can test the WMTS access directly in your web browser by fetching a random map tile, for example:
+
+[https://wxs.ign.fr/**[YOUR_ID]**/wmts?LAYER=GEOGRAPHICALGRIDSYSTEMS.MAPS&EXCEPTIONS=text/xml&FORMAT=image/jpeg&SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&STYLE=normal&TILEMATRIXSET=PM&&TILEMATRIX=1&TILECOL=0&TILEROW=0](https://wxs.ign.fr/[YOUR_ID]/wmts?LAYER=GEOGRAPHICALGRIDSYSTEMS.MAPS&EXCEPTIONS=text/xml&FORMAT=image/jpeg&SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&STYLE=normal&TILEMATRIXSET=PM&&TILEMATRIX=1&TILECOL=0&TILEROW=0)
+
+(don't forget to replace **[YOUR_ID]** with your actual 24 character personal key)
+
+The WMTS "capabilities" can then be fetched at the following URL:
+
+[https://wxs.ign.fr/**[YOUR_ID]**/geoportail/wmts?SERVICE=WMTS&REQUEST=GetCapabilities](https://wxs.ign.fr/[YOUR_ID]/geoportail/wmts?SERVICE=WMTS&REQUEST=GetCapabilities)
+
+(don't forget to replace **[YOUR_ID]** with your actual 24 character personal key)
+
+Unfortunately, unlike other WMTS servers, this capabilities file does not directly work in QMapShack (although it works "as is" in QGIS). To work around this, you will have to modify it with a text editor to include a <ResourceURL> line at the end of the layer description (just before the </Layer> directive) for the "GEOGRAPHICALGRIDSYSTEMS.MAPS" layer (must be adjusted and tested for other layers).
+
+**Download: [IGN.wmts](IGN.wmts)**
+
+(again, don't forget to replace the 3 occurrences of **[YOUR_ID]** with your actual 24 character personal key)
+
+Note that this file was working as of September 22, 2015 but may stop working in the future in case IGN changes its WMTS server configuration.
+
+---
+## Contour lines
+There are two ways to add a transparent contour line layer to your map view:
+
+- vector map in Garmin IMG format
+- raster map with transparent contour line tiles 
+### Vector map in Garmin IMG format
+Some maps for Garmin devices provide a separate img file with contour lines. Add this file to your QMS map directory and you can use it as contour line overlay in map views. 
+
+Sources for vector contour line maps:
+
+- [OpenTopoMap](http://garmin.opentopomap.org/#download): the "Garmin" file contains both a base map and a contour line map in img format
+- [BBBike](http://extract.bbbike.org/?lang=en): allows to create a contour line file for a custom area. 
+- [Velomap](https://www.velomap.org): download the .exe file and chose "install a separate contour lines only map" during the installation process.
+
+### Raster contour line layer
+Some TMS tile servers provide contour line only layers. To use such a layer in QMS, add a *.tms file to your map directory. 
+
+Sample TMS file for the contour line layer from [OpenSnowMap](http://www.opensnowmap.org):
+
+
+```
+#!xml
+
+<TMS>
+ <Title>OpenSnowMap Contour Lines</Title>
+ <MinZoomLevel>1</MinZoomLevel>
+ <MaxZoomLevel>1024</MaxZoomLevel>
+ <Layer idx="0">
+     <ServerUrl>http://www.opensnowmap.org/opensnowmap-overlay/%1/%2/%3.png</ServerUrl>
+ </Layer>
+ <Copyright>Openstreetmap contributors | Rendering: www.opensnowmap.org | DEM: ASTER GDEM is a product of METI and NASA
+SRTM V4.1 from CGIAR-CSI EU-DEM: Produced using Copernicus data and information funded by the European Union </Copyright>
+</TMS>
+
+```
+Other sources for transparent contour line tiles:
+
+- OpenMapSurfer from GIScience at Heidelberg University   
+```<ServerUrl>http://129.206.74.245:8006/tms_il.ashx?x=%2&y=%3&z=%1</ServerUrl>```
+
+---
+## Using openmtbmap.org & velomap.org in QMapShack (Linux only)
+In order to use openmtbmap.org or velomap.org maps within QMapShack you first need to create a gmapsupp.img from the map tiles. 
+For Windows user, there is an integrated batchfile, which will do all necessary steps; so this tutorial is for Linux users. More information you may find [here](https://openmtbmap.org/de/tutorials/mkgmap/).
+
+In Linux, please check if package p7zip-full is installed – we need it to unpack the .exe file. Open the console and execute *sudo apt-get install p7zip-full* . We need [Mkgmap](http://www.mkgmap.org.uk/), too. Also Java is required.
+
+1. Download openmtbmap-ALPS and the latest version of mkgmap
+2. Create a folder like ~/openmtbmap_alps and unzip your downloaded version
+3. Open the .exe file and extract all files called 6528xxxx.img (maptiles) and 7528xxxx (contour lines), and a typ file (the layout of the map). For this sample we choose *widealp.TYP* 
+
+The folder should now contain all map tiles, the contour lines, the layout file and the extracted files from mkgmap.
+
+Now start your console, browse to your folder and copy the following code: 
+
+
+```
+#!sh
+
+java  -Xmx2048M -jar --index --family-id=6528 --description="openmtbmap_alps" --series-name="openmtbmap_alps" --family-name="openmtbmap_alps" --product-id=1 --gmapsupp 6*.img 7*.img widealp.TYP
+```
+
+
+Then press <Enter> and a gmapsupp.img will be created, which you can easily rename to opentmtbmap_alps.img. Now copy this file onto your GPS unit and in your QMapShack maps folder as well.
+
+If you would like do it with some other layout, simply replace the *.TYP (f.e. easyalps.TYP). 
+If you prefer another country be careful: all 6x.img and 7x.img must be from the particular openmtbmap country file! Also don't forget to replace the --family-id with the one from your country.
+
+This is really a quick way, to integrate your favorite openmtbmaps or velomaps into QMapShack.
+
+If you prefer a GUI: you can still use QLandkarteGT for creating gmapsupp.img, too. 
+
+Links (with further information and some tutorials):
+
+* [openmtbmap.org](https://openmtbmap.org/)
+* [velomap.org](https://velomap.org/)
+* [Mkgmap](http://www.mkgmap.org.uk/)
+
+### Script
+
+If you want to update your maps regularly you might consider using the script below.
+The script requires the following tools to be installed:
+
+ * `wget` (downloading)
+ * `7z` (extraction)
+ * `mkgmap` (creation of gmapsupp.img)
+
+#### Configuration
+
+The script below is configured to download the OpenMTBMap for Bavaria, convert it to `OpenMTBMap_<date>.img` using traddby.TYP and move it to `~/.qmapshack_maps/`.
+
+If this does not match your requirements, you will need to adopt the values *FILESRC*, *IMGFMT*, *QMSMAPDIR* and *TYPE*:
+
+* *FILESRC*: [Navigate here](http://ftp5.gwdg.de/pub/misc/openstreetmap/openmtbmap/odbl/), find the file you want to download and write the URL to *FILESRC*
+
+* *IMGFMT*: Name of the resulting file, see `man 1 date`
+
+* *QMSMAPDIR*: Path to your QMS-Map folder (`~` will not work, use `${HOME}` instead)
+
+Depending on your system's configuration you will need to change *MKGMAP* to allow proper execution of `mkgmap` (see section above).
+
+
+```
+#!sh
+#! /bin/sh
+
+# configuration
+
+FILESRC="http://ftp5.gwdg.de/pub/misc/openstreetmap/openmtbmap/odbl/germany/mtbbayern.exe"
+IMGFMT="OpenMTBMap_%Y-%m-%d.img"
+QMSMAPDIR="${HOME}/.qmapshack_maps/"
+TYPE="traddby.TYP"
+MKGMAP="mkgmap"
+
+# code starts here, no changes below here required
+
+error_check() {
+	if [ $1 != 0 ]; then
+		echo ${red}ERROR${NC}
+		exit 1
+	else
+		echo ${green}OK${NC}
+	fi
+}
+
+tool_check() {
+	which $1 2>&1 1>/dev/null
+	if [ $? != 0 ]; then
+		echo ${red}ERROR: $1 missing${NC}
+		exit 1
+	fi
+}
+
+red="\033[0;31m"
+green="\033[0;32m"
+NC="\033[0m"
+
+TMP=`mktemp`
+if [ ! -f "${TMP}" ]; then
+	echo ${red}ERROR: failed to get temp. file${NC}
+	exit 1
+fi
+
+tool_check "wget"
+tool_check "7z"
+${MKGMAP} >/dev/null 2>&1
+if [ $? != 0 ]; then
+	echo ${red}ERROR: mkgmap can\'t be executed${NC}
+	echo ${red}ERROR: make sure MKGMAP is set properly in script configuration${NC}
+	exit 1
+fi
+
+echo -n " * Downloading... "
+wget -q -O "$TMP" "$FILESRC"
+error_check $?
+
+echo -n " * Decompressing... "
+7z e -o"${TMP}_" ${TMP} >/dev/null
+error_check $?
+
+FILETIME=`stat -c %Y ${TMP}`
+IMGFILE=`date -d@${FILETIME} +"${IMGFMT}"`
+
+echo -n " * Building ${IMGFILE}... "
+cd "${TMP}_"
+FID=`ls -x 7*.img | cut -c1-4`
+${MKGMAP} --show-profiles=1 --product-id=1 --family-id=${FID} --index --gmapsupp 6*.img 7*.img ${TYPE} >/dev/null
+error_check $?
+
+echo -n " * Moving gmapsupp.img to ${QMSMAPDIR}... "
+mv "${TMP}_/gmapsupp.img" "${QMSMAPDIR}/${IMGFILE}"
+error_check $?
+
+echo -n " * Cleanup... "
+rm -rf "${TMP}" "${TMP}_"
+error_check $?
+
+```
+
+## TMS Configuration for NZ Topo
+
+Script converts to OSGEO TMS (http://www.maptiler.org/google-maps-coordinates-tile-bounds-projection/)
+(Optimized by KartenFreak, thank you)
+```
+<TMS>
+	<Title>NZTopo</Title>
+	<MinZoomLevel>6</MinZoomLevel>
+	<MaxZoomLevel>15</MaxZoomLevel>
+	<Layer idx="0">
+		<Title>NZTopo</Title>
+		<Script><![CDATA[(
+		function convert(z1,x1,y1)
+		{  return "http://nz1.nztopomaps.com/" + z1 + "/" + x1 + "/" + ((1<<z1) - y1 - 1) + ".png";
+		}
+		)]]></Script>
+	</Layer>
+</TMS>
+```
+
+## (Russian) Raster maps (ex-military (aka "Genshtab" /Maps of the General Staff/), non-classified maps and so on) 
+
+[Quick way to prepare raster map for QMapShack](QuickWayToPrepareRasterMapForQMapShack)
+
+- - -
+[Prev](DocControlMapDem) (Control maps and DEM files) | [Home](Home) | [Manual](DocMain) | (Working with Projects) [Next](DocWorkingWithProjects)
diff --git a/doc/DocPlayground.md b/doc/DocPlayground.md
new file mode 100644
index 0000000..96ab1f9
--- /dev/null
+++ b/doc/DocPlayground.md
@@ -0,0 +1,24 @@
+[Prev](DocFaq) (Frequently Asked Questions) | [Home](Home) | [Manual](DocMain) | (Commit Code) [Next](DeveloperCommitCode)
+- - -
+[TOC]
+- - -
+
+# The Playground #
+
+This page references all articles in progress, that are not referenced by any other page, yet. If you want to start a new page/article, start here.
+
+Please keep in mind that all pages/articles you find in this section is work in progress. You are welcome to read it. You are welcome to point out errors or misleading stuff. But do not expect anything usefull right from the spot.
+
+To start a new page/article in the playgound simply add a new link referencing a file in the sub-directory _playgound_. Do your best to mimic the name scheme. Once you are done you can click the link and a new file file be created.
+
+Pages/articles will be removed without further notice from the Wiki if they stick into this section for more than half a year.
+
+Unfinished articles are:
+
+* [How to do routing](playground/DocGisHowToRouting) - August 2016
+* [How to save your work](playground/DocGisHowToSaveYourWork) - August 2016
+* [Use case motorcycle navigation](playground/DocUseCaseMotorcycleNavigation) - August 2016
+
+
+- - -
+[Prev](DocFaq) (Frequently Asked Questions) | [Home](Home) | [Manual](DocMain) | (Commit Code) [Next](DeveloperCommitCode)
diff --git a/doc/DocSearchGoogle.html b/doc/DocSearchGoogle.html
new file mode 100644
index 0000000..a50f57e
--- /dev/null
+++ b/doc/DocSearchGoogle.html
@@ -0,0 +1,16 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocHandleGpxFiles.html">Prev</a> (Handle GPX and QMS files) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Tracks, Waypoints & Co) <a href="DocGisItems.html">Next</a></p>
+<hr />
+<h1 id="search-google">Search Google</h1>
+<p>The search behaves like a project. It is a toggle item. Thus you can switch it on or off. Simply type your search as you are used to it when using the browser. A return will start the search.</p>
+<p><img alt="maproom1.png" src="images/DocSearchGoogle/maproom1.png" /></p>
+<p>The result is displayed as child item of the project.</p>
+<p><img alt="maproom2.png" src="images/DocSearchGoogle/maproom2.png" /></p>
+<p>Now you can use an existing project or create a new one. </p>
+<p><img alt="maproom3.png" src="images/DocSearchGoogle/maproom3.png" /></p>
+<p>And copy the result via drag-n-drop to the new project. </p>
+<p><img alt="maproom4.png" src="images/DocSearchGoogle/maproom4.png" /></p>
+<hr />
+<p><a href="DocHandleGpxFiles.html">Prev</a> (Handle GPX and QMS files) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Tracks, Waypoints & Co) <a href="DocGisItems.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocSearchGoogle.md b/doc/DocSearchGoogle.md
new file mode 100644
index 0000000..0bfeaff
--- /dev/null
+++ b/doc/DocSearchGoogle.md
@@ -0,0 +1,25 @@
+[Prev](DocHandleGpxFiles) (Handle GPX and QMS files) | [Home](Home) | [Manual](DocMain) | (Tracks, Waypoints & Co) [Next](DocGisItems)
+- - -
+[TOC]
+- - -
+
+# Search Google
+
+The search behaves like a project. It is a toggle item. Thus you can switch it on or off. Simply type your search as you are used to it when using the browser. A return will start the search.
+
+![maproom1.png](images/DocSearchGoogle/maproom1.png)
+
+The result is displayed as child item of the project.
+
+![maproom2.png](images/DocSearchGoogle/maproom2.png)
+
+Now you can use an existing project or create a new one. 
+
+![maproom3.png](images/DocSearchGoogle/maproom3.png)
+
+And copy the result via drag-n-drop to the new project. 
+
+![maproom4.png](images/DocSearchGoogle/maproom4.png)
+
+- - -
+[Prev](DocHandleGpxFiles) (Handle GPX and QMS files) | [Home](Home) | [Manual](DocMain) | (Tracks, Waypoints & Co) [Next](DocGisItems)
diff --git a/doc/DocUseCaseMotorcycleNavigation.html b/doc/DocUseCaseMotorcycleNavigation.html
new file mode 100644
index 0000000..d0f6985
--- /dev/null
+++ b/doc/DocUseCaseMotorcycleNavigation.html
@@ -0,0 +1,113 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
+<hr />
+<h1 id="this-is-just-a-stub-test-dummy-and-not-yet-ready-for-public-linkage">This is just a stub / test dummy and not yet ready for public linkage.</h1>
+<h1 id="peculiarities-of-motorcycle-navigation">Peculiarities of Motorcycle Navigation</h1>
+<p>As it appears, motorcycle navigation demands some special requirements, so that all those major manufacturers of satnav navigation devices even offer special product series. Beyond ruggedized design and glove optimized handling, there are special features like navigating along tracks, preference for curvy roads or skipping of intermediary route points.</p>
+<p><strong>They way is the goal</strong>. This implies some special approach for trip planning, which obviously is not present in this combination in other GIS related situations:</p>
+<ul>
+<li>extensive share of trip data with third parties (friends, other planning tools, web hosted trips)</li>
+<li>maps with indication of “scenicness”</li>
+<li>repeated replanning of trips already engaged</li>
+<li>fast replanning while driving on the satnav device</li>
+<li>refinding your tour (not some arbitrary waypoint) after deviation</li>
+<li>....</li>
+</ul>
+<p>The common trick to force your satnav device to stick to your preplanned route instead of guiding you away from the scenic river valley to the close by highway is to add a number of arbitrary <strong>dummy waypoints</strong>: Addresses you do not really want to visit, but keep your satnav to stick to your preferences, not the one the programmer implemented. Let’s call this trick to <strong>nail down</strong> your route.</p>
+<p>For sake of example, let me report some encounters of my last tour I pre-planned with QMapShack and engaged with the route downloaded to a Garmin zumo 390LM (one of those dedicated motorcycle satnav gadgets).</p>
+<p>Some supplemental waypoints I added to “nail down” a route to my desires where some dozen meters beneath the road. If you realize it during driving, you have to pass it by and then manually call “skip route point” (a feature I desperately missed on my car satnav I used before) to avoid your satnav insisting to “turn back”. Not nice during driving curvy roads, but still better than a complete loss of navigation assistance.</p>
+<p><img alt="wiki-fl.jpg" src="https://bitbucket.org/repo/L5qerE/images/2580338973-wiki-fl.jpg" /></p>
+<p>If you do not realize that you just hunt a dummy nail, you may enter some residential area, city center or some highway junction just to be told that you can turn now: <em>have come far but what am I doing here?</em> :-((( . So, carefully adjusting your “trip nails” close to your route is tantamount. </p>
+<p><img alt="wiki-kc.jpg" src="https://bitbucket.org/repo/L5qerE/images/1500573576-wiki-kc.jpg" />
+<img alt="wiki-bf.jpg" src="https://bitbucket.org/repo/L5qerE/images/3741804599-wiki-bf.jpg" /></p>
+<p>One road that was both included by QMapShack backend routino and by Garmins zumo I found decorated by the infamous “closed for cars and motorcycles”. (Yes, I know, OSM is a community endeavor, too. Put on my todo list).</p>
+<p><img alt="wiki-ol.jpg" src="https://bitbucket.org/repo/L5qerE/images/3337226930-wiki-ol.jpg" /></p>
+<p>Pretending to be the nice guy, I passed by and found myself on a highway that led me to miss one of the most interesting pieces of river valley in the journey I’d planned. Presumably there had been an alternative to my sceny track back (yellow road between the blue plan and the magenta track), but you won’t find that in heavy traffic when you are just entering a highway, nearly naked between 40-ton-trucks. Never mind: nice reason to ride there again :-) . After the trip is [...]
+<p><img alt="wiki-or.jpg" src="https://bitbucket.org/repo/L5qerE/images/2715376200-wiki-or.jpg" /></p>
+<p>At some other junction, my eyes found a sideway that promised an even more scenic trip into the mountains than the river valley that I had planned with my eyes on the map only. Great - just turn and enjoy the nüvis functionality to reroute me back to my preplanned tour on other curvy roads. This nice deviation is registered in my track log and available for future planning.</p>
+<p><img alt="wiki-lk.jpg" src="https://bitbucket.org/repo/L5qerE/images/1078212255-wiki-lk.jpg" /></p>
+<p>When you use differend maps and/or different routing engines and/or different routing preferences, your plan in the workstation might nevertheless show differences from the one your satnav displays on the trip:</p>
+<p><img alt="wiki-sk.jpg" src="https://bitbucket.org/repo/L5qerE/images/3193648309-wiki-sk.jpg" />
+<img alt="wiki-eg.jpg" src="https://bitbucket.org/repo/L5qerE/images/2078719396-wiki-eg.jpg" /></p>
+<p>This is where you learn to appreciate the “prefer curvy roads” option of the zümo. At least, as long as the curves are not located in the middle of some industrial area.</p>
+<h1 id="why-qmapshack">Why QMapShack?</h1>
+<h2 id="glimpse-on-the-gis-software-field">Glimpse on the GIS software Field</h2>
+<p>This is not a thourough overview if GIS software for linux, just my own personal experience.
+Being a farmer by profession, I have used <strong>qgis</strong> since about 5 years now to assist the ever growing documentation needs of work in the field. I have a small matchbox sized <strong>BT747 GPS logger</strong> I can carry with me on the tractor. At home, I can import the tracks into qgis and reconstruct the partitioning of my fields for different crops. While I’d consider qgis much more elaborate and mature than QMapShack, it is in many cases much more tedious, overcrowd [...]
+<p>Maintaining a collection of trip records may become a source of chaos over time.
+A Tool for a quick preview of shape and location of track might be of great assistance for sorting.
+On my old SuSE 11 workstation, I misused <strong>josm</strong> - the OSM map edit tool - for this purpose. While it is quite slow due to its java architecture and a lot features of which I do not even know the purpose, it was still faster as the qgis track conversion procedure. I used it for opening tracks on a OSM or Satellite image background - just to get an idea what is in the track when organizing them.</p>
+<p>Some day I stuck my BT747 into the pocket to carry it along what should become a nice motorcycle trip. Reading the trip into josm and dreaming of what I might change the next time I’d ride into those areas became the beginning of what is documented right here.</p>
+<p>On my new debian, I found <strong>marble</strong> as a much better tool for fast preview of tracks (and other GPS data files). It is even preregistered as standard application for gpx files and fires up within seconds, when I click on it in my file manager. Ah, marble is part of KDE, I see. While in some instances targeting similar use cases as QMapShack, I did not dig deeper into it. Well - I had preplanned a tour using the address search capability I was (then) still missing in QMap [...]
+<p>Garmin, one of the major satnav device manufacturers, offers a product called <strong>BaseCamp</strong>. As the name suggests, it is targeted precisely to planing and replanning trips which are then guided by one of its devices “out there in the wild”. Consequently, what is called a “project” in QMapShack, is labeled an “adventure” in BaseCamp. Of course, it offers a good integration with its own satnav gadgets. The main disadvantage for me: it only [...]
+<p>Googling for “BaseCamp wine”, I found many reports of failure - and a pointer to <strong>QLandkarteGT</strong>, and from the last ones web page a Pointer to its successor QMapShack. So I started to explore QMapShack considering it as the open source / linux alternative to Garmins BaseCamp. Haven’t even tried “wine BaseCamp” yet.</p>
+<p>Last but not least, there is one tool you should know whenever you face tasks of integrating GPS data from different sources and formats: <strong>gpsbabel</strong> . I call it the “GPS swiss army knife”. It is “just” a command line tool, hence a very versatile and powerful one, if it comes to manipulate GPS/GIS data and convert them between different file formats. Maybe there is some GUI wrapper for gpsbabel out there, but to my experience, such things just add [...]
+<h2 id="features-of-qmapshack-i-learned-to-appreciate">Features of QMapShack I learned to appreciate</h2>
+<ul>
+<li>Really fast performance when zooming in and out
+even with multiple maps</li>
+<li>DEM, Topo maps, bicycle maps, Sat images for estimation the “scenicity” of a tour</li>
+<li>Offline OSM and offline DEM</li>
+<li>Offline router routino</li>
+<li>
+<p>possibility to build all on a single data source OSM
+(well, there may be some time lags if we used prefabricated sources as recommended in Manual</p>
+</li>
+<li>
+<p>Routing</p>
+</li>
+<li>GPX import and export (haven’t yet tested other formats)</li>
+<li>Handle many GPX projects simultaneously</li>
+<li>workable Garmin device integration (no access to test other brands)</li>
+</ul>
+<h2 id="downsides">downsides</h2>
+<p>To me, QMapShack appears to be a project of rapid development. Why this is good news if it comes to features and quality we can expect, we see that documentation does not catch up. For example, recently I asked in QMS issue list for some functionality that might resemble some basic route planning features, as (still to be) described below. Surprise: route planning support is available and works fine, but simply is not yet documented. I agree, another candidate for my ToDo list.</p>
+<p>Of course, rapidly growing projects also display some higher risk of regression bugs. I encountered a segfault issue in the routino part - a really great and performant routing engine - which is integrated in QMS. I only received defending comments from the programmers when reporting this issue. In mature projects, you always find some people doing the boring job of quality assurance. In QMS, all good people still seem to fight at the frontier of innovation. However, QMS at least took [...]
+<p>Look, feel and features may severely change in future releases. I would not dare to rely on QMapShack in “mission critical” professional applications, as long as you do not feel confident to be able to grab into the nuts and bolts of the source code on your own responsibility.</p>
+<p>However</p>
+<p>.... route point labels missing ????....
+well this happened on the nüvi with BaseCamp as well 
+maybe the problem is located between chair and keyboard?</p>
+<h1 id="geopatial-data">Geopatial data</h1>
+<h2 id="geospatial-entities-tracks-routes-waypoints">Geospatial entities: Tracks, Routes, Waypoints</h2>
+<h2 id="some-words-on-data-formats">Some Words on data formats</h2>
+<h3 id="sources-of-track-data">sources of track data</h3>
+<p>breadcrumb</p>
+<p>I have a bunch of GPS mice laying around from a 
+NMEA … collection with a raspi … gpsbabel -> gpx 
+Logger
+Mobile apps (most mobiles have built in GPS -
+reportedly bad accuracy - no systematic tests yet</p>
+<p>Import from other route planners, 
+Trips from Friends</p>
+<h1 id="working-with-qmapshack">Working with QMapShack</h1>
+<h2 id="installation">Installation</h2>
+<h3 id="configuring-maps-dem-and-routino">Configuring maps, DEM and routino</h3>
+<h3 id="configuring-maps-dem-and-routino_1">Configuring maps, DEM and routino</h3>
+<h3 id="configuring-maps-dem-and-routino_2">Configuring maps, DEM and routino</h3>
+<h3 id="planning-routes">Planning routes</h3>
+<h3 id="importing-tracks">Importing tracks</h3>
+<h3 id="exchanging-data-with-the-garmin-nuvi">Exchanging data with the Garmin nüvi</h3>
+<h2 id="some-additional-helper-scripts">Some additional helper scripts</h2>
+<h2 id="gpsbabel">gpsbabel</h2>
+<h1 id="further-plans">Further plans</h1>
+<h2 id="inverse-routing">Inverse routing</h2>
+<p>rationale .... 
+status quo
+link to code snippet </p>
+<h2 id="geotagged-videos">Geotagged Videos</h2>
+<p>I donsider it a great idea to record a video during driving along with the track coordinates.
+Many car dashboard cams do this, but I did not yet find a ruggedized one for motorcycle mounting.
+Recently, I got a ruggedized “action cam” with GPS receiver included. 
+Sadly, first test where disappointing: huge files, small memory, small battery, 30 min recording max.
+Not suited for a trip.</p>
+<p>Calls for some DIY, e.g. on a raspberry. There I could record cam and GPS from independent sources and perform image / video extraction matching to my needs, not to some GoPro-cloning marketing geek.
+My Idea were to record low quality video at say 30 fps, and additionally extract high quality images at say 1 fps or so.</p>
+<p>Unfortunately, most players for geotagged video playing is for WIN$ only.
+I could not get one to work on my old SuSE 11.0 those days. I got a WIN Laptop now, and a recent debian jessie on the workstation. Time to try again.</p>
+<p>And it would be great to display a combined view of track on map, video, images and track profile synchronized in the web, I haven’t found any player yet. Pointers were welcome.</p>
+<p>Nice-Stuff-ToDo list growing still longer....</p>
+<hr />
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
\ No newline at end of file
diff --git a/doc/DocWorkingWithProjects.html b/doc/DocWorkingWithProjects.html
new file mode 100644
index 0000000..a367e7f
--- /dev/null
+++ b/doc/DocWorkingWithProjects.html
@@ -0,0 +1,12 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p><a href="DocMapsTipsTricks.html">Prev</a> (Maps: Tips and Tricks) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Handle GPX and QMS files) <a href="DocHandleGpxFiles.html">Next</a></p>
+<hr />
+<h1 id="working-with-projects">Working with Projects</h1>
+<p>A project is a container that contains GIS items like waypoints, tracks, etc. There are several sources for projects. A single GPX file is a project. Or a query on a GIS server like Google. </p>
+<p>You can create a new project, start a search or close all projects by the <em>Project</em> menu:</p>
+<p><img alt="Alt text" src="images/DocWorkingWithProjects/maproom1.png" /></p>
+<p>You get the same menu with a right click when no item in the data view’s workspace list is selected.</p>
+<hr />
+<p><a href="DocMapsTipsTricks.html">Prev</a> (Maps: Tips and Tricks) | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | (Handle GPX and QMS files) <a href="DocHandleGpxFiles.html">Next</a></p>
\ No newline at end of file
diff --git a/doc/DocWorkingWithProjects.md b/doc/DocWorkingWithProjects.md
new file mode 100644
index 0000000..5f698e8
--- /dev/null
+++ b/doc/DocWorkingWithProjects.md
@@ -0,0 +1,17 @@
+[Prev](DocMapsTipsTricks) (Maps: Tips and Tricks) | [Home](Home) | [Manual](DocMain) | (Handle GPX and QMS files) [Next](DocHandleGpxFiles)
+- - -
+[TOC]
+- - -
+
+# Working with Projects
+
+A project is a container that contains GIS items like waypoints, tracks, etc. There are several sources for projects. A single GPX file is a project. Or a query on a GIS server like Google. 
+
+You can create a new project, start a search or close all projects by the _Project_ menu:
+
+![Alt text](images/DocWorkingWithProjects/maproom1.png)
+
+You get the same menu with a right click when no item in the data view's workspace list is selected.
+
+- - -
+[Prev](DocMapsTipsTricks) (Maps: Tips and Tricks) | [Home](Home) | [Manual](DocMain) | (Handle GPX and QMS files) [Next](DocHandleGpxFiles)
diff --git a/doc/Home.html b/doc/Home.html
new file mode 100644
index 0000000..f4f9d20
--- /dev/null
+++ b/doc/Home.html
@@ -0,0 +1,76 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<h1 id="welcome-to-qmapshack">Welcome to QMapShack</h1>
+<p>Use QMapShack to plan your next outdoor trip or to visualize and archive all the GPS recordings of your past exciting adventures. QMapShack is the next generation of the famous QLandkarte GT application. And of course it’s even better and easier to use.</p>
+<p>If you want to download QMapShack visit the <a href="https://bitbucket.org/maproom/qmapshack/downloads"><strong>download page</strong></a></p>
+<p>If you want to see <strong>screenshots</strong> or start with QMapShack visit the <a href="DocMain.html"><strong>documentation page</strong></a>.</p>
+<p><a href="ReportBugs.html"><strong>Found a bug?</strong> Read this!</a></p>
+<p><a href="BugFeatures.html"><strong>Missing a feature?</strong> Read this!</a></p>
+<p>If you need <strong>troubleshooting</strong> have a look <a href="TroubleShooting.html"><strong>here</strong></a></p>
+<h2 id="support">Support</h2>
+<p>Problems understanding the documentation? Your requirement is not addressed by the documentation? You want to add to the project, but you do not know where to start? You got lost in the source code and need some guidance? You just want to brag about the crazy new feature you plan to add? </p>
+<p>For all these questions you can get in touch with development.</p>
+<ul>
+<li>The QLandkarte GT <a href="https://lists.sourceforge.net/lists/listinfo/qlandkartegt-users">mailing list</a> and it’s <a href="http://news.gmane.org/gmane.comp.gis.qlandkartegt.user">archive</a></li>
+<li>IRC freenode, channel <a href="http://webchat.freenode.net/?channels=#qlandkarte">#qlandkarte</a></li>
+<li>Reading the <a href="DocFaq.html">FAQ</a> never hurts.</li>
+</ul>
+<h2 id="unsupported-systems">Unsupported Systems:</h2>
+<p>Due to limited resources a few operating system versions are not supported:</p>
+<ul>
+<li>Linux 32bit versions</li>
+<li>Windows 32bit versions</li>
+<li>OS X < 10.8</li>
+</ul>
+<h2 id="features">Features</h2>
+<p>Maps:</p>
+<ul>
+<li>Garmin vector maps and *.jnx raster maps</li>
+<li>Raster maps supported by GDAL</li>
+<li>GEMF raster maps</li>
+<li>Online maps (TMS and WTMS (partially))</li>
+<li>Display multiple maps in one view</li>
+<li>Reproject maps on-the-fly to view’s projection</li>
+<li>Digital elevation model independent from maps</li>
+<li>Hillshading and slope coloring</li>
+</ul>
+<p>GIS Data:</p>
+<ul>
+<li>100% project oriented data handling</li>
+<li>Summarize project by a diary</li>
+<li>Support for tracks, routes, waypoints and areas</li>
+<li>Support of track point extensions (e.g. heart rate)</li>
+<li>Support GPX, SLF, FIT and QMapShack’s own binary format</li>
+<li>Simple geocache support</li>
+<li>Store projects in a database</li>
+<li>Support for multiple databases</li>
+</ul>
+<p>Planning:</p>
+<ul>
+<li>Undo/redo history for all items</li>
+<li>Track point edit mode to create/change tracks, routes or areas</li>
+<li>Cut/copy/combine/reverse tracks</li>
+<li>Various filter to enhance tracks</li>
+<li>Track point extensions like heart rate, cadence,…</li>
+<li>Fine tune track statistics by activities</li>
+<li>Colorize track by extension or activity</li>
+<li>Create routes and calculate them by Routino (offline) or MapQuest (online)</li>
+<li>Use offline router to draw tracks on-the-fly.</li>
+</ul>
+<p>GPS Devices:</p>
+<ul>
+<li>Support for newer Garmin devices</li>
+<li>Support for TwoNav devices</li>
+<li>Project oriented data organization on devices</li>
+<li>Synchronize your project with a group of devices attached </li>
+</ul>
+<p>System:</p>
+<ul>
+<li>License GPL3+</li>
+<li>Runs on all *nix systems as well as on Windows and OS X.</li>
+<li>GUI has been translated to Czech, Dutch, French, German and Spanish</li>
+<li>Wiki documentation is English </li>
+<li>Needs Qt5.4 or later, GDAL, Proj4 and Routino installed</li>
+<li>For device support on Linux DBus and UDisk2 must be installed</li>
+</ul>
\ No newline at end of file
diff --git a/doc/Home.md b/doc/Home.md
new file mode 100644
index 0000000..aab01f6
--- /dev/null
+++ b/doc/Home.md
@@ -0,0 +1,82 @@
+# Welcome to QMapShack
+
+Use QMapShack to plan your next outdoor trip or to visualize and archive all the GPS recordings of your past exciting adventures. QMapShack is the next generation of the famous QLandkarte GT application. And of course it's even better and easier to use.
+
+If you want to download QMapShack visit the [**download page**](https://bitbucket.org/maproom/qmapshack/downloads)
+
+If you want to see **screenshots** or start with QMapShack visit the [**documentation page**](DocMain).
+
+[**Found a bug?** Read this!](ReportBugs)
+
+[**Missing a feature?** Read this!](RequestFeatures)
+
+If you need **troubleshooting** have a look [**here**](TroubleShooting)
+
+## Support
+
+Problems understanding the documentation? Your requirement is not addressed by the documentation? You want to add to the project, but you do not know where to start? You got lost in the source code and need some guidance? You just want to brag about the crazy new feature you plan to add? 
+
+For all these questions you can get in touch with development.
+
+* The QLandkarte GT [mailing list](https://lists.sourceforge.net/lists/listinfo/qlandkartegt-users) and it's [archive](http://news.gmane.org/gmane.comp.gis.qlandkartegt.user)
+* IRC freenode, channel [#qlandkarte](http://webchat.freenode.net/?channels=#qlandkarte)
+* Reading the [FAQ](DocFaq) never hurts.
+
+## Unsupported Systems:
+Due to limited resources a few operating system versions are not supported:
+
+* Linux 32bit versions
+* Windows 32bit versions
+* OS X < 10.8
+
+## Features
+
+Maps:
+
+* Garmin vector maps and *.jnx raster maps
+* Raster maps supported by GDAL
+* GEMF raster maps
+* Online maps (TMS and WTMS (partially))
+* Display multiple maps in one view
+* Reproject maps on-the-fly to view's projection
+* Digital elevation model independent from maps
+* Hillshading and slope coloring
+
+GIS Data:
+
+* 100% project oriented data handling
+* Summarize project by a diary
+* Support for tracks, routes, waypoints and areas
+* Support of track point extensions (e.g. heart rate)
+* Support GPX, SLF, FIT and QMapShack's own binary format
+* Simple geocache support
+* Store projects in a database
+* Support for multiple databases
+
+Planning:
+
+* Undo/redo history for all items
+* Track point edit mode to create/change tracks, routes or areas
+* Cut/copy/combine/reverse tracks
+* Various filter to enhance tracks
+* Track point extensions like heart rate, cadence,...
+* Fine tune track statistics by activities
+* Colorize track by extension or activity
+* Create routes and calculate them by Routino (offline) or MapQuest (online)
+* Use offline router to draw tracks on-the-fly.
+
+GPS Devices:
+
+* Support for newer Garmin devices
+* Support for TwoNav devices
+* Project oriented data organization on devices
+* Synchronize your project with a group of devices attached 
+
+System:
+
+* License GPL3+
+* Runs on all *nix systems as well as on Windows and OS X.
+* GUI has been translated to Czech, Dutch, French, German and Spanish
+* Wiki documentation is English 
+* Needs Qt5.4 or later, GDAL, Proj4 and Routino installed
+* For device support on Linux DBus and UDisk2 must be installed
diff --git a/doc/HtmlMake.py b/doc/HtmlMake.py
new file mode 100755
index 0000000..7329bcd
--- /dev/null
+++ b/doc/HtmlMake.py
@@ -0,0 +1,156 @@
+#! /usr/bin/env python
+
+########################################################################
+########################################################################
+##                                                                    ##
+## Copyright (C) 2016 Rainer Woitok, Rainer.Woitok at Gmail.Com          ##
+##                                                                    ##
+## This Shell script is free software: you can redistribute it and/or ##
+## modify it  under the terms  of the  GNU General  Public License as ##
+## published by the Free Software Foundation, either version 3 of the ##
+## License, or (at your option) any later version.                    ##
+##                                                                    ##
+## This program is  distributed in the hope that  it will be  useful, ##
+## but  WITHOUT ANY WARRANTY;  without  even the implied warranty  of ##
+## MERCHANTABILITY or FITNESS FOR A  PARTICULAR PURPOSE.  See the GNU ##
+## General Public License for more details.                           ##
+##                                                                    ##
+## You should have received a copy  of the GNU General Public License ##
+## along with this program.  If not, see                              ##
+##                                                                    ##
+##        <http://www.gnu.org/licenses/>                              ##
+##                                                                    ##
+########################################################################
+########################################################################
+#
+# From the  "*.md" Markdown source file  specified as argument create an
+# "*.html" file  on standard output  by using Python's "Markdown" module
+# which can be found at:
+#
+#      "https://pythonhosted.org/Markdown/".
+#
+#                                                    R Woitok 2016-03-04
+#
+########################################################################
+#
+# Specify UTF-8 encoding for the HTML file to be created  (since we esc-
+# ape the angle brackets in our own extension below, the following three
+# lines MUST NOT be piped to "Markdown"):
+
+print('<head>')
+print('<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">')
+print('</head>')
+
+import markdown, re, sys
+
+#
+# Check the argument,  and if there is none,  provide an  empty argument
+# causing standard input to be read:
+
+if len(sys.argv) == 1: sys.argv.extend([''])  # Default: standard input.
+
+from markdown.extensions    import Extension
+from markdown.preprocessors import Preprocessor
+
+#
+# Since references to local files in the various "*.md" source files are
+# required by Bitbucket  to have  NO  extension  but are required by any
+# browser to have an ".html" extension,  we use the following additional
+# Markdown preprocessor:
+
+class AddHtmlExt(Preprocessor):
+    def run(self, InLines):
+        OutLines  = []                    # To receive the output lines.
+        ReHash    = re.compile('#')  # Match start of header identifier.
+
+        #
+        # Ignore URLs which refer  to a header identifier in the current
+        # file ("#..."), to a remote location ("http://" or "https://"),
+        # or which  already contain  an extension  (which is supposed to
+        # consist of a dot  followed by  a sequence of  characters other
+        # than dot  and dash  (the latter preventing  the trailing ".04-
+        # HowTo" in the "Ubuntu*" URL to be mistaken for an extension)):
+
+        ReIgnore  = re.compile('[]][(](#|https?://|(.*/)?.+[.][^-.]+(#|[)]))')
+        ReProtect = re.compile('[]]=[(]')                 # Match "]=(".
+        ReRPar    = re.compile('[)]')                # Match end of URL.
+
+        #
+        # In Markdown a URL is always  prefixed with  "]("  and suffixed
+        # with ")":
+
+        ReUrl     = re.compile('[]][(][^)]+[)]')
+
+        for line in InLines:
+            while True:
+                url = ReUrl.search(line)              # Locate next URL.
+
+                if not url: break                # No further URL found.
+
+                OldUrl = url.group()                # Fetch current URL.
+
+                if ReIgnore.match(OldUrl):
+                      NewUrl = OldUrl           # Don't change this URL.
+                elif ReHash.search(OldUrl):
+                      NewUrl = ReHash.sub('.html#', OldUrl, count=1)
+                else: NewUrl = ReRPar.sub('.html)', OldUrl, count=1)
+
+                #
+                # Replace the initial "](" with "]=("  to prevent match-
+                # ing here again:
+
+                line = ReUrl.sub(']=(' + NewUrl[2:], line, count=1)
+
+            #
+            # After having  processed all URLs  in this line,  again re-
+            # place "]=(" with "](" and output the line:
+
+            OutLines.append(ReProtect.sub('](',line))
+
+        return OutLines
+
+#
+# Define a Markdown extension which solves all our HTML problems:
+
+class FixHtml(Extension):
+   def extendMarkdown(self, md, md_globals):
+
+       #
+       # Insert our own "AddHtmlExt" preprocessor  at the very beginning
+       # of ordered "md" dict "preprocessors":
+
+       md.preprocessors.add('add_html_ext',AddHtmlExt(md),'_begin')
+
+       #
+       # Since Markdown's "save_mode='...'" option  is meanwhile deprec-
+       # ated,  delete the following  three components  from the various
+       # "md" dicts  to achieve the same effect  as "safe_mode='escape'"
+       # formerly had:
+
+       del md.inlinePatterns['entity']
+       del md.inlinePatterns['html']
+       del md.preprocessors['html_block']
+
+#
+# Pass the input file to Markdown with all necessary extensions enabled,
+# including our own "FixHtml" extension:
+
+markdown.markdownFromFile(extensions=['markdown.extensions.admonition',
+                                      'markdown.extensions.codehilite',
+                                      'markdown.extensions.extra'     ,
+                                      'markdown.extensions.meta'      ,
+                                      'markdown.extensions.sane_lists',
+                                      'markdown.extensions.smarty'    ,
+                                      'markdown.extensions.toc'       ,
+                                      'markdown.extensions.wikilinks' ,
+                                      FixHtml()
+                                     ],
+                          extension_configs={'markdown.extensions.codehilite':
+                                                {'linenums':     'False',
+                                                 'use_pygments': 'False'
+                                                }
+                                            },
+                          input=sys.argv[1]
+                         )
+
+sys.exit(0)
diff --git a/doc/IGN.wmts b/doc/IGN.wmts
new file mode 100644
index 0000000..4a3ee91
--- /dev/null
+++ b/doc/IGN.wmts
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Capabilities xmlns="http://www.opengis.net/wmts/1.0" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0.0" xsi:schemaLocation="http://www.opengis.net/wmts/1.0 http://schemas.opengis.net/wmts/1.0/wmtsGetCapabilities_response.xsd">
+<ows:ServiceIdentification>
+<ows:Title>Service de visualisation WMTS</ows:Title>
+<ows:Abstract>Ce service permet la visualisation de couches de données raster IGN au travers d'un flux WMTS</ows:Abstract>
+<ows:Keywords>
+<ows:Keyword>Unités administratives</ows:Keyword>
+<ows:Keyword>Limites administratives</ows:Keyword>
+<ows:Keyword>Surfaces bâties</ows:Keyword>
+<ows:Keyword>Réseaux de transport</ows:Keyword>
+<ows:Keyword>Routes</ows:Keyword>
+<ows:Keyword>Réseaux ferroviaires</ows:Keyword>
+<ows:Keyword>Aérodromes</ows:Keyword>
+<ows:Keyword>Réseau hydrographique</ows:Keyword>
+<ows:Keyword>Parcelles cadastrales</ows:Keyword>
+<ows:Keyword>Bâtiments</ows:Keyword>
+<ows:Keyword>Services d'utilité publique et services publics</ows:Keyword>
+<ows:Keyword>Réseaux de transport</ows:Keyword>
+<ows:Keyword>Hydrographie</ows:Keyword>
+<ows:Keyword>Photographies aériennes</ows:Keyword>
+<ows:Keyword>Cartes</ows:Keyword>
+<ows:Keyword>Cartes historiques</ows:Keyword>
+<ows:Keyword>Altitude</ows:Keyword>
+</ows:Keywords>
+<ows:ServiceType>OGC WMTS</ows:ServiceType>
+<ows:ServiceTypeVersion>1.0.0</ows:ServiceTypeVersion>
+<ows:Fees>licences</ows:Fees>
+<ows:AccessConstraints>Conditions Générales d'Utilisation disponibles ici : http://professionnels.ign.fr/sites/default/files/CGU_API_Pro.pdf</ows:AccessConstraints>
+</ows:ServiceIdentification>
+<ows:ServiceProvider>
+<ows:ProviderName>IGN</ows:ProviderName>
+<ows:ProviderSite xlink:href=""/>
+<ows:ServiceContact>
+<ows:IndividualName>Géoportail SAV</ows:IndividualName>
+<ows:PositionName>custodian</ows:PositionName>
+<ows:ContactInfo>
+<ows:Phone>
+<ows:Voice/>
+<ows:Facsimile/>
+</ows:Phone>
+<ows:Address>
+<ows:DeliveryPoint>73 avenue de Paris</ows:DeliveryPoint>
+<ows:City>Saint Mandé</ows:City>
+<ows:AdministrativeArea/>
+<ows:PostalCode>94160</ows:PostalCode>
+<ows:Country>France</ows:Country>
+<ows:ElectronicMailAddress>geop_services at geoportail.fr</ows:ElectronicMailAddress>
+</ows:Address>
+</ows:ContactInfo>
+</ows:ServiceContact>
+</ows:ServiceProvider>
+<ows:OperationsMetadata>
+<ows:Operation name="GetCapabilities">
+<ows:DCP>
+<ows:HTTP>
+<ows:Get xlink:href="https://wxs.ign.fr/[YOUR_ID]/geoportail/wmts?">
+<ows:Constraint name="GetEncoding">
+<ows:AllowedValues>
+<ows:Value>KVP</ows:Value>
+</ows:AllowedValues>
+</ows:Constraint>
+</ows:Get>
+</ows:HTTP>
+</ows:DCP>
+</ows:Operation>
+<ows:Operation name="GetTile">
+<ows:DCP>
+<ows:HTTP>
+<ows:Get xlink:href="https://wxs.ign.fr/[YOUR_ID]/geoportail/wmts?">
+<ows:Constraint name="GetEncoding">
+<ows:AllowedValues>
+<ows:Value>KVP</ows:Value>
+</ows:AllowedValues>
+</ows:Constraint>
+</ows:Get>
+</ows:HTTP>
+</ows:DCP>
+</ows:Operation>
+</ows:OperationsMetadata>
+<Contents>
+<Layer>
+<ows:Title>Cartes IGN</ows:Title>
+<ows:Abstract>Cartes IGN</ows:Abstract>
+<ows:Keywords>
+<ows:Keyword>Cartes</ows:Keyword>
+</ows:Keywords>
+<ows:WGS84BoundingBox>
+<ows:LowerCorner>-180 -68.1389</ows:LowerCorner>
+<ows:UpperCorner>180 80</ows:UpperCorner>
+</ows:WGS84BoundingBox>
+<ows:Identifier>GEOGRAPHICALGRIDSYSTEMS.MAPS</ows:Identifier>
+<Style isDefault="true">
+<ows:Title>Données Brutes</ows:Title>
+<ows:Abstract>Données brutes sans changement de palette</ows:Abstract>
+<ows:Keywords>
+<ows:Keyword>Défaut</ows:Keyword>
+</ows:Keywords>
+<ows:Identifier>normal</ows:Identifier>
+<LegendURL format="image/jpeg" height="200" maxScaleDenominator="100000000" minScaleDenominator="200" width="200" xlink:href="http://www.geoportail.gouv.fr/depot/LEGEND.jpg"/>
+</Style>
+<Format>image/jpeg</Format>
+<TileMatrixSetLink>
+<TileMatrixSet>PM</TileMatrixSet>
+<TileMatrixSetLimits>
+<TileMatrixLimits>
+<TileMatrix>0</TileMatrix>
+<MinTileRow>0</MinTileRow>
+<MaxTileRow>0</MaxTileRow>
+<MinTileCol>0</MinTileCol>
+<MaxTileCol>1</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>1</TileMatrix>
+<MinTileRow>0</MinTileRow>
+<MaxTileRow>1</MaxTileRow>
+<MinTileCol>0</MinTileCol>
+<MaxTileCol>2</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>10</TileMatrix>
+<MinTileRow>341</MinTileRow>
+<MaxTileRow>780</MaxTileRow>
+<MinTileCol>5</MinTileCol>
+<MaxTileCol>990</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>11</TileMatrix>
+<MinTileRow>681</MinTileRow>
+<MaxTileRow>1544</MaxTileRow>
+<MinTileCol>10</MinTileCol>
+<MaxTileCol>1981</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>12</TileMatrix>
+<MinTileRow>1363</MinTileRow>
+<MaxTileRow>3088</MaxTileRow>
+<MinTileCol>20</MinTileCol>
+<MaxTileCol>3962</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>13</TileMatrix>
+<MinTileRow>2726</MinTileRow>
+<MaxTileRow>6177</MaxTileRow>
+<MinTileCol>40</MinTileCol>
+<MaxTileCol>7924</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>14</TileMatrix>
+<MinTileRow>5452</MinTileRow>
+<MaxTileRow>12355</MaxTileRow>
+<MinTileCol>81</MinTileCol>
+<MaxTileCol>15847</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>15</TileMatrix>
+<MinTileRow>10944</MinTileRow>
+<MaxTileRow>21176</MaxTileRow>
+<MinTileCol>163</MinTileCol>
+<MaxTileCol>31695</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>16</TileMatrix>
+<MinTileRow>21889</MinTileRow>
+<MaxTileRow>42353</MaxTileRow>
+<MinTileCol>326</MinTileCol>
+<MaxTileCol>63382</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>17</TileMatrix>
+<MinTileRow>43776</MinTileRow>
+<MaxTileRow>73526</MaxTileRow>
+<MinTileCol>42528</MinTileCol>
+<MaxTileCol>85869</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>18</TileMatrix>
+<MinTileRow>87557</MinTileRow>
+<MaxTileRow>147052</MaxTileRow>
+<MinTileCol>85058</MinTileCol>
+<MaxTileCol>171738</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>2</TileMatrix>
+<MinTileRow>0</MinTileRow>
+<MaxTileRow>2</MaxTileRow>
+<MinTileCol>0</MinTileCol>
+<MaxTileCol>4</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>3</TileMatrix>
+<MinTileRow>0</MinTileRow>
+<MaxTileRow>5</MaxTileRow>
+<MinTileCol>0</MinTileCol>
+<MaxTileCol>8</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>4</TileMatrix>
+<MinTileRow>1</MinTileRow>
+<MaxTileRow>11</MaxTileRow>
+<MinTileCol>0</MinTileCol>
+<MaxTileCol>16</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>5</TileMatrix>
+<MinTileRow>3</MinTileRow>
+<MaxTileRow>22</MaxTileRow>
+<MinTileCol>0</MinTileCol>
+<MaxTileCol>32</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>6</TileMatrix>
+<MinTileRow>7</MinTileRow>
+<MaxTileRow>45</MaxTileRow>
+<MinTileCol>0</MinTileCol>
+<MaxTileCol>64</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>7</TileMatrix>
+<MinTileRow>42</MinTileRow>
+<MaxTileRow>97</MaxTileRow>
+<MinTileCol>0</MinTileCol>
+<MaxTileCol>115</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>8</TileMatrix>
+<MinTileRow>84</MinTileRow>
+<MaxTileRow>195</MaxTileRow>
+<MinTileCol>1</MinTileCol>
+<MaxTileCol>247</MaxTileCol>
+</TileMatrixLimits>
+<TileMatrixLimits>
+<TileMatrix>9</TileMatrix>
+<MinTileRow>170</MinTileRow>
+<MaxTileRow>390</MaxTileRow>
+<MinTileCol>2</MinTileCol>
+<MaxTileCol>495</MaxTileCol>
+</TileMatrixLimits>
+</TileMatrixSetLimits>
+</TileMatrixSetLink>
+<ResourceURL format="image/jpeg" resourceType="tile" template="https://wxs.ign.fr/[YOUR_ID]/geoportail/wmts?LAYER=GEOGRAPHICALGRIDSYSTEMS.MAPS&EXCEPTIONS=text/xml&FORMAT=image/jpeg&SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&STYLE=normal&TILEMATRIXSET={TileMatrixSet}&&TILEMATRIX={TileMatrix}&TILECOL={TileCol}&TILEROW={TileRow}"/>
+</Layer>
+<TileMatrixSet>
+<ows:Identifier>PM</ows:Identifier>
+<ows:SupportedCRS>EPSG:3857</ows:SupportedCRS>
+<TileMatrix>
+<ows:Identifier>0</ows:Identifier>
+<ScaleDenominator>559082264.0287178958533332</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>1</MatrixWidth>
+<MatrixHeight>1</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>1</ows:Identifier>
+<ScaleDenominator>279541132.0143588959472254</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>2</MatrixWidth>
+<MatrixHeight>2</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>10</ows:Identifier>
+<ScaleDenominator>545978.7734655447186469</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>1024</MatrixWidth>
+<MatrixHeight>1024</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>11</ows:Identifier>
+<ScaleDenominator>272989.3867327723085907</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>2048</MatrixWidth>
+<MatrixHeight>2048</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>12</ows:Identifier>
+<ScaleDenominator>136494.6933663861796617</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>4096</MatrixWidth>
+<MatrixHeight>4096</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>13</ows:Identifier>
+<ScaleDenominator>68247.3466831930771477</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>8192</MatrixWidth>
+<MatrixHeight>8192</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>14</ows:Identifier>
+<ScaleDenominator>34123.6733415965449154</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>16384</MatrixWidth>
+<MatrixHeight>16384</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>15</ows:Identifier>
+<ScaleDenominator>17061.8366707982724577</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>32768</MatrixWidth>
+<MatrixHeight>32768</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>16</ows:Identifier>
+<ScaleDenominator>8530.9183353991362289</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>65536</MatrixWidth>
+<MatrixHeight>65536</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>17</ows:Identifier>
+<ScaleDenominator>4265.4591676995681144</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>131072</MatrixWidth>
+<MatrixHeight>131072</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>18</ows:Identifier>
+<ScaleDenominator>2132.7295838497840572</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>262144</MatrixWidth>
+<MatrixHeight>262144</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>19</ows:Identifier>
+<ScaleDenominator>1066.3647919248918304</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>524288</MatrixWidth>
+<MatrixHeight>524288</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>2</ows:Identifier>
+<ScaleDenominator>139770566.0071793960087234</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>4</MatrixWidth>
+<MatrixHeight>4</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>20</ows:Identifier>
+<ScaleDenominator>533.1823959624461134</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>1048576</MatrixWidth>
+<MatrixHeight>1048576</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>21</ows:Identifier>
+<ScaleDenominator>266.5911979812228585</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>2097152</MatrixWidth>
+<MatrixHeight>2097152</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>3</ows:Identifier>
+<ScaleDenominator>69885283.0035897239868063</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>8</MatrixWidth>
+<MatrixHeight>8</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>4</ows:Identifier>
+<ScaleDenominator>34942641.5017948619934032</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>16</MatrixWidth>
+<MatrixHeight>16</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>5</ows:Identifier>
+<ScaleDenominator>17471320.7508974309967016</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>32</MatrixWidth>
+<MatrixHeight>32</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>6</ows:Identifier>
+<ScaleDenominator>8735660.3754487154983508</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>64</MatrixWidth>
+<MatrixHeight>64</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>7</ows:Identifier>
+<ScaleDenominator>4367830.1877243577491754</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>128</MatrixWidth>
+<MatrixHeight>128</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>8</ows:Identifier>
+<ScaleDenominator>2183915.0938621788745877</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>256</MatrixWidth>
+<MatrixHeight>256</MatrixHeight>
+</TileMatrix>
+<TileMatrix>
+<ows:Identifier>9</ows:Identifier>
+<ScaleDenominator>1091957.5469310886252288</ScaleDenominator>
+<TopLeftCorner>-20037508 20037508</TopLeftCorner>
+<TileWidth>256</TileWidth>
+<TileHeight>256</TileHeight>
+<MatrixWidth>512</MatrixWidth>
+<MatrixHeight>512</MatrixHeight>
+</TileMatrix>
+</TileMatrixSet>
+</Contents>
+</Capabilities>
\ No newline at end of file
diff --git a/doc/LinkCheck.sh b/doc/LinkCheck.sh
new file mode 100755
index 0000000..f0268fc
--- /dev/null
+++ b/doc/LinkCheck.sh
@@ -0,0 +1,170 @@
+#! /usr/bin/sh
+
+########################################################################
+########################################################################
+##                                                                    ##
+## Copyright (C) 2016 Rainer Woitok, <Rainer.Woitok at Gmail.Com>        ##
+##                                                                    ##
+## This shell script is free software: you can redistribute it and/or ##
+## modify it  under the terms  of the  GNU General  Public License as ##
+## published by the Free Software Foundation, either version 3 of the ##
+## License, or (at your option) any later version.                    ##
+##                                                                    ##
+## This program is  distributed in the hope that  it will be  useful, ##
+## but  WITHOUT ANY WARRANTY;  without  even the implied warranty  of ##
+## MERCHANTABILITY or FITNESS FOR A  PARTICULAR PURPOSE.  See the GNU ##
+## General Public License for more details.                           ##
+##                                                                    ##
+## You should have received a copy  of the GNU General Public License ##
+## along with this program.  If not, see                              ##
+##                                                                    ##
+##        <http://www.gnu.org/licenses/>                              ##
+##                                                                    ##
+########################################################################
+########################################################################
+#
+# Check for  dead files  ("*.md" files  not pointed to  by a link in any
+# other "*.md" file) as well as for broken links  (links to non-existing
+# "*.md" files.  Mind however, that in the case of broken links only the
+# existence of the  target file can be tested,  but not the existence of
+# any header identifiers within that file).
+#
+#                                                    R Woitok 2016-07-29
+#
+########################################################################
+
+hg manifest |                 # Provide list of currently tracked files.
+gawk '#
+      # Define a function which removes  the file passed as argument and
+      # all files  which are  recursively reachable  from it from global
+      # array "file_unref[]":
+
+      function referenced(file , refs) {
+         if ( file in file_unref ) {
+            refs = linked_in[file]    # Files mentioned in current file.
+            delete file_unref[file]           # Mark file as referenced.
+
+            #
+            # If the current file is a "*.png" file, also mark the corr-
+            # esponding "*.svg" file as referenced:
+
+            if ( match(file,"^(.*)[.]png$",mm) ) \
+               delete file_unref[mm[1] ".svg"]
+
+            #
+            # Process each file mentioned in the current file:
+
+            while ( match(refs,"^(.*) ([^ ]+) *$",mm) ) {
+               refs = mm[1]                   # For next loop iteration.
+               referenced(mm[2])         # Mark next file as referenced.
+                                   }   }                }
+
+      #
+      # Provide input file name without extension:
+
+      BEGINFILE { filename = FILENAME
+                  sub(".md$","",filename)
+                }
+
+      #
+      # Read in  the names of  tracked files  from standard input,  skip
+      # Mercurial files,  file "Makefile",  as well as scripts  and pure
+      # text files, remove the extension from "*.md" files, and mark all
+      # these files as existing but not yet referenced:
+
+      F { if ( $0 ~ "^[.]hg|^Makefile$|[.](py|sh|txt)$" ) next
+
+          sub(".md$","")          # Remove ".md" extension, if existing.
+          file_unref[$0] = link_def[$0] = 1      # Mark file as existing
+          next                                   # but yet unreferenced.
+        }
+
+      #
+      # Now we are reading all existing Markdown files:
+
+      /[]][(]http/ { next }          # Skip links to external web pages.
+
+      #
+      # Mark the local link targets implicitly created for each Markdown
+      # headline as existing:
+
+      match($0,"^ *#+ *(.*)$",m) {
+         l = tolower(m[1])
+         sub("^![[][^]]*[]][(][^)]+[)] *","",l)     # Ignore image link.
+         sub(" *#*$","",l)                       # Drop trailing marker.
+         gsub("[^a-zA-Z0-9]+","-",l)
+         link_def[filename "#" l] = 1
+                                 }
+
+      #
+      # Check every Markdown link in the current line (since regular ex-
+      # pressions are greedy,  we process the last link in the currently
+      # remaining line first and then we simply drop it.  And because we
+      # potentially modify the current input line in this loop, this ac-
+      # tion must be the last one):
+
+      { while ( match($0,"^(.*)[]][(]([^)]+)",m) ) {
+
+           #
+           # If this is not  a self reference,  that is,  a reference to
+           # the current  input file,  add it to the list of  links con-
+           # tained in the current input file, and also mark the link as
+           # existing (mind however, that file "DocMain.md" contains two
+           # self references,  one each in the top and bottom navigation
+           # bars.  So suppress the correspondig message in that case):
+
+           if ( m[2] == filename ) {
+              if ( filename != "DocMain" ) printf "Self-reference in %s\n", FILENAME
+                                   }
+           else { f = l = m[2]
+
+                  sub("#.*$",""          ,f)  # Discard local link part.
+                  sub("^#"  ,filename "#",l) # Prefix name to local lnk.
+
+                  linked_in[filename] = linked_in[filename] " " f
+                  called_in[l]        = called_in[l]        " " FILENAME
+                }
+
+           $0 = m[1]                 # Drop last link from current line.
+      }                                            }    # End while ....
+
+      END { #
+            # Sort arrays ascending with respect to their indices:
+
+            PROCINFO["sorted_in"] = "@ind_str_asc"
+
+            #
+            # Remove all files from array "file_unref[]"  which are rec-
+            # ursively referenced  from within file "Home.md"  (which in
+            # turn references the top documentation file "DocMain.md"):
+
+            referenced("Home")
+
+            #
+            # Remove all links marked  as defined in  array "link_def[]"
+            # from array "called_in[]":
+
+            for ( l in called_in ) if ( l in link_def ) delete called_in[l]
+
+            #
+            # If there are any unreferenced files left, print them:
+
+            if ( length(file_unref) ) {
+               printf "\nUnreferenced files:\n"
+               for ( f in file_unref ) {
+
+                   #
+                   # If the file name already contains an extension, use
+                   # it, otherwise append extension ".md":
+
+                   if ( f ~ "[.][a-z]+$" ) print f
+                   else                    print f ".md"
+                                      }}
+            #
+            # If there are any undefined links left, print them:
+
+            if ( length(called_in) ) {
+               printf "\nUndefined links:\n"
+               for ( l in called_in ) print l, "in:" called_in[l]
+          }                          }
+     ' F=1 - F= *.md
diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644
index 0000000..f0abaf0
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,157 @@
+########################################################################
+########################################################################
+##                                                                    ##
+## Copyright (C) 2016 Rainer Woitok, <Rainer.Woitok at Gmail.Com>        ##
+##                                                                    ##
+## This makefile  is free software:  you can  redistribute it  and/or ##
+## modify it  under the terms  of the  GNU General  Public License as ##
+## published by the Free Software Foundation, either version 3 of the ##
+## License, or (at your option) any later version.                    ##
+##                                                                    ##
+## This makefile  is distributed  in the hope that it will be useful, ##
+## but WITHOUT  ANY WARRANTY;  without even  the implied  warranty of ##
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the GNU ##
+## General Public License for more details.                           ##
+##                                                                    ##
+## You should have received a copy  of the GNU General Public License ##
+## along with this file.  If not, see                                 ##
+##                                                                    ##
+##        <http://www.gnu.org/licenses/>                              ##
+##                                                                    ##
+########################################################################
+########################################################################
+#
+# Makefile for managing  creation of the "*.html" files  from their cor-
+# responding "*.md" Markdown source files.
+#
+#                                                    R Woitok 2016-03-04
+#
+########################################################################
+#
+# Variables:
+#
+# Define the paths to the relevant scripts  ("fix",  "htm",  and "nav"),
+# the name  of the file containing  the table of contents ("cnt"), both,
+# the original ("UBU") and the blank free ("ubu")  name of the "Ubuntu*.
+# md" source file, the lists of files to process  ("src" and "tgt", both
+# featuring the blank free "Ubuntu*.*" names obtained by using the comm-
+# ands "ls" and "sed"  in a shell,  because the "make" specific function
+# "patsubst" only operates  on blank free words),  the names of the time
+# stamp files used internally to record various actions ("fxt" and "nvt"
+# the values of which  must be mentioned  in file ".hgignore"),  and the
+# name of the Mercurial command ("HG"), if we are executing in a Mercur-
+# ial repository's main directory:
+
+cnt ::= DocMain.md
+fix ::= ./DocFix.sh
+fxt ::= fix.time
+HG  ::= $(shell [ -d .hg ] && echo hg)
+htm ::= ./HtmlMake.py
+nav ::= ./NavBar.sh
+nvt ::= nav.time
+Ubu ::= $(wildcard Ubuntu*.md)
+ubu ::= Ubuntu-14.04-HowTo.md
+src ::= $(shell ls *.md | sed 's/^$(Ubu)$$/$(ubu)/')
+tgt ::= $(src:.md=.html)
+
+#
+# Define function "select" which  either returns only those "*.md" files
+# being younger than the target, or all "*.md" files,  depending on whe-
+# ther or not  the files passed  as second and third  arguments are both
+# older than the file passed as first argument (this function is used in
+# the "fxt" and "nvt" targets):
+
+select = $(if $(shell test $(2) -ot $(1) && test $(3) -ot $(1) && echo 1),$?,$(src))
+
+########################################################################
+#
+# Target rules:
+
+.PHONY: clean doc fix help nav
+
+#
+# Default rule to update all outdated "*.html" files:
+
+doc: nav $(tgt)
+
+#
+# Rule to check for unreferenced local files,  undefined local links, as
+# well as for self references:
+
+check:
+	@./LinkCheck.sh
+
+#
+# Rule to remove all "*.html" files as well as any time stamp files:
+
+clean:
+	rm -f $(tgt) $(fxt) $(nvt)
+
+#
+# Rules to rename file "Ubuntu*.md", if not yet done, and to fix the in-
+# dividual "*.md" Markdown source files so they are usable locally (this
+# rule is  implicitly called  as prerequisite  by both rules,  "doc" and
+# "nav", and thus there's hardly any need to call it directly):
+
+fix: $(ubu) $(fxt)
+
+#
+# Rule to either fix all  "*.md" files having changed  since the time of
+# the last fixing,  or all "*.md" files,  if the script performing these
+# fixes has  changed since then  (the recipe is using  function "select"
+# defined above to determine the set of files to be processed):
+
+$(fxt): $(fix) $(src)
+	@for f in $(call select,$(fxt),$(fix),$(fix)) ; \
+	 do echo $(fix) $$f ; $(fix) $$f              ; \
+	 done                                         ; \
+	 echo 'Last modified by "make fix".' > $(fxt)
+
+#
+# Rule to display  "help" output  (mind that the  initial white space in
+# the arguments for the "echo" commands consists of a tab character!):
+
+help:
+	@echo '	make check # Check for dead files and broken links.'     ; \
+	 echo '	make clean # Discard all "*.html" and time stamp files.' ; \
+	 echo '	make [doc] # Update all outdated "*.html" files.'        ; \
+	 echo '	make help  # Display this text.'                         ; \
+	 echo '	make nav   # Sanitize all changed "*.md" files.'         ; \
+
+#
+# Rule to create  a single  "*.html" file from its  Markdown source file
+# "*.md" (we also have  to re-create the "*.html" file,  should the con-
+# version script change):
+
+%.html: %.md $(htm)
+	$(htm) $< > $@
+
+#
+# Rule to update  the navigation bars in the  "*.md" source files  (this
+# rule is implicitly called as prerequisite  by rule "doc", and explicit
+# use of it is required only when no "*.html" files should be created):
+
+nav: fix $(nvt)
+
+#
+# Rule to either recreate the navigation bars in those "*.md" files hav-
+# ing changed since the time of the last recreation,  or all "*.md" fil-
+# es, if the source file containing the table of contents  or the script
+# generating the navigation bars  has changed since then  (the recipe is
+# using function "select" defined above to determine the set of files to
+# be processed,  and since the  "nav" target  has the  "fix" target as a
+# prerequisite, the changes  made by  this rule  should not  again cause
+# "make fix" to process any files):
+
+$(nvt): $(cnt) $(nav) $(src)
+	@for f in $(call select,$(nvt),$(cnt),$(nav))  ; \
+	 do echo $(nav) $(cnt) $$f ; $(nav) $(cnt) $$f ; \
+	 done                                          ; \
+	 echo 'Last modified by "make nav".' | tee $(fxt) > $(nvt)
+
+#
+# Rule to make the name of the "Ubuntu*.md" file blank free, either in a
+# Mercurial repository or in a normal directory:
+
+$(ubu):
+	$(HG) mv "$(Ubu)" $(ubu)
diff --git a/doc/NavBar.sh b/doc/NavBar.sh
new file mode 100755
index 0000000..0fcca1f
--- /dev/null
+++ b/doc/NavBar.sh
@@ -0,0 +1,186 @@
+#! /usr/bin/sh
+
+########################################################################
+########################################################################
+##                                                                    ##
+## Copyright (C) 2016 Rainer Woitok, <Rainer.Woitok at Gmail.Com>        ##
+##                                                                    ##
+## This shell script is free software: you can redistribute it and/or ##
+## modify it  under the terms  of the  GNU General  Public License as ##
+## published by the Free Software Foundation, either version 3 of the ##
+## License, or (at your option) any later version.                    ##
+##                                                                    ##
+## This program is  distributed in the hope that  it will be  useful, ##
+## but  WITHOUT ANY WARRANTY;  without  even the implied warranty  of ##
+## MERCHANTABILITY or FITNESS FOR A  PARTICULAR PURPOSE.  See the GNU ##
+## General Public License for more details.                           ##
+##                                                                    ##
+## You should have received a copy  of the GNU General Public License ##
+## along with this program.  If not, see                              ##
+##                                                                    ##
+##        <http://www.gnu.org/licenses/>                              ##
+##                                                                    ##
+########################################################################
+########################################################################
+#
+# Replace the original navigation links  in the file specified as second
+# parameter with a slightly more sophisticated navigation bar,  and also
+# insert this navigation bar at the bottom of the file.  Both navigation
+# bars provide  a "Prev"  and a "Next" link  for easier navigation while
+# reading.   The target information  required for these additional links
+# is retrieved from the table of contents file specified as first param-
+# eter.
+#
+# And if the second file already features navigation bars at the top and
+# at the bottom, update the information in them according to the current
+# contents of the first file.
+#
+#                                                    R Woitok 2016-03-04
+#
+########################################################################
+
+gawk -v "toc=${1%.*}" '
+     #
+     # Define a function  which takes the  current "*.md"  input file as
+     # argument and which  creates the Markdown code  for the navigation
+     # bar from the information stored in arrays "p[]" and "n[]":
+
+     function nav(file) {  
+        sub("[.]md$","",file)              # Remove the ".md" extension.
+
+        #
+        # Provide information for previous file:
+
+        if ( p[file] ) { match(p[file],"[[]([^]]*)[]][(]([^)]*)",m)
+                         pr = "[Prev](" m[2] ") (" m[1] ")"
+                       }
+        else             pr = "Prev ()"         # Non-clickable element.
+
+        #
+        # Provide information for next file:
+
+        if ( n[file] ) { match(n[file],"[[]([^]]*)[]][(]([^)]*)",m)
+                         nx = "(" m[1] ") [Next](" m[2] ")"
+                       }
+        else             nx = "() Next"         # Non-clickable element.
+
+        printf "%s | [Home](Home) | [Manual](%s) | %s\n", pr, toc, nx
+                        }                       # End of function "nav".
+
+     #
+     # Extract the sequence of documents mentioned  in the table of con-
+     # tents source file  and initialize  arrays  "p[]"  (previous), and
+     # "n[]" (next)  from this information  (both arrays take file names
+     # without extensions as indices):
+
+     C                                  { #
+                                          # Skip lines which do not dir-
+                                          # ectly belong to the table of
+                                          # contents:
+
+                                          if ( ! sub("^ *[*] +","") ) next
+
+                                          #
+                                          # Set the "p[]" and "n[]" arr-
+                                          # ay components from the targ-
+                                          # et information extracted:
+
+                                          match($0,"[[][^]]*[]][(]([^)]*)",m)
+
+                                          #
+                                          # If the previous entry is al-
+                                          # ready  set in  array  "p[]",
+                                          # this is  caused by  a header
+                                          # and an immediately following
+                                          # sub-header  in the  contents
+                                          # file  pointing  to the  same
+                                          # target  file.   In that case
+                                          # we do not again set the com-
+                                          # ponent in  "p[]"  to prevent
+                                          # it from pointing to the cur-
+                                          # rent file:
+
+                                          if ( ! (m[1] in p) ) p[m[1]] = last_info
+
+                                          n[last_file] = $0
+                                          last_info    = $0
+                                          last_file    = m[1]
+
+                                          next
+                                        }
+
+     #
+     # When the  table of contents  has been read,  correctly initialize
+     # the "next file" navigation information  for the table of contents
+     # file to the first file found  in this table of contents and init-
+     # ialize the  "previous file"  navigation information  for the next
+     # file with the  information for  the table  of contents  file (the
+     # "ENDFILE" rule will be executed twice, after reading the table of
+     # contents  and after processing  the source file,  but this second
+     # execution simply does not matter):
+
+     ENDFILE                            {
+        n[toc                                     ] = n[""]
+        p[gensub("^.*[(]([^)]+).*$","\\1",1,n[""])] = "[Manual](" toc ")"
+                                        }
+
+     #
+     # Replace the  original simple  navigation link(s)  with a slightly
+     # more sophisticated  navigation bar  or update the  top navigation
+     # bar (if this regular expression should match  a second time, this
+     # is the bottom navigation bar,  which we remove here  to create it
+     # anew in the "END" rule):
+
+     /^([[](Home|Prev)[]]|Prev [(][)])/ { if ( U ) next      # Skip bar.
+
+                                          nav(FILENAME)
+                                          printf "- - -\n[TOC]\n- - -\n\n"
+
+                                          e = 1  # Document still empty.
+                                          U = 1    # Upper nav bar done.
+
+                                          next
+                                        }
+
+     #
+     # Remove our special rule line directives "- - -"  belonging to the
+     # old navigation bars as well as the old "[TOC]" directive:
+
+     /^(- - -|[[]TOC[]])$/ { next }
+
+     #
+     # At the beginning of the file drop both, empty lines and rules:
+
+     e && /^( *|---)$/     { next }
+
+     { print                                       # Print normal lines.
+
+       e = 0                              # Document is no longer empty.
+
+       #
+       # For the sake of the "END" clause check the current line for be-
+       # ing empty or not  (if it is  not empty and  the current line is
+       # the last line of the file, the "END" clause will insert an add-
+       # itional empty line before adding the bottom navigation bar):
+
+       if ( $0 ~ /^ *$/ ) rule = "- - -\n"            # Use normal rule.
+       else               rule = "\n- - -\n" # Empty line ahead of rule.
+     }
+
+     #
+     # Also insert a navigation bar at the end of the file,  provided we
+     # have added or updated one at the beginning:
+
+     END                                { if ( ! U ) exit
+
+                                          printf rule
+                                          nav(FILENAME)
+                                        }
+                      ' C=1 "$1" C= "$2" > "$2.out" &&
+
+if cmp  -s "$2" "$2.out"                          # File did not change,
+then rm -f      "$2.out"                        # so remove output file.
+else mv         "$2.out" "$2"  # Move output file back to original file.
+fi
+
+exit 0
diff --git a/doc/QuickWayToPrepareRasterMapForQMapShack.html b/doc/QuickWayToPrepareRasterMapForQMapShack.html
new file mode 100644
index 0000000..e13eef7
--- /dev/null
+++ b/doc/QuickWayToPrepareRasterMapForQMapShack.html
@@ -0,0 +1,54 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
+<hr />
+<h1 id="quick-way-to-prepare-raster-maps-for-use-in-qmapshack">Quick way to prepare raster maps for use in QMapShack</h1>
+<p>This is translation of the original article in the blog: 
+<a href="http://htrd.su/wiki/zhurnal/2016/02/11/bystro_i_nenavjazchivo_gotovim_kartu_dlja_otkrytija_v_qmapshack">http://htrd.su/wiki</a>.</p>
+<p>Let us take <a href="http://loadmap.net">http://loadmap.net</a> as an example server for getting raster maps 
+(military maps updated by the Goverment GIS Center) with <code>OziExplorer</code> references.</p>
+<p>A major disadvantage of such maps is a border that overlaps neighbouring maps. 
+To solve this issue A. Drozdoff wrote the small <a href="https://github.com/h4tr3d/geocrop">geocrop</a> application 
+(free and open source, patches welcome, *nix only) which helps to crop the maps. </p>
+<p>A major advantage of <code>QMapShack</code> (<code>QMS</code>) is that it can open maps defined in a <code>GDAL</code> <code>.vrt</code> format file. 
+A VRT file is a XML based map description containing different useful information about maps:</p>
+<ul>
+<li>links to the original map source (raster file in our case),</li>
+<li>reference description,</li>
+<li>other useful transformations.</li>
+</ul>
+<p>The method used in <code>geocrop</code> in order to crop map borders works with VRT files too: 
+cropping does not affect the original raster file transformation. The cropped file can be opened properly. 
+The transformation speed is increased dramatically.</p>
+<p>The <code>geocrop</code> build process is described in the GitHub (see link above). 
+It requires the installation of developer packages for <code>libgdal</code> and <code>libproj4</code>. 
+Building on Windows is not yet supported (any help is welcome). 
+The application does not require any installation, simply copy it into <code>~/bin</code>.</p>
+<p>Having prepared <code>geocrop</code> 3 simple steps are required to prepare a map:</p>
+<ul>
+<li>Download the needed map sheet from <a href="http://loadmap.net">http://loadmap.net</a>, 
+   for example assume the 500-meter (scale: 1:50 000 or 1 cm = 500 meters) sheet <code>K-53-027-A</code> with 
+   raster image file <code>K-53-027-A.png</code></li>
+<li>Download from the same location the OziExplorer reference file for the map: <code>K-53-027-A.map</code></li>
+<li>Crop the border and create a VRT file with <code>geocrop</code>:<pre class="codehilite"><code>`~/bin/geocrop -s 50k -f VRT K-53-027-A.map K-53-027-A.vrt`</code></pre>
+
+
+</li>
+</ul>
+<p>Pay attention to the parameter <code>-s</code> - it allows to select the scale of the sheet: </p>
+<p>50k (k - kilo) => 50 000 => scale 1:50 000. </p>
+<p>The scale parameter allows to select suitable rules for the sheet content calculation and the detection of the border.
+  Thus, this parameters is a mandatory.</p>
+<p>Repeat these steps for all necessary sheets. </p>
+<p>Next add the path to the maps to <code>QMS</code> and check the result.</p>
+<p>On the following screenshot (for image with better quality see: 
+<a href="http://htrd.su/wiki/_media/zhurnal/2016/02/11/qms-vrt-maps.png">http://htrd.su/wik</a>) 
+two sheets of a 200k map (2km) are displayed. The sheet boundaries can be seen but they do not affect the maps.</p>
+<p><img alt="qms-vrt-maps-1024.png" src="https://bitbucket.org/repo/L5qerE/images/1237331501-qms-vrt-maps-1024.png" /></p>
+<p>The podcast <a href="https://youtu.be/7mp35wYk0IQ">https://youtu.be/7mp35wYk0IQ</a> describes the required procedure.</p>
+<p>A single VRT file can be created out of several VRT files. 
+In other words: it is possible to combine multiple VRT files for maps with the same scale into a single file (an “atlas”)
+and open only one VRT file for loading a whole series of raster maps. </p>
+<hr />
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
\ No newline at end of file
diff --git a/doc/QuickWayToPrepareRasterMapForQMapShack.md b/doc/QuickWayToPrepareRasterMapForQMapShack.md
new file mode 100644
index 0000000..63a7e7f
--- /dev/null
+++ b/doc/QuickWayToPrepareRasterMapForQMapShack.md
@@ -0,0 +1,68 @@
+Prev () | [Home](Home) | [Manual](DocMain) | () Next
+- - -
+[TOC]
+- - -
+
+# Quick way to prepare raster maps for use in QMapShack
+
+This is translation of the original article in the blog: 
+[http://htrd.su/wiki](http://htrd.su/wiki/zhurnal/2016/02/11/bystro_i_nenavjazchivo_gotovim_kartu_dlja_otkrytija_v_qmapshack).
+
+Let us take [http://loadmap.net](http://loadmap.net) as an example server for getting raster maps 
+(military maps updated by the Goverment GIS Center) with `OziExplorer` references.
+
+A major disadvantage of such maps is a border that overlaps neighbouring maps. 
+To solve this issue A. Drozdoff wrote the small [geocrop](https://github.com/h4tr3d/geocrop) application 
+(free and open source, patches welcome, *nix only) which helps to crop the maps. 
+
+A major advantage of `QMapShack` (`QMS`) is that it can open maps defined in a `GDAL` `.vrt` format file. 
+A VRT file is a XML based map description containing different useful information about maps:
+
+* links to the original map source (raster file in our case),
+* reference description,
+* other useful transformations.
+
+The method used in `geocrop` in order to crop map borders works with VRT files too: 
+cropping does not affect the original raster file transformation. The cropped file can be opened properly. 
+The transformation speed is increased dramatically.
+
+The `geocrop` build process is described in the GitHub (see link above). 
+It requires the installation of developer packages for `libgdal` and `libproj4`. 
+Building on Windows is not yet supported (any help is welcome). 
+The application does not require any installation, simply copy it into `~/bin`.
+
+Having prepared `geocrop` 3 simple steps are required to prepare a map:
+
+* Download the needed map sheet from [http://loadmap.net](http://loadmap.net), 
+   for example assume the 500-meter (scale: 1:50 000 or 1 cm = 500 meters) sheet `K-53-027-A` with 
+   raster image file `K-53-027-A.png`
+* Download from the same location the OziExplorer reference file for the map: `K-53-027-A.map`
+* Crop the border and create a VRT file with `geocrop`:
+
+        `~/bin/geocrop -s 50k -f VRT K-53-027-A.map K-53-027-A.vrt`
+
+  Pay attention to the parameter `-s` - it allows to select the scale of the sheet: 
+  
+  50k (k - kilo) => 50 000 => scale 1:50 000. 
+  
+  The scale parameter allows to select suitable rules for the sheet content calculation and the detection of the border.
+  Thus, this parameters is a mandatory.
+
+Repeat these steps for all necessary sheets. 
+
+Next add the path to the maps to `QMS` and check the result.
+
+On the following screenshot (for image with better quality see: 
+[http://htrd.su/wik](http://htrd.su/wiki/_media/zhurnal/2016/02/11/qms-vrt-maps.png)) 
+two sheets of a 200k map (2km) are displayed. The sheet boundaries can be seen but they do not affect the maps.
+
+![qms-vrt-maps-1024.png](https://bitbucket.org/repo/L5qerE/images/1237331501-qms-vrt-maps-1024.png)
+
+The podcast [https://youtu.be/7mp35wYk0IQ](https://youtu.be/7mp35wYk0IQ) describes the required procedure.
+
+A single VRT file can be created out of several VRT files. 
+In other words: it is possible to combine multiple VRT files for maps with the same scale into a single file (an "atlas")
+and open only one VRT file for loading a whole series of raster maps. 
+
+- - -
+Prev () | [Home](Home) | [Manual](DocMain) | () Next
diff --git a/doc/README.txt b/doc/README.txt
new file mode 100644
index 0000000..472da2b
--- /dev/null
+++ b/doc/README.txt
@@ -0,0 +1,378 @@
+How to deal with all these Markdown ("*.md") files
+==================================================
+
+Author: Rainer Woitok, <Rainer.Woitok at Gmail.Com>, 2016-04-07
+
+
+
+Contents:
+
+A. Creating the "*.html" files
+B. Sanitizing the "*.md" files
+C. Changing the existing documentation
+
+
+
+A. Creating the "*.html" files
+------------------------------
+
+   If you want to read the QMapShack documentation locally in your brow-
+   ser without having installed some Markdown plugin for it, you need to
+   create the "*.html" files from the "*.md" files yourself.
+
+   Mind that creating the "*.html" files  will also automatically sanit-
+   ize the "*.md" files as described in section "B." below.
+
+
+   1. Prerequisites
+   ................
+
+      To successfully create  "*.html" files  from the  "*.md" files you
+      will need the following:
+
+         * Python 2.7 or better.
+
+         * Python's  Markdown module  version 2.6.6  or better  plus the
+           following standard Markdown extensions:
+
+              - Admonition
+
+              - CodeHilite
+
+              - Extra, containing the extensions
+                  . Abbreviations
+                  . Attribute Lists
+                  . Definition Lists
+                  . Fenced Code Blocks
+                  . Footnotes
+                  . Tables
+                  . Smart Strong
+
+              - Meta-Data
+
+              - Sane Lists
+
+              - SmartyPants
+
+              - Table of Contents
+
+              - WikiLinks
+
+           All this is downloadable from, for instance,
+
+              https://pythonhosted.org/Markdown/
+
+         * Some sort of  Unix/Linux shell  located at  "/usr/bin/sh" (if
+           your shell resides  in some other place,  simply edit scripts
+           "DocFix.sh" and "NavBar.sh" accordingly).
+
+         * GNU "gawk".   Both scripts, "DocFix.sh"  and "NavBar.sh", use
+           some "gawk" specific  features,  like function  "gensub()", a
+           function "match()" which takes three arguments, and perhaps a
+           few others.
+
+         * GNU "make".  The makefile provided uses "simply expanded var-
+           iables" (defined via "::=", as introduced by the Posix stand-
+           ard in 2012).
+
+
+   2. Building the "*.html" files
+   ..............................
+
+      Change into the directory  containing the  "*.md" files  and issue
+      the command
+
+         $ make
+         $ your_browser file:///local/path/to/DocMain.html
+         $
+
+      This will sanitize  all "*.md" files  modified since the last call
+      of "make"  and besides it will update  all outdated "*.html" files
+      before it opens your browser at the main documentation page.
+
+      If you are working  in a clone of the wiki repository  rather than
+      in a normal directory  created from  a downloaded  "tar" ball, you
+      should be aware  that your actions might have  changed some of the
+      "*.md" files and that these actions should thus be committed.
+
+      That's it :-)
+
+
+
+B. Sanitizing the "*.md" files
+------------------------------
+
+   If you work on a clone of the QMapShack wiki repository and have made
+   changes to the  documentation,  you afterwards need  to make sure all
+   your local  "*.md" files  are in a  consistent state which  is usable
+   both, locally and over the web.  We call this process "sanitizing".
+
+   This process includes fixing  URLs so the  Markdown files  are usable
+   both, locally and over the web as well as adding or updating the nav-
+   igation bars on the top and bottom of each "*.md" file to ease navig-
+   ation.
+
+
+   1. Prerequisites
+   ................
+
+      To sanitize the "*.md" files in a local clone of the QMapShack wi-
+      ki repository you'll need:
+
+         * Some sort of  Unix/Linux shell  located at  "/usr/bin/sh" (if
+           your shell resides  in some other place,  simply edit scripts
+           "DocFix.sh" and "NavBar.sh" accordingly).
+
+         * GNU "gawk".   Both scripts,  "DocFix.sh" and "NavBar.sh", use
+           some "gawk" spcific features, like a function "match()" which
+           takes three arguments, function "gensub()", and perhaps a few
+           others.
+
+         * GNU "make".  The makefile provided uses "simply expanded var-
+           iables" (defined via "::=", as introduced by the Posix stand-
+           ard in 2012) as well as "double-colon rules".
+
+      Because no "*.html" files  are created,  Python and "Markdown" are
+      not needed here.
+
+
+   2. Sanitizing
+   .............
+
+      Change into the directory  containing all  these "*.md"  files and
+      issue the command
+
+         $ make nav
+         $
+
+      This will sanitize  all "*.md" files  modified since the last call
+      of "make".   And if you want to check for dead files ("*.md" files
+      not pointed to by a link in any other "*.md"  file) as well as for
+      broken links (links to non-existing "*.md" files),  you can addit-
+      ionally run the command
+
+         $ make check
+         $
+
+      Since you are definitely  working in a clone  of the wiki reposit-
+      ory, you should be aware that your actions might have changed some
+      of the "*.md" files and that these actions should thus be committ-
+      ed.
+
+      That's it again :-)
+
+
+   3. What sanitizing includes
+   ...........................
+
+      * Make the name  of a "Ubuntu*.md" file blank free  and update all
+        references to this  file accordingly  (the "make" command simply
+        isn't made to deal with file names containing blanks).
+
+      * Ensure that all  URLs referencing  other files  in this wiki are
+        local and do not point to Bitbucket.
+
+      * Ensure that "#..." suffixes in URLs  refer to the correct header
+        identifiers in the local files.
+
+      * Add a navigation bar (which does not only contain the "Home" and
+        "Manual" links  previously provided  but also "Prev"  and "Next"
+        links for  easier reading)  to both,  the top  and the bottom of
+        each "*.md" file.
+
+
+
+C. Changing the existing documentation
+--------------------------------------
+
+   1. Prerequisites
+   ................
+
+      To change the documentation files  the following conditions should
+      be met:
+
+         * MOST IMPORTANT: You have sufficient knowledge of the Markdown
+           language!
+
+         * You are working with a local clone  of the upstream Mercurial
+           repository at Bitbucket.
+
+         * You are editing  an existing  or creating  a new "*.md" file.
+           NEVER TOUCH ANY "*.html" FILES, because these -- if at all --
+           only exist in  your local clone,  are not version controlled,
+           and are always created from the "*.md" files.
+
+         * If you want to see in a browser what your changes are looking
+           like, you'll either need a Markdown extension for your brows-
+           er or all the tools mentioned in section "A.1" above.
+
+
+   2. The Markdown language
+   ........................
+
+      You can find extensive documentation of the Markdown language at
+
+         * http://daringfireball.net/projects/markdown/syntax
+
+           This URL refers to John Gruber's original Markdown syntax de-
+           finition dating back to 2004.
+
+         * https://pythonhosted.org/Markdown/
+
+           Among other things  this URL  contains the  deviations of the
+           Markdown syntax implemented by the Python Markdown module us-
+           ed here from John Gruber's original syntax
+
+         * https://pythonhosted.org/Markdown/extensions/index.html
+
+           For every  Markdown extension  used here  (see section "A.1",
+           above) this URL also documents the Markdown syntax understood
+           by the extension as well as the HTML code produced from it.
+
+      Finally, you can look  into any of the "*.md" files in this repos-
+      itory and at the same time  point your broser at the corresponding
+      web page at
+
+         https://bitbucket.org/maproom/qmapshack/wiki/
+
+      to see the  effect of a  particular  Markdown clause.   And if you
+      want to see the HTML source  of the current page  in your browser,
+      and your  browser happens  to be Firefox,  just type Ctrl-u (other
+      browsers may or may  not need different handling,  but most decent
+      browsers will be  able to display  the HTML source of  the current
+      page one way or other).
+
+      Mind that a Markdown file isn't just a text file you look at using
+      a browser.  For instance, a line containing
+
+         For more information see here: http://x.y.z.com
+
+      will result in an HTML file where you cannot even click at the URL
+      when you look at it in your browser!  Instead, this line should be
+      written as
+
+         For more information see [here](http://x.y.z.com).
+
+      in Markdown.   In this case  the word "here"  will be clickable in
+      your browser, taking you to "http://x.y.z.com".
+
+
+   3. Editing an existing "*.md" file
+   ..................................
+
+      When editing an existing file please mind:
+
+         * Always leave the navigation bars at the top and bottom of the
+           "*.md" file alone.  The top navigation bar looks like
+
+              [Prev](... | [Home](Home) | [Manual](DocMain) | ...
+              - - -
+              [TOC]
+              - - -
+
+           while the bottom navigation bar looks like this
+
+              - - -
+              [Prev](... | [Home](Home) | [Manual](DocMain) | ...
+
+           These lines are automatically created if they don't yet exist
+           and are automatically  updated otherwise  when running "make"
+           or "make nav".
+
+         * Do not use the Markdown directive "- - -"  to insert a horiz-
+           ontal rule, that is, a  horizontal line running from the left
+           edge of the browser window  to the right edge.   This special
+           variant is regarded  part of the navigation bars  and will be
+           removed anywhere else  in the file  when the  navigation bars
+           are automatically inserted or updated.   Rather use the Mark-
+           down variants  "---" or "***",  if you need a horizontal rule
+           somewhere in your Markdown file.
+
+         * Apart from the advices above try to maintain the general look
+           of the original file.
+
+
+   4. Creating a new "*.md" file
+   .............................
+
+      When creating a new file please stick to the following guidelines:
+
+         * Chose a  name for  your file  which smoothly  blends into the
+           naming scheme  already in use.   The file name must only con-
+           tain upper and lower case characters, digits,  as well as the
+           characters  "+", "-", "_", and  ".".  In particular DO NEITH-
+           ER USE blanks,  NOR ":",  "/", "\",  "*",  or "?" characters.
+           And make sure your file name ends in ".md", otherwise it will
+           not be recognized.
+
+         * Don't try to add the navigation bars at the top and bottom of
+           your new "*.md" file yourself.   These lines  will be created
+           automatically when running "make" or "make nav".   Just start
+           the file with your first headline.
+
+         * Do not use the Markdown directive "- - -"  to insert a horiz-
+           ontal rule, that is, a  horizontal line running from the left
+           edge of the browser window  to the right edge.   This special
+           variant is regarded  part of the navigation bars  and will be
+           removed anywhere else  in the file  when the  navigation bars
+           are automatically inserted or updated.   Rather use the Mark-
+           down variants  "---" or "***",  if you need a horizontal rule
+           somewhere in your Markdown file.
+
+         * If your file isn't reachable via some link occuring in one of
+           the other "*.md" files,  it is dead.   Or at least as good as
+           dead.   There is  a good chance  that nobody ever  reads your
+           text.  So there should  always be at least  one link to it in
+           the other "*.md" files.  There are two categories of files:
+
+              - The general case:  your file covers  some self-contained
+                topic.  Most of the existing "*.md" files belong to that
+                category.   In this case  it's sufficient  to insert the
+                link to the new file  at a suitable  place in file "Doc-
+                Main.md".
+
+              - The special case: the contents of your file is more like
+                an appendix or a lengthy footnote dealing with a special
+                case.   File "Ubuntu-14.04-HowTo.md"  is an example of a
+                file in this category, it is only mentioned as a special
+                case of Linux installation in file "DocGetQMapShack.md".
+                In this case you should add to the file needing the app-
+                endix or  lengthy footnote  the appropriate  link to the
+                new file, while the new file should contain a link "Con-
+                tinue here", "Back to ...", or the like at its end which
+                takes you back to  or at least near  the point where you
+                left off earlier.
+
+
+   5. Activating your changes
+   ..........................
+
+      Depending on what you want and depending on what prerequisites are
+      met by your installation  follow the instructions in sections "A."
+      or "B.", above.
+
+
+   6. Sharing your changes
+   .......................
+
+      If you are finally satisfied with your changes, it's time to share
+      them with the world.  There are two cases:
+
+         * You have successfully  run the command "make"  or "make nav".
+           By this  you have added  some changes to  your local clone of
+           the Bitbucket wiki repository which you should now commit ac-
+           cordingly and then push to the upstream Bitbucket repository.
+
+         * You can neither run "make" nor "make nav" yourself.   In this
+           case it's probably your best bet to send your proposed chang-
+           es (preferably in  "unified diff" format,  see "man diff") to
+           the QMapShack mailing list at
+
+              <qlandkartegt-users at lists.sourceforge.net>
+
+           so someone who cares  and has the tools  can apply your patch
+           to a current clone  of the upstream Bitbucket repository, can
+           run "make nav" against it, and can finally push the resulting
+           repository back to Bitbucket.
+
+========================================================================
diff --git a/doc/ReportBugs.html b/doc/ReportBugs.html
new file mode 100644
index 0000000..92ea4a2
--- /dev/null
+++ b/doc/ReportBugs.html
@@ -0,0 +1,48 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
+<hr />
+<h1 id="reporting-bugs">Reporting Bugs</h1>
+<p>If you have found a bug file a bug report on the <a href="https://bitbucket.org/maproom/qmapshack/issues?status=new&status=open">Issues page</a>.
+Make sure to include the all the information listed below to ease both your and our lifes.</p>
+<p><strong>Consider fixing it yourself.</strong> For example bad spelling, confusing names or explanations and bad translations can be fixed by everyone. Use Qt5 Linguist to edit the translations. Linguist will tell you the source file containing the string, too. By that you can change the original string in the source code. </p>
+<h1 id="required-information"><strong>Required Information</strong></h1>
+<ol>
+<li>The <strong>operating system</strong></li>
+<li>The <strong>software’s version</strong> (you find this in the menu “?” -> About)</li>
+<li>A <strong>detailed report</strong> about what is broken</li>
+<li>A <strong>list of steps</strong> required <strong>for reproduction</strong></li>
+<li>Further information (depending on issue; these are examples):<ol>
+<li><em>application crash</em>: <a href="TroubleShooting.html#create-a-backtrace-of-a-crash-on-linux">A backtrace (if you are on Linux)</a></li>
+<li><em>incorrect displaying</em>: A screenshot</li>
+<li><em>failed loading of a file</em>: The file you tried to load<strong>¹</strong></li>
+<li><em>“strange” behaviour</em>: Describe the behavior you expected</li>
+</ol>
+</li>
+</ol>
+<h2 id="additional-tips">Additional Tips</h2>
+<ol>
+<li><strong>Include everything required for fixing the bug within your report</strong>, avoid untraceable references (such as <code>as discuessed on IRC</code>)</li>
+<li>Do <strong>not assume anything</strong>; we (most likely) don’t know you at all</li>
+<li>Use to <code>Preview</code> button to ensure <strong>correct formatting</strong> (px. a missing newline can destroy your whole formatting)</li>
+<li><strong>Reread</strong> your text <strong>before submitting</strong>, make sure there are no ambiguities</li>
+</ol>
+<h1 id="example">Example</h1>
+<hr />
+<p><img alt="example_bug_report.png" src="https://bitbucket.org/repo/L5qerE/images/2322176961-example_bug_report.png" /></p>
+<hr />
+<h3 id="remarks-see-example-above">Remarks (see example above)</h3>
+<ol>
+<li>Use a <strong>descriptive title</strong></li>
+<li>Do <strong>not assign</strong> the issue to anyone</li>
+<li>A bug is a bug, a proposal is a proposal - select the <strong>correct kind</strong></li>
+<li>Include <strong>steps</strong> required to reproduce the bug</li>
+<li>Include a <strong>screenshot</strong> (if applicable)</li>
+<li>Include <strong>version information</strong> (for OS, QMS and packages used by QMS)</li>
+<li>Attach any <strong>additional data</strong> required to reproduce this bug<strong>¹</strong></li>
+</ol>
+<hr />
+<p><strong>¹</strong> Some files may contain sensitive data you do not want to share with the world (for instance, .gpx can contain your heart rate and home location).</p>
+<hr />
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
\ No newline at end of file
diff --git a/doc/ReportBugs.md b/doc/ReportBugs.md
new file mode 100644
index 0000000..9cc08fc
--- /dev/null
+++ b/doc/ReportBugs.md
@@ -0,0 +1,53 @@
+Prev () | [Home](Home) | [Manual](DocMain) | () Next
+- - -
+[TOC]
+- - -
+
+# Reporting Bugs
+
+If you have found a bug file a bug report on the [Issues page](https://bitbucket.org/maproom/qmapshack/issues?status=new&status=open).
+Make sure to include the all the information listed below to ease both your and our lifes.
+
+**Consider fixing it yourself.** For example bad spelling, confusing names or explanations and bad translations can be fixed by everyone. Use Qt5 Linguist to edit the translations. Linguist will tell you the source file containing the string, too. By that you can change the original string in the source code. 
+
+# **Required Information**
+
+ 1. The **operating system**
+ 2. The **software's version** (you find this in the menu "?" -> About)
+ 3. A **detailed report** about what is broken
+ 4. A **list of steps** required **for reproduction**
+ 5. Further information (depending on issue; these are examples):
+    1. *application crash*: [A backtrace (if you are on Linux)](TroubleShooting#create-a-backtrace-of-a-crash-on-linux)
+    2. *incorrect displaying*: A screenshot
+    3. *failed loading of a file*: The file you tried to load**¹**
+    4. *"strange" behaviour*: Describe the behavior you expected
+
+## Additional Tips
+
+ 1. **Include everything required for fixing the bug within your report**, avoid untraceable references (such as `as discuessed on IRC`)
+ 1. Do **not assume anything**; we (most likely) don't know you at all
+ 2. Use to `Preview` button to ensure **correct formatting** (px. a missing newline can destroy your whole formatting)
+ 3. **Reread** your text **before submitting**, make sure there are no ambiguities
+
+# Example
+
+---
+![example_bug_report.png](https://bitbucket.org/repo/L5qerE/images/2322176961-example_bug_report.png)
+
+---
+
+### Remarks (see example above)
+ 1. Use a **descriptive title**
+ 2. Do **not assign** the issue to anyone
+ 3. A bug is a bug, a proposal is a proposal - select the **correct kind**
+ 4. Include **steps** required to reproduce the bug
+ 5. Include a **screenshot** (if applicable)
+ 6. Include **version information** (for OS, QMS and packages used by QMS)
+ 7. Attach any **additional data** required to reproduce this bug**¹**
+
+---
+
+**¹** Some files may contain sensitive data you do not want to share with the world (for instance, .gpx can contain your heart rate and home location).
+
+- - -
+Prev () | [Home](Home) | [Manual](DocMain) | () Next
diff --git a/doc/RequestFeatures.md b/doc/RequestFeatures.md
new file mode 100644
index 0000000..2cfd28e
--- /dev/null
+++ b/doc/RequestFeatures.md
@@ -0,0 +1,33 @@
+Prev () | [Home](Home) | [Manual](DocMain) | () Next
+- - -
+[TOC]
+- - -
+
+[Read this if you want to **report a bug**](ReportBugs).
+
+# Preface
+
+Feature requests are [managed using the Bitbucket Issue page](https://bitbucket.org/maproom/qmapshack/issues?status=new&status=open).
+
+Keep in mind that you are asking a stranger to spend time/work for you - stay kind and try to support him/her as good as you can.
+
+# Things to include in your request
+
+Try to be as accurate as possible; don't assume we'll just "know".
+
+The request should be **self-contained**, avoid untraceable references (such as `as discuessed on IRC`).
+
+1. Give a **detailed description** of what you want and **why it is of a general interest** (in your opinion). Just because software XYZ does it, is a bad reason. 
+2. Sketch in detail how you think the feature should be integrated into the GUI or the workflow.
+3. If possible, **provide ressources** (such as icons) required while implementing your feature
+
+**Do not assign an issue to anyone!** The issue will be assigned when someone volunteers to solve it. 
+
+
+## Implement yourself
+
+Your **best chance** to get a new feature is to** implement it on your own**. If you want someone else to do the work for you open an [Issue](https://bitbucket.org/maproom/qmapshack/issues?status=new&status=open). Do not assign it to anyone. If someone volunteers to implement it the issue will be assigned. To increase your chances consider the following:
+
+
+- - -
+Prev () | [Home](Home) | [Manual](DocMain) | () Next
diff --git a/doc/TroubleShooting.html b/doc/TroubleShooting.html
new file mode 100644
index 0000000..8a2c068
--- /dev/null
+++ b/doc/TroubleShooting.html
@@ -0,0 +1,82 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
+<hr />
+<div class="toc">
+<ul>
+<li><a href="#troubleshooting">Troubleshooting</a></li>
+<li><a href="#create-a-backtrace-of-a-crash-on-linux">Create a backtrace of a crash on Linux</a></li>
+<li><a href="#limitations-of-qmapshack-for-windows-short-qms">Limitations of QMapShack for Windows (short: QMS)</a><ul>
+<li><a href="#qt-comes-without-ssl-support">Qt comes without SSL support</a></li>
+<li><a href="#gdal-comes-without-curl-support">GDAL comes without curl support</a></li>
+<li><a href="#gdal-comes-without-support-for-exotic-formats">GDAL comes without support for exotic formats</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<h1 id="troubleshooting">Troubleshooting</h1>
+<p>Since the 13-Oct-2015 development version, you can start qmapshack 
+with the commandline option “-f”.
+Then a logfile “org.qlandkarte.QMapShack.log” will be created in 
+the system’s temporary folder.
+On a Windows 7 installation this temporary folder seems to be 
+C:\Users\your user name\AppData\Local\Temp. 
+That log file may give additional insight to the root cause.</p>
+<h1 id="create-a-backtrace-of-a-crash-on-linux">Create a backtrace of a crash on Linux</h1>
+<p>If QMapShack crashes on Linux the best you can do to help development is to send a backtrace. A backtrace is a log of the last code lines executed before the crash. Usually this contains enough hints to fix the problem fast.</p>
+<p>To create a backtrace you have to compile QMapShack as debug version yourself. Have a look at <a href="DocGetQMapShack.html">the getting started chapter of the wiki</a> for basic instructions. </p>
+<p>When you do the step:</p>
+<div class="codehilite"><pre>ccmake ../QMapShack
+</pre></div>
+
+
+<p>Change the variable CMAKE_BUILD_TYPE to <em>Debug</em>. Now start the build process with </p>
+<div class="codehilite"><pre>make
+</pre></div>
+
+
+<p>No need to do a “make install”. To create a backtrace you have to start QMapShack with the GDB debugger:</p>
+<div class="codehilite"><pre>gdb bin/qmapshack
+</pre></div>
+
+
+<p>At gdb’s command line prompt enter ‘r’ to run QMapShack. Now you can provoke the crash. After the crash enter ‘bt’ on gdb’s command line. This will output the backtrace. Copy the lines and attach them to your bug report.</p>
+<h1 id="limitations-of-qmapshack-for-windows-short-qms">Limitations of QMapShack for Windows (short: QMS)</h1>
+<p>To limit the build and maintenance effort, the Windows binary packages 
+for QMS come with a restricted set of 3rd party libraries.
+In particular the timely maintenance of security related libraries would 
+either put an unmanageable burden on your QMS Windows maintainer or add 
+an uncalculable risk to the users (imagine what could happen if I package 
+a SSL library where severe bugs such as Heartbleed are not yet fixed).
+Due to this limitation certain kinds of maps - in particular online maps - 
+will not work.</p>
+<p>Below those restrictions are summarized and  possible workarounds are 
+described. Please be aware that those workarounds are on the sole risk 
+of the users - I cannot take responsibility in which situations they work 
+or not.</p>
+<h2 id="qt-comes-without-ssl-support">Qt comes without SSL support</h2>
+<p>Qt5 binaries are delivered without SSL support due to legal restrictions in 
+some countries. See <a href="http://doc.qt.io/qt-5/ssl.html">qt-5-ssl</a>.
+This may hinder some kinds of web maps (TMS, WMTS) to be downloaded properly.
+As a workaround you could download the and compatible Windows SSL package
+and copy the 2 DLLs libeay32.dll and ssleay32.dll to QMS home directory.
+The DLLs from the following 2 sources have been reported to work: 
+<a href="https://indy.fulgan.com/SSL/openssl-1.0.2d-x64_86-win64.zip">indy</a> or
+<a href="http://download.gisinternals.com/sdk/downloads/release-1800-x64-gdal-1-11-1-mapserver-6-4-1.zip">gisinternals</a>.
+Please judge by yourself whether those sources are trustable for you and 
+whether they fit to your actual installation.</p>
+<h2 id="gdal-comes-without-curl-support">GDAL comes without curl support</h2>
+<p>The default GDAL libraries come without curl support. 
+This may hinder some kinds of web maps to be downloaded properly.
+As a workaround you could download GDAL binaries from 
+<a href="http://download.gisinternals.com/sdk/downloads/release-1800-x64-gdal-1-11-1-mapserver-6-4-1.zip">gisinternals</a>
+and then brute-force-copy the complete “bin” subdirectory including 
+subdirectories to the QMS home directory.</p>
+<h2 id="gdal-comes-without-support-for-exotic-formats">GDAL comes without support for exotic formats</h2>
+<p>Some raster map formats (e.g. wavelet based) are not supported by the default
+GDAL installation. The reasons may be various (licences, dependencies, …).
+A possible workaround is the same as to add curl support: use the GDAL binaries 
+from <a href="http://gisinternals.com/">gisinternals</a>.</p>
+<hr />
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
\ No newline at end of file
diff --git a/doc/TroubleShooting.md b/doc/TroubleShooting.md
new file mode 100644
index 0000000..2056bd9
--- /dev/null
+++ b/doc/TroubleShooting.md
@@ -0,0 +1,101 @@
+Prev () | [Home](Home) | [Manual](DocMain) | () Next
+- - -
+[TOC]
+- - -
+
+# Troubleshooting
+
+Since the 13-Oct-2015 development version, you can start qmapshack 
+with the commandline option "-f".
+Then a logfile "org.qlandkarte.QMapShack.log" will be created in 
+the system's temporary folder.
+On a Windows 7 installation this temporary folder seems to be 
+C:\Users\your user name\AppData\Local\Temp. 
+That log file may give additional insight to the root cause.
+
+# Create a backtrace of a crash on Linux
+
+If QMapShack crashes on Linux the best you can do to help development is to send a backtrace. A backtrace is a log of the last code lines executed before the crash. Usually this contains enough hints to fix the problem fast.
+
+To create a backtrace you have to compile QMapShack as debug version yourself. Have a look at [the getting started chapter of the wiki](DocGetQMapShack) for basic instructions. 
+
+When you do the step:
+
+
+```
+#!bash
+ccmake ../QMapShack
+
+
+```
+
+Change the variable CMAKE_BUILD_TYPE to *Debug*. Now start the build process with 
+
+```
+#!bash
+make
+
+
+```
+
+No need to do a "make install". To create a backtrace you have to start QMapShack with the GDB debugger:
+
+```
+#!bash
+gdb bin/qmapshack
+
+
+```
+At gdb's command line prompt enter 'r' to run QMapShack. Now you can provoke the crash. After the crash enter 'bt' on gdb's command line. This will output the backtrace. Copy the lines and attach them to your bug report.
+
+
+
+
+
+# Limitations of QMapShack for Windows (short: QMS)
+
+To limit the build and maintenance effort, the Windows binary packages 
+for QMS come with a restricted set of 3rd party libraries.
+In particular the timely maintenance of security related libraries would 
+either put an unmanageable burden on your QMS Windows maintainer or add 
+an uncalculable risk to the users (imagine what could happen if I package 
+a SSL library where severe bugs such as Heartbleed are not yet fixed).
+Due to this limitation certain kinds of maps - in particular online maps - 
+will not work.
+
+Below those restrictions are summarized and  possible workarounds are 
+described. Please be aware that those workarounds are on the sole risk 
+of the users - I cannot take responsibility in which situations they work 
+or not.
+
+## Qt comes without SSL support
+
+Qt5 binaries are delivered without SSL support due to legal restrictions in 
+some countries. See [qt-5-ssl](http://doc.qt.io/qt-5/ssl.html).
+This may hinder some kinds of web maps (TMS, WMTS) to be downloaded properly.
+As a workaround you could download the and compatible Windows SSL package
+and copy the 2 DLLs libeay32.dll and ssleay32.dll to QMS home directory.
+The DLLs from the following 2 sources have been reported to work: 
+[indy](https://indy.fulgan.com/SSL/openssl-1.0.2d-x64_86-win64.zip) or
+[gisinternals](http://download.gisinternals.com/sdk/downloads/release-1800-x64-gdal-1-11-1-mapserver-6-4-1.zip).
+Please judge by yourself whether those sources are trustable for you and 
+whether they fit to your actual installation.
+
+## GDAL comes without curl support
+
+The default GDAL libraries come without curl support. 
+This may hinder some kinds of web maps to be downloaded properly.
+As a workaround you could download GDAL binaries from 
+[gisinternals](http://download.gisinternals.com/sdk/downloads/release-1800-x64-gdal-1-11-1-mapserver-6-4-1.zip)
+and then brute-force-copy the complete "bin" subdirectory including 
+subdirectories to the QMS home directory.
+
+## GDAL comes without support for exotic formats
+
+Some raster map formats (e.g. wavelet based) are not supported by the default
+GDAL installation. The reasons may be various (licences, dependencies, ...).
+A possible workaround is the same as to add curl support: use the GDAL binaries 
+from [gisinternals](http://gisinternals.com/).
+
+- - -
+Prev () | [Home](Home) | [Manual](DocMain) | () Next
diff --git a/doc/Ubuntu-14.04-HowTo.html b/doc/Ubuntu-14.04-HowTo.html
new file mode 100644
index 0000000..1f2d1b7
--- /dev/null
+++ b/doc/Ubuntu-14.04-HowTo.html
@@ -0,0 +1,47 @@
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
+<hr />
+<p>In particular Ubuntu 14.04 needs cmake 3 and Qt 5.4</p>
+<h1 id="build">Build</h1>
+<h2 id="cmake-3">cmake 3</h2>
+<div class="codehilite"><pre><span class="n">sudo</span> <span class="n">add</span><span class="o">-</span><span class="n">apt</span><span class="o">-</span><span class="n">repository</span> <span class="n">ppa</span><span class="o">:</span><span class="n">george</span><span class="o">-</span><span class="n">edison55</span><span class="o">/</span><span class="n">cmake</span><span class="o">-</span><span class="mf">3.</span><span class="n">x</span>
+<span class="n">sudo</span> <span class="n">apt</span><span class="o">-</span><span class="n">get</span> <span class="n">update</span>
+</pre></div>
+
+
+<h2 id="qt-54">Qt 5.4</h2>
+<div class="codehilite"><pre><span class="n">sudo</span> <span class="n">add</span><span class="o">-</span><span class="n">apt</span><span class="o">-</span><span class="n">repository</span> <span class="n">ppa</span><span class="o">:</span><span class="n">beineri</span><span class="o">/</span><span class="n">opt</span><span class="o">-</span><span class="n">qt542</span><span class="o">-</span><span class="n">trusty</span>
+<span class="n">sudo</span> <span class="n">apt</span><span class="o">-</span><span class="n">get</span> <span class="n">update</span>
+<span class="n">sudo</span> <span class="n">apt</span><span class="o">-</span><span class="n">get</span> <span class="n">install</span> <span class="n">libgdal</span><span class="o">-</span><span class="n">dev</span> <span class="n">libproj</span><span class="o">-</span><span class="n">dev</span> <span class="n">qt54base</span> <span class="n">qt54tools</span> <span class="n">qt54</span><span class="o">-</span><span class="n">meta</span><span class="o">-</span><span class="n">full</span> [...]
+</pre></div>
+
+
+<h2 id="routino">Routino</h2>
+<div class="codehilite"><pre><span class="c"># install required dev-packages</span>
+sudo apt-get install gcc make libc6-dev libz-dev libbz2-dev libgraphics-magick-perl
+
+<span class="c"># download, build and install routino</span>
+svn co http://routino.org/svn/trunk routino
+<span class="nb">cd </span>routino
+make
+sudo make install
+</pre></div>
+
+
+<h2 id="use-qt-54-instead-of-52-its-only-temporary-and-for-the-current-terminal">Use Qt 5.4 instead of 5.2 (it’s only temporary and for the current terminal)</h2>
+<div class="codehilite"><pre><span class="n">source</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">qt54</span><span class="o">/</span><span class="n">bin</span><span class="o">/</span><span class="n">qt54</span><span class="o">-</span><span class="n">env</span><span class="p">.</span><span class="n">sh</span>
+</pre></div>
+
+
+<p><a href="DocGetQMapShack.html#linux">go on with the build instructions</a></p>
+<h1 id="running-the-software">Running the software:</h1>
+<div class="codehilite"><pre><span class="n">source</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">qt54</span><span class="o">/</span><span class="n">bin</span><span class="o">/</span><span class="n">qt54</span><span class="o">-</span><span class="n">env</span><span class="p">.</span><span class="n">sh</span> <span class="err">#</span> <span class="n">to</span> <span class="n">use</span> <span class="n">Qt</span> <span class="mf">5.4</spa [...]
+<span class="n">qmapshack</span>
+</pre></div>
+
+
+<p>Maybe there is a better way to use Qt 5.4</p>
+<hr />
+<p>Prev () | <a href="Home.html">Home</a> | <a href="DocMain.html">Manual</a> | () Next</p>
\ No newline at end of file
diff --git a/doc/Ubuntu-14.04-HowTo.md b/doc/Ubuntu-14.04-HowTo.md
new file mode 100644
index 0000000..53d401f
--- /dev/null
+++ b/doc/Ubuntu-14.04-HowTo.md
@@ -0,0 +1,53 @@
+Prev () | [Home](Home) | [Manual](DocMain) | () Next
+- - -
+[TOC]
+- - -
+
+In particular Ubuntu 14.04 needs cmake 3 and Qt 5.4
+
+
+# Build
+## cmake 3
+```
+sudo add-apt-repository ppa:george-edison55/cmake-3.x
+sudo apt-get update
+```
+
+## Qt 5.4
+```
+sudo add-apt-repository ppa:beineri/opt-qt542-trusty
+sudo apt-get update
+sudo apt-get install libgdal-dev libproj-dev qt54base qt54tools qt54-meta-full # qt54-meta-minimal might be enough instead of full
+```
+
+## Routino
+```
+#!bash
+
+# install required dev-packages
+sudo apt-get install gcc make libc6-dev libz-dev libbz2-dev libgraphics-magick-perl
+
+# download, build and install routino
+svn co http://routino.org/svn/trunk routino
+cd routino
+make
+sudo make install
+```
+
+## Use Qt 5.4 instead of 5.2 (it's only temporary and for the current terminal)
+```
+source /opt/qt54/bin/qt54-env.sh
+```
+[go on with the build instructions](DocGetQMapShack#linux)
+
+
+# Running the software:
+```
+source /opt/qt54/bin/qt54-env.sh # to use Qt 5.4 instead of 5.2, this is only for the current terminal
+qmapshack
+```
+
+Maybe there is a better way to use Qt 5.4
+
+- - -
+Prev () | [Home](Home) | [Manual](DocMain) | () Next
diff --git a/doc/fix.time b/doc/fix.time
new file mode 100644
index 0000000..b78d2a7
--- /dev/null
+++ b/doc/fix.time
@@ -0,0 +1 @@
+Last modified by "make nav".
diff --git a/doc/images/DocBasicsMapDem/qmapshack1.png b/doc/images/DocBasicsMapDem/qmapshack1.png
new file mode 100644
index 0000000..74f5401
Binary files /dev/null and b/doc/images/DocBasicsMapDem/qmapshack1.png differ
diff --git a/doc/images/DocControlMapDem/maproom1.png b/doc/images/DocControlMapDem/maproom1.png
new file mode 100644
index 0000000..b0cefb1
Binary files /dev/null and b/doc/images/DocControlMapDem/maproom1.png differ
diff --git a/doc/images/DocControlMapDem/maproom10.png b/doc/images/DocControlMapDem/maproom10.png
new file mode 100644
index 0000000..a2c6d76
Binary files /dev/null and b/doc/images/DocControlMapDem/maproom10.png differ
diff --git a/doc/images/DocControlMapDem/maproom2.png b/doc/images/DocControlMapDem/maproom2.png
new file mode 100644
index 0000000..b27fa38
Binary files /dev/null and b/doc/images/DocControlMapDem/maproom2.png differ
diff --git a/doc/images/DocControlMapDem/maproom3.png b/doc/images/DocControlMapDem/maproom3.png
new file mode 100644
index 0000000..9c596cb
Binary files /dev/null and b/doc/images/DocControlMapDem/maproom3.png differ
diff --git a/doc/images/DocControlMapDem/maproom5.png b/doc/images/DocControlMapDem/maproom5.png
new file mode 100644
index 0000000..e5fef1f
Binary files /dev/null and b/doc/images/DocControlMapDem/maproom5.png differ
diff --git a/doc/images/DocControlMapDem/maproom6.png b/doc/images/DocControlMapDem/maproom6.png
new file mode 100644
index 0000000..7de076e
Binary files /dev/null and b/doc/images/DocControlMapDem/maproom6.png differ
diff --git a/doc/images/DocControlMapDem/maproom7.png b/doc/images/DocControlMapDem/maproom7.png
new file mode 100644
index 0000000..437e7da
Binary files /dev/null and b/doc/images/DocControlMapDem/maproom7.png differ
diff --git a/doc/images/DocControlMapDem/maproom7.svg b/doc/images/DocControlMapDem/maproom7.svg
new file mode 100644
index 0000000..ef72f4e
--- /dev/null
+++ b/doc/images/DocControlMapDem/maproom7.svg
@@ -0,0 +1,354 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="335"
+   height="216"
+   sodipodi:docname="maproom7.svg"
+   inkscape:export-filename="/home/oeichler/Wiki/QMapStackWiki/images/DocControlMapDem/maproom9.png"
+   inkscape:export-xdpi="89"
+   inkscape:export-ydpi="89">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="992"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="1.0925926"
+     inkscape:cx="29.29661"
+     inkscape:cy="108"
+     inkscape:window-x="-4"
+     inkscape:window-y="-1"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <image
+     width="335"
+     height="216"
+     xlink:href="data:image/png;base64,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
+"
+     id="image10"
+     x="0"
+     y="0" />
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+     x="36.001572"
+     y="96.549751"
+     id="text2987"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan2989"
+       x="36.001572"
+       y="96.549751">1</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+     x="162.94377"
+     y="97.932198"
+     id="text2991"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan2993"
+       x="162.94377"
+       y="97.932198">2</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+     x="36.341415"
+     y="122.30508"
+     id="text2995"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan2997"
+       x="36.341415"
+       y="122.30508">3</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+     x="162.90276"
+     y="124.27466"
+     id="text2999"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3001"
+       x="162.90276"
+       y="124.27466">4</tspan><tspan
+       sodipodi:role="line"
+       x="162.90276"
+       y="139.27466"
+       id="tspan3007" /></text>
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+     x="162.85295"
+     y="178.47458"
+     id="text3003"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3005"
+       x="162.85295"
+       y="178.47458">5</tspan></text>
+</svg>
diff --git a/doc/images/DocControlMapDem/maproom8.png b/doc/images/DocControlMapDem/maproom8.png
new file mode 100644
index 0000000..be825eb
Binary files /dev/null and b/doc/images/DocControlMapDem/maproom8.png differ
diff --git a/doc/images/DocControlMapDem/maproom8.svg b/doc/images/DocControlMapDem/maproom8.svg
new file mode 100644
index 0000000..c98841c
--- /dev/null
+++ b/doc/images/DocControlMapDem/maproom8.svg
@@ -0,0 +1,372 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="352"
+   height="255"
+   sodipodi:docname="maproom8.png">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="992"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="0.9254902"
+     inkscape:cx="12.84322"
+     inkscape:cy="127.5"
+     inkscape:window-x="-4"
+     inkscape:window-y="-1"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <image
+     width="352"
+     height="255"
+     xlink:href="data:image/png;base64,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
+AElFTkSuQmCC
+"
+     id="image10"
+     x="0"
+     y="0" />
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+     x="26.948257"
+     y="110.21186"
+     id="text2987"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan2989"
+       x="26.948257"
+       y="110.21186">1</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+     x="27.258804"
+     y="137.22458"
+     id="text2991"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan2993"
+       x="27.258804"
+       y="137.22458">2</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+     x="27.288101"
+     y="164.23729"
+     id="text2995"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan2997"
+       x="27.288101"
+       y="164.23729">3</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+     x="27.217789"
+     y="186.92796"
+     id="text2999"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3001"
+       x="27.217789"
+       y="186.92796">4</tspan></text>
+</svg>
diff --git a/doc/images/DocGettingStarted/maproom1.png b/doc/images/DocGettingStarted/maproom1.png
new file mode 100644
index 0000000..78b8f6a
Binary files /dev/null and b/doc/images/DocGettingStarted/maproom1.png differ
diff --git a/doc/images/DocGettingStarted/maproom1_1.png b/doc/images/DocGettingStarted/maproom1_1.png
new file mode 100644
index 0000000..943676f
Binary files /dev/null and b/doc/images/DocGettingStarted/maproom1_1.png differ
diff --git a/doc/images/DocGettingStarted/maproom2.png b/doc/images/DocGettingStarted/maproom2.png
new file mode 100644
index 0000000..c53f2ea
Binary files /dev/null and b/doc/images/DocGettingStarted/maproom2.png differ
diff --git a/doc/images/DocGettingStarted/maproom3.png b/doc/images/DocGettingStarted/maproom3.png
new file mode 100644
index 0000000..96cf6c9
Binary files /dev/null and b/doc/images/DocGettingStarted/maproom3.png differ
diff --git a/doc/images/DocGettingStarted/maproom4.png b/doc/images/DocGettingStarted/maproom4.png
new file mode 100644
index 0000000..296689c
Binary files /dev/null and b/doc/images/DocGettingStarted/maproom4.png differ
diff --git a/doc/images/DocGettingStarted/maproom6.png b/doc/images/DocGettingStarted/maproom6.png
new file mode 100644
index 0000000..17fbd00
Binary files /dev/null and b/doc/images/DocGettingStarted/maproom6.png differ
diff --git a/doc/images/DocGisDatabaseAddRemove/Add.png b/doc/images/DocGisDatabaseAddRemove/Add.png
new file mode 100644
index 0000000..62a35ae
Binary files /dev/null and b/doc/images/DocGisDatabaseAddRemove/Add.png differ
diff --git a/doc/images/DocGisDatabaseAddRemove/PathBlue.png b/doc/images/DocGisDatabaseAddRemove/PathBlue.png
new file mode 100644
index 0000000..7cfba33
Binary files /dev/null and b/doc/images/DocGisDatabaseAddRemove/PathBlue.png differ
diff --git a/doc/images/DocGisDatabaseAddRemove/maproom1.png b/doc/images/DocGisDatabaseAddRemove/maproom1.png
new file mode 100644
index 0000000..ca074bd
Binary files /dev/null and b/doc/images/DocGisDatabaseAddRemove/maproom1.png differ
diff --git a/doc/images/DocGisDatabaseAddRemove/maproom2.png b/doc/images/DocGisDatabaseAddRemove/maproom2.png
new file mode 100644
index 0000000..6681129
Binary files /dev/null and b/doc/images/DocGisDatabaseAddRemove/maproom2.png differ
diff --git a/doc/images/DocGisDatabaseAddRemove/maproom3.png b/doc/images/DocGisDatabaseAddRemove/maproom3.png
new file mode 100644
index 0000000..87a46ea
Binary files /dev/null and b/doc/images/DocGisDatabaseAddRemove/maproom3.png differ
diff --git a/doc/images/DocGisDatabaseAddRemove/maproom4.png b/doc/images/DocGisDatabaseAddRemove/maproom4.png
new file mode 100644
index 0000000..91c9f72
Binary files /dev/null and b/doc/images/DocGisDatabaseAddRemove/maproom4.png differ
diff --git a/doc/images/DocGisDatabaseAddRemove/maproom5.png b/doc/images/DocGisDatabaseAddRemove/maproom5.png
new file mode 100644
index 0000000..6449ecb
Binary files /dev/null and b/doc/images/DocGisDatabaseAddRemove/maproom5.png differ
diff --git a/doc/images/DocGisDatabaseFolderItems/maproom1.png b/doc/images/DocGisDatabaseFolderItems/maproom1.png
new file mode 100644
index 0000000..b96bada
Binary files /dev/null and b/doc/images/DocGisDatabaseFolderItems/maproom1.png differ
diff --git a/doc/images/DocGisDatabaseFolderItems/maproom3.png b/doc/images/DocGisDatabaseFolderItems/maproom3.png
new file mode 100644
index 0000000..ea75158
Binary files /dev/null and b/doc/images/DocGisDatabaseFolderItems/maproom3.png differ
diff --git a/doc/images/DocGisDatabaseFolderItems/maproom4.png b/doc/images/DocGisDatabaseFolderItems/maproom4.png
new file mode 100644
index 0000000..606df12
Binary files /dev/null and b/doc/images/DocGisDatabaseFolderItems/maproom4.png differ
diff --git a/doc/images/DocGisDatabaseFolderItems/maproom5.png b/doc/images/DocGisDatabaseFolderItems/maproom5.png
new file mode 100644
index 0000000..24b1650
Binary files /dev/null and b/doc/images/DocGisDatabaseFolderItems/maproom5.png differ
diff --git a/doc/images/DocGisDatabaseFolderItems/maproom6.png b/doc/images/DocGisDatabaseFolderItems/maproom6.png
new file mode 100644
index 0000000..675f052
Binary files /dev/null and b/doc/images/DocGisDatabaseFolderItems/maproom6.png differ
diff --git a/doc/images/DocGisDatabaseFolderItems/maproom7.png b/doc/images/DocGisDatabaseFolderItems/maproom7.png
new file mode 100644
index 0000000..d518d66
Binary files /dev/null and b/doc/images/DocGisDatabaseFolderItems/maproom7.png differ
diff --git a/doc/images/DocGisDatabaseFolderItems/maproom8.png b/doc/images/DocGisDatabaseFolderItems/maproom8.png
new file mode 100644
index 0000000..70ce94d
Binary files /dev/null and b/doc/images/DocGisDatabaseFolderItems/maproom8.png differ
diff --git a/doc/images/DocGisDatabaseLostFound/maproom1.png b/doc/images/DocGisDatabaseLostFound/maproom1.png
new file mode 100644
index 0000000..6e647b2
Binary files /dev/null and b/doc/images/DocGisDatabaseLostFound/maproom1.png differ
diff --git a/doc/images/DocGisDatabaseLostFound/maproom2.png b/doc/images/DocGisDatabaseLostFound/maproom2.png
new file mode 100644
index 0000000..bd741d5
Binary files /dev/null and b/doc/images/DocGisDatabaseLostFound/maproom2.png differ
diff --git a/doc/images/DocGisDatabaseLostFound/maproom4.png b/doc/images/DocGisDatabaseLostFound/maproom4.png
new file mode 100644
index 0000000..e72fb78
Binary files /dev/null and b/doc/images/DocGisDatabaseLostFound/maproom4.png differ
diff --git a/doc/images/DocGisDatabaseLostFound/maproom5.png b/doc/images/DocGisDatabaseLostFound/maproom5.png
new file mode 100644
index 0000000..5506431
Binary files /dev/null and b/doc/images/DocGisDatabaseLostFound/maproom5.png differ
diff --git a/doc/images/DocGisDatabaseLostFound/maproom6.png b/doc/images/DocGisDatabaseLostFound/maproom6.png
new file mode 100644
index 0000000..e3d406d
Binary files /dev/null and b/doc/images/DocGisDatabaseLostFound/maproom6.png differ
diff --git a/doc/images/DocGisDatabaseWorkspaceDatabase/maproom2.png b/doc/images/DocGisDatabaseWorkspaceDatabase/maproom2.png
new file mode 100644
index 0000000..04f7418
Binary files /dev/null and b/doc/images/DocGisDatabaseWorkspaceDatabase/maproom2.png differ
diff --git a/doc/images/DocGisDatabaseWorkspaceDatabase/maproom2.svg b/doc/images/DocGisDatabaseWorkspaceDatabase/maproom2.svg
new file mode 100644
index 0000000..fa5f6cb
--- /dev/null
+++ b/doc/images/DocGisDatabaseWorkspaceDatabase/maproom2.svg
@@ -0,0 +1,847 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="382"
+   height="584"
+   sodipodi:docname="maproom2.svg"
+   inkscape:export-filename="/home/oeichler/Wiki/QMapStackWiki/images/DocGisDatabaseWorkspaceDatabase/maproom2.png"
+   inkscape:export-xdpi="89"
+   inkscape:export-ydpi="89">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lstart"
+       style="overflow:visible">
+      <path
+         id="path3861"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path3843"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.8) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lend"
+       style="overflow:visible;">
+      <path
+         id="path3864"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) rotate(180) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path3870"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="992"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="1.1429945"
+     inkscape:cx="254.62838"
+     inkscape:cy="288.33942"
+     inkscape:window-x="-4"
+     inkscape:window-y="-1"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <image
+     width="382"
+     height="584"
+     xlink:href="data:image/png;base64,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
+lnst4qilppAAAAAASUVORK5CYII=
+"
+     id="image10"
+     x="11.995938"
+     y="0" />
+  <path
+     sodipodi:type="arc"
+     style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     id="path2987"
+     sodipodi:cx="205.60028"
+     sodipodi:cy="463.26453"
+     sodipodi:rx="219.5986"
+     sodipodi:ry="160.10576"
+     d="m 400.39921,389.35354 a 219.5986,160.10576 0 1 1 -0.0445,-0.0624"
+     sodipodi:start="5.8033439"
+     sodipodi:end="12.08609"
+     sodipodi:open="true"
+     transform="matrix(0.89072613,0,0,0.95364691,19.862395,14.050819)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     id="path2987-5"
+     sodipodi:cx="205.60028"
+     sodipodi:cy="463.26453"
+     sodipodi:rx="219.5986"
+     sodipodi:ry="160.10576"
+     d="m 400.39921,389.35354 a 219.5986,160.10576 0 1 1 -0.0445,-0.0624"
+     sodipodi:start="5.8033439"
+     sodipodi:end="12.08609"
+     sodipodi:open="true"
+     transform="matrix(0.89072613,0,0,0.95364691,19.862395,-289.11397)" />
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+     x="404.20139"
+     y="148.30237"
+     id="text3007"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3009"
+       x="404.20139"
+       y="148.30237">workspace</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+     x="409.45078"
+     y="457.14023"
+     id="text3011"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3013"
+       x="409.45078"
+       y="457.14023">database</tspan></text>
+  <path
+     sodipodi:type="arc"
+     style="fill:none;stroke:#008000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     id="path3017"
+     sodipodi:cx="202.9756"
+     sodipodi:cy="324.15625"
+     sodipodi:rx="216.09903"
+     sodipodi:ry="21.872372"
+     d="m 394.67017,314.05912 a 216.09903,21.872372 0 1 1 -0.0438,-0.009"
+     sodipodi:start="5.8033439"
+     sodipodi:end="12.08609"
+     sodipodi:open="true"
+     transform="matrix(0.9996237,0,0,0.69334961,0.0967164,99.745031)" />
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#008000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+     x="-108.48696"
+     y="327.65582"
+     id="text3019"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3021"
+       x="-108.48696"
+       y="327.65582">database file</tspan></text>
+  <path
+     sodipodi:type="arc"
+     style="fill:none;stroke:#000080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     id="path3017-5"
+     sodipodi:cx="202.9756"
+     sodipodi:cy="324.15625"
+     sodipodi:rx="216.09903"
+     sodipodi:ry="21.872372"
+     d="m 394.67017,314.05912 a 216.09903,21.872372 0 1 1 -0.0438,-0.009"
+     sodipodi:start="5.8033439"
+     sodipodi:end="12.08609"
+     sodipodi:open="true"
+     transform="matrix(0.9996237,0,0,0.69334961,0.09671639,121.27499)" />
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+     x="-189.85219"
+     y="346.9035"
+     id="text3041"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3043"
+       x="-189.85219"
+       y="346.9035">folder to keep all items </tspan><tspan
+       sodipodi:role="line"
+       x="-189.85219"
+       y="361.9035"
+       id="tspan3045">not referenced by a folder</tspan></text>
+  <path
+     sodipodi:type="arc"
+     style="fill:none;stroke:#ff6600;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     id="path3017-0"
+     sodipodi:cx="202.9756"
+     sodipodi:cy="324.15625"
+     sodipodi:rx="216.09903"
+     sodipodi:ry="21.872372"
+     d="m 394.67017,314.05912 a 216.09903,21.872372 0 1 1 -0.0438,-0.009"
+     sodipodi:start="5.8033439"
+     sodipodi:end="12.08609"
+     sodipodi:open="true"
+     transform="matrix(0.9996237,0,0,0.69334961,0.09671639,-41.455445)" />
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff6600;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+     x="-189.85219"
+     y="186.79774"
+     id="text3065"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3067"
+       x="-189.85219"
+       y="186.79774">a loaded database folder</tspan></text>
+  <path
+     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend);marker-start:url(#Arrow2Lstart)"
+     d="m 398.95204,62.56268 c 0,0 159.64402,32.217605 145.23255,104.11249 -14.41147,71.89489 -254.5944,58.61795 -254.5944,58.61795"
+     id="path3069"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="czc" />
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+     x="548.55908"
+     y="157.92622"
+     id="text4847"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan4849"
+       x="548.55908"
+       y="157.92622">exchange items between projects </tspan><tspan
+       sodipodi:role="line"
+       x="548.55908"
+       y="172.92622"
+       id="tspan4851">via workspace exclusively </tspan></text>
+</svg>
diff --git a/doc/images/DocGisDevices/qmapshack2.png b/doc/images/DocGisDevices/qmapshack2.png
new file mode 100644
index 0000000..187923c
Binary files /dev/null and b/doc/images/DocGisDevices/qmapshack2.png differ
diff --git a/doc/images/DocGisDevices/qmapshack4.png b/doc/images/DocGisDevices/qmapshack4.png
new file mode 100644
index 0000000..c8d2be1
Binary files /dev/null and b/doc/images/DocGisDevices/qmapshack4.png differ
diff --git a/doc/images/DocGisDevices/qmapshack5.png b/doc/images/DocGisDevices/qmapshack5.png
new file mode 100644
index 0000000..7f4303b
Binary files /dev/null and b/doc/images/DocGisDevices/qmapshack5.png differ
diff --git a/doc/images/DocGisDevices/qmapshack6.png b/doc/images/DocGisDevices/qmapshack6.png
new file mode 100644
index 0000000..8993674
Binary files /dev/null and b/doc/images/DocGisDevices/qmapshack6.png differ
diff --git a/doc/images/DocGisItems/maproom1.png b/doc/images/DocGisItems/maproom1.png
new file mode 100644
index 0000000..a121965
Binary files /dev/null and b/doc/images/DocGisItems/maproom1.png differ
diff --git a/doc/images/DocGisItems/maproom2.png b/doc/images/DocGisItems/maproom2.png
new file mode 100644
index 0000000..9362e86
Binary files /dev/null and b/doc/images/DocGisItems/maproom2.png differ
diff --git a/doc/images/DocGisItems/maproom3.png b/doc/images/DocGisItems/maproom3.png
new file mode 100644
index 0000000..52bf37a
Binary files /dev/null and b/doc/images/DocGisItems/maproom3.png differ
diff --git a/doc/images/DocGisItems/maproom4.png b/doc/images/DocGisItems/maproom4.png
new file mode 100644
index 0000000..962023a
Binary files /dev/null and b/doc/images/DocGisItems/maproom4.png differ
diff --git a/doc/images/DocGisItems/maproom5.png b/doc/images/DocGisItems/maproom5.png
new file mode 100644
index 0000000..856d1c5
Binary files /dev/null and b/doc/images/DocGisItems/maproom5.png differ
diff --git a/doc/images/DocGisItemsArea/maproom1.png b/doc/images/DocGisItemsArea/maproom1.png
new file mode 100644
index 0000000..2551167
Binary files /dev/null and b/doc/images/DocGisItemsArea/maproom1.png differ
diff --git a/doc/images/DocGisItemsArea/maproom2.png b/doc/images/DocGisItemsArea/maproom2.png
new file mode 100644
index 0000000..54031a2
Binary files /dev/null and b/doc/images/DocGisItemsArea/maproom2.png differ
diff --git a/doc/images/DocGisItemsArea/maproom3.png b/doc/images/DocGisItemsArea/maproom3.png
new file mode 100644
index 0000000..8db9aa8
Binary files /dev/null and b/doc/images/DocGisItemsArea/maproom3.png differ
diff --git a/doc/images/DocGisItemsEditMultiple/Add.png b/doc/images/DocGisItemsEditMultiple/Add.png
new file mode 100644
index 0000000..d3e2dc2
Binary files /dev/null and b/doc/images/DocGisItemsEditMultiple/Add.png differ
diff --git a/doc/images/DocGisItemsEditMultiple/Apply_small.png b/doc/images/DocGisItemsEditMultiple/Apply_small.png
new file mode 100644
index 0000000..5e2d28a
Binary files /dev/null and b/doc/images/DocGisItemsEditMultiple/Apply_small.png differ
diff --git a/doc/images/DocGisItemsEditMultiple/AreaMove.png b/doc/images/DocGisItemsEditMultiple/AreaMove.png
new file mode 100644
index 0000000..2a81bc9
Binary files /dev/null and b/doc/images/DocGisItemsEditMultiple/AreaMove.png differ
diff --git a/doc/images/DocGisItemsEditMultiple/DeleteOne.png b/doc/images/DocGisItemsEditMultiple/DeleteOne.png
new file mode 100644
index 0000000..9460597
Binary files /dev/null and b/doc/images/DocGisItemsEditMultiple/DeleteOne.png differ
diff --git a/doc/images/DocGisItemsEditMultiple/DeleteOne_small.png b/doc/images/DocGisItemsEditMultiple/DeleteOne_small.png
new file mode 100644
index 0000000..1b3fb88
Binary files /dev/null and b/doc/images/DocGisItemsEditMultiple/DeleteOne_small.png differ
diff --git a/doc/images/DocGisItemsEditMultiple/LineMove.png b/doc/images/DocGisItemsEditMultiple/LineMove.png
new file mode 100644
index 0000000..d1b2866
Binary files /dev/null and b/doc/images/DocGisItemsEditMultiple/LineMove.png differ
diff --git a/doc/images/DocGisItemsEditMultiple/PointMove.png b/doc/images/DocGisItemsEditMultiple/PointMove.png
new file mode 100644
index 0000000..efc0615
Binary files /dev/null and b/doc/images/DocGisItemsEditMultiple/PointMove.png differ
diff --git a/doc/images/DocGisItemsEditMultiple/Redo.png b/doc/images/DocGisItemsEditMultiple/Redo.png
new file mode 100644
index 0000000..48f1d77
Binary files /dev/null and b/doc/images/DocGisItemsEditMultiple/Redo.png differ
diff --git a/doc/images/DocGisItemsEditMultiple/SelectRange.png b/doc/images/DocGisItemsEditMultiple/SelectRange.png
new file mode 100644
index 0000000..e4ede1e
Binary files /dev/null and b/doc/images/DocGisItemsEditMultiple/SelectRange.png differ
diff --git a/doc/images/DocGisItemsEditMultiple/Undo.png b/doc/images/DocGisItemsEditMultiple/Undo.png
new file mode 100644
index 0000000..539adb0
Binary files /dev/null and b/doc/images/DocGisItemsEditMultiple/Undo.png differ
diff --git a/doc/images/DocGisItemsEditMultiple/qms1.png b/doc/images/DocGisItemsEditMultiple/qms1.png
new file mode 100644
index 0000000..440d867
Binary files /dev/null and b/doc/images/DocGisItemsEditMultiple/qms1.png differ
diff --git a/doc/images/DocGisItemsEditMultiple/qms2.png b/doc/images/DocGisItemsEditMultiple/qms2.png
new file mode 100644
index 0000000..40ad08c
Binary files /dev/null and b/doc/images/DocGisItemsEditMultiple/qms2.png differ
diff --git a/doc/images/DocGisItemsEditMultiple/qms2.svg b/doc/images/DocGisItemsEditMultiple/qms2.svg
new file mode 100644
index 0000000..1a5a040
--- /dev/null
+++ b/doc/images/DocGisItemsEditMultiple/qms2.svg
@@ -0,0 +1,1680 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="475"
+   height="236"
+   sodipodi:docname="qms2.png">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1012"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="0.94526316"
+     inkscape:cx="237.5"
+     inkscape:cy="118"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <image
+     width="475"
+     height="236"
+     xlink:href="data:image/png;base64,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
+
+"
+     id="image10"
+     x="0"
+     y="0" />
+  <path
+     sodipodi:type="arc"
+     style="fill:none;stroke:#ff0000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path2987"
+     sodipodi:cx="88.864143"
+     sodipodi:cy="130.73831"
+     sodipodi:rx="17.984409"
+     sodipodi:ry="15.339643"
+     d="m 104.81754,123.65694 a 17.984409,15.339643 0 1 1 -0.50504,-0.77251"
+     sodipodi:start="5.8033439"
+     sodipodi:end="12.02886"
+     sodipodi:open="true" />
+  <path
+     sodipodi:type="arc"
+     style="fill:none;stroke:#ff0000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path2989"
+     sodipodi:cx="398.83075"
+     sodipodi:cy="112.7539"
+     sodipodi:rx="17.984409"
+     sodipodi:ry="19.57127"
+     d="m 414.78415,103.71905 a 17.984409,19.57127 0 1 1 -0.50505,-0.98563"
+     sodipodi:start="5.8033439"
+     sodipodi:end="12.02886"
+     sodipodi:open="true" />
+  <path
+     sodipodi:type="arc"
+     style="fill:none;stroke:#ff0000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path2991"
+     sodipodi:cx="294.62695"
+     sodipodi:cy="131.79622"
+     sodipodi:rx="16.397551"
+     sodipodi:ry="17.455456"
+     d="m 309.1727,123.73811 a 16.397551,17.455456 0 1 1 -0.46048,-0.87907"
+     sodipodi:start="5.8033439"
+     sodipodi:end="12.02886"
+     sodipodi:open="true" />
+  <path
+     sodipodi:type="arc"
+     style="fill:none;stroke:#ff0000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path2997"
+     sodipodi:cx="177.19933"
+     sodipodi:cy="135.49889"
+     sodipodi:rx="18.513363"
+     sodipodi:ry="13.752784"
+     d="m 193.62194,129.15007 a 18.513363,13.752784 0 1 1 -0.5199,-0.6926"
+     sodipodi:start="5.8033439"
+     sodipodi:end="12.02886"
+     sodipodi:open="true" />
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+     x="7.4053464"
+     y="115.39867"
+     id="text3003"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3005"
+       x="7.4053464"
+       y="115.39867"
+       style="font-weight:bold;fill:#ff0000;-inkscape-font-specification:Sans Bold">first point</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+     x="392.88083"
+     y="83.798294"
+     id="text3003-2"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3005-7"
+       x="392.88083"
+       y="83.798294"
+       style="font-weight:bold;fill:#ff0000;-inkscape-font-specification:Sans Bold">last point</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+     x="297.2717"
+     y="163.00446"
+     id="text3028"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3030"
+       x="297.2717"
+       y="163.00446" /></text>
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+     x="230.90533"
+     y="110.24596"
+     id="text3003-6"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3005-2"
+       x="230.90533"
+       y="110.24596"
+       style="font-weight:bold;fill:#ff0000;-inkscape-font-specification:Sans Bold">intermediate point</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+     x="147.57349"
+     y="166.315"
+     id="text3003-6-6"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3005-2-4"
+       x="147.57349"
+       y="166.315"
+       style="font-weight:bold;fill:#ff0000;-inkscape-font-specification:Sans Bold">sub-point</tspan></text>
+</svg>
diff --git a/doc/images/DocGisItemsNew/maproom1.png b/doc/images/DocGisItemsNew/maproom1.png
new file mode 100644
index 0000000..ba8670e
Binary files /dev/null and b/doc/images/DocGisItemsNew/maproom1.png differ
diff --git a/doc/images/DocGisItemsNew/maproom2.png b/doc/images/DocGisItemsNew/maproom2.png
new file mode 100644
index 0000000..601dee1
Binary files /dev/null and b/doc/images/DocGisItemsNew/maproom2.png differ
diff --git a/doc/images/DocGisItemsNew/maproom3.png b/doc/images/DocGisItemsNew/maproom3.png
new file mode 100644
index 0000000..ecbc26a
Binary files /dev/null and b/doc/images/DocGisItemsNew/maproom3.png differ
diff --git a/doc/images/DocGisItemsNew/maproom4.png b/doc/images/DocGisItemsNew/maproom4.png
new file mode 100644
index 0000000..b1507eb
Binary files /dev/null and b/doc/images/DocGisItemsNew/maproom4.png differ
diff --git a/doc/images/DocGisItemsNew/maproom5.png b/doc/images/DocGisItemsNew/maproom5.png
new file mode 100644
index 0000000..d9ea59f
Binary files /dev/null and b/doc/images/DocGisItemsNew/maproom5.png differ
diff --git a/doc/images/DocGisItemsRte/Apply.png b/doc/images/DocGisItemsRte/Apply.png
new file mode 100644
index 0000000..11cbe09
Binary files /dev/null and b/doc/images/DocGisItemsRte/Apply.png differ
diff --git a/doc/images/DocGisItemsRte/Copy.png b/doc/images/DocGisItemsRte/Copy.png
new file mode 100644
index 0000000..e93e024
Binary files /dev/null and b/doc/images/DocGisItemsRte/Copy.png differ
diff --git a/doc/images/DocGisItemsRte/DeleteOne.png b/doc/images/DocGisItemsRte/DeleteOne.png
new file mode 100644
index 0000000..9460597
Binary files /dev/null and b/doc/images/DocGisItemsRte/DeleteOne.png differ
diff --git a/doc/images/DocGisItemsRte/EditDetails.png b/doc/images/DocGisItemsRte/EditDetails.png
new file mode 100644
index 0000000..96f926f
Binary files /dev/null and b/doc/images/DocGisItemsRte/EditDetails.png differ
diff --git a/doc/images/DocGisItemsRte/LineMove.png b/doc/images/DocGisItemsRte/LineMove.png
new file mode 100644
index 0000000..d1b2866
Binary files /dev/null and b/doc/images/DocGisItemsRte/LineMove.png differ
diff --git a/doc/images/DocGisItemsRte/Reset.png b/doc/images/DocGisItemsRte/Reset.png
new file mode 100644
index 0000000..8f94c11
Binary files /dev/null and b/doc/images/DocGisItemsRte/Reset.png differ
diff --git a/doc/images/DocGisItemsRte/RteInstr.png b/doc/images/DocGisItemsRte/RteInstr.png
new file mode 100644
index 0000000..83f007a
Binary files /dev/null and b/doc/images/DocGisItemsRte/RteInstr.png differ
diff --git a/doc/images/DocGisItemsRte/qms1.png b/doc/images/DocGisItemsRte/qms1.png
new file mode 100644
index 0000000..462afbe
Binary files /dev/null and b/doc/images/DocGisItemsRte/qms1.png differ
diff --git a/doc/images/DocGisItemsRte/qms2.png b/doc/images/DocGisItemsRte/qms2.png
new file mode 100644
index 0000000..3eae192
Binary files /dev/null and b/doc/images/DocGisItemsRte/qms2.png differ
diff --git a/doc/images/DocGisItemsRte/qms3.png b/doc/images/DocGisItemsRte/qms3.png
new file mode 100644
index 0000000..4ec393a
Binary files /dev/null and b/doc/images/DocGisItemsRte/qms3.png differ
diff --git a/doc/images/DocGisItemsRte/qms4.png b/doc/images/DocGisItemsRte/qms4.png
new file mode 100644
index 0000000..f45abdb
Binary files /dev/null and b/doc/images/DocGisItemsRte/qms4.png differ
diff --git a/doc/images/DocGisItemsRte/qms5.png b/doc/images/DocGisItemsRte/qms5.png
new file mode 100644
index 0000000..89cce28
Binary files /dev/null and b/doc/images/DocGisItemsRte/qms5.png differ
diff --git a/doc/images/DocGisItemsRte/qms6.png b/doc/images/DocGisItemsRte/qms6.png
new file mode 100644
index 0000000..d2f667f
Binary files /dev/null and b/doc/images/DocGisItemsRte/qms6.png differ
diff --git a/doc/images/DocGisItemsTrk/Activity.png b/doc/images/DocGisItemsTrk/Activity.png
new file mode 100644
index 0000000..042ccee
Binary files /dev/null and b/doc/images/DocGisItemsTrk/Activity.png differ
diff --git a/doc/images/DocGisItemsTrk/ActivityTab.png b/doc/images/DocGisItemsTrk/ActivityTab.png
new file mode 100644
index 0000000..5dbc656
Binary files /dev/null and b/doc/images/DocGisItemsTrk/ActivityTab.png differ
diff --git a/doc/images/DocGisItemsTrk/Combine.png b/doc/images/DocGisItemsTrk/Combine.png
new file mode 100644
index 0000000..b8f0991
Binary files /dev/null and b/doc/images/DocGisItemsTrk/Combine.png differ
diff --git a/doc/images/DocGisItemsTrk/Copy.png b/doc/images/DocGisItemsTrk/Copy.png
new file mode 100644
index 0000000..e93e024
Binary files /dev/null and b/doc/images/DocGisItemsTrk/Copy.png differ
diff --git a/doc/images/DocGisItemsTrk/DeleteOne.png b/doc/images/DocGisItemsTrk/DeleteOne.png
new file mode 100644
index 0000000..9460597
Binary files /dev/null and b/doc/images/DocGisItemsTrk/DeleteOne.png differ
diff --git a/doc/images/DocGisItemsTrk/DetailsDialog.png b/doc/images/DocGisItemsTrk/DetailsDialog.png
new file mode 100644
index 0000000..9310eb3
Binary files /dev/null and b/doc/images/DocGisItemsTrk/DetailsDialog.png differ
diff --git a/doc/images/DocGisItemsTrk/EditDetails.png b/doc/images/DocGisItemsTrk/EditDetails.png
new file mode 100644
index 0000000..96f926f
Binary files /dev/null and b/doc/images/DocGisItemsTrk/EditDetails.png differ
diff --git a/doc/images/DocGisItemsTrk/FilterEelvation.png b/doc/images/DocGisItemsTrk/FilterEelvation.png
new file mode 100644
index 0000000..901deb6
Binary files /dev/null and b/doc/images/DocGisItemsTrk/FilterEelvation.png differ
diff --git a/doc/images/DocGisItemsTrk/FilterExtensions.png b/doc/images/DocGisItemsTrk/FilterExtensions.png
new file mode 100644
index 0000000..ea9b1a9
Binary files /dev/null and b/doc/images/DocGisItemsTrk/FilterExtensions.png differ
diff --git a/doc/images/DocGisItemsTrk/FilterPoints.png b/doc/images/DocGisItemsTrk/FilterPoints.png
new file mode 100644
index 0000000..5840816
Binary files /dev/null and b/doc/images/DocGisItemsTrk/FilterPoints.png differ
diff --git a/doc/images/DocGisItemsTrk/FilterSplit.png b/doc/images/DocGisItemsTrk/FilterSplit.png
new file mode 100644
index 0000000..d9be355
Binary files /dev/null and b/doc/images/DocGisItemsTrk/FilterSplit.png differ
diff --git a/doc/images/DocGisItemsTrk/FilterTab.png b/doc/images/DocGisItemsTrk/FilterTab.png
new file mode 100644
index 0000000..4e18a8c
Binary files /dev/null and b/doc/images/DocGisItemsTrk/FilterTab.png differ
diff --git a/doc/images/DocGisItemsTrk/FilterTime.png b/doc/images/DocGisItemsTrk/FilterTime.png
new file mode 100644
index 0000000..ec4ae0f
Binary files /dev/null and b/doc/images/DocGisItemsTrk/FilterTime.png differ
diff --git a/doc/images/DocGisItemsTrk/GraphArea.png b/doc/images/DocGisItemsTrk/GraphArea.png
new file mode 100644
index 0000000..3e3b820
Binary files /dev/null and b/doc/images/DocGisItemsTrk/GraphArea.png differ
diff --git a/doc/images/DocGisItemsTrk/GraphsTab.png b/doc/images/DocGisItemsTrk/GraphsTab.png
new file mode 100644
index 0000000..f7fd868
Binary files /dev/null and b/doc/images/DocGisItemsTrk/GraphsTab.png differ
diff --git a/doc/images/DocGisItemsTrk/HistoryTab.png b/doc/images/DocGisItemsTrk/HistoryTab.png
new file mode 100644
index 0000000..9264201
Binary files /dev/null and b/doc/images/DocGisItemsTrk/HistoryTab.png differ
diff --git a/doc/images/DocGisItemsTrk/InfoTab.png b/doc/images/DocGisItemsTrk/InfoTab.png
new file mode 100644
index 0000000..c49c8ae
Binary files /dev/null and b/doc/images/DocGisItemsTrk/InfoTab.png differ
diff --git a/doc/images/DocGisItemsTrk/LineMove.png b/doc/images/DocGisItemsTrk/LineMove.png
new file mode 100644
index 0000000..d1b2866
Binary files /dev/null and b/doc/images/DocGisItemsTrk/LineMove.png differ
diff --git a/doc/images/DocGisItemsTrk/Lock.png b/doc/images/DocGisItemsTrk/Lock.png
new file mode 100644
index 0000000..b3dfa83
Binary files /dev/null and b/doc/images/DocGisItemsTrk/Lock.png differ
diff --git a/doc/images/DocGisItemsTrk/PointHide.png b/doc/images/DocGisItemsTrk/PointHide.png
new file mode 100644
index 0000000..b97ad53
Binary files /dev/null and b/doc/images/DocGisItemsTrk/PointHide.png differ
diff --git a/doc/images/DocGisItemsTrk/PointShow.png b/doc/images/DocGisItemsTrk/PointShow.png
new file mode 100644
index 0000000..197892a
Binary files /dev/null and b/doc/images/DocGisItemsTrk/PointShow.png differ
diff --git a/doc/images/DocGisItemsTrk/PointsTab.png b/doc/images/DocGisItemsTrk/PointsTab.png
new file mode 100644
index 0000000..5ea7c24
Binary files /dev/null and b/doc/images/DocGisItemsTrk/PointsTab.png differ
diff --git a/doc/images/DocGisItemsTrk/Reverse.png b/doc/images/DocGisItemsTrk/Reverse.png
new file mode 100644
index 0000000..58b0228
Binary files /dev/null and b/doc/images/DocGisItemsTrk/Reverse.png differ
diff --git a/doc/images/DocGisItemsTrk/Save.png b/doc/images/DocGisItemsTrk/Save.png
new file mode 100644
index 0000000..9db5fc2
Binary files /dev/null and b/doc/images/DocGisItemsTrk/Save.png differ
diff --git a/doc/images/DocGisItemsTrk/SelectRange.png b/doc/images/DocGisItemsTrk/SelectRange.png
new file mode 100644
index 0000000..e4ede1e
Binary files /dev/null and b/doc/images/DocGisItemsTrk/SelectRange.png differ
diff --git a/doc/images/DocGisItemsTrk/StyleTab.png b/doc/images/DocGisItemsTrk/StyleTab.png
new file mode 100644
index 0000000..db9561d
Binary files /dev/null and b/doc/images/DocGisItemsTrk/StyleTab.png differ
diff --git a/doc/images/DocGisItemsTrk/Tainted.png b/doc/images/DocGisItemsTrk/Tainted.png
new file mode 100644
index 0000000..78a19b6
Binary files /dev/null and b/doc/images/DocGisItemsTrk/Tainted.png differ
diff --git a/doc/images/DocGisItemsTrk/TrkCut.png b/doc/images/DocGisItemsTrk/TrkCut.png
new file mode 100644
index 0000000..2f2144e
Binary files /dev/null and b/doc/images/DocGisItemsTrk/TrkCut.png differ
diff --git a/doc/images/DocGisItemsTrk/TrkProfile.png b/doc/images/DocGisItemsTrk/TrkProfile.png
new file mode 100644
index 0000000..910df33
Binary files /dev/null and b/doc/images/DocGisItemsTrk/TrkProfile.png differ
diff --git a/doc/images/DocGisItemsTrk/Zoom.png b/doc/images/DocGisItemsTrk/Zoom.png
new file mode 100644
index 0000000..5fd0046
Binary files /dev/null and b/doc/images/DocGisItemsTrk/Zoom.png differ
diff --git a/doc/images/DocGisItemsTrk/maproom1.png b/doc/images/DocGisItemsTrk/maproom1.png
new file mode 100644
index 0000000..d7f385e
Binary files /dev/null and b/doc/images/DocGisItemsTrk/maproom1.png differ
diff --git a/doc/images/DocGisItemsWpt/AddImage.png b/doc/images/DocGisItemsWpt/AddImage.png
new file mode 100644
index 0000000..c53b1c6
Binary files /dev/null and b/doc/images/DocGisItemsWpt/AddImage.png differ
diff --git a/doc/images/DocGisItemsWpt/Bubble.png b/doc/images/DocGisItemsWpt/Bubble.png
new file mode 100644
index 0000000..b346d1f
Binary files /dev/null and b/doc/images/DocGisItemsWpt/Bubble.png differ
diff --git a/doc/images/DocGisItemsWpt/Copy.png b/doc/images/DocGisItemsWpt/Copy.png
new file mode 100644
index 0000000..9808443
Binary files /dev/null and b/doc/images/DocGisItemsWpt/Copy.png differ
diff --git a/doc/images/DocGisItemsWpt/DelImage.png b/doc/images/DocGisItemsWpt/DelImage.png
new file mode 100644
index 0000000..facacd4
Binary files /dev/null and b/doc/images/DocGisItemsWpt/DelImage.png differ
diff --git a/doc/images/DocGisItemsWpt/DeleteOne.png b/doc/images/DocGisItemsWpt/DeleteOne.png
new file mode 100644
index 0000000..85f386c
Binary files /dev/null and b/doc/images/DocGisItemsWpt/DeleteOne.png differ
diff --git a/doc/images/DocGisItemsWpt/EditDetails.png b/doc/images/DocGisItemsWpt/EditDetails.png
new file mode 100644
index 0000000..4f3d124
Binary files /dev/null and b/doc/images/DocGisItemsWpt/EditDetails.png differ
diff --git a/doc/images/DocGisItemsWpt/Lock.png b/doc/images/DocGisItemsWpt/Lock.png
new file mode 100644
index 0000000..b3dfa83
Binary files /dev/null and b/doc/images/DocGisItemsWpt/Lock.png differ
diff --git a/doc/images/DocGisItemsWpt/Move.png b/doc/images/DocGisItemsWpt/Move.png
new file mode 100644
index 0000000..3807a6c
Binary files /dev/null and b/doc/images/DocGisItemsWpt/Move.png differ
diff --git a/doc/images/DocGisItemsWpt/PinRed.png b/doc/images/DocGisItemsWpt/PinRed.png
new file mode 100644
index 0000000..0ae7db6
Binary files /dev/null and b/doc/images/DocGisItemsWpt/PinRed.png differ
diff --git a/doc/images/DocGisItemsWpt/Projection.png b/doc/images/DocGisItemsWpt/Projection.png
new file mode 100644
index 0000000..b444661
Binary files /dev/null and b/doc/images/DocGisItemsWpt/Projection.png differ
diff --git a/doc/images/DocGisItemsWpt/Tainted.png b/doc/images/DocGisItemsWpt/Tainted.png
new file mode 100644
index 0000000..78a19b6
Binary files /dev/null and b/doc/images/DocGisItemsWpt/Tainted.png differ
diff --git a/doc/images/DocGisItemsWpt/WptBubble.png b/doc/images/DocGisItemsWpt/WptBubble.png
new file mode 100644
index 0000000..cdd06fc
Binary files /dev/null and b/doc/images/DocGisItemsWpt/WptBubble.png differ
diff --git a/doc/images/DocGisItemsWpt/WptDetails.png b/doc/images/DocGisItemsWpt/WptDetails.png
new file mode 100644
index 0000000..a2facf0
Binary files /dev/null and b/doc/images/DocGisItemsWpt/WptDetails.png differ
diff --git a/doc/images/DocGisItemsWpt/WptHighlight.png b/doc/images/DocGisItemsWpt/WptHighlight.png
new file mode 100644
index 0000000..5add759
Binary files /dev/null and b/doc/images/DocGisItemsWpt/WptHighlight.png differ
diff --git a/doc/images/DocGisItemsWpt/WptMove.png b/doc/images/DocGisItemsWpt/WptMove.png
new file mode 100644
index 0000000..bd82c9e
Binary files /dev/null and b/doc/images/DocGisItemsWpt/WptMove.png differ
diff --git a/doc/images/DocGisItemsWpt/WptProj.png b/doc/images/DocGisItemsWpt/WptProj.png
new file mode 100644
index 0000000..e444e78
Binary files /dev/null and b/doc/images/DocGisItemsWpt/WptProj.png differ
diff --git a/doc/images/DocHandleGpxFiles/maproom1.png b/doc/images/DocHandleGpxFiles/maproom1.png
new file mode 100644
index 0000000..a9eb285
Binary files /dev/null and b/doc/images/DocHandleGpxFiles/maproom1.png differ
diff --git a/doc/images/DocHandleGpxFiles/maproom2.png b/doc/images/DocHandleGpxFiles/maproom2.png
new file mode 100644
index 0000000..fb09534
Binary files /dev/null and b/doc/images/DocHandleGpxFiles/maproom2.png differ
diff --git a/doc/images/DocHandleGpxFiles/maproom3.png b/doc/images/DocHandleGpxFiles/maproom3.png
new file mode 100644
index 0000000..d62f43f
Binary files /dev/null and b/doc/images/DocHandleGpxFiles/maproom3.png differ
diff --git a/doc/images/DocHandleGpxFiles/maproom4.png b/doc/images/DocHandleGpxFiles/maproom4.png
new file mode 100644
index 0000000..dcce766
Binary files /dev/null and b/doc/images/DocHandleGpxFiles/maproom4.png differ
diff --git a/doc/images/DocSearchGoogle/maproom1.png b/doc/images/DocSearchGoogle/maproom1.png
new file mode 100644
index 0000000..80eb957
Binary files /dev/null and b/doc/images/DocSearchGoogle/maproom1.png differ
diff --git a/doc/images/DocSearchGoogle/maproom2.png b/doc/images/DocSearchGoogle/maproom2.png
new file mode 100644
index 0000000..b115352
Binary files /dev/null and b/doc/images/DocSearchGoogle/maproom2.png differ
diff --git a/doc/images/DocSearchGoogle/maproom3.png b/doc/images/DocSearchGoogle/maproom3.png
new file mode 100644
index 0000000..48e5293
Binary files /dev/null and b/doc/images/DocSearchGoogle/maproom3.png differ
diff --git a/doc/images/DocSearchGoogle/maproom4.png b/doc/images/DocSearchGoogle/maproom4.png
new file mode 100644
index 0000000..0d64108
Binary files /dev/null and b/doc/images/DocSearchGoogle/maproom4.png differ
diff --git a/doc/images/DocWorkingWithProjects/maproom1.png b/doc/images/DocWorkingWithProjects/maproom1.png
new file mode 100644
index 0000000..06220cc
Binary files /dev/null and b/doc/images/DocWorkingWithProjects/maproom1.png differ
diff --git a/doc/images/maproom1.png b/doc/images/maproom1.png
new file mode 100644
index 0000000..01b6f75
Binary files /dev/null and b/doc/images/maproom1.png differ
diff --git a/doc/nav.time b/doc/nav.time
new file mode 100644
index 0000000..b78d2a7
--- /dev/null
+++ b/doc/nav.time
@@ -0,0 +1 @@
+Last modified by "make nav".
diff --git a/doc/playground/DocGisHowToRouting.md b/doc/playground/DocGisHowToRouting.md
new file mode 100644
index 0000000..08490ae
--- /dev/null
+++ b/doc/playground/DocGisHowToRouting.md
@@ -0,0 +1,196 @@
+Prev () | [Home](Home) | [Manual](DocMain) | () Next
+- - -
+
+[TOC]
+
+
+# Routing Quick Start  #
+
+Activate a proper map. OpenStreetMap as installed by "I want maps" will do perfectly.
+
+Activate **Menu -> Project -> Add empty project**  
+
+**kiozen: Images are stored in the correct folder of the images folder. Keep in mind that the Wiki can be converted into a stand alone HTML document by the scripts. Therefore all stuff has to be in this repository.**
+
+
+![projmenu.png](https://bitbucket.org/repo/L5qerE/images/1188753088-projmenu.png)
+
+and give it a proper name. Leave qms project type unless you know why not.
+
+![proj_new.png](https://bitbucket.org/repo/L5qerE/images/2189981266-proj_new.png)
+
+Activate **Menu -> Project -> Search Google** if not yet open.
+
+Type some search term for your address into the "Google Project" field. You may expand the left triangle to see your results. If you get "Error:", try to change or refine your search term. Usually, a road and a town should give reasonable results. Right click on your result, activate "copy to" and select your project name given in the first step. If your search yields multiple results, select the one desired.
+
+This way, you collect **waypoints** in your project.
+Repeat the steps for all waypoints your route is desired to pass.
+
+Use **shift-<click>** or **ctrl-<click>** to select some or all of your waypoints in the project. Be sure to select at least two waypoints and no other objects.
+In the context menu (right mouse button), select "Create Route". 
+
+![rte_create.png](https://bitbucket.org/repo/L5qerE/images/541772100-rte_create.png)
+
+You can now adjust the sequence in which the route should pass your waypoints.
+
+![rte_cr_rearrange.png](https://bitbucket.org/repo/L5qerE/images/3043379165-rte_cr_rearrange.png)
+
+Continue with OK, enter a route name in the next window and select your project in the following window.
+
+QMapShack automagically will calculate the route according to your current routing preferences, which more or less may take some time.
+
+Double click your route to zoom your map view to the whole route.
+
+![ge_must_see.jpg](https://bitbucket.org/repo/L5qerE/images/2544969820-ge_must_see.jpg)
+
+Click on the route between the waypoints to display route properties
+
+![rte_properties.png](https://bitbucket.org/repo/L5qerE/images/866504795-rte_properties.png)
+
+Save your project if you want to use the results later.
+
+
+
+# Manipulating a Route #
+
+### route context menu ###
+
+![rte_context.png](https://bitbucket.org/repo/L5qerE/images/3754465212-rte_context.png)
+
+"**Edit...**", "**Copy to...** " and "**Delete**" are generic object functions and do what their name promises.
+
+"**Route Instructions**": highlight route and see routing instructions.
+
+"**Reset Route**" removes the calculated pathway and returns to waypoints linked by straight lines of flight.
+
+"**Calculate**" restores the calculated pathway or recalculates it according to your (maybe changed) routing preferences.
+
+**kiozen: Local documents are referenced like this:**
+
+See [here](DocGisItemsRte)
+how to configure your routing engine. It is strongly encouraged to **use** offline **routino** routing, if you want to use serious route planning - both for performance reasons and to limit load on MapQuest online routing.
+
+
+"**Convert to Track**" creates a track with a large number of points ("breadcrumb track") which remains independent of the routing engine, the router map and the routing properties (available in version 1.6.2). If your GPS device supports routing by track, this will deliver exactly what you have planned. Be aware, that from track data, you cannot easily replan your route on the GPS device.
+
+"**Edit route**" .....
+This allows you to add/delete/move maypoints to your route. See here
+https://bitbucket.org/maproom/qmapshack/wiki/DocGisItemsEditMultiple
+for a detailled description of the dialogue.
+
+You may notice that the routepoints have lost their relation to the waypoints from which they were initially created. Moving a routepoint does not change the waypoint it was derived from.
+
+### Issue: named route points ###
+
+The routepoints do not inherit their name or description from the waypoints they were generated from.
+There is a bug report/feature request on this in the issue list:
+https://bitbucket.org/maproom/qmapshack/issues/127/create-a-route-from-waypoints-does-not-add
+
+### Manually create, edit and move a waypoint ###
+
+If you are not always happy with the results of the "Google Search" function, you may manually fine tune your waypoints before deriving a route from them. See here for detailed instructions:
+https://bitbucket.org/maproom/qmapshack/wiki/DocGisItemsNew#markdown-header-waypoint
+
+### Import Waypoints ###
+
+The GPX file format is a widely used de facto standard for GIS data exchange. Many GIS data sources may produce GPX directly, which can be used in the "File -> Load GIS" dialogue.
+
+If not, the GPS "swiss army knife" **gpsbabel**  may help to convert nearyly any relevant GIS data format into GPX. 
+For details, read the manual you may find here: https://www.gpsbabel.org/htmldoc-1.4.4/gpsbabel-1.4.4.pdf
+
+For example, take this little csv formatted text file, saved as "wpts-test5.csv":
+
+
+```
+#!
+49.43226,11.09153 , Nürnberg Hermundurenstraße 17
+49.73233,11.07244 , Forchheim Hugo-Post-Straße 84
+49.42029,11.89065 , Kümmersbruck Grasiger Weg
+49.15800,11.71157 , parsberg lindlbergstraße
+49.43226,11.09153 , Nürnberg Hermundurenstraße 17
+```
+
+Call gpsbabel like this to convert this to a gpx with waypoints:
+```
+#!
+gpsbabel -i csv -f wpts-test5.csv  -o gpx -F wpts-test5-wpt.gpx
+```
+Short explanation of the options:
+
+* *-i csv* : input file format
+* *-f wpts-test5.csv* : input file name
+* *-o gpx* : output file format
+* *-F wpts-test5-wpt.gpx* : output file name
+
+Open the output file in QMapShack with "File -> Load GIS Data" yields 
+
+![import-wpt-list.png](https://bitbucket.org/repo/L5qerE/images/995727279-import-wpt-list.png)
+
+and
+
+![import-wpt-map.jpg](https://bitbucket.org/repo/L5qerE/images/3896244447-import-wpt-map.jpg)
+
+As you see, the coordinates and the descriptive labels of the waypoints are imported.
+
+### Import Routes ###
+
+To import the points as routepoints instead, call this:
+
+```
+#!
+gpsbabel -i csv -f wpts-test5.csv -x  transform,rte=wpt -x nuketypes,waypoints -o gpx -F wpts-test5-rtpt.gpx
+```
+which differs from above command by the gpsbabel filter options
+
+* *-x transform,rte=wpt* : transform the (way-)points found in input to routepoints
+* *-x nuketypes,waypoints* : remove the waypoints from the output
+
+This will display in QMapShack as
+
+![import-rtpt-list.png](https://bitbucket.org/repo/L5qerE/images/2542930625-import-rtpt-list.png)
+
+and in the map as path of flight:
+
+![import-rtpt-map.jpg](https://bitbucket.org/repo/L5qerE/images/1051625912-import-rtpt-map.jpg)
+
+Call "Calculate route" to get:
+
+![import-rtpt-map-calc.jpg](https://bitbucket.org/repo/L5qerE/images/1950590911-import-rtpt-map-calc.jpg)
+
+Notice that the routepoints now have kept their labels, as opposed to their anonymous behavior when QMapShack derives routepoints from waypoints.
+
+As soon as you call "Edit Route", e.g. to move points, you get a warning 
+
+![edit-warning.png](https://bitbucket.org/repo/L5qerE/images/2327772757-edit-warning.png)
+
+If you continue, the edited route points now have lost their description.
+
+**kiozen: Keep in mind that once these issues are fixed this statement will be obsolete and misleading. And it's very likely that no one will take care of fixing the text. Therefore it's ok to mention and reference the issue once. But avoid hidden references like that.**
+
+This property is consistently transferred to the mobile GPS device.
+
+???#### screenshots from device ?? 
+not here, better in the issue case ########
+
+
+### Send Route to Device ###
+
+Save your project, plug your device and call "**send to device**" in the project context menu. Be aware that all objects in the project - waypoints, routes and tracks - are sent to the device. If this is not what you want, create a new project and copy only desired items into this. Send this project to the device, then.
+
+See here
+https://bitbucket.org/maproom/qmapshack/wiki/DocGisDevices
+for more infos about exchanging data with mobile GPS devices.
+
+### Gotchas and Tricks ###
+
+Be aware that your device presumably uses different maps, routing preferences and routing engine than QMapShack / routino does. While the routepoints are fixed by coordinates, the calculated route between them may differ significantly.
+
+One way to prevent this is to convert your route to a track and send this to your device. However, this is not flexible for rerouting if you deviate from your preplanned route for whatever reason and want to find back to it.
+
+You also may add addional waypoints to your route, using the "edit route" functionality. This let's you "nail down" your route to the desired pathway. Be sure to select "nails" as close to your target pathway as possible. Otherwise, your device might navigate you to artificial stepaways just to collect an imaginary flag. Some devices, e.g. the Garmin zumo motorcycle navigators, have a "skip next route point" function for this reason.
+
+You also may send waypoints as such to your device. However, many devices will add them to their list of favorites. So this may be clobbered with supplementary way points you are not permanently interested in.
+
+The best solution would be to share the same map, routing engine and routing preference setting between workstation and mobile device. Any reports on such solutions are welcome ... where? on the mailing list????
+- - -
+Prev () | [Home](Home) | [Manual](DocMain) | () Next
diff --git a/doc/playground/DocGisHowToSaveYourWork.md b/doc/playground/DocGisHowToSaveYourWork.md
new file mode 100644
index 0000000..c760071
--- /dev/null
+++ b/doc/playground/DocGisHowToSaveYourWork.md
@@ -0,0 +1,181 @@
+# How to save your work #
+
+*(pen-pen-ultimate version -  should be fine for me)*
+
+We suppose you want to keep your work save:
+
+* frequently save memory resident data to disk to provide against system (power, memory, hardware, software ...) failure
+* keep copies of your disk content to provide against media failure
+* keep different versions of your files to prevent against user mistakes
+
+You will have some system and strategies in place to do backup. You **want to know what, where, and when data is stored by QMapShack** to include this into your existing backup, and to know what to do in case of recovery.
+
+Basically, you have three distinct realms of storable work:
+
+* your maps, including the map view
+* your project files
+* your workspace
+
+# Maps and views #
+
+You don't edit maps in QMapShack. Maps are huge and may eat up lots of backup resources. They may be easily recovered from the internet. Enough reason for some special considerations regarding map backup.
+
+QMapShack reads its maps from the configured MapPaths.
+
+Recall the map organization:
+https://bitbucket.org/maproom/qmapshack/wiki/DocBasicsMapDem
+
+
+
+### Online maps ###
+
+The essential information to backup for online maps are their **definition files**. They are located in your configured MapPaths.
+
+If you installed your initial maps from the "I want maps" buttons, they are named
+
+
+```
+#!
+
+OpenCycleMap.tms  OpenStreetMap.tms  OSM_Topo.tms  WorldSat.wmts  WorldTopo.wmts
+
+```
+
+When browsing through maps, QMapShack maintains a local **tile cache**. This has limited life time and is automagically rebuilt if missing. It may contain some hundreds MB. Consider to exclude the tile cache from backup.
+
+Default location is
+
+```
+#!
+
+~/.QMapShack/
+```
+
+
+You can change the path of the tile cache via
+ *File -> Setup Map Paths* - 
+Directly at the top of the window ("Root path of the tile cache for online maps:").
+
+
+### Local Maps, DEMs and routing database ###
+
+... are usually are **huge** (easily some GB). They **will not change** while working with QMapShack. Thus you may consider them for special treatment on backup. 
+You may keep online maps and offline maps in different paths to ease this.
+
+### Map Views ###
+
+.. determine how your currently visible maps - including your visible data - are **displayed**. Recall https://bitbucket.org/maproom/qmapshack/wiki/DocControlMapDem
+
+The view is different and independent from your GIS data as organized in projects.
+
+QMapShack does not save a view by default. 
+The "File ->  Store Map View" and the "File ->  Load Map View" allow you to select specific locations. 
+
+It depends on your style of work, whether backing up views is worth any special consideration at all.
+
+
+# Your Projects #
+
+The **project** is the place **where your own personal data** - basically in the form of waypoints, tracks and routes - **lives in**. Presumably this will be the data you really want to take care of.
+
+In terms of storage, projects may be implemented as:
+
+* qms files, the QMapShack internal format
+* gpx files, the most common format for exchanging GIS Data 
+* in databases,
+* on the storage of your satnav device 
+
+
+###Backup of single project files###
+
+See here https://bitbucket.org/maproom/qmapshack/wiki/DocHandleGpxFiles for further details on the handling of GIS files.
+
+For both .gpx and .qms files, there is a **1:1 relation between project and file**. This keeps backup procedures simple and straightforward. However, it leaves you the responsibility to keep your data in sync  between different projects=files if you roll back to a different version of your work.
+
+There is one important difference between .qms an .gpx files with regard to backup: The **.qms format** includes object history and **allows a roll back of changes** on a per object basis. This feature is not available in gpx files, because it would break the main purpose of **gpx**, it's **exchangeability**: there is simply no standard in the gpx definitions for rollback histories. 
+
+So, if you want to combine the advantage of both worlds, save your work in a qms "master copy" (or in a database) and only produce gmx files for the sake of exchange. In the right-click context menu of the project, there is a "**save as...**" dialogue which allows you **to switch** between **.gpx** and **.qms** format for this purpose. 
+
+###Backup of databases###
+
+Databases are, like qms files, a  QMapShack internal format not supposed to be disassembled by the causal end user.
+See here https://bitbucket.org/maproom/qmapshack/wiki/DocGisDatabase for more on databases.
+
+In a database, multiple projects are stored in one database file. So if you backup versions of this database, all the projects within will be restored in a consistent way, if you switch to an earlier version. This means on the other hand, that you cannot easily roll back selectively. To do so, you have to open both old and new version and manually copy selected content between them as desired.
+
+###Data on mobile device###
+
+Don't consider your mobile satnav device as a sure location for backup, even if it looks like a memory stick when you plug it into your workstation. 
+
+*(The following is derived from tests with singular GARMIN nuvi and zumo units. File system organization differs not only between manufacturers, but also between device series and models. Your **milegae** may vary.**WHAT DO YOU MEAN BY THAT?**)*
+
+In the directory tree of a plugged Garmin device, you find the **directory "GPX"** similar to this:
+
+![wiki-garmin.png](https://bitbucket.org/repo/L5qerE/images/2180082863-wiki-garmin.png)
+
+This contains most information on your device as it refers to QMapShack projects. You may frequently copy them to your Workstation and include it into your backup scheme. The gpx files can be opened as QMapShack projects or any other compatible application.
+
+We do **not recommend to write directly onto the device** using file level access, unless you do not know what to do. Enjoy the great work the QMS programmers have delivered and **use QMapShack device access** functionality instead. There are quite some items in a GPX file that the standard allows but may upset your device. You have been warned.
+
+See here https://bitbucket.org/maproom/qmapshack/wiki/DocGisDevices for further information on device access.
+
+We also do not discuss the other directories, as they are not immediately related to QMS work. There is a plethora of forum entries around, full of tips and good and bad experiences. Good luck trying!
+
+There is one important thing to mention on mass storage devices: The **risk of premature plugoff** . In other applications, data may still reside in **write cache** RAM only, while the app is displaying successful writing. In Linux, you have to unmount a device, in WIN, you call "safe remove" to make sure the write cache is synced to the device.
+
+To avoid this, QMapShack implements its own handling of device mounting.
+*If you access a device via the icon in the workspace QMapShack will take care about mounting and unmounting the device. Simply plugin the device and wait until QMapShack recognized it. The device is unmounted **unless** QMapShack is actively reading/writing it (**Cursor is an hourglass**). Once done **you can unplug** the device without any further action.* 
+
+This automounting of QMapShack may interfere with your OS mounting behavior and produce some warning. But following above rule, you should be on the safe side and not loose any data. If not, its time to file a bug.
+
+
+
+# Your Workspace #
+
+The workspace is the place where QMapShack keeps your actions **while you are working** with it. This is distinct from the concept of project files, where your data conceptually resides before you begin after you are done.
+
+
+Data in your file based projects is only stored in your files if you select "save" in the project file line's context menu.
+
+
+If you make any changes to any object (as shown here 
+https://bitbucket.org/maproom/qmapshack/wiki/DocGisItemsEditMultiple 
+in detail), both your edited object and the project it belongs to is marked by an asterisk * in the Data Window with the project tree:
+
+![wiki-projtree.png](https://bitbucket.org/repo/L5qerE/images/4285409798-wiki-projtree.png)
+
+This asterisk indicate you that your current changes are not yet written to save storage. At least not yet to the final place in the project file they belong to.
+
+The good news: there is an periodic **autosave feature** for all these pending changes in your workspace. You can configure it by the menu path **"Project -> setup Workspace"** which gives you:
+
+![wiki-setupws.png](https://bitbucket.org/repo/L5qerE/images/4061261758-wiki-setupws.png)
+
+Your workspace is also saved upon clear exit of QMapShack, so all your changes you made are still available after a restart. Thus you can still continue editing, roll back to an earlier stage and/or safe your data objects finally to the project file they are supposed to belong to.
+
+But beware - your very last changes are lost after some crash of QMapShack. There is no way to manually trigger the saving of the workspace. So if you think five minutes is too risky on your system, or for your style of work, you may decrease the value. 
+
+It is not intended that users play around with the stored workspace. 
+So, if we provide the path here ( ~/.config/QLandkarte/ on linux systems) , this is only for backup purposes.
+If you need instantaneous save or consistent roll back, use one of the concepts outlined above.
+
+### Workflow for Database based items ###
+
+The workflow for database based items is as follows:
+You load any project from the database by activating the associated tickbox in the database window.
+
+
+![wiki-db.png](https://bitbucket.org/repo/L5qerE/images/1993398614-wiki-db.png)
+
+Thus, it's folder is opened as a project in 
+the workspace with the item attached. The project name is qualified by  @, followed by the parent folder in the database.
+
+ If you edit the item you will see the 
+asterisk that it has been changed - as for file based items. If you save the project, the item will be 
+changed in the database.
+
+
+The sync. function is to update your workspace if someone else is changing 
+items on another instance of QMapShack. This includes saving local changes and 
+reloading all items in the workspace. On a conflict the user is asked which 
+version to keep.
+
diff --git a/doc/playground/DocUseCaseMotorcycleNavigation.md b/doc/playground/DocUseCaseMotorcycleNavigation.md
new file mode 100644
index 0000000..5fb006d
--- /dev/null
+++ b/doc/playground/DocUseCaseMotorcycleNavigation.md
@@ -0,0 +1,168 @@
+# This is just a stub / test dummy and not yet ready for public linkage. #
+
+# Peculiarities of Motorcycle Navigation #
+
+As it appears, motorcycle navigation demands some special requirements, so that all those major manufacturers of satnav navigation devices even offer special product series. Beyond ruggedized design and glove optimized handling, there are special features like navigating along tracks, preference for curvy roads or skipping of intermediary route points.
+
+**They way is the goal**. This implies some special approach for trip planning, which obviously is not present in this combination in other GIS related situations:
+
+* extensive share of trip data with third parties (friends, other planning tools, web hosted trips)
+* maps with indication of "scenicness"
+* repeated replanning of trips already engaged
+* fast replanning while driving on the satnav device
+* refinding your tour (not some arbitrary waypoint) after deviation
+* ....
+
+
+The common trick to force your satnav device to stick to your preplanned route instead of guiding you away from the scenic river valley to the close by highway is to add a number of arbitrary **dummy waypoints**: Addresses you do not really want to visit, but keep your satnav to stick to your preferences, not the one the programmer implemented. Let's call this trick to **nail down** your route.
+
+For sake of example, let me report some encounters of my last tour I pre-planned with QMapShack and engaged with the route downloaded to a Garmin zumo 390LM (one of those dedicated motorcycle satnav gadgets).
+
+
+Some supplemental waypoints I added to "nail down" a route to my desires where some dozen meters beneath the road. If you realize it during driving, you have to pass it by and then manually call "skip route point" (a feature I desperately missed on my car satnav I used before) to avoid your satnav insisting to "turn back". Not nice during driving curvy roads, but still better than a complete loss of navigation assistance.
+
+![wiki-fl.jpg](https://bitbucket.org/repo/L5qerE/images/2580338973-wiki-fl.jpg)
+
+If you do not realize that you just hunt a dummy nail, you may enter some residential area, city center or some highway junction just to be told that you can turn now: *have come far but what am I doing here?* :-((( . So, carefully adjusting your "trip nails" close to your route is tantamount. 
+
+![wiki-kc.jpg](https://bitbucket.org/repo/L5qerE/images/1500573576-wiki-kc.jpg)
+![wiki-bf.jpg](https://bitbucket.org/repo/L5qerE/images/3741804599-wiki-bf.jpg)
+
+One road that was both included by QMapShack backend routino and by Garmins zumo I found decorated by the infamous "closed for cars and motorcycles". (Yes, I know, OSM is a community endeavor, too. Put on my todo list).
+
+![wiki-ol.jpg](https://bitbucket.org/repo/L5qerE/images/3337226930-wiki-ol.jpg)
+
+Pretending to be the nice guy, I passed by and found myself on a highway that led me to miss one of the most interesting pieces of river valley in the journey I'd planned. Presumably there had been an alternative to my sceny track back (yellow road between the blue plan and the magenta track), but you won't find that in heavy traffic when you are just entering a highway, nearly naked between 40-ton-trucks. Never mind: nice reason to ride there again :-) . After the trip is before the trip. 
+
+![wiki-or.jpg](https://bitbucket.org/repo/L5qerE/images/2715376200-wiki-or.jpg)
+
+At some other junction, my eyes found a sideway that promised an even more scenic trip into the mountains than the river valley that I had planned with my eyes on the map only. Great - just turn and enjoy the nüvis functionality to reroute me back to my preplanned tour on other curvy roads. This nice deviation is registered in my track log and available for future planning.
+
+![wiki-lk.jpg](https://bitbucket.org/repo/L5qerE/images/1078212255-wiki-lk.jpg)
+
+When you use differend maps and/or different routing engines and/or different routing preferences, your plan in the workstation might nevertheless show differences from the one your satnav displays on the trip:
+
+![wiki-sk.jpg](https://bitbucket.org/repo/L5qerE/images/3193648309-wiki-sk.jpg)
+![wiki-eg.jpg](https://bitbucket.org/repo/L5qerE/images/2078719396-wiki-eg.jpg)
+
+This is where you learn to appreciate the "prefer curvy roads" option of the zümo. At least, as long as the curves are not located in the middle of some industrial area.
+
+#Why QMapShack?#
+
+##Glimpse on the GIS software Field##
+This is not a thourough overview if GIS software for linux, just my own personal experience.
+Being a farmer by profession, I have used **qgis** since about 5 years now to assist the ever growing documentation needs of work in the field. I have a small matchbox sized **BT747 GPS logger** I can carry with me on the tractor. At home, I can import the tracks into qgis and reconstruct the partitioning of my fields for different crops. While I'd consider qgis much more elaborate and mature than QMapShack, it is in many cases much more tedious, overcrowded, and slow - not to say *bloat [...]
+
+Maintaining a collection of trip records may become a source of chaos over time.
+A Tool for a quick preview of shape and location of track might be of great assistance for sorting.
+On my old SuSE 11 workstation, I misused **josm** - the OSM map edit tool - for this purpose. While it is quite slow due to its java architecture and a lot features of which I do not even know the purpose, it was still faster as the qgis track conversion procedure. I used it for opening tracks on a OSM or Satellite image background - just to get an idea what is in the track when organizing them.
+
+Some day I stuck my BT747 into the pocket to carry it along what should become a nice motorcycle trip. Reading the trip into josm and dreaming of what I might change the next time I'd ride into those areas became the beginning of what is documented right here.
+
+On my new debian, I found **marble** as a much better tool for fast preview of tracks (and other GPS data files). It is even preregistered as standard application for gpx files and fires up within seconds, when I click on it in my file manager. Ah, marble is part of KDE, I see. While in some instances targeting similar use cases as QMapShack, I did not dig deeper into it. Well - I had preplanned a tour using the address search capability I was (then) still missing in QMapShack. I had to  [...]
+
+Garmin, one of the major satnav device manufacturers, offers a product called **BaseCamp**. As the name suggests, it is targeted precisely to planing and replanning trips which are then guided by one of its devices "out there in the wild". Consequently, what is called a "project" in QMapShack, is labeled an "adventure" in BaseCamp. Of course, it offers a good integration with its own satnav gadgets. The main disadvantage for me: it only runs on WIN$. Becoming fed up with the latter in th [...]
+
+Googling for "BaseCamp wine", I found many reports of failure - and a pointer to **QLandkarteGT**, and from the last ones web page a Pointer to its successor QMapShack. So I started to explore QMapShack considering it as the open source / linux alternative to Garmins BaseCamp. Haven't even tried "wine BaseCamp" yet.
+
+Last but not least, there is one tool you should know whenever you face tasks of integrating GPS data from different sources and formats: **gpsbabel** . I call it the "GPS swiss army knife". It is "just" a command line tool, hence a very versatile and powerful one, if it comes to manipulate GPS/GIS data and convert them between different file formats. Maybe there is some GUI wrapper for gpsbabel out there, but to my experience, such things just add a layer of obfuscation.
+
+
+
+
+##Features of QMapShack I learned to appreciate##
+* Really fast performance when zooming in and out
+even with multiple maps
+* DEM, Topo maps, bicycle maps, Sat images for estimation the "scenicity" of a tour
+* Offline OSM and offline DEM
+* Offline router routino
+* possibility to build all on a single data source OSM
+(well, there may be some time lags if we used prefabricated sources as recommended in Manual
+
+* Routing
+* GPX import and export (haven't yet tested other formats)
+* Handle many GPX projects simultaneously
+* workable Garmin device integration (no access to test other brands)
+
+## downsides##
+To me, QMapShack appears to be a project of rapid development. Why this is good news if it comes to features and quality we can expect, we see that documentation does not catch up. For example, recently I asked in QMS issue list for some functionality that might resemble some basic route planning features, as (still to be) described below. Surprise: route planning support is available and works fine, but simply is not yet documented. I agree, another candidate for my ToDo list.
+
+Of course, rapidly growing projects also display some higher risk of regression bugs. I encountered a segfault issue in the routino part - a really great and performant routing engine - which is integrated in QMS. I only received defending comments from the programmers when reporting this issue. In mature projects, you always find some people doing the boring job of quality assurance. In QMS, all good people still seem to fight at the frontier of innovation. However, QMS at least took th [...]
+
+Look, feel and features may severely change in future releases. I would not dare to rely on QMapShack in "mission critical" professional applications, as long as you do not feel confident to be able to grab into the nuts and bolts of the source code on your own responsibility.
+
+However
+
+.... route point labels missing ????....
+well this happened on the nüvi with BaseCamp as well 
+maybe the problem is located between chair and keyboard?
+
+
+#Geopatial data#
+
+
+
+##Geospatial entities: Tracks, Routes, Waypoints##
+
+##Some Words on data formats##
+
+### sources of track data ###
+
+breadcrumb
+
+I have a bunch of GPS mice laying around from a 
+NMEA ... collection with a raspi ... gpsbabel -> gpx 
+Logger
+Mobile apps (most mobiles have built in GPS -
+reportedly bad accuracy - no systematic tests yet
+
+Import from other route planners, 
+Trips from Friends
+
+
+
+
+
+# Working with QMapShack #
+## Installation ##
+### Configuring maps, DEM and routino ###
+### Configuring maps, DEM and routino ###
+### Configuring maps, DEM and routino ###
+
+
+
+### Planning routes ###
+### Importing tracks ###
+### Exchanging data with the Garmin nüvi ###
+## Some additional helper scripts ##
+##gpsbabel##
+
+#Further plans#
+
+##Inverse routing##
+
+
+
+rationale .... 
+status quo
+link to code snippet 
+
+
+
+
+## Geotagged Videos ##
+I donsider it a great idea to record a video during driving along with the track coordinates.
+Many car dashboard cams do this, but I did not yet find a ruggedized one for motorcycle mounting.
+Recently, I got a ruggedized "action cam" with GPS receiver included. 
+Sadly, first test where disappointing: huge files, small memory, small battery, 30 min recording max.
+Not suited for a trip.
+
+Calls for some DIY, e.g. on a raspberry. There I could record cam and GPS from independent sources and perform image / video extraction matching to my needs, not to some GoPro-cloning marketing geek.
+My Idea were to record low quality video at say 30 fps, and additionally extract high quality images at say 1 fps or so.
+
+Unfortunately, most players for geotagged video playing is for WIN$ only.
+I could not get one to work on my old SuSE 11.0 those days. I got a WIN Laptop now, and a recent debian jessie on the workstation. Time to try again.
+
+And it would be great to display a combined view of track on map, video, images and track profile synchronized in the web, I haven't found any player yet. Pointers were welcome.
+
+Nice-Stuff-ToDo list growing still longer....
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dd7590d..cfd9893 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -188,6 +188,7 @@ set( SRCS
         gis/db/CLostFoundProject.cpp
         gis/db/CSelectSaveAction.cpp
         gis/db/CSelectDBFolder.cpp
+        gis/db/CSearchDatabase.cpp
         gis/search/CSearchGoogle.cpp
         gis/wpt/CGisItemWpt.cpp
         gis/wpt/CScrOptWpt.cpp
@@ -200,7 +201,6 @@ set( SRCS
         gis/trk/CDetailsTrk.cpp
         gis/trk/CCombineTrk.cpp
         gis/trk/CCutTrk.cpp
-        gis/trk/CSelectActivity.cpp
         gis/trk/CSelectActivityColor.cpp
         gis/trk/CActivityTrk.cpp
         gis/trk/CPropertyTrk.cpp
@@ -448,6 +448,7 @@ set( HDRS
         gis/db/CLostFoundProject.h
         gis/db/CSelectSaveAction.h
         gis/db/CSelectDBFolder.h
+        gis/db/CSearchDatabase.h
         gis/wpt/CGisItemWpt.h
         gis/wpt/CScrOptWpt.h
         gis/wpt/CDetailsWpt.h
@@ -459,7 +460,6 @@ set( HDRS
         gis/trk/CDetailsTrk.h
         gis/trk/CCombineTrk.h
         gis/trk/CCutTrk.h
-        gis/trk/CSelectActivity.h
         gis/trk/CSelectActivityColor.h
         gis/trk/CActivityTrk.h
         gis/trk/CPropertyTrk.h
@@ -611,6 +611,7 @@ set( UIS
     gis/db/ISetupFolder.ui
     gis/db/ISelectSaveAction.ui
     gis/db/ISelectDBFolder.ui
+    gis/db/ISearchDatabase.ui
     gis/wpt/IScrOptWpt.ui
     gis/wpt/IDetailsWpt.ui
     gis/wpt/IDetailsGeoCache.ui
@@ -620,7 +621,6 @@ set( UIS
     gis/trk/IDetailsTrk.ui
     gis/trk/ICombineTrk.ui
     gis/trk/ICutTrk.ui
-    gis/trk/ISelectActivity.ui
     gis/trk/ISelectActivityColor.ui
     gis/trk/filter/IFilterDouglasPeuker.ui
     gis/trk/filter/IFilterInvalid.ui
diff --git a/src/gis/CGisListDB.cpp b/src/gis/CGisListDB.cpp
index d5f17aa..1d22bd3 100644
--- a/src/gis/CGisListDB.cpp
+++ b/src/gis/CGisListDB.cpp
@@ -25,6 +25,8 @@
 #include "gis/db/CDBFolderMysql.h"
 #include "gis/db/CDBFolderSqlite.h"
 #include "gis/db/CDBItem.h"
+#include "gis/db/CSearchDatabase.h"
+#include "gis/db/CSelectDBFolder.h"
 #include "gis/db/CSetupDatabase.h"
 #include "gis/db/CSetupFolder.h"
 #include "gis/db/macros.h"
@@ -43,7 +45,7 @@ public:
         {
             CCanvas::setOverrideCursor(Qt::WaitCursor, "CGisListDBEditLock: " + src);
         }
-        widget->isInternalEdit += 1;
+        widget->isInternalEdit++;
     }
     ~CGisListDBEditLock()
     {
@@ -51,7 +53,7 @@ public:
         {
             CCanvas::restoreOverrideCursor("~CGisListDBEditLock: " + src);
         }
-        widget->isInternalEdit -= 1;
+        widget->isInternalEdit--;
     }
 private:
     CGisListDB * widget;
@@ -116,6 +118,9 @@ CGisListDB::CGisListDB(QWidget *parent)
 
     menuFolder          = new QMenu(this);
     actionAddFolder     = menuFolder->addAction(QIcon("://icons/32x32/Add.png"), tr("Add Folder"), this, SLOT(slotAddFolder()));
+    actionRenameFolder  = menuFolder->addAction(QIcon("://icons/32x32/A.png"), tr("Rename Folder"), this, SLOT(slotRenameFolder()));
+    actionCopyFolder    = menuFolder->addAction(QIcon("://icons/32x32/Copy.png"), tr("Copy Folder"), this, SLOT(slotCopyFolder()));
+    actionMoveFolder    = menuFolder->addAction(QIcon("://icons/32x32/Move.png"), tr("Move Folder"), this, SLOT(slotMoveFolder()));
     actionDelFolder     = menuFolder->addAction(QIcon("://icons/32x32/DeleteOne.png"), tr("Delete Folder"), this, SLOT(slotDelFolder()));
 
     menuItem            = new QMenu(this);
@@ -123,6 +128,7 @@ CGisListDB::CGisListDB(QWidget *parent)
 
     menuDatabase        = new QMenu(this);
     menuDatabase->addAction(actionAddFolder);
+    actionSearch        = menuDatabase->addAction(QIcon("://icons/32x32/Zoom.png"), tr("Search Database"), this, SLOT(slotSearchDatabase()));
     actionUpdate        = menuDatabase->addAction(QIcon("://icons/32x32/DatabaseSync.png"), tr("Sync. with Database"), this, SLOT(slotUpdateDatabase()));
     actionDelDatabase   = menuDatabase->addAction(QIcon("://icons/32x32/DeleteOne.png"), tr("Remove Database"), this, SLOT(slotDelDatabase()));
 
@@ -132,7 +138,6 @@ CGisListDB::CGisListDB(QWidget *parent)
     menuLostFoundItem       = new QMenu(this);
     actionDelLostFoundItem  = menuLostFoundItem->addAction(QIcon("://icons/32x32/DeleteOne.png"), tr("Delete Item"), this, SLOT(slotDelLostFoundItem()));
 
-
     connect(this, &CGisListDB::customContextMenuRequested, this, &CGisListDB::slotContextMenu);
     connect(this, &CGisListDB::itemExpanded,               this, &CGisListDB::slotItemExpanded);
     connect(this, &CGisListDB::itemChanged,                this, &CGisListDB::slotItemChanged);
@@ -243,6 +248,11 @@ bool CGisListDB::hasDatabase(const QString& name)
 
 bool CGisListDB::event(QEvent * e)
 {
+    if(!dlgSearch.isNull())
+    {
+        dlgSearch->event(e);
+    }
+
     switch(e->type())
     {
     case eEvtW2DAckInfo:
@@ -322,6 +332,7 @@ void CGisListDB::slotContextMenu(const QPoint& point)
         bool enabled = database->getDb().isOpen();
         actionUpdate->setEnabled(enabled);
         actionAddFolder->setEnabled(enabled);
+        actionSearch->setEnabled(enabled);
 
         menuDatabase->exec(p);
 
@@ -338,6 +349,8 @@ void CGisListDB::slotContextMenu(const QPoint& point)
     IDBFolder * folder = dynamic_cast<IDBFolder*>(currentItem());
     if(folder)
     {
+        bool isGroupFolder = folder->type() == IDBFolder::eTypeGroup;
+        actionRenameFolder->setVisible(isGroupFolder);
         menuFolder->exec(p);
         return;
     }
@@ -474,22 +487,249 @@ void CGisListDB::slotDelFolder()
         return;
     }
 
-    int res = QMessageBox::question(this, tr("Delete database folder..."), tr("Are you sure you want to delete \"%1\" from the database?").arg(folder->text(1)), QMessageBox::Ok|QMessageBox::No);
+    IDBFolderSql * dbfolder = folder->getDBFolder();
+    if(dbfolder == nullptr)
+    {
+        return;
+    }
+
+    int res = QMessageBox::question(this, tr("Delete database folder..."), tr("Are you sure you want to delete selected folders and all subfolders from the database?"), QMessageBox::Ok|QMessageBox::No);
     if(res != QMessageBox::Ok)
     {
         return;
     }
 
+    QList<QTreeWidgetItem*> itemsToDelete;
+    QList<QTreeWidgetItem*> items = selectedItems();
+    for(QTreeWidgetItem * item : items)
+    {
+        // only pick the project/other folders to copy
+        folder = dynamic_cast<IDBFolder*>(item);
+        if((folder == nullptr) || (folder->type() < IDBFolder::eTypeGroup))
+        {
+            continue;
+        }
+
+
+        folder->remove();
+        // Because some items can be parent of other selected items
+        // it's a bad idea to delete them asap. Better collect them first.
+        itemsToDelete << folder;
+    }
+
+    // iterate over all items to be deleted.
+    for(QTreeWidgetItem * item : itemsToDelete)
+    {
+        // Test if the item's parent is also in the list.
+        // If it is skip it because it will be deleted together with it's parent.
+        if(itemsToDelete.contains(item->parent()))
+        {
+            continue;
+        }
+
+        delete item;
+    }
+
+    dbfolder->updateLostFound();
+    dbfolder->announceChange();
+}
+
+void CGisListDB::slotCopyFolder()
+{
+    CGisListDBEditLock lock(false, this, "slotCopyFolder");
+
+    // no way to continue if the current item is not a folder (we need the database it is attached to)
+    IDBFolder * folder = dynamic_cast<IDBFolder*>(currentItem());
+    if(folder == nullptr)
+    {
+        return;
+    }
+
+    // get the database the folder is attached to
     IDBFolderSql * dbfolder = folder->getDBFolder();
+    if(dbfolder == nullptr)
+    {
+        return;
+    }
 
-    folder->remove();
-    delete folder;
+    // next we need to get the target folder
+    // NOTE: By pre-setting db and host, we limit the selection to the current database
+    quint64 idTarget    = 0;
+    QString db          = folder->getDBName();
+    QString host        = folder->getDBHost();
 
-    if(dbfolder)
+    CSelectDBFolder dlg(idTarget, db, host, this);
+    if(dlg.exec() == QDialog::Rejected)
     {
-        dbfolder->updateLostFound();
-        dbfolder->announceChange();
+        return;
+    }
+
+    // get a pointer to the parent folder for later use.
+    IDBFolder * target = dbfolder->getFolder(idTarget);
+    if(target == nullptr)
+    {
+        return;
+    }
+
+    // --- at this point we should have all data to perform the copy without interruption ---
+
+    // now iterate over all selected items
+    QList<QTreeWidgetItem*> items = selectedItems();
+    for(QTreeWidgetItem * item : items)
+    {
+        // only pick the project/other folders to copy
+        folder = dynamic_cast<IDBFolder*>(item);
+        if((folder == nullptr) || (folder->type() < IDBFolder::eTypeGroup))
+        {
+            continue;
+        }
+
+        IDBFolder * parent = dynamic_cast<IDBFolder*>(folder->parent());
+        if((parent == nullptr) || (parent->getId() == idTarget) || (folder->getId() == idTarget))
+        {
+            // skip operation if the current parent is the same as the traget parent
+            continue;
+        }
+
+
+        dbfolder->copyFolder(folder->getId(), idTarget);
+    }
+
+    // tell the parent folder to show all changes
+    target->update();
+    // tell other clients to show changes
+    dbfolder->announceChange();
+}
+
+void CGisListDB::slotMoveFolder()
+{
+    CGisListDBEditLock lock(false, this, "slotMoveFolder");
+
+    // no way to continue if the current item is not a folder (we need the database it is attached to)
+    IDBFolder * folder = dynamic_cast<IDBFolder*>(currentItem());
+    if(folder == nullptr)
+    {
+        return;
+    }
+
+    // get the database the folder is attached to
+    IDBFolderSql * dbfolder = folder->getDBFolder();
+    if(dbfolder == nullptr)
+    {
+        return;
+    }
+
+    // next we need to get the target folder
+    // NOTE: By pre-setting db and host, we limit the selection to the current database
+    quint64 idTarget    = 0;
+    QString db          = folder->getDBName();
+    QString host        = folder->getDBHost();
+
+    CSelectDBFolder dlg(idTarget, db, host, this);
+    if(dlg.exec() == QDialog::Rejected)
+    {
+        return;
+    }
+
+    // get a pointer to the parent folder for later use.
+    IDBFolder * target = dbfolder->getFolder(idTarget);
+    if(target == nullptr)
+    {
+        return;
+    }
+
+    // --- at this point we should have all data to perform the copy without interruption ---
+
+    // now iterate over all selected items
+    QList<IDBFolder*> foldersToDelete;
+    QList<QTreeWidgetItem*> items = selectedItems();
+    for(QTreeWidgetItem * item : items)
+    {
+        // only pick the project/other folders to copy
+        folder = dynamic_cast<IDBFolder*>(item);
+        if((folder == nullptr) || (folder->type() < IDBFolder::eTypeGroup))
+        {
+            continue;
+        }
+
+        IDBFolder * parent = dynamic_cast<IDBFolder*>(folder->parent());
+        if((parent == nullptr) || (parent->getId() == idTarget))
+        {
+            // skip operation if the current parent is the same as the traget parent
+            continue;
+        }
+
+        if(target->isSiblingFrom(folder))
+        {
+            QMessageBox::warning(this, tr("Bad operation...."), tr("The target folder is a subfolder of the one to move. This will not work."), QMessageBox::Abort);
+            continue;
+        }
+
+        // copy to new loacation
+        dbfolder->copyFolder(folder->getId(), idTarget);
+        // Because some items can be parent of other selected items
+        // it's a bad idea to delete them asap. Better collect them first.
+        foldersToDelete << folder;
+    }
+
+    // iterate over all items to be deleted.
+    for(IDBFolder * folder : foldersToDelete)
+    {
+        // Test if the item's parent is also in the list.
+        // If it is skip it because it will be deleted together with it's parent.
+        if(foldersToDelete.contains(dynamic_cast<IDBFolder*>(folder->parent())))
+        {
+            continue;
+        }
+
+        folder->remove();
+        delete folder;
     }
+
+    // tell the parent folder to show all changes
+    target->update();
+    // tell other clients to show changes
+    dbfolder->announceChange();
+}
+
+void CGisListDB::slotRenameFolder()
+{
+    CGisListDBEditLock lock(false, this, "slotRenameFolder");
+
+    IDBFolder * folder = dynamic_cast<IDBFolder*>(currentItem());
+    if(folder == nullptr)
+    {
+        return;
+    }
+
+    // get the database the folder is attached to
+    IDBFolderSql * dbfolder = folder->getDBFolder();
+    if(dbfolder == nullptr)
+    {
+        return;
+    }
+
+    QList<QTreeWidgetItem*> items = selectedItems();
+    for(QTreeWidgetItem * item : items)
+    {
+        folder = dynamic_cast<IDBFolder*>(item);
+        if((folder == nullptr) || (folder->type() != IDBFolder::eTypeGroup))
+        {
+            continue;
+        }
+
+
+        QString name1 = folder->getName();
+        QString name2 = QInputDialog::getText(this, tr("Folder name..."), tr("Rename folder:"), QLineEdit::Normal, name1);
+
+        if(!name2.isEmpty() && (name1 != name2))
+        {
+            folder->setName(name2);
+        }
+    }
+
+    // tell other clients to show changes
+    dbfolder->announceChange();
 }
 
 void CGisListDB::slotDelLostFound()
@@ -701,6 +941,24 @@ void CGisListDB::slotUpdateDatabase()
     }
 }
 
+void CGisListDB::slotSearchDatabase()
+{
+    CGisListDBEditLock lock(false, this, "slotSearchDatabase");
+
+    IDBFolder * db = dynamic_cast<IDBFolder*>(currentItem());
+    if(db == nullptr)
+    {
+        return;
+    }
+
+    isInternalEdit--;
+    dlgSearch = new CSearchDatabase(*db,this);
+    connect(dlgSearch.data(), &CSearchDatabase::sigItemChanged, this, &CGisListDB::slotItemChanged);
+    dlgSearch->exec();
+    delete dlgSearch;
+    isInternalEdit++;
+}
+
 
 void CGisListDB::slotReadyRead()
 {
diff --git a/src/gis/CGisListDB.h b/src/gis/CGisListDB.h
index 1d108a6..c0d1957 100644
--- a/src/gis/CGisListDB.h
+++ b/src/gis/CGisListDB.h
@@ -19,6 +19,7 @@
 #ifndef CGISLISTDB_H
 #define CGISLISTDB_H
 
+#include <QPointer>
 #include <QSqlDatabase>
 #include <QTreeWidget>
 
@@ -26,6 +27,7 @@ struct action_t;
 class QMenu;
 class IDBFolderSql;
 class QUdpSocket;
+class CSearchDatabase;
 
 class CGisListDB : public QTreeWidget
 {
@@ -59,6 +61,10 @@ private slots:
     void slotDelDatabase();
     void slotDelItem();
     void slotUpdateDatabase();
+    void slotSearchDatabase();
+    void slotRenameFolder();
+    void slotCopyFolder();
+    void slotMoveFolder();
 
     void slotReadyRead();
 
@@ -75,11 +81,15 @@ private:
 
     QMenu * menuFolder;
     QAction * actionAddFolder;
+    QAction * actionRenameFolder;
+    QAction * actionCopyFolder;
+    QAction * actionMoveFolder;
     QAction * actionDelFolder;
 
     QMenu * menuDatabase;
     QAction * actionDelDatabase;
     QAction * actionUpdate;
+    QAction * actionSearch;
 
     QMenu * menuItem;
     QAction * actionDelItem;
@@ -93,6 +103,8 @@ private:
     QUdpSocket * socket;
 
     quint32 lastTan;
+
+    QPointer<CSearchDatabase> dlgSearch;
 };
 
 #endif //CGISLISTDB_H
diff --git a/src/gis/CGisListWks.cpp b/src/gis/CGisListWks.cpp
index ba6c152..83d850c 100644
--- a/src/gis/CGisListWks.cpp
+++ b/src/gis/CGisListWks.cpp
@@ -96,9 +96,17 @@ CGisListWks::CGisListWks(QWidget *parent)
 
     menuProjectWks   = new QMenu(this);
     actionEditPrj    = menuProjectWks->addAction(QIcon("://icons/32x32/EditDetails.png"), tr("Edit.."         ), this, SLOT(slotEditPrj()));
+    actionCopyPrj    = menuProjectWks->addAction(QIcon("://icons/32x32/Copy.png"       ), tr("Copy to..."     ), this, SLOT(slotCopyProject()));
     actionShowOnMap  = menuProjectWks->addAction(QIcon("://icons/32x32/ShowAll.png"    ), tr("Show on Map"    ), this, SLOT(slotShowOnMap()));
     actionHideFrMap  = menuProjectWks->addAction(QIcon("://icons/32x32/ShowNone.png"   ), tr("Hide from Map"  ), this, SLOT(slotHideFrMap()));
 
+
+    menuProjectWks->addSeparator();
+    actionGroup = new QActionGroup(menuProjectWks);
+    actionGroup->setExclusive(true);
+    actionSortByTime = addSortAction(menuProjectWks, actionGroup, "://icons/32x32/Time.png", tr("Sort by Time"), IGisProject::eSortFolderTime);
+    actionSortByName = addSortAction(menuProjectWks, actionGroup, "://icons/32x32/SortName.png", tr("Sort by Name"), IGisProject::eSortFolderName);
+
     menuProjectWks->addSeparator();
     actionSave       = menuProjectWks->addAction(QIcon("://icons/32x32/SaveGIS.png"    ), tr("Save"           ), this, SLOT(slotSaveProject()));
     actionSaveAs     = menuProjectWks->addAction(QIcon("://icons/32x32/SaveGISAs.png"  ), tr("Save As..."     ), this, SLOT(slotSaveAsProject()));
@@ -112,11 +120,10 @@ CGisListWks::CGisListWks(QWidget *parent)
 
     menuProjectDev  = new QMenu(this);
     menuProjectDev->addAction(actionEditPrj);
+    menuProjectDev->addAction(actionCopyPrj);
     menuProjectDev->addAction(actionShowOnMap);
     menuProjectDev->addAction(actionHideFrMap);
     menuProjectDev->addSeparator();
-    menuProjectDev->addAction(actionSaveAs);
-    menuProjectDev->addAction(actionSave);
     menuProjectDev->addSeparator();
     actionSyncDevWks= menuProjectDev->addAction(QIcon("://icons/32x32/Device.png"),tr("Update Project on Device"), this, SLOT(slotSyncDevWks()));
     menuProjectDev->addSeparator();
@@ -334,6 +341,19 @@ void CGisListWks::setExternalMenu(QMenu * project)
     connect(CMainWindow::self().findChild<QAction*>("actionSearchGoogle"),     &QAction::triggered, this, &CGisListWks::slotSearchGoogle);
 }
 
+QAction * CGisListWks::addSortAction(QMenu * menu, QActionGroup * actionGroup, const QString& icon, const QString& text, IGisProject::sorting_folder_e mode)
+{
+    QAction * action = menu->addAction(QIcon(icon), text);
+    action->setCheckable(true);
+
+    auto func = bind(&CGisListWks::slotSetSortMode, this, mode, std::placeholders::_1);
+    connect(action, &QAction::toggled, this, func);
+
+    actionGroup->addAction(action);
+
+    return action;
+}
+
 void CGisListWks::dragMoveEvent(QDragMoveEvent  * e )
 {
     CGisListWksEditLock lock(true, IGisItem::mutexItems);
@@ -940,6 +960,7 @@ void CGisListWks::slotContextMenu(const QPoint& point)
             }
             else
             {
+                actionGroup->setEnabled(false);
                 actionSyncWksDev->setEnabled(IDevice::count());
                 actionSyncDB->setEnabled(project->getType() == IGisProject::eTypeDb);
                 menuProjectWks->exec(p);
@@ -996,8 +1017,24 @@ void CGisListWks::slotContextMenu(const QPoint& point)
                 }
                 else
                 {
+                    actionGroup->setEnabled(true);
                     actionSyncWksDev->setEnabled(IDevice::count());
                     actionSyncDB->setEnabled(project->getType() == IGisProject::eTypeDb);
+
+                    blockSorting = true;
+                    switch(project->getSortingFolder())
+                    {
+                    case IGisProject::eSortFolderName:
+                        actionSortByName->setChecked(true);
+                        break;
+
+                    case IGisProject::eSortFolderTime:
+                        actionSortByTime->setChecked(true);
+                        break;
+                    }
+
+                    blockSorting = false;
+
                     menuProjectWks->exec(p);
                 }
             }
@@ -1664,6 +1701,11 @@ bool CGisListWks::event(QEvent * e)
             CDBProject * project =  getProjectById(evt->id, evt->db);
             if(project && project->askBeforClose())
             {
+                /*
+                    Tell the DB view that we aborted to hide the folder by posting it's
+                    current status.
+                 */
+                project->postStatus(false);
                 return false;
             }
             delete project;
@@ -1791,3 +1833,47 @@ void CGisListWks::slotSyncDB()
         project->update();
     }
 }
+
+void CGisListWks::slotSetSortMode(IGisProject::sorting_folder_e mode, bool checked)
+{
+    if(!checked || blockSorting)
+    {
+        return;
+    }
+
+
+    IGisProject * project = dynamic_cast<IGisProject*>(currentItem());
+    if(project != nullptr)
+    {
+        project->setSortingFolder(mode);
+    }
+}
+
+
+void CGisListWks::slotCopyProject()
+{
+    CGisListWksEditLock lock(true, IGisItem::mutexItems);
+
+    QList<IGisItem::key_t>  keys;
+
+    for(QTreeWidgetItem * item : selectedItems())
+    {
+        IGisProject * project = dynamic_cast<IGisProject*>(item);
+        if(project == nullptr)
+        {
+            continue;
+        }
+
+        const int N = project->childCount();
+        for(int i = 0; i < N; i++)
+        {
+            IGisItem * item = dynamic_cast<IGisItem*>(project->child(i));
+            if(item != nullptr)
+            {
+                keys << item->getKey();
+            }
+        }
+    }
+
+    CGisWidget::self().copyItemsByKey(keys);
+}
diff --git a/src/gis/CGisListWks.h b/src/gis/CGisListWks.h
index 5fa7c60..fb69f66 100644
--- a/src/gis/CGisListWks.h
+++ b/src/gis/CGisListWks.h
@@ -19,6 +19,8 @@
 #ifndef CGISLISTWKS_H
 #define CGISLISTWKS_H
 
+#include "gis/prj/IGisProject.h"
+
 #include <QPointer>
 #include <QSqlDatabase>
 #include <QTreeWidget>
@@ -29,6 +31,7 @@ class CSearchGoogle;
 class IGisProject;
 class CDBProject;
 class IDeviceWatcher;
+class QActionGroup;
 
 class CGisListWks : public QTreeWidget
 {
@@ -103,6 +106,8 @@ private slots:
     void slotSyncDevWks();
     void slotRteFromWpt();
     void slotSyncDB();
+    void slotSetSortMode(IGisProject::sorting_folder_e mode, bool checked);
+    void slotCopyProject();
 
 
 private:
@@ -112,20 +117,27 @@ private:
     void migrateDB1to2();
     void migrateDB2to3();
     void setVisibilityOnMap(bool visible);
+    QAction * addSortAction(QMenu * menu, QActionGroup *actionGroup, const QString& icon, const QString& text, IGisProject::sorting_folder_e mode);
 
     QSqlDatabase db;
 
     QMenu * menuProjectWks;
     QAction  * actionSave;
     QAction  * actionSaveAs;
+    QAction  * actionCopyPrj;
     QAction  * actionEditPrj;
     QAction  * actionCloseProj;
     QAction  * actionShowOnMap;
     QAction  * actionHideFrMap;
     QAction  * actionSyncWksDev;
     QAction  * actionSyncDB;
+    QAction  * actionSortByTime;
+    QAction  * actionSortByName;
+
 
 
+    QActionGroup * actionGroup;
+
     QMenu * menuProjectDev;
     QAction  * actionDelProj;
     QAction  * actionSyncDevWks;
@@ -164,6 +176,8 @@ private:
     qint32 saveEvery = 5;
 
     IDeviceWatcher * deviceWatcher = nullptr;
+
+    bool blockSorting = false;
 };
 
 #endif //CGISLISTWKS_H
diff --git a/src/gis/CGisWidget.cpp b/src/gis/CGisWidget.cpp
index 1a2227c..c0d5a51 100644
--- a/src/gis/CGisWidget.cpp
+++ b/src/gis/CGisWidget.cpp
@@ -222,11 +222,18 @@ IGisProject * CGisWidget::selectProject()
 
         if(evt.idChild)
         {
-            while(nullptr == project)
+            CDBProject * p = nullptr;
+            while(nullptr == p)
             {
                 QApplication::processEvents(QEventLoop::WaitForMoreEvents|QEventLoop::ExcludeUserInputEvents, 100);
-                project = treeWks->getProjectById(evt.idChild, db);
+                p = dynamic_cast<CDBProject*>(treeWks->getProjectById(evt.idChild, db));
             }
+            /*
+               Creating a project usually does initiate an info request. However as the project isn't in the workspace
+               the moment we create it, the request will fail. That is why we send the info now.
+             */
+            p->postStatus(false);
+            project = p;
         }
     }
     else if(!name.isEmpty())
diff --git a/src/gis/IGisItem.cpp b/src/gis/IGisItem.cpp
index 05dd574..6be1193 100644
--- a/src/gis/IGisItem.cpp
+++ b/src/gis/IGisItem.cpp
@@ -25,6 +25,7 @@
 #include "gis/CGisWidget.h"
 #include "gis/IGisItem.h"
 #include "gis/db/macros.h"
+#include "gis/ovl/CGisItemOvlArea.h"
 #include "gis/prj/IGisProject.h"
 #include "gis/rte/CGisItemRte.h"
 #include "gis/trk/CGisItemTrk.h"
@@ -282,7 +283,7 @@ QString IGisItem::getNameEx() const
 void IGisItem::updateDecoration(quint32 enable, quint32 disable)
 {
     // update text and icon
-    setToolTip(CGisListWks::eColumnName,getInfo());
+    setToolTip(CGisListWks::eColumnName,getInfo(true, false));
     setText(CGisListWks::eColumnName, getName());
     setSymbol();
 
@@ -655,6 +656,12 @@ QString IGisItem::removeHtml(const QString &str)
 
 QString IGisItem::html2Dev(const QString& str)
 {
+    // device or not, an empty text should never be enclosed in HTML tags
+    if(removeHtml(str).simplified().isEmpty())
+    {
+        return "";
+    }
+
     return isOnDevice() == IDevice::eTypeGarmin ? removeHtml(str) : str;
 }
 
@@ -837,3 +844,33 @@ bool IGisItem::getNameAndProject(QString &name, IGisProject *&project, const QSt
     project = CGisWidget::self().selectProject();
     return nullptr != project;
 }
+
+IGisItem * IGisItem::newGisItem(quint32 type, quint64 id, QSqlDatabase& db, IGisProject * project)
+{
+    IGisItem *item = nullptr;
+
+    // load item from database
+    switch(type)
+    {
+    case IGisItem::eTypeWpt:
+        item = new CGisItemWpt(id, db, project);
+        break;
+
+    case IGisItem::eTypeTrk:
+        item = new CGisItemTrk(id, db, project);
+        break;
+
+    case IGisItem::eTypeRte:
+        item = new CGisItemRte(id, db, project);
+        break;
+
+    case IGisItem::eTypeOvl:
+        item = new CGisItemOvlArea(id, db, project);
+        break;
+
+    default:
+        ;
+    }
+
+    return item;
+}
diff --git a/src/gis/IGisItem.h b/src/gis/IGisItem.h
index 0b6699c..fde6f88 100644
--- a/src/gis/IGisItem.h
+++ b/src/gis/IGisItem.h
@@ -250,13 +250,18 @@ public:
 
     /**
        @brief Get a short string with the items properties to be displayed in tool tips or similar
+
+       @param showName          set true if the first line should be the item's name
+       @apram showFullText      set false to get a 200 characters limited info text
+
        @return A string object.
      */
-    virtual QString getInfo(bool allowEdit = false) const = 0;
+    virtual QString getInfo(bool showName, bool showFullText) const = 0;
 
     virtual const QString& getComment() const = 0;
     virtual const QString& getDescription() const = 0;
     virtual const QList<link_t>& getLinks() const = 0;
+    virtual QDateTime getTimestamp() const = 0;
 
 
     virtual void setComment(const QString& str) = 0;
@@ -501,6 +506,10 @@ public:
      */
     static bool getNameAndProject(QString &name, IGisProject *&project, const QString &itemtype);
 
+
+    static IGisItem * newGisItem(quint32 type, quint64 id, QSqlDatabase& db, IGisProject * project);
+
+
     /// a no key value that can be used to nullify references.
     const static QString noKey;
 
diff --git a/src/gis/IGisLine.cpp b/src/gis/IGisLine.cpp
index b3b6658..597fda5 100644
--- a/src/gis/IGisLine.cpp
+++ b/src/gis/IGisLine.cpp
@@ -25,11 +25,20 @@ IGisLine::subpt_t::subpt_t(const QPointF& pt)
     : coord(pt)
 {
 }
+IGisLine::subpt_t::subpt_t(const QPointF& pt, const QString &nm)
+    : coord(pt)
+    , name(nm)
+{
+}
 
 IGisLine::point_t::point_t(const QPointF& pt)
+    : subpt_t(pt)
+{
+}
+
+IGisLine::point_t::point_t(const QPointF& pt, const QString& nm)
+    : subpt_t(pt,nm)
 {
-    coord = pt;
-    pixel = pt;
 }
 
 void IGisLine::point_t::resetElevation()
diff --git a/src/gis/IGisLine.h b/src/gis/IGisLine.h
index 9ffd25c..31d3c91 100644
--- a/src/gis/IGisLine.h
+++ b/src/gis/IGisLine.h
@@ -37,8 +37,10 @@ public:
     {
         subpt_t() = default;
         subpt_t(const QPointF& pt);
+        subpt_t(const QPointF& pt, const QString &name);
         QPointF coord;
         QPointF pixel;
+        QString name;
         qint32 ele = NOINT;
     };
 
@@ -46,6 +48,7 @@ public:
     {
         point_t() = default;
         point_t(const QPointF &pt);
+        point_t(const QPointF &pt, const QString &name);
         void resetElevation();
         QVector<subpt_t> subpts;
     };
diff --git a/src/gis/db/CDBFolderLostFound.h b/src/gis/db/CDBFolderLostFound.h
index 7436080..f01040d 100644
--- a/src/gis/db/CDBFolderLostFound.h
+++ b/src/gis/db/CDBFolderLostFound.h
@@ -22,6 +22,8 @@
 #include "gis/db/IDBFolder.h"
 #include <QCoreApplication>
 
+class CDBItem;
+
 class CDBFolderLostFound : public IDBFolder
 {
     Q_DECLARE_TR_FUNCTIONS(CDBFolderLostFound)
diff --git a/src/gis/db/CDBFolderMysql.cpp b/src/gis/db/CDBFolderMysql.cpp
index 0f89ac6..6d1a24c 100644
--- a/src/gis/db/CDBFolderMysql.cpp
+++ b/src/gis/db/CDBFolderMysql.cpp
@@ -18,8 +18,9 @@
 
 #include "gis/CGisListDB.h"
 #include "gis/db/CDBFolderMysql.h"
+#include "gis/db/macros.h"
 
-#include <QSqlError>
+#include <QtSql>
 
 CDBFolderMysql::CDBFolderMysql(const QString &server, const QString &port, const QString &user, const QString & passwd, bool noPasswd, const QString &name, QTreeWidget *parent)
     : IDBFolderSql(IDB::db, parent)
@@ -74,3 +75,21 @@ QString CDBFolderMysql::getDBInfo() const
 
     return str;
 }
+
+bool CDBFolderMysql::search(const QString& str, QSqlQuery &query)
+{
+    query.prepare("SELECT id FROM items WHERE MATCH(comment) AGAINST (:str IN BOOLEAN MODE)");
+    query.bindValue(":str", str);
+    QUERY_EXEC(return false);
+
+    return true;
+}
+
+void CDBFolderMysql::copyFolder(quint64 child, quint64 parent) //override;
+{
+    QSqlQuery query(IDB::db);
+    query.prepare("INSERT INTO folder2folder (parent, child) SELECT :parent, :child FROM DUAL WHERE NOT EXISTS (SELECT id FROM folder2folder WHERE parent=:parent AND child=:child)");
+    query.bindValue(":parent", parent);
+    query.bindValue(":child", child);
+    QUERY_EXEC(return );
+}
diff --git a/src/gis/db/CDBFolderMysql.h b/src/gis/db/CDBFolderMysql.h
index 30a07f7..34ac641 100644
--- a/src/gis/db/CDBFolderMysql.h
+++ b/src/gis/db/CDBFolderMysql.h
@@ -41,6 +41,9 @@ public:
 
     QString getDBInfo() const;
 
+    bool search(const QString& str, QSqlQuery& query) override;
+
+    void copyFolder(quint64 child, quint64 parent) override;
 private:
     const QString server;
     const QString port;
diff --git a/src/gis/db/CDBFolderSqlite.cpp b/src/gis/db/CDBFolderSqlite.cpp
index e5f8268..e7c9515 100644
--- a/src/gis/db/CDBFolderSqlite.cpp
+++ b/src/gis/db/CDBFolderSqlite.cpp
@@ -18,8 +18,10 @@
 
 #include "gis/CGisListDB.h"
 #include "gis/db/CDBFolderSqlite.h"
+#include "gis/db/macros.h"
 
-#include <QtCore>
+#include <QtSql>
+#include <QtWidgets>
 
 CDBFolderSqlite::CDBFolderSqlite(const QString& filename, const QString& name, QTreeWidget *parent)
     : IDBFolderSql(IDB::db, parent)
@@ -66,3 +68,22 @@ QString CDBFolderSqlite::getDBInfo() const
 
     return str;
 }
+
+
+bool CDBFolderSqlite::search(const QString& str, QSqlQuery& query)
+{
+    query.prepare("SELECT id FROM searchindex WHERE comment MATCH :str");
+    query.bindValue(":str", str);
+    QUERY_EXEC(return false);
+
+    return true;
+}
+
+void CDBFolderSqlite::copyFolder(quint64 child, quint64 parent) //override;
+{
+    QSqlQuery query(IDB::db);
+    query.prepare("INSERT INTO folder2folder (parent, child) SELECT :parent, :child WHERE NOT EXISTS (SELECT parent, child FROM folder2folder WHERE parent=:parent AND child=:child)");
+    query.bindValue(":parent", parent);
+    query.bindValue(":child", child);
+    QUERY_EXEC(return );
+}
diff --git a/src/gis/db/CDBFolderSqlite.h b/src/gis/db/CDBFolderSqlite.h
index 711b777..0b0c2e5 100644
--- a/src/gis/db/CDBFolderSqlite.h
+++ b/src/gis/db/CDBFolderSqlite.h
@@ -37,6 +37,9 @@ public:
 
     QString getDBInfo() const;
 
+    bool search(const QString& str, QSqlQuery &query) override;
+
+    void copyFolder(quint64 child, quint64 parent) override;
 private:
     QString filename;
     QString error;
diff --git a/src/gis/db/CDBItem.cpp b/src/gis/db/CDBItem.cpp
index 665500c..47f34f1 100644
--- a/src/gis/db/CDBItem.cpp
+++ b/src/gis/db/CDBItem.cpp
@@ -29,9 +29,8 @@ CDBItem::CDBItem(QSqlDatabase &db, quint64 id, IDBFolder *parent)
     , db(db)
     , id(id)
 {
-//    qDebug() << "CDBItem::CDBItem()";
     QSqlQuery query(db);
-    query.prepare("SELECT type, keyqms, icon, name, comment FROM items WHERE id=:id");
+    query.prepare("SELECT type, keyqms, icon, name, date, comment FROM items WHERE id=:id");
     query.bindValue(":id", id);
     QUERY_EXEC(return );
     if(query.next())
@@ -42,16 +41,21 @@ CDBItem::CDBItem(QSqlDatabase &db, quint64 id, IDBFolder *parent)
         pixmap.loadFromData(query.value(2).toByteArray(), "PNG");
         setIcon(CGisListDB::eColumnCheckbox, pixmap);
         setText(CGisListDB::eColumnName, query.value(3).toString());
-        setToolTip(CGisListDB::eColumnName, query.value(4).toString());
+
+        date = query.value(4).toDateTime();
+
+        // limit comment to 300 characters
+        QString comment = query.value(5).toString();
+        if(comment.size() > 300)
+        {
+            comment = comment.left(297) + "...";
+        }
+        setToolTip(CGisListDB::eColumnName, comment);
     }
 
     updateAge();
 }
 
-CDBItem::~CDBItem()
-{
-//    qDebug() << "CDBItem::~CDBItem()";
-}
 
 void CDBItem::updateAge()
 {
@@ -64,7 +68,7 @@ void CDBItem::updateAge()
         return;
     }
 
-    if(parent()->type() == IDBFolder::eTypeLostFound)
+    if((parent() != nullptr) && (parent()->type() == IDBFolder::eTypeLostFound))
     {
         QString date = query.value(0).toString();
         QDateTime timestamp;
diff --git a/src/gis/db/CDBItem.h b/src/gis/db/CDBItem.h
index aaad194..ecf14ec 100644
--- a/src/gis/db/CDBItem.h
+++ b/src/gis/db/CDBItem.h
@@ -30,17 +30,30 @@ class CDBItem : public QTreeWidgetItem
     Q_DECLARE_TR_FUNCTIONS(CDBItem)
 public:
     CDBItem(QSqlDatabase& db, quint64 id, IDBFolder * parent);
-    virtual ~CDBItem();
+    virtual ~CDBItem() = default;
 
-    quint64 getId()
+    /**
+       @brief Get the database id
+       @return The ID value used by the database
+     */
+    quint64 getId() const
     {
         return id;
     }
-    const QString& getKey()
+
+    /**
+       @brief Get the item key
+
+       This is not the full blown QMapShack item key with project and device key. It's just the item key.
+
+       @return The string with the item key
+     */
+    const QString& getKey() const
     {
         return key;
     }
 
+
     /**
        @brief Send show/hide events to the workspace
      */
@@ -51,14 +64,19 @@ public:
      */
     void remove();
 
+    /**
+       @brief Update the time the item is in the lost & found folder
+     */
     void updateAge();
 
 private:
+    friend bool sortByTime(CDBItem * item1, CDBItem * item2);
     QSqlDatabase& db;
     quint64 id;
 
     int type = 0;
     QString key;
+    QDateTime date;
 };
 
 #endif //CDBITEM_H
diff --git a/src/gis/db/CDBProject.cpp b/src/gis/db/CDBProject.cpp
index e613b37..e33c996 100644
--- a/src/gis/db/CDBProject.cpp
+++ b/src/gis/db/CDBProject.cpp
@@ -24,6 +24,7 @@
 #include "gis/db/macros.h"
 #include "gis/gpx/CGpxProject.h"
 #include "gis/ovl/CGisItemOvlArea.h"
+#include "gis/prj/CDetailsPrj.h"
 #include "gis/qms/CQmsProject.h"
 #include "gis/rte/CGisItemRte.h"
 #include "gis/trk/CGisItemTrk.h"
@@ -166,8 +167,11 @@ void CDBProject::postStatus(bool updateLostFound)
         query.prepare("SELECT COUNT(*) FROM folder2item WHERE parent=:parent");
         query.bindValue(":parent", getId());
         QUERY_EXEC();
+        query.next();
 
-        if(query.next() && (query.value(0).toInt() != info->keysChildren.count()))
+        const int nChildrenAttached = query.value(0).toInt();
+
+        if((nChildrenAttached != 0) && (nChildrenAttached != info->keysChildren.count()))
         {
             checkState = Qt::PartiallyChecked;
         }
@@ -194,12 +198,12 @@ void CDBProject::postStatus(bool updateLostFound)
 }
 
 
-int CDBProject::checkForAction2(IGisItem * item, quint64 &idItem, QString& hashItem, QSqlQuery &query)
+int CDBProject::checkForAction2(IGisItem * item, quint64 &itemId, QString& hashItem, QSqlQuery &query)
 {
     int action = eActionNone;
 
     query.prepare("SELECT hash, last_user, last_change FROM items WHERE id=:id");
-    query.bindValue(":id", idItem);
+    query.bindValue(":id", itemId);
     QUERY_EXEC(throw eReasonQueryFail);
 
     if(query.next())
@@ -273,12 +277,13 @@ void CDBProject::updateItem(IGisItem *&item, quint64 idItem, QSqlQuery &query)
 
     QString hashInDb = item->getLastDatabaseHash();
 
-    query.prepare("UPDATE items SET type=:type, keyqms=:keyqms, icon=:icon, name=:name, comment=:comment, data=:data, hash=:hash WHERE id=:id AND hash=:oldhash");
+    query.prepare("UPDATE items SET type=:type, keyqms=:keyqms, icon=:icon, name=:name, date=:date, comment=:comment, data=:data, hash=:hash WHERE id=:id AND hash=:oldhash");
     query.bindValue(":type",    item->type());
     query.bindValue(":keyqms",  item->getKey().item);
     query.bindValue(":icon",    buffer.data());
     query.bindValue(":name",    item->getName());
-    query.bindValue(":comment", item->getInfo());
+    query.bindValue(":date",    item->getTimestamp());
+    query.bindValue(":comment", item->getInfo(true, true));
     query.bindValue(":data",    data);
     query.bindValue(":hash",    item->getHash());
     query.bindValue(":id",      idItem);
@@ -320,12 +325,13 @@ void CDBProject::updateItem(IGisItem *&item, quint64 idItem, QSqlQuery &query)
         {
             // hashInDb has been updated by checkForAction2() by the one stored in the database
             // therefore the update should succeed now.
-            query.prepare("UPDATE items SET type=:type, keyqms=:keyqms, icon=:icon, name=:name, comment=:comment, data=:data, hash=:hash WHERE id=:id AND hash=:oldhash");
+            query.prepare("UPDATE items SET type=:type, keyqms=:keyqms, icon=:icon, name=:name, date=:date, comment=:comment, data=:data, hash=:hash WHERE id=:id AND hash=:oldhash");
             query.bindValue(":type",    item->type());
             query.bindValue(":keyqms",  item->getKey().item);
             query.bindValue(":icon",    buffer.data());
             query.bindValue(":name",    item->getName());
-            query.bindValue(":comment", item->getInfo());
+            query.bindValue(":date",    item->getTimestamp());
+            query.bindValue(":comment", item->getInfo(true, true));
             query.bindValue(":data",    data);
             query.bindValue(":hash",    item->getHash());
             query.bindValue(":id",      idItem);
@@ -372,12 +378,13 @@ quint64 CDBProject::insertItem(IGisItem * item, QSqlQuery &query)
     pixmap.save(&buffer, "PNG");
     buffer.seek(0);
 
-    query.prepare("INSERT INTO items (type, keyqms, icon, name, comment, data, hash) VALUES (:type, :keyqms, :icon, :name, :comment, :data, :hash)");
+    query.prepare("INSERT INTO items (type, keyqms, icon, name, date, comment, data, hash) VALUES (:type, :keyqms, :icon, :name, :date, :comment, :data, :hash)");
     query.bindValue(":type",    item->type());
     query.bindValue(":keyqms",  item->getKey().item);
     query.bindValue(":icon",    buffer.data());
     query.bindValue(":name",    item->getName());
-    query.bindValue(":comment", item->getInfo());
+    query.bindValue(":date",    item->getTimestamp());
+    query.bindValue(":comment", item->getInfo(true, true));
     query.bindValue(":data",    data);
     query.bindValue(":hash",    item->getHash());
     QUERY_EXEC(throw eReasonQueryFail);
@@ -400,12 +407,12 @@ quint64 CDBProject::insertItem(IGisItem * item, QSqlQuery &query)
     return idItem;
 }
 
-int CDBProject::checkForAction1(IGisItem * item, quint64& idItem, int& lastResult, QSqlQuery &query)
+int CDBProject::checkForAction1(IGisItem * item, quint64& itemId, int& lastResult, QSqlQuery &query)
 {
     int action = eActionNone;
 
     // test if item exists in database
-    quint32 typeItem = 0;
+    quint32 itemType = 0;
     query.prepare("SELECT id, type FROM items WHERE keyqms=:keyqms");
     query.bindValue(":keyqms", item->getKey().item);
     QUERY_EXEC(throw eReasonQueryFail);
@@ -413,13 +420,13 @@ int CDBProject::checkForAction1(IGisItem * item, quint64& idItem, int& lastResul
 
     if(query.next())
     {
-        idItem      = query.value(0).toULongLong();
-        typeItem    = query.value(1).toUInt();
+        itemId      = query.value(0).toULongLong();
+        itemType    = query.value(1).toUInt();
 
         // check if relation already exists.
         query.prepare("SELECT id FROM folder2item WHERE parent=:parent AND child=:child");
         query.bindValue(":parent", id);
-        query.bindValue(":child", idItem);
+        query.bindValue(":child", itemId);
         QUERY_EXEC(throw eReasonQueryFail);
 
         if(!query.next())
@@ -430,31 +437,7 @@ int CDBProject::checkForAction1(IGisItem * item, quint64& idItem, int& lastResul
             if(lastResult == CSelectSaveAction::eResultNone)
             {
                 // Build the dialog to ask for user action
-
-                IGisItem * item1 = nullptr;
-
-                // load item from database for a compare
-                switch(typeItem)
-                {
-                case IGisItem::eTypeWpt:
-                    item1 = new CGisItemWpt(idItem, db, nullptr);
-                    break;
-
-                case IGisItem::eTypeTrk:
-                    item1 = new CGisItemTrk(idItem, db, nullptr);
-                    break;
-
-                case IGisItem::eTypeRte:
-                    item1 = new CGisItemRte(idItem, db, nullptr);
-                    break;
-
-                case IGisItem::eTypeOvl:
-                    item1 = new CGisItemOvlArea(idItem, db, nullptr);
-                    break;
-
-                default:
-                    ;
-                }
+                IGisItem * item1 = IGisItem::newGisItem(itemType, itemId, db, nullptr);
 
                 if(nullptr == item1)
                 {
@@ -622,10 +605,11 @@ bool CDBProject::save()
     *this >> in;
 
     // update folder entry in database
-    query.prepare("UPDATE folders SET name=:name, comment=:comment, data=:data WHERE id=:id");
+    query.prepare("UPDATE folders SET name=:name, comment=:comment, data=:data, sortmode=:sortmode WHERE id=:id");
     query.bindValue(":name", getName());
     query.bindValue(":comment", getInfo());
     query.bindValue(":data", data);
+    query.bindValue(":sortmode", getSortingFolder());
     query.bindValue(":id", getId());
     QUERY_EXEC(return false);
 
@@ -639,35 +623,18 @@ bool CDBProject::save()
 
 void CDBProject::showItems(CEvtD2WShowItems * evt)
 {
+    bool restoreDlgDetails = false;
     if(evt->addItemsExclusively)
     {
+        restoreDlgDetails = !dlgDetails.isNull();
+        delete dlgDetails;
+
         qDeleteAll(takeChildren());
     }
 
     for(const evt_item_t &item : evt->items)
     {
-        IGisItem * gisItem = nullptr;
-        switch(item.type)
-        {
-        case IGisItem::eTypeWpt:
-            gisItem = new CGisItemWpt(item.id, db, this);
-            break;
-
-        case IGisItem::eTypeTrk:
-            gisItem = new CGisItemTrk(item.id, db, this);
-            break;
-
-        case IGisItem::eTypeRte:
-            gisItem = new CGisItemRte(item.id, db, this);
-            break;
-
-        case IGisItem::eTypeOvl:
-            gisItem = new CGisItemOvlArea(item.id, db, this);
-            break;
-
-        default:
-            ;
-        }
+        IGisItem * gisItem = IGisItem::newGisItem(item.type, item.id, db, this);
 
         /* [Issue #72] Database/Workspace inconsistency in QMS 1.4.0
 
@@ -696,8 +663,14 @@ void CDBProject::showItems(CEvtD2WShowItems * evt)
         }
     }
 
+    sortItems();
     postStatus(false);
     setToolTip(CGisListWks::eColumnName, getInfo());
+
+    if(restoreDlgDetails)
+    {
+        edit();
+    }
 }
 
 void CDBProject::hideItems(CEvtD2WHideItems * evt)
diff --git a/src/gis/db/CDBProject.h b/src/gis/db/CDBProject.h
index 367aa3d..6e8703c 100644
--- a/src/gis/db/CDBProject.h
+++ b/src/gis/db/CDBProject.h
@@ -123,8 +123,8 @@ protected:
     void updateItem(IGisItem *&item, quint64 idItem, QSqlQuery& query);
 
 
-    int checkForAction1(IGisItem * item, quint64 &idItem, int &lastResult, QSqlQuery& query);
-    int checkForAction2(IGisItem * item, quint64 &idItem, QString &hashItem, QSqlQuery& query);
+    int checkForAction1(IGisItem * item, quint64 &itemId, int &lastResult, QSqlQuery& query);
+    int checkForAction2(IGisItem * item, quint64 &itemId, QString &hashItem, QSqlQuery& query);
 
     /**
      * @brief Add item to database
diff --git a/src/gis/db/CLostFoundProject.cpp b/src/gis/db/CLostFoundProject.cpp
index 4781e34..a2c541c 100644
--- a/src/gis/db/CLostFoundProject.cpp
+++ b/src/gis/db/CLostFoundProject.cpp
@@ -59,27 +59,7 @@ void CLostFoundProject::updateFromDb()
         quint64 id   = query.value(0).toULongLong();
         quint32 type = query.value(1).toUInt();
 
-        switch(type)
-        {
-        case IGisItem::eTypeWpt:
-            new CGisItemWpt(id, db, this);
-            break;
-
-        case IGisItem::eTypeTrk:
-            new CGisItemTrk(id, db, this);
-            break;
-
-        case IGisItem::eTypeRte:
-            new CGisItemRte(id, db, this);
-            break;
-
-        case IGisItem::eTypeOvl:
-            new CGisItemOvlArea(id, db, this);
-            break;
-
-        default:
-            ;
-        }
+        IGisItem::newGisItem(type, id, db, this);
     }
 
     setText(CGisListWks::eColumnDecoration,"");
diff --git a/src/gis/db/CSearchDatabase.cpp b/src/gis/db/CSearchDatabase.cpp
new file mode 100644
index 0000000..15c374c
--- /dev/null
+++ b/src/gis/db/CSearchDatabase.cpp
@@ -0,0 +1,293 @@
+/**********************************************************************************************
+    Copyright (C) 2016 Oliver Eichler oliver.eichler at gmx.de
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "gis/CGisListDB.h"
+#include "gis/CGisWidget.h"
+#include "gis/db/CDBFolderGroup.h"
+#include "gis/db/CDBFolderOther.h"
+#include "gis/db/CDBFolderProject.h"
+#include "gis/db/CDBItem.h"
+#include "gis/db/CSearchDatabase.h"
+#include "gis/db/IDBFolder.h"
+#include "gis/db/macros.h"
+
+#include <QtSql>
+#include <QtWidgets>
+
+CSearchDatabase::CSearchDatabase(IDBFolder &dbFolder, CGisListDB *parent)
+    : QDialog(parent)
+    , dbFolder(dbFolder)
+{
+    setupUi(this);
+
+    labelName->setText(tr("Search database '%1':").arg(dbFolder.getDBName()));
+
+    connect(pushSearch, &QPushButton::clicked, this, &CSearchDatabase::slotSearch);
+    connect(pushClose, &QPushButton::clicked, this, &CSearchDatabase::accept);
+    connect(treeResult, &QTreeWidget::itemChanged, this, &CSearchDatabase::slotItemChanged);
+}
+
+void CSearchDatabase::slotItemChanged(QTreeWidgetItem * item, int column)
+{
+    if((column != CGisListDB::eColumnCheckbox) || internalEdit)
+    {
+        return;
+    }
+
+    IDBFolder * folder = dynamic_cast<IDBFolder*>(item);
+    if(folder != nullptr)
+    {
+        Qt::CheckState checkState = item->checkState(column);
+
+        const int N = folder->childCount();
+        for(int i = 0; i < N; i++)
+        {
+            IDBFolder * childFolder = dynamic_cast<IDBFolder*>(folder->child(i));
+            if(childFolder != nullptr)
+            {
+                childFolder->setCheckState(CGisListDB::eColumnCheckbox, checkState);
+            }
+
+            CDBItem * childItem = dynamic_cast<CDBItem*>(folder->child(i));
+            if(childItem != nullptr)
+            {
+                childItem->setCheckState(CGisListDB::eColumnCheckbox, checkState);
+            }
+        }
+    }
+    else
+    {
+        emit sigItemChanged(item, column);
+    }
+}
+
+void CSearchDatabase::slotSearch()
+{
+    internalEdit = true;
+
+    treeResult->clear();
+
+    QSqlDatabase& db = dbFolder.getDb();
+    QSqlQuery query(db);
+    dbFolder.search(lineQuery->text(), query);
+
+    QMap<quint64, IDBFolder*> folders;
+
+    while(query.next())
+    {
+        quint64 itemId = query.value(0).toULongLong();
+
+        QSqlQuery query2(db);
+        query2.prepare("SELECT t1.id, t1.type FROM folders AS t1 WHERE id=(SELECT parent FROM folder2item WHERE child=:id)");
+        query2.bindValue(":id", itemId);
+        if(!query2.exec())
+        {
+            qWarning() << query2.lastQuery();
+            qWarning() << query2.lastError();
+            continue;
+        }
+
+        while(query2.next())
+        {
+            quint64 folderId = query2.value(0).toULongLong();
+            quint32 type = query2.value(1).toUInt();
+
+            IDBFolder * folder = nullptr;
+
+            if(!folders.contains(folderId))
+            {
+                switch(type)
+                {
+                case IDBFolder::eTypeProject:
+                    folder = new CDBFolderProject(db, folderId, 0);
+                    break;
+
+                case IDBFolder::eTypeOther:
+                    folder = new CDBFolderOther(db, folderId, 0);
+                    break;
+
+                default:
+                    continue;
+                }
+
+                folders[folderId] = folder;
+
+                addWithParentFolders(treeResult, folder, folders, db);
+            }
+            else
+            {
+                folder = folders[folderId];
+            }
+
+            CDBItem * item = new CDBItem(db, itemId, folder);
+            item->setCheckState(CGisListDB::eColumnCheckbox, Qt::Unchecked);
+        }
+    }
+
+    treeResult->expandAll();
+    treeResult->header()->resizeSections(QHeaderView::ResizeToContents);
+
+    internalEdit = false;
+}
+
+void CSearchDatabase::addWithParentFolders(QTreeWidget * result, IDBFolder * child, QMap<quint64, IDBFolder*>& folders, QSqlDatabase& db)
+{
+    QSqlQuery query(db);
+
+    query.prepare("SELECT t1.id, t1.type FROM folders AS t1 WHERE id=(SELECT parent FROM folder2folder WHERE child=:id)");
+    query.bindValue(":id", child->getId());
+    QUERY_EXEC(return );
+
+    while(query.next())
+    {
+        quint64 folderId = query.value(0).toULongLong();
+        quint32 type = query.value(1).toUInt();
+
+        if(!folders.contains(folderId))
+        {
+            IDBFolder * folder = nullptr;
+
+            switch(type)
+            {
+            case IDBFolder::eTypeProject:
+                folder = new CDBFolderProject(db, folderId, 0);
+                break;
+
+            case IDBFolder::eTypeOther:
+                folder = new CDBFolderOther(db, folderId, 0);
+                break;
+
+            case IDBFolder::eTypeGroup:
+                folder = new CDBFolderGroup(db, folderId, 0);
+                break;
+
+            default:
+                ;
+            }
+
+            if(folder != nullptr)
+            {
+                folders[folderId] = folder;
+                folder->addChild(child);
+                addWithParentFolders(result, folder, folders, db);
+            }
+            else
+            {
+                result->addTopLevelItem(child);
+            }
+        }
+        else
+        {
+            folders[folderId]->addChild(child);
+        }
+    }
+}
+
+bool CSearchDatabase::event(QEvent * e)
+{
+    switch(e->type())
+    {
+    case eEvtW2DAckInfo:
+    {
+        CEvtW2DAckInfo * evt    = (CEvtW2DAckInfo*)e;
+
+        // check for matching database
+        if(evt->db == dbFolder.getDBName())
+        {
+            if(!evt->host.isEmpty())
+            {
+                if(dbFolder.getDBHost() != evt->host)
+                {
+                    break;
+                }
+            }
+        }
+        internalEdit = true;
+        // iterate over all top level items and their children to check active items.
+        const int N = treeResult->topLevelItemCount();
+        for(int i = 0; i < N; i++)
+        {
+            IDBFolder * folder = dynamic_cast<IDBFolder*>(treeResult->topLevelItem(i));
+            if(folder)
+            {
+                updateFolder(folder, evt);
+            }
+        }
+
+        internalEdit = false;
+        break;
+    }
+    }
+
+    return QDialog::event(e);
+}
+
+void CSearchDatabase::updateFolder(IDBFolder * folder, CEvtW2DAckInfo * evt)
+{
+    const int N     = folder->childCount();
+    for(int i = 0; i < N; i++)
+    {
+        IDBFolder * folder1 = dynamic_cast<IDBFolder*>(folder->child(i));
+        if(folder1 != nullptr)
+        {
+            updateFolder(folder1, evt);
+            continue;
+        }
+    }
+
+    if(folder->getId() != evt->id)
+    {
+        return;
+    }
+
+    int nItems      = 0;
+    int nChecked    = 0;
+    for(int i = 0; i < N; i++)
+    {
+        CDBItem * item = dynamic_cast<CDBItem*>(folder->child(i));
+        if(item != nullptr)
+        {
+            nItems++;
+            if(evt->keysChildren.contains(item->getKey()))
+            {
+                nChecked++;
+                item->setCheckState(CGisListDB::eColumnCheckbox, Qt::Checked);
+            }
+            else
+            {
+                item->setCheckState(CGisListDB::eColumnCheckbox, Qt::Unchecked);
+            }
+        }
+    }
+
+    if(folder->type() > IDBFolder::eTypeGroup)
+    {
+        if(nChecked == nItems)
+        {
+            folder->setCheckState(CGisListDB::eColumnCheckbox, Qt::Checked);
+        }
+        else if(nChecked > 0)
+        {
+            folder->setCheckState(CGisListDB::eColumnCheckbox, Qt::PartiallyChecked);
+        }
+        else
+        {
+            folder->setCheckState(CGisListDB::eColumnCheckbox, Qt::Unchecked);
+        }
+    }
+}
diff --git a/src/gis/trk/CSelectActivity.h b/src/gis/db/CSearchDatabase.h
similarity index 52%
rename from src/gis/trk/CSelectActivity.h
rename to src/gis/db/CSearchDatabase.h
index 83c307e..6adb1fd 100644
--- a/src/gis/trk/CSelectActivity.h
+++ b/src/gis/db/CSearchDatabase.h
@@ -1,5 +1,5 @@
 /**********************************************************************************************
-    Copyright (C) 2014-2015 Oliver Eichler oliver.eichler at gmx.de
+    Copyright (C) 2016 Oliver Eichler oliver.eichler at gmx.de
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -16,28 +16,39 @@
 
 **********************************************************************************************/
 
-#ifndef CSELECTACTIVITY_H
-#define CSELECTACTIVITY_H
+#ifndef CSEARCHDATABASE_H
+#define CSEARCHDATABASE_H
 
-#include "ui_ISelectActivity.h"
+#include "ui_ISearchDatabase.h"
 #include <QDialog>
 
-class CSelectActivity : public QDialog, private Ui::ISelectActivity
+class CGisListDB;
+class IDBFolder;
+class QSqlDatabase;
+
+class CSearchDatabase : public QDialog, private Ui::ISearchDatabase
 {
     Q_OBJECT
 public:
-    CSelectActivity(quint32& flag, QString& name, QString& icon, QWidget * parent);
-    virtual ~CSelectActivity();
+    CSearchDatabase(IDBFolder& db, CGisListDB * parent);
+    virtual ~CSearchDatabase() = default;
+
+    bool event(QEvent * e) override;
 
+signals:
+    void sigItemChanged(QTreeWidgetItem * item, int column);
 
 private slots:
-    void slotActivitySelected(bool);
+    void slotSearch();
+    void slotItemChanged(QTreeWidgetItem * item, int column);
 
 private:
-    quint32& flag;
-    QString& name;
-    QString& icon;
+    void addWithParentFolders(QTreeWidget * result, IDBFolder * folder, QMap<quint64, IDBFolder *> &folders, QSqlDatabase &sqlDB);
+    void updateFolder(IDBFolder * folder, CEvtW2DAckInfo * evt);
+    IDBFolder& dbFolder;
+
+    bool internalEdit = false;
 };
 
-#endif //CSELECTACTIVITY_H
+#endif //CSEARCHDATABASE_H
 
diff --git a/src/gis/db/CSelectDBFolder.cpp b/src/gis/db/CSelectDBFolder.cpp
index 646909e..ec33cc4 100644
--- a/src/gis/db/CSelectDBFolder.cpp
+++ b/src/gis/db/CSelectDBFolder.cpp
@@ -40,6 +40,11 @@ CSelectDBFolder::CSelectDBFolder(quint64 &id, QString &db, QString &host, QWidge
     cfg.beginGroup("Entries");
     for(const QString &name : names)
     {
+        if(!db.isEmpty() && (db != name))
+        {
+            continue;
+        }
+
         cfg.beginGroup(name);
         QString type = cfg.value("type", "SQLite").toString();
         if(type == "SQLite")
diff --git a/src/gis/db/CSelectSaveAction.cpp b/src/gis/db/CSelectSaveAction.cpp
index 848e3d9..13d1963 100644
--- a/src/gis/db/CSelectSaveAction.cpp
+++ b/src/gis/db/CSelectSaveAction.cpp
@@ -26,9 +26,9 @@ CSelectSaveAction::CSelectSaveAction(const IGisItem *src, const IGisItem *tar, Q
     setupUi(this);
 
     labelIcon1->setPixmap(src->getIcon());
-    labelInfo1->setText(src->getInfo());
+    labelInfo1->setText(src->getInfo(true, false));
     labelIcon2->setPixmap(tar->getIcon());
-    labelInfo2->setText(tar->getInfo());
+    labelInfo2->setText(tar->getInfo(true, false));
 
     adjustSize();
 
diff --git a/src/gis/db/IDBFolder.cpp b/src/gis/db/IDBFolder.cpp
index db408dd..b930955 100644
--- a/src/gis/db/IDBFolder.cpp
+++ b/src/gis/db/IDBFolder.cpp
@@ -90,6 +90,22 @@ QString IDBFolder::getDBHost() const
     return db.hostName();
 }
 
+QString IDBFolder::getName() const
+{
+    return text(CGisListDB::eColumnName);
+}
+
+void IDBFolder::setName(const QString& name)
+{
+    QSqlQuery query(db);
+    query.prepare("UPDATE folders SET name=:name WHERE id=:id");
+    query.bindValue(":name", name);
+    query.bindValue(":id", getId());
+    QUERY_EXEC(return );
+
+    setupFromDB();
+}
+
 IDBFolderSql *IDBFolder::getDBFolder()
 {
     if(type() == eTypeDatabase)
@@ -194,13 +210,15 @@ void IDBFolder::update(CEvtW2DAckInfo * info)
 
     QSqlQuery query(db);
     // update text and tooltip
-    query.prepare("SELECT name, comment FROM folders WHERE id=:id");
+    query.prepare("SELECT name, comment, sortmode FROM folders WHERE id=:id");
     query.bindValue(":id", id);
     QUERY_EXEC(return );
     query.next();
 
     setText(CGisListDB::eColumnName, query.value(0).toString());
     setToolTip(CGisListDB::eColumnName, query.value(1).toString());
+    sortMode = query.value(2).toUInt();
+
 
     setChildIndicator();
 
@@ -228,7 +246,7 @@ bool IDBFolder::update()
     }
 
     // Step 1: get basic properties like name and key
-    query.prepare("SELECT keyqms, name, comment FROM folders WHERE id=:id");
+    query.prepare("SELECT keyqms, name, comment, sortmode FROM folders WHERE id=:id");
     query.bindValue(":id", id);
     QUERY_EXEC(return false);
     query.next();
@@ -237,6 +255,7 @@ bool IDBFolder::update()
     key = query.value(0).toString();
     setText(CGisListDB::eColumnName, query.value(1).toString());
     setToolTip(CGisListDB::eColumnName, query.value(2).toString());
+    sortMode = query.value(3).toUInt();
 
     // Step 2: Test for children.
     setChildIndicator();
@@ -376,6 +395,7 @@ void IDBFolder::remove()
     CGisWidget::self().postEventForWks(evt1);
 }
 
+
 void IDBFolder::setupFromDB()
 {
     if(id == 0)
@@ -386,7 +406,7 @@ void IDBFolder::setupFromDB()
     QSqlQuery query(db);
 
     // get basic properties like name and key
-    query.prepare("SELECT keyqms, name, comment FROM folders WHERE id=:id");
+    query.prepare("SELECT keyqms, name, comment, sortmode FROM folders WHERE id=:id");
     query.bindValue(":id", id);
     QUERY_EXEC(return );
     query.next();
@@ -394,6 +414,7 @@ void IDBFolder::setupFromDB()
     key = query.value(0).toString();
     setText(CGisListDB::eColumnName, query.value(1).toString());
     setToolTip(CGisListDB::eColumnName, query.value(2).toString());
+    sortMode = query.value(3).toUInt();
 
     // check if folder has child folders (to set expand indicator)
     setChildIndicator();
@@ -428,6 +449,7 @@ void IDBFolder::addChildren(const QSet<QString>& activeChildren, bool skipFolder
         sortChildren(CGisListDB::eColumnName, Qt::AscendingOrder);
     }
 
+    QList<CDBItem*> items;
     // tracks 2nd
     query.prepare("SELECT t1.child FROM folder2item AS t1, items AS t2 WHERE t1.parent = :id AND t2.id = t1.child AND t2.type=:type ORDER BY t2.id");
     query.bindValue(":id", id);
@@ -436,9 +458,11 @@ void IDBFolder::addChildren(const QSet<QString>& activeChildren, bool skipFolder
     while(query.next())
     {
         quint64 idChild = query.value(0).toULongLong();
-        CDBItem * item = new CDBItem(db, idChild, this);
+        CDBItem * item = new CDBItem(db, idChild, nullptr);
         item->setCheckState(CGisListDB::eColumnCheckbox, activeChildren.contains(item->getKey()) ? Qt::Checked : Qt::Unchecked);
+        items << item;
     }
+    addItemsSorted(items);
 
     // routes 3rd
     query.prepare("SELECT t1.child FROM folder2item AS t1, items AS t2 WHERE t1.parent = :id AND t2.id = t1.child AND t2.type=:type ORDER BY t2.id");
@@ -448,9 +472,11 @@ void IDBFolder::addChildren(const QSet<QString>& activeChildren, bool skipFolder
     while(query.next())
     {
         quint64 idChild = query.value(0).toULongLong();
-        CDBItem * item = new CDBItem(db, idChild, this);
+        CDBItem * item = new CDBItem(db, idChild, nullptr);
         item->setCheckState(CGisListDB::eColumnCheckbox, activeChildren.contains(item->getKey()) ? Qt::Checked : Qt::Unchecked);
+        items << item;
     }
+    addItemsSorted(items);
 
     //waypoints 4th
     query.prepare("SELECT t1.child FROM folder2item AS t1, items AS t2 WHERE t1.parent = :id AND t2.id = t1.child AND t2.type=:type ORDER BY t2.id");
@@ -460,9 +486,11 @@ void IDBFolder::addChildren(const QSet<QString>& activeChildren, bool skipFolder
     while(query.next())
     {
         quint64 idChild = query.value(0).toULongLong();
-        CDBItem * item = new CDBItem(db, idChild, this);
+        CDBItem * item = new CDBItem(db, idChild, nullptr);
         item->setCheckState(CGisListDB::eColumnCheckbox, activeChildren.contains(item->getKey()) ? Qt::Checked : Qt::Unchecked);
+        items << item;
     }
+    addItemsSorted(items);
 
     // overlays 5th
     query.prepare("SELECT t1.child FROM folder2item AS t1, items AS t2 WHERE t1.parent = :id AND t2.id = t1.child AND t2.type=:type ORDER BY t2.id");
@@ -472,9 +500,11 @@ void IDBFolder::addChildren(const QSet<QString>& activeChildren, bool skipFolder
     while(query.next())
     {
         quint64 idChild = query.value(0).toULongLong();
-        CDBItem * item = new CDBItem(db, idChild, this);
+        CDBItem * item = new CDBItem(db, idChild, nullptr);
         item->setCheckState(CGisListDB::eColumnCheckbox, activeChildren.contains(item->getKey()) ? Qt::Checked : Qt::Unchecked);
+        items << item;
     }
+    addItemsSorted(items);
 }
 
 void IDBFolder::remove(quint64 idParent, quint64 idFolder)
@@ -548,3 +578,54 @@ void IDBFolder::setChildIndicator()
         setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicator);
     }
 }
+
+void IDBFolder::addItemsSorted(QList<CDBItem*>& items)
+{
+    sortItems(items);
+    for(CDBItem * item : items)
+    {
+        addChild(item);
+    }
+    items.clear();
+}
+
+bool sortByName(CDBItem * item1, CDBItem * item2)
+{
+    return item1->text(CGisListDB::eColumnName) < item2->text(CGisListDB::eColumnName);
+}
+
+bool sortByTime(CDBItem * item1, CDBItem * item2)
+{
+    return item1->date < item2->date;
+}
+
+void IDBFolder::sortItems(QList<CDBItem*>& items) const
+{
+    switch(sortMode)
+    {
+    case IGisProject::eSortFolderTime:
+        qSort(items.begin(), items.end(), &sortByTime);
+        break;
+
+    case IGisProject::eSortFolderName:
+        qSort(items.begin(), items.end(), &sortByName);
+        break;
+    }
+}
+
+
+bool IDBFolder::isSiblingFrom(IDBFolder * folder) const
+{
+    if(folder->getId() == getId())
+    {
+        return true;
+    }
+
+    IDBFolder * parentFolder = dynamic_cast<IDBFolder*>(parent());
+    if(parentFolder != nullptr)
+    {
+        return parentFolder->isSiblingFrom(folder);
+    }
+
+    return false;
+}
diff --git a/src/gis/db/IDBFolder.h b/src/gis/db/IDBFolder.h
index 192881c..805db50 100644
--- a/src/gis/db/IDBFolder.h
+++ b/src/gis/db/IDBFolder.h
@@ -19,6 +19,8 @@
 #ifndef IDBFOLDER_H
 #define IDBFOLDER_H
 
+#include "gis/prj/IGisProject.h"
+
 #include <QSqlDatabase>
 #include <QTreeWidgetItem>
 
@@ -27,6 +29,7 @@ class CEvtW2DAckInfo;
 class IDBFolderSql;
 class CDBItem;
 
+
 /**
  * @brief Baseclass for all folders in the database view
  */
@@ -59,6 +62,9 @@ public:
 
     QSqlDatabase& getDb(){return db; }
 
+    QString getName() const;
+    void setName(const QString& name);
+
     /**
      * @brief Get the database folder that folder is stored in
      *
@@ -142,6 +148,22 @@ public:
 
     void updateItemsOnWks();
 
+    /**
+       @brief Do a database search.
+
+       This must be overridden by the database folder classes. As a result the query will
+       contain a list of item IDs.
+
+       @param str       The string to search for
+       @param query     The sql query item to use
+     */
+    virtual bool search(const QString& str, QSqlQuery& query)
+    {
+        return false;
+    }
+
+    bool isSiblingFrom(IDBFolder * folder) const;
+
 protected:
     /**
        @brief Setup all item properties
@@ -175,10 +197,14 @@ protected:
 
     void setChildIndicator();
 
+    void addItemsSorted(QList<CDBItem *> &items);
+    void sortItems(QList<CDBItem *> &items) const;
+
     QSqlDatabase& db;
 
     quint64 id;
     QString key;
+    quint32 sortMode =  IGisProject::eSortFolderTime;
     bool isLoadable;
 };
 
diff --git a/src/gis/db/IDBFolderSql.h b/src/gis/db/IDBFolderSql.h
index 8af3347..fe81b28 100644
--- a/src/gis/db/IDBFolderSql.h
+++ b/src/gis/db/IDBFolderSql.h
@@ -42,6 +42,7 @@ public:
 
     void announceChange() const;
 
+    virtual void copyFolder(quint64 child, quint64 parent) = 0;
 
 protected:
     CDBFolderLostFound * folderLostFound = nullptr;
diff --git a/src/gis/db/IDBMysql.cpp b/src/gis/db/IDBMysql.cpp
index 974624e..730b6da 100644
--- a/src/gis/db/IDBMysql.cpp
+++ b/src/gis/db/IDBMysql.cpp
@@ -19,6 +19,12 @@
 #include "CMainWindow.h"
 #include "gis/db/IDBMysql.h"
 #include "gis/db/macros.h"
+#include "gis/ovl/CGisItemOvlArea.h"
+#include "gis/rte/CGisItemRte.h"
+#include "gis/trk/CGisItemTrk.h"
+#include "gis/wpt/CGisItemWpt.h"
+#include "helpers/CProgressDialog.h"
+
 
 #include <QtSql>
 #include <QtWidgets>
@@ -96,7 +102,8 @@ bool IDBMysql::initDB()
                "name           TEXT NOT NULL,"
                "comment        TEXT,"
                "locked         BOOLEAN DEFAULT FALSE,"
-               "data           LONGBLOB"
+               "data           LONGBLOB,"
+               "sortmode       INTEGER NOT NULL DEFAULT 0"
                ")", return false);
 
     QUERY_RUN( "CREATE TABLE items ("
@@ -112,6 +119,7 @@ bool IDBMysql::initDB()
                "last_user      TEXT DEFAULT NULL,"
                "last_change    DATETIME DEFAULT NOW() ON UPDATE NOW(),"
                "trash          DATETIME DEFAULT NULL,"
+               "FULLTEXT INDEX searchindex(comment),"
                "UNIQUE KEY (keyqms)"
                ")", return false);
 
@@ -164,7 +172,31 @@ bool IDBMysql::migrateDB(int version)
 {
     QSqlQuery query(db);
 
-    return false;
+    try
+    {
+        if(version < 5)
+        {
+            if(!migrateDB4to5())
+            {
+                throw -1;
+            }
+        }
+
+        if(version < 6)
+        {
+            if(!migrateDB5to6())
+            {
+                throw -1;
+            }
+        }
+    }
+    catch(int i)
+    {
+        if(i == -1)
+        {
+            return false;
+        }
+    }
 
     query.prepare( "UPDATE versioninfo set version=:version");
     query.bindValue(":version", DB_VERSION);
@@ -172,3 +204,109 @@ bool IDBMysql::migrateDB(int version)
     return true;
 }
 
+bool IDBMysql::migrateDB4to5()
+{
+    QSqlQuery query(db);
+
+    // id and comment to full text search index
+    QUERY_RUN("ALTER TABLE items ADD FULLTEXT INDEX searchindex (comment)", return false);
+
+
+    // get number of items in the database
+    QUERY_RUN("SELECT Count(*) FROM items", return false);
+    query.next();
+    quint32 N = query.value(0).toUInt();
+
+    // over all items
+    QUERY_RUN("SELECT id, type FROM items", return false);
+    PROGRESS_SETUP(tr("Update to database version 5. Migrate all GIS items."), 0, N, CMainWindow::self().getBestWidgetForParent());
+    progress.enableCancel(false);
+    quint32 cnt = 0;
+    while(query.next())
+    {
+        PROGRESS(cnt++,;
+                 );
+
+        quint64 itemId      = query.value(0).toULongLong();
+        quint32 itemType    = query.value(1).toUInt();
+        IGisItem *item      = IGisItem::newGisItem(itemType, itemId, db, nullptr);
+
+        if(nullptr == item)
+        {
+            continue;
+        }
+
+        // get full size info text
+        QString comment = item->getInfo(true, true);
+
+        // replace comment with full size info text in items table
+        QSqlQuery query2(db);
+        query2.prepare("UPDATE items SET comment=:comment WHERE id=:id");
+        query2.bindValue(":comment", comment);
+        query2.bindValue(":id", itemId);
+        if(!query2.exec())
+        {
+            qWarning() << query2.lastQuery();
+            qWarning() << query2.lastError();
+        }
+
+        delete item;
+    }
+
+    return true;
+}
+
+bool IDBMysql::migrateDB5to6()
+{
+    QSqlQuery query(db);
+
+    QUERY_RUN("ALTER TABLE folders ADD COLUMN sortmode INTEGER NOT NULL DEFAULT 0", return false);
+
+    // get number of items in the database
+    QUERY_RUN("SELECT Count(*) FROM items", return false);
+    query.next();
+    quint32 N = query.value(0).toUInt();
+
+    // over all items
+    QUERY_RUN("SELECT id, type FROM items", return false);
+    PROGRESS_SETUP(("Update to database version 6. Migrate all GIS items."), 0, N, CMainWindow::self().getBestWidgetForParent());
+    progress.enableCancel(false);
+    quint32 cnt = 0;
+    while(query.next())
+    {
+        PROGRESS(cnt++,;
+                 );
+
+        quint64 itemId      = query.value(0).toULongLong();
+        quint32 itemType    = query.value(1).toUInt();
+        IGisItem *item      = IGisItem::newGisItem(itemType, itemId, db, nullptr);
+
+
+        if(nullptr == item)
+        {
+            continue;
+        }
+
+        // get full size info text
+        QString comment = item->getInfo(true, true);
+        QDateTime date  = item->getTimestamp();
+
+        // replace comment with full size info text in items table
+        QSqlQuery query2(db);
+        query2.prepare("UPDATE items SET comment=:comment, date=:date WHERE id=:id");
+        query2.bindValue(":comment", comment);
+        query2.bindValue(":date", date);
+        query2.bindValue(":id", itemId);
+        if(!query2.exec())
+        {
+            qWarning() << query2.lastQuery();
+            qWarning() << query2.lastError();
+        }
+
+        delete item;
+    }
+
+
+    return true;
+}
+
diff --git a/src/gis/db/IDBMysql.h b/src/gis/db/IDBMysql.h
index 55a1f3c..aa759f6 100644
--- a/src/gis/db/IDBMysql.h
+++ b/src/gis/db/IDBMysql.h
@@ -33,6 +33,8 @@ protected:
     bool setupDB(const QString &server, const QString &port, const QString &user, const QString &passwd, bool noPasswd, const QString &name, const QString &connectionName);
     bool initDB() override;
     bool migrateDB(int version) override;
+    bool migrateDB4to5();
+    bool migrateDB5to6();
 };
 
 #endif //IDBMYSQL_H
diff --git a/src/gis/db/IDBSqlite.cpp b/src/gis/db/IDBSqlite.cpp
index 2a1b2f4..67176a2 100644
--- a/src/gis/db/IDBSqlite.cpp
+++ b/src/gis/db/IDBSqlite.cpp
@@ -98,7 +98,8 @@ bool IDBSqlite::initDB()
                   "name           TEXT NOT NULL,"
                   "comment        TEXT,"
                   "locked         BOOLEAN DEFAULT FALSE,"
-                  "data           BLOB"
+                  "data           BLOB,"
+                  "sortmode       INTEGER NOT NULL DEFAULT 0"
                   ")", throw -1)
 
         QUERY_RUN("CREATE TABLE items ("
@@ -154,6 +155,20 @@ bool IDBSqlite::initDB()
                   "WHERE id=OLD.child AND OLD.child NOT IN(SELECT child FROM folder2item); "
                   "END;", throw -1);
 
+        // create virtual table with search index
+        QUERY_RUN("CREATE VIRTUAL TABLE searchindex USING fts4(id, comment)", throw -1);
+
+        QUERY_RUN("CREATE TRIGGER searchindex_update "
+                  "AFTER UPDATE ON items BEGIN "
+                  "UPDATE searchindex SET comment=NEW.comment "
+                  "WHERE id=OLD.id; "
+                  "END;", throw -1);
+
+        QUERY_RUN("CREATE TRIGGER searchindex_insert "
+                  "AFTER INSERT ON items BEGIN "
+                  "INSERT INTO searchindex(id, comment) VALUES(NEW.id, NEW.comment); "
+                  "END;", throw -1);
+
         QUERY_RUN("END TRANSACTION;", throw -1);
     }
     catch(int i)
@@ -200,6 +215,22 @@ bool IDBSqlite::migrateDB(int version)
             }
         }
 
+        if(version < 5)
+        {
+            if(!migrateDB4to5())
+            {
+                throw -1;
+            }
+        }
+
+        if(version < 6)
+        {
+            if(!migrateDB5to6())
+            {
+                throw -1;
+            }
+        }
+
         QUERY_RUN("END TRANSACTION;", throw -1);
     }
     catch(int i)
@@ -272,7 +303,7 @@ bool IDBSqlite::migrateDB2to3()
 
     QUERY_RUN("SELECT id, type FROM items WHERE hash='-'", return false);
 
-    PROGRESS_SETUP("Migrate all GIS items.", 0, N, CMainWindow::self().getBestWidgetForParent());
+    PROGRESS_SETUP(tr("Update to database version 3. Migrate all GIS items."), 0, N, CMainWindow::self().getBestWidgetForParent());
     progress.enableCancel(false);
     quint32 cnt = 0;
     while(query.next())
@@ -283,30 +314,7 @@ bool IDBSqlite::migrateDB2to3()
         quint64 idItem      = query.value(0).toULongLong();
         quint32 typeItem    = query.value(1).toUInt();
 
-        IGisItem *item = nullptr;
-
-        // load item from database for a compare
-        switch(typeItem)
-        {
-        case IGisItem::eTypeWpt:
-            item = new CGisItemWpt(idItem, db, nullptr);
-            break;
-
-        case IGisItem::eTypeTrk:
-            item = new CGisItemTrk(idItem, db, nullptr);
-            break;
-
-        case IGisItem::eTypeRte:
-            item = new CGisItemRte(idItem, db, nullptr);
-            break;
-
-        case IGisItem::eTypeOvl:
-            item = new CGisItemOvlArea(idItem, db, nullptr);
-            break;
-
-        default:
-            ;
-        }
+        IGisItem *item = IGisItem::newGisItem(typeItem, idItem, db, nullptr);
 
         if(nullptr == item)
         {
@@ -350,3 +358,132 @@ bool IDBSqlite::migrateDB3to4()
     return true;
 }
 
+bool IDBSqlite::migrateDB4to5()
+{
+    QSqlQuery query(db);
+
+    // create virtual table with serach index
+    QUERY_RUN("CREATE VIRTUAL TABLE searchindex USING fts4(id, comment)", return false);
+
+    // get number of items in the database
+    QUERY_RUN("SELECT Count(*) FROM items", return false);
+    query.next();
+    quint32 N = query.value(0).toUInt();
+
+    // over all items
+    QUERY_RUN("SELECT id, type FROM items", return false);
+    PROGRESS_SETUP(tr("Update to database version 5. Migrate all GIS items."), 0, N, CMainWindow::self().getBestWidgetForParent());
+    progress.enableCancel(false);
+    quint32 cnt = 0;
+    while(query.next())
+    {
+        PROGRESS(cnt++,;
+                 );
+
+        quint64 idItem      = query.value(0).toULongLong();
+        quint32 typeItem    = query.value(1).toUInt();
+
+        IGisItem *item = IGisItem::newGisItem(typeItem, idItem, db, nullptr);
+
+
+        if(nullptr == item)
+        {
+            continue;
+        }
+
+        // get full size info text
+        QString comment = item->getInfo(true, true);
+
+        // replace comment with full size info text in items table
+        QSqlQuery query2(db);
+        query2.prepare("UPDATE items SET comment=:comment WHERE id=:id");
+        query2.bindValue(":comment", comment);
+        query2.bindValue(":id", idItem);
+        if(!query2.exec())
+        {
+            qWarning() << query2.lastQuery();
+            qWarning() << query2.lastError();
+        }
+
+        // add item id and full size info text to virtual table
+        query2.prepare("INSERT INTO searchindex(id, comment) VALUES(:id, :comment)");
+        query2.bindValue(":id", idItem);
+        query2.bindValue(":comment", comment);
+        if(!query2.exec())
+        {
+            qWarning() << query2.lastQuery();
+            qWarning() << query2.lastError();
+        }
+
+        delete item;
+    }
+
+
+    QUERY_RUN("CREATE TRIGGER searchindex_update "
+              "AFTER UPDATE ON items BEGIN "
+              "UPDATE searchindex SET comment=NEW.comment "
+              "WHERE id=OLD.id; "
+              "END;", return false);
+    QUERY_RUN("CREATE TRIGGER searchindex_insert "
+              "AFTER INSERT ON items BEGIN "
+              "INSERT INTO searchindex(id, comment) VALUES(NEW.id, NEW.comment); "
+              "END;", return false);
+
+
+    return true;
+}
+
+bool IDBSqlite::migrateDB5to6()
+{
+    QSqlQuery query(db);
+
+    QUERY_RUN("ALTER TABLE folders ADD COLUMN sortmode INTEGER NOT NULL DEFAULT 0", return false);
+
+    // get number of items in the database
+    QUERY_RUN("SELECT Count(*) FROM items", return false);
+    query.next();
+    quint32 N = query.value(0).toUInt();
+
+    // over all items
+    QUERY_RUN("SELECT id, type FROM items", return false);
+    PROGRESS_SETUP(tr("Update to database version 6. Migrate all GIS items."), 0, N, CMainWindow::self().getBestWidgetForParent());
+    progress.enableCancel(false);
+    quint32 cnt = 0;
+    while(query.next())
+    {
+        PROGRESS(cnt++,;
+                 );
+
+        quint64 idItem      = query.value(0).toULongLong();
+        quint32 typeItem    = query.value(1).toUInt();
+
+        IGisItem *item = IGisItem::newGisItem(typeItem, idItem, db, nullptr);
+
+        if(nullptr == item)
+        {
+            continue;
+        }
+
+        // get full size info text
+        QString comment = item->getInfo(true, true);
+        QDateTime date  = item->getTimestamp();
+
+        // replace comment with full size info text in items table
+        QSqlQuery query2(db);
+        query2.prepare("UPDATE items SET comment=:comment, date=:date WHERE id=:id");
+        query2.bindValue(":comment", comment);
+        query2.bindValue(":date", date);
+        query2.bindValue(":id", idItem);
+        if(!query2.exec())
+        {
+            qWarning() << query2.lastQuery();
+            qWarning() << query2.lastError();
+        }
+
+        delete item;
+    }
+
+
+    return true;
+}
+
diff --git a/src/gis/db/IDBSqlite.h b/src/gis/db/IDBSqlite.h
index 492e257..d8a184b 100644
--- a/src/gis/db/IDBSqlite.h
+++ b/src/gis/db/IDBSqlite.h
@@ -23,6 +23,7 @@
 
 class IDBSqlite : public IDB
 {
+    Q_DECLARE_TR_FUNCTIONS(IDBSqlite)
 public:
     IDBSqlite();
     virtual ~IDBSqlite() = default;
@@ -35,6 +36,8 @@ protected:
     bool migrateDB1to2();
     bool migrateDB2to3();
     bool migrateDB3to4();
+    bool migrateDB4to5();
+    bool migrateDB5to6();
 };
 
 #endif //IDBSQLITE_H
diff --git a/src/gis/db/ISearchDatabase.ui b/src/gis/db/ISearchDatabase.ui
new file mode 100644
index 0000000..88db4f2
--- /dev/null
+++ b/src/gis/db/ISearchDatabase.ui
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ISearchDatabase</class>
+ <widget class="QDialog" name="ISearchDatabase">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>545</width>
+    <height>492</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Search...</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="labelName">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="lineQuery">
+     <property name="focusPolicy">
+      <enum>Qt::WheelFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="labelHelp">
+     <property name="text">
+      <string>Type the word you want to search for and press the search button. 
+If you enter 'word' a search with an exact match is done. If you enter 'word*', 'word' has to be at the beginning of a string.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTreeWidget" name="treeResult">
+     <column>
+      <property name="text">
+       <string notr="true"/>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Name</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string/>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <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="QPushButton" name="pushSearch">
+       <property name="text">
+        <string>Search</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushClose">
+       <property name="text">
+        <string>Close</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/gis/db/macros.h b/src/gis/db/macros.h
index 0e068a6..2659976 100644
--- a/src/gis/db/macros.h
+++ b/src/gis/db/macros.h
@@ -19,7 +19,7 @@
 #ifndef MACROS_H
 #define MACROS_H
 
-#define DB_VERSION 4
+#define DB_VERSION 6
 
 #define NO_CMD ((void)0)
 
diff --git a/src/gis/fit/CFitProject.cpp b/src/gis/fit/CFitProject.cpp
index bd6e23c..74e8420 100644
--- a/src/gis/fit/CFitProject.cpp
+++ b/src/gis/fit/CFitProject.cpp
@@ -66,6 +66,8 @@ void CFitProject::loadFitFromFile(const QString &filename, bool showErrorMsg)
         }
         valid = false;
     }
+
+    sortItems();
     blockUpdateItems(false);
 }
 
diff --git a/src/gis/fit/CFitProject.h b/src/gis/fit/CFitProject.h
index 88888d8..decba1e 100644
--- a/src/gis/fit/CFitProject.h
+++ b/src/gis/fit/CFitProject.h
@@ -27,6 +27,7 @@ class CFitStream;
 
 class CFitProject final : public IGisProject
 {
+    Q_DECLARE_TR_FUNCTIONS(CFitProject)
 public:
     CFitProject(const QString& filename, CGisListWks * parent);
     CFitProject(const QString& filename, IDevice * parent);
diff --git a/src/gis/fit/decoder/CFitCrcState.h b/src/gis/fit/decoder/CFitCrcState.h
index c803687..9f5c397 100644
--- a/src/gis/fit/decoder/CFitCrcState.h
+++ b/src/gis/fit/decoder/CFitCrcState.h
@@ -23,6 +23,7 @@
 
 class CFitCrcState final : public IFitDecoderState
 {
+    Q_DECLARE_TR_FUNCTIONS(CFitCrcState)
 public:
     CFitCrcState(shared_state_data_t &data) : IFitDecoderState(data) { reset(); }
     virtual ~CFitCrcState() {}
diff --git a/src/gis/fit/decoder/CFitHeaderState.h b/src/gis/fit/decoder/CFitHeaderState.h
index dc15b95..56caf51 100644
--- a/src/gis/fit/decoder/CFitHeaderState.h
+++ b/src/gis/fit/decoder/CFitHeaderState.h
@@ -23,6 +23,7 @@
 
 class CFitHeaderState final : public IFitDecoderState
 {
+    Q_DECLARE_TR_FUNCTIONS(CFitHeaderState)
 public:
     CFitHeaderState(shared_state_data_t &data) : IFitDecoderState(data) { reset(); }
     virtual ~CFitHeaderState() {}
diff --git a/src/gis/fit/decoder/CFitRecordContentState.h b/src/gis/fit/decoder/CFitRecordContentState.h
index 91b8458..618a70a 100644
--- a/src/gis/fit/decoder/CFitRecordContentState.h
+++ b/src/gis/fit/decoder/CFitRecordContentState.h
@@ -23,6 +23,7 @@
 
 class CFitRecordContentState final : public IFitDecoderState
 {
+    Q_DECLARE_TR_FUNCTIONS(CFitRecordContentState)
 public:
     CFitRecordContentState(shared_state_data_t &data) : IFitDecoderState(data) { reset(); }
     virtual ~CFitRecordContentState() {}
diff --git a/src/gis/gpx/CGpxProject.cpp b/src/gis/gpx/CGpxProject.cpp
index 779c8d4..1d28dc6 100644
--- a/src/gis/gpx/CGpxProject.cpp
+++ b/src/gis/gpx/CGpxProject.cpp
@@ -99,7 +99,7 @@ void CGpxProject::loadGpx(const QString &filename, CGpxProject *project)
     QFile file(filename);
 
     // if the file does not exist, the filename is assumed to be a name for a new project
-    if(!file.exists())
+    if(!file.exists() || QFileInfo(filename).suffix().toLower() != "gpx")
     {
         project->filename.clear();
         project->setupName(filename);
@@ -158,9 +158,14 @@ void CGpxProject::loadGpx(const QString &filename, CGpxProject *project)
         project->key = xmlExtension.namedItem("ql:key").toElement().text();
     }
 
-    if(xmlExtension.namedItem("ql:sorting").isElement())
+    if(xmlExtension.namedItem("ql:sortingRoadbook").isElement())
     {
-        project->sorting = sorting_e(xmlExtension.namedItem("ql:sorting").toElement().text().toInt());
+        project->sortingRoadbook = sorting_roadbook_e(xmlExtension.namedItem("ql:sortingRoadbook").toElement().text().toInt());
+    }
+
+    if(xmlExtension.namedItem("ql:sortingFolder").isElement())
+    {
+        project->sortingFolder = sorting_folder_e(xmlExtension.namedItem("ql:sortingFolder").toElement().text().toInt());
     }
 
     if(xmlExtension.namedItem("ql:correlation").isElement())
@@ -221,6 +226,7 @@ void CGpxProject::loadGpx(const QString &filename, CGpxProject *project)
         new CGisItemOvlArea(xmlArea, project);
     }
 
+    project->sortItems();
     project->setupName(QFileInfo(filename).baseName().replace("_", " "));
     project->setToolTip(CGisListWks::eColumnName, project->getInfo());
     project->valid = true;
@@ -344,9 +350,16 @@ bool CGpxProject::saveAs(const QString& fn, IGisProject& project)
     }
 
     {
-        QDomElement elem = xmlExt.ownerDocument().createElement("ql:sorting");
+        QDomElement elem = xmlExt.ownerDocument().createElement("ql:sortingRoadbook");
+        xmlExt.appendChild(elem);
+        QDomText text = xmlExt.ownerDocument().createTextNode(QString::number(project.getSortingRoadbook()));
+        elem.appendChild(text);
+    }
+
+    {
+        QDomElement elem = xmlExt.ownerDocument().createElement("ql:sortingFolder");
         xmlExt.appendChild(elem);
-        QDomText text = xmlExt.ownerDocument().createTextNode(QString::number(project.getSorting()));
+        QDomText text = xmlExt.ownerDocument().createTextNode(QString::number(project.getSortingFolder()));
         elem.appendChild(text);
     }
 
diff --git a/src/gis/ovl/CGisItemOvlArea.cpp b/src/gis/ovl/CGisItemOvlArea.cpp
index 5249928..3b6c11f 100644
--- a/src/gis/ovl/CGisItemOvlArea.cpp
+++ b/src/gis/ovl/CGisItemOvlArea.cpp
@@ -376,10 +376,16 @@ IScrOpt * CGisItemOvlArea::getScreenOptions(const QPoint& origin, IMouse * mouse
     return scrOpt;
 }
 
-QString CGisItemOvlArea::getInfo(bool allowEdit) const
+QString CGisItemOvlArea::getInfo(bool showName, bool showFullText) const
 {
     QString unit, val;
-    QString str = "<div style='font-weight: bold;'>" + getName() + "</div>";
+    QString str = "<div>";
+
+    if(showName)
+    {
+        str += "<b>" + getName() + "</b>";
+    }
+
 
     IUnit::self().meter2area(area.area, val, unit);
     str += "<br/>\n" + tr("Area: %1%2").arg(val).arg(unit);
@@ -392,37 +398,35 @@ QString CGisItemOvlArea::getInfo(bool allowEdit) const
             str += "<br/>\n";
         }
 
-        if(desc.count() < 200)
+        if(showFullText || (desc.count() < 300))
         {
             str += desc;
         }
         else
         {
-            str += desc.left(197) + "...";
+            str += desc.left(297) + "...";
         }
     }
-    else
+
+    QString cmt = removeHtml(area.cmt).simplified();
+    if((cmt != desc) && cmt.count())
     {
-        QString cmt = removeHtml(area.cmt).simplified();
-        if(cmt.count())
+        if(!str.isEmpty())
+        {
+            str += "<br/>\n";
+        }
+
+        if(showFullText || cmt.count() < 300)
+        {
+            str += cmt;
+        }
+        else
         {
-            if(!str.isEmpty())
-            {
-                str += "<br/>\n";
-            }
-
-            if(cmt.count() < 200)
-            {
-                str += cmt;
-            }
-            else
-            {
-                str += cmt.left(197) + "...";
-            }
+            str += cmt.left(297) + "...";
         }
     }
 
-    return str;
+    return str + "</div>";
 }
 
 void CGisItemOvlArea::getPolylineFromData(SGisLine &l)
diff --git a/src/gis/ovl/CGisItemOvlArea.h b/src/gis/ovl/CGisItemOvlArea.h
index 8913724..0177224 100644
--- a/src/gis/ovl/CGisItemOvlArea.h
+++ b/src/gis/ovl/CGisItemOvlArea.h
@@ -58,7 +58,7 @@ public:
     {
         return colorIdx;
     }
-    QString getInfo(bool allowEdit = false) const override;
+    QString getInfo(bool showName, bool showFullText) const override;
     void getPolylineFromData(SGisLine& l) override;
     const QString& getComment() const override
     {
@@ -85,6 +85,11 @@ public:
         return area.opacity;
     }
 
+    QDateTime getTimestamp() const override
+    {
+        return QDateTime();
+    }
+
     void setName(const QString& str);
     void setColor(size_t idx);
     void setDataFromPolyline(const SGisLine& l) override;
diff --git a/src/gis/ovl/CScrOptOvlArea.cpp b/src/gis/ovl/CScrOptOvlArea.cpp
index bbdd816..d6b4f7a 100644
--- a/src/gis/ovl/CScrOptOvlArea.cpp
+++ b/src/gis/ovl/CScrOptOvlArea.cpp
@@ -30,7 +30,7 @@ CScrOptOvlArea::CScrOptOvlArea(CGisItemOvlArea *area, const QPoint &point, IMous
     setupUi(this);
     setOrigin(point);
     label->setFont(CMainWindow::self().getMapFont());
-    label->setText(area->getInfo());
+    label->setText(area->getInfo(true, false));
     adjustSize();
 
     anchor = area->getPointCloseBy(point);
diff --git a/src/gis/prj/CDetailsPrj.cpp b/src/gis/prj/CDetailsPrj.cpp
index 12f7678..ffcabba 100644
--- a/src/gis/prj/CDetailsPrj.cpp
+++ b/src/gis/prj/CDetailsPrj.cpp
@@ -16,6 +16,7 @@
 
 **********************************************************************************************/
 
+#include "CMainWindow.h"
 #include "gis/IGisItem.h"
 #include "gis/ovl/CGisItemOvlArea.h"
 #include "gis/prj/CDetailsPrj.h"
@@ -118,8 +119,8 @@ void CDetailsPrj::slotSetupGui()
     }
 
     X______________BlockAllSignals______________X(this);
-    comboSort->setCurrentIndex(prj.getSorting());
-    if((prj.getSorting() > IGisProject::eSortTime) && !prj.doCorrelation())
+    comboSort->setCurrentIndex(prj.getSortingRoadbook());
+    if((prj.getSortingRoadbook() > IGisProject::eSortRoadbookNone) && !prj.doCorrelation())
     {
         X_____________UnBlockAllSignals_____________X(this);
 
@@ -131,7 +132,7 @@ void CDetailsPrj::slotSetupGui()
         }
         else
         {
-            comboSort->setCurrentIndex(IGisProject::eSortNone);
+            comboSort->setCurrentIndex(IGisProject::eSortRoadbookNone);
         }
         timerUpdateTime->start();
 
@@ -161,8 +162,15 @@ void CDetailsPrj::slotSetupGui()
     }
     X_____________UnBlockAllSignals_____________X(this);
 
-    textDesc->document()->setTextWidth(textDesc->size().width() - 20);
-    draw(*textDesc->document(), false);
+    // Create a new document, fill it and attach it to the text browser.
+    // This is much faster than to use the current one of the text browser.
+    // According to the docs, the text browser's current document should be
+    // deleted because the text browser is it's parent.
+    QTextDocument * doc = new QTextDocument();
+    doc->setTextWidth(textDesc->size().width() - 20);
+    draw(*doc, false);
+    doc->setParent(textDesc);
+    textDesc->setDocument(doc);
 
     QTabWidget * tabWidget = dynamic_cast<QTabWidget*>(parentWidget() ? parentWidget()->parentWidget() : nullptr);
     if(tabWidget)
@@ -180,16 +188,6 @@ void CDetailsPrj::slotSetupGui()
 #define ROOT_FRAME_MARGIN 5
 #define CHAR_PER_LINE 130
 
-bool sortTrkByTime(const CGisItemTrk * trk1, const CGisItemTrk * trk2)
-{
-    return trk1->getTimeStart() < trk2->getTimeStart();
-}
-
-bool sortWptByTime(const CGisItemWpt * wpt1, const CGisItemWpt * wpt2)
-{
-    return wpt1->getTime() < wpt2->getTime();
-}
-
 void CDetailsPrj::draw(QTextDocument& doc, bool printable)
 {
     int w = doc.textWidth();
@@ -197,10 +195,7 @@ void CDetailsPrj::draw(QTextDocument& doc, bool printable)
 
     QFontMetrics fm(QFont(font().family(),12));
     int pointSize = ((10 * (w - 2 * ROOT_FRAME_MARGIN)) / (CHAR_PER_LINE *  fm.width("X")));
-    if(pointSize == 0)
-    {
-        return;
-    }
+    pointSize = qMax(pointSize,CMainWindow::self().getMapFont().pointSize());
 
     QFont f = textDesc->font();
     f.setPointSize(pointSize);
@@ -342,7 +337,7 @@ void CDetailsPrj::draw(QTextDocument& doc, bool printable)
     int n=1;
     PROGRESS_SETUP(tr("Build diary..."), 0, nItems, this);
 
-    if(comboSort->currentIndex() > IGisProject::eSortTime)
+    if(comboSort->currentIndex() > IGisProject::eSortRoadbookNone)
     {
         drawByTrack(cursor, trks, wpts, progress, n, isReadOnly);
     }
@@ -378,7 +373,7 @@ void CDetailsPrj::drawInfo(QTextCursor& cursor, bool isReadOnly)
 void CDetailsPrj::drawTrackSummary(QTextCursor& cursor, const QList<CGisItemTrk*> trks, bool isReadOnly)
 {
     quint32 flags = 0;
-    QVector<CActivityTrk::activity_summary_t> summaries(CGisItemTrk::trkpt_t::eActMaxNum + 1);
+    QMap<uint32_t, CActivityTrk::activity_summary_t> summaries;
     for(const CGisItemTrk* trk : trks)
     {
         const CActivityTrk& activities = trk->getActivities();
@@ -435,12 +430,6 @@ void CDetailsPrj::drawByGroup(QTextCursor &cursor, QList<CGisItemTrk*>& trks, QL
 {
     int cnt, w = cursor.document()->textWidth();
 
-    if(comboSort->currentIndex() == IGisProject::eSortTime)
-    {
-        qSort(trks.begin(), trks.end(), sortTrkByTime);
-        qSort(wpts.begin(), wpts.end(), sortWptByTime);
-    }
-
     if(!wpts.isEmpty())
     {
         cursor.insertHtml(tr("<h2>Waypoints</h2>"));
@@ -459,7 +448,7 @@ void CDetailsPrj::drawByGroup(QTextCursor &cursor, QList<CGisItemTrk*>& trks, QL
             PROGRESS(n++, return );
 
             addIcon(table, eSym1, cnt, wpt, printable);
-            table->cellAt(cnt,eInfo1).firstCursorPosition().insertHtml(wpt->getInfo());
+            table->cellAt(cnt,eInfo1).firstCursorPosition().insertHtml(wpt->getInfo(true, false));
             table->cellAt(cnt,eComment1).firstCursorPosition().insertHtml(IGisItem::createText(wpt->isReadOnly()||printable, wpt->getComment(), wpt->getDescription(), wpt->getLinks(), wpt->getKey().item));
             cnt++;
         }
@@ -492,7 +481,7 @@ void CDetailsPrj::drawByGroup(QTextCursor &cursor, QList<CGisItemTrk*>& trks, QL
 
             if(w1 < 300)
             {
-                table->cellAt(cnt,eInfo1).firstCursorPosition().insertHtml(trk->getInfo());
+                table->cellAt(cnt,eInfo1).firstCursorPosition().insertHtml(trk->getInfo(true, false));
 
                 QTextTable * table1 = table->cellAt(cnt,eInfo1).lastCursorPosition().insertTable(1, 2, fmtTableInfo);
 
@@ -508,7 +497,7 @@ void CDetailsPrj::drawByGroup(QTextCursor &cursor, QList<CGisItemTrk*>& trks, QL
             {
                 QTextTable * table1 = table->cellAt(cnt,eInfo1).firstCursorPosition().insertTable(1, 3, fmtTableInfo);
 
-                table1->cellAt(0,0).firstCursorPosition().insertHtml(trk->getInfo());
+                table1->cellAt(0,0).firstCursorPosition().insertHtml(trk->getInfo(true, false));
 
                 QImage profile(w1,h1,QImage::Format_ARGB32);
                 getTrackProfile(trk, profile);
@@ -549,10 +538,6 @@ void CDetailsPrj::drawByTrack(QTextCursor& cursor, QList<CGisItemTrk *> &trks, Q
 {
     int cnt, w = cursor.document()->textWidth();
 
-    if(comboSort->currentIndex() == IGisProject::eSortTime)
-    {
-        qSort(trks.begin(), trks.end(), sortTrkByTime);
-    }
 
     const qreal w1 = qRound(w/3.5 > 300 ? 300 : w/3.5);
     const qreal h1 = qRound(w1/2.0);
@@ -617,7 +602,7 @@ void CDetailsPrj::drawByTrack(QTextCursor& cursor, QList<CGisItemTrk *> &trks, Q
             if(wpt != nullptr)
             {
                 addIcon(table, eSym2, cnt, wpt, printable);
-                table->cellAt(cnt,eInfo2).firstCursorPosition().insertHtml(wpt->getInfo());
+                table->cellAt(cnt,eInfo2).firstCursorPosition().insertHtml(wpt->getInfo(true, false));
 
                 QTextTable * table1 = table->cellAt(cnt,eData2).lastCursorPosition().insertTable(1, 2, fmtTableInfo);
 
@@ -691,7 +676,7 @@ void CDetailsPrj::drawByTrack(QTextCursor& cursor, QList<CGisItemTrk *> &trks, Q
         }
 
         addIcon(table, eSym1, cnt, trk, printable);
-        table->cellAt(cnt,eInfo2).firstCursorPosition().insertHtml(trk->getInfo());
+        table->cellAt(cnt,eInfo2).firstCursorPosition().insertHtml(trk->getInfo(true, false));
 
         QTextTable * table1 = table->cellAt(cnt,eData2).lastCursorPosition().insertTable(1, 2, fmtTableInfo);
 
@@ -731,7 +716,7 @@ void CDetailsPrj::drawArea(QTextCursor& cursor, QList<CGisItemOvlArea *> &areas,
         PROGRESS(n++, return );
 
         addIcon(table, eSym1, cnt, area, printable);
-        table->cellAt(cnt,eInfo1).firstCursorPosition().insertHtml(area->getInfo());
+        table->cellAt(cnt,eInfo1).firstCursorPosition().insertHtml(area->getInfo(true, false));
         table->cellAt(cnt,eComment1).firstCursorPosition().insertHtml(IGisItem::createText(area->isReadOnly()||printable, area->getComment(), area->getDescription(), area->getLinks(), area->getKey().item));
         cnt++;
     }
@@ -761,7 +746,7 @@ void CDetailsPrj::drawRoute(QTextCursor& cursor, QList<CGisItemRte *> &rtes, CPr
         PROGRESS(n++, return );
 
         addIcon(table, eSym1, cnt, rte, printable);
-        table->cellAt(cnt,eInfo1).firstCursorPosition().insertHtml(rte->getInfo());
+        table->cellAt(cnt,eInfo1).firstCursorPosition().insertHtml(rte->getInfo(true, false));
         table->cellAt(cnt,eComment1).firstCursorPosition().insertHtml(IGisItem::createText(rte->isReadOnly()||printable, rte->getComment(), rte->getDescription(), rte->getLinks(), rte->getKey().item));
         cnt++;
     }
@@ -963,7 +948,7 @@ void CDetailsPrj::slotLock(bool on)
 void CDetailsPrj::slotSortMode(int idx)
 {
     comboSort->setEnabled(false);
-    prj.setSorting(IGisProject::sorting_e(idx));
+    prj.setSortingRoadbook(IGisProject::sorting_roadbook_e(idx));
     slotSetupGui();
 }
 
diff --git a/src/gis/prj/IDetailsPrj.ui b/src/gis/prj/IDetailsPrj.ui
index db1b26b..d03ba63 100644
--- a/src/gis/prj/IDetailsPrj.ui
+++ b/src/gis/prj/IDetailsPrj.ui
@@ -73,11 +73,6 @@
        </item>
        <item>
         <property name="text">
-         <string>Sort by time</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
          <string>Sort along track (multiple)</string>
         </property>
        </item>
diff --git a/src/gis/prj/IGisProject.cpp b/src/gis/prj/IGisProject.cpp
index 284fa62..ab71ac6 100644
--- a/src/gis/prj/IGisProject.cpp
+++ b/src/gis/prj/IGisProject.cpp
@@ -212,10 +212,23 @@ void IGisProject::setLinks(const QList<IGisItem::link_t>& links)
     setChanged();
 }
 
-void IGisProject::setSorting(sorting_e s)
+void IGisProject::setSortingRoadbook(sorting_roadbook_e s)
 {
-    bool changed = s != sorting;
-    sorting = s;
+    bool changed = (s != sortingRoadbook);
+    sortingRoadbook = s;
+    if(changed)
+    {
+        setChanged();
+    }
+}
+
+void IGisProject::setSortingFolder(sorting_folder_e s)
+{
+    bool changed = (s != sortingFolder);
+    sortingFolder = s;
+
+    sortItems();
+
     if(changed)
     {
         setChanged();
@@ -272,6 +285,11 @@ void IGisProject::updateItems()
             }
         }
     }
+
+    if(dlgDetails != nullptr)
+    {
+        dlgDetails->updateData();
+    }
 }
 
 bool IGisProject::save()
@@ -318,8 +336,7 @@ bool IGisProject::saveAs(QString fn, QString filter)
     if(filter == getFileDialogFilter())
     {
         filename = fn;
-        metadata.name.clear();
-        setupName(QFileInfo(fn).baseName());
+        setupName(QFileInfo(fn).completeBaseName());
     }
 
     if(filter == filedialogFilterGPX)
@@ -902,3 +919,92 @@ void IGisProject::updateDecoration()
 
     setText(CGisListWks::eColumnDecoration, saved ? "" : "*");
 }
+
+void IGisProject::sortItems()
+{
+    QList<IGisItem*> trks;
+    QList<IGisItem*> rtes;
+    QList<IGisItem*> wpts;
+    QList<IGisItem*> ovls;
+
+    QList<QTreeWidgetItem*> items = takeChildren();
+    for(QTreeWidgetItem* item : items)
+    {
+        CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(item);
+        if(trk != nullptr)
+        {
+            trks << trk;
+            continue;
+        }
+
+        CGisItemRte * rte = dynamic_cast<CGisItemRte*>(item);
+        if(rte != nullptr)
+        {
+            rtes << rte;
+            continue;
+        }
+
+        CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(item);
+        if(wpt != nullptr)
+        {
+            wpts << wpt;
+            continue;
+        }
+
+        CGisItemOvlArea * ovl = dynamic_cast<CGisItemOvlArea*>(item);
+        if(ovl != nullptr)
+        {
+            ovls << ovl;
+            continue;
+        }
+    }
+
+    sortItems(trks);
+    sortItems(rtes);
+    sortItems(wpts);
+    sortItems(ovls);
+
+    items.clear();
+    for(IGisItem * item : trks)
+    {
+        items << item;
+    }
+    for(IGisItem * item : rtes)
+    {
+        items << item;
+    }
+    for(IGisItem * item : wpts)
+    {
+        items << item;
+    }
+    for(IGisItem * item : ovls)
+    {
+        items << item;
+    }
+
+    addChildren(items);
+}
+
+bool sortByName(IGisItem * item1, IGisItem * item2)
+{
+    return item1->getName() < item2->getName();
+}
+
+bool sortByTime(IGisItem * item1, IGisItem * item2)
+{
+    return item1->getTimestamp() < item2->getTimestamp();
+}
+
+void IGisProject::sortItems(QList<IGisItem *> &items) const
+{
+    switch(sortingFolder)
+    {
+    case IGisProject::eSortFolderName:
+        qSort(items.begin(), items.end(), &sortByName);
+        break;
+
+    case IGisProject::eSortFolderTime:
+        qSort(items.begin(), items.end(), &sortByTime);
+        break;
+    }
+}
diff --git a/src/gis/prj/IGisProject.h b/src/gis/prj/IGisProject.h
index 313865d..06ccb26 100644
--- a/src/gis/prj/IGisProject.h
+++ b/src/gis/prj/IGisProject.h
@@ -47,12 +47,18 @@ public:
         , eTypeFit
     };
 
-    enum sorting_e
+    enum sorting_roadbook_e
     {
-        eSortNone
-        , eSortTime
-        , eSortTrackWithDouble
-        , eSortTrackWithoutDouble
+        eSortRoadbookNone
+        , eSortRoadbookTrackWithDouble
+        , eSortRoadbookTrackWithoutDouble
+    };
+
+    enum sorting_folder_e
+    {
+        eSortFolderTime
+        ,eSortFolderName
+        ,eSortFolderSymbol
     };
 
     struct person_t
@@ -222,9 +228,14 @@ public:
        @brief Get the sorting mode
        @return One of sorting_e
      */
-    sorting_e getSorting() const
+    sorting_roadbook_e getSortingRoadbook() const
     {
-        return sorting;
+        return sortingRoadbook;
+    }
+
+    sorting_folder_e getSortingFolder() const
+    {
+        return sortingFolder;
     }
 
     void setName(const QString& str);
@@ -237,13 +248,22 @@ public:
     void setChanged();
 
     /**
-       @brief Set the sorting mode_t
+       @brief Set the sorting mode for the roadbook in the details dialog
+
+       This will mark the project as changed.
+
+       @param s the mode
+     */
+    void setSortingRoadbook(sorting_roadbook_e s);
+
+    /**
+       @brief Set the sorting mode for workspace folder
 
        This will mark the project as changed.
 
        @param s the mode
      */
-    void setSorting(sorting_e s);
+    void setSortingFolder(sorting_folder_e s);
 
     /**
        @brief Get a short metadata summary
@@ -451,6 +471,8 @@ protected:
     void updateItems();
     void updateItemCounters();
     void updateDecoration();
+    void sortItems();
+    void sortItems(QList<IGisItem*>& items) const;
 
     /**
        @brief Converts a string with HTML tags to a string without HTML depending on the device
@@ -486,7 +508,8 @@ protected:
     metadata_t metadata;
     QString nameSuffix;
 
-    sorting_e sorting = eSortNone;
+    sorting_roadbook_e sortingRoadbook  = eSortRoadbookNone;
+    sorting_folder_e sortingFolder    = eSortFolderTime;
 
     qint32 cntItemsByType[IGisItem::eTypeMax];
 
diff --git a/src/gis/qms/CQmsProject.cpp b/src/gis/qms/CQmsProject.cpp
index d9b52f5..05ab2ae 100644
--- a/src/gis/qms/CQmsProject.cpp
+++ b/src/gis/qms/CQmsProject.cpp
@@ -34,7 +34,7 @@ CQmsProject::CQmsProject(const QString &filename, CGisListWks *parent)
     QFile file(filename);
 
     // if the file does not exist, the filename is assumed to be a name for a new project
-    if(!file.exists())
+    if(!file.exists() || QFileInfo(filename).suffix().toLower() != "qms")
     {
         IGisProject::filename.clear();
         setupName(filename);
diff --git a/src/gis/qms/serialization.cpp b/src/gis/qms/serialization.cpp
index b01e749..40dbcc7 100644
--- a/src/gis/qms/serialization.cpp
+++ b/src/gis/qms/serialization.cpp
@@ -41,7 +41,7 @@
 #define VER_GC_T        quint8(1)
 #define VER_GCLOG_T     quint8(1)
 #define VER_IMAGE       quint8(1)
-#define VER_PROJECT     quint8(4)
+#define VER_PROJECT     quint8(5)
 #define VER_COPYRIGHT   quint8(1)
 #define VER_PERSON      quint8(1)
 #define VER_HIST        quint8(1)
@@ -604,7 +604,7 @@ QDataStream& CGisItemTrk::operator<<(QDataStream& stream)
     deriveSecondaryData();
     setColor(str2color(trk.color));
     setText(   CGisListWks::eColumnName, getName());
-    setToolTip(CGisListWks::eColumnName, getInfo());
+    setToolTip(CGisListWks::eColumnName, getInfo(true, false));
     return stream;
 }
 
@@ -646,7 +646,7 @@ QDataStream& CGisItemWpt::operator<<(QDataStream& stream)
 
     setIcon();
     setText   (CGisListWks::eColumnName, getName());
-    setToolTip(CGisListWks::eColumnName, getInfo());
+    setToolTip(CGisListWks::eColumnName, getInfo(true, false));
 
     return stream;
 }
@@ -725,7 +725,7 @@ QDataStream& CGisItemRte::operator<<(QDataStream& stream)
     setSymbol();
     deriveSecondaryData();
     setText   (CGisListWks::eColumnName, getName());
-    setToolTip(CGisListWks::eColumnName, getInfo());
+    setToolTip(CGisListWks::eColumnName, getInfo(true, false));
 
     return stream;
 }
@@ -805,7 +805,7 @@ QDataStream& CGisItemOvlArea::operator<<(QDataStream& stream)
 
     setColor(str2color(area.color));
     setText   (CGisListWks::eColumnName, getName());
-    setToolTip(CGisListWks::eColumnName, getInfo());
+    setToolTip(CGisListWks::eColumnName, getInfo(true, false));
 
     return stream;
 }
@@ -857,7 +857,15 @@ QDataStream& IGisProject::operator<<(QDataStream& stream)
     blockUpdateItems(true);
 
     stream >> version;
-    stream >> filename;
+    if(filename.isEmpty())
+    {
+        stream >> filename;
+    }
+    else
+    {
+        QString tmp;
+        stream >> tmp;
+    }
     stream >> metadata.name;
     stream >> metadata.desc;
     stream >> metadata.author;
@@ -874,7 +882,7 @@ QDataStream& IGisProject::operator<<(QDataStream& stream)
     {
         qint32 tmp;
         stream >> tmp;
-        sorting = (sorting_e)tmp;
+        sortingRoadbook = (sorting_roadbook_e)tmp;
     }
     if(version > 3)
     {
@@ -883,6 +891,13 @@ QDataStream& IGisProject::operator<<(QDataStream& stream)
         noCorrelation = tmp != 0;
     }
 
+    if(version > 4)
+    {
+        qint32 tmp;
+        stream >> tmp;
+        sortingFolder = (sorting_folder_e)tmp;
+    }
+
     while(!stream.atEnd())
     {
         QString lastDatabaseHash;
@@ -932,6 +947,8 @@ QDataStream& IGisProject::operator<<(QDataStream& stream)
         }
     }
 
+    sortItems();
+
     blockUpdateItems(false);
     return stream;
 }
@@ -951,8 +968,9 @@ QDataStream& IGisProject::operator>>(QDataStream& stream) const
     stream << metadata.keywords;
     stream << metadata.bounds;
     stream << key;
-    stream << qint32(sorting);
+    stream << qint32(sortingRoadbook);
     stream << qint8(noCorrelation);
+    stream << qint32(sortingFolder);
 
     for(int i = 0; i < childCount(); i++)
     {
@@ -1043,7 +1061,7 @@ QDataStream& CDBProject::operator<<(QDataStream& stream)
     {
         qint32 tmp;
         stream >> tmp;
-        sorting = (sorting_e)tmp;
+        sortingRoadbook = (sorting_roadbook_e)tmp;
     }
     if(version > 3)
     {
@@ -1051,6 +1069,12 @@ QDataStream& CDBProject::operator<<(QDataStream& stream)
         stream >> tmp;
         noCorrelation = tmp != 0;
     }
+    if(version > 4)
+    {
+        qint32 tmp;
+        stream >> tmp;
+        sortingFolder = (sorting_folder_e)tmp;
+    }
 
     return stream;
 }
@@ -1070,8 +1094,9 @@ QDataStream& CDBProject::operator>>(QDataStream& stream) const
     stream << metadata.keywords;
     stream << metadata.bounds;
     stream << key;
-    stream << qint32(sorting);
+    stream << qint32(sortingRoadbook);
     stream << qint8(noCorrelation);
+    stream << qint32(sortingFolder);
 
     return stream;
 }
diff --git a/src/gis/rte/CCreateRouteFromWpt.cpp b/src/gis/rte/CCreateRouteFromWpt.cpp
index 30929c3..530f3d4 100644
--- a/src/gis/rte/CCreateRouteFromWpt.cpp
+++ b/src/gis/rte/CCreateRouteFromWpt.cpp
@@ -45,7 +45,7 @@ CCreateRouteFromWpt::CCreateRouteFromWpt(const QList<IGisItem::key_t> &keys, QWi
         QListWidgetItem * item = new QListWidgetItem(listWidget);
         item->setText(wpt->getName());
         item->setIcon(wpt->getIcon());
-        item->setToolTip(wpt->getInfo());
+        item->setToolTip(wpt->getInfo(true, false));
         item->setData(Qt::UserRole + 0, QPointF(wpt->getPosition()*DEG_TO_RAD));
     }
 
@@ -74,7 +74,7 @@ void CCreateRouteFromWpt::accept()
     for(int i = 0; i < listWidget->count(); i++)
     {
         QListWidgetItem * item = listWidget->item(i);
-        points << IGisLine::point_t(item->data(Qt::UserRole + 0).toPointF());
+        points << IGisLine::point_t(item->data(Qt::UserRole + 0).toPointF(),item->text());
     }
 
     CGisItemRte* rte = new CGisItemRte(points,name, project, NOIDX);
diff --git a/src/gis/rte/CDetailsRte.cpp b/src/gis/rte/CDetailsRte.cpp
index d5abf36..8aa5c90 100644
--- a/src/gis/rte/CDetailsRte.cpp
+++ b/src/gis/rte/CDetailsRte.cpp
@@ -64,7 +64,7 @@ void CDetailsRte::setupGui()
     lineName->setText(rte.getName());
     lineName->setReadOnly(isReadOnly);
 
-    labelInfo->setText(rte.getInfo(false));
+    labelInfo->setText(rte.getInfo(false, false));
 
     textCmtDesc->document()->clear();
     textCmtDesc->append(IGisItem::createText(isReadOnly, rte.getComment(), rte.getDescription(), rte.getLinks()));
diff --git a/src/gis/rte/CGisItemRte.cpp b/src/gis/rte/CGisItemRte.cpp
index 01c974d..6f73758 100644
--- a/src/gis/rte/CGisItemRte.cpp
+++ b/src/gis/rte/CGisItemRte.cpp
@@ -330,9 +330,9 @@ void CGisItemRte::setLinks(const QList<link_t>& links)
 
 
 
-QString CGisItemRte::getInfo(bool showName) const
+QString CGisItemRte::getInfo(bool showName, bool showFullText) const
 {
-    QString val1, unit1, val2, unit2;
+    QString val1, unit1;
     QString str = "<div>";
 
     if(showName)
@@ -378,7 +378,44 @@ QString CGisItemRte::getInfo(bool showName) const
         str += "<br/>\n";
         str += tr("with %1").arg(rte.lastRoutedWith);
     }
-    return str;
+
+    QString desc = removeHtml(rte.desc).simplified();
+    if(desc.count())
+    {
+        if(!str.isEmpty())
+        {
+            str += "<br/>\n";
+        }
+
+        if(showFullText || (desc.count() < 300))
+        {
+            str += desc;
+        }
+        else
+        {
+            str += desc.left(297) + "...";
+        }
+    }
+
+    QString cmt = removeHtml(rte.cmt).simplified();
+    if((cmt != desc) && cmt.count())
+    {
+        if(!str.isEmpty())
+        {
+            str += "<br/>\n";
+        }
+
+        if(showFullText || cmt.count() < 300)
+        {
+            str += cmt;
+        }
+        else
+        {
+            str += cmt.left(297) + "...";
+        }
+    }
+
+    return str + "</div>";
 }
 
 IScrOpt * CGisItemRte::getScreenOptions(const QPoint& origin, IMouse * mouse)
@@ -654,6 +691,7 @@ void CGisItemRte::readRouteDataFromGisLine(const SGisLine &l)
         rtept.lon = pt.coord.x() * RAD_TO_DEG;
         rtept.lat = pt.coord.y() * RAD_TO_DEG;
         rtept.ele = pt.ele;
+        rtept.name = pt.name;
     }
 
     if(doAutoRouting)
diff --git a/src/gis/rte/CGisItemRte.h b/src/gis/rte/CGisItemRte.h
index dc533ca..45bd91e 100644
--- a/src/gis/rte/CGisItemRte.h
+++ b/src/gis/rte/CGisItemRte.h
@@ -124,7 +124,7 @@ public:
         return rte.name.isEmpty() ? noName : rte.name;
     }
 
-    QString getInfo(bool showName = true) const override;
+    QString getInfo(bool showName, bool showFullText) const override;
     IScrOpt * getScreenOptions(const QPoint &origin, IMouse * mouse) override;
     QPointF getPointCloseBy(const QPoint& screenPos) override;
     void drawItem(QPainter& p, const QPolygonF& viewport, QList<QRectF>& blockedAreas, CGisDraw * gis) override;
@@ -191,6 +191,12 @@ public:
         return rte;
     }
 
+    QDateTime getTimestamp() const override
+    {
+        return QDateTime();
+    }
+
+
     void setName(const QString& str);
     void setComment(const QString& str)       override;
     void setDescription(const QString& str)   override;
diff --git a/src/gis/rte/CScrOptRte.cpp b/src/gis/rte/CScrOptRte.cpp
index 51d7f70..02fe4ba 100644
--- a/src/gis/rte/CScrOptRte.cpp
+++ b/src/gis/rte/CScrOptRte.cpp
@@ -31,7 +31,7 @@ CScrOptRte::CScrOptRte(CGisItemRte *rte, const QPoint& point, IMouse *parent)
     setupUi(this);
     setOrigin(point);
     label->setFont(CMainWindow::self().getMapFont());
-    label->setText(rte->getInfo());
+    label->setText(rte->getInfo(true, false));
     adjustSize();
 
     toolInstruction->setEnabled(rte->isCalculated());
diff --git a/src/gis/slf/CSlfProject.cpp b/src/gis/slf/CSlfProject.cpp
index 05b2181..11da6fd 100644
--- a/src/gis/slf/CSlfProject.cpp
+++ b/src/gis/slf/CSlfProject.cpp
@@ -47,6 +47,8 @@ CSlfProject::CSlfProject(const QString &filename, bool readFile)
     {
         IGisProject::filename.clear();
     }
+
+    sortItems();
     blockUpdateItems(false);
     setupName(QFileInfo(filename).baseName().replace("_", " "));
 }
diff --git a/src/gis/tnv/CTwoNavProject.cpp b/src/gis/tnv/CTwoNavProject.cpp
index 158d58d..935bebb 100644
--- a/src/gis/tnv/CTwoNavProject.cpp
+++ b/src/gis/tnv/CTwoNavProject.cpp
@@ -38,6 +38,7 @@ CTwoNavProject::CTwoNavProject(const QString &filename, IDevice * parent)
 
     load(filename);
 
+    sortItems();
     setupName(QFileInfo(filename).baseName().replace("_", " "));
     setToolTip(CGisListWks::eColumnName, getInfo());
     updateItems();
@@ -61,7 +62,7 @@ CTwoNavProject::CTwoNavProject(const QString &filename, const IGisProject * proj
         }
     }
 
-
+    sortItems();
     setupName(QFileInfo(filename).baseName().replace("_", " "));
     setToolTip(CGisListWks::eColumnName, getInfo());
     updateItems();
diff --git a/src/gis/trk/CActivityTrk.cpp b/src/gis/trk/CActivityTrk.cpp
index 0e7a023..4859fee 100644
--- a/src/gis/trk/CActivityTrk.cpp
+++ b/src/gis/trk/CActivityTrk.cpp
@@ -21,115 +21,100 @@
 #include "helpers/CSettings.h"
 #include "units/IUnit.h"
 
-CActivityTrk::desc_t CActivityTrk::actDescriptor[] =
-{
-    { // 0
-        "Foot"
-        , CGisItemTrk::trkpt_t::eActFoot
-        , tr("Foot")
-        , "://icons/48x48/ActFoot.png"
-        , "://icons/16x16/ActFoot.png"
-        , IGisItem::colorMap[0].color
-    },
-    { // 1
-        "Cycle"
-        , CGisItemTrk::trkpt_t::eActCycle
-        , tr("Bicycle")
-        , "://icons/48x48/ActCycle.png"
-        , "://icons/16x16/ActCycle.png"
-        , IGisItem::colorMap[1].color
-    },
-    { // 2
-        "Bike"
-        , CGisItemTrk::trkpt_t::eActBike
-        , tr("Motor Bike")
-        , "://icons/48x48/ActBike.png"
-        , "://icons/16x16/ActBike.png"
-        , IGisItem::colorMap[2].color
-    },
-    { // 3
-        "Car"
-        , CGisItemTrk::trkpt_t::eActCar
-        , tr("Car")
-        , "://icons/48x48/ActCar.png"
-        , "://icons/16x16/ActCar.png"
-        , IGisItem::colorMap[3].color
-    },
-    { // 4
-        "Cable"
-        , CGisItemTrk::trkpt_t::eActCable
-        , tr("Cable Car")
-        , "://icons/48x48/ActCable.png"
-        , "://icons/16x16/ActCable.png"
-        , IGisItem::colorMap[4].color
-    },
-    { // 5
-        "Swim"
-        , CGisItemTrk::trkpt_t::eActSwim
-        , tr("Swim")
-        , "://icons/48x48/ActSwim.png"
-        , "://icons/16x16/ActSwim.png"
-        , IGisItem::colorMap[5].color
-    },
-    { // 6
-        "Ship"
-        , CGisItemTrk::trkpt_t::eActShip
-        , tr("Ship")
-        , "://icons/48x48/ActShip.png"
-        , "://icons/16x16/ActShip.png"
-        , IGisItem::colorMap[6].color
-    },
-    { // 7
-        "Aeronautik"
-        , CGisItemTrk::trkpt_t::eActAero
-        , tr("Aeronautik")
-        , "://icons/48x48/ActAero.png"
-        , "://icons/16x16/ActAero.png"
-        , IGisItem::colorMap[7].color
-    },
-    { // 8
-        "Ski/Winter"
-        , CGisItemTrk::trkpt_t::eActSki
-        , tr("Ski/Winter")
-        , "://icons/48x48/ActSki.png"
-        , "://icons/16x16/ActSki.png"
-        , IGisItem::colorMap[8].color
-    },
-    { // 9
-        QString()
-        , 0
-        , QString()
-        , QString()
-        , QString()
-        , QColor()
-    }
-};
+QVector<CActivityTrk::desc_t> CActivityTrk::actDescriptor;
 
 CActivityTrk::CActivityTrk(CGisItemTrk * trk)
     : trk(trk)
     , allFlags(0)
-    , activitySummary(CGisItemTrk::trkpt_t::eActMaxNum + 1)
 {
 }
 
 void CActivityTrk::init()
 {
-    actDescriptor[0].name = tr("Foot");
-    actDescriptor[1].name = tr("Bicycle");
-    actDescriptor[2].name = tr("Motor Bike");
-    actDescriptor[3].name = tr("Car");
-    actDescriptor[4].name = tr("Cable Car");
-    actDescriptor[5].name = tr("Swim");
-    actDescriptor[6].name = tr("Ship");
-    actDescriptor[7].name = tr("Aeronautics");
-    actDescriptor[8].name = tr("Ski/Winter");
+    actDescriptor =
+    {
+        { // 0
+            "Foot"
+            , CGisItemTrk::trkpt_t::eActFoot
+            , tr("Foot")
+            , "://icons/48x48/ActFoot.png"
+            , "://icons/16x16/ActFoot.png"
+            , IGisItem::colorMap[0].color
+        },
+        { // 1
+            "Cycle"
+            , CGisItemTrk::trkpt_t::eActCycle
+            , tr("Bicycle")
+            , "://icons/48x48/ActCycle.png"
+            , "://icons/16x16/ActCycle.png"
+            , IGisItem::colorMap[1].color
+        },
+        { // 2
+            "Bike"
+            , CGisItemTrk::trkpt_t::eActBike
+            , tr("Motor Bike")
+            , "://icons/48x48/ActBike.png"
+            , "://icons/16x16/ActBike.png"
+            , IGisItem::colorMap[2].color
+        },
+        { // 3
+            "Car"
+            , CGisItemTrk::trkpt_t::eActCar
+            , tr("Car")
+            , "://icons/48x48/ActCar.png"
+            , "://icons/16x16/ActCar.png"
+            , IGisItem::colorMap[3].color
+        },
+        { // 4
+            "Cable"
+            , CGisItemTrk::trkpt_t::eActCable
+            , tr("Cable Car")
+            , "://icons/48x48/ActCable.png"
+            , "://icons/16x16/ActCable.png"
+            , IGisItem::colorMap[4].color
+        },
+        { // 5
+            "Swim"
+            , CGisItemTrk::trkpt_t::eActSwim
+            , tr("Swim")
+            , "://icons/48x48/ActSwim.png"
+            , "://icons/16x16/ActSwim.png"
+            , IGisItem::colorMap[5].color
+        },
+        { // 6
+            "Ship"
+            , CGisItemTrk::trkpt_t::eActShip
+            , tr("Ship")
+            , "://icons/48x48/ActShip.png"
+            , "://icons/16x16/ActShip.png"
+            , IGisItem::colorMap[6].color
+        },
+        { // 7
+            "Aeronautik"
+            , CGisItemTrk::trkpt_t::eActAero
+            , tr("Aeronautics")
+            , "://icons/48x48/ActAero.png"
+            , "://icons/16x16/ActAero.png"
+            , IGisItem::colorMap[7].color
+        },
+        { // 8
+            "Ski/Winter"
+            , CGisItemTrk::trkpt_t::eActSki
+            , tr("Ski/Winter")
+            , "://icons/48x48/ActSki.png"
+            , "://icons/16x16/ActSki.png"
+            , IGisItem::colorMap[8].color
+        }
+    };
+
 
     SETTINGS;
     cfg.beginGroup("Activities");
-    for(int i = 0; !actDescriptor[i].objName.isEmpty(); i++)
+    int i = 0;
+    for(desc_t &desc : actDescriptor)
     {
-        desc_t& desc = actDescriptor[i];
         desc.color = QColor(cfg.value(QString("color%1").arg(i), desc.color.name()).toString());
+        ++i;
     }
     cfg.endGroup(); // Activities
 }
@@ -138,27 +123,44 @@ void CActivityTrk::release()
 {
     SETTINGS;
     cfg.beginGroup("Activities");
-    for(int i = 0; !actDescriptor[i].objName.isEmpty(); i++)
+    int i = 0;
+    for(desc_t &desc : actDescriptor)
     {
-        desc_t& desc = actDescriptor[i];
         cfg.setValue(QString("color%1").arg(i), desc.color.name());
+        ++i;
     }
     cfg.endGroup(); // Activities
 }
 
+uint32_t CActivityTrk::selectActivity(QWidget *parent)
+{
+    QMenu menu(parent);
+
+    for(const desc_t &desc : actDescriptor)
+    {
+        QAction *act = menu.addAction(QIcon(desc.iconLarge), desc.name);
+        act->setData(QVariant(desc.flag));
+    }
+
+    QAction *act = menu.exec(QCursor::pos());
+    if(nullptr != act)
+    {
+        return act->data().toUInt(nullptr);
+    }
+
+    return 0;
+}
+
 
 void CActivityTrk::update()
 {
     allFlags = 0;
     activityRanges.clear();
-    for(int i = 0; i < activitySummary.size(); i++)
-    {
-        activitySummary[i].reset();
-    }
+    activitySummary.clear();
 
-    const CGisItemTrk::trk_t&       data = trk->getTrackData();
-    const CGisItemTrk::trkpt_t *    lastTrkpt = nullptr;
-    const CGisItemTrk::trkpt_t *    startTrkpt = nullptr;
+    const CGisItemTrk::trk_t&   data       = trk->getTrackData();
+    const CGisItemTrk::trkpt_t *lastTrkpt  = nullptr;
+    const CGisItemTrk::trkpt_t *startTrkpt = nullptr;
 
     quint32 lastFlag = 0xFFFFFFFF;
     for(const CGisItemTrk::trkseg_t &seg : data.segs)
@@ -176,10 +178,10 @@ void CActivityTrk::update()
             {
                 if(startTrkpt != nullptr)
                 {
-                    activity_summary_t& summary = getSummary(activitySummary, lastFlag);
+                    activity_summary_t& summary = activitySummary[lastFlag];
                     summary.distance += pt.distance - startTrkpt->distance;
-                    summary.ascend += pt.ascend - startTrkpt->ascend;
-                    summary.descend += pt.descend - startTrkpt->descend;
+                    summary.ascend   += pt.ascend   - startTrkpt->ascend;
+                    summary.descend  += pt.descend  - startTrkpt->descend;
                     summary.ellapsedSeconds += pt.elapsedSeconds - startTrkpt->elapsedSeconds;
                     summary.ellapsedSecondsMoving += pt.elapsedSecondsMoving - startTrkpt->elapsedSecondsMoving;
 
@@ -207,10 +209,10 @@ void CActivityTrk::update()
         return;
     }
 
-    activity_summary_t& summary = getSummary(activitySummary, lastFlag);
+    activity_summary_t& summary = activitySummary[lastFlag];
     summary.distance += lastTrkpt->distance - startTrkpt->distance;
-    summary.ascend += lastTrkpt->ascend - startTrkpt->ascend;
-    summary.descend += lastTrkpt->descend - startTrkpt->descend;
+    summary.ascend   += lastTrkpt->ascend   - startTrkpt->ascend;
+    summary.descend  += lastTrkpt->descend  - startTrkpt->descend;
     summary.ellapsedSeconds += lastTrkpt->elapsedSeconds - startTrkpt->elapsedSeconds;
     summary.ellapsedSecondsMoving += lastTrkpt->elapsedSecondsMoving - startTrkpt->elapsedSecondsMoving;
 
@@ -247,12 +249,11 @@ void CActivityTrk::printSummary(QString& str) const
     printSummary(activitySummary, allFlags, str);
 }
 
-void CActivityTrk::printSummary(const QVector<activity_summary_t>& summary, quint32 flags, QString& str)
+void CActivityTrk::printSummary(const QMap<uint32_t, activity_summary_t>& summary, quint32 flags, QString& str)
 {
-    quint32 mask;
     QString val, unit;
 
-    if((flags == 0) && (summary.size() >= (int)CGisItemTrk::trkpt_t::eActMaxNum))
+    if(flags == 0)
     {
         const activity_summary_t& s = summary[CGisItemTrk::trkpt_t::eActMaxNum];
 
@@ -275,260 +276,164 @@ void CActivityTrk::printSummary(const QVector<activity_summary_t>& summary, quin
         return;
     }
 
-
-    const int N = qMin((int)CGisItemTrk::trkpt_t::eActMaxNum, summary.size());
-
     str += "<table>";
 
-    // ############### build header ###############
-    str += "<tr>";
-    str += "<th></th>";
-    mask = 0x80000000;
-    for(int i = 0; i < N; i++)
+
+    // gather any used activities
+    QVector<const desc_t*> descs;
+    for(const desc_t &desc : actDescriptor)
     {
-        if(actDescriptor[i].objName.isEmpty())
+        if(flags & desc.flag)
         {
-            break;
+            descs << &desc;
         }
+    }
 
-        if((flags & mask) != 0)
-        {
-            str += QString("<th align='right'><img src='%1'/></th>").arg(actDescriptor[i].iconSmall);
-        }
 
-        mask >>= 1;
+    // ############### build header ###############
+    str += "<tr>";
+    str += "<th></th>";
+    for(const desc_t *desc : descs)
+    {
+        str += QString("<th align='right'><img src='%1'/></th>").arg(desc->iconSmall);
     }
     str += "</tr>";
 
     // ############### build Distance row ###############
     str += "<tr>";
     str += "<td>" + tr("Distance:") + "</td>";
-    mask = 0x80000000;
-    for(int i = 0; i < N; i++)
+    for(const desc_t *desc : descs)
     {
-        if(actDescriptor[i].objName.isEmpty())
-        {
-            break;
-        }
-
-        if((flags & mask) != 0)
-        {
-            const activity_summary_t& s = getSummary(summary, mask);
-            IUnit::self().meter2distance(s.distance, val, unit);
-            str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
-        }
-
-        mask >>= 1;
+        const activity_summary_t& s = summary[desc->flag];
+        IUnit::self().meter2distance(s.distance, val, unit);
+        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
     }
     str += "</tr>";
 
     // ############### build Ascend row ###############
     str += "<tr>";
     str += "<td>" + tr("Ascend:") + "</td>";
-    mask = 0x80000000;
-    for(int i = 0; i < N; i++)
+    for(const desc_t *desc : descs)
     {
-        if(actDescriptor[i].objName.isEmpty())
-        {
-            break;
-        }
-
-        if((flags & mask) != 0)
-        {
-            const activity_summary_t& s = getSummary(summary, mask);
-            IUnit::self().meter2elevation(s.ascend, val, unit);
-            str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
-        }
-
-        mask >>= 1;
+        const activity_summary_t& s = summary[desc->flag];
+        IUnit::self().meter2elevation(s.ascend, val, unit);
+        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
     }
     str += "</tr>";
 
     // ############### build Descend row ###############
     str += "<tr>";
     str += "<td>" + tr("Descend:") + "</td>";
-    mask = 0x80000000;
-    for(int i = 0; i < N; i++)
+    for(const desc_t *desc : descs)
     {
-        if(actDescriptor[i].objName.isEmpty())
-        {
-            break;
-        }
-
-        if((flags & mask) != 0)
-        {
-            const activity_summary_t& s = getSummary(summary, mask);
-            IUnit::self().meter2elevation(s.descend, val, unit);
-            str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
-        }
-
-        mask >>= 1;
+        const activity_summary_t& s = summary[desc->flag];
+        IUnit::self().meter2elevation(s.descend, val, unit);
+        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
     }
     str += "</tr>";
 
     // ############### build Speed Moving row ###############
     str += "<tr>";
     str += "<td>" + tr("Speed Moving:") + "</td>";
-    mask = 0x80000000;
-    for(int i = 0; i < N; i++)
+    for(const desc_t *desc : descs)
     {
-        if(actDescriptor[i].objName.isEmpty())
-        {
-            break;
-        }
-
-        if((flags & mask) != 0)
-        {
-            const activity_summary_t& s = getSummary(summary, mask);
-            IUnit::self().meter2speed(s.distance/s.ellapsedSecondsMoving, val, unit);
-            str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
-        }
-
-        mask >>= 1;
+       const activity_summary_t& s = summary[desc->flag];
+       IUnit::self().meter2speed(s.distance/s.ellapsedSecondsMoving, val, unit);
+       str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
     }
     str += "</tr>";
 
     // ############### build Speed row ###############
     str += "<tr>";
     str += "<td>" + tr("Speed Total:") + "</td>";
-    mask = 0x80000000;
-    for(int i = 0; i < N; i++)
+    for(const desc_t *desc : descs)
     {
-        if(actDescriptor[i].objName.isEmpty())
-        {
-            break;
-        }
-
-        if((flags & mask) != 0)
-        {
-            const activity_summary_t& s = getSummary(summary, mask);
-            IUnit::self().meter2speed(s.distance/s.ellapsedSeconds, val, unit);
-            str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
-        }
-
-        mask >>= 1;
+        const activity_summary_t& s = summary[desc->flag];
+        IUnit::self().meter2speed(s.distance/s.ellapsedSeconds, val, unit);
+        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
     }
     str += "</tr>";
 
     // ############### build Time Moving row ###############
     str += "<tr>";
     str += "<td>" + tr("Time Moving:") + "</td>";
-    mask = 0x80000000;
-    for(int i = 0; i < N; i++)
+    for(const desc_t *desc : descs)
     {
-        if(actDescriptor[i].objName.isEmpty())
-        {
-            break;
-        }
-
-        if((flags & mask) != 0)
-        {
-            const activity_summary_t& s = getSummary(summary, mask);
-            IUnit::self().seconds2time(s.ellapsedSecondsMoving, val, unit);
-            str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
-        }
-
-        mask >>= 1;
+        const activity_summary_t& s = summary[desc->flag];
+        IUnit::self().seconds2time(s.ellapsedSecondsMoving, val, unit);
+        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
     }
     str += "</tr>";
 
     // ############### build Time Moving row ###############
     str += "<tr>";
     str += "<td>" + tr("Time Total:") + "</td>";
-    mask = 0x80000000;
-    for(int i = 0; i < N; i++)
+    for(const desc_t *desc : descs)
     {
-        if(actDescriptor[i].objName.isEmpty())
-        {
-            break;
-        }
-
-        if((flags & mask) != 0)
-        {
-            const activity_summary_t& s = getSummary(summary, mask);
-            IUnit::self().seconds2time(s.ellapsedSeconds, val, unit);
-            str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
-        }
-
-        mask >>= 1;
+        const activity_summary_t& s = summary[desc->flag];
+        IUnit::self().seconds2time(s.ellapsedSeconds, val, unit);
+        str += QString("<td align='right'>  %1 %2</td>").arg(val).arg(unit);
     }
     str += "</tr>";
 
     str += "</table>";
 }
 
-void CActivityTrk::sumUp(QVector<activity_summary_t> &summary) const
+void CActivityTrk::sumUp(QMap<uint32_t, activity_summary_t> &summary) const
 {
-    const int N = qMin(activitySummary.size(), summary.size());
-    for(int i = 0; i < N; i++)
+    for(uint32_t flag : activitySummary.keys())
     {
-        const activity_summary_t& sum1 = activitySummary[i];
-        activity_summary_t& sum2 = summary[i];
-
-        sum2.distance += sum1.distance;
-        sum2.ascend += sum1.ascend;
-        sum2.descend += sum1.descend;
-        sum2.ellapsedSeconds += sum1.ellapsedSeconds;
-        sum2.ellapsedSecondsMoving += sum1.ellapsedSecondsMoving;
+        const activity_summary_t &src = activitySummary[flag];
+        activity_summary_t       &dst = summary[flag];
+
+        dst.distance += src.distance;
+        dst.ascend   += src.ascend;
+        dst.descend  += src.descend;
+        dst.ellapsedSeconds += src.ellapsedSeconds;
+        dst.ellapsedSecondsMoving += src.ellapsedSecondsMoving;
     }
 }
 
-const CActivityTrk::activity_summary_t &CActivityTrk::getSummary(const QVector<activity_summary_t>& summary, quint32 flag)
+const CActivityTrk::desc_t& CActivityTrk::getDescriptor(quint32 flag)
 {
-    qint32 cnt = 0;
-    flag >>= 32 - CGisItemTrk::trkpt_t::eActMaxNum;
-
-    while(((flag & 0x01) == 0) && (cnt < qMin((int)CGisItemTrk::trkpt_t::eActMaxNum,summary.size())))
+    for(const desc_t &desc : actDescriptor)
     {
-        cnt++;
-        flag >>= 1;
-    }
-
-    return summary[cnt];
-}
-
-
-CActivityTrk::activity_summary_t& CActivityTrk::getSummary(QVector<activity_summary_t> &summary, quint32 flag)
-{
-    qint32 cnt = 0;
-    flag >>= 32 - CGisItemTrk::trkpt_t::eActMaxNum;
-
-    while(((flag & 0x01) == 0) && (cnt < qMin((int)CGisItemTrk::trkpt_t::eActMaxNum,summary.size())))
-    {
-        cnt++;
-        flag >>= 1;
+        if(desc.flag == flag)
+        {
+            return desc;
+        }
     }
 
-    return summary[cnt];
+    static desc_t dummyDesc = {
+        "None"
+        , CGisItemTrk::trkpt_t::eActNone
+        , tr("None")
+        , "://icons/48x48/ActNone.png"
+        , "://icons/16x16/ActNone.png"
+        , QColor()
+    };
+    return dummyDesc;
 }
 
-const CActivityTrk::desc_t& CActivityTrk::getDescriptor(quint32 flag)
+void CActivityTrk::setColor(quint32 flag, const QString& color)
 {
-    int i = 0;
-    while(!actDescriptor[i].objName.isEmpty())
+    for(desc_t &desc : actDescriptor)
     {
-        if(actDescriptor[i].flag == flag)
+        if(desc.flag == flag)
         {
-            break;
+            desc.color = QColor(color);
+            return;
         }
-
-        i++;
     }
-
-    return actDescriptor[i];
 }
 
-void CActivityTrk::setColor(quint32 flag, const QString& color)
+void CActivityTrk::getActivityNames(QStringList& names) const
 {
-    int i = 0;
-    while(!actDescriptor[i].objName.isEmpty())
+    for(const desc_t &desc : actDescriptor)
     {
-        if(actDescriptor[i].flag == flag)
+        if((allFlags & desc.flag) != 0)
         {
-            actDescriptor[i].color = QColor(color);
-            break;
+            names << desc.name;
         }
-
-        i++;
     }
 }
diff --git a/src/gis/trk/CActivityTrk.h b/src/gis/trk/CActivityTrk.h
index f36741f..6f5161b 100644
--- a/src/gis/trk/CActivityTrk.h
+++ b/src/gis/trk/CActivityTrk.h
@@ -21,6 +21,8 @@
 
 #include <QCoreApplication>
 #include <QIcon>
+#include <QMap>
+#include <QMenu>
 #include <QPointer>
 #include <QVector>
 class CGisItemTrk;
@@ -93,6 +95,10 @@ public:
         return allFlags;
     }
 
+    void getActivityNames(QStringList& names) const;
+
+    static uint32_t selectActivity(QWidget *parent);
+
     /**
        @brief Convert internal summary to HTML table
        @param str   string to receive HTML
@@ -104,13 +110,14 @@ public:
        @param summary  The array of summaries
        @param str   string to receive HTML
      */
-    static void printSummary(const QVector<activity_summary_t> &summary, quint32 flags, QString& str);
+    static void printSummary(const QMap<uint32_t, activity_summary_t> &summary, quint32 flags, QString& str);
+
 
     /**
        @brief Add internal summary to given array of summaries
        @param summary  an array of summaries to hold the sum
      */
-    void sumUp(QVector<activity_summary_t> &summary) const;
+    void sumUp(QMap<uint32_t, activity_summary_t> &summary) const;
 
 
     const QList<activity_range_t>& getActivityRanges() const
@@ -118,7 +125,7 @@ public:
         return activityRanges;
     }
 
-    static const desc_t* getActivityDescriptors()
+    static const QVector<desc_t>& getActivityDescriptors()
     {
         return actDescriptor;
     }
@@ -130,15 +137,13 @@ public:
 private:
     friend class CGisItemTrk;
     CActivityTrk(CGisItemTrk * trk);
-    static activity_summary_t& getSummary(QVector<activity_summary_t> &summary, quint32 flag);
-    static const activity_summary_t& getSummary(const QVector<activity_summary_t> &summary, quint32 flag);
 
-    static desc_t actDescriptor[];
+    static QVector<desc_t> actDescriptor;
 
     CGisItemTrk * trk;
     quint32 allFlags;
     QList<activity_range_t> activityRanges;
-    QVector<activity_summary_t>  activitySummary;
+    QMap<uint32_t, activity_summary_t> activitySummary;
 };
 
 #endif //CACTIVITYTRK_H
diff --git a/src/gis/trk/CDetailsTrk.cpp b/src/gis/trk/CDetailsTrk.cpp
index a7f5bc0..7ea9302 100644
--- a/src/gis/trk/CDetailsTrk.cpp
+++ b/src/gis/trk/CDetailsTrk.cpp
@@ -90,24 +90,6 @@ CDetailsTrk::CDetailsTrk(CGisItemTrk& trk, QWidget *parent)
 
     widgetColorActivity->setTrack(&trk);
 
-    const CActivityTrk::desc_t* actDesc = CActivityTrk::getActivityDescriptors();
-    for(int i = 0; !actDesc[i].name.isEmpty(); ++i)
-    {
-        const CActivityTrk::desc_t& desc = actDesc[i];
-        QCheckBox * check = new QCheckBox(this);
-        check->setText(desc.name);
-        check->setIcon(QIcon(desc.iconLarge));
-        check->setProperty("flag",   desc.flag);
-        check->setProperty("name",   desc.name);
-        check->setProperty("symbol", desc.iconLarge);
-        check->setObjectName("check" + desc.objName);
-
-        connect(check, &QCheckBox::clicked, this, &CDetailsTrk::slotActivitySelected);
-
-        layoutActivities->addWidget(check, i%8, i>>3);
-    }
-    layoutActivities->addItem(new QSpacerItem(0,0,QSizePolicy::Maximum, QSizePolicy::MinimumExpanding),8,0);
-
     updateData();
 
     treeWidget->setTrack(&trk);
@@ -145,6 +127,9 @@ CDetailsTrk::CDetailsTrk(CGisItemTrk& trk, QWidget *parent)
     connect(toolLock,         &QToolButton::toggled,               this, &CDetailsTrk::slotChangeReadOnlyMode);
     connect(textCmtDesc,      &QTextBrowser::anchorClicked,        this, &CDetailsTrk::slotLinkActivated);
 
+    connect(pushSetActivities,    &QPushButton::clicked, this, &CDetailsTrk::slotSetActivities);
+    connect(pushRemoveActivities, &QPushButton::clicked, this, &CDetailsTrk::slotRemoveActivities);
+
     connect(lineName,         &QLineEdit::textEdited,              this, &CDetailsTrk::slotNameChanged);
     connect(lineName,         &QLineEdit::editingFinished,         this, &CDetailsTrk::slotNameChangeFinished);
 
@@ -366,7 +351,7 @@ void CDetailsTrk::updateData()
 
     labelTainted->setVisible(trk.isTainted());
 
-    labelInfo->setText(trk.getInfo(false));
+    labelInfo->setText(trk.getInfo(false, false));
     comboColor->setCurrentIndex(trk.getColorIdx());
     toolLock->setChecked(isReadOnly);
 
@@ -378,23 +363,11 @@ void CDetailsTrk::updateData()
     textCmtDesc->moveCursor (QTextCursor::Start);
     textCmtDesc->ensureCursorVisible();
 
-    quint32 flags = trk.getActivities().getAllFlags();
-
-    const CActivityTrk::desc_t* actDesc = CActivityTrk::getActivityDescriptors();
-    for(int i = 0; !actDesc[i].objName.isEmpty(); ++i)
-    {
-        const CActivityTrk::desc_t& desc = actDesc[i];
-        QCheckBox * check = findChild<QCheckBox*>("check" + desc.objName);
-        if(nullptr != check)
-        {
-            check->setChecked((flags & desc.flag) == desc.flag);
-        }
-    }
-
     QString str;
     trk.getActivities().printSummary(str);
     labelActivityInfo->setText(str);
 
+    quint32 flags = trk.getActivities().getAllFlags();
     bool hasActivity = 0 != (flags & CGisItemTrk::trkpt_t::eActMask);
     labelActivityHelp->setVisible(!hasActivity);
     labelActivityInfo->setVisible(hasActivity);
@@ -642,28 +615,20 @@ void CDetailsTrk::slotLinkActivated(const QUrl& url)
     }
 }
 
-void CDetailsTrk::slotActivitySelected(bool checked)
+void CDetailsTrk::slotSetActivities()
 {
-    if(!checked)
+    uint32_t flags = CActivityTrk::selectActivity(this);
+    if(0 != flags)
     {
-        if(QMessageBox::warning(this, tr("Reset activities..."), tr("This will remove all activities from the track. Proceed?"), QMessageBox::Ok|QMessageBox::No, QMessageBox::Ok) != QMessageBox::Ok)
-        {
-            updateData();
-        }
-        else
-        {
-            trk.setActivity(CGisItemTrk::trkpt_t::eActNone, tr("None"), "://icons/48x48/ActNone.png");
-        }
+        trk.setActivity(flags);
     }
-    else
+}
+
+void CDetailsTrk::slotRemoveActivities()
+{
+    if(QMessageBox::warning(this, tr("Reset activities..."), tr("This will remove all activities from the track. Proceed?"), QMessageBox::Ok|QMessageBox::No, QMessageBox::Ok) == QMessageBox::Ok)
     {
-        QObject *s = sender();
-        bool ok = false;
-        quint32 flag = s->property("flag").toUInt(&ok);
-        if(ok)
-        {
-            trk.setActivity(flag, s->property("name").toString(), s->property("symbol").toString());
-        }
+        trk.setActivity(CGisItemTrk::trkpt_t::eActNone);
     }
 }
 
diff --git a/src/gis/trk/CDetailsTrk.h b/src/gis/trk/CDetailsTrk.h
index 2947c16..bbd3dd4 100644
--- a/src/gis/trk/CDetailsTrk.h
+++ b/src/gis/trk/CDetailsTrk.h
@@ -49,7 +49,8 @@ private slots:
     void slotChangeReadOnlyMode(bool on);
     void slotLinkActivated(const QUrl& url);
     void slotMouseClickState(int);
-    void slotActivitySelected(bool checked);
+    void slotSetActivities();
+    void slotRemoveActivities();
 
     void slotColorSourceChanged(int idx);
     void slotColorLimitHighChanged();
diff --git a/src/gis/trk/CGisItemTrk.cpp b/src/gis/trk/CGisItemTrk.cpp
index b4a3a2c..0eacddc 100644
--- a/src/gis/trk/CGisItemTrk.cpp
+++ b/src/gis/trk/CGisItemTrk.cpp
@@ -27,7 +27,6 @@
 #include "gis/trk/CKnownExtension.h"
 #include "gis/trk/CPropertyTrk.h"
 #include "gis/trk/CScrOptTrk.h"
-#include "gis/trk/CSelectActivity.h"
 #include "gis/wpt/CGisItemWpt.h"
 #include "helpers/CDraw.h"
 #include "helpers/CProgressDialog.h"
@@ -370,7 +369,7 @@ void CGisItemTrk::unregisterVisual(INotifyTrk * visual)
     registeredVisuals.remove(visual);
 }
 
-QString CGisItemTrk::getInfo(bool showName) const
+QString CGisItemTrk::getInfo(bool showName, bool showFullText) const
 {
     QString val1, unit1, val2, unit2;
 
@@ -467,6 +466,35 @@ QString CGisItemTrk::getInfo(bool showName) const
         str += "<b style='color: red;'>" + tr("Invalid positions!") + "</b><br/>";
     }
 
+    if(showFullText)
+    {
+        QStringList actNames;
+        activities.getActivityNames(actNames);
+        if(!actNames.isEmpty())
+        {
+            str += "</div><div>" + tr("Activities: %1").arg(actNames.join(", "));
+        }
+
+        QString desc = removeHtml(trk.desc).simplified();
+        if(desc.count())
+        {
+            if(!str.isEmpty())
+            {
+                str += "<br/>\n";
+            }
+            str += desc;
+        }
+
+        QString cmt = removeHtml(trk.cmt).simplified();
+        if((cmt != desc) && cmt.count())
+        {
+            if(!str.isEmpty())
+            {
+                str += "<br/>\n";
+            }
+            str += cmt;
+        }
+    }
     return str + "</div>";
 }
 
@@ -1117,7 +1145,7 @@ void CGisItemTrk::findWaypointsCloseBy(CProgressDialog& progress, quint32& curre
 
     quint32 lastCurrent = current;
 
-    bool withDoubles = project->getSorting() != IGisProject::eSortTrackWithoutDouble;
+    bool withDoubles = project->getSortingRoadbook() != IGisProject::eSortRoadbookTrackWithoutDouble;
 
     QVector<pointDP> line;
     // combine all segments to a single line
@@ -1242,7 +1270,7 @@ void CGisItemTrk::findWaypointsCloseBy(CProgressDialog& progress, quint32& curre
         }
     }
 
-    updateVisuals(eVisualDetails|eVisualPlot|eVisualProject, "findWaypointsCloseBy()");
+    updateVisuals(eVisualDetails|eVisualPlot, "findWaypointsCloseBy()");
 }
 
 bool CGisItemTrk::isCloseTo(const QPointF& pos)
@@ -2165,7 +2193,7 @@ void CGisItemTrk::setColor(int idx)
     }
 }
 
-void CGisItemTrk::setActivity(quint32 flag, const QString& name, const QString& icon)
+void CGisItemTrk::setActivity(uint32_t flag)
 {
     for(int s = 0; s < trk.segs.size(); s++)
     {
@@ -2179,31 +2207,25 @@ void CGisItemTrk::setActivity(quint32 flag, const QString& name, const QString&
     }
 
     deriveSecondaryData();
-    changed(tr("Changed activity to '%1' for complete track.").arg(name), icon);
+
+    const CActivityTrk::desc_t &desc = CActivityTrk::getDescriptor(flag);
+    changed(tr("Changed activity to '%1' for complete track.").arg(desc.name), desc.iconLarge);
 }
 
-void CGisItemTrk::setActivity()
+void CGisItemTrk::setActivityRange(uint32_t flags)
 {
     if((mouseRange1 == nullptr) && (mouseRange2 == nullptr))
     {
         return;
     }
 
-    quint32 flag = 0;
-    QString name;
-    QString icon;
-
-    CSelectActivity dlg(flag, name, icon, CMainWindow::getBestWidgetForParent());
-    if(dlg.exec() != QDialog::Accepted)
-    {
-        return;
-    }
-
     if(!setReadOnlyMode(false))
     {
         return;
     }
 
+    const CActivityTrk::desc_t &desc = CActivityTrk::getDescriptor(flags);
+
     // read start/stop indices
     qint32 idx1 = mouseRange1->idxTotal;
     qint32 idx2 = mouseRange2->idxTotal;
@@ -2230,17 +2252,16 @@ void CGisItemTrk::setActivity()
             if((idx1 <= trkpt.idxTotal) && (trkpt.idxTotal < idx2))
             {
                 trkpt.unsetFlag(trkpt_t::eActMask);
-                trkpt.setFlag((enum CGisItemTrk::trkpt_t::flag_e) flag);
+                trkpt.setFlag((enum CGisItemTrk::trkpt_t::flag_e) flags);
             }
         }
     }
 
     resetMouseRange();
     deriveSecondaryData();
-    changed(tr("Changed activity to '%1' for range(%2..%3).").arg(name).arg(idx1).arg(idx2), icon);
+    changed(tr("Changed activity to '%1' for range(%2..%3).").arg(desc.name).arg(idx1).arg(idx2), desc.iconLarge);
 }
 
-
 void CGisItemTrk::setColor(const QColor& c)
 {
     colorIdx = DEFAULT_COLOR;
diff --git a/src/gis/trk/CGisItemTrk.h b/src/gis/trk/CGisItemTrk.h
index d1b0fbf..de09dd3 100644
--- a/src/gis/trk/CGisItemTrk.h
+++ b/src/gis/trk/CGisItemTrk.h
@@ -164,6 +164,11 @@ public:
         return trk.name.isEmpty() ? noName : trk.name;
     }
 
+    QDateTime getTimestamp() const override
+    {
+        return getTimeStart();
+    }
+
     /// get the track color as index into the Garmin color table
     int getColorIdx() const
     {
@@ -181,7 +186,7 @@ public:
        @param showName  if true the track name is shown
        @return
      */
-    QString getInfo(bool showName = true) const override;
+    QString getInfo(bool showName, bool showFullText) const override;
     /// get a summary of a selected range
     QString getInfoRange() const;
     /// get a summary of a selected range defined by two track points
@@ -446,19 +451,16 @@ public:
     /**
        @brief Set the activity flag for all track points
        @param flag  one of trkpt_t::flag_e::eAct...
-       @param name  the name of the activity
-       @param icon  a resource icon string to display with the activity
      */
-    void setActivity(quint32 flag, const QString &name, const QString &icon);
+    void setActivity(uint32_t flags);
 
     /**
        @brief Sets the activity flag for a selected range of track points
 
        The range has to be selected already. The activity will be selected by a dialog displayed
        in this method.
-
      */
-    void setActivity();
+    void setActivityRange(uint32_t flags);
 
     /**
        @brief Copy a section into a new track object
diff --git a/src/gis/trk/CScrOptTrk.cpp b/src/gis/trk/CScrOptTrk.cpp
index 7e8d566..6ef5fd2 100644
--- a/src/gis/trk/CScrOptTrk.cpp
+++ b/src/gis/trk/CScrOptTrk.cpp
@@ -31,7 +31,7 @@ CScrOptTrk::CScrOptTrk(CGisItemTrk * trk, const QPoint& point, IMouse *parent)
     setupUi(this);
     setOrigin(point);
     label->setFont(CMainWindow::self().getMapFont());
-    label->setText(trk->getInfo());
+    label->setText(trk->getInfo(true, false));
     adjustSize();
 
     toolProfile->setChecked(trk->hasUserFocus());
diff --git a/src/gis/trk/CSelectActivity.cpp b/src/gis/trk/CSelectActivity.cpp
deleted file mode 100644
index b3370a3..0000000
--- a/src/gis/trk/CSelectActivity.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/**********************************************************************************************
-    Copyright (C) 2014-2015 Oliver Eichler oliver.eichler at gmx.de
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-**********************************************************************************************/
-
-#include "gis/trk/CActivityTrk.h"
-#include "gis/trk/CGisItemTrk.h"
-#include "gis/trk/CSelectActivity.h"
-
-#include <QtWidgets>
-
-CSelectActivity::CSelectActivity(quint32 &flag, QString &name, QString &icon, QWidget * parent)
-    : QDialog(parent)
-    , flag(flag)
-    , name(name)
-    , icon(icon)
-{
-    setupUi(this);
-
-    int i = 0;
-    QLayout * l = layout();
-
-    const CActivityTrk::desc_t* actDesc = CActivityTrk::getActivityDescriptors();
-    while(!actDesc[i].name.isEmpty())
-    {
-        const CActivityTrk::desc_t& desc = actDesc[i];
-        QCheckBox * check = new QCheckBox(this);
-        check->setText(desc.name);
-        check->setIcon(QIcon(desc.iconLarge));
-        check->setProperty("flag", desc.flag);
-        check->setProperty("name", desc.name);
-        check->setProperty("symbol", desc.iconLarge);
-
-        connect(check, &QCheckBox::clicked, this, &CSelectActivity::slotActivitySelected);
-
-        l->addWidget(check);
-
-        i++;
-    }
-
-    l->addItem(new QSpacerItem(0,0,QSizePolicy::Maximum, QSizePolicy::MinimumExpanding));
-}
-
-CSelectActivity::~CSelectActivity()
-{
-}
-
-void CSelectActivity::slotActivitySelected(bool)
-{
-    QObject * s = sender();
-    bool ok = false;
-    flag = s->property("flag").toUInt(&ok);
-    if(ok)
-    {
-        name = s->property("name").toString();
-        icon = s->property("symbol").toString();
-    }
-    QDialog::accept();
-}
diff --git a/src/gis/trk/IDetailsTrk.ui b/src/gis/trk/IDetailsTrk.ui
index 6801235..7b36d15 100644
--- a/src/gis/trk/IDetailsTrk.ui
+++ b/src/gis/trk/IDetailsTrk.ui
@@ -1350,7 +1350,35 @@
             <number>3</number>
            </property>
            <item>
-            <layout class="QGridLayout" name="layoutActivities"/>
+            <layout class="QVBoxLayout" name="verticalLayout">
+             <item>
+              <widget class="QPushButton" name="pushSetActivities">
+               <property name="text">
+                <string>Set Track Activity</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="pushRemoveActivities">
+               <property name="text">
+                <string>Remove Track Activity</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="verticalSpacer_4">
+               <property name="orientation">
+                <enum>Qt::Vertical</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>20</width>
+                 <height>40</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
            </item>
            <item>
             <widget class="Line" name="line_3">
@@ -1617,9 +1645,9 @@
  <connections/>
  <buttongroups>
   <buttongroup name="buttonGroupLineWidth"/>
+  <buttongroup name="buttonGroupGraph3"/>
+  <buttongroup name="buttonGroupGraph2"/>
   <buttongroup name="buttonGroupGraph1"/>
   <buttongroup name="buttonGroupArrow"/>
-  <buttongroup name="buttonGroupGraph2"/>
-  <buttongroup name="buttonGroupGraph3"/>
  </buttongroups>
 </ui>
diff --git a/src/gis/trk/ISelectActivity.ui b/src/gis/trk/ISelectActivity.ui
deleted file mode 100644
index 789124f..0000000
--- a/src/gis/trk/ISelectActivity.ui
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ISelectActivity</class>
- <widget class="QDialog" name="ISelectActivity">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>171</width>
-    <height>273</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Activities...</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Select one:</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/gis/wpt/CGisItemWpt.cpp b/src/gis/wpt/CGisItemWpt.cpp
index f58a974..3e69199 100644
--- a/src/gis/wpt/CGisItemWpt.cpp
+++ b/src/gis/wpt/CGisItemWpt.cpp
@@ -237,9 +237,14 @@ bool CGisItemWpt::getNewWptData(QPointF& pt, QString& icon, QString& name)
     return true;
 }
 
-QString CGisItemWpt::getInfo(bool allowEdit) const
+QString CGisItemWpt::getInfo(bool showName, bool showFullText) const
 {
-    QString str = "<div style='font-weight: bold;'>" + getName() + "</div>";
+    QString str = "<div>";
+
+    if(showName)
+    {
+        str = "<b>" + getName() + "</b><br/>\n";
+    }
 
     if(geocache.hasData)
     {
@@ -286,36 +291,34 @@ QString CGisItemWpt::getInfo(bool allowEdit) const
             str += "<br/>\n";
         }
 
-        if(desc.count() < 200)
+        if(showFullText || (desc.count() < 300))
         {
             str += desc;
         }
         else
         {
-            str += desc.left(197) + "...";
+            str += desc.left(297) + "...";
         }
     }
-    else
+
+    QString cmt = removeHtml(wpt.cmt).simplified();
+    if((cmt != desc) && cmt.count())
     {
-        QString cmt = removeHtml(wpt.cmt).simplified();
-        if(cmt.count())
+        if(!str.isEmpty())
         {
-            if(!str.isEmpty())
-            {
-                str += "<br/>\n";
-            }
+            str += "<br/>\n";
+        }
 
-            if(cmt.count() < 200)
-            {
-                str += cmt;
-            }
-            else
-            {
-                str += cmt.left(197) + "...";
-            }
+        if(showFullText || cmt.count() < 300)
+        {
+            str += cmt;
+        }
+        else
+        {
+            str += cmt.left(297) + "...";
         }
     }
-    return str;
+    return str + "</div>";
 }
 
 IScrOpt * CGisItemWpt::getScreenOptions(const QPoint& origin, IMouse * mouse)
diff --git a/src/gis/wpt/CGisItemWpt.h b/src/gis/wpt/CGisItemWpt.h
index 6fb8dcf..1bbb23f 100644
--- a/src/gis/wpt/CGisItemWpt.h
+++ b/src/gis/wpt/CGisItemWpt.h
@@ -219,7 +219,7 @@ public:
         return wpt.name.isEmpty() ? noName : wpt.name;
     }
 
-    QString getInfo(bool allowEdit = false) const override;
+    QString getInfo(bool showName, bool showFullText) const override;
     QPointF getPosition() const
     {
         return QPointF(wpt.lon, wpt.lat);
@@ -262,6 +262,12 @@ public:
         return images;
     }
 
+    QDateTime getTimestamp() const override
+    {
+        return wpt.time;
+    }
+
+
     IScrOpt* getScreenOptions(const QPoint &origin, IMouse * mouse) override;
 
     QPointF getPointCloseBy(const QPoint& ) override
diff --git a/src/gis/wpt/CScrOptWpt.cpp b/src/gis/wpt/CScrOptWpt.cpp
index 28a4f1a..695d4a2 100644
--- a/src/gis/wpt/CScrOptWpt.cpp
+++ b/src/gis/wpt/CScrOptWpt.cpp
@@ -35,7 +35,7 @@ CScrOptWpt::CScrOptWpt(CGisItemWpt *wpt, const QPoint& point, IMouse *parent)
     setupUi(this);
     setOrigin(point);
     label->setFont(CMainWindow::self().getMapFont());
-    label->setText(wpt->getInfo());
+    label->setText(wpt->getInfo(true, false));
     adjustSize();
 
     toolProj->setDisabled(wpt->isGeocache() || wpt->isOnDevice());
diff --git a/src/helpers/CSelectCopyAction.cpp b/src/helpers/CSelectCopyAction.cpp
index de99968..655f313 100644
--- a/src/helpers/CSelectCopyAction.cpp
+++ b/src/helpers/CSelectCopyAction.cpp
@@ -29,9 +29,9 @@ CSelectCopyAction::CSelectCopyAction(const IGisItem *src, const IGisItem *tar, Q
     setupUi(this);
 
     labelIcon1->setPixmap(src->getIcon());
-    labelInfo1->setText(src->getInfo());
+    labelInfo1->setText(src->getInfo(true, false));
     labelIcon2->setPixmap(tar->getIcon());
-    labelInfo2->setText(tar->getInfo());
+    labelInfo2->setText(tar->getInfo(true, false));
 
     adjustSize();
 
diff --git a/src/icons/32x32/SearchDatabase.png b/src/icons/32x32/SearchDatabase.png
new file mode 100644
index 0000000..71aeeac
Binary files /dev/null and b/src/icons/32x32/SearchDatabase.png differ
diff --git a/src/icons/32x32/SortName.png b/src/icons/32x32/SortName.png
new file mode 100644
index 0000000..ab70dc4
Binary files /dev/null and b/src/icons/32x32/SortName.png differ
diff --git a/src/icons/48x48/SearchDatabase.png b/src/icons/48x48/SearchDatabase.png
new file mode 100644
index 0000000..2d7c147
Binary files /dev/null and b/src/icons/48x48/SearchDatabase.png differ
diff --git a/src/icons/48x48/SortName.png b/src/icons/48x48/SortName.png
new file mode 100644
index 0000000..8798f36
Binary files /dev/null and b/src/icons/48x48/SortName.png differ
diff --git a/src/icons/SearchDatabase.svg b/src/icons/SearchDatabase.svg
new file mode 100644
index 0000000..478f20b
--- /dev/null
+++ b/src/icons/SearchDatabase.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="SearchDatabase.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.45184044"
+     inkscape:cx="-243.4793"
+     inkscape:cy="513.43589"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="996"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-988.36218)">
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot3859"
+       style="font-style:normal;font-weight:normal;font-size:12px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="translate(-56.338127,-9.7809249)"><flowRegion
+         id="flowRegion3861"><rect
+           id="rect3863"
+           width="75.35714"
+           height="62.142857"
+           x="-9.4642859"
+           y="2.2142856" /></flowRegion><flowPara
+         id="flowPara3865" /></flowRoot>    <g
+       id="g4172"
+       transform="translate(2.7754746,-2.1815968)">
+      <g
+         style="stroke-width:3.38945651;stroke-miterlimit:4;stroke-dasharray:none"
+         transform="matrix(0.9270579,0,0,0.9609277,5.3800344,983.04727)"
+         id="g3856">
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:3.60437727;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path3012-6"
+           sodipodi:cx="30"
+           sodipodi:cy="19"
+           sodipodi:rx="20"
+           sodipodi:ry="5"
+           d="m 47.741363,16.691808 a 20,5 0 0 1 -8.506645,6.743279 20,5 0 0 1 -26.974053,-2.125921 20,5 0 0 1 8.500722,-6.743746 20,5 0 0 1 26.975919,2.12444"
+           sodipodi:start="5.8033439"
+           sodipodi:end="5.8029047"
+           sodipodi:open="true"
+           transform="matrix(0.97628959,0,0,0.90577639,0.75264714,41.745822)" />
+        <rect
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           id="rect3032"
+           width="40"
+           height="40"
+           x="10.056155"
+           y="18.943857" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:3.60437727;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path3012"
+           sodipodi:cx="30"
+           sodipodi:cy="19"
+           sodipodi:rx="20"
+           sodipodi:ry="5"
+           d="m 47.741363,16.691808 a 20,5 0 0 1 -8.506645,6.743279 20,5 0 0 1 -26.974053,-2.125921 20,5 0 0 1 8.500722,-6.743746 20,5 0 0 1 26.975919,2.12444"
+           sodipodi:start="5.8033439"
+           sodipodi:end="5.8029047"
+           sodipodi:open="true"
+           transform="matrix(0.97628959,0,0,0.90577639,0.75264717,1.7458229)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:3.67074943;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path3012-0"
+           sodipodi:cx="30"
+           sodipodi:cy="19"
+           sodipodi:rx="20"
+           sodipodi:ry="5"
+           d="M 49.959676,19.317345 A 20,5 0 0 1 30.145537,23.999868 20,5 0 0 1 10.060911,19.389931"
+           sodipodi:start="0.063511676"
+           sodipodi:end="3.0635271"
+           transform="matrix(0.9793945,0,0,0.87054856,0.71290745,12.690707)"
+           sodipodi:open="true" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:3.67074943;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path3012-0-2"
+           sodipodi:cx="30"
+           sodipodi:cy="19"
+           sodipodi:rx="20"
+           sodipodi:ry="5"
+           d="M 49.959676,19.317345 A 20,5 0 0 1 30.145537,23.999868 20,5 0 0 1 10.060911,19.389931"
+           sodipodi:start="0.063511676"
+           sodipodi:end="3.0635271"
+           transform="matrix(0.9793945,0,0,0.87054856,0.6219979,22.236163)"
+           sodipodi:open="true" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000080;stroke-width:3.67074943;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path3012-0-1"
+           sodipodi:cx="30"
+           sodipodi:cy="19"
+           sodipodi:rx="20"
+           sodipodi:ry="5"
+           d="M 49.959676,19.317345 A 20,5 0 0 1 30.145537,23.999868 20,5 0 0 1 10.060911,19.389931"
+           sodipodi:start="0.063511676"
+           sodipodi:end="3.0635271"
+           transform="matrix(0.9793945,0,0,0.87054856,0.71290699,32.327076)"
+           sodipodi:open="true" />
+        <path
+           style="fill:#ffffff;stroke:#000080;stroke-width:3.38945651;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 10.454545,19 0,40"
+           id="path3084"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;stroke:#000080;stroke-width:3.38945651;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 49.545455,19 0,40"
+           id="path3086"
+           inkscape:connector-curvature="0" />
+      </g>
+      <rect
+         y="995.48077"
+         x="8.237051"
+         height="50"
+         width="50"
+         id="rect2997"
+         style="fill:none;stroke:none" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1.29969895;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 21.662403,1017.1498 c 0.0019,2.0247 0.455839,4.0701 1.447538,5.9828 3.30752,6.3792 11.142539,8.8324 17.498152,5.5126 0.16494,-0.086 0.308625,-0.2069 0.468321,-0.2991 l 14.390209,14.4441 4.89608,-4.9572 -14.39021,-14.444 c 2.03228,-3.6896 2.25331,-8.2899 0.1703,-12.3074 -3.307525,-6.3792 -11.142545,-8.8325 -17.498157,-5.5127 l -0.638619,0.3419 c -4.05963,2.4287 -6.347897,6.7848 -6.343614,11.239 z m 3.23567,-0.043 c -0.0033,-3.3407 1.72363,-6.5543 4.768353,-8.3759 l 0.468321,-0 [...]
+       id="path6229" />
+  </g>
+</svg>
diff --git a/src/icons/SortName.svg b/src/icons/SortName.svg
new file mode 100644
index 0000000..5a322f9
--- /dev/null
+++ b/src/icons/SortName.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg3513"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="SortName.svg">
+  <defs
+     id="defs3515" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="-28.60835"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="972"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3518">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4181">
+      <text
+         transform="scale(1.0327955,0.96824587)"
+         sodipodi:linespacing="125%"
+         id="text3002"
+         y="31.734989"
+         x="14.000945"
+         style="font-style:normal;font-weight:bold;font-size:29.05446815px;line-height:125%;font-family:Sans;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           y="31.734989"
+           x="14.000945"
+           id="tspan3004"
+           sodipodi:role="line">A</tspan></text>
+      <rect
+         y="10.727273"
+         x="14.562677"
+         height="40"
+         width="40"
+         id="rect3002"
+         style="fill:none;stroke:none" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:bold;font-size:27.91541672px;line-height:125%;font-family:Sans;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000080;fill-opacity:1;stroke:none"
+       x="38.874409"
+       y="50.336971"
+       id="text3002-2"
+       sodipodi:linespacing="125%"
+       transform="scale(0.99230585,1.0077538)"><tspan
+         sodipodi:role="line"
+         id="tspan3004-9"
+         x="38.874409"
+         y="50.336971">Z</tspan></text>
+  </g>
+</svg>
diff --git a/src/locale/qmapshack.ts b/src/locale/qmapshack.ts
index 06d4526..81020cf 100644
--- a/src/locale/qmapshack.ts
+++ b/src/locale/qmapshack.ts
@@ -17,105 +17,97 @@
 <context>
     <name>CActivityTrk</name>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="29"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="117"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="39"/>
         <source>Foot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="37"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="118"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="47"/>
         <source>Bicycle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="45"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="119"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="55"/>
         <source>Motor Bike</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="53"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="120"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="63"/>
         <source>Car</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="61"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="121"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="71"/>
         <source>Cable Car</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="69"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="122"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="79"/>
         <source>Swim</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="77"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="87"/>
         <source>Ship</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="85"/>
-        <source>Aeronautik</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="93"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="125"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="103"/>
         <source>Ski/Winter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="124"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="95"/>
         <source>Aeronautics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="261"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="305"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="262"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="304"/>
         <source>Distance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="263"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="327"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="264"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="315"/>
         <source>Ascend:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="265"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="349"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="266"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="326"/>
         <source>Descend:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="267"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="371"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="268"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="337"/>
         <source>Speed Moving:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="269"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="393"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="270"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
         <source>Speed Total:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="271"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="415"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="272"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="359"/>
         <source>Time Moving:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="273"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="437"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="274"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="370"/>
         <source>Time Total:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="410"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CCanvas</name>
@@ -125,7 +117,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="674"/>
+        <location filename="../canvas/CCanvas.cpp" line="670"/>
         <source>Setup Map Background</source>
         <translation type="unfinished"></translation>
     </message>
@@ -200,28 +192,28 @@
 <context>
     <name>CDBFolderMysql</name>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="32"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="33"/>
         <source>All your data grouped by folders.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="52"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="53"/>
         <source>MySQL Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="55"/>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="59"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="56"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="60"/>
         <source>Server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="64"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="65"/>
         <source> (No PW)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="72"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="73"/>
         <source>Error: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -229,35 +221,40 @@
 <context>
     <name>CDBFolderSqlite</name>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="28"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="30"/>
         <source>All your data grouped by folders.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="46"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="52"/>
         <source>SQLite Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="56"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="62"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="66"/>
+        <source>Error: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CDBItem</name>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="87"/>
+        <location filename="../gis/db/CDBItem.cpp" line="91"/>
         <source>%1 min.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="91"/>
+        <location filename="../gis/db/CDBItem.cpp" line="95"/>
         <source>%1 h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="95"/>
+        <location filename="../gis/db/CDBItem.cpp" line="99"/>
         <source>%1 days</source>
         <translation type="unfinished"></translation>
     </message>
@@ -265,66 +262,66 @@
 <context>
     <name>CDBProject</name>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="219"/>
+        <location filename="../gis/db/CDBProject.cpp" line="223"/>
         <source>The item %1 has been changed by %2 (%3). 
 
 To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="225"/>
+        <location filename="../gis/db/CDBProject.cpp" line="229"/>
         <source>Conflict with database...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="226"/>
+        <location filename="../gis/db/CDBProject.cpp" line="230"/>
         <source>Clone && Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="227"/>
+        <location filename="../gis/db/CDBProject.cpp" line="231"/>
         <source>Force Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="228"/>
+        <location filename="../gis/db/CDBProject.cpp" line="232"/>
         <source>Take remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="531"/>
+        <location filename="../gis/db/CDBProject.cpp" line="514"/>
         <source>Missing folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="532"/>
+        <location filename="../gis/db/CDBProject.cpp" line="515"/>
         <source>Failed to save project. The folder has been deleted in the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="539"/>
+        <location filename="../gis/db/CDBProject.cpp" line="522"/>
         <source>Save ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="602"/>
+        <location filename="../gis/db/CDBProject.cpp" line="585"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="602"/>
+        <location filename="../gis/db/CDBProject.cpp" line="585"/>
         <source>There was an unexpected database error:
 
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="727"/>
+        <location filename="../gis/db/CDBProject.cpp" line="700"/>
         <source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="728"/>
+        <location filename="../gis/db/CDBProject.cpp" line="701"/>
         <source>Save changes?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -332,12 +329,12 @@ To solve this conflict you can create and save a clone, force your version or dr
 <context>
     <name>CDemList</name>
     <message>
-        <location filename="../dem/CDemList.cpp" line="202"/>
+        <location filename="../dem/CDemList.cpp" line="195"/>
         <source>Deactivate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dem/CDemList.cpp" line="202"/>
+        <location filename="../dem/CDemList.cpp" line="195"/>
         <source>Activate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -409,123 +406,123 @@ To solve this conflict you can create and save a clone, force your version or dr
 <context>
     <name>CDetailsPrj</name>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="126"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
         <source>You want to sort waypoints along a track, but you switched off track and waypoint correlation. Do you want to switch it on again?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="128"/>
         <source>Correlation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="270"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="791"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="265"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="775"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="343"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="338"/>
         <source>Build diary...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="398"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="393"/>
         <source><b>Summary over all tracks in project</b><br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="446"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="435"/>
         <source><h2>Waypoints</h2></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="479"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="608"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="726"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="442"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="468"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="710"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="740"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="454"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="480"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="609"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="727"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="757"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="443"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="469"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="593"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="711"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="741"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="472"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="461"/>
         <source><h2>Tracks</h2></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>From Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>To Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>To End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="630"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="614"/>
         <source>distance: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="640"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="624"/>
         <source>ascent: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="650"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="634"/>
         <source>descend: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="719"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="703"/>
         <source><h2>Areas</h2></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="749"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
         <source><h2>Routes</h2></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="761"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="788"/>
         <source>Edit name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="761"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="788"/>
         <source>Enter new project name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="770"/>
         <source>Edit keywords...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="770"/>
         <source>Enter keywords.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="935"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="916"/>
         <source>Print Diary</source>
         <translation type="unfinished"></translation>
     </message>
@@ -533,55 +530,50 @@ To solve this conflict you can create and save a clone, force your version or dr
 <context>
     <name>CDetailsTrk</name>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="181"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="166"/>
         <source>Reduce visible track points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="184"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
         <source>Change elevation of track points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="187"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
         <source>Change timestamp of track points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="190"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
         <source>Modify track points' extensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="193"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
         <source>Cut track into pieces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="426"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="399"/>
         <source>Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="427"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="400"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="629"/>
         <source>Reset activities...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="629"/>
         <source>This will remove all activities from the track. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="657"/>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>CDetailsWpt</name>
@@ -678,7 +670,7 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/fit/CFitProject.cpp" line="91"/>
+        <location filename="../gis/fit/CFitProject.cpp" line="93"/>
         <source>Failed to open FIT file %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -743,52 +735,52 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="385"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="391"/>
         <source>Area: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="447"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="451"/>
         <source>Changed area shape.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="455"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="459"/>
         <source>Changed name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="461"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="465"/>
         <source>Changed border width.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="467"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="471"/>
         <source>Changed fill pattern.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="473"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="477"/>
         <source>Changed opacity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="479"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="483"/>
         <source>Changed comment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="485"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="489"/>
         <source>Changed description.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="491"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="495"/>
         <source>Changed links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="502"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="506"/>
         <source>Changed color</source>
         <translation type="unfinished"></translation>
     </message>
@@ -801,73 +793,73 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="283"/>
         <source>track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="310"/>
         <source>Changed name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="316"/>
         <source>Changed comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="322"/>
         <source>Changed description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="328"/>
         <source>Changed links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="346"/>
         <source>Length: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="350"/>
         <source>Length: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="559"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="357"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="595"/>
         <source>Time: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="361"/>
         <source>Time: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="371"/>
         <source>%1%2 %3, %4%5 %6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="377"/>
         <source>Last time routed:<br/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="379"/>
         <source>with %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="561"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="597"/>
         <source>Distance: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="675"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="712"/>
         <source>Changed route points.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -906,257 +898,262 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="118"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="117"/>
         <source>_Clone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="290"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="289"/>
         <source>Changed trackpoints, sacrificed all previous data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="394"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
         <source>Length: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="401"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="400"/>
         <source>, %1%2 %3, %4%5 %6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="405"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="404"/>
         <source>, %1-, %2-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="417"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="416"/>
         <source>Time: -, Speed: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="429"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="428"/>
         <source>Moving: -, Speed: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="434"/>
         <source>Start: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="438"/>
         <source>Start: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="445"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="444"/>
         <source>End: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="449"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="448"/>
         <source>End: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="452"/>
         <source>Points: %1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="457"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="456"/>
         <source>Invalid elevations!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="461"/>
         <source>Invalid timestamps!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="467"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="466"/>
         <source>Invalid positions!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="475"/>
+        <source>Activities: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
         <source>Index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="562"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="590"/>
         <source>Index: visible %1, total %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="601"/>
         <source>Ele.: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
         <source> slope: %1%3 (%2%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
         <source> speed: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
         <source>... and %1 tags not displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
         <source>Descend: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="649"/>
         <source>Distance: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="622"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="650"/>
         <source>Moving: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="627"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="655"/>
         <source>Ascend: %1%2 (%3%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1317"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1330"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1390"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1434"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1599"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1345"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1418"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1462"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1627"/>
         <source>track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1535"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1563"/>
         <source>Hide point %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1539"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1567"/>
         <source>Hide points %1..%2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="619"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="647"/>
         <source>Ascend: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
         <source> Descend: %1%2 (%3%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="645"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="673"/>
         <source> Moving: %1%2 (%3%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="695"/>
         <source>Ascend: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="672"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="700"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="712"/>
         <source>, %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
         <source>Ascend: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="707"/>
         <source> Descend: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="690"/>
         <source>Descend: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="694"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="722"/>
         <source> Time: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="413"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="412"/>
         <source>Time: %1, Speed: %2 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="424"/>
         <source>Moving: %1, Speed: %2 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
         <source>Distance: %1%2 (%3%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="717"/>
         <source>Distance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1380"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1408"/>
         <source>Permanently removed points %1..%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1579"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1607"/>
         <source>Show points.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2142"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
         <source>Changed name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2148"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
         <source>Changed comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2166"/>
         <source>Changed description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2172"/>
         <source>Changed links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2171"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2183"/>
         <source>Changed elevation of point %1 to %2 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2198"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2212"/>
         <source>Changed activity to '%1' for complete track.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2256"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2262"/>
         <source>Changed activity to '%1' for range(%2..%3).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1254,62 +1251,62 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="267"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="272"/>
         <source>Elevation: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="278"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="283"/>
         <source>Proximity: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="352"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="355"/>
         <source>Changed name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="362"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="365"/>
         <source>Changed position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="371"/>
         <source>Changed elevation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="377"/>
         <source>Changed proximity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="388"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="391"/>
         <source>Changed icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="397"/>
         <source>Changed comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="403"/>
         <source>Changed description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="409"/>
         <source>Changed links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="415"/>
         <source>Changed images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="421"/>
         <source>Add image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1317,94 +1314,134 @@ To solve this conflict you can create and save a clone, force your version or dr
 <context>
     <name>CGisListDB</name>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="81"/>
+        <location filename="../gis/CGisListDB.cpp" line="83"/>
         <source>Due to changes in the database system QMapShack forgot about the filename of your database '%1'. You have to select it again in the next step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="82"/>
+        <location filename="../gis/CGisListDB.cpp" line="84"/>
         <source>Select database file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="115"/>
+        <location filename="../gis/CGisListDB.cpp" line="117"/>
         <source>Add Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="118"/>
+        <location filename="../gis/CGisListDB.cpp" line="120"/>
         <source>Add Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="119"/>
-        <source>Delete Folder</source>
+        <location filename="../gis/CGisListDB.cpp" line="121"/>
+        <source>Rename Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/CGisListDB.cpp" line="122"/>
-        <location filename="../gis/CGisListDB.cpp" line="133"/>
+        <source>Copy Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="123"/>
+        <source>Move Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="124"/>
+        <source>Delete Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="127"/>
+        <location filename="../gis/CGisListDB.cpp" line="139"/>
         <source>Delete Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="126"/>
+        <location filename="../gis/CGisListDB.cpp" line="131"/>
+        <source>Search Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="132"/>
         <source>Sync. with Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="127"/>
+        <location filename="../gis/CGisListDB.cpp" line="133"/>
         <source>Remove Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="130"/>
+        <location filename="../gis/CGisListDB.cpp" line="136"/>
         <source>Empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="418"/>
+        <location filename="../gis/CGisListDB.cpp" line="432"/>
         <source>Remove database...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="418"/>
+        <location filename="../gis/CGisListDB.cpp" line="432"/>
         <source>Do you really want to remove '%1' from the list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="476"/>
+        <location filename="../gis/CGisListDB.cpp" line="496"/>
         <source>Delete database folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="476"/>
-        <source>Are you sure you want to delete "%1" from the database?</source>
+        <location filename="../gis/CGisListDB.cpp" line="496"/>
+        <source>Are you sure you want to delete selected folders and all subfolders from the database?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="503"/>
-        <location filename="../gis/CGisListDB.cpp" line="524"/>
+        <location filename="../gis/CGisListDB.cpp" line="664"/>
+        <source>Bad operation....</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="664"/>
+        <source>The target folder is a subfolder of the one to move. This will not work.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="723"/>
+        <source>Folder name...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="723"/>
+        <source>Rename folder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="744"/>
+        <location filename="../gis/CGisListDB.cpp" line="765"/>
         <source>Remove items...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="503"/>
+        <location filename="../gis/CGisListDB.cpp" line="744"/>
         <source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="524"/>
+        <location filename="../gis/CGisListDB.cpp" line="765"/>
         <source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="611"/>
+        <location filename="../gis/CGisListDB.cpp" line="852"/>
         <source>Are you sure you want to delete '%1' from folder '%2'?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="612"/>
+        <location filename="../gis/CGisListDB.cpp" line="853"/>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1417,175 +1454,186 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="99"/>
+        <location filename="../gis/CGisListWks.cpp" line="100"/>
         <source>Show on Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="100"/>
+        <location filename="../gis/CGisListWks.cpp" line="101"/>
         <source>Hide from Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="103"/>
+        <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <source>Sort by Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="108"/>
+        <source>Sort by Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="111"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="104"/>
+        <location filename="../gis/CGisListWks.cpp" line="112"/>
         <source>Save As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <location filename="../gis/CGisListWks.cpp" line="115"/>
         <source>Send to Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="108"/>
+        <location filename="../gis/CGisListWks.cpp" line="116"/>
         <source>Sync. with Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="111"/>
+        <location filename="../gis/CGisListWks.cpp" line="119"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="121"/>
+        <location filename="../gis/CGisListWks.cpp" line="128"/>
         <source>Update Project on Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="123"/>
-        <location filename="../gis/CGisListWks.cpp" line="144"/>
+        <location filename="../gis/CGisListWks.cpp" line="130"/>
+        <location filename="../gis/CGisListWks.cpp" line="151"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="134"/>
+        <location filename="../gis/CGisListWks.cpp" line="141"/>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="135"/>
+        <location filename="../gis/CGisListWks.cpp" line="99"/>
+        <location filename="../gis/CGisListWks.cpp" line="142"/>
         <source>Copy to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="137"/>
+        <location filename="../gis/CGisListWks.cpp" line="144"/>
         <source>Track Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="139"/>
+        <location filename="../gis/CGisListWks.cpp" line="146"/>
         <source>Select Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="140"/>
+        <location filename="../gis/CGisListWks.cpp" line="147"/>
         <source>Edit Track Points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="141"/>
+        <location filename="../gis/CGisListWks.cpp" line="148"/>
         <source>Reverse Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="142"/>
+        <location filename="../gis/CGisListWks.cpp" line="149"/>
         <source>Combine Tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="150"/>
+        <location filename="../gis/CGisListWks.cpp" line="157"/>
         <source>Show Bubble</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="152"/>
+        <location filename="../gis/CGisListWks.cpp" line="159"/>
         <source>Move Waypoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="153"/>
+        <location filename="../gis/CGisListWks.cpp" line="160"/>
         <source>Proj. Waypoint...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="161"/>
+        <location filename="../gis/CGisListWks.cpp" line="168"/>
         <source>Route Instructions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="163"/>
+        <location filename="../gis/CGisListWks.cpp" line="170"/>
         <source>Calculate Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="164"/>
+        <location filename="../gis/CGisListWks.cpp" line="171"/>
         <source>Reset Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="165"/>
+        <location filename="../gis/CGisListWks.cpp" line="172"/>
         <source>Edit Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="166"/>
+        <location filename="../gis/CGisListWks.cpp" line="173"/>
         <source>Convert to Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="175"/>
+        <location filename="../gis/CGisListWks.cpp" line="182"/>
         <source>Edit Area Points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="182"/>
+        <location filename="../gis/CGisListWks.cpp" line="189"/>
         <source>Create Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="626"/>
+        <location filename="../gis/CGisListWks.cpp" line="618"/>
         <source>Drop items...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="651"/>
-        <location filename="../gis/CGisListWks.cpp" line="1593"/>
-        <location filename="../gis/CGisListWks.cpp" line="1631"/>
+        <location filename="../gis/CGisListWks.cpp" line="643"/>
+        <location filename="../gis/CGisListWks.cpp" line="1599"/>
+        <location filename="../gis/CGisListWks.cpp" line="1637"/>
         <source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="780"/>
+        <location filename="../gis/CGisListWks.cpp" line="769"/>
         <source>Saving workspace. Please wait.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="826"/>
+        <location filename="../gis/CGisListWks.cpp" line="815"/>
         <source>Loading workspace. Please wait.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1143"/>
+        <location filename="../gis/CGisListWks.cpp" line="1149"/>
         <source>Close all projects...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1143"/>
+        <location filename="../gis/CGisListWks.cpp" line="1149"/>
         <source>This will remove all projects from the workspace.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1166"/>
+        <location filename="../gis/CGisListWks.cpp" line="1172"/>
         <source>Delete project...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1166"/>
+        <location filename="../gis/CGisListWks.cpp" line="1172"/>
         <source>Do you really want to delete %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1643,27 +1691,27 @@ line %2, column %3:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="258"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="264"/>
         <source>File exists ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="259"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="265"/>
         <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains GPX data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file.  Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="367"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="380"/>
         <source>Failed to create file '%1'</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="377"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="390"/>
         <source>Failed to write file '%1'</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="395"/>
         <source>Saving GIS data failed...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1833,11 +1881,21 @@ line %2, column %3:
         <source>Select file to load</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1061"/>
+        <source>Fatal...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1062"/>
+        <source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your ditribution to fix it.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CMapDraw</name>
     <message>
-        <location filename="../map/CMapDraw.cpp" line="406"/>
+        <location filename="../map/CMapDraw.cpp" line="420"/>
         <source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack. 
 
 If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is  [...]
@@ -2473,17 +2531,17 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
 <context>
     <name>CMapList</name>
     <message>
-        <location filename="../map/CMapList.cpp" line="208"/>
+        <location filename="../map/CMapList.cpp" line="202"/>
         <source>Deactivate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapList.cpp" line="208"/>
+        <location filename="../map/CMapList.cpp" line="202"/>
         <source>Activate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapList.cpp" line="233"/>
+        <location filename="../map/CMapList.cpp" line="227"/>
         <source>Where do you want to store maps?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2599,7 +2657,7 @@ line %2, column %3:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapTMS.cpp" line="304"/>
+        <location filename="../map/CMapTMS.cpp" line="299"/>
         <source><b>%1</b>: %2 tiles pending<br/></source>
         <translation type="unfinished"></translation>
     </message>
@@ -2840,22 +2898,22 @@ Unknown structure.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="98"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="104"/>
         <source>%1 waypoints<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="97"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="99"/>
         <source>%1 tracks<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="99"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="109"/>
         <source>%1 routes<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="100"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="114"/>
         <source>%1 areas<br/></source>
         <translation type="unfinished"></translation>
     </message>
@@ -3151,7 +3209,7 @@ is not a valid coordinate system definition:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qlgt/CQmsDb.cpp" line="163"/>
+        <location filename="../qlgt/CQmsDb.cpp" line="164"/>
         <source>%1: drop item with QLGT DB ID %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3509,13 +3567,13 @@ is not a valid coordinate system definition:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="344"/>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="431"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="338"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="425"/>
         <source>Calculate route with %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="352"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="346"/>
         <source><br/>Calculation time: %1s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3624,6 +3682,14 @@ is not a valid coordinate system definition:
     </message>
 </context>
 <context>
+    <name>CSearchDatabase</name>
+    <message>
+        <location filename="../gis/db/CSearchDatabase.cpp" line="38"/>
+        <source>Search database '%1':</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CSearchGoogle</name>
     <message>
         <location filename="../gis/search/CSearchGoogle.cpp" line="118"/>
@@ -3756,10 +3822,15 @@ line %2, column %3:
 <context>
     <name>CTextEditWidget</name>
     <message>
-        <location filename="../widgets/CTextEditWidget.cpp" line="73"/>
+        <location filename="../widgets/CTextEditWidget.cpp" line="70"/>
         <source>&Color...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../widgets/CTextEditWidget.cpp" line="113"/>
+        <source>Reset format</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CTwoNavProject</name>
@@ -3770,20 +3841,20 @@ line %2, column %3:
         <location filename="../gis/tnv/serialization.cpp" line="617"/>
         <location filename="../gis/tnv/serialization.cpp" line="645"/>
         <location filename="../gis/tnv/serialization.cpp" line="719"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="87"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="191"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
         <source>Error...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="560"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="87"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="191"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
         <source>Failed to open %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="159"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="160"/>
         <source>Save GIS data to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4092,7 +4163,7 @@ If you want to keep just one half you can simply remove the points, or check thi
     <name>IDB</name>
     <message>
         <location filename="../gis/db/IDB.cpp" line="60"/>
-        <source>The internal database format of '%1'' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
+        <source>The internal database format of '%1' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4101,28 +4172,48 @@ If you want to keep just one half you can simply remove the points, or check thi
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="74"/>
+        <location filename="../gis/db/IDB.cpp" line="69"/>
+        <source>Migration aborted by user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="75"/>
         <source>Failed to migrate '%1'.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="76"/>
-        <location filename="../gis/db/IDB.cpp" line="100"/>
+        <location filename="../gis/db/IDB.cpp" line="77"/>
+        <location filename="../gis/db/IDB.cpp" line="106"/>
         <source>Error...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="85"/>
-        <source>The database version of '%1'' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
+        <location filename="../gis/db/IDB.cpp" line="81"/>
+        <source>Migration failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="88"/>
+        <source>The database version of '%1' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="110"/>
+        <source>Initialization failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="91"/>
         <source>Wrong database version...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="98"/>
+        <location filename="../gis/db/IDB.cpp" line="95"/>
+        <source>Database created by newer version of QMapShack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="104"/>
         <source>Failed to initialize '%1'.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4130,15 +4221,38 @@ If you want to keep just one half you can simply remove the points, or check thi
 <context>
     <name>IDBMysql</name>
     <message>
-        <location filename="../gis/db/IDBMysql.cpp" line="54"/>
+        <location filename="../gis/db/IDBMysql.cpp" line="60"/>
         <source>Password...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/IDBMysql.cpp" line="54"/>
+        <location filename="../gis/db/IDBMysql.cpp" line="60"/>
         <source>Password for database '%1':</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gis/db/IDBMysql.cpp" line="222"/>
+        <source>Update to database version 5. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IDBSqlite</name>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="306"/>
+        <source>Update to database version 3. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="375"/>
+        <source>Update to database version 5. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="449"/>
+        <source>Update to database version 6. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IDemPathSetup</name>
@@ -4431,33 +4545,28 @@ If you want to keep just one half you can simply remove the points, or check thi
     </message>
     <message>
         <location filename="../gis/prj/IDetailsPrj.ui" line="76"/>
-        <source>Sort by time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
         <source>Sort along track (multiple)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="86"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
         <source>Sort along track (single)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="94"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="118"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="138"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="89"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="113"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="133"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="115"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="110"/>
         <source>Print diary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="135"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="130"/>
         <source>Rebuild diary.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4671,67 +4780,77 @@ If you want to keep just one half you can simply remove the points, or check thi
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1375"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1357"/>
+        <source>Set Track Activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1364"/>
+        <source>Remove Track Activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1403"/>
         <source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1402"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1430"/>
         <source>Points</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1478"/>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1483"/>
         <source>Ele.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1488"/>
         <source>Delta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1493"/>
         <source>Dist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1498"/>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1503"/>
         <source>Slope</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1508"/>
         <source>Ascend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1513"/>
         <source>Descend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1518"/>
         <source>Position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1499"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1527"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1536"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1564"/>
         <source>Hist.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4813,7 +4932,7 @@ If you want to keep just one half you can simply remove the points, or check thi
 <context>
     <name>IDevice</name>
     <message>
-        <location filename="../device/IDevice.cpp" line="287"/>
+        <location filename="../device/IDevice.cpp" line="292"/>
         <source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5183,87 +5302,87 @@ If you want to keep just one half you can simply remove the points, or check thi
 <context>
     <name>IGisItem</name>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="43"/>
+        <location filename="../gis/IGisItem.cpp" line="44"/>
         <source>[no name]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="315"/>
+        <location filename="../gis/IGisItem.cpp" line="316"/>
         <source>The item is not part of the project in the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="316"/>
+        <location filename="../gis/IGisItem.cpp" line="317"/>
         <source>
 It is either a new item or it has been deleted in the database by someone else.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="322"/>
+        <location filename="../gis/IGisItem.cpp" line="323"/>
         <source>The item is not in the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="328"/>
+        <location filename="../gis/IGisItem.cpp" line="329"/>
         <source>The item might need to be saved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="412"/>
+        <location filename="../gis/IGisItem.cpp" line="413"/>
         <source>Initial version.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="520"/>
+        <location filename="../gis/IGisItem.cpp" line="521"/>
         <source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="521"/>
+        <location filename="../gis/IGisItem.cpp" line="522"/>
         <source>Read Only Mode...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="685"/>
-        <location filename="../gis/IGisItem.cpp" line="744"/>
+        <location filename="../gis/IGisItem.cpp" line="692"/>
+        <location filename="../gis/IGisItem.cpp" line="745"/>
         <source><h4>Description:</h4></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="688"/>
-        <location filename="../gis/IGisItem.cpp" line="747"/>
+        <location filename="../gis/IGisItem.cpp" line="695"/>
+        <location filename="../gis/IGisItem.cpp" line="748"/>
         <source><p>--- no description ---</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="699"/>
+        <location filename="../gis/IGisItem.cpp" line="706"/>
         <source><h4>Comment:</h4></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="702"/>
+        <location filename="../gis/IGisItem.cpp" line="709"/>
         <source><p>--- no comment ---</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="713"/>
-        <location filename="../gis/IGisItem.cpp" line="758"/>
+        <location filename="../gis/IGisItem.cpp" line="720"/>
+        <location filename="../gis/IGisItem.cpp" line="759"/>
         <source><h4>Links:</h4></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="716"/>
-        <location filename="../gis/IGisItem.cpp" line="761"/>
+        <location filename="../gis/IGisItem.cpp" line="723"/>
+        <location filename="../gis/IGisItem.cpp" line="762"/>
         <source><p>--- no links ---</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="843"/>
+        <location filename="../gis/IGisItem.cpp" line="838"/>
         <source>Edit name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="843"/>
+        <location filename="../gis/IGisItem.cpp" line="838"/>
         <source>Enter new %1 name.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5281,58 +5400,58 @@ It is either a new item or it has been deleted in the database by someone else.<
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="258"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="271"/>
         <source>%1: Correlate tracks and waypoints.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="268"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="281"/>
         <source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="269"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="282"/>
         <source>Canceled correlation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="309"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="327"/>
         <source>Save "%1" to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="420"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="437"/>
         <source><br/>
 Filename: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="425"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="442"/>
         <source>Waypoints: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="429"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="446"/>
         <source>Tracks: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="433"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="450"/>
         <source>Routes: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="437"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="454"/>
         <source>Areas: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="557"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="574"/>
         <source>Are you sure you want to delete '%1' from project '%2'?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="558"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="575"/>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6025,62 +6144,62 @@ I don't want to read the documentation!</source>
 <context>
     <name>IMouseEditLine</name>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="264"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="256"/>
         <source><b>New Line</b><br/>Move the mouse and use the left mouse button to drop points. When done use the right mouse button to stop.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="314"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="306"/>
         <source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="323"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="315"/>
         <source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="324"/>
         <source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="341"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="333"/>
         <source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it.  Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="350"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="342"/>
         <source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="356"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="348"/>
         <source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="361"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="353"/>
         <source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="525"/>
         <source><b>%1 Metrics</b></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="536"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="528"/>
         <source>Distance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="538"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="530"/>
         <source>Ascend:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="540"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="532"/>
         <source>Descend:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6122,12 +6241,12 @@ I don't want to read the documentation!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../plot/IPlot.cpp" line="647"/>
+        <location filename="../plot/IPlot.cpp" line="648"/>
         <source>No or bad data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../plot/IPlot.cpp" line="1244"/>
+        <location filename="../plot/IPlot.cpp" line="1245"/>
         <source>Select output file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6980,23 +7099,39 @@ or
     </message>
 </context>
 <context>
-    <name>ISelDevices</name>
+    <name>ISearchDatabase</name>
     <message>
-        <location filename="../gis/ISelDevices.ui" line="14"/>
-        <source>Select devices...</source>
+        <location filename="../gis/db/ISearchDatabase.ui" line="14"/>
+        <source>Search...</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ISelectActivity</name>
     <message>
-        <location filename="../gis/trk/ISelectActivity.ui" line="14"/>
-        <source>Activities...</source>
+        <location filename="../gis/db/ISearchDatabase.ui" line="34"/>
+        <source>Type the word you want to search for and press the search button. 
+If you enter 'word' a search with an exact match is done. If you enter 'word*', 'word' has to be at the beginning of a string.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/ISelectActivity.ui" line="20"/>
-        <source>Select one:</source>
+        <location filename="../gis/db/ISearchDatabase.ui" line="51"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="79"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="86"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ISelDevices</name>
+    <message>
+        <location filename="../gis/ISelDevices.ui" line="14"/>
+        <source>Select devices...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7351,141 +7486,296 @@ or
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="25"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="38"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="51"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="64"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="77"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="97"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="110"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="123"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="136"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="169"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="182"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="195"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="208"/>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="256"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="331"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="259"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="334"/>
         <source>Ctrl+Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="268"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="38"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="343"/>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="271"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="346"/>
         <source>Ctrl+Shift+Z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="51"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="355"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="283"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="358"/>
         <source>Ctrl+X</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="292"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="64"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="367"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="370"/>
         <source>Ctrl+C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="304"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="77"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="375"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="307"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="100"/>
+        <source>A:L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="113"/>
+        <source>A:C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="126"/>
+        <source>A:R</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="139"/>
+        <source>A:B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="172"/>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="185"/>
+        <source>I</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="198"/>
+        <source>U</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="218"/>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="265"/>
+        <source>Standard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="270"/>
+        <source>Bullet List (Disc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="275"/>
+        <source>Bullet List (Circle)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+        <source>Bullet List (Square)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="285"/>
+        <source>Ordered List (Decimal)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="290"/>
+        <source>Ordered List (Alpha lower)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+        <source>Ordered List (Alpha upper)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="300"/>
+        <source>Ordered List (Roman lower)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="305"/>
+        <source>Ordered List (Roman upper)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="378"/>
         <source>Ctrl+V</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="319"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="390"/>
         <source>Align Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="322"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="393"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="334"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="405"/>
         <source>Align Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="337"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="408"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="349"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="420"/>
         <source>Align Center</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="352"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="423"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="364"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="435"/>
         <source>Align Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="367"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="438"/>
         <source>Ctrl+J</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="379"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="450"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="382"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="453"/>
         <source>Ctrl+U</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="394"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="465"/>
         <source>Bold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="397"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="468"/>
         <source>Ctrl+B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="409"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="480"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="412"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="483"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="495"/>
+        <source>Plain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="498"/>
+        <source>Reset the text's format before pasting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="503"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="506"/>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="509"/>
+        <source>Ctrl+A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="514"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="517"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="522"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="525"/>
+        <source>Reset Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="530"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="533"/>
+        <source>Reset Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="545"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="548"/>
+        <source>Paste without resetting the text's format</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ITextEditWidgetSelMenu</name>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="55"/>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="68"/>
+        <source>I</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="81"/>
+        <source>U</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="101"/>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="114"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="127"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ITimeZoneSetup</name>
diff --git a/src/locale/qmapshack_cs.ts b/src/locale/qmapshack_cs.ts
index 7e4d8d0..eab1ee2 100644
--- a/src/locale/qmapshack_cs.ts
+++ b/src/locale/qmapshack_cs.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="cs_CZ">
+<TS version="2.1" language="cs_CZ">
 <context>
     <name>CAbout</name>
     <message>
@@ -21,105 +21,101 @@
 <context>
     <name>CActivityTrk</name>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="29"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="117"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="39"/>
         <source>Foot</source>
         <translation>Chodec</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="37"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="118"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="47"/>
         <source>Bicycle</source>
         <translation>Jízdní kolo</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="45"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="119"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="55"/>
         <source>Motor Bike</source>
         <translation>Motocykl</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="53"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="120"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="63"/>
         <source>Car</source>
         <translation>Auto</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="61"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="121"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="71"/>
         <source>Cable Car</source>
         <translation>Lanovka</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="69"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="122"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="79"/>
         <source>Swim</source>
         <translation>Plavání</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="77"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="87"/>
         <source>Ship</source>
         <translation>Loď</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="85"/>
         <source>Aeronautik</source>
-        <translation>Vzduchoplavba</translation>
+        <translation type="vanished">Vzduchoplavba</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="93"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="125"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="103"/>
         <source>Ski/Winter</source>
         <translation>Lyže/Zima</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="124"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="95"/>
         <source>Aeronautics</source>
         <translation>Letectví</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="261"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="305"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="262"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="304"/>
         <source>Distance:</source>
         <translation>Vzdálenost:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="263"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="327"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="264"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="315"/>
         <source>Ascend:</source>
         <translation>Stoupání:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="265"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="349"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="266"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="326"/>
         <source>Descend:</source>
         <translation>Klesání:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="267"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="371"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="268"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="337"/>
         <source>Speed Moving:</source>
         <translation>Rychlost při pohybu:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="269"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="393"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="270"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
         <source>Speed Total:</source>
         <translation>Celková rychlost:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="271"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="415"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="272"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="359"/>
         <source>Time Moving:</source>
         <translation>Čas při pohybu:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="273"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="437"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="274"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="370"/>
         <source>Time Total:</source>
         <translation>Celkový čas:</translation>
     </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="410"/>
+        <source>None</source>
+        <translation type="unfinished">Žádné</translation>
+    </message>
 </context>
 <context>
     <name>CCanvas</name>
@@ -133,7 +129,7 @@
         <translation>Pohled %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="674"/>
+        <location filename="../canvas/CCanvas.cpp" line="670"/>
         <source>Setup Map Background</source>
         <translation>Nastavit pozadí mapy</translation>
     </message>
@@ -183,11 +179,11 @@
     <name>CCreateRouteFromWpt</name>
     <message>
         <source>Edit name...</source>
-        <translation>Upravit název...</translation>
+        <translation type="vanished">Upravit název...</translation>
     </message>
     <message>
         <source>Enter new route name.</source>
-        <translation>Zadat nový název cesty.</translation>
+        <translation type="vanished">Zadat nový název cesty.</translation>
     </message>
     <message>
         <location filename="../gis/rte/CCreateRouteFromWpt.cpp" line="68"/>
@@ -216,28 +212,28 @@
 <context>
     <name>CDBFolderMysql</name>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="32"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="33"/>
         <source>All your data grouped by folders.</source>
         <translation>Všechna data seskupená podle složek.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="52"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="53"/>
         <source>MySQL Database</source>
         <translation>Databáze MySQL</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="55"/>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="59"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="56"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="60"/>
         <source>Server: </source>
         <translation>Server: </translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="64"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="65"/>
         <source> (No PW)</source>
         <translation> (žádné heslo)</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="72"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="73"/>
         <source>Error: </source>
         <translation>Chyba: </translation>
     </message>
@@ -245,35 +241,40 @@
 <context>
     <name>CDBFolderSqlite</name>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="28"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="30"/>
         <source>All your data grouped by folders.</source>
         <translation>Všechna data seskupená podle složek.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="46"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="52"/>
         <source>SQLite Database</source>
         <translation>Databáze SQLite</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="56"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="62"/>
         <source>File: </source>
         <translation>Soubor: </translation>
     </message>
+    <message>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="66"/>
+        <source>Error: </source>
+        <translation type="unfinished">Chyba: </translation>
+    </message>
 </context>
 <context>
     <name>CDBItem</name>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="87"/>
+        <location filename="../gis/db/CDBItem.cpp" line="91"/>
         <source>%1 min.</source>
         <translation>%1 m</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="91"/>
+        <location filename="../gis/db/CDBItem.cpp" line="95"/>
         <source>%1 h</source>
         <translation>%1 h</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="95"/>
+        <location filename="../gis/db/CDBItem.cpp" line="99"/>
         <source>%1 days</source>
         <translation>%1 dnů</translation>
     </message>
@@ -281,7 +282,7 @@
 <context>
     <name>CDBProject</name>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="219"/>
+        <location filename="../gis/db/CDBProject.cpp" line="223"/>
         <source>The item %1 has been changed by %2 (%3). 
 
 To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -290,47 +291,47 @@ To solve this conflict you can create and save a clone, force your version or dr
 K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji verzi, nebo ji zahodit a vzít jednu z databáze</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="225"/>
+        <location filename="../gis/db/CDBProject.cpp" line="229"/>
         <source>Conflict with database...</source>
         <translation>Střet s databází...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="226"/>
+        <location filename="../gis/db/CDBProject.cpp" line="230"/>
         <source>Clone && Save</source>
         <translation>Klonovat a uložit</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="227"/>
+        <location filename="../gis/db/CDBProject.cpp" line="231"/>
         <source>Force Save</source>
         <translation>Vynutit uložení</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="228"/>
+        <location filename="../gis/db/CDBProject.cpp" line="232"/>
         <source>Take remote</source>
         <translation>Vzít vzdálenou verzi</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="531"/>
+        <location filename="../gis/db/CDBProject.cpp" line="514"/>
         <source>Missing folder...</source>
         <translation>Chybí složka...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="532"/>
+        <location filename="../gis/db/CDBProject.cpp" line="515"/>
         <source>Failed to save project. The folder has been deleted in the database.</source>
         <translation>Nepodařilo se uložit projekt. Složka byla v databázi smazána.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="539"/>
+        <location filename="../gis/db/CDBProject.cpp" line="522"/>
         <source>Save ...</source>
         <translation>Uložit...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="602"/>
+        <location filename="../gis/db/CDBProject.cpp" line="585"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="602"/>
+        <location filename="../gis/db/CDBProject.cpp" line="585"/>
         <source>There was an unexpected database error:
 
 %1</source>
@@ -339,12 +340,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
 %1</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="727"/>
+        <location filename="../gis/db/CDBProject.cpp" line="700"/>
         <source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
         <translation>Projekt '%1' se právě bude aktualizovat z databáze. Jsou tu ovšem neuložené změny.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="728"/>
+        <location filename="../gis/db/CDBProject.cpp" line="701"/>
         <source>Save changes?</source>
         <translation>Uložit změny?</translation>
     </message>
@@ -352,12 +353,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
 <context>
     <name>CDemList</name>
     <message>
-        <location filename="../dem/CDemList.cpp" line="202"/>
+        <location filename="../dem/CDemList.cpp" line="195"/>
         <source>Deactivate</source>
         <translation>Vypnout</translation>
     </message>
     <message>
-        <location filename="../dem/CDemList.cpp" line="202"/>
+        <location filename="../dem/CDemList.cpp" line="195"/>
         <source>Activate</source>
         <translation>Zapnout</translation>
     </message>
@@ -467,13 +468,13 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
 <context>
     <name>CDetailsPrj</name>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="270"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="791"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="265"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="775"/>
         <source>none</source>
         <translation>žádné</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="343"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="338"/>
         <source>Build diary...</source>
         <translation>Sestavit deník...</translation>
     </message>
@@ -482,124 +483,124 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation type="obsolete">Zrušit</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="446"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="435"/>
         <source><h2>Waypoints</h2></source>
         <translation><h2>Cestovní body</h2></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="479"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="608"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="726"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="442"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="468"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="710"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="740"/>
         <source>Info</source>
         <translation>Informace</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="454"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="480"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="609"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="727"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="757"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="443"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="469"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="593"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="711"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="741"/>
         <source>Comment</source>
         <translation>Poznámka</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="472"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="461"/>
         <source><h2>Tracks</h2></source>
         <translation><h2>Stopy</h2></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>From Start</source>
         <translation>Od začátku</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>To Next</source>
         <translation>K další</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>To End</source>
         <translation>Na konec</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="630"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="614"/>
         <source>distance: </source>
         <translation>Vzdálenost: </translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="640"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="624"/>
         <source>ascent: </source>
         <translation>Stoupání: </translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="650"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="634"/>
         <source>descend: </source>
         <translation>Klesání: </translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="719"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="703"/>
         <source><h2>Areas</h2></source>
         <translation><h2>Oblasti</h2></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="126"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
         <source>You want to sort waypoints along a track, but you switched off track and waypoint correlation. Do you want to switch it on again?</source>
         <translation>Chcete třídit cestovní body podél cesty, ale vypnul jste svázání cestovních bodů a cest (dání do vzájemného vztahu). Chcete je opět zapnout?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="128"/>
         <source>Correlation...</source>
         <translation>Svázání...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="398"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="393"/>
         <source><b>Summary over all tracks in project</b><br/></source>
         <translation><b>Přehled všech stop v projektu</b><br/></translation>
     </message>
     <message>
         <source>distance: %1%2</source>
-        <translation>Vzdálenost: %1%2</translation>
+        <translation type="vanished">Vzdálenost: %1%2</translation>
     </message>
     <message>
         <source>ascent: %1%2</source>
-        <translation>Stoupání: %1%2</translation>
+        <translation type="vanished">Stoupání: %1%2</translation>
     </message>
     <message>
         <source>descend: %1%2</source>
-        <translation>Klesání: %1%2</translation>
+        <translation type="vanished">Klesání: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="749"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
         <source><h2>Routes</h2></source>
         <translation><h2>Cesty</h2></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="761"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="788"/>
         <source>Edit name...</source>
         <translation>Upravit název...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="761"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="788"/>
         <source>Enter new project name.</source>
         <translation>Zadejte nový název projektu.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="770"/>
         <source>Edit keywords...</source>
         <translation>Upravit klíčová slova...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="770"/>
         <source>Enter keywords.</source>
         <translation>Zadejte klíčová slova.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="935"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="916"/>
         <source>Print Diary</source>
         <translation>Tisk deníku</translation>
     </message>
@@ -638,41 +639,41 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation type="obsolete">Plná barva </translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="181"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="166"/>
         <source>Reduce visible track points</source>
         <translation>Omezit počet viditelných bodů stopy</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="184"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
         <source>Change elevation of track points</source>
         <translation>Změnit informace o výškách bodů stopy</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="187"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
         <source>Change timestamp of track points</source>
         <translation>Změnit časová razítka bodů stopy</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="190"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
         <source>Modify track points' extensions</source>
         <translation>Změnit rozšíření bodů stopy</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="193"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
         <source>Cut track into pieces</source>
         <translation>Rozkrájet stopu na kusy</translation>
     </message>
     <message>
         <source>%1 %2</source>
-        <translation>%1 %2</translation>
+        <translation type="vanished">%1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="426"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="399"/>
         <source>Color</source>
         <translation>Barva</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="427"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="400"/>
         <source>Activity</source>
         <translation>Činnost</translation>
     </message>
@@ -685,19 +686,18 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation type="obsolete">Zadat název nové stopy.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="629"/>
         <source>Reset activities...</source>
         <translation>Nastavit činnosti znovu...</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="629"/>
         <source>This will remove all activities from the track. Proceed?</source>
         <translation>Tímto budou všechny činnosti odstraněny ze stopy. Pokračovat?</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="657"/>
         <source>None</source>
-        <translation>Žádné</translation>
+        <translation type="vanished">Žádné</translation>
     </message>
     <message>
         <source><h4>Comment:</h4></source>
@@ -839,7 +839,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation>Nepodařilo se nahrát soubor %1...</translation>
     </message>
     <message>
-        <location filename="../gis/fit/CFitProject.cpp" line="91"/>
+        <location filename="../gis/fit/CFitProject.cpp" line="93"/>
         <source>Failed to open FIT file %1.</source>
         <translation>Nepodařilo se otevřít soubor FIT %1.</translation>
     </message>
@@ -904,52 +904,52 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation>_Klon</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="385"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="391"/>
         <source>Area: %1%2</source>
         <translation>Oblast: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="447"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="451"/>
         <source>Changed area shape.</source>
         <translation>Změněn tvar oblasti.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="455"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="459"/>
         <source>Changed name.</source>
         <translation>Změněn název.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="461"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="465"/>
         <source>Changed border width.</source>
         <translation>Změněna šířka okraje.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="467"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="471"/>
         <source>Changed fill pattern.</source>
         <translation>Změněn vzor výplně.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="473"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="477"/>
         <source>Changed opacity.</source>
         <translation>Změněna neprůhlednost.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="479"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="483"/>
         <source>Changed comment.</source>
         <translation>Změněna poznámka.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="485"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="489"/>
         <source>Changed description.</source>
         <translation>Změněn popis.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="491"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="495"/>
         <source>Changed links</source>
         <translation>Změněné odkazy</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="502"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="506"/>
         <source>Changed color</source>
         <translation>Změněná barva</translation>
     </message>
@@ -962,73 +962,73 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation>_Klon</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="283"/>
         <source>track</source>
         <translation>Stopa</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="310"/>
         <source>Changed name.</source>
         <translation>Změněn název.</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="316"/>
         <source>Changed comment</source>
         <translation>Změněná poznámka</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="322"/>
         <source>Changed description</source>
         <translation>Změněný popis</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="328"/>
         <source>Changed links</source>
         <translation>Změněné odkazy</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="346"/>
         <source>Length: %1 %2</source>
         <translation>Délka: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="350"/>
         <source>Length: -</source>
         <translation>Délka: -</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="559"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="357"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="595"/>
         <source>Time: %1 %2</source>
         <translation>Čas: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="361"/>
         <source>Time: -</source>
         <translation>Výsledný čas: -</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="371"/>
         <source>%1%2 %3, %4%5 %6</source>
         <translation>%1%2 %3, %4%5 %6</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="377"/>
         <source>Last time routed:<br/>%1</source>
         <translation>Poslední spočítání cesty:<br/>%1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="379"/>
         <source>with %1</source>
         <translation>s %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="561"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="597"/>
         <source>Distance: %1 %2</source>
         <translation>Vzdálenost: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="675"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="712"/>
         <source>Changed route points.</source>
         <translation>Změněné body cesty.</translation>
     </message>
@@ -1067,22 +1067,22 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation>Nepodařilo se přečíst data.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="118"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="117"/>
         <source>_Clone</source>
         <translation>_Klon</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="290"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="289"/>
         <source>Changed trackpoints, sacrificed all previous data.</source>
         <translation>Změněny body stop. Obětována veškerá předchozí data.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="394"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
         <source>Length: %1 %2</source>
         <translation>Délka: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="401"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="400"/>
         <source>, %1%2 %3, %4%5 %6</source>
         <translation>, %1%2 %3, %4%5 %6</translation>
     </message>
@@ -1099,121 +1099,126 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation type="obsolete">Pohyb: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="434"/>
         <source>Start: %1</source>
         <translation>Začátek: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="438"/>
         <source>Start: -</source>
         <translation>Začátek: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="445"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="444"/>
         <source>End: %1</source>
         <translation>Konec: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="449"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="448"/>
         <source>End: -</source>
         <translation>Konec: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="452"/>
         <source>Points: %1 (%2)</source>
         <translation>Body: %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="457"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="456"/>
         <source>Invalid elevations!</source>
         <translation>Neplatné výšky!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="461"/>
         <source>Invalid timestamps!</source>
         <translation>Neplatná časová razítka!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="467"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="466"/>
         <source>Invalid positions!</source>
         <translation>Neplatné polohy!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="475"/>
+        <source>Activities: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
         <source>Index: %1</source>
         <translation>Rejstřík: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="562"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="590"/>
         <source>Index: visible %1, total %2</source>
         <translation>Rejstřík: viditelné %1, celkem %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="601"/>
         <source>Ele.: %1 %2</source>
         <translation>Výška: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
         <source> slope: %1%3 (%2%)</source>
         <translation> sklon: %1%3 (%2%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
         <source> speed: %1%2</source>
         <translation> rychlost: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
         <source>... and %1 tags not displayed</source>
         <translation>... a %1 značek nezobrazeno</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
         <source>Descend: - (-)</source>
         <translation>Klesání: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="649"/>
         <source>Distance: - (-)</source>
         <translation>Vzdálenost: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="622"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="650"/>
         <source>Moving: - (-)</source>
         <translation>Pohyb: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="627"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="655"/>
         <source>Ascend: %1%2 (%3%)</source>
         <translation>Stoupání: %1%2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1317"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1330"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1390"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1434"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1599"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1345"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1418"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1462"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1627"/>
         <source>track</source>
         <translation>Stopa</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1535"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1563"/>
         <source>Hide point %1.</source>
         <translation>Skrýt bod %1.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1539"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1567"/>
         <source>Hide points %1..%2.</source>
         <translation>Skrýt body %1  %2.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="619"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="647"/>
         <source>Ascend: - (-)</source>
         <translation>Stoupání: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
         <source> Descend: %1%2 (%3%)</source>
         <translation> Klesání: %1%2 (%3%)</translation>
     </message>
@@ -1230,7 +1235,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation type="obsolete">Vzdálenost: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="645"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="673"/>
         <source> Moving: %1%2 (%3%)</source>
         <translation> Pohyb: %1%2 (%3%)</translation>
     </message>
@@ -1239,28 +1244,28 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation type="obsolete"> Pohyb: - (-) </translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="695"/>
         <source>Ascend: %1%2</source>
         <translation>Stoupání: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="672"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="700"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="712"/>
         <source>, %1%2</source>
         <translation>, %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
         <source>Ascend: -</source>
         <translation>Stoupání: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="707"/>
         <source> Descend: %1%2</source>
         <translation> Klesání: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="690"/>
         <source>Descend: -</source>
         <translation>Klesání: -</translation>
     </message>
@@ -1269,55 +1274,55 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation type="obsolete">Vzdál.: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="694"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="722"/>
         <source> Time: %1%2</source>
         <translation> Čas: %1%2</translation>
     </message>
     <message>
         <source>Edit name...</source>
-        <translation>Upravit název...</translation>
+        <translation type="vanished">Upravit název...</translation>
     </message>
     <message>
         <source>Enter new track name.</source>
-        <translation>Zadejte nový název stopy.</translation>
+        <translation type="vanished">Zadejte nový název stopy.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="405"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="404"/>
         <source>, %1-, %2-</source>
         <translation>, %1-, %2-</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="413"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="412"/>
         <source>Time: %1, Speed: %2 %3</source>
         <translation>Čas: %1, Rychlost: %2 %3</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="417"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="416"/>
         <source>Time: -, Speed: -</source>
         <translation>Čas: -, Rychlost: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="424"/>
         <source>Moving: %1, Speed: %2 %3</source>
         <translation>Pohyb: %1, Rychlost: %2 %3</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="429"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="428"/>
         <source>Moving: -, Speed: -</source>
         <translation>Pohyb: -, Rychlost: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
         <source>Distance: %1%2 (%3%)</source>
         <translation>Vzdálenost: %1%2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="717"/>
         <source>Distance: %1%2</source>
         <translation>Vzdálenost: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1380"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1408"/>
         <source>Permanently removed points %1..%2</source>
         <translation>Trvale odstraněné body %1 ... %2</translation>
     </message>
@@ -1326,42 +1331,42 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation type="obsolete">Skrýt body.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1579"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1607"/>
         <source>Show points.</source>
         <translation>Ukázat body.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2142"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
         <source>Changed name</source>
         <translation>Změněný název</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2148"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
         <source>Changed comment</source>
         <translation>Změněná poznámka</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2166"/>
         <source>Changed description</source>
         <translation>Změněný popis</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2172"/>
         <source>Changed links</source>
         <translation>Změněné odkazy</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2171"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2183"/>
         <source>Changed elevation of point %1 to %2 %3</source>
         <translation>Výška bodu %1 byla změněna na %2 %3</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2198"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2212"/>
         <source>Changed activity to '%1' for complete track.</source>
         <translation>Činnost byla pro celou stopu změněna na '%1'.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2256"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2262"/>
         <source>Changed activity to '%1' for range(%2..%3).</source>
         <translation>Činnost byla změněna pro oblast (%2...%3) na '%1'.</translation>
     </message>
@@ -1372,7 +1377,7 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
     </message>
     <message>
         <source>Hide points with invalid coordinates at the beginning of the track</source>
-        <translation>Skrýt body s neplatnými souřadnicemi na začátku stopy</translation>
+        <translation type="vanished">Skrýt body s neplatnými souřadnicemi na začátku stopy</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/filter.cpp" line="141"/>
@@ -1463,62 +1468,62 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation>_Klon</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="267"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="272"/>
         <source>Elevation: %1 %2</source>
         <translation>Výška: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="278"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="283"/>
         <source>Proximity: %1 %2</source>
         <translation>Blízkost: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="352"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="355"/>
         <source>Changed name</source>
         <translation>Změněný název</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="362"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="365"/>
         <source>Changed position</source>
         <translation>Změněná poloha</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="371"/>
         <source>Changed elevation</source>
         <translation>Změněná výška</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="377"/>
         <source>Changed proximity</source>
         <translation>Změněná blízkost</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="388"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="391"/>
         <source>Changed icon</source>
         <translation>Změněná ikona</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="397"/>
         <source>Changed comment</source>
         <translation>Změněná poznámka</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="403"/>
         <source>Changed description</source>
         <translation>Změněný popis</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="409"/>
         <source>Changed links</source>
         <translation>Změněné odkazy</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="415"/>
         <source>Changed images</source>
         <translation>Změněné obrázky</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="421"/>
         <source>Add image</source>
         <translation>Přidat obrázek</translation>
     </message>
@@ -1526,68 +1531,113 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
 <context>
     <name>CGisListDB</name>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="81"/>
+        <location filename="../gis/CGisListDB.cpp" line="83"/>
         <source>Due to changes in the database system QMapShack forgot about the filename of your database '%1'. You have to select it again in the next step.</source>
         <translation>Na základě změn v databázovém systému QMapShack souborové názvy ve vaší databázi '%1' už nezná. Musíte je v dalším kroku znovu zvolit.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="82"/>
+        <location filename="../gis/CGisListDB.cpp" line="84"/>
         <source>Select database file.</source>
         <translation>Vybrat soubor s databází.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="115"/>
+        <location filename="../gis/CGisListDB.cpp" line="117"/>
         <source>Add Database</source>
         <translation>Přidat databázi</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="118"/>
+        <location filename="../gis/CGisListDB.cpp" line="120"/>
         <source>Add Folder</source>
         <translation>Přidat složku</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="119"/>
+        <location filename="../gis/CGisListDB.cpp" line="121"/>
+        <source>Rename Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="122"/>
+        <source>Copy Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="123"/>
+        <source>Move Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="124"/>
         <source>Delete Folder</source>
         <translation>Smazat složku</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="122"/>
-        <location filename="../gis/CGisListDB.cpp" line="133"/>
+        <location filename="../gis/CGisListDB.cpp" line="127"/>
+        <location filename="../gis/CGisListDB.cpp" line="139"/>
         <source>Delete Item</source>
         <translation>Smazat prvek</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="126"/>
+        <location filename="../gis/CGisListDB.cpp" line="131"/>
+        <source>Search Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="132"/>
         <source>Sync. with Database</source>
         <translation>Seřídit s databází</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="127"/>
+        <location filename="../gis/CGisListDB.cpp" line="133"/>
         <source>Remove Database</source>
         <translation>Odstranit databázi</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="130"/>
+        <location filename="../gis/CGisListDB.cpp" line="136"/>
         <source>Empty</source>
         <translation>Prázdný</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="418"/>
+        <location filename="../gis/CGisListDB.cpp" line="432"/>
         <source>Remove database...</source>
         <translation>Odstranit databázi...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="418"/>
+        <location filename="../gis/CGisListDB.cpp" line="432"/>
         <source>Do you really want to remove '%1' from the list?</source>
         <translation>Opravdu chcete '%1' odstranit ze seznamu?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="611"/>
+        <location filename="../gis/CGisListDB.cpp" line="496"/>
+        <source>Are you sure you want to delete selected folders and all subfolders from the database?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="664"/>
+        <source>Bad operation....</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="664"/>
+        <source>The target folder is a subfolder of the one to move. This will not work.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="723"/>
+        <source>Folder name...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="723"/>
+        <source>Rename folder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="852"/>
         <source>Are you sure you want to delete '%1' from folder '%2'?</source>
         <translation>Jste si jistý, že chcete smazat '%1' ze složky '%2'?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="612"/>
+        <location filename="../gis/CGisListDB.cpp" line="853"/>
         <source>Delete...</source>
         <translation>Smazat...</translation>
     </message>
@@ -1596,28 +1646,27 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation type="obsolete">Opravdu chcete '%1' odstranit ze seznamu?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="476"/>
+        <location filename="../gis/CGisListDB.cpp" line="496"/>
         <source>Delete database folder...</source>
         <translation>Smazat složku s databází...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="476"/>
         <source>Are you sure you want to delete "%1" from the database?</source>
-        <translation>Opravdu chcete "%1" odstranit z databáze?</translation>
+        <translation type="vanished">Opravdu chcete "%1" odstranit z databáze?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="503"/>
-        <location filename="../gis/CGisListDB.cpp" line="524"/>
+        <location filename="../gis/CGisListDB.cpp" line="744"/>
+        <location filename="../gis/CGisListDB.cpp" line="765"/>
         <source>Remove items...</source>
         <translation>Odstranit prvky...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="503"/>
+        <location filename="../gis/CGisListDB.cpp" line="744"/>
         <source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
         <translation>Opravdu chcete smazat všechny prvky ze ztracených a nalezených? Tím budou trvale odstraněny.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="524"/>
+        <location filename="../gis/CGisListDB.cpp" line="765"/>
         <source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
         <translation>Opravdu chcete smazat všechny vybrané prvky ze ztracených a nalezených? Tím budou trvale odstraněny.</translation>
     </message>
@@ -1625,12 +1674,12 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
 <context>
     <name>CGisListWks</name>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="104"/>
+        <location filename="../gis/CGisListWks.cpp" line="112"/>
         <source>Save As...</source>
         <translation>Uložit jako...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="103"/>
+        <location filename="../gis/CGisListWks.cpp" line="111"/>
         <source>Save</source>
         <translation>Uložit</translation>
     </message>
@@ -1644,89 +1693,90 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation type="obsolete">Aktualizovat projekt na zařízeních</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="111"/>
+        <location filename="../gis/CGisListWks.cpp" line="119"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="121"/>
+        <location filename="../gis/CGisListWks.cpp" line="128"/>
         <source>Update Project on Device</source>
         <translation>Aktualizovat projekt na zařízení</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="134"/>
+        <location filename="../gis/CGisListWks.cpp" line="141"/>
         <source>Edit...</source>
         <translation>Upravit...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="135"/>
+        <location filename="../gis/CGisListWks.cpp" line="99"/>
+        <location filename="../gis/CGisListWks.cpp" line="142"/>
         <source>Copy to...</source>
         <translation>Kopírovat do...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="150"/>
+        <location filename="../gis/CGisListWks.cpp" line="157"/>
         <source>Show Bubble</source>
         <translation>Ukázat bublinu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="152"/>
+        <location filename="../gis/CGisListWks.cpp" line="159"/>
         <source>Move Waypoint</source>
         <translation>Přesunout cestovní bod</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="153"/>
+        <location filename="../gis/CGisListWks.cpp" line="160"/>
         <source>Proj. Waypoint...</source>
         <translation>Promítnutí cestovního bodu...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="161"/>
+        <location filename="../gis/CGisListWks.cpp" line="168"/>
         <source>Route Instructions</source>
         <translation>Pokyny pro cestu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="163"/>
+        <location filename="../gis/CGisListWks.cpp" line="170"/>
         <source>Calculate Route</source>
         <translation>Spočítat cestu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="164"/>
+        <location filename="../gis/CGisListWks.cpp" line="171"/>
         <source>Reset Route</source>
         <translation>Nastavit cestu znovu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="165"/>
+        <location filename="../gis/CGisListWks.cpp" line="172"/>
         <source>Edit Route</source>
         <translation>Upravit cestu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="166"/>
+        <location filename="../gis/CGisListWks.cpp" line="173"/>
         <source>Convert to Track</source>
         <translation>Převést na stopu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="182"/>
+        <location filename="../gis/CGisListWks.cpp" line="189"/>
         <source>Create Route</source>
         <translation>Vytvořit cestu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="626"/>
+        <location filename="../gis/CGisListWks.cpp" line="618"/>
         <source>Drop items...</source>
         <translation>Zahodit prvky...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="651"/>
-        <location filename="../gis/CGisListWks.cpp" line="1593"/>
-        <location filename="../gis/CGisListWks.cpp" line="1631"/>
+        <location filename="../gis/CGisListWks.cpp" line="643"/>
+        <location filename="../gis/CGisListWks.cpp" line="1599"/>
+        <location filename="../gis/CGisListWks.cpp" line="1637"/>
         <source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
         <translation><b>Aktualizovat zařízení</b><p>Aktualizovat %1<br/>Počkejte, prosím...</p></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1166"/>
+        <location filename="../gis/CGisListWks.cpp" line="1172"/>
         <source>Delete project...</source>
         <translation>Smazat projekt...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1166"/>
+        <location filename="../gis/CGisListWks.cpp" line="1172"/>
         <source>Do you really want to delete %1?</source>
         <translation>Opravdu chcete smazat %1?</translation>
     </message>
@@ -1735,78 +1785,88 @@ K vyřešení tohoto střetu můžete vytvořit a uložit klona, vynutit svoji v
         <translation type="obsolete">Kopírovat prvky...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="137"/>
+        <location filename="../gis/CGisListWks.cpp" line="144"/>
         <source>Track Profile</source>
         <translation>Profil stopy</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="99"/>
+        <location filename="../gis/CGisListWks.cpp" line="100"/>
         <source>Show on Map</source>
         <translation>Ukázat na mapě</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="100"/>
+        <location filename="../gis/CGisListWks.cpp" line="101"/>
         <source>Hide from Map</source>
         <translation>Skrýt v mapě</translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <source>Sort by Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="108"/>
+        <source>Sort by Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="115"/>
         <source>Send to Devices</source>
         <translation>Poslat do zařízení</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="108"/>
+        <location filename="../gis/CGisListWks.cpp" line="116"/>
         <source>Sync. with Database</source>
         <translation>Seřídit s databází</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="139"/>
+        <location filename="../gis/CGisListWks.cpp" line="146"/>
         <source>Select Range</source>
         <translation>Vybrat rozsah</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="140"/>
+        <location filename="../gis/CGisListWks.cpp" line="147"/>
         <source>Edit Track Points</source>
         <translation>Upravit body stopy</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="141"/>
+        <location filename="../gis/CGisListWks.cpp" line="148"/>
         <source>Reverse Track</source>
         <translation>Obrátit stopu</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="142"/>
+        <location filename="../gis/CGisListWks.cpp" line="149"/>
         <source>Combine Tracks</source>
         <translation>Spojit stopy</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="175"/>
+        <location filename="../gis/CGisListWks.cpp" line="182"/>
         <source>Edit Area Points</source>
         <translation>Upravit body oblasti</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="123"/>
-        <location filename="../gis/CGisListWks.cpp" line="144"/>
+        <location filename="../gis/CGisListWks.cpp" line="130"/>
+        <location filename="../gis/CGisListWks.cpp" line="151"/>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="780"/>
+        <location filename="../gis/CGisListWks.cpp" line="769"/>
         <source>Saving workspace. Please wait.</source>
         <translation>Ukládá se pracovní prostor. Počkejte, prosím.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="826"/>
+        <location filename="../gis/CGisListWks.cpp" line="815"/>
         <source>Loading workspace. Please wait.</source>
         <translation>Nahrává se pracovní prostor. Počkejte, prosím.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1143"/>
+        <location filename="../gis/CGisListWks.cpp" line="1149"/>
         <source>Close all projects...</source>
         <translation>Zavřít všechny projekty...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1143"/>
+        <location filename="../gis/CGisListWks.cpp" line="1149"/>
         <source>This will remove all projects from the workspace.</source>
         <translation>Tímto budou všechny projekty odstraněny z pracovního prostoru.</translation>
     </message>
@@ -1901,27 +1961,27 @@ line %2, column %3:
         <translation>Není souborem GPX: %1</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="258"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="264"/>
         <source>File exists ...</source>
         <translation>Soubor existuje...</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="259"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="265"/>
         <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains GPX data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file.  Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
         <translation>Soubor existuje a nebyl vytvořen programem QMapShack. Pokud stisknete Ano, budou všechna data v tomto souboru ztracena. I když by tento soubor obsahoval data GPX a byl nahrán programem QMapShack, QMapShack nemusí být schopen nahrát a uložit všechny prvky tohoto souboru.  Tyto prvky budou ztraceny. Doporučuje se použít jiný soubor. <b>Opravdu chcete soubor přepsat?</b></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="367"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="380"/>
         <source>Failed to create file '%1'</source>
         <translation>Nepodařilo se vytvořit soubor '%1'</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="377"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="390"/>
         <source>Failed to write file '%1'</source>
         <translation>Nepodařilo se zapsat soubor '%1'</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="395"/>
         <source>Saving GIS data failed...</source>
         <translation>Nepodařilo se uložit data GIS...</translation>
     </message>
@@ -2103,11 +2163,21 @@ line %2, column %3:
         <source>Select file to load</source>
         <translation>Vybrat soubor k nahrání</translation>
     </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1061"/>
+        <source>Fatal...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1062"/>
+        <source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your ditribution to fix it.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CMapDraw</name>
     <message>
-        <location filename="../map/CMapDraw.cpp" line="406"/>
+        <location filename="../map/CMapDraw.cpp" line="420"/>
         <source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack. 
 
 If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is  [...]
@@ -2724,7 +2794,7 @@ Když s QMapShack není bez map žádná zábava, proč s ním nejsou nějaké p
     </message>
     <message>
         <source>File contains locked / encypted data. Garmin does not want you to use this file with any other software than the one supplied by Garmin.</source>
-        <translation>Soubor obsahuje zamknutá/zašifrovaná data. Garmin nechce, aby byl tento soubor použit s jiným programem než dodaným Garminem.</translation>
+        <translation type="vanished">Soubor obsahuje zamknutá/zašifrovaná data. Garmin nechce, aby byl tento soubor použit s jiným programem než dodaným Garminem.</translation>
     </message>
     <message>
         <location filename="../map/CMapIMG.cpp" line="2305"/>
@@ -2749,17 +2819,17 @@ Když s QMapShack není bez map žádná zábava, proč s ním nejsou nějaké p
 <context>
     <name>CMapList</name>
     <message>
-        <location filename="../map/CMapList.cpp" line="208"/>
+        <location filename="../map/CMapList.cpp" line="202"/>
         <source>Deactivate</source>
         <translation>Vypnout</translation>
     </message>
     <message>
-        <location filename="../map/CMapList.cpp" line="208"/>
+        <location filename="../map/CMapList.cpp" line="202"/>
         <source>Activate</source>
         <translation>Zapnout</translation>
     </message>
     <message>
-        <location filename="../map/CMapList.cpp" line="233"/>
+        <location filename="../map/CMapList.cpp" line="227"/>
         <source>Where do you want to store maps?</source>
         <translation>Kde chcete ukládat mapy?</translation>
     </message>
@@ -2884,7 +2954,7 @@ line %2, column %3:
         <translation>Tato mapa vyžaduje podporu pro OpenSSL. Nicméně kvůli právním omezením v některých zemích není OpenSSL k QMapShack přibaleno. Můžete se podívat na <a href='https://www.openssl.org/community/binaries.html'>stránky OpenSSL</a>, kde najdete spustitelné soubory. Musíte zkopírovat libeay32.dll a ssleay32.dll do adresáře s programem QMapShack.</translation>
     </message>
     <message>
-        <location filename="../map/CMapTMS.cpp" line="304"/>
+        <location filename="../map/CMapTMS.cpp" line="299"/>
         <source><b>%1</b>: %2 tiles pending<br/></source>
         <translation><b>%1</b>: %2 dlaždic čeká<br/></translation>
     </message>
@@ -3032,11 +3102,11 @@ Neznámá stavba.</translation>
     </message>
     <message>
         <source>Edit name...</source>
-        <translation>Upravit název...</translation>
+        <translation type="vanished">Upravit název...</translation>
     </message>
     <message>
         <source>Enter new area name.</source>
-        <translation>Zadat nový název oblasti.</translation>
+        <translation type="vanished">Zadat nový název oblasti.</translation>
     </message>
 </context>
 <context>
@@ -3059,11 +3129,11 @@ Neznámá stavba.</translation>
     </message>
     <message>
         <source>Edit name...</source>
-        <translation>Upravit název...</translation>
+        <translation type="vanished">Upravit název...</translation>
     </message>
     <message>
         <source>Enter new route name.</source>
-        <translation>Zadat nový název cesty.</translation>
+        <translation type="vanished">Zadat nový název cesty.</translation>
     </message>
 </context>
 <context>
@@ -3100,11 +3170,11 @@ Neznámá stavba.</translation>
     </message>
     <message>
         <source>Edit name...</source>
-        <translation>Upravit název...</translation>
+        <translation type="vanished">Upravit název...</translation>
     </message>
     <message>
         <source>Enter new track name.</source>
-        <translation>Zadejte nový název stopy.</translation>
+        <translation type="vanished">Zadejte nový název stopy.</translation>
     </message>
 </context>
 <context>
@@ -3178,22 +3248,22 @@ Neznámá stavba.</translation>
         <translation><b>Vybráno:</b><br/></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="98"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="104"/>
         <source>%1 waypoints<br/></source>
         <translation>%1 cestovní body<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="97"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="99"/>
         <source>%1 tracks<br/></source>
         <translation>%1 stopy<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="99"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="109"/>
         <source>%1 routes<br/></source>
         <translation>%1 cesty<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="100"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="114"/>
         <source>%1 areas<br/></source>
         <translation>%1 oblasti<br/></translation>
     </message>
@@ -3375,11 +3445,11 @@ není platným vymezením soustavy souřadnic
     <name>CPropertyTrk</name>
     <message>
         <source>distance [%1]</source>
-        <translation>Vzdálenost [%1]</translation>
+        <translation type="vanished">Vzdálenost [%1]</translation>
     </message>
     <message>
         <source>time</source>
-        <translation>Čas</translation>
+        <translation type="vanished">Čas</translation>
     </message>
 </context>
 <context>
@@ -3553,7 +3623,7 @@ není platným vymezením soustavy souřadnic
         <translation>Odstranit stávající soubor %1</translation>
     </message>
     <message>
-        <location filename="../qlgt/CQmsDb.cpp" line="163"/>
+        <location filename="../qlgt/CQmsDb.cpp" line="164"/>
         <source>%1: drop item with QLGT DB ID %2</source>
         <translation>%1: Zahodit prvek s ID DB QLGT %2</translation>
     </message>
@@ -3915,13 +3985,13 @@ není platným vymezením soustavy souřadnic
         <translation>%1: Kvůli omezením Windows POSIX API Routino nedokáže zpracovat soubory větší než 4 GB.</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="344"/>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="431"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="338"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="425"/>
         <source>Calculate route with %1</source>
         <translation>Spočítat cestu s %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="352"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="346"/>
         <source><br/>Calculation time: %1s</source>
         <translation><br/>Doba výpočtu: %1 s</translation>
     </message>
@@ -4039,6 +4109,14 @@ není platným vymezením soustavy souřadnic
     </message>
 </context>
 <context>
+    <name>CSearchDatabase</name>
+    <message>
+        <location filename="../gis/db/CSearchDatabase.cpp" line="38"/>
+        <source>Search database '%1':</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CSearchGoogle</name>
     <message>
         <location filename="../gis/search/CSearchGoogle.cpp" line="118"/>
@@ -4188,10 +4266,15 @@ line %2, column %3:
 <context>
     <name>CTextEditWidget</name>
     <message>
-        <location filename="../widgets/CTextEditWidget.cpp" line="73"/>
+        <location filename="../widgets/CTextEditWidget.cpp" line="70"/>
         <source>&Color...</source>
         <translation>B&arva...</translation>
     </message>
+    <message>
+        <location filename="../widgets/CTextEditWidget.cpp" line="113"/>
+        <source>Reset format</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CTwoNavProject</name>
@@ -4202,20 +4285,20 @@ line %2, column %3:
         <location filename="../gis/tnv/serialization.cpp" line="617"/>
         <location filename="../gis/tnv/serialization.cpp" line="645"/>
         <location filename="../gis/tnv/serialization.cpp" line="719"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="87"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="191"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
         <source>Error...</source>
         <translation>Chyba...</translation>
     </message>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="560"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="87"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="191"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
         <source>Failed to open %1.</source>
         <translation>Nepodařilo se otevřít %1.</translation>
     </message>
     <message>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="159"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="160"/>
         <source>Save GIS data to...</source>
         <translation>Uložit data GIS do...</translation>
     </message>
@@ -4576,9 +4659,13 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
 <context>
     <name>IDB</name>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="60"/>
         <source>The internal database format of '%1'' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
-        <translation>Vnitřní formát databáze '%1'' se změnil. QMapShack nyní vaši databázi přestěhuje. Po přestěhování databáze se staršími verzemi QMapShack nebude použitelná. Doporučuje se databázi nejprve zazálohovat.</translation>
+        <translation type="vanished">Vnitřní formát databáze '%1'' se změnil. QMapShack nyní vaši databázi přestěhuje. Po přestěhování databáze se staršími verzemi QMapShack nebude použitelná. Doporučuje se databázi nejprve zazálohovat.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="60"/>
+        <source>The internal database format of '%1' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="64"/>
@@ -4586,29 +4673,48 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
         <translation>Přestěhovat databázi...</translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="74"/>
+        <location filename="../gis/db/IDB.cpp" line="69"/>
+        <source>Migration aborted by user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="75"/>
         <source>Failed to migrate '%1'.</source>
         <translation>Nepodařilo se přestěhovat '%1'.</translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="76"/>
-        <location filename="../gis/db/IDB.cpp" line="100"/>
+        <location filename="../gis/db/IDB.cpp" line="77"/>
+        <location filename="../gis/db/IDB.cpp" line="106"/>
         <source>Error...</source>
         <translation>Chyba...</translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="85"/>
-        <source>The database version of '%1'' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
-        <translatorcomment>Verze databáze '%1'' je pokročilejší než ta, se kterou pracuje vaše instalace QMapShack. To nebude pracovat.</translatorcomment>
-        <translation></translation>
+        <location filename="../gis/db/IDB.cpp" line="81"/>
+        <source>Migration failed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="88"/>
+        <source>The database version of '%1' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="110"/>
+        <source>Initialization failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="91"/>
         <source>Wrong database version...</source>
         <translation>Nesprávná verze databáze...</translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="98"/>
+        <location filename="../gis/db/IDB.cpp" line="95"/>
+        <source>Database created by newer version of QMapShack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="104"/>
         <source>Failed to initialize '%1'.</source>
         <translation>Nepodařilo se inicializovat '%1'.</translation>
     </message>
@@ -4616,15 +4722,38 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
 <context>
     <name>IDBMysql</name>
     <message>
-        <location filename="../gis/db/IDBMysql.cpp" line="54"/>
+        <location filename="../gis/db/IDBMysql.cpp" line="60"/>
         <source>Password...</source>
         <translation>Heslo...</translation>
     </message>
     <message>
-        <location filename="../gis/db/IDBMysql.cpp" line="54"/>
+        <location filename="../gis/db/IDBMysql.cpp" line="60"/>
         <source>Password for database '%1':</source>
         <translation>Heslo pro databázi '%1':</translation>
     </message>
+    <message>
+        <location filename="../gis/db/IDBMysql.cpp" line="222"/>
+        <source>Update to database version 5. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IDBSqlite</name>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="306"/>
+        <source>Update to database version 3. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="375"/>
+        <source>Update to database version 5. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="449"/>
+        <source>Update to database version 6. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IDemPathSetup</name>
@@ -4729,11 +4858,11 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
     </message>
     <message>
         <source>To add files with elevation data use File->Setup DEM Paths. </source>
-        <translation>Pro přidání souborů s údaji o výšce použijte Soubor → Nastavit cesty k výškovým modelům. </translation>
+        <translation type="vanished">Pro přidání souborů s údaji o výšce použijte Soubor → Nastavit cesty k výškovým modelům. </translation>
     </message>
     <message>
         <source>To add files with elevation data use <b>File->Setup DEM Paths</b>. </source>
-        <translation>Pro přidání souborů s údaji o výšce použijte <b>Soubor → Nastavit cesty k výškovým modelům</b>. </translation>
+        <translation type="vanished">Pro přidání souborů s údaji o výšce použijte <b>Soubor → Nastavit cesty k výškovým modelům</b>. </translation>
     </message>
     <message>
         <location filename="../dem/IDemList.ui" line="118"/>
@@ -4930,14 +5059,14 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
         <translation type="obsolete">Třídit podle stopy</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="115"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="110"/>
         <source>Print diary</source>
         <translation>Tisk deníku</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="94"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="118"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="138"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="89"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="113"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="133"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -4947,22 +5076,21 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
         <translation>Zachovat pořadí projektu</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="76"/>
         <source>Sort by time</source>
-        <translation>Třídit podle času</translation>
+        <translation type="vanished">Třídit podle času</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="76"/>
         <source>Sort along track (multiple)</source>
         <translation>Třídit podle stopy (vícenásobně)</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="86"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
         <source>Sort along track (single)</source>
         <translation>Třídit podle stopy (jednorázově)</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="135"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="130"/>
         <source>Rebuild diary.</source>
         <translation>Sestavit deník znovu.</translation>
     </message>
@@ -5030,7 +5158,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1498"/>
         <source>Speed</source>
         <translation>Rychlost</translation>
     </message>
@@ -5159,52 +5287,62 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
         <translation>Činnost</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1375"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1357"/>
+        <source>Set Track Activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1364"/>
+        <source>Remove Track Activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1403"/>
         <source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
         <translation>K rozlišení statistik stop zvolte v seznamu činnost pro celou stopu. Nebo vyberte část stopy a přiřaďte jí činnost.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1402"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1430"/>
         <source>Points</source>
         <translation>Body</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1478"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1483"/>
         <source>Ele.</source>
         <translation>Výška</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1488"/>
         <source>Delta</source>
         <translation>Rozdíl</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1493"/>
         <source>Dist.</source>
         <translation>Vzdál.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1503"/>
         <source>Slope</source>
         <translation>Sklon</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1508"/>
         <source>Ascend</source>
         <translation>Stoupání</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1513"/>
         <source>Descend</source>
         <translation>Klesání</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1518"/>
         <source>Position</source>
         <translation>Poloha</translation>
     </message>
@@ -5271,12 +5409,12 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
         <translation>Barva</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1499"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1527"/>
         <source>Filter</source>
         <translation>Filtr</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1536"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1564"/>
         <source>Hist.</source>
         <translation>Historie</translation>
     </message>
@@ -5362,7 +5500,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
 <context>
     <name>IDevice</name>
     <message>
-        <location filename="../device/IDevice.cpp" line="287"/>
+        <location filename="../device/IDevice.cpp" line="292"/>
         <source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
         <translation>Je jiný projekt se stejným názvem. Pokud stisknete OK, bude odstraněn a nahrazen.</translation>
     </message>
@@ -5498,7 +5636,7 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
     </message>
     <message>
         <source>Hide points with invalid coordinates at the beginning of the track.</source>
-        <translation>Skrýt body s neplatnými souřadnicemi na začátku stopy.</translation>
+        <translation type="vanished">Skrýt body s neplatnými souřadnicemi na začátku stopy.</translation>
     </message>
     <message>
         <location filename="../gis/trk/filter/IFilterInvalid.ui" line="63"/>
@@ -5736,88 +5874,88 @@ Pokud chcete zachovat pouze jednu polovinu, můžete jednoduše odstranit body,
 <context>
     <name>IGisItem</name>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="43"/>
+        <location filename="../gis/IGisItem.cpp" line="44"/>
         <source>[no name]</source>
         <translation>[žádný název]</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="315"/>
+        <location filename="../gis/IGisItem.cpp" line="316"/>
         <source>The item is not part of the project in the database.</source>
         <translation>Prvek není částí projektu v databázi.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="316"/>
+        <location filename="../gis/IGisItem.cpp" line="317"/>
         <source>
 It is either a new item or it has been deleted in the database by someone else.</source>
         <translation>
 Buď je to nový symbol nebo byl v databázi někým smazán.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="322"/>
+        <location filename="../gis/IGisItem.cpp" line="323"/>
         <source>The item is not in the database.</source>
         <translation>Prvek není v databázi.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="328"/>
+        <location filename="../gis/IGisItem.cpp" line="329"/>
         <source>The item might need to be saved</source>
         <translation>Může být potřeba prvek uložit.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="412"/>
+        <location filename="../gis/IGisItem.cpp" line="413"/>
         <source>Initial version.</source>
         <translation>Počáteční verze.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="520"/>
+        <location filename="../gis/IGisItem.cpp" line="521"/>
         <source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
         <translation><h3>%1</h3> Tento prvek je pravděpodobně pouze pro čtení, protože nebyl vytvořen v programu QMapShack. Obvykle nemáte zájem měnit zavedená data. Ale pokud si myslíte, že je to tentokrát na místě, stiskněte OK.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="521"/>
+        <location filename="../gis/IGisItem.cpp" line="522"/>
         <source>Read Only Mode...</source>
         <translation>Režim pouze pro čtení...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="685"/>
-        <location filename="../gis/IGisItem.cpp" line="744"/>
+        <location filename="../gis/IGisItem.cpp" line="692"/>
+        <location filename="../gis/IGisItem.cpp" line="745"/>
         <source><h4>Description:</h4></source>
         <translation><h4>Popis:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="688"/>
-        <location filename="../gis/IGisItem.cpp" line="747"/>
+        <location filename="../gis/IGisItem.cpp" line="695"/>
+        <location filename="../gis/IGisItem.cpp" line="748"/>
         <source><p>--- no description ---</p></source>
         <translation><p>--- žádný popis ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="699"/>
+        <location filename="../gis/IGisItem.cpp" line="706"/>
         <source><h4>Comment:</h4></source>
         <translation><h4>Poznámka:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="702"/>
+        <location filename="../gis/IGisItem.cpp" line="709"/>
         <source><p>--- no comment ---</p></source>
         <translation><p>--- žádná poznámka ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="713"/>
-        <location filename="../gis/IGisItem.cpp" line="758"/>
+        <location filename="../gis/IGisItem.cpp" line="720"/>
+        <location filename="../gis/IGisItem.cpp" line="759"/>
         <source><h4>Links:</h4></source>
         <translation><h4>Odkazy:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="716"/>
-        <location filename="../gis/IGisItem.cpp" line="761"/>
+        <location filename="../gis/IGisItem.cpp" line="723"/>
+        <location filename="../gis/IGisItem.cpp" line="762"/>
         <source><p>--- no links ---</p></source>
         <translation><p>--- žádné odkazy ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="843"/>
+        <location filename="../gis/IGisItem.cpp" line="838"/>
         <source>Edit name...</source>
         <translation>Upravit název...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="843"/>
+        <location filename="../gis/IGisItem.cpp" line="838"/>
         <source>Enter new %1 name.</source>
         <translation>Zadat nový název %1.</translation>
     </message>
@@ -5835,59 +5973,59 @@ Buď je to nový symbol nebo byl v databázi někým smazán.</translation>
         <translation><h3>%1</h3>Projekt byl změněn. Uložit jej před zavřením?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="258"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="271"/>
         <source>%1: Correlate tracks and waypoints.</source>
         <translation>%1: Svázat stopy a cestovní body.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="268"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="281"/>
         <source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
         <translation><h3>%1</h3>Trvalo to moc dlouho? Chcete svázání stop a cestovních bodů pro tento projekt přeskočit i v budoucnu?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="269"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="282"/>
         <source>Canceled correlation...</source>
         <translation>Svázání zrušeno...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="309"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="327"/>
         <source>Save "%1" to...</source>
         <translation>Uložit "%1" do...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="420"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="437"/>
         <source><br/>
 Filename: %1</source>
         <translation><br/>
 Název souboru: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="425"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="442"/>
         <source>Waypoints: %1</source>
         <translation>Cestovní body: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="429"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="446"/>
         <source>Tracks: %1</source>
         <translation>Stopy: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="433"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="450"/>
         <source>Routes: %1</source>
         <translation>Cesty: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="437"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="454"/>
         <source>Areas: %1</source>
         <translation>Oblasti: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="557"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="574"/>
         <source>Are you sure you want to delete '%1' from project '%2'?</source>
         <translation>Jste si jistý, že chcete smazat '%1' z projektu '%2'?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="558"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="575"/>
         <source>Delete...</source>
         <translation>Smazat...</translation>
     </message>
@@ -6417,11 +6555,11 @@ Název souboru: %1</translation>
     </message>
     <message>
         <source>To add maps use File->Setup Map Paths. </source>
-        <translation>Pro přidání map použijte Soubor → Nastavit cesty k mapám. </translation>
+        <translation type="vanished">Pro přidání map použijte Soubor → Nastavit cesty k mapám. </translation>
     </message>
     <message>
         <source>To add maps use <b>File->Setup Map Paths</b>. </source>
-        <translation>Pro přidání map použijte <b>Soubor → Nastavit cesty k mapám</b>. </translation>
+        <translation type="vanished">Pro přidání map použijte <b>Soubor → Nastavit cesty k mapám</b>. </translation>
     </message>
     <message>
         <location filename="../map/IMapList.ui" line="103"/>
@@ -6626,62 +6764,62 @@ Nechce se mi číst dokumentaci!</translation>
         <translation type="obsolete">Tímto budou všechny původní údaje nahrazeny jednoduchou čárou souřadnic. Všechna ostatní data budou trvale ztracena.</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="264"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="256"/>
         <source><b>New Line</b><br/>Move the mouse and use the left mouse button to drop points. When done use the right mouse button to stop.<br/></source>
         <translation><b>Nová čára</b><br/>Posuňte ukazovátko myši a použijte levé tlačítko myši k upuštění bodů. Až to bude uděláno, použijte pravé tlačítko myši k zastavení.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="314"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="306"/>
         <source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
         <translation><b>Smazat bod</b><br/>Přesuňte ukazovátko myši blízko k bodu a stiskněte levé tlačítko myši pro jeho smazání.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="323"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="315"/>
         <source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
         <translation><b>Upravit rozsah bodů</b><br/>Klepněte levým tlačítkem myši na první bod pro započetí výběru. Klepněte levým tlačítkem myši na druhý bod pro dokončení výběru a vyberte z voleb. Použijte pravé tlačítko myši pro zrušení.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="324"/>
         <source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Přesunout bod</b><br/>Přesuňte ukazovátko myši blízko k bodu a stiskněte levé tlačítko myši pro jeho držení v blízkosti ukazovátka. Posuňte myší pro přesunutí bodu. Upustěte bod klepnutím levým tlačítkem myši. Použijte pravé tlačítko myši pro zrušení.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="341"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="333"/>
         <source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it.  Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Přidat bod</b><br/>Přesuňte ukazovátko myši blízko k čáře a stiskněte levé tlačítko myši pro přidání bodu. Bod přilne k ukazovátku a vy jím budete moci pohnout. Bod upustěte klepnutím levým tlačítkem myši. Použijte pravé tlačítko myši pro zrušení.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="350"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="342"/>
         <source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
         <translation><b>Žádné stanovení cesty</b><br/>Všechny body budou spojeny přímou čarou.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="356"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="348"/>
         <source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
         <translation><b>Automatické stanovení cesty</b><br/>Nynější nastavení směrování je používáno k vytváření cesty mezi body. <b>Poznámka:</b> Vybraný směrovač musí být schopen rychle směrovat (za běhu). Směrovače nepřipojené k internetu toto obvykle dokáží, směrovače připojené k internetu to běžně neumí.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="361"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="353"/>
         <source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
         <translation><b>Vektorové stanovení cesty</b><br/>Spojuje body čárou z nahrané vektorové mapy, je-li to možné.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="525"/>
         <source><b>%1 Metrics</b></source>
         <translation><b>%1 metrika</b></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="536"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="528"/>
         <source>Distance:</source>
         <translation>Vzdálenost:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="538"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="530"/>
         <source>Ascend:</source>
         <translation>Stoupání:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="540"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="532"/>
         <source>Descend:</source>
         <translation>Klesání:</translation>
     </message>
@@ -6723,12 +6861,12 @@ Nechce se mi číst dokumentaci!</translation>
         <translation>Přidat cestovní bod</translation>
     </message>
     <message>
-        <location filename="../plot/IPlot.cpp" line="647"/>
+        <location filename="../plot/IPlot.cpp" line="648"/>
         <source>No or bad data.</source>
         <translation>Žádné nebo špatné údaje.</translation>
     </message>
     <message>
-        <location filename="../plot/IPlot.cpp" line="1244"/>
+        <location filename="../plot/IPlot.cpp" line="1245"/>
         <source>Select output file</source>
         <translation>Vybrat výstupní soubor</translation>
     </message>
@@ -7003,7 +7141,7 @@ nebo
     </message>
     <message>
         <source>To use offline routing you need to define paths to local routing data. Use the setup tool button to register a path.</source>
-        <translation>Pro použití stanovení cesty bez připojení k internetu je potřeba stanovit cesty k místním datům se stanovením cest. Použijte nástrojové tlačítko pro nastavení k zaregistrování cesty.</translation>
+        <translation type="vanished">Pro použití stanovení cesty bez připojení k internetu je potřeba stanovit cesty k místním datům se stanovením cest. Použijte nástrojové tlačítko pro nastavení k zaregistrování cesty.</translation>
     </message>
 </context>
 <context>
@@ -7718,6 +7856,35 @@ nebo
     </message>
 </context>
 <context>
+    <name>ISearchDatabase</name>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="14"/>
+        <source>Search...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="34"/>
+        <source>Type the word you want to search for and press the search button. 
+If you enter 'word' a search with an exact match is done. If you enter 'word*', 'word' has to be at the beginning of a string.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="51"/>
+        <source>Name</source>
+        <translation type="unfinished">Název</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="79"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="86"/>
+        <source>Close</source>
+        <translation type="unfinished">Zavřít</translation>
+    </message>
+</context>
+<context>
     <name>ISelDevices</name>
     <message>
         <location filename="../gis/ISelDevices.ui" line="14"/>
@@ -7728,14 +7895,12 @@ nebo
 <context>
     <name>ISelectActivity</name>
     <message>
-        <location filename="../gis/trk/ISelectActivity.ui" line="14"/>
         <source>Activities...</source>
-        <translation>Činnosti...</translation>
+        <translation type="vanished">Činnosti...</translation>
     </message>
     <message>
-        <location filename="../gis/trk/ISelectActivity.ui" line="20"/>
         <source>Select one:</source>
-        <translation>Vyberte jednu:</translation>
+        <translation type="vanished">Vyberte jednu:</translation>
     </message>
 </context>
 <context>
@@ -8142,142 +8307,301 @@ nebo
         <translation>Upravit text...</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="25"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="38"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="51"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="64"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="77"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="97"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="110"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="123"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="136"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="169"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="182"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="195"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="208"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="256"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="25"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="331"/>
         <source>Undo</source>
         <translation>Zpět</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="259"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="334"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="268"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="38"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="343"/>
         <source>Redo</source>
         <translation>Znovu</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="271"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="346"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="51"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="355"/>
         <source>Cut</source>
         <translation>Vyjmout</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="283"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="358"/>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="292"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="64"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="367"/>
         <source>Copy</source>
         <translation>Kopírovat</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="370"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="304"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="77"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="375"/>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="307"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="100"/>
+        <source>A:L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="113"/>
+        <source>A:C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="126"/>
+        <source>A:R</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="139"/>
+        <source>A:B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="172"/>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="185"/>
+        <source>I</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="198"/>
+        <source>U</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="218"/>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="265"/>
+        <source>Standard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="270"/>
+        <source>Bullet List (Disc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="275"/>
+        <source>Bullet List (Circle)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+        <source>Bullet List (Square)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="285"/>
+        <source>Ordered List (Decimal)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="290"/>
+        <source>Ordered List (Alpha lower)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+        <source>Ordered List (Alpha upper)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="300"/>
+        <source>Ordered List (Roman lower)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="305"/>
+        <source>Ordered List (Roman upper)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="378"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="319"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="390"/>
         <source>Align Left</source>
         <translation>Zarovnat vlevo</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="322"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="393"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="334"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="405"/>
         <source>Align Right</source>
         <translation>Zarovnat vpravo</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="337"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="408"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="349"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="420"/>
         <source>Align Center</source>
         <translation>Zarovnat na střed</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="352"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="423"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="364"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="435"/>
         <source>Align Block</source>
         <translation>Zarovnat do bloku</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="367"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="438"/>
         <source>Ctrl+J</source>
         <translation>Ctrl+J</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="379"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="450"/>
         <source>Underline</source>
         <translation>Podtržení</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="382"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="453"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="394"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="465"/>
         <source>Bold</source>
         <translation>Tučné</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="397"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="468"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="409"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="480"/>
         <source>Italic</source>
         <translation>Kurzíva</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="412"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="483"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="495"/>
+        <source>Plain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="498"/>
+        <source>Reset the text's format before pasting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="503"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="506"/>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="509"/>
+        <source>Ctrl+A</source>
+        <translation type="unfinished">Ctrl+A</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="514"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="517"/>
+        <source>Delete</source>
+        <translation type="unfinished">Smazat</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="522"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="525"/>
+        <source>Reset Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="530"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="533"/>
+        <source>Reset Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="545"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="548"/>
+        <source>Paste without resetting the text's format</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ITextEditWidgetSelMenu</name>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="55"/>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="68"/>
+        <source>I</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="81"/>
+        <source>U</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="101"/>
+        <source>Cut</source>
+        <translation type="unfinished">Vyjmout</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="114"/>
+        <source>Copy</source>
+        <translation type="unfinished">Kopírovat</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="127"/>
+        <source>Paste</source>
+        <translation type="unfinished">Vložit</translation>
+    </message>
 </context>
 <context>
     <name>ITimeZoneSetup</name>
@@ -8431,7 +8755,7 @@ nebo
     </message>
     <message>
         <source>All custom icons have to be *.bmp format.</source>
-        <translation>Všechny vlastní symboly musí být ve formátu *.bmp.</translation>
+        <translation type="vanished">Všechny vlastní symboly musí být ve formátu *.bmp.</translation>
     </message>
 </context>
 <context>
diff --git a/src/locale/qmapshack_de.ts b/src/locale/qmapshack_de.ts
index 6018b2d..ce47f2c 100644
--- a/src/locale/qmapshack_de.ts
+++ b/src/locale/qmapshack_de.ts
@@ -17,105 +17,101 @@
 <context>
     <name>CActivityTrk</name>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="29"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="117"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="39"/>
         <source>Foot</source>
         <translation>Fußgänger</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="37"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="118"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="47"/>
         <source>Bicycle</source>
         <translation>Fahrrad</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="45"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="119"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="55"/>
         <source>Motor Bike</source>
         <translation>Motorrad</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="53"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="120"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="63"/>
         <source>Car</source>
         <translation>Auto</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="61"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="121"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="71"/>
         <source>Cable Car</source>
         <translation>Seilbahn</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="69"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="122"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="79"/>
         <source>Swim</source>
         <translation>Schwimmen</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="77"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="87"/>
         <source>Ship</source>
         <translation>Schiff</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="85"/>
         <source>Aeronautik</source>
         <translation>Luftfahrt</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="93"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="125"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="103"/>
         <source>Ski/Winter</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="124"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="95"/>
         <source>Aeronautics</source>
         <translation>Aeronautik</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="261"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="305"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="262"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="304"/>
         <source>Distance:</source>
         <translation>Entfernung:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="263"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="327"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="264"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="315"/>
         <source>Ascend:</source>
         <translation>Anstieg:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="265"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="349"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="266"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="326"/>
         <source>Descend:</source>
         <translation>Abstieg:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="267"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="371"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="268"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="337"/>
         <source>Speed Moving:</source>
         <translation>Geschwindigkeit in Bewegung:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="269"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="393"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="270"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
         <source>Speed Total:</source>
         <translation>Geschwindigkeit insgesamt:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="271"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="415"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="272"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="359"/>
         <source>Time Moving:</source>
         <translation>Zeit in Bewegung:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="273"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="437"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="274"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="370"/>
         <source>Time Total:</source>
         <translation>Zeit insgesamt:</translation>
     </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="410"/>
+        <source>None</source>
+        <translation>Keine</translation>
+    </message>
 </context>
 <context>
     <name>CCanvas</name>
@@ -125,7 +121,7 @@
         <translation>Ansicht %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="674"/>
+        <location filename="../canvas/CCanvas.cpp" line="670"/>
         <source>Setup Map Background</source>
         <translation>Kartenhintergrund einstellen</translation>
     </message>
@@ -208,28 +204,28 @@
 <context>
     <name>CDBFolderMysql</name>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="32"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="33"/>
         <source>All your data grouped by folders.</source>
         <translation>Alle Daten nach Ordnern gruppiert.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="52"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="53"/>
         <source>MySQL Database</source>
         <translation>MySQL Datenbank</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="55"/>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="59"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="56"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="60"/>
         <source>Server: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="64"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="65"/>
         <source> (No PW)</source>
         <translation> (Kein Passwort)</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="72"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="73"/>
         <source>Error: </source>
         <translation>Fehler:</translation>
     </message>
@@ -237,35 +233,40 @@
 <context>
     <name>CDBFolderSqlite</name>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="28"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="30"/>
         <source>All your data grouped by folders.</source>
         <translation>Alle Daten nach Ordnern gruppiert.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="46"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="52"/>
         <source>SQLite Database</source>
         <translation>SQLite Datenbank</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="56"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="62"/>
         <source>File: </source>
         <translation>Datei: </translation>
     </message>
+    <message>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="66"/>
+        <source>Error: </source>
+        <translation>Fehler:</translation>
+    </message>
 </context>
 <context>
     <name>CDBItem</name>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="87"/>
+        <location filename="../gis/db/CDBItem.cpp" line="91"/>
         <source>%1 min.</source>
         <translation>%1 min</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="91"/>
+        <location filename="../gis/db/CDBItem.cpp" line="95"/>
         <source>%1 h</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="95"/>
+        <location filename="../gis/db/CDBItem.cpp" line="99"/>
         <source>%1 days</source>
         <translation>%1 Tage</translation>
     </message>
@@ -273,7 +274,7 @@
 <context>
     <name>CDBProject</name>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="219"/>
+        <location filename="../gis/db/CDBProject.cpp" line="223"/>
         <source>The item %1 has been changed by %2 (%3). 
 
 To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -282,47 +283,47 @@ To solve this conflict you can create and save a clone, force your version or dr
 Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihre Version oder verwerfen diese und nehmen die Version in der Datenbank</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="225"/>
+        <location filename="../gis/db/CDBProject.cpp" line="229"/>
         <source>Conflict with database...</source>
         <translation>Konflikt mit der Datenbank...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="226"/>
+        <location filename="../gis/db/CDBProject.cpp" line="230"/>
         <source>Clone && Save</source>
         <translation>Klonen && Speichern</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="227"/>
+        <location filename="../gis/db/CDBProject.cpp" line="231"/>
         <source>Force Save</source>
         <translation>Speichern erzwingen</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="228"/>
+        <location filename="../gis/db/CDBProject.cpp" line="232"/>
         <source>Take remote</source>
         <translation>Entfernte Version nehmen</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="531"/>
+        <location filename="../gis/db/CDBProject.cpp" line="514"/>
         <source>Missing folder...</source>
         <translation>Fehlender Ordner...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="532"/>
+        <location filename="../gis/db/CDBProject.cpp" line="515"/>
         <source>Failed to save project. The folder has been deleted in the database.</source>
         <translation>Speichern des Projektes fehlgeschlagen. Der Ordner wurde in der Datenbank gelöscht.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="539"/>
+        <location filename="../gis/db/CDBProject.cpp" line="522"/>
         <source>Save ...</source>
         <translation>Speichern ...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="602"/>
+        <location filename="../gis/db/CDBProject.cpp" line="585"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="602"/>
+        <location filename="../gis/db/CDBProject.cpp" line="585"/>
         <source>There was an unexpected database error:
 
 %1</source>
@@ -331,12 +332,12 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
 %1</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="727"/>
+        <location filename="../gis/db/CDBProject.cpp" line="700"/>
         <source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
         <translation>Das Projekt '%1' will sich gerade aus der Datenbank aktualisieren. Es gibt allerdings nicht gespeicherte Änderungen.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="728"/>
+        <location filename="../gis/db/CDBProject.cpp" line="701"/>
         <source>Save changes?</source>
         <translation>Änderungen speichern?</translation>
     </message>
@@ -344,12 +345,12 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
 <context>
     <name>CDemList</name>
     <message>
-        <location filename="../dem/CDemList.cpp" line="202"/>
+        <location filename="../dem/CDemList.cpp" line="195"/>
         <source>Deactivate</source>
         <translation>Deaktivieren</translation>
     </message>
     <message>
-        <location filename="../dem/CDemList.cpp" line="202"/>
+        <location filename="../dem/CDemList.cpp" line="195"/>
         <source>Activate</source>
         <translation>Aktivieren</translation>
     </message>
@@ -421,91 +422,91 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
 <context>
     <name>CDetailsPrj</name>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="270"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="791"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="265"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="775"/>
         <source>none</source>
         <translation>keine</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="343"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="338"/>
         <source>Build diary...</source>
         <translation>Tagebuch erstellen...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="398"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="393"/>
         <source><b>Summary over all tracks in project</b><br/></source>
         <translation><b>Auswertung aller Tracks im Projekt</b><br/></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="446"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="435"/>
         <source><h2>Waypoints</h2></source>
         <translation><h2>Wegpunkte</h2></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="479"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="608"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="726"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="442"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="468"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="710"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="740"/>
         <source>Info</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="454"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="480"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="609"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="727"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="757"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="443"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="469"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="593"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="711"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="741"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="472"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="461"/>
         <source><h2>Tracks</h2></source>
         <translation><h2>Tracks</h2></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>From Start</source>
         <translation>Vom Anfang</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>To Next</source>
         <translation>Zum Nächsten</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>To End</source>
         <translation>Zum Ende</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="630"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="614"/>
         <source>distance: </source>
         <translation>Entfernung:</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="640"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="624"/>
         <source>ascent: </source>
         <translation>Anstieg:</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="650"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="634"/>
         <source>descend: </source>
         <translation>Abstieg:</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="719"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="703"/>
         <source><h2>Areas</h2></source>
         <translation><h2>Gebiete</h2></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="126"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
         <source>You want to sort waypoints along a track, but you switched off track and waypoint correlation. Do you want to switch it on again?</source>
         <translation>Sie wollen Wegpunkte entlang eines Tracks sortieren, aber Sie haben die Verknüpfung von Wegpunkten und Tracks ausgeschaltet. Wollen Sie sie wieder einschalten?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="128"/>
         <source>Correlation...</source>
         <translation>Verknüpfungen...</translation>
     </message>
@@ -522,34 +523,34 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
         <translation>Abstieg: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="749"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
         <source><h2>Routes</h2></source>
         <translation><h2>Routen</h2></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="761"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="788"/>
         <source>Edit name...</source>
         <translation>Name bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="761"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="788"/>
         <source>Enter new project name.</source>
         <translation>Geben Sie einen neuen Namen für das Projekt ein.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="935"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="916"/>
         <source>Print Diary</source>
         <translation>Tagebuch drucken</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="770"/>
         <source>Edit keywords...</source>
         <translation>Stichwörter bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="770"/>
         <source>Enter keywords.</source>
         <translation>Stichwörter eingeben.</translation>
     </message>
@@ -557,52 +558,51 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
 <context>
     <name>CDetailsTrk</name>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="181"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="166"/>
         <source>Reduce visible track points</source>
         <translation>Sichtbare Trackpunkte reduzieren</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="184"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
         <source>Change elevation of track points</source>
         <translation>Höhe von Trackpunkten ändern</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="187"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
         <source>Change timestamp of track points</source>
         <translation>Zeitstempel von Trackpunkten ändern</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="190"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
         <source>Modify track points' extensions</source>
         <translation>Erweiterung von Trackpunkten ändern</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="193"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
         <source>Cut track into pieces</source>
         <translation>Track in Stücke teilen</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="426"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="399"/>
         <source>Color</source>
         <translation>Farbe</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="427"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="400"/>
         <source>Activity</source>
         <translation>Aktivität</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="629"/>
         <source>Reset activities...</source>
         <translation>Aktivitäten zurücksetzen...</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="629"/>
         <source>This will remove all activities from the track. Proceed?</source>
         <translation>Dies wird alle Aktivitäten vom Track entfernen. Fortfahren?</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="657"/>
         <source>None</source>
         <translation>Keine</translation>
     </message>
@@ -702,7 +702,7 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
         <translation>Datei %1 konnte nicht geladen werden...</translation>
     </message>
     <message>
-        <location filename="../gis/fit/CFitProject.cpp" line="91"/>
+        <location filename="../gis/fit/CFitProject.cpp" line="93"/>
         <source>Failed to open FIT file %1.</source>
         <translation>Öffnen der FIT Datei %1 fehlgeschlagen.</translation>
     </message>
@@ -767,52 +767,52 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
         <translation>_Klon</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="385"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="391"/>
         <source>Area: %1%2</source>
         <translation>Gebiet: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="447"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="451"/>
         <source>Changed area shape.</source>
         <translation>Gebietsform geändert.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="455"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="459"/>
         <source>Changed name.</source>
         <translation>Name geändert.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="461"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="465"/>
         <source>Changed border width.</source>
         <translation>Umrandungsbreite geändert.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="467"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="471"/>
         <source>Changed fill pattern.</source>
         <translation>Füllung geändert.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="473"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="477"/>
         <source>Changed opacity.</source>
         <translation>Deckkraft geändert.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="479"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="483"/>
         <source>Changed comment.</source>
         <translation>Kommentar geändert.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="485"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="489"/>
         <source>Changed description.</source>
         <translation>Beschreibung geändert.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="491"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="495"/>
         <source>Changed links</source>
         <translation>Geänderte Verknüpfungen</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="502"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="506"/>
         <source>Changed color</source>
         <translation>Farbe geändert</translation>
     </message>
@@ -825,73 +825,73 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
         <translation>_Klon</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="283"/>
         <source>track</source>
         <translation>Track</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="310"/>
         <source>Changed name.</source>
         <translation>Name geändert.</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="316"/>
         <source>Changed comment</source>
         <translation>Kommentar geändert</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="322"/>
         <source>Changed description</source>
         <translation>Beschreibung geändert</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="328"/>
         <source>Changed links</source>
         <translation>Geänderte Verknüpfungen</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="346"/>
         <source>Length: %1 %2</source>
         <translation>Länge: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="350"/>
         <source>Length: -</source>
         <translation>Länge: -</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="559"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="357"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="595"/>
         <source>Time: %1 %2</source>
         <translation>Gesamtzeit: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="361"/>
         <source>Time: -</source>
         <translation>Gesamtzeit: -</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="371"/>
         <source>%1%2 %3, %4%5 %6</source>
         <translation>%1%2 %3, %4%5 %6</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="377"/>
         <source>Last time routed:<br/>%1</source>
         <translation>Letzte Routenberechnung: <br/>%1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="379"/>
         <source>with %1</source>
         <translation>mit %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="561"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="597"/>
         <source>Distance: %1 %2</source>
         <translation>Entfernung: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="675"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="712"/>
         <source>Changed route points.</source>
         <translation>Geänderte Routenpunkte.</translation>
     </message>
@@ -930,192 +930,197 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
         <translation>Lesen der Daten fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="118"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="117"/>
         <source>_Clone</source>
         <translation>_Klon</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="290"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="289"/>
         <source>Changed trackpoints, sacrificed all previous data.</source>
         <translation>Wegpunkte geändert, alle vorherigen Daten sind verloren.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="394"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
         <source>Length: %1 %2</source>
         <translation>Länge: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="401"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="400"/>
         <source>, %1%2 %3, %4%5 %6</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="405"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="404"/>
         <source>, %1-, %2-</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="417"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="416"/>
         <source>Time: -, Speed: -</source>
         <translation>Zeit: -, Geschwindigkeit: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="429"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="428"/>
         <source>Moving: -, Speed: -</source>
         <translation>Zeit in Bew.: -, Geschw. -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="434"/>
         <source>Start: %1</source>
         <translation>Beginn: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="438"/>
         <source>Start: -</source>
         <translation>Beginn: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="445"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="444"/>
         <source>End: %1</source>
         <translation>Ende: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="449"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="448"/>
         <source>End: -</source>
         <translation>Ende: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="452"/>
         <source>Points: %1 (%2)</source>
         <translation>Punkte: %1 von %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="457"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="456"/>
         <source>Invalid elevations!</source>
         <translation>Ungültige Höhenwerte!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="461"/>
         <source>Invalid timestamps!</source>
         <translation>Ungültige Zeitmarken!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="467"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="466"/>
         <source>Invalid positions!</source>
         <translation>Ungültige Positionsdaten!</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="475"/>
+        <source>Activities: %1</source>
+        <translation>Aktivitäten: %1</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
         <source>Index: %1</source>
         <translation>Index: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="562"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="590"/>
         <source>Index: visible %1, total %2</source>
         <translation>Index: angez. %1, total %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="601"/>
         <source>Ele.: %1 %2</source>
         <translation>Höhe: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
         <source> slope: %1%3 (%2%)</source>
         <translation>, Neigung: %1%3 (%2%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
         <source> speed: %1%2</source>
         <translation>, Geschw.: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
         <source>... and %1 tags not displayed</source>
         <translation>... und %1 Tags werden nicht angezeigt</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
         <source>Descend: - (-)</source>
         <translation>Abstieg: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="649"/>
         <source>Distance: - (-)</source>
         <translation>Entfernung: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="622"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="650"/>
         <source>Moving: - (-)</source>
         <translation>Zeit in Bew.: - (-) </translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="627"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="655"/>
         <source>Ascend: %1%2 (%3%)</source>
         <translation>Anstieg: %1 %2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1317"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1330"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1390"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1434"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1599"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1345"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1418"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1462"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1627"/>
         <source>track</source>
         <translation>Track</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1535"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1563"/>
         <source>Hide point %1.</source>
         <translation>Punkt %1 verbergen.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1539"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1567"/>
         <source>Hide points %1..%2.</source>
         <translation>Punkte %1  %2 verbergen.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="619"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="647"/>
         <source>Ascend: - (-)</source>
         <translation>Anstieg: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
         <source> Descend: %1%2 (%3%)</source>
         <translation>, Abstieg: %1 %2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="645"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="673"/>
         <source> Moving: %1%2 (%3%)</source>
         <translation>, Zeit in Bew.: %1 %2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="695"/>
         <source>Ascend: %1%2</source>
         <translation>Anstieg: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="672"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="700"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="712"/>
         <source>, %1%2</source>
         <translation>, %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
         <source>Ascend: -</source>
         <translation>Anstieg: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="707"/>
         <source> Descend: %1%2</source>
         <translation> Abstieg: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="690"/>
         <source>Descend: -</source>
         <translation>Abstieg: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="694"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="722"/>
         <source> Time: %1%2</source>
         <translation> Zeit: %1 %2</translation>
     </message>
@@ -1128,67 +1133,67 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
         <translation>Geben Sie einen neuen Namen für den Track ein.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="413"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="412"/>
         <source>Time: %1, Speed: %2 %3</source>
         <translation>Zeit: %1, Geschwindigkeit: %2 %3</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="424"/>
         <source>Moving: %1, Speed: %2 %3</source>
         <translation>Zeit in Bew.: %1, Geschw. %2 %3</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
         <source>Distance: %1%2 (%3%)</source>
         <translation>Entf.: %1 %2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="717"/>
         <source>Distance: %1%2</source>
         <translation>Entfernung: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1380"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1408"/>
         <source>Permanently removed points %1..%2</source>
         <translation>Punkte %1..%2 dauerhaft entfernt</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1579"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1607"/>
         <source>Show points.</source>
         <translation>Punkte anzeigen.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2142"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
         <source>Changed name</source>
         <translation>Name geändert</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2148"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
         <source>Changed comment</source>
         <translation>Kommentar geändert</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2166"/>
         <source>Changed description</source>
         <translation>Beschreibung geändert</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2172"/>
         <source>Changed links</source>
         <translation>Geänderte Verknüpfungen</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2171"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2183"/>
         <source>Changed elevation of point %1 to %2 %3</source>
         <translation>Höhe von Punkt %1 auf %2 %3 geändert</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2198"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2212"/>
         <source>Changed activity to '%1' for complete track.</source>
         <translation>Die Aktivität wurde für den gesamten Track auf '%1' geändert.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2256"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2262"/>
         <source>Changed activity to '%1' for range(%2..%3).</source>
         <translation>Die Aktivität wurde für den Bereich (%2..%3) auf '%1' geändert.</translation>
     </message>
@@ -1290,62 +1295,62 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
         <translation>_Klon</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="267"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="272"/>
         <source>Elevation: %1 %2</source>
         <translation>Höhe: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="278"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="283"/>
         <source>Proximity: %1 %2</source>
         <translation>Abstand: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="352"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="355"/>
         <source>Changed name</source>
         <translation>Name geändert</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="362"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="365"/>
         <source>Changed position</source>
         <translation>Position geändert</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="371"/>
         <source>Changed elevation</source>
         <translation>Höhe geändert</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="377"/>
         <source>Changed proximity</source>
         <translation>Abstandsalarm geändert</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="388"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="391"/>
         <source>Changed icon</source>
         <translation>Symbol geändert</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="397"/>
         <source>Changed comment</source>
         <translation>Kommentar geändert</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="403"/>
         <source>Changed description</source>
         <translation>Beschreibung geändert</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="409"/>
         <source>Changed links</source>
         <translation>Geänderte Verknüpfungen</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="415"/>
         <source>Changed images</source>
         <translation>Bilder geändert</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="421"/>
         <source>Add image</source>
         <translation>Bild hinzufügen</translation>
     </message>
@@ -1353,94 +1358,142 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
 <context>
     <name>CGisListDB</name>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="118"/>
+        <location filename="../gis/CGisListDB.cpp" line="120"/>
         <source>Add Folder</source>
         <translation>Ordner hinzufügen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="119"/>
+        <location filename="../gis/CGisListDB.cpp" line="124"/>
         <source>Delete Folder</source>
         <translation>Ordner löschen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="81"/>
+        <location filename="../gis/CGisListDB.cpp" line="83"/>
         <source>Due to changes in the database system QMapShack forgot about the filename of your database '%1'. You have to select it again in the next step.</source>
         <translation>Aufgrund der Änderungen im Datenbanksystem kennt QMapShack den Dateinamen Ihrer Datenbank nicht mehr. Sie müssen diesen im nächsten Schritt erneut wählen.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="82"/>
+        <location filename="../gis/CGisListDB.cpp" line="84"/>
         <source>Select database file.</source>
         <translation>Datenbankdatei wählen.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="115"/>
+        <location filename="../gis/CGisListDB.cpp" line="117"/>
         <source>Add Database</source>
         <translation>Datenbank hinzufügen</translation>
     </message>
     <message>
+        <location filename="../gis/CGisListDB.cpp" line="121"/>
+        <source>Rename Folder</source>
+        <translation>Ordner umbenennen</translation>
+    </message>
+    <message>
         <location filename="../gis/CGisListDB.cpp" line="122"/>
-        <location filename="../gis/CGisListDB.cpp" line="133"/>
+        <source>Copy Folder</source>
+        <translation>Ordner kopieren</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="123"/>
+        <source>Move Folder</source>
+        <translation>Ordner verschieben</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="127"/>
+        <location filename="../gis/CGisListDB.cpp" line="139"/>
         <source>Delete Item</source>
         <translation>Element löschen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="126"/>
+        <location filename="../gis/CGisListDB.cpp" line="131"/>
+        <source>Search Database</source>
+        <translation>Datenbank durchsuchen</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="132"/>
         <source>Sync. with Database</source>
         <translation>Mit der Datenbank synchronisieren</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="127"/>
+        <location filename="../gis/CGisListDB.cpp" line="133"/>
         <source>Remove Database</source>
         <translation>Datenbank entfernen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="130"/>
+        <location filename="../gis/CGisListDB.cpp" line="136"/>
         <source>Empty</source>
         <translation>Leeren</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="418"/>
+        <location filename="../gis/CGisListDB.cpp" line="432"/>
         <source>Remove database...</source>
         <translation>Datenbank entfernen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="418"/>
+        <location filename="../gis/CGisListDB.cpp" line="432"/>
         <source>Do you really want to remove '%1' from the list?</source>
         <translation>Wollen Sie '%1' wirklich aus der Liste entfernen?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="611"/>
+        <location filename="../gis/CGisListDB.cpp" line="496"/>
+        <source>Are you sure you want to delete selected folders and all subfolders from the database?</source>
+        <translation>Sind Sie sicher, dass Sie alle ausgewählten Ordner und alle Unterordner löschen wollen?</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="664"/>
+        <source>Bad operation....</source>
+        <translation>Falsche Funktion...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="664"/>
+        <source>The target folder is a subfolder of the one to move. This will not work.</source>
+        <translation>Der Zielordner ist ein Unterordner von dem zu verschiebenden. Das kann nicht funktionieren.</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete selected folders and all folders below from the database?</source>
+        <translation>Sind Sie sicher, dass Sie alle ausgewählten Ordner und alle darunter liegenden löschen wollen?</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="723"/>
+        <source>Folder name...</source>
+        <translation>Ordnername...</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="723"/>
+        <source>Rename folder:</source>
+        <translation>Ordner umbenennen:</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="852"/>
         <source>Are you sure you want to delete '%1' from folder '%2'?</source>
         <translation>Sind Sie sicher, dass Sie '%1' aus dem Ordner '%2' löschen wollen? </translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="612"/>
+        <location filename="../gis/CGisListDB.cpp" line="853"/>
         <source>Delete...</source>
         <translation>Löschen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="476"/>
+        <location filename="../gis/CGisListDB.cpp" line="496"/>
         <source>Delete database folder...</source>
         <translation>Datenbankordner löschen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="476"/>
         <source>Are you sure you want to delete "%1" from the database?</source>
         <translation>Sind Sie sicher, dass Sie "%1" aus der Datenbank löschen wollen? </translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="503"/>
-        <location filename="../gis/CGisListDB.cpp" line="524"/>
+        <location filename="../gis/CGisListDB.cpp" line="744"/>
+        <location filename="../gis/CGisListDB.cpp" line="765"/>
         <source>Remove items...</source>
         <translation>Element entfernen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="503"/>
+        <location filename="../gis/CGisListDB.cpp" line="744"/>
         <source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
         <translation>Sind Sie sicher, dass Sie alle Elemente in Verloren & Gefunden löschen wollen? Sie werden dauerhaft entfernt.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="524"/>
+        <location filename="../gis/CGisListDB.cpp" line="765"/>
         <source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
         <translation>Sind Sie sicher, dass Sie alle ausgewählten Elemente in Verloren & Gefunden löschen wollen? Sie werden dauerhaft entfernt.</translation>
     </message>
@@ -1448,12 +1501,12 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
 <context>
     <name>CGisListWks</name>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="103"/>
+        <location filename="../gis/CGisListWks.cpp" line="111"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="104"/>
+        <location filename="../gis/CGisListWks.cpp" line="112"/>
         <source>Save As...</source>
         <translation>Speichern unter...</translation>
     </message>
@@ -1463,165 +1516,176 @@ Um den Konflikt zu lösen, erstellen und speichern Sie einen Klon, erzwingen Ihr
         <translation>Bearbeiten..</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="111"/>
+        <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <source>Sort by Time</source>
+        <translation>Nach der Zeit sortieren</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="108"/>
+        <source>Sort by Name</source>
+        <translation>Nach dem Namen sortieren</translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="119"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="121"/>
+        <location filename="../gis/CGisListWks.cpp" line="128"/>
         <source>Update Project on Device</source>
         <translation>Aktualisiere das Projekt auf dem Gerät</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="134"/>
+        <location filename="../gis/CGisListWks.cpp" line="141"/>
         <source>Edit...</source>
         <translation>Bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="135"/>
+        <location filename="../gis/CGisListWks.cpp" line="99"/>
+        <location filename="../gis/CGisListWks.cpp" line="142"/>
         <source>Copy to...</source>
         <translation>Kopieren nach...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="150"/>
+        <location filename="../gis/CGisListWks.cpp" line="157"/>
         <source>Show Bubble</source>
         <translation>Infoblase anzeigen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="152"/>
+        <location filename="../gis/CGisListWks.cpp" line="159"/>
         <source>Move Waypoint</source>
         <translation>Wegpunkt verschieben</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="161"/>
+        <location filename="../gis/CGisListWks.cpp" line="168"/>
         <source>Route Instructions</source>
         <translation>Navigationsanweisungen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="163"/>
+        <location filename="../gis/CGisListWks.cpp" line="170"/>
         <source>Calculate Route</source>
         <translation>Route berechnen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="164"/>
+        <location filename="../gis/CGisListWks.cpp" line="171"/>
         <source>Reset Route</source>
         <translation>Route zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="165"/>
+        <location filename="../gis/CGisListWks.cpp" line="172"/>
         <source>Edit Route</source>
         <translation>Route bearbeiten</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="166"/>
+        <location filename="../gis/CGisListWks.cpp" line="173"/>
         <source>Convert to Track</source>
         <translation>In einen Track umwandeln</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="182"/>
+        <location filename="../gis/CGisListWks.cpp" line="189"/>
         <source>Create Route</source>
         <translation>Route erstellen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="626"/>
+        <location filename="../gis/CGisListWks.cpp" line="618"/>
         <source>Drop items...</source>
         <translation>Elemente verwerfen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="651"/>
-        <location filename="../gis/CGisListWks.cpp" line="1593"/>
-        <location filename="../gis/CGisListWks.cpp" line="1631"/>
+        <location filename="../gis/CGisListWks.cpp" line="643"/>
+        <location filename="../gis/CGisListWks.cpp" line="1599"/>
+        <location filename="../gis/CGisListWks.cpp" line="1637"/>
         <source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
         <translation><b>Aktualisieren der Geräte</b><p>Aktualisiere %1<br/>Bitte warten...</p></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1166"/>
+        <location filename="../gis/CGisListWks.cpp" line="1172"/>
         <source>Delete project...</source>
         <translation>Projekt löschen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1166"/>
+        <location filename="../gis/CGisListWks.cpp" line="1172"/>
         <source>Do you really want to delete %1?</source>
         <translation>Sind Sie sicher, dass sie %1 löschen wollen?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="153"/>
+        <location filename="../gis/CGisListWks.cpp" line="160"/>
         <source>Proj. Waypoint...</source>
         <translation>Wegpunkt Projektion...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="137"/>
+        <location filename="../gis/CGisListWks.cpp" line="144"/>
         <source>Track Profile</source>
         <translation>Trackprofil</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <location filename="../gis/CGisListWks.cpp" line="115"/>
         <source>Send to Devices</source>
         <translation>Ans Gerät senden</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="139"/>
+        <location filename="../gis/CGisListWks.cpp" line="146"/>
         <source>Select Range</source>
         <translation>Bereich wählen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="140"/>
+        <location filename="../gis/CGisListWks.cpp" line="147"/>
         <source>Edit Track Points</source>
         <translation>Trackpunkte bearbeiten</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="141"/>
+        <location filename="../gis/CGisListWks.cpp" line="148"/>
         <source>Reverse Track</source>
         <translation>Track umkehren</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="142"/>
+        <location filename="../gis/CGisListWks.cpp" line="149"/>
         <source>Combine Tracks</source>
         <translation>Tracks verbinden</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="175"/>
+        <location filename="../gis/CGisListWks.cpp" line="182"/>
         <source>Edit Area Points</source>
         <translation>Gebietspunkte bearbeiten</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="123"/>
-        <location filename="../gis/CGisListWks.cpp" line="144"/>
+        <location filename="../gis/CGisListWks.cpp" line="130"/>
+        <location filename="../gis/CGisListWks.cpp" line="151"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="99"/>
+        <location filename="../gis/CGisListWks.cpp" line="100"/>
         <source>Show on Map</source>
         <translation>Auf der Karte anzeigen.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="100"/>
+        <location filename="../gis/CGisListWks.cpp" line="101"/>
         <source>Hide from Map</source>
         <translation>Auf der Karte ausblenden.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="108"/>
+        <location filename="../gis/CGisListWks.cpp" line="116"/>
         <source>Sync. with Database</source>
         <translation>Mit der Datenbank synchronisieren</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="780"/>
+        <location filename="../gis/CGisListWks.cpp" line="769"/>
         <source>Saving workspace. Please wait.</source>
         <translation>Arbeitsplatz wird gespeichert. Bitte warten.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="826"/>
+        <location filename="../gis/CGisListWks.cpp" line="815"/>
         <source>Loading workspace. Please wait.</source>
         <translation>Arbeitsplatz laden. Bitte warten.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1143"/>
+        <location filename="../gis/CGisListWks.cpp" line="1149"/>
         <source>Close all projects...</source>
         <translation>Alle Projekte schließen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1143"/>
+        <location filename="../gis/CGisListWks.cpp" line="1149"/>
         <source>This will remove all projects from the workspace.</source>
         <translation>Dies wird alle Projekte aus dem Arbeitsplatz entfernen.</translation>
     </message>
@@ -1681,27 +1745,27 @@ Zeile %2, Spalte %3:
         <translation>Keine GPX Datei: %1</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="258"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="264"/>
         <source>File exists ...</source>
         <translation>Datei existiert...</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="259"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="265"/>
         <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains GPX data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file.  Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
         <translation>Diese Datei wurde nicht mit QMapShack erstellt. Wenn Sie 'Ja' drücken werden alle Daten dieser Datei gelöscht. Selbst wenn diese Datei GPX Daten enthält und mit QMapShack geladen wurde, können nicht alle Elemente dieser Datei durch QMapShack geladen und gespeichert werden. Diese Elemente sind verloren. Ich empfehle die Nutzung einer anderen Datei. <b>Wollen Sie die Datei wirklich überschreiben?</b></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="367"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="380"/>
         <source>Failed to create file '%1'</source>
         <translation>Datei '%1' konnte nicht erstellt werden</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="377"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="390"/>
         <source>Failed to write file '%1'</source>
         <translation>Datei '%1' konnte nicht geschrieben werden</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="395"/>
         <source>Saving GIS data failed...</source>
         <translation>Das Speichern der GIS Daten ist fehlgeschlagen...</translation>
     </message>
@@ -1879,11 +1943,21 @@ Zeile %2, Spalte %3:
         <source>Select file to load</source>
         <translation>Zu ladende Datei auswählen</translation>
     </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1061"/>
+        <source>Fatal...</source>
+        <translation>Schwerer Fehler...</translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1062"/>
+        <source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your ditribution to fix it.</source>
+        <translation>QMapShack hat eine unvollständig installierte Proj4 Biliothek detektiert. Die Übersetzungstabellen für EPSG Projektionen, die normalerweise in /usr/share/proj installiert sind, fehlen. Bitte kontaktieren Sie den Paketbetreuer ihrer Distribution um das zu beheben.</translation>
+    </message>
 </context>
 <context>
     <name>CMapDraw</name>
     <message>
-        <location filename="../map/CMapDraw.cpp" line="406"/>
+        <location filename="../map/CMapDraw.cpp" line="420"/>
         <source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack. 
 
 If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is  [...]
@@ -2526,17 +2600,17 @@ Wenn QMapShack ohne Karten keinen Spaß macht, warum werden dann keine mitgelief
 <context>
     <name>CMapList</name>
     <message>
-        <location filename="../map/CMapList.cpp" line="208"/>
+        <location filename="../map/CMapList.cpp" line="202"/>
         <source>Deactivate</source>
         <translation>Deaktivieren</translation>
     </message>
     <message>
-        <location filename="../map/CMapList.cpp" line="208"/>
+        <location filename="../map/CMapList.cpp" line="202"/>
         <source>Activate</source>
         <translation>Aktivieren</translation>
     </message>
     <message>
-        <location filename="../map/CMapList.cpp" line="233"/>
+        <location filename="../map/CMapList.cpp" line="227"/>
         <source>Where do you want to store maps?</source>
         <translation>Wo wollen Sie die Karten speichern?</translation>
     </message>
@@ -2654,7 +2728,7 @@ Zeile %2, Spalte %3:
         <translation>Diese Karte benötigt OpenSSL. Aufgrund rechtlicher Beschränkungen in einigen Ländern, ist OpenSSL nicht Bestandteil von QMapShack. Sie können sich auf der <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> nach Binäries umsehen. Sie müssen die Dateien libeay32.dll and ssleay32.dll in das QMapShack Programmverzeichnis kopieren.</translation>
     </message>
     <message>
-        <location filename="../map/CMapTMS.cpp" line="304"/>
+        <location filename="../map/CMapTMS.cpp" line="299"/>
         <source><b>%1</b>: %2 tiles pending<br/></source>
         <translation><b>%1</b>: %2 unerledigte Kacheln<br/></translation>
     </message>
@@ -2922,22 +2996,22 @@ Unbekannte Struktur.</translation>
         <translation><b>Ausgewählt:</b><br/></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="97"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="99"/>
         <source>%1 tracks<br/></source>
         <translation>%1 Tracks<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="98"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="104"/>
         <source>%1 waypoints<br/></source>
         <translation>%1 Wegpunkte<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="99"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="109"/>
         <source>%1 routes<br/></source>
         <translation>%1 Routen<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="100"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="114"/>
         <source>%1 areas<br/></source>
         <translation>%1 Gebiete<br/></translation>
     </message>
@@ -3240,7 +3314,7 @@ ist keine gültige Koordinatensystemdefinition:
         <translation>Entferne vorhandene Datei %1</translation>
     </message>
     <message>
-        <location filename="../qlgt/CQmsDb.cpp" line="163"/>
+        <location filename="../qlgt/CQmsDb.cpp" line="164"/>
         <source>%1: drop item with QLGT DB ID %2</source>
         <translation>%1: verwerfe das Element mit der QLGT DB ID %2</translation>
     </message>
@@ -3599,13 +3673,13 @@ ist keine gültige Koordinatensystemdefinition:
         <translation>%1: Aufgrund der Einschränkungen der Windows POSIX API können Dateien, die größer als 4GB sind, nicht bearbeitet werden.</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="344"/>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="431"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="338"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="425"/>
         <source>Calculate route with %1</source>
         <translation>Berechne Route mit %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="352"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="346"/>
         <source><br/>Calculation time: %1s</source>
         <translation><br/>Berechnungszeit: %1 s</translation>
     </message>
@@ -3714,6 +3788,14 @@ ist keine gültige Koordinatensystemdefinition:
     </message>
 </context>
 <context>
+    <name>CSearchDatabase</name>
+    <message>
+        <location filename="../gis/db/CSearchDatabase.cpp" line="38"/>
+        <source>Search database '%1':</source>
+        <translation>Datenbank '%1' durchsuchen</translation>
+    </message>
+</context>
+<context>
     <name>CSearchGoogle</name>
     <message>
         <location filename="../gis/search/CSearchGoogle.cpp" line="118"/>
@@ -3848,10 +3930,15 @@ Zeile %2, Spalte %3:
 <context>
     <name>CTextEditWidget</name>
     <message>
-        <location filename="../widgets/CTextEditWidget.cpp" line="73"/>
+        <location filename="../widgets/CTextEditWidget.cpp" line="70"/>
         <source>&Color...</source>
         <translation>&Farbe...</translation>
     </message>
+    <message>
+        <location filename="../widgets/CTextEditWidget.cpp" line="113"/>
+        <source>Reset format</source>
+        <translation>Format zurücksetzen</translation>
+    </message>
 </context>
 <context>
     <name>CTwoNavProject</name>
@@ -3862,20 +3949,20 @@ Zeile %2, Spalte %3:
         <location filename="../gis/tnv/serialization.cpp" line="617"/>
         <location filename="../gis/tnv/serialization.cpp" line="645"/>
         <location filename="../gis/tnv/serialization.cpp" line="719"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="87"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="191"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
         <source>Error...</source>
         <translation>Fehler...</translation>
     </message>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="560"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="87"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="191"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
         <source>Failed to open %1.</source>
         <translation>Die Datei %1 konnte nicht geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="159"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="160"/>
         <source>Save GIS data to...</source>
         <translation>GIS Daten speichern in...</translation>
     </message>
@@ -4187,38 +4274,66 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
 <context>
     <name>IDB</name>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="60"/>
         <source>The internal database format of '%1'' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
         <translation>Das interne Datenbankformat von '%1' wurde geändert. QMapShack wird ihre Datenbank nun migrieren. Nach der Migration kann die Datenbank mit älteren QMapShack Versionen nicht mehr verwendet werden. Es wird empfohlen, zuerst ein Backup der Datenbank zu erstellen.</translation>
     </message>
     <message>
+        <location filename="../gis/db/IDB.cpp" line="60"/>
+        <source>The internal database format of '%1' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
+        <translation>Das interne Datenbankformat von '%1' wurde geändert. QMapShack wird ihre Datenbank nun migrieren. Nach der Migration kann die Datenbank mit älteren QMapShack Versionen nicht mehr verwendet werden. Es wird empfohlen, zuerst ein Backup der Datenbank zu erstellen.</translation>
+    </message>
+    <message>
         <location filename="../gis/db/IDB.cpp" line="64"/>
         <source>Migrate database...</source>
         <translation>Datenbank wird migriert...</translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="74"/>
+        <location filename="../gis/db/IDB.cpp" line="69"/>
+        <source>Migration aborted by user</source>
+        <translation>Migration durch den Benutzer abgebrochen</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="75"/>
         <source>Failed to migrate '%1'.</source>
         <translation>Migrieren von '%1' fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="76"/>
-        <location filename="../gis/db/IDB.cpp" line="100"/>
+        <location filename="../gis/db/IDB.cpp" line="77"/>
+        <location filename="../gis/db/IDB.cpp" line="106"/>
         <source>Error...</source>
         <translation>Fehler...</translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="85"/>
+        <location filename="../gis/db/IDB.cpp" line="81"/>
+        <source>Migration failed</source>
+        <translation>Migration fehlgeschlagen</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="88"/>
+        <source>The database version of '%1' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
+        <translation>Die Datenbankversion von '%1' ist höher als die, die von QMapShack gelesen werden kann. Das wird nicht gehen.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="110"/>
+        <source>Initialization failed</source>
+        <translation>Initialisierung fehlgeschlagen</translation>
+    </message>
+    <message>
         <source>The database version of '%1'' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
         <translation>Die Datenbankversion von '%1' ist höher als die in ihrer QMapShack Installation benutzte. Dies wird nicht funktionieren.</translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="88"/>
+        <location filename="../gis/db/IDB.cpp" line="91"/>
         <source>Wrong database version...</source>
         <translation>Falsche Datenbankversion...</translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="98"/>
+        <location filename="../gis/db/IDB.cpp" line="95"/>
+        <source>Database created by newer version of QMapShack</source>
+        <translation>Die Datenbank wurde von einer aktuelleren Version von QMapShack erstellt</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="104"/>
         <source>Failed to initialize '%1'.</source>
         <translation>Initialisieren von '%1' fehlgeschlagen.</translation>
     </message>
@@ -4226,15 +4341,38 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
 <context>
     <name>IDBMysql</name>
     <message>
-        <location filename="../gis/db/IDBMysql.cpp" line="54"/>
+        <location filename="../gis/db/IDBMysql.cpp" line="60"/>
         <source>Password...</source>
         <translation>Passwort...</translation>
     </message>
     <message>
-        <location filename="../gis/db/IDBMysql.cpp" line="54"/>
+        <location filename="../gis/db/IDBMysql.cpp" line="60"/>
         <source>Password for database '%1':</source>
         <translation>Passwort für Datenbank '%1':</translation>
     </message>
+    <message>
+        <location filename="../gis/db/IDBMysql.cpp" line="222"/>
+        <source>Update to database version 5. Migrate all GIS items.</source>
+        <translation>Wechsel zu Datenbankversion 5. Alle GIS Elemente werden übertragen.</translation>
+    </message>
+</context>
+<context>
+    <name>IDBSqlite</name>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="306"/>
+        <source>Update to database version 3. Migrate all GIS items.</source>
+        <translation>Wechsel zu Datenbankversion 3. Alle GIS Elemente werden übertragen.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="375"/>
+        <source>Update to database version 5. Migrate all GIS items.</source>
+        <translation>Wechsel zu Datenbankversion 5. Alle GIS Elemente werden übertragen.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="449"/>
+        <source>Update to database version 6. Migrate all GIS items.</source>
+        <translation>Wechsel zu Datenbankversion 6. Alle GIS Elemente werden übertragen.</translation>
+    </message>
 </context>
 <context>
     <name>IDemPathSetup</name>
@@ -4520,14 +4658,14 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="115"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="110"/>
         <source>Print diary</source>
         <translation>Tagebuch drucken</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="94"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="118"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="138"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="89"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="113"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="133"/>
         <source>...</source>
         <translation></translation>
     </message>
@@ -4537,22 +4675,21 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
         <translation>Reihenfolge beibehalten</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="76"/>
         <source>Sort by time</source>
         <translation>Sortieren nach Zeit</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="76"/>
         <source>Sort along track (multiple)</source>
         <translation>Sort. entl. d. Tracks (mehrfach)</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="86"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
         <source>Sort along track (single)</source>
         <translation>Sort. entl. d. Tracks (einmalig)</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="135"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="130"/>
         <source>Rebuild diary.</source>
         <translation>Tagebuch aktualisieren.</translation>
     </message>
@@ -4615,7 +4752,7 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1498"/>
         <source>Speed</source>
         <translation>Geschw.</translation>
     </message>
@@ -4700,52 +4837,62 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
         <translation>Aktivität</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1375"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1357"/>
+        <source>Set Track Activity</source>
+        <translation>Trackaktivität festlegen</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1364"/>
+        <source>Remove Track Activity</source>
+        <translation>Trackaktivität entfernen</translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1403"/>
         <source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
         <translation>Um Trackstatistiken zu differenzieren, wählen Sie für den gesamten Track eine Aktivität aus der Liste. Oder Sie wählen einen Teil des Track aus und weisen diesem eine Aktivität zu.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1402"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1430"/>
         <source>Points</source>
         <translation>Punkte</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1478"/>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1483"/>
         <source>Ele.</source>
         <translation>Höhe</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1488"/>
         <source>Delta</source>
         <translation>Delta</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1493"/>
         <source>Dist.</source>
         <translation>Entf.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1503"/>
         <source>Slope</source>
         <translation>Neigung</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1508"/>
         <source>Ascend</source>
         <translation>Anstieg</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1513"/>
         <source>Descend</source>
         <translation>Abstieg</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1518"/>
         <source>Position</source>
         <translation>Position</translation>
     </message>
@@ -4828,12 +4975,12 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
         <translation>Farbe</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1499"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1527"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1536"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1564"/>
         <source>Hist.</source>
         <translation>Historie</translation>
     </message>
@@ -4915,7 +5062,7 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
 <context>
     <name>IDevice</name>
     <message>
-        <location filename="../device/IDevice.cpp" line="287"/>
+        <location filename="../device/IDevice.cpp" line="292"/>
         <source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
         <translation>Es gibt schon ein Projekt mit demselben Namen. Wenn Sie 'ok' drücken wird dieses entfernt und ersetzt.</translation>
     </message>
@@ -5289,87 +5436,87 @@ Wenn Sie nur die eine Hälfte behalten wollen, können Sie einfach die Punkte l
 <context>
     <name>IGisItem</name>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="43"/>
+        <location filename="../gis/IGisItem.cpp" line="44"/>
         <source>[no name]</source>
         <translation>[kein Name]</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="315"/>
+        <location filename="../gis/IGisItem.cpp" line="316"/>
         <source>The item is not part of the project in the database.</source>
         <translation>Das Element ist nicht Teil des Projektes in der Datenbank.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="316"/>
+        <location filename="../gis/IGisItem.cpp" line="317"/>
         <source>
 It is either a new item or it has been deleted in the database by someone else.</source>
         <translation>Es ist entweder ein neues Symbol oder es wurde in der Datenbank gelöscht.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="322"/>
+        <location filename="../gis/IGisItem.cpp" line="323"/>
         <source>The item is not in the database.</source>
         <translation>Das Element ist nicht in der Datenbank.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="328"/>
+        <location filename="../gis/IGisItem.cpp" line="329"/>
         <source>The item might need to be saved</source>
         <translation>Es könnte notwendig sein, das Element zu speichern.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="412"/>
+        <location filename="../gis/IGisItem.cpp" line="413"/>
         <source>Initial version.</source>
         <translation>Erstversion.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="520"/>
+        <location filename="../gis/IGisItem.cpp" line="521"/>
         <source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
         <translation><h3>%1</h3> Diese Element ist vermutlich schreibgeschützt, da nicht mit QMapShack erstellt. Normalerweise sollten importierte Daten nicht geändert werden. Wenn doch, drücken Sie 'OK'.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="521"/>
+        <location filename="../gis/IGisItem.cpp" line="522"/>
         <source>Read Only Mode...</source>
         <translation>Schreibgeschützt...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="685"/>
-        <location filename="../gis/IGisItem.cpp" line="744"/>
+        <location filename="../gis/IGisItem.cpp" line="692"/>
+        <location filename="../gis/IGisItem.cpp" line="745"/>
         <source><h4>Description:</h4></source>
         <translation><h4>Beschreibung:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="688"/>
-        <location filename="../gis/IGisItem.cpp" line="747"/>
+        <location filename="../gis/IGisItem.cpp" line="695"/>
+        <location filename="../gis/IGisItem.cpp" line="748"/>
         <source><p>--- no description ---</p></source>
         <translation><p>--- keine Beschreibung ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="699"/>
+        <location filename="../gis/IGisItem.cpp" line="706"/>
         <source><h4>Comment:</h4></source>
         <translation><h4>Kommentar:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="702"/>
+        <location filename="../gis/IGisItem.cpp" line="709"/>
         <source><p>--- no comment ---</p></source>
         <translation><p>--- kein Kommentar ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="713"/>
-        <location filename="../gis/IGisItem.cpp" line="758"/>
+        <location filename="../gis/IGisItem.cpp" line="720"/>
+        <location filename="../gis/IGisItem.cpp" line="759"/>
         <source><h4>Links:</h4></source>
         <translation><h4>Verknüpfungen:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="716"/>
-        <location filename="../gis/IGisItem.cpp" line="761"/>
+        <location filename="../gis/IGisItem.cpp" line="723"/>
+        <location filename="../gis/IGisItem.cpp" line="762"/>
         <source><p>--- no links ---</p></source>
         <translation><p>--- keine Verknüpfungen---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="843"/>
+        <location filename="../gis/IGisItem.cpp" line="838"/>
         <source>Edit name...</source>
         <translation>Name bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="843"/>
+        <location filename="../gis/IGisItem.cpp" line="838"/>
         <source>Enter new %1 name.</source>
         <translation>Geben Sie einen neuen %1namen ein.</translation>
     </message>
@@ -5387,59 +5534,59 @@ It is either a new item or it has been deleted in the database by someone else.<
         <translation><h3>%1</h3>Das Projekt wurde geändert. Speichern, bevor es geschlossen wird?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="258"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="271"/>
         <source>%1: Correlate tracks and waypoints.</source>
         <translation>%1: Tracks und Wegpunkte verknüpfen.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="268"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="281"/>
         <source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
         <translation><h3>%1</h3>Hat das zu lange gedauert? Wollen Sie die Verknüpfung von Tracks und Wegpunkten auch in Zukunft für dieses Projekt überspringen?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="269"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="282"/>
         <source>Canceled correlation...</source>
         <translation>Verknüpfung abgebrochen...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="309"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="327"/>
         <source>Save "%1" to...</source>
         <translation>Speichere "%1" nach...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="420"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="437"/>
         <source><br/>
 Filename: %1</source>
         <translation><br/>
 Dateiname: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="425"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="442"/>
         <source>Waypoints: %1</source>
         <translation>Wegpunkte: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="429"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="446"/>
         <source>Tracks: %1</source>
         <translation>Tracks: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="433"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="450"/>
         <source>Routes: %1</source>
         <translation>Routen: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="437"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="454"/>
         <source>Areas: %1</source>
         <translation>Gebiete: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="557"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="574"/>
         <source>Are you sure you want to delete '%1' from project '%2'?</source>
         <translation>Sind Sie sicher, dass Sie '%1' aus dem Projekt '%2' löschen wollen? </translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="558"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="575"/>
         <source>Delete...</source>
         <translation>Löschen...</translation>
     </message>
@@ -6138,62 +6285,62 @@ Keine Lust die Anleitung zu lesen!</translation>
 <context>
     <name>IMouseEditLine</name>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="264"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="256"/>
         <source><b>New Line</b><br/>Move the mouse and use the left mouse button to drop points. When done use the right mouse button to stop.<br/></source>
         <translation><b>Neue Linie</b><br/>Erstellen Sie Punkte durch Verschieben des Mauscursors und Drücken der linken Maustaste. Mit der rechten Maustaste beenden Sie den Vorgang.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="314"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="306"/>
         <source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
         <translation><b>Punkt löschen</b><br/>Bewegen Sie den Mauscursor nahe an einen Punkt und drücken Sie die linke Maustaste um ihn zu löschen. <br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="323"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="315"/>
         <source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
         <translation><b>Punktebereich auswählen</b><br/>Mit der linken Maustaste wählen Sie den ersten Punkt aus. Mit einem erneuten Drücken der linken Maustaste wählen Sie den zweiten Punkt aus und dann wählen Sie eine der Optionen. Zum Abbrechen nutzen Sie die rechte Maustaste.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="324"/>
         <source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Punkt verschieben</b><br/>Bewegen Sie den Mauscursor nahe an einen Punkt und drücken die linke Maustaste, um ihn mit dem Cursor zu fangen. Verschieben Sie den Punkt mit der Maus. Setzen Sie den Punkt mit einem Linksklick. Zum Abbrechen nutzen Sie die rechte Maustaste.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="341"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="333"/>
         <source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it.  Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Punkt hinzufügen</b><br/>Bewegen Sie den Mauscursor nahe an ein Liniensegment und drücken Sie die linke Maustaste, um einen Punkt hinzuzufügen. Der Punkt wird durch den Cursor gefangen und kann verschoben werden. Setzen Sie den Punkt mit einem Linksklick. Zum Abbrechen nutzen Sie die rechte Maustaste.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="350"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="342"/>
         <source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
         <translation><b>Kein Routing</b><br/>Alle Punkte werden mittels einer geraden Linie verbunden.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="356"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="348"/>
         <source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
         <translation><b>Auto Routing</b><br/>Die aktuellen Router Einstellungen erstellen eine Route zwischen Punkten. <b>Hinweis:</b> Der gewählte Router muss schnell routen können. Offline Router können dies gewöhnlich, Online Router nicht.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="361"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="353"/>
         <source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
         <translation><b>Vektor Routing</b><br/>Verbindet Punkte mit einer Linie einer geladenen Vektorkarte, soweit möglich.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="525"/>
         <source><b>%1 Metrics</b></source>
         <translation><b>%1maße</b></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="536"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="528"/>
         <source>Distance:</source>
         <translation>Entfernung:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="538"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="530"/>
         <source>Ascend:</source>
         <translation>Anstieg:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="540"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="532"/>
         <source>Descend:</source>
         <translation>Abstieg:</translation>
     </message>
@@ -6235,12 +6382,12 @@ Keine Lust die Anleitung zu lesen!</translation>
         <translation>Wegpunkt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../plot/IPlot.cpp" line="647"/>
+        <location filename="../plot/IPlot.cpp" line="648"/>
         <source>No or bad data.</source>
         <translation>Keine oder schlechte Daten.</translation>
     </message>
     <message>
-        <location filename="../plot/IPlot.cpp" line="1244"/>
+        <location filename="../plot/IPlot.cpp" line="1245"/>
         <source>Select output file</source>
         <translation>Ausgabedatei auswählen</translation>
     </message>
@@ -7101,6 +7248,36 @@ sein</translation>
     </message>
 </context>
 <context>
+    <name>ISearchDatabase</name>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="14"/>
+        <source>Search...</source>
+        <translation>Suchen...</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="34"/>
+        <source>Type the word you want to search for and press the search button. 
+If you enter 'word' a search with an exact match is done. If you enter 'word*', 'word' has to be at the beginning of a string.</source>
+        <translation>Tippen Sie das Wort, das sie suchen ein und drücken Sie den 'Suchen' Knopf.
+Wenn Sie das Wort 'wort' eingeben, wird exakt nach dem Wort gesucht. Wenn Sie das Wort 'wort*' eingeben, dann muss 'wort' nur am Anfang stehen.</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="51"/>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="79"/>
+        <source>Search</source>
+        <translation>Suchen</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="86"/>
+        <source>Close</source>
+        <translation>Schließen</translation>
+    </message>
+</context>
+<context>
     <name>ISelDevices</name>
     <message>
         <location filename="../gis/ISelDevices.ui" line="14"/>
@@ -7111,12 +7288,10 @@ sein</translation>
 <context>
     <name>ISelectActivity</name>
     <message>
-        <location filename="../gis/trk/ISelectActivity.ui" line="14"/>
         <source>Activities...</source>
         <translation>Aktivitäten...</translation>
     </message>
     <message>
-        <location filename="../gis/trk/ISelectActivity.ui" line="20"/>
         <source>Select one:</source>
         <translation>Wählen Sie eine aus:</translation>
     </message>
@@ -7476,141 +7651,296 @@ sein</translation>
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="25"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="38"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="51"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="64"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="77"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="97"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="110"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="123"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="136"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="169"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="182"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="195"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="208"/>
-        <source>...</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="256"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="331"/>
         <source>Undo</source>
         <translation>Rückgängig</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="259"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="334"/>
         <source>Ctrl+Z</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="268"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="38"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="343"/>
         <source>Redo</source>
         <translation>Wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="271"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="346"/>
         <source>Ctrl+Shift+Z</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="51"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="355"/>
         <source>Cut</source>
         <translation>Ausschneiden</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="283"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="358"/>
         <source>Ctrl+X</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="292"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="64"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="367"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="370"/>
         <source>Ctrl+C</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="304"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="77"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="375"/>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="307"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="100"/>
+        <source>A:L</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="113"/>
+        <source>A:C</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="126"/>
+        <source>A:R</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="139"/>
+        <source>A:B</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="172"/>
+        <source>B</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="185"/>
+        <source>I</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="198"/>
+        <source>U</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="218"/>
+        <source>C</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="265"/>
+        <source>Standard</source>
+        <translation>Standard</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="270"/>
+        <source>Bullet List (Disc)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="275"/>
+        <source>Bullet List (Circle)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+        <source>Bullet List (Square)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="285"/>
+        <source>Ordered List (Decimal)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="290"/>
+        <source>Ordered List (Alpha lower)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+        <source>Ordered List (Alpha upper)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="300"/>
+        <source>Ordered List (Roman lower)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="305"/>
+        <source>Ordered List (Roman upper)</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="378"/>
         <source>Ctrl+V</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="319"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="390"/>
         <source>Align Left</source>
         <translation>Linksbündig</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="322"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="393"/>
         <source>Ctrl+L</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="334"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="405"/>
         <source>Align Right</source>
         <translation>Rechtsbündig</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="337"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="408"/>
         <source>Ctrl+R</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="349"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="420"/>
         <source>Align Center</source>
         <translation>Zentriert</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="352"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="423"/>
         <source>Ctrl+E</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="364"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="435"/>
         <source>Align Block</source>
         <translation>Blocksatz</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="367"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="438"/>
         <source>Ctrl+J</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="379"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="450"/>
         <source>Underline</source>
         <translation>Unterstreichen</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="382"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="453"/>
         <source>Ctrl+U</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="394"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="465"/>
         <source>Bold</source>
         <translation>Fett</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="397"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="468"/>
         <source>Ctrl+B</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="409"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="480"/>
         <source>Italic</source>
         <translation>Kursiv</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="412"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="483"/>
         <source>Ctrl+I</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="495"/>
+        <source>Plain</source>
+        <translation>Schlicht</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="498"/>
+        <source>Reset the text's format before pasting</source>
+        <translation>Das Textformat wird entfernt bevor der Text eingefügt wird</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="503"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="506"/>
+        <source>Select All</source>
+        <translation>Alles auswählen</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="509"/>
+        <source>Ctrl+A</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="514"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="517"/>
+        <source>Delete</source>
+        <translation>Löschen</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="522"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="525"/>
+        <source>Reset Font</source>
+        <translation>Font zurücksetzen</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="530"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="533"/>
+        <source>Reset Layout</source>
+        <translation>Layout zurücksetzen</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="545"/>
+        <source>Normal</source>
+        <translation>Normal</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="548"/>
+        <source>Paste without resetting the text's format</source>
+        <translation>Einfügen ohne das Format zurückzusetzen</translation>
+    </message>
+</context>
+<context>
+    <name>ITextEditWidgetSelMenu</name>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="55"/>
+        <source>B</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="68"/>
+        <source>I</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="81"/>
+        <source>U</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="101"/>
+        <source>Cut</source>
+        <translation>Ausschneiden</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="114"/>
+        <source>Copy</source>
+        <translation>Kopieren</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="127"/>
+        <source>Paste</source>
+        <translation>Einfügen</translation>
+    </message>
 </context>
 <context>
     <name>ITimeZoneSetup</name>
diff --git a/src/locale/qmapshack_es.ts b/src/locale/qmapshack_es.ts
index b72dbd3..edc8205 100644
--- a/src/locale/qmapshack_es.ts
+++ b/src/locale/qmapshack_es.ts
@@ -17,105 +17,97 @@
 <context>
     <name>CActivityTrk</name>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="29"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="117"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="39"/>
         <source>Foot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="37"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="118"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="47"/>
         <source>Bicycle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="45"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="119"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="55"/>
         <source>Motor Bike</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="53"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="120"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="63"/>
         <source>Car</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="61"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="121"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="71"/>
         <source>Cable Car</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="69"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="122"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="79"/>
         <source>Swim</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="77"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="87"/>
         <source>Ship</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="85"/>
-        <source>Aeronautik</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="93"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="125"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="103"/>
         <source>Ski/Winter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="124"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="95"/>
         <source>Aeronautics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="261"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="305"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="262"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="304"/>
         <source>Distance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="263"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="327"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="264"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="315"/>
         <source>Ascend:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="265"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="349"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="266"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="326"/>
         <source>Descend:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="267"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="371"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="268"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="337"/>
         <source>Speed Moving:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="269"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="393"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="270"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
         <source>Speed Total:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="271"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="415"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="272"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="359"/>
         <source>Time Moving:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="273"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="437"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="274"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="370"/>
         <source>Time Total:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="410"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CCanvas</name>
@@ -129,7 +121,7 @@
         <translation>Vista %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="674"/>
+        <location filename="../canvas/CCanvas.cpp" line="670"/>
         <source>Setup Map Background</source>
         <translation type="unfinished"></translation>
     </message>
@@ -208,28 +200,28 @@
 <context>
     <name>CDBFolderMysql</name>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="32"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="33"/>
         <source>All your data grouped by folders.</source>
         <translation type="unfinished">Todos tus datos agrupados en carpetas.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="52"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="53"/>
         <source>MySQL Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="55"/>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="59"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="56"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="60"/>
         <source>Server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="64"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="65"/>
         <source> (No PW)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="72"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="73"/>
         <source>Error: </source>
         <translation type="unfinished">Error: </translation>
     </message>
@@ -237,35 +229,40 @@
 <context>
     <name>CDBFolderSqlite</name>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="28"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="30"/>
         <source>All your data grouped by folders.</source>
         <translation type="unfinished">Todos tus datos agrupados en carpetas.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="46"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="52"/>
         <source>SQLite Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="56"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="62"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="66"/>
+        <source>Error: </source>
+        <translation type="unfinished">Error: </translation>
+    </message>
 </context>
 <context>
     <name>CDBItem</name>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="87"/>
+        <location filename="../gis/db/CDBItem.cpp" line="91"/>
         <source>%1 min.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="91"/>
+        <location filename="../gis/db/CDBItem.cpp" line="95"/>
         <source>%1 h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="95"/>
+        <location filename="../gis/db/CDBItem.cpp" line="99"/>
         <source>%1 days</source>
         <translation type="unfinished"></translation>
     </message>
@@ -273,66 +270,66 @@
 <context>
     <name>CDBProject</name>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="219"/>
+        <location filename="../gis/db/CDBProject.cpp" line="223"/>
         <source>The item %1 has been changed by %2 (%3). 
 
 To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="225"/>
+        <location filename="../gis/db/CDBProject.cpp" line="229"/>
         <source>Conflict with database...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="226"/>
+        <location filename="../gis/db/CDBProject.cpp" line="230"/>
         <source>Clone && Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="227"/>
+        <location filename="../gis/db/CDBProject.cpp" line="231"/>
         <source>Force Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="228"/>
+        <location filename="../gis/db/CDBProject.cpp" line="232"/>
         <source>Take remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="531"/>
+        <location filename="../gis/db/CDBProject.cpp" line="514"/>
         <source>Missing folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="532"/>
+        <location filename="../gis/db/CDBProject.cpp" line="515"/>
         <source>Failed to save project. The folder has been deleted in the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="539"/>
+        <location filename="../gis/db/CDBProject.cpp" line="522"/>
         <source>Save ...</source>
         <translation type="unfinished">Guardar...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="602"/>
+        <location filename="../gis/db/CDBProject.cpp" line="585"/>
         <source>Error</source>
         <translation type="unfinished">Error</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="602"/>
+        <location filename="../gis/db/CDBProject.cpp" line="585"/>
         <source>There was an unexpected database error:
 
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="727"/>
+        <location filename="../gis/db/CDBProject.cpp" line="700"/>
         <source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="728"/>
+        <location filename="../gis/db/CDBProject.cpp" line="701"/>
         <source>Save changes?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -340,12 +337,12 @@ To solve this conflict you can create and save a clone, force your version or dr
 <context>
     <name>CDemList</name>
     <message>
-        <location filename="../dem/CDemList.cpp" line="202"/>
+        <location filename="../dem/CDemList.cpp" line="195"/>
         <source>Deactivate</source>
         <translation>Desactivar</translation>
     </message>
     <message>
-        <location filename="../dem/CDemList.cpp" line="202"/>
+        <location filename="../dem/CDemList.cpp" line="195"/>
         <source>Activate</source>
         <translation>Activar</translation>
     </message>
@@ -455,13 +452,13 @@ To solve this conflict you can create and save a clone, force your version or dr
 <context>
     <name>CDetailsPrj</name>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="270"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="791"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="265"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="775"/>
         <source>none</source>
         <translation>ninguna</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="343"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="338"/>
         <source>Build diary...</source>
         <translation>Creando diario...</translation>
     </message>
@@ -470,112 +467,112 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Cancelar</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="446"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="435"/>
         <source><h2>Waypoints</h2></source>
         <translation>Waypoints</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="479"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="608"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="726"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="442"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="468"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="710"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="740"/>
         <source>Info</source>
         <translation>Información</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="454"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="480"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="609"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="727"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="757"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="443"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="469"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="593"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="711"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="741"/>
         <source>Comment</source>
         <translation>Comentario</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="472"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="461"/>
         <source><h2>Tracks</h2></source>
         <translation>Tracks</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>From Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>To Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>To End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="630"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="614"/>
         <source>distance: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="640"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="624"/>
         <source>ascent: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="650"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="634"/>
         <source>descend: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="719"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="703"/>
         <source><h2>Areas</h2></source>
         <translation>Áreas</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="126"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
         <source>You want to sort waypoints along a track, but you switched off track and waypoint correlation. Do you want to switch it on again?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="128"/>
         <source>Correlation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="398"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="393"/>
         <source><b>Summary over all tracks in project</b><br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="749"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
         <source><h2>Routes</h2></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="761"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="788"/>
         <source>Edit name...</source>
         <translation>Editar nombre...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="761"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="788"/>
         <source>Enter new project name.</source>
         <translation>Introducir nuevo nombre de proyecto.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="770"/>
         <source>Edit keywords...</source>
         <translation>Editar etiquetas...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="770"/>
         <source>Enter keywords.</source>
         <translation>Introducir etiquetas.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="935"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="916"/>
         <source>Print Diary</source>
         <translation>Imprimir Diario</translation>
     </message>
@@ -606,37 +603,37 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">distancia. [%1]</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="181"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="166"/>
         <source>Reduce visible track points</source>
         <translation>Reducir puntos visibles del track</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="184"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
         <source>Change elevation of track points</source>
         <translation>Cambiar elevación de puntos del track</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="187"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
         <source>Change timestamp of track points</source>
         <translation>Cambiar fecha/hora de puntos del track</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="190"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
         <source>Modify track points' extensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="193"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
         <source>Cut track into pieces</source>
         <translation>Dividir track en partes</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="426"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="399"/>
         <source>Color</source>
         <translation type="unfinished">Color</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="427"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="400"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -649,21 +646,16 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Introduzca el nombre del nuevo track.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="629"/>
         <source>Reset activities...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="629"/>
         <source>This will remove all activities from the track. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="657"/>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source><h4>Comment:</h4></source>
         <translation type="obsolete"><h4>Comentario:</h4></translation>
     </message>
@@ -799,7 +791,7 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/fit/CFitProject.cpp" line="91"/>
+        <location filename="../gis/fit/CFitProject.cpp" line="93"/>
         <source>Failed to open FIT file %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -864,52 +856,52 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="385"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="391"/>
         <source>Area: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="447"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="451"/>
         <source>Changed area shape.</source>
         <translation type="unfinished">Se cambió la forma del área.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="455"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="459"/>
         <source>Changed name.</source>
         <translation type="unfinished">Se cambió el nombre.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="461"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="465"/>
         <source>Changed border width.</source>
         <translation type="unfinished">Se cambió la anchura del borde.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="467"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="471"/>
         <source>Changed fill pattern.</source>
         <translation type="unfinished">Se cambió el patró de relleno.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="473"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="477"/>
         <source>Changed opacity.</source>
         <translation type="unfinished">Se cambió la opacidad.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="479"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="483"/>
         <source>Changed comment.</source>
         <translation type="unfinished">Se cambió el comentario.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="485"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="489"/>
         <source>Changed description.</source>
         <translation type="unfinished">Se cambió la descripción.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="491"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="495"/>
         <source>Changed links</source>
         <translation type="unfinished">Se cambió el enlace</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="502"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="506"/>
         <source>Changed color</source>
         <translation type="unfinished">Se cambió el color</translation>
     </message>
@@ -922,73 +914,73 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="283"/>
         <source>track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="310"/>
         <source>Changed name.</source>
         <translation type="unfinished">Se cambió el nombre.</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="316"/>
         <source>Changed comment</source>
         <translation type="unfinished">Se cambió el comentario</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="322"/>
         <source>Changed description</source>
         <translation type="unfinished">Se cambió la descripción</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="328"/>
         <source>Changed links</source>
         <translation type="unfinished">Se cambió el enlace</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="346"/>
         <source>Length: %1 %2</source>
         <translation type="unfinished">Longitud: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="350"/>
         <source>Length: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="559"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="357"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="595"/>
         <source>Time: %1 %2</source>
         <translation type="unfinished">Tiempo: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="361"/>
         <source>Time: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="371"/>
         <source>%1%2 %3, %4%5 %6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="377"/>
         <source>Last time routed:<br/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="379"/>
         <source>with %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="561"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="597"/>
         <source>Distance: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="675"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="712"/>
         <source>Changed route points.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1027,22 +1019,22 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished">Fallo al leer los datos.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="118"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="117"/>
         <source>_Clone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="290"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="289"/>
         <source>Changed trackpoints, sacrificed all previous data.</source>
         <translation type="unfinished">Se cambiaron los puntos del track, y descartados todos los datos previos.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="394"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
         <source>Length: %1 %2</source>
         <translation type="unfinished">Longitud: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="401"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="400"/>
         <source>, %1%2 %3, %4%5 %6</source>
         <translation type="unfinished">, %1%2 %3, %4%5 %6</translation>
     </message>
@@ -1059,121 +1051,126 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">En movimiento: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="434"/>
         <source>Start: %1</source>
         <translation type="unfinished">Comienzo: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="438"/>
         <source>Start: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="445"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="444"/>
         <source>End: %1</source>
         <translation type="unfinished">Final: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="449"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="448"/>
         <source>End: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="452"/>
         <source>Points: %1 (%2)</source>
         <translation type="unfinished">Puntos: %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="457"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="456"/>
         <source>Invalid elevations!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="461"/>
         <source>Invalid timestamps!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="467"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="466"/>
         <source>Invalid positions!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="475"/>
+        <source>Activities: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
         <source>Index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="562"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="590"/>
         <source>Index: visible %1, total %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="601"/>
         <source>Ele.: %1 %2</source>
         <translation type="unfinished">Altitud: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
         <source> slope: %1%3 (%2%)</source>
         <translation type="unfinished"> pendiente: %1%3 (%2%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
         <source> speed: %1%2</source>
         <translation type="unfinished"> velocidad: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
         <source>... and %1 tags not displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
         <source>Descend: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="649"/>
         <source>Distance: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="622"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="650"/>
         <source>Moving: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="627"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="655"/>
         <source>Ascend: %1%2 (%3%)</source>
         <translation type="unfinished">Ascenso: %1%2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1317"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1330"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1390"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1434"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1599"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1345"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1418"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1462"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1627"/>
         <source>track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1535"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1563"/>
         <source>Hide point %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1539"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1567"/>
         <source>Hide points %1..%2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="619"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="647"/>
         <source>Ascend: - (-)</source>
         <translation type="unfinished">Ascenso: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
         <source> Descend: %1%2 (%3%)</source>
         <translation type="unfinished"> Descenso: %1%2 (%3%)</translation>
     </message>
@@ -1190,7 +1187,7 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Dist.: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="645"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="673"/>
         <source> Moving: %1%2 (%3%)</source>
         <translation type="unfinished"> En movimiento: %1%2 (%3%)</translation>
     </message>
@@ -1199,33 +1196,33 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete"> En movimiento: - (-) </translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="695"/>
         <source>Ascend: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="672"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="700"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="712"/>
         <source>, %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
         <source>Ascend: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="707"/>
         <source> Descend: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="690"/>
         <source>Descend: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="694"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="722"/>
         <source> Time: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1238,42 +1235,42 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Introduzca el nombre del nuevo track.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="405"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="404"/>
         <source>, %1-, %2-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="413"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="412"/>
         <source>Time: %1, Speed: %2 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="417"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="416"/>
         <source>Time: -, Speed: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="424"/>
         <source>Moving: %1, Speed: %2 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="429"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="428"/>
         <source>Moving: -, Speed: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
         <source>Distance: %1%2 (%3%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="717"/>
         <source>Distance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1380"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1408"/>
         <source>Permanently removed points %1..%2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1282,42 +1279,42 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Ocultar puntos.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1579"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1607"/>
         <source>Show points.</source>
         <translation type="unfinished">Mostrar puntos.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2142"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
         <source>Changed name</source>
         <translation type="unfinished">Se cambió el nombre</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2148"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
         <source>Changed comment</source>
         <translation type="unfinished">Se cambió el comentario</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2166"/>
         <source>Changed description</source>
         <translation type="unfinished">Se cambió la descripción</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2172"/>
         <source>Changed links</source>
         <translation type="unfinished">Se cambió el enlace</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2171"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2183"/>
         <source>Changed elevation of point %1 to %2 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2198"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2212"/>
         <source>Changed activity to '%1' for complete track.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2256"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2262"/>
         <source>Changed activity to '%1' for range(%2..%3).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1415,62 +1412,62 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="267"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="272"/>
         <source>Elevation: %1 %2</source>
         <translation type="unfinished">Altitud: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="278"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="283"/>
         <source>Proximity: %1 %2</source>
         <translation type="unfinished">Proximidad: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="352"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="355"/>
         <source>Changed name</source>
         <translation type="unfinished">Se cambió el nombre</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="362"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="365"/>
         <source>Changed position</source>
         <translation type="unfinished">Se cambió la posición</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="371"/>
         <source>Changed elevation</source>
         <translation type="unfinished">Se cambió la altitud</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="377"/>
         <source>Changed proximity</source>
         <translation type="unfinished">Se cambió la proximidad</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="388"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="391"/>
         <source>Changed icon</source>
         <translation type="unfinished">Se cambió el icono</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="397"/>
         <source>Changed comment</source>
         <translation type="unfinished">Se cambió el comentario</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="403"/>
         <source>Changed description</source>
         <translation type="unfinished">Se cambió la descripción</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="409"/>
         <source>Changed links</source>
         <translation type="unfinished">Se cambió el enlace</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="415"/>
         <source>Changed images</source>
         <translation type="unfinished">Se cambió la imagen</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="421"/>
         <source>Add image</source>
         <translation type="unfinished">Añadir Imagen</translation>
     </message>
@@ -1478,68 +1475,113 @@ To solve this conflict you can create and save a clone, force your version or dr
 <context>
     <name>CGisListDB</name>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="81"/>
+        <location filename="../gis/CGisListDB.cpp" line="83"/>
         <source>Due to changes in the database system QMapShack forgot about the filename of your database '%1'. You have to select it again in the next step.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="82"/>
+        <location filename="../gis/CGisListDB.cpp" line="84"/>
         <source>Select database file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="115"/>
+        <location filename="../gis/CGisListDB.cpp" line="117"/>
         <source>Add Database</source>
         <translation>Añadir Base de Datos</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="118"/>
+        <location filename="../gis/CGisListDB.cpp" line="120"/>
         <source>Add Folder</source>
         <translation>Añadir carpeta</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="119"/>
+        <location filename="../gis/CGisListDB.cpp" line="121"/>
+        <source>Rename Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="122"/>
+        <source>Copy Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="123"/>
+        <source>Move Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="124"/>
         <source>Delete Folder</source>
         <translation>Eliminar Carpeta</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="122"/>
-        <location filename="../gis/CGisListDB.cpp" line="133"/>
+        <location filename="../gis/CGisListDB.cpp" line="127"/>
+        <location filename="../gis/CGisListDB.cpp" line="139"/>
         <source>Delete Item</source>
         <translation>Eliminar Elemento</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="126"/>
+        <location filename="../gis/CGisListDB.cpp" line="131"/>
+        <source>Search Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="132"/>
         <source>Sync. with Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="127"/>
+        <location filename="../gis/CGisListDB.cpp" line="133"/>
         <source>Remove Database</source>
         <translation>Quitar Base de Datos</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="130"/>
+        <location filename="../gis/CGisListDB.cpp" line="136"/>
         <source>Empty</source>
         <translation>Vacío</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="418"/>
+        <location filename="../gis/CGisListDB.cpp" line="432"/>
         <source>Remove database...</source>
         <translation>Quitar Base de Datos...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="418"/>
+        <location filename="../gis/CGisListDB.cpp" line="432"/>
         <source>Do you really want to remove '%1' from the list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="611"/>
+        <location filename="../gis/CGisListDB.cpp" line="496"/>
+        <source>Are you sure you want to delete selected folders and all subfolders from the database?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="664"/>
+        <source>Bad operation....</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="664"/>
+        <source>The target folder is a subfolder of the one to move. This will not work.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="723"/>
+        <source>Folder name...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="723"/>
+        <source>Rename folder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="852"/>
         <source>Are you sure you want to delete '%1' from folder '%2'?</source>
         <translation type="unfinished">¿Desea realmente eleiminar '%1' de la carpeta '%2'?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="612"/>
+        <location filename="../gis/CGisListDB.cpp" line="853"/>
         <source>Delete...</source>
         <translation type="unfinished">Borrar...</translation>
     </message>
@@ -1548,28 +1590,27 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">¿Desea realmente quitar '%1' de la lista?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="476"/>
+        <location filename="../gis/CGisListDB.cpp" line="496"/>
         <source>Delete database folder...</source>
         <translation>Eliminar Carpeta de la Base de Datos...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="476"/>
         <source>Are you sure you want to delete "%1" from the database?</source>
-        <translation>¿Desea realmente eliminar '%1' de la Base de Datos?</translation>
+        <translation type="vanished">¿Desea realmente eliminar '%1' de la Base de Datos?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="503"/>
-        <location filename="../gis/CGisListDB.cpp" line="524"/>
+        <location filename="../gis/CGisListDB.cpp" line="744"/>
+        <location filename="../gis/CGisListDB.cpp" line="765"/>
         <source>Remove items...</source>
         <translation>Eliminar elementos...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="503"/>
+        <location filename="../gis/CGisListDB.cpp" line="744"/>
         <source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
         <translation>¿Desea realmente eliminar todos los elementos de 'Objetos Perdidos'? Se eliminarán definitivamente.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="524"/>
+        <location filename="../gis/CGisListDB.cpp" line="765"/>
         <source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
         <translation>¿Desea realmente eliminar todos los elementos.seleccionados de 'Objetos Perdidos'? Se eliminarán definitivamente.</translation>
     </message>
@@ -1577,12 +1618,12 @@ To solve this conflict you can create and save a clone, force your version or dr
 <context>
     <name>CGisListWks</name>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="103"/>
+        <location filename="../gis/CGisListWks.cpp" line="111"/>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="104"/>
+        <location filename="../gis/CGisListWks.cpp" line="112"/>
         <source>Save As...</source>
         <translation>Guardar Como...</translation>
     </message>
@@ -1596,89 +1637,90 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Actualizar Proyecto en Dispositivos</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="111"/>
+        <location filename="../gis/CGisListWks.cpp" line="119"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="121"/>
+        <location filename="../gis/CGisListWks.cpp" line="128"/>
         <source>Update Project on Device</source>
         <translation>Actualizar Proyecto en Dsipositivo</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="134"/>
+        <location filename="../gis/CGisListWks.cpp" line="141"/>
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="135"/>
+        <location filename="../gis/CGisListWks.cpp" line="99"/>
+        <location filename="../gis/CGisListWks.cpp" line="142"/>
         <source>Copy to...</source>
         <translation>Copiar a...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="150"/>
+        <location filename="../gis/CGisListWks.cpp" line="157"/>
         <source>Show Bubble</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="152"/>
+        <location filename="../gis/CGisListWks.cpp" line="159"/>
         <source>Move Waypoint</source>
         <translation>Mover Waypoint</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="153"/>
+        <location filename="../gis/CGisListWks.cpp" line="160"/>
         <source>Proj. Waypoint...</source>
         <translation>Proyectar Waypoint...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="161"/>
+        <location filename="../gis/CGisListWks.cpp" line="168"/>
         <source>Route Instructions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="163"/>
+        <location filename="../gis/CGisListWks.cpp" line="170"/>
         <source>Calculate Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="164"/>
+        <location filename="../gis/CGisListWks.cpp" line="171"/>
         <source>Reset Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="165"/>
+        <location filename="../gis/CGisListWks.cpp" line="172"/>
         <source>Edit Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="166"/>
+        <location filename="../gis/CGisListWks.cpp" line="173"/>
         <source>Convert to Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="182"/>
+        <location filename="../gis/CGisListWks.cpp" line="189"/>
         <source>Create Route</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="626"/>
+        <location filename="../gis/CGisListWks.cpp" line="618"/>
         <source>Drop items...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="651"/>
-        <location filename="../gis/CGisListWks.cpp" line="1593"/>
-        <location filename="../gis/CGisListWks.cpp" line="1631"/>
+        <location filename="../gis/CGisListWks.cpp" line="643"/>
+        <location filename="../gis/CGisListWks.cpp" line="1599"/>
+        <location filename="../gis/CGisListWks.cpp" line="1637"/>
         <source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
         <translation type="unfinished"><b>Actualizar dispositivos</b><p>Actualizar %1<br/>Por favor espere...</p></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1166"/>
+        <location filename="../gis/CGisListWks.cpp" line="1172"/>
         <source>Delete project...</source>
         <translation type="unfinished">Eliminar Proyecto...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1166"/>
+        <location filename="../gis/CGisListWks.cpp" line="1172"/>
         <source>Do you really want to delete %1?</source>
         <translation type="unfinished">¿Desea realmente eliminar %1?</translation>
     </message>
@@ -1687,78 +1729,88 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Copia elementos....</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="137"/>
+        <location filename="../gis/CGisListWks.cpp" line="144"/>
         <source>Track Profile</source>
         <translation>Perfil del Track</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="99"/>
+        <location filename="../gis/CGisListWks.cpp" line="100"/>
         <source>Show on Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="100"/>
+        <location filename="../gis/CGisListWks.cpp" line="101"/>
         <source>Hide from Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="107"/>
-        <source>Send to Devices</source>
+        <source>Sort by Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/CGisListWks.cpp" line="108"/>
+        <source>Sort by Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="115"/>
+        <source>Send to Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="116"/>
         <source>Sync. with Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="139"/>
+        <location filename="../gis/CGisListWks.cpp" line="146"/>
         <source>Select Range</source>
         <translation>Seleccionar Rango</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="140"/>
+        <location filename="../gis/CGisListWks.cpp" line="147"/>
         <source>Edit Track Points</source>
         <translation>Editar Puntos del Track</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="141"/>
+        <location filename="../gis/CGisListWks.cpp" line="148"/>
         <source>Reverse Track</source>
         <translation>Invertir Track</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="142"/>
+        <location filename="../gis/CGisListWks.cpp" line="149"/>
         <source>Combine Tracks</source>
         <translation>Combinar Tracks</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="175"/>
+        <location filename="../gis/CGisListWks.cpp" line="182"/>
         <source>Edit Area Points</source>
         <translation>Editar Puntos del Área</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="123"/>
-        <location filename="../gis/CGisListWks.cpp" line="144"/>
+        <location filename="../gis/CGisListWks.cpp" line="130"/>
+        <location filename="../gis/CGisListWks.cpp" line="151"/>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="780"/>
+        <location filename="../gis/CGisListWks.cpp" line="769"/>
         <source>Saving workspace. Please wait.</source>
         <translation>Guardando espacio de trabajo. Por favor espere.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="826"/>
+        <location filename="../gis/CGisListWks.cpp" line="815"/>
         <source>Loading workspace. Please wait.</source>
         <translation>Cargando espacio de trabajo. Por favor espere.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1143"/>
+        <location filename="../gis/CGisListWks.cpp" line="1149"/>
         <source>Close all projects...</source>
         <translation>Cerrar todos los proyectos...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1143"/>
+        <location filename="../gis/CGisListWks.cpp" line="1149"/>
         <source>This will remove all projects from the workspace.</source>
         <translation>Esto quitará.todos los proyectos.del espacio de trabajo.</translation>
     </message>
@@ -1849,27 +1901,27 @@ línea %2, columna %3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="258"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="264"/>
         <source>File exists ...</source>
         <translation type="unfinished">El archivo ya existe ...</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="259"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="265"/>
         <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains GPX data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file.  Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
         <translation type="unfinished">El archivo ya existe y no lo ha creado QMapShack. Si pulsa 'sí' todos los datos de este archivo se perderán. Incluso si el archivo contiene datos GPX y QMapShack lo ha leído, QMapShack podría no ser capaz de leer y almacenar todos los elementos en el archivo, y aquellos que no haya leído se perderán. Se le recomienda usar otro archivo distinto. <b>¿Quiere realmente sobrescribir el archivo</b></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="367"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="380"/>
         <source>Failed to create file '%1'</source>
         <translation type="unfinished">Fallo al crear el archivo '%1'</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="377"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="390"/>
         <source>Failed to write file '%1'</source>
         <translation type="unfinished">Fallo al escribir en el archivo '%1'</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="395"/>
         <source>Saving GIS data failed...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2051,11 +2103,21 @@ línea %2, columna %3.
         <source>Select file to load</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1061"/>
+        <source>Fatal...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1062"/>
+        <source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your ditribution to fix it.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CMapDraw</name>
     <message>
-        <location filename="../map/CMapDraw.cpp" line="406"/>
+        <location filename="../map/CMapDraw.cpp" line="420"/>
         <source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack. 
 
 If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is  [...]
@@ -2695,17 +2757,17 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
 <context>
     <name>CMapList</name>
     <message>
-        <location filename="../map/CMapList.cpp" line="208"/>
+        <location filename="../map/CMapList.cpp" line="202"/>
         <source>Deactivate</source>
         <translation>Desactivar</translation>
     </message>
     <message>
-        <location filename="../map/CMapList.cpp" line="208"/>
+        <location filename="../map/CMapList.cpp" line="202"/>
         <source>Activate</source>
         <translation>Activar</translation>
     </message>
     <message>
-        <location filename="../map/CMapList.cpp" line="233"/>
+        <location filename="../map/CMapList.cpp" line="227"/>
         <source>Where do you want to store maps?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2830,7 +2892,7 @@ línea %2, columna %3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../map/CMapTMS.cpp" line="304"/>
+        <location filename="../map/CMapTMS.cpp" line="299"/>
         <source><b>%1</b>: %2 tiles pending<br/></source>
         <translation><b>%1</b>: %2 teselas pendientes<br/></translation>
     </message>
@@ -3111,22 +3173,22 @@ Estructura desconocida.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="98"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="104"/>
         <source>%1 waypoints<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="97"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="99"/>
         <source>%1 tracks<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="99"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="109"/>
         <source>%1 routes<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="100"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="114"/>
         <source>%1 areas<br/></source>
         <translation type="unfinished"></translation>
     </message>
@@ -3482,7 +3544,7 @@ no es una definición de sistema de coordenadas válido:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qlgt/CQmsDb.cpp" line="163"/>
+        <location filename="../qlgt/CQmsDb.cpp" line="164"/>
         <source>%1: drop item with QLGT DB ID %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3840,13 +3902,13 @@ no es una definición de sistema de coordenadas válido:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="344"/>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="431"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="338"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="425"/>
         <source>Calculate route with %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="352"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="346"/>
         <source><br/>Calculation time: %1s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3964,6 +4026,14 @@ no es una definición de sistema de coordenadas válido:
     </message>
 </context>
 <context>
+    <name>CSearchDatabase</name>
+    <message>
+        <location filename="../gis/db/CSearchDatabase.cpp" line="38"/>
+        <source>Search database '%1':</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CSearchGoogle</name>
     <message>
         <location filename="../gis/search/CSearchGoogle.cpp" line="118"/>
@@ -4113,10 +4183,15 @@ línea %2, columna %3.
 <context>
     <name>CTextEditWidget</name>
     <message>
-        <location filename="../widgets/CTextEditWidget.cpp" line="73"/>
+        <location filename="../widgets/CTextEditWidget.cpp" line="70"/>
         <source>&Color...</source>
         <translation>&Color...</translation>
     </message>
+    <message>
+        <location filename="../widgets/CTextEditWidget.cpp" line="113"/>
+        <source>Reset format</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CTwoNavProject</name>
@@ -4127,20 +4202,20 @@ línea %2, columna %3.
         <location filename="../gis/tnv/serialization.cpp" line="617"/>
         <location filename="../gis/tnv/serialization.cpp" line="645"/>
         <location filename="../gis/tnv/serialization.cpp" line="719"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="87"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="191"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
         <source>Error...</source>
         <translation type="unfinished">Error...</translation>
     </message>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="560"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="87"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="191"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
         <source>Failed to open %1.</source>
         <translation type="unfinished">Fallo al abrir %1.</translation>
     </message>
     <message>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="159"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="160"/>
         <source>Save GIS data to...</source>
         <translation type="unfinished">Guardar los datos GIS en...</translation>
     </message>
@@ -4477,7 +4552,7 @@ If you want to keep just one half you can simply remove the points, or check thi
     <name>IDB</name>
     <message>
         <location filename="../gis/db/IDB.cpp" line="60"/>
-        <source>The internal database format of '%1'' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
+        <source>The internal database format of '%1' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4486,28 +4561,48 @@ If you want to keep just one half you can simply remove the points, or check thi
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="74"/>
+        <location filename="../gis/db/IDB.cpp" line="69"/>
+        <source>Migration aborted by user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="75"/>
         <source>Failed to migrate '%1'.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="76"/>
-        <location filename="../gis/db/IDB.cpp" line="100"/>
+        <location filename="../gis/db/IDB.cpp" line="77"/>
+        <location filename="../gis/db/IDB.cpp" line="106"/>
         <source>Error...</source>
         <translation type="unfinished">Error...</translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="85"/>
-        <source>The database version of '%1'' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
+        <location filename="../gis/db/IDB.cpp" line="81"/>
+        <source>Migration failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="88"/>
+        <source>The database version of '%1' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="110"/>
+        <source>Initialization failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="91"/>
         <source>Wrong database version...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="98"/>
+        <location filename="../gis/db/IDB.cpp" line="95"/>
+        <source>Database created by newer version of QMapShack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="104"/>
         <source>Failed to initialize '%1'.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4515,15 +4610,38 @@ If you want to keep just one half you can simply remove the points, or check thi
 <context>
     <name>IDBMysql</name>
     <message>
-        <location filename="../gis/db/IDBMysql.cpp" line="54"/>
+        <location filename="../gis/db/IDBMysql.cpp" line="60"/>
         <source>Password...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/IDBMysql.cpp" line="54"/>
+        <location filename="../gis/db/IDBMysql.cpp" line="60"/>
         <source>Password for database '%1':</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gis/db/IDBMysql.cpp" line="222"/>
+        <source>Update to database version 5. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IDBSqlite</name>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="306"/>
+        <source>Update to database version 3. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="375"/>
+        <source>Update to database version 5. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="449"/>
+        <source>Update to database version 6. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IDemPathSetup</name>
@@ -4825,14 +4943,14 @@ If you want to keep just one half you can simply remove the points, or check thi
         <translation type="obsolete">Mantener orden del proyecto</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="115"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="110"/>
         <source>Print diary</source>
         <translation>Imprimir diario</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="94"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="118"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="138"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="89"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="113"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="133"/>
         <source>...</source>
         <translation>...</translation>
     </message>
@@ -4843,21 +4961,16 @@ If you want to keep just one half you can simply remove the points, or check thi
     </message>
     <message>
         <location filename="../gis/prj/IDetailsPrj.ui" line="76"/>
-        <source>Sort by time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
         <source>Sort along track (multiple)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="86"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
         <source>Sort along track (single)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="135"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="130"/>
         <source>Rebuild diary.</source>
         <translation>Recargar diario.</translation>
     </message>
@@ -4979,7 +5092,7 @@ If you want to keep just one half you can simply remove the points, or check thi
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1498"/>
         <source>Speed</source>
         <translation>Velocidad</translation>
     </message>
@@ -5076,52 +5189,62 @@ If you want to keep just one half you can simply remove the points, or check thi
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1375"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1357"/>
+        <source>Set Track Activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1364"/>
+        <source>Remove Track Activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1403"/>
         <source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1402"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1430"/>
         <source>Points</source>
         <translation>Puntos</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1478"/>
         <source>Time</source>
         <translation>Tiempo</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1483"/>
         <source>Ele.</source>
         <translation>Altitud</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1488"/>
         <source>Delta</source>
         <translation>Delta</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1493"/>
         <source>Dist.</source>
         <translation>Distancia</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1503"/>
         <source>Slope</source>
         <translation>Pendiente</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1508"/>
         <source>Ascend</source>
         <translation>Ascenso</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1513"/>
         <source>Descend</source>
         <translation>Descenso</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1518"/>
         <source>Position</source>
         <translation>Posición</translation>
     </message>
@@ -5136,12 +5259,12 @@ If you want to keep just one half you can simply remove the points, or check thi
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1499"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1527"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1536"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1564"/>
         <source>Hist.</source>
         <translation>Historial</translation>
     </message>
@@ -5227,7 +5350,7 @@ If you want to keep just one half you can simply remove the points, or check thi
 <context>
     <name>IDevice</name>
     <message>
-        <location filename="../device/IDevice.cpp" line="287"/>
+        <location filename="../device/IDevice.cpp" line="292"/>
         <source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5597,87 +5720,87 @@ If you want to keep just one half you can simply remove the points, or check thi
 <context>
     <name>IGisItem</name>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="43"/>
+        <location filename="../gis/IGisItem.cpp" line="44"/>
         <source>[no name]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="315"/>
+        <location filename="../gis/IGisItem.cpp" line="316"/>
         <source>The item is not part of the project in the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="316"/>
+        <location filename="../gis/IGisItem.cpp" line="317"/>
         <source>
 It is either a new item or it has been deleted in the database by someone else.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="322"/>
+        <location filename="../gis/IGisItem.cpp" line="323"/>
         <source>The item is not in the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="328"/>
+        <location filename="../gis/IGisItem.cpp" line="329"/>
         <source>The item might need to be saved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="412"/>
+        <location filename="../gis/IGisItem.cpp" line="413"/>
         <source>Initial version.</source>
         <translation type="unfinished">Versión inicial</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="520"/>
+        <location filename="../gis/IGisItem.cpp" line="521"/>
         <source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="521"/>
+        <location filename="../gis/IGisItem.cpp" line="522"/>
         <source>Read Only Mode...</source>
         <translation type="unfinished">Modo Sólo Lectura...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="685"/>
-        <location filename="../gis/IGisItem.cpp" line="744"/>
+        <location filename="../gis/IGisItem.cpp" line="692"/>
+        <location filename="../gis/IGisItem.cpp" line="745"/>
         <source><h4>Description:</h4></source>
         <translation type="unfinished"><h4>Descripción:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="688"/>
-        <location filename="../gis/IGisItem.cpp" line="747"/>
+        <location filename="../gis/IGisItem.cpp" line="695"/>
+        <location filename="../gis/IGisItem.cpp" line="748"/>
         <source><p>--- no description ---</p></source>
         <translation type="unfinished"><p>---sin descripción---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="699"/>
+        <location filename="../gis/IGisItem.cpp" line="706"/>
         <source><h4>Comment:</h4></source>
         <translation type="unfinished"><h4>Comentario:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="702"/>
+        <location filename="../gis/IGisItem.cpp" line="709"/>
         <source><p>--- no comment ---</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="713"/>
-        <location filename="../gis/IGisItem.cpp" line="758"/>
+        <location filename="../gis/IGisItem.cpp" line="720"/>
+        <location filename="../gis/IGisItem.cpp" line="759"/>
         <source><h4>Links:</h4></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="716"/>
-        <location filename="../gis/IGisItem.cpp" line="761"/>
+        <location filename="../gis/IGisItem.cpp" line="723"/>
+        <location filename="../gis/IGisItem.cpp" line="762"/>
         <source><p>--- no links ---</p></source>
         <translation type="unfinished"><p>--- sin links ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="843"/>
+        <location filename="../gis/IGisItem.cpp" line="838"/>
         <source>Edit name...</source>
         <translation type="unfinished">Editar nombre...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="843"/>
+        <location filename="../gis/IGisItem.cpp" line="838"/>
         <source>Enter new %1 name.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5695,58 +5818,58 @@ It is either a new item or it has been deleted in the database by someone else.<
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="258"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="271"/>
         <source>%1: Correlate tracks and waypoints.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="268"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="281"/>
         <source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="269"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="282"/>
         <source>Canceled correlation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="309"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="327"/>
         <source>Save "%1" to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="420"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="437"/>
         <source><br/>
 Filename: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="425"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="442"/>
         <source>Waypoints: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="429"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="446"/>
         <source>Tracks: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="433"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="450"/>
         <source>Routes: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="437"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="454"/>
         <source>Areas: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="557"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="574"/>
         <source>Are you sure you want to delete '%1' from project '%2'?</source>
         <translation type="unfinished">¿Desea realmente eleiminar '%1' del proyecto '%2'?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="558"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="575"/>
         <source>Delete...</source>
         <translation type="unfinished">Borrar...</translation>
     </message>
@@ -6471,62 +6594,62 @@ I don't want to read the documentation!</source>
         <translation type="obsolete">Esto sustituirá todos los datos del original con una simple línea de coordenadas. Todos los demás datos se perderán definitivamente.</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="264"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="256"/>
         <source><b>New Line</b><br/>Move the mouse and use the left mouse button to drop points. When done use the right mouse button to stop.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="314"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="306"/>
         <source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="323"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="315"/>
         <source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="324"/>
         <source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="341"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="333"/>
         <source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it.  Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="350"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="342"/>
         <source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="356"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="348"/>
         <source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="361"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="353"/>
         <source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="525"/>
         <source><b>%1 Metrics</b></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="536"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="528"/>
         <source>Distance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="538"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="530"/>
         <source>Ascend:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="540"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="532"/>
         <source>Descend:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6568,12 +6691,12 @@ I don't want to read the documentation!</source>
         <translation type="unfinished">Añadir Waypoint</translation>
     </message>
     <message>
-        <location filename="../plot/IPlot.cpp" line="647"/>
+        <location filename="../plot/IPlot.cpp" line="648"/>
         <source>No or bad data.</source>
         <translation>Datos incorrectos o inexistentes.</translation>
     </message>
     <message>
-        <location filename="../plot/IPlot.cpp" line="1244"/>
+        <location filename="../plot/IPlot.cpp" line="1245"/>
         <source>Select output file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7503,23 +7626,39 @@ o
     </message>
 </context>
 <context>
-    <name>ISelDevices</name>
+    <name>ISearchDatabase</name>
     <message>
-        <location filename="../gis/ISelDevices.ui" line="14"/>
-        <source>Select devices...</source>
+        <location filename="../gis/db/ISearchDatabase.ui" line="14"/>
+        <source>Search...</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ISelectActivity</name>
     <message>
-        <location filename="../gis/trk/ISelectActivity.ui" line="14"/>
-        <source>Activities...</source>
+        <location filename="../gis/db/ISearchDatabase.ui" line="34"/>
+        <source>Type the word you want to search for and press the search button. 
+If you enter 'word' a search with an exact match is done. If you enter 'word*', 'word' has to be at the beginning of a string.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/ISelectActivity.ui" line="20"/>
-        <source>Select one:</source>
+        <location filename="../gis/db/ISearchDatabase.ui" line="51"/>
+        <source>Name</source>
+        <translation type="unfinished">Nombre</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="79"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="86"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
+    </message>
+</context>
+<context>
+    <name>ISelDevices</name>
+    <message>
+        <location filename="../gis/ISelDevices.ui" line="14"/>
+        <source>Select devices...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7919,142 +8058,301 @@ o
         <translation>Editar texto...</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="25"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="38"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="51"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="64"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="77"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="97"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="110"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="123"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="136"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="169"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="182"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="195"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="208"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="256"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="25"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="331"/>
         <source>Undo</source>
         <translation>Deshacer</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="259"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="334"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="268"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="38"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="343"/>
         <source>Redo</source>
         <translation>Rehacer</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="271"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="346"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="51"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="355"/>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="283"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="358"/>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="292"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="64"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="367"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="370"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="304"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="77"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="375"/>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="307"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="100"/>
+        <source>A:L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="113"/>
+        <source>A:C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="126"/>
+        <source>A:R</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="139"/>
+        <source>A:B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="172"/>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="185"/>
+        <source>I</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="198"/>
+        <source>U</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="218"/>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="265"/>
+        <source>Standard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="270"/>
+        <source>Bullet List (Disc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="275"/>
+        <source>Bullet List (Circle)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+        <source>Bullet List (Square)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="285"/>
+        <source>Ordered List (Decimal)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="290"/>
+        <source>Ordered List (Alpha lower)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+        <source>Ordered List (Alpha upper)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="300"/>
+        <source>Ordered List (Roman lower)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="305"/>
+        <source>Ordered List (Roman upper)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="378"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="319"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="390"/>
         <source>Align Left</source>
         <translation>Alinear a la Izquierda</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="322"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="393"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="334"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="405"/>
         <source>Align Right</source>
         <translation>Alinear a la Derecha</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="337"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="408"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="349"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="420"/>
         <source>Align Center</source>
         <translation>Alinear al Centro</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="352"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="423"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="364"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="435"/>
         <source>Align Block</source>
         <translation>Alinear Bloque</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="367"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="438"/>
         <source>Ctrl+J</source>
         <translation>Ctrl+J</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="379"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="450"/>
         <source>Underline</source>
         <translation>Subrayar</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="382"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="453"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="394"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="465"/>
         <source>Bold</source>
         <translation>Negrita</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="397"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="468"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="409"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="480"/>
         <source>Italic</source>
         <translation>Cursiva</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="412"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="483"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="495"/>
+        <source>Plain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="498"/>
+        <source>Reset the text's format before pasting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="503"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="506"/>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="509"/>
+        <source>Ctrl+A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="514"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="517"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="522"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="525"/>
+        <source>Reset Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="530"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="533"/>
+        <source>Reset Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="545"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="548"/>
+        <source>Paste without resetting the text's format</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ITextEditWidgetSelMenu</name>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="55"/>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="68"/>
+        <source>I</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="81"/>
+        <source>U</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="101"/>
+        <source>Cut</source>
+        <translation type="unfinished">Cortar</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="114"/>
+        <source>Copy</source>
+        <translation type="unfinished">Copiar</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="127"/>
+        <source>Paste</source>
+        <translation type="unfinished">Pegar</translation>
+    </message>
 </context>
 <context>
     <name>ITimeZoneSetup</name>
diff --git a/src/locale/qmapshack_fr.ts b/src/locale/qmapshack_fr.ts
index bca52b4..dafe4f3 100644
--- a/src/locale/qmapshack_fr.ts
+++ b/src/locale/qmapshack_fr.ts
@@ -17,105 +17,97 @@
 <context>
     <name>CActivityTrk</name>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="29"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="117"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="39"/>
         <source>Foot</source>
         <translation type="unfinished">à pied</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="37"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="118"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="47"/>
         <source>Bicycle</source>
         <translation type="unfinished">Vélo</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="45"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="119"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="55"/>
         <source>Motor Bike</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="53"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="120"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="63"/>
         <source>Car</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="61"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="121"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="71"/>
         <source>Cable Car</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="69"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="122"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="79"/>
         <source>Swim</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="77"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="87"/>
         <source>Ship</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="85"/>
-        <source>Aeronautik</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="93"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="125"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="103"/>
         <source>Ski/Winter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="124"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="95"/>
         <source>Aeronautics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="261"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="305"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="262"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="304"/>
         <source>Distance:</source>
         <translation type="unfinished">Distance:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="263"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="327"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="264"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="315"/>
         <source>Ascend:</source>
         <translation type="unfinished">Dénivelé positif:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="265"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="349"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="266"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="326"/>
         <source>Descend:</source>
         <translation type="unfinished">Dénivelé négatif:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="267"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="371"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="268"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="337"/>
         <source>Speed Moving:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="269"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="393"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="270"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
         <source>Speed Total:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="271"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="415"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="272"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="359"/>
         <source>Time Moving:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="273"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="437"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="274"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="370"/>
         <source>Time Total:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="410"/>
+        <source>None</source>
+        <translation type="unfinished">Aucune</translation>
+    </message>
 </context>
 <context>
     <name>CCanvas</name>
@@ -125,7 +117,7 @@
         <translation>Vue %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="674"/>
+        <location filename="../canvas/CCanvas.cpp" line="670"/>
         <source>Setup Map Background</source>
         <translation type="unfinished"></translation>
     </message>
@@ -208,28 +200,28 @@
 <context>
     <name>CDBFolderMysql</name>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="32"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="33"/>
         <source>All your data grouped by folders.</source>
         <translation type="unfinished">Vos données groupées par dossiers.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="52"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="53"/>
         <source>MySQL Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="55"/>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="59"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="56"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="60"/>
         <source>Server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="64"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="65"/>
         <source> (No PW)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="72"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="73"/>
         <source>Error: </source>
         <translation type="unfinished">Erreur: </translation>
     </message>
@@ -237,35 +229,40 @@
 <context>
     <name>CDBFolderSqlite</name>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="28"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="30"/>
         <source>All your data grouped by folders.</source>
         <translation type="unfinished">Vos données groupées par dossiers.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="46"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="52"/>
         <source>SQLite Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="56"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="62"/>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="66"/>
+        <source>Error: </source>
+        <translation type="unfinished">Erreur: </translation>
+    </message>
 </context>
 <context>
     <name>CDBItem</name>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="87"/>
+        <location filename="../gis/db/CDBItem.cpp" line="91"/>
         <source>%1 min.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="91"/>
+        <location filename="../gis/db/CDBItem.cpp" line="95"/>
         <source>%1 h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="95"/>
+        <location filename="../gis/db/CDBItem.cpp" line="99"/>
         <source>%1 days</source>
         <translation type="unfinished"></translation>
     </message>
@@ -273,66 +270,66 @@
 <context>
     <name>CDBProject</name>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="219"/>
+        <location filename="../gis/db/CDBProject.cpp" line="223"/>
         <source>The item %1 has been changed by %2 (%3). 
 
 To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="225"/>
+        <location filename="../gis/db/CDBProject.cpp" line="229"/>
         <source>Conflict with database...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="226"/>
+        <location filename="../gis/db/CDBProject.cpp" line="230"/>
         <source>Clone && Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="227"/>
+        <location filename="../gis/db/CDBProject.cpp" line="231"/>
         <source>Force Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="228"/>
+        <location filename="../gis/db/CDBProject.cpp" line="232"/>
         <source>Take remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="531"/>
+        <location filename="../gis/db/CDBProject.cpp" line="514"/>
         <source>Missing folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="532"/>
+        <location filename="../gis/db/CDBProject.cpp" line="515"/>
         <source>Failed to save project. The folder has been deleted in the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="539"/>
+        <location filename="../gis/db/CDBProject.cpp" line="522"/>
         <source>Save ...</source>
         <translation type="unfinished">Enregistrer...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="602"/>
+        <location filename="../gis/db/CDBProject.cpp" line="585"/>
         <source>Error</source>
         <translation type="unfinished">Erreur</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="602"/>
+        <location filename="../gis/db/CDBProject.cpp" line="585"/>
         <source>There was an unexpected database error:
 
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="727"/>
+        <location filename="../gis/db/CDBProject.cpp" line="700"/>
         <source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="728"/>
+        <location filename="../gis/db/CDBProject.cpp" line="701"/>
         <source>Save changes?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -340,12 +337,12 @@ To solve this conflict you can create and save a clone, force your version or dr
 <context>
     <name>CDemList</name>
     <message>
-        <location filename="../dem/CDemList.cpp" line="202"/>
+        <location filename="../dem/CDemList.cpp" line="195"/>
         <source>Deactivate</source>
         <translation>Désactiver</translation>
     </message>
     <message>
-        <location filename="../dem/CDemList.cpp" line="202"/>
+        <location filename="../dem/CDemList.cpp" line="195"/>
         <source>Activate</source>
         <translation>Activer</translation>
     </message>
@@ -440,13 +437,13 @@ To solve this conflict you can create and save a clone, force your version or dr
 <context>
     <name>CDetailsPrj</name>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="270"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="791"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="265"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="775"/>
         <source>none</source>
         <translation>aucun</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="343"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="338"/>
         <source>Build diary...</source>
         <translation>Créer le journal...</translation>
     </message>
@@ -455,80 +452,80 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Annuler</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="446"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="435"/>
         <source><h2>Waypoints</h2></source>
         <translation><h2>Waypoints</h2></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="479"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="608"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="726"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="442"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="468"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="710"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="740"/>
         <source>Info</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="454"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="480"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="609"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="727"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="757"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="443"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="469"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="593"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="711"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="741"/>
         <source>Comment</source>
         <translation>Commentaire</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="472"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="461"/>
         <source><h2>Tracks</h2></source>
         <translation><h2>Traces</h2></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>From Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>To Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>To End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="630"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="614"/>
         <source>distance: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="640"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="624"/>
         <source>ascent: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="650"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="634"/>
         <source>descend: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="719"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="703"/>
         <source><h2>Areas</h2></source>
         <translation><h2>Surfaces</h2></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="126"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
         <source>You want to sort waypoints along a track, but you switched off track and waypoint correlation. Do you want to switch it on again?</source>
         <translation>Vous voulez trier des waypoints le long d'une trace, mais vous avez désactivé la corrélation des traces et waypoints. Voulez-vous la réactiver ?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="128"/>
         <source>Correlation...</source>
         <translation>Corrélation en cours...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="398"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="393"/>
         <source><b>Summary over all tracks in project</b><br/></source>
         <translation>Résumé de toutes les traces du projet</translation>
     </message>
@@ -545,34 +542,34 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="vanished">descente : %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="749"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
         <source><h2>Routes</h2></source>
         <translation><h2>Routes</h2></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="761"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="788"/>
         <source>Edit name...</source>
         <translation>Éditer le nom...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="761"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="788"/>
         <source>Enter new project name.</source>
         <translation>Entrez le nom du nouveau projet.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="770"/>
         <source>Edit keywords...</source>
         <translation>Éditer les mots-clés...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="770"/>
         <source>Enter keywords.</source>
         <translation>Saisir les mots-clés.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="935"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="916"/>
         <source>Print Diary</source>
         <translation>Imprimer le journal</translation>
     </message>
@@ -603,37 +600,37 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Couleur unie</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="181"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="166"/>
         <source>Reduce visible track points</source>
         <translation>Réduire les points visibles de la trace</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="184"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
         <source>Change elevation of track points</source>
         <translation>Modifier l'altitude des points de la trace</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="187"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
         <source>Change timestamp of track points</source>
         <translation>Modifier l'horodatage des points de la trace</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="190"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
         <source>Modify track points' extensions</source>
         <translation>Modifier les extensions des points de la trace</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="193"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
         <source>Cut track into pieces</source>
         <translation>Découper la trace</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="426"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="399"/>
         <source>Color</source>
         <translation>Couleur</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="427"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="400"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -646,19 +643,18 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Entrez le nom de la nouvelle trace.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="629"/>
         <source>Reset activities...</source>
         <translation>Réinitialiser les activités...</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="629"/>
         <source>This will remove all activities from the track. Proceed?</source>
         <translation>Toutes les activités seront supprimées de la trace. Etes-vous sûr ?</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="657"/>
         <source>None</source>
-        <translation>Aucune</translation>
+        <translation type="vanished">Aucune</translation>
     </message>
 </context>
 <context>
@@ -764,7 +760,7 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/fit/CFitProject.cpp" line="91"/>
+        <location filename="../gis/fit/CFitProject.cpp" line="93"/>
         <source>Failed to open FIT file %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -829,52 +825,52 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished">_Clone</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="385"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="391"/>
         <source>Area: %1%2</source>
         <translation type="unfinished">Surface: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="447"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="451"/>
         <source>Changed area shape.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="455"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="459"/>
         <source>Changed name.</source>
         <translation type="unfinished">Nom modifié...</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="461"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="465"/>
         <source>Changed border width.</source>
         <translation type="unfinished">Largeur de la bordure modifiée...</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="467"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="471"/>
         <source>Changed fill pattern.</source>
         <translation type="unfinished">Remplissage modifié...</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="473"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="477"/>
         <source>Changed opacity.</source>
         <translation type="unfinished">Opacité modifiée...</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="479"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="483"/>
         <source>Changed comment.</source>
         <translation type="unfinished">Commentaire modifié...</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="485"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="489"/>
         <source>Changed description.</source>
         <translation type="unfinished">Description modifiée...</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="491"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="495"/>
         <source>Changed links</source>
         <translation type="unfinished">Liens modifiés...</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="502"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="506"/>
         <source>Changed color</source>
         <translation type="unfinished">Couleur modifiée...</translation>
     </message>
@@ -887,73 +883,73 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished">_Clone</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="283"/>
         <source>track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="310"/>
         <source>Changed name.</source>
         <translation type="unfinished">Nom modifié...</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="316"/>
         <source>Changed comment</source>
         <translation type="unfinished">Commentaire modifié</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="322"/>
         <source>Changed description</source>
         <translation type="unfinished">Description modifiée</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="328"/>
         <source>Changed links</source>
         <translation type="unfinished">Liens modifiés...</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="346"/>
         <source>Length: %1 %2</source>
         <translation type="unfinished">Longueur: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="350"/>
         <source>Length: -</source>
         <translation type="unfinished">Longueur: -</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="559"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="357"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="595"/>
         <source>Time: %1 %2</source>
         <translation type="unfinished">Durée: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="361"/>
         <source>Time: -</source>
         <translation type="unfinished">Heure : -</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="371"/>
         <source>%1%2 %3, %4%5 %6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="377"/>
         <source>Last time routed:<br/>%1</source>
         <translation type="unfinished">Date du dernier calcul d'itinéraire : <br/>%1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="379"/>
         <source>with %1</source>
         <translation type="unfinished">avec %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="561"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="597"/>
         <source>Distance: %1 %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="675"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="712"/>
         <source>Changed route points.</source>
         <translation type="unfinished">Points de route modifiés.</translation>
     </message>
@@ -992,22 +988,22 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished">Impossible de lire les données.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="118"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="117"/>
         <source>_Clone</source>
         <translation type="unfinished">_Clone</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="290"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="289"/>
         <source>Changed trackpoints, sacrificed all previous data.</source>
         <translation type="unfinished">Points de la trace modifiés, Les données antérieures sont perdues.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="394"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
         <source>Length: %1 %2</source>
         <translation type="unfinished">Longueur: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="401"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="400"/>
         <source>, %1%2 %3, %4%5 %6</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1024,121 +1020,126 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Déplacement: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="434"/>
         <source>Start: %1</source>
         <translation type="unfinished">Début: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="438"/>
         <source>Start: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="445"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="444"/>
         <source>End: %1</source>
         <translation type="unfinished">Fin: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="449"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="448"/>
         <source>End: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="452"/>
         <source>Points: %1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="457"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="456"/>
         <source>Invalid elevations!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="461"/>
         <source>Invalid timestamps!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="467"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="466"/>
         <source>Invalid positions!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="475"/>
+        <source>Activities: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
         <source>Index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="562"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="590"/>
         <source>Index: visible %1, total %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="601"/>
         <source>Ele.: %1 %2</source>
         <translation type="unfinished">Altitude: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
         <source> slope: %1%3 (%2%)</source>
         <translation type="unfinished"> Pente: %1%3(%2%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
         <source> speed: %1%2</source>
         <translation type="unfinished"> Vitesse: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
         <source>... and %1 tags not displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
         <source>Descend: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="649"/>
         <source>Distance: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="622"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="650"/>
         <source>Moving: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="627"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="655"/>
         <source>Ascend: %1%2 (%3%)</source>
         <translation type="unfinished">Montée: %1%2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1317"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1330"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1390"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1434"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1599"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1345"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1418"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1462"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1627"/>
         <source>track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1535"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1563"/>
         <source>Hide point %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1539"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1567"/>
         <source>Hide points %1..%2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="619"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="647"/>
         <source>Ascend: - (-)</source>
         <translation type="unfinished">Montées: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
         <source> Descend: %1%2 (%3%)</source>
         <translation type="unfinished">  Descente: %1%2 (%3%)</translation>
     </message>
@@ -1155,7 +1156,7 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Dist.: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="645"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="673"/>
         <source> Moving: %1%2 (%3%)</source>
         <translation type="unfinished">  En mouvement: %1%2 (%3%)</translation>
     </message>
@@ -1164,28 +1165,28 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">En mouvement: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="695"/>
         <source>Ascend: %1%2</source>
         <translation type="unfinished">Montée : %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="672"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="700"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="712"/>
         <source>, %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
         <source>Ascend: -</source>
         <translation type="unfinished">Montée : -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="707"/>
         <source> Descend: %1%2</source>
         <translation type="unfinished">Descente : %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="690"/>
         <source>Descend: -</source>
         <translation type="unfinished">Descente : -</translation>
     </message>
@@ -1194,7 +1195,7 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Dist.: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="694"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="722"/>
         <source> Time: %1%2</source>
         <translation type="unfinished"> Temps : %1%2</translation>
     </message>
@@ -1207,42 +1208,42 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Entrez le nom de la nouvelle trace.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="405"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="404"/>
         <source>, %1-, %2-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="413"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="412"/>
         <source>Time: %1, Speed: %2 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="417"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="416"/>
         <source>Time: -, Speed: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="424"/>
         <source>Moving: %1, Speed: %2 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="429"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="428"/>
         <source>Moving: -, Speed: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
         <source>Distance: %1%2 (%3%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="717"/>
         <source>Distance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1380"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1408"/>
         <source>Permanently removed points %1..%2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1251,42 +1252,42 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Cacher des points.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1579"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1607"/>
         <source>Show points.</source>
         <translation type="unfinished">Afficher les points.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2142"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
         <source>Changed name</source>
         <translation type="unfinished">Nom modifié</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2148"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
         <source>Changed comment</source>
         <translation type="unfinished">Commentaire modifié</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2166"/>
         <source>Changed description</source>
         <translation type="unfinished">Description modifiée</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2172"/>
         <source>Changed links</source>
         <translation type="unfinished">Liens modifiés...</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2171"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2183"/>
         <source>Changed elevation of point %1 to %2 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2198"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2212"/>
         <source>Changed activity to '%1' for complete track.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2256"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2262"/>
         <source>Changed activity to '%1' for range(%2..%3).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1384,62 +1385,62 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="unfinished">_Clone</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="267"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="272"/>
         <source>Elevation: %1 %2</source>
         <translation type="unfinished">Altitude: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="278"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="283"/>
         <source>Proximity: %1 %2</source>
         <translation type="unfinished">Proximité: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="352"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="355"/>
         <source>Changed name</source>
         <translation type="unfinished">Nom modifié</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="362"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="365"/>
         <source>Changed position</source>
         <translation type="unfinished">Position modifiée</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="371"/>
         <source>Changed elevation</source>
         <translation type="unfinished">Altitude modifiée</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="377"/>
         <source>Changed proximity</source>
         <translation type="unfinished">Rayon de proximité modifié</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="388"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="391"/>
         <source>Changed icon</source>
         <translation type="unfinished">Icône modifié</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="397"/>
         <source>Changed comment</source>
         <translation type="unfinished">Commentaire modifié</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="403"/>
         <source>Changed description</source>
         <translation type="unfinished">Description modifiée</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="409"/>
         <source>Changed links</source>
         <translation type="unfinished">Liens modifiés...</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="415"/>
         <source>Changed images</source>
         <translation type="unfinished">Images modifiées</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="421"/>
         <source>Add image</source>
         <translation type="unfinished">Ajouter une image</translation>
     </message>
@@ -1447,68 +1448,113 @@ To solve this conflict you can create and save a clone, force your version or dr
 <context>
     <name>CGisListDB</name>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="81"/>
+        <location filename="../gis/CGisListDB.cpp" line="83"/>
         <source>Due to changes in the database system QMapShack forgot about the filename of your database '%1'. You have to select it again in the next step.</source>
         <translation>A cause d'évolutions de la gestion des bases de données, QMapShack doit de nouveau connaître l'emplacement de votre base de données. '%1'.  Indiquez-le à l'étape suivante.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="82"/>
+        <location filename="../gis/CGisListDB.cpp" line="84"/>
         <source>Select database file.</source>
         <translation>Sélectionnez un fichier de base de données</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="115"/>
+        <location filename="../gis/CGisListDB.cpp" line="117"/>
         <source>Add Database</source>
         <translation>Ajouter une base de données</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="118"/>
+        <location filename="../gis/CGisListDB.cpp" line="120"/>
         <source>Add Folder</source>
         <translation>Ajouter un dossier</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="119"/>
+        <location filename="../gis/CGisListDB.cpp" line="121"/>
+        <source>Rename Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="122"/>
+        <source>Copy Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="123"/>
+        <source>Move Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="124"/>
         <source>Delete Folder</source>
         <translation>Supprimer le dossier</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="122"/>
-        <location filename="../gis/CGisListDB.cpp" line="133"/>
+        <location filename="../gis/CGisListDB.cpp" line="127"/>
+        <location filename="../gis/CGisListDB.cpp" line="139"/>
         <source>Delete Item</source>
         <translation>Supprimer un élément</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="126"/>
+        <location filename="../gis/CGisListDB.cpp" line="131"/>
+        <source>Search Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="132"/>
         <source>Sync. with Database</source>
         <translation>Synchroniser avec la base de données</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="127"/>
+        <location filename="../gis/CGisListDB.cpp" line="133"/>
         <source>Remove Database</source>
         <translation>Enlever la base de données</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="130"/>
+        <location filename="../gis/CGisListDB.cpp" line="136"/>
         <source>Empty</source>
         <translation>Vider</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="418"/>
+        <location filename="../gis/CGisListDB.cpp" line="432"/>
         <source>Remove database...</source>
         <translation>Enlever la base de données</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="418"/>
+        <location filename="../gis/CGisListDB.cpp" line="432"/>
         <source>Do you really want to remove '%1' from the list?</source>
         <translation>Voulez-vous vraiment supprimere '%1' de la liste ?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="611"/>
+        <location filename="../gis/CGisListDB.cpp" line="496"/>
+        <source>Are you sure you want to delete selected folders and all subfolders from the database?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="664"/>
+        <source>Bad operation....</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="664"/>
+        <source>The target folder is a subfolder of the one to move. This will not work.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="723"/>
+        <source>Folder name...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="723"/>
+        <source>Rename folder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="852"/>
         <source>Are you sure you want to delete '%1' from folder '%2'?</source>
         <translation type="unfinished">Êtes-vous sûr de vouloir supprimer %1 du dossier %2?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="612"/>
+        <location filename="../gis/CGisListDB.cpp" line="853"/>
         <source>Delete...</source>
         <translation type="unfinished">Supprimer...</translation>
     </message>
@@ -1517,28 +1563,27 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Êtes-vous sûr de vouloir enlever '%1' de la liste ?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="476"/>
+        <location filename="../gis/CGisListDB.cpp" line="496"/>
         <source>Delete database folder...</source>
         <translation>Supprimer la base de données...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="476"/>
         <source>Are you sure you want to delete "%1" from the database?</source>
-        <translation>Êtes-vous sûr de vouloir enlever '%1' de la liste ?</translation>
+        <translation type="vanished">Êtes-vous sûr de vouloir enlever '%1' de la liste ?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="503"/>
-        <location filename="../gis/CGisListDB.cpp" line="524"/>
+        <location filename="../gis/CGisListDB.cpp" line="744"/>
+        <location filename="../gis/CGisListDB.cpp" line="765"/>
         <source>Remove items...</source>
         <translation>Supprimer les éléments...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="503"/>
+        <location filename="../gis/CGisListDB.cpp" line="744"/>
         <source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
         <translation>Êtes-vous sûr de vouloir supprimer tous les éléments dans Perdu & Trouvé ? Les éléments seront supprimés définitivement.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="524"/>
+        <location filename="../gis/CGisListDB.cpp" line="765"/>
         <source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
         <translation>Êtes-vous sûr de vouloir supprimer les éléments sélectionnés dans Perdu & Trouvé ? Les éléments seront supprimés définitivement.</translation>
     </message>
@@ -1551,22 +1596,32 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation>Éditer..</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="99"/>
+        <location filename="../gis/CGisListWks.cpp" line="100"/>
         <source>Show on Map</source>
         <translation>Afficher sur la carte</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="100"/>
+        <location filename="../gis/CGisListWks.cpp" line="101"/>
         <source>Hide from Map</source>
         <translation>Masquer</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="104"/>
+        <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <source>Sort by Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="108"/>
+        <source>Sort by Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="112"/>
         <source>Save As...</source>
         <translation>Enregistrer sous...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="103"/>
+        <location filename="../gis/CGisListWks.cpp" line="111"/>
         <source>Save</source>
         <translation>Enregistrer</translation>
     </message>
@@ -1575,148 +1630,149 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Mettre à jour le projet sur tous les appareils</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <location filename="../gis/CGisListWks.cpp" line="115"/>
         <source>Send to Devices</source>
         <translation>Envoyer vers les appareils</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="108"/>
+        <location filename="../gis/CGisListWks.cpp" line="116"/>
         <source>Sync. with Database</source>
         <translation>Synchroniser avec la base de données</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="111"/>
+        <location filename="../gis/CGisListWks.cpp" line="119"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="121"/>
+        <location filename="../gis/CGisListWks.cpp" line="128"/>
         <source>Update Project on Device</source>
         <translation>Mettre à jour le projet sur l'appareil</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="123"/>
-        <location filename="../gis/CGisListWks.cpp" line="144"/>
+        <location filename="../gis/CGisListWks.cpp" line="130"/>
+        <location filename="../gis/CGisListWks.cpp" line="151"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="134"/>
+        <location filename="../gis/CGisListWks.cpp" line="141"/>
         <source>Edit...</source>
         <translation>Éditer...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="135"/>
+        <location filename="../gis/CGisListWks.cpp" line="99"/>
+        <location filename="../gis/CGisListWks.cpp" line="142"/>
         <source>Copy to...</source>
         <translation>Copier vers...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="137"/>
+        <location filename="../gis/CGisListWks.cpp" line="144"/>
         <source>Track Profile</source>
         <translation>Profile de la trace</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="139"/>
+        <location filename="../gis/CGisListWks.cpp" line="146"/>
         <source>Select Range</source>
         <translation>Sélectionner des points</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="140"/>
+        <location filename="../gis/CGisListWks.cpp" line="147"/>
         <source>Edit Track Points</source>
         <translation>Éditer les points de la trace</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="141"/>
+        <location filename="../gis/CGisListWks.cpp" line="148"/>
         <source>Reverse Track</source>
         <translation>Inverser la trace</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="142"/>
+        <location filename="../gis/CGisListWks.cpp" line="149"/>
         <source>Combine Tracks</source>
         <translation>Joindre des traces</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="150"/>
+        <location filename="../gis/CGisListWks.cpp" line="157"/>
         <source>Show Bubble</source>
         <translation>Afficher la bulle</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="152"/>
+        <location filename="../gis/CGisListWks.cpp" line="159"/>
         <source>Move Waypoint</source>
         <translation>Déplacer le waypoint</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="153"/>
+        <location filename="../gis/CGisListWks.cpp" line="160"/>
         <source>Proj. Waypoint...</source>
         <translation>Projection du waypoint...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="161"/>
+        <location filename="../gis/CGisListWks.cpp" line="168"/>
         <source>Route Instructions</source>
         <translation>Instructions de guidage</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="163"/>
+        <location filename="../gis/CGisListWks.cpp" line="170"/>
         <source>Calculate Route</source>
         <translation>Calculer l'itinéraire</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="164"/>
+        <location filename="../gis/CGisListWks.cpp" line="171"/>
         <source>Reset Route</source>
         <translation>Réinitialiser la route</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="165"/>
+        <location filename="../gis/CGisListWks.cpp" line="172"/>
         <source>Edit Route</source>
         <translation>Éditer la route</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="166"/>
+        <location filename="../gis/CGisListWks.cpp" line="173"/>
         <source>Convert to Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="175"/>
+        <location filename="../gis/CGisListWks.cpp" line="182"/>
         <source>Edit Area Points</source>
         <translation>Éditer les points de la surface</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="182"/>
+        <location filename="../gis/CGisListWks.cpp" line="189"/>
         <source>Create Route</source>
         <translation>Créer une route</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="626"/>
+        <location filename="../gis/CGisListWks.cpp" line="618"/>
         <source>Drop items...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="780"/>
+        <location filename="../gis/CGisListWks.cpp" line="769"/>
         <source>Saving workspace. Please wait.</source>
         <translation>Sauvegarde de l'espace de travail. Patientez.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="826"/>
+        <location filename="../gis/CGisListWks.cpp" line="815"/>
         <source>Loading workspace. Please wait.</source>
         <translation>Chargement de l'espace de travail. Patientez.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1143"/>
+        <location filename="../gis/CGisListWks.cpp" line="1149"/>
         <source>Close all projects...</source>
         <translation>Fermer tous les projets...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1143"/>
+        <location filename="../gis/CGisListWks.cpp" line="1149"/>
         <source>This will remove all projects from the workspace.</source>
         <translation>Ceci enlevera tous les projets de l'espace de travail.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1166"/>
+        <location filename="../gis/CGisListWks.cpp" line="1172"/>
         <source>Delete project...</source>
         <translation type="unfinished">Supprimer le projet</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1166"/>
+        <location filename="../gis/CGisListWks.cpp" line="1172"/>
         <source>Do you really want to delete %1?</source>
         <translation type="unfinished">Êtes-vous sûr de vouloir supprimer %1?</translation>
     </message>
@@ -1725,9 +1781,9 @@ To solve this conflict you can create and save a clone, force your version or dr
         <translation type="obsolete">Copier les éléments...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="651"/>
-        <location filename="../gis/CGisListWks.cpp" line="1593"/>
-        <location filename="../gis/CGisListWks.cpp" line="1631"/>
+        <location filename="../gis/CGisListWks.cpp" line="643"/>
+        <location filename="../gis/CGisListWks.cpp" line="1599"/>
+        <location filename="../gis/CGisListWks.cpp" line="1637"/>
         <source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
         <translation><b>Mise à jour des appareils</b><p>Mise à jour de %1<br/>Patientez...</p></translation>
     </message>
@@ -1818,27 +1874,27 @@ ligne %2, colonne %3:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="258"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="264"/>
         <source>File exists ...</source>
         <translation type="unfinished">Le fichier existe...</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="259"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="265"/>
         <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains GPX data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file.  Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
         <translation type="unfinished">Le fichier existe et n'a pas été créé par QMapShack. Si vous cliquez sur 'oui' tous les données de ce fichier seront perdues. Même si ce fichier contient des données GPX et sera ouvert par QMapShack certains éléments de ce fichier ne pourront pas être lus ou enregistrés. Ces élements seront perdus. Il est conseillé d'utiliser un autre fichier.<b>Voulez-vous vraiment écraser ce fichier ?</b> </translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="367"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="380"/>
         <source>Failed to create file '%1'</source>
         <translation type="unfinished">Impossible de créer le fichier: '%1'</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="377"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="390"/>
         <source>Failed to write file '%1'</source>
         <translation type="unfinished">Impossible d'écrire le fichier: '%1'</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="395"/>
         <source>Saving GIS data failed...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2016,11 +2072,21 @@ ligne %2, colonne %3:
         <source>Select file to load</source>
         <translation>Sélectionner le fichier à charger</translation>
     </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1061"/>
+        <source>Fatal...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1062"/>
+        <source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your ditribution to fix it.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CMapDraw</name>
     <message>
-        <location filename="../map/CMapDraw.cpp" line="406"/>
+        <location filename="../map/CMapDraw.cpp" line="420"/>
         <source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack. 
 
 If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is  [...]
@@ -2660,17 +2726,17 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
 <context>
     <name>CMapList</name>
     <message>
-        <location filename="../map/CMapList.cpp" line="208"/>
+        <location filename="../map/CMapList.cpp" line="202"/>
         <source>Deactivate</source>
         <translation>Désactiver</translation>
     </message>
     <message>
-        <location filename="../map/CMapList.cpp" line="208"/>
+        <location filename="../map/CMapList.cpp" line="202"/>
         <source>Activate</source>
         <translation>Activer</translation>
     </message>
     <message>
-        <location filename="../map/CMapList.cpp" line="233"/>
+        <location filename="../map/CMapList.cpp" line="227"/>
         <source>Where do you want to store maps?</source>
         <translation>Où voulez vous enregistrer les cartes ?</translation>
     </message>
@@ -2795,7 +2861,7 @@ ligne %2, colonne %3:
         <translation>L'affichage de cette carte nécessite l'utilisation d'OpenSSL. Par défaut OpenSSL n'est pas inclus dans QMapShack à cause de restriction légales dans certains pays. Vous pouvez consulter <a href='https://www.openssl.org/community/binaries.html'>la page d'accueil OpenSSL</a> pour trouver des fichiers binaires. Vous devez copier libeay32.dll et ssleay32.dll dans le répertoire programme de QMapShack.</translation>
     </message>
     <message>
-        <location filename="../map/CMapTMS.cpp" line="304"/>
+        <location filename="../map/CMapTMS.cpp" line="299"/>
         <source><b>%1</b>: %2 tiles pending<br/></source>
         <translation><b>%1</b>: %2 tuiles à charger<br/></translation>
     </message>
@@ -3088,22 +3154,22 @@ Structure inconnue.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="98"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="104"/>
         <source>%1 waypoints<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="97"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="99"/>
         <source>%1 tracks<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="99"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="109"/>
         <source>%1 routes<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="100"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="114"/>
         <source>%1 areas<br/></source>
         <translation type="unfinished"></translation>
     </message>
@@ -3443,7 +3509,7 @@ n'est pas une définition de système de coordonnées:
         <translation>Supprimer le fichier existant %1 ?</translation>
     </message>
     <message>
-        <location filename="../qlgt/CQmsDb.cpp" line="163"/>
+        <location filename="../qlgt/CQmsDb.cpp" line="164"/>
         <source>%1: drop item with QLGT DB ID %2</source>
         <translation>%1: poubellise l'élément avec l'identifiant QLGT DB %2</translation>
     </message>
@@ -3801,13 +3867,13 @@ n'est pas une définition de système de coordonnées:
         <translation>%1 : A cause de limitation de l'API POSIX Routino ne peut gérer de fichiers de plus de 4 Go</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="344"/>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="431"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="338"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="425"/>
         <source>Calculate route with %1</source>
         <translation>Calculer l'itinéraire avec %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="352"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="346"/>
         <source><br/>Calculation time: %1s</source>
         <translation><br/>Temps de calcul : %1s</translation>
     </message>
@@ -3925,6 +3991,14 @@ n'est pas une définition de système de coordonnées:
     </message>
 </context>
 <context>
+    <name>CSearchDatabase</name>
+    <message>
+        <location filename="../gis/db/CSearchDatabase.cpp" line="38"/>
+        <source>Search database '%1':</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CSearchGoogle</name>
     <message>
         <location filename="../gis/search/CSearchGoogle.cpp" line="118"/>
@@ -4059,10 +4133,15 @@ ligne %2, colonne %3:
 <context>
     <name>CTextEditWidget</name>
     <message>
-        <location filename="../widgets/CTextEditWidget.cpp" line="73"/>
+        <location filename="../widgets/CTextEditWidget.cpp" line="70"/>
         <source>&Color...</source>
         <translation>&Couleur...</translation>
     </message>
+    <message>
+        <location filename="../widgets/CTextEditWidget.cpp" line="113"/>
+        <source>Reset format</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CTwoNavProject</name>
@@ -4073,20 +4152,20 @@ ligne %2, colonne %3:
         <location filename="../gis/tnv/serialization.cpp" line="617"/>
         <location filename="../gis/tnv/serialization.cpp" line="645"/>
         <location filename="../gis/tnv/serialization.cpp" line="719"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="87"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="191"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
         <source>Error...</source>
         <translation type="unfinished">Erreur...</translation>
     </message>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="560"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="87"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="191"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
         <source>Failed to open %1.</source>
         <translation type="unfinished">Impossible d'ouvrir %1</translation>
     </message>
     <message>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="159"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="160"/>
         <source>Save GIS data to...</source>
         <translation type="unfinished">Enregistrer les données SIG dans...</translation>
     </message>
@@ -4424,7 +4503,7 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
     <name>IDB</name>
     <message>
         <location filename="../gis/db/IDB.cpp" line="60"/>
-        <source>The internal database format of '%1'' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
+        <source>The internal database format of '%1' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4433,28 +4512,48 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="74"/>
+        <location filename="../gis/db/IDB.cpp" line="69"/>
+        <source>Migration aborted by user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="75"/>
         <source>Failed to migrate '%1'.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="76"/>
-        <location filename="../gis/db/IDB.cpp" line="100"/>
+        <location filename="../gis/db/IDB.cpp" line="77"/>
+        <location filename="../gis/db/IDB.cpp" line="106"/>
         <source>Error...</source>
         <translation type="unfinished">Erreur...</translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="85"/>
-        <source>The database version of '%1'' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
+        <location filename="../gis/db/IDB.cpp" line="81"/>
+        <source>Migration failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="88"/>
+        <source>The database version of '%1' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="110"/>
+        <source>Initialization failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="91"/>
         <source>Wrong database version...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="98"/>
+        <location filename="../gis/db/IDB.cpp" line="95"/>
+        <source>Database created by newer version of QMapShack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="104"/>
         <source>Failed to initialize '%1'.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4462,15 +4561,38 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
 <context>
     <name>IDBMysql</name>
     <message>
-        <location filename="../gis/db/IDBMysql.cpp" line="54"/>
+        <location filename="../gis/db/IDBMysql.cpp" line="60"/>
         <source>Password...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/IDBMysql.cpp" line="54"/>
+        <location filename="../gis/db/IDBMysql.cpp" line="60"/>
         <source>Password for database '%1':</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gis/db/IDBMysql.cpp" line="222"/>
+        <source>Update to database version 5. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IDBSqlite</name>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="306"/>
+        <source>Update to database version 3. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="375"/>
+        <source>Update to database version 5. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="449"/>
+        <source>Update to database version 6. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IDemPathSetup</name>
@@ -4765,12 +4887,12 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="76"/>
         <source>Sort along track (multiple)</source>
         <translation>Trier le long de la trace (multiple)</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="86"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
         <source>Sort along track (single)</source>
         <translation>Trier le long de la trace (individuel)</translation>
     </message>
@@ -4783,14 +4905,14 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
         <translation type="obsolete">Conserver l'ordre du projet</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="115"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="110"/>
         <source>Print diary</source>
         <translation>Imprimer le journal</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="94"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="118"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="138"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="89"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="113"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="133"/>
         <source>...</source>
         <translation></translation>
     </message>
@@ -4800,12 +4922,11 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
         <translation>Garder l'ordre du projet</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="76"/>
         <source>Sort by time</source>
-        <translation>Trier par ordre chronolgique</translation>
+        <translation type="vanished">Trier par ordre chronolgique</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="135"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="130"/>
         <source>Rebuild diary.</source>
         <translation>Restaurer le journal...</translation>
     </message>
@@ -4893,7 +5014,7 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1498"/>
         <source>Speed</source>
         <translation>Vitesse</translation>
     </message>
@@ -5040,62 +5161,72 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1375"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1357"/>
+        <source>Set Track Activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1364"/>
+        <source>Remove Track Activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1403"/>
         <source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1402"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1430"/>
         <source>Points</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1478"/>
         <source>Time</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1483"/>
         <source>Ele.</source>
         <translation>Alt.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1488"/>
         <source>Delta</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1493"/>
         <source>Dist.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1503"/>
         <source>Slope</source>
         <translation>Pente</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1508"/>
         <source>Ascend</source>
         <translation>Montée</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1513"/>
         <source>Descend</source>
         <translation>Descente</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1518"/>
         <source>Position</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1499"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1527"/>
         <source>Filter</source>
         <translation>Filtre</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1536"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1564"/>
         <source>Hist.</source>
         <translation></translation>
     </message>
@@ -5181,7 +5312,7 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
 <context>
     <name>IDevice</name>
     <message>
-        <location filename="../device/IDevice.cpp" line="287"/>
+        <location filename="../device/IDevice.cpp" line="292"/>
         <source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
         <translation type="unfinished">Un autre projet du même nom existe déjà. Si vous confirmez, il sera supprimé et remplacé.</translation>
     </message>
@@ -5555,87 +5686,87 @@ Si vous voulez conserver seulement une moitié vous pouvez simplement enlever le
 <context>
     <name>IGisItem</name>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="43"/>
+        <location filename="../gis/IGisItem.cpp" line="44"/>
         <source>[no name]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="315"/>
+        <location filename="../gis/IGisItem.cpp" line="316"/>
         <source>The item is not part of the project in the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="316"/>
+        <location filename="../gis/IGisItem.cpp" line="317"/>
         <source>
 It is either a new item or it has been deleted in the database by someone else.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="322"/>
+        <location filename="../gis/IGisItem.cpp" line="323"/>
         <source>The item is not in the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="328"/>
+        <location filename="../gis/IGisItem.cpp" line="329"/>
         <source>The item might need to be saved</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="412"/>
+        <location filename="../gis/IGisItem.cpp" line="413"/>
         <source>Initial version.</source>
         <translation type="unfinished">Version initiale</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="520"/>
+        <location filename="../gis/IGisItem.cpp" line="521"/>
         <source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="521"/>
+        <location filename="../gis/IGisItem.cpp" line="522"/>
         <source>Read Only Mode...</source>
         <translation type="unfinished">Mode lecture seule</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="685"/>
-        <location filename="../gis/IGisItem.cpp" line="744"/>
+        <location filename="../gis/IGisItem.cpp" line="692"/>
+        <location filename="../gis/IGisItem.cpp" line="745"/>
         <source><h4>Description:</h4></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="688"/>
-        <location filename="../gis/IGisItem.cpp" line="747"/>
+        <location filename="../gis/IGisItem.cpp" line="695"/>
+        <location filename="../gis/IGisItem.cpp" line="748"/>
         <source><p>--- no description ---</p></source>
         <translation type="unfinished"><p>--- pas de description ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="699"/>
+        <location filename="../gis/IGisItem.cpp" line="706"/>
         <source><h4>Comment:</h4></source>
         <translation type="unfinished"><h4>Commentaire:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="702"/>
+        <location filename="../gis/IGisItem.cpp" line="709"/>
         <source><p>--- no comment ---</p></source>
         <translation type="unfinished"><p>--- pas de commentaire ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="713"/>
-        <location filename="../gis/IGisItem.cpp" line="758"/>
+        <location filename="../gis/IGisItem.cpp" line="720"/>
+        <location filename="../gis/IGisItem.cpp" line="759"/>
         <source><h4>Links:</h4></source>
         <translation type="unfinished"><h4>Liens:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="716"/>
-        <location filename="../gis/IGisItem.cpp" line="761"/>
+        <location filename="../gis/IGisItem.cpp" line="723"/>
+        <location filename="../gis/IGisItem.cpp" line="762"/>
         <source><p>--- no links ---</p></source>
         <translation type="unfinished"><p>--- pas de liens ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="843"/>
+        <location filename="../gis/IGisItem.cpp" line="838"/>
         <source>Edit name...</source>
         <translation type="unfinished">Éditer le nom...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="843"/>
+        <location filename="../gis/IGisItem.cpp" line="838"/>
         <source>Enter new %1 name.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5653,59 +5784,59 @@ It is either a new item or it has been deleted in the database by someone else.<
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="258"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="271"/>
         <source>%1: Correlate tracks and waypoints.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="268"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="281"/>
         <source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="269"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="282"/>
         <source>Canceled correlation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="309"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="327"/>
         <source>Save "%1" to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="420"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="437"/>
         <source><br/>
 Filename: %1</source>
         <translation type="unfinished"><br/>
 Nom de fichier: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="425"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="442"/>
         <source>Waypoints: %1</source>
         <translation type="unfinished">Waypoints: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="429"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="446"/>
         <source>Tracks: %1</source>
         <translation type="unfinished">Traces: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="433"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="450"/>
         <source>Routes: %1</source>
         <translation type="unfinished">Routes: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="437"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="454"/>
         <source>Areas: %1</source>
         <translation type="unfinished">Surfaces: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="557"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="574"/>
         <source>Are you sure you want to delete '%1' from project '%2'?</source>
         <translation type="unfinished">Êtes-vous sûr de vouloir supprimer %1 du projet '%2'?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="558"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="575"/>
         <source>Delete...</source>
         <translation type="unfinished">Supprimer...</translation>
     </message>
@@ -6420,62 +6551,62 @@ Je n'ai pas envie de lire la documentation !</translation>
         <translation type="obsolete">Ceci remplacera les données de l'original par une ligne simple de coordonnées. Toutes les autres données seront définitivement perdues.</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="264"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="256"/>
         <source><b>New Line</b><br/>Move the mouse and use the left mouse button to drop points. When done use the right mouse button to stop.<br/></source>
         <translation><b>Nouvelle ligne</b><br/>Déplacez la souris et utilisez le bouton gauche pour ajouter des points. Cliquez droit pour terminer.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="314"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="306"/>
         <source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
         <translation><b>Supprimer un point</b><br/>Approchez le pointeur du point et cliquez gauche pour le supprimer.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="323"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="315"/>
         <source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
         <translation><b>Sélectionner une série de points</b><br/> Pour commencer la sélection, cliquez gauche sur le premier point. Cliquez gauche sur le sur le deuxième point pour terminer la sélection et choisissez une option. Utilisez le bouton droit pour annuler.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="324"/>
         <source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Déplacer un point</b><br/>Approchez le pointeur près d'un point et cliquez gauche pour le coller au pointeur. Déplacez le point avec la souris. Déposez le point avec un clic gauche. Utilisez le bouton droit pour annuler.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="341"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="333"/>
         <source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it.  Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Ajouter un point</b><br/>Placez le pointeur de la souris près d'un segment de ligne et cliquez gauche pour ajouter un point. Le nouveau point va coller au pointeur et vous pouvez le déplacer. Déposez le point par un clic gauche. Utilisez le clic droit pour annuler.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="350"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="342"/>
         <source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
         <translation><b>Aucun calcul d'itinéraire</b><br/>Les points seront connectés par une ligne droite.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="356"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="348"/>
         <source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
         <translation><b>Calcul d'itinéraire automatique</b><br/>Les paramètres de calcul d'itinéraire actuels serviront pour calculer un tracé entre les points. <b>Remarque :</b>Le routeur sélectionné doit être capable de faire le calcul à la volée. Généralement, les routeurs hors ligne en sont capables, les routeurs en ligne ne le sont pas.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="361"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="353"/>
         <source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
         <translation><b>Calcul d'itinéraire vecteur</b><br/>Connecter les points avec une ligne basée sur une carte vecteur active, si possible.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="525"/>
         <source><b>%1 Metrics</b></source>
         <translation><b>%1 Mesures</b></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="536"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="528"/>
         <source>Distance:</source>
         <translation>Distance:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="538"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="530"/>
         <source>Ascend:</source>
         <translation>Dénivelé positif:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="540"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="532"/>
         <source>Descend:</source>
         <translation>Dénivelé négatif:</translation>
     </message>
@@ -6518,12 +6649,12 @@ Je n'ai pas envie de lire la documentation !</translation>
         <translation type="unfinished">Ajouter un waypoint</translation>
     </message>
     <message>
-        <location filename="../plot/IPlot.cpp" line="647"/>
+        <location filename="../plot/IPlot.cpp" line="648"/>
         <source>No or bad data.</source>
         <translation>Aucune donnée ou données invalides.</translation>
     </message>
     <message>
-        <location filename="../plot/IPlot.cpp" line="1244"/>
+        <location filename="../plot/IPlot.cpp" line="1245"/>
         <source>Select output file</source>
         <translation>Sélectionner le fichier de sortie</translation>
     </message>
@@ -7489,6 +7620,35 @@ or
     </message>
 </context>
 <context>
+    <name>ISearchDatabase</name>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="14"/>
+        <source>Search...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="34"/>
+        <source>Type the word you want to search for and press the search button. 
+If you enter 'word' a search with an exact match is done. If you enter 'word*', 'word' has to be at the beginning of a string.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="51"/>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="79"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="86"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
+    </message>
+</context>
+<context>
     <name>ISelDevices</name>
     <message>
         <location filename="../gis/ISelDevices.ui" line="14"/>
@@ -7499,14 +7659,12 @@ or
 <context>
     <name>ISelectActivity</name>
     <message>
-        <location filename="../gis/trk/ISelectActivity.ui" line="14"/>
         <source>Activities...</source>
-        <translation>Activités...</translation>
+        <translation type="vanished">Activités...</translation>
     </message>
     <message>
-        <location filename="../gis/trk/ISelectActivity.ui" line="20"/>
         <source>Select one:</source>
-        <translation>Faites une sélection :</translation>
+        <translation type="vanished">Faites une sélection :</translation>
     </message>
 </context>
 <context>
@@ -7872,141 +8030,296 @@ or
     </message>
     <message>
         <location filename="../widgets/ITextEditWidget.ui" line="25"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="38"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="51"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="64"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="77"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="97"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="110"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="123"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="136"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="169"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="182"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="195"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="208"/>
-        <source>...</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="256"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="331"/>
         <source>Undo</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="259"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="334"/>
         <source>Ctrl+Z</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="268"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="38"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="343"/>
         <source>Redo</source>
         <translation>Répéter</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="271"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="346"/>
         <source>Ctrl+Shift+Z</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="51"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="355"/>
         <source>Cut</source>
         <translation>Couper</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="283"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="358"/>
         <source>Ctrl+X</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="292"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="64"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="367"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="370"/>
         <source>Ctrl+C</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="304"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="77"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="375"/>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="307"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="100"/>
+        <source>A:L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="113"/>
+        <source>A:C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="126"/>
+        <source>A:R</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="139"/>
+        <source>A:B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="172"/>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="185"/>
+        <source>I</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="198"/>
+        <source>U</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="218"/>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="265"/>
+        <source>Standard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="270"/>
+        <source>Bullet List (Disc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="275"/>
+        <source>Bullet List (Circle)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+        <source>Bullet List (Square)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="285"/>
+        <source>Ordered List (Decimal)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="290"/>
+        <source>Ordered List (Alpha lower)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+        <source>Ordered List (Alpha upper)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="300"/>
+        <source>Ordered List (Roman lower)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="305"/>
+        <source>Ordered List (Roman upper)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="378"/>
         <source>Ctrl+V</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="319"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="390"/>
         <source>Align Left</source>
         <translation>Aligné à gauche</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="322"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="393"/>
         <source>Ctrl+L</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="334"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="405"/>
         <source>Align Right</source>
         <translation>Aligné à droite</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="337"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="408"/>
         <source>Ctrl+R</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="349"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="420"/>
         <source>Align Center</source>
         <translation>Centré</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="352"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="423"/>
         <source>Ctrl+E</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="364"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="435"/>
         <source>Align Block</source>
         <translation>Justifié</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="367"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="438"/>
         <source>Ctrl+J</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="379"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="450"/>
         <source>Underline</source>
         <translation>Soulignage</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="382"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="453"/>
         <source>Ctrl+U</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="394"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="465"/>
         <source>Bold</source>
         <translation>Gras</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="397"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="468"/>
         <source>Ctrl+B</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="409"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="480"/>
         <source>Italic</source>
         <translation>Italique</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="412"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="483"/>
         <source>Ctrl+I</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="495"/>
+        <source>Plain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="498"/>
+        <source>Reset the text's format before pasting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="503"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="506"/>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="509"/>
+        <source>Ctrl+A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="514"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="517"/>
+        <source>Delete</source>
+        <translation type="unfinished">Supprimer</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="522"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="525"/>
+        <source>Reset Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="530"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="533"/>
+        <source>Reset Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="545"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="548"/>
+        <source>Paste without resetting the text's format</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ITextEditWidgetSelMenu</name>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="55"/>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="68"/>
+        <source>I</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="81"/>
+        <source>U</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="101"/>
+        <source>Cut</source>
+        <translation type="unfinished">Couper</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="114"/>
+        <source>Copy</source>
+        <translation type="unfinished">Copier</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="127"/>
+        <source>Paste</source>
+        <translation type="unfinished">Coller</translation>
+    </message>
 </context>
 <context>
     <name>ITimeZoneSetup</name>
diff --git a/src/locale/qmapshack_nl.ts b/src/locale/qmapshack_nl.ts
index 8f510f8..bb0593c 100644
--- a/src/locale/qmapshack_nl.ts
+++ b/src/locale/qmapshack_nl.ts
@@ -17,105 +17,101 @@
 <context>
     <name>CActivityTrk</name>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="29"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="117"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="39"/>
         <source>Foot</source>
         <translation>Wandelen</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="37"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="118"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="47"/>
         <source>Bicycle</source>
         <translation>Fiets</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="45"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="119"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="55"/>
         <source>Motor Bike</source>
         <translation>Motorfiets</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="53"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="120"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="63"/>
         <source>Car</source>
         <translation>Auto</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="61"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="121"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="71"/>
         <source>Cable Car</source>
         <translation>Kabelbaan</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="69"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="122"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="79"/>
         <source>Swim</source>
         <translation>Zwemmen</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="77"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="123"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="87"/>
         <source>Ship</source>
         <translation>Boot</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="85"/>
         <source>Aeronautik</source>
-        <translation>Vliegen</translation>
+        <translation type="vanished">Vliegen</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="93"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="125"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="103"/>
         <source>Ski/Winter</source>
         <translation>Ski/Winter</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="124"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="95"/>
         <source>Aeronautics</source>
         <translation>Vliegtuig</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="261"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="305"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="262"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="304"/>
         <source>Distance:</source>
         <translation>Afstand:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="263"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="327"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="264"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="315"/>
         <source>Ascend:</source>
         <translation>Stijging:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="265"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="349"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="266"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="326"/>
         <source>Descend:</source>
         <translation>Daling:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="267"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="371"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="268"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="337"/>
         <source>Speed Moving:</source>
         <translation>Bewogen snelheid:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="269"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="393"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="270"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="348"/>
         <source>Speed Total:</source>
         <translation>Totale snelheid:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="271"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="415"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="272"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="359"/>
         <source>Time Moving:</source>
         <translation>Bewogen tijd:</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="273"/>
-        <location filename="../gis/trk/CActivityTrk.cpp" line="437"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="274"/>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="370"/>
         <source>Time Total:</source>
         <translation>Totale tijd:</translation>
     </message>
+    <message>
+        <location filename="../gis/trk/CActivityTrk.cpp" line="410"/>
+        <source>None</source>
+        <translation type="unfinished">Geen</translation>
+    </message>
 </context>
 <context>
     <name>CCanvas</name>
@@ -125,7 +121,7 @@
         <translation>Venster %1</translation>
     </message>
     <message>
-        <location filename="../canvas/CCanvas.cpp" line="674"/>
+        <location filename="../canvas/CCanvas.cpp" line="670"/>
         <source>Setup Map Background</source>
         <translation type="unfinished"></translation>
     </message>
@@ -204,28 +200,28 @@
 <context>
     <name>CDBFolderMysql</name>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="32"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="33"/>
         <source>All your data grouped by folders.</source>
         <translation>Alle gegevens gegroepeerd per map.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="52"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="53"/>
         <source>MySQL Database</source>
         <translation>MySQL Database</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="55"/>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="59"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="56"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="60"/>
         <source>Server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="64"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="65"/>
         <source> (No PW)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderMysql.cpp" line="72"/>
+        <location filename="../gis/db/CDBFolderMysql.cpp" line="73"/>
         <source>Error: </source>
         <translation>Fout: </translation>
     </message>
@@ -233,35 +229,40 @@
 <context>
     <name>CDBFolderSqlite</name>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="28"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="30"/>
         <source>All your data grouped by folders.</source>
         <translation>Alle gegevens gegroepeerd per map.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="46"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="52"/>
         <source>SQLite Database</source>
         <translation>SQLite Database</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBFolderSqlite.cpp" line="56"/>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="62"/>
         <source>File: </source>
         <translation>Bestand: </translation>
     </message>
+    <message>
+        <location filename="../gis/db/CDBFolderSqlite.cpp" line="66"/>
+        <source>Error: </source>
+        <translation type="unfinished">Fout: </translation>
+    </message>
 </context>
 <context>
     <name>CDBItem</name>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="87"/>
+        <location filename="../gis/db/CDBItem.cpp" line="91"/>
         <source>%1 min.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="91"/>
+        <location filename="../gis/db/CDBItem.cpp" line="95"/>
         <source>%1 h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBItem.cpp" line="95"/>
+        <location filename="../gis/db/CDBItem.cpp" line="99"/>
         <source>%1 days</source>
         <translation type="unfinished"></translation>
     </message>
@@ -269,7 +270,7 @@
 <context>
     <name>CDBProject</name>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="219"/>
+        <location filename="../gis/db/CDBProject.cpp" line="223"/>
         <source>The item %1 has been changed by %2 (%3). 
 
 To solve this conflict you can create and save a clone, force your version or drop your version and take the one from the database</source>
@@ -278,47 +279,47 @@ To solve this conflict you can create and save a clone, force your version or dr
 Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer huidige versie of verwijder deze versie en kies een ander uit de database</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="225"/>
+        <location filename="../gis/db/CDBProject.cpp" line="229"/>
         <source>Conflict with database...</source>
         <translation>Conflict met database...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="226"/>
+        <location filename="../gis/db/CDBProject.cpp" line="230"/>
         <source>Clone && Save</source>
         <translation>Kloon && Opslaan</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="227"/>
+        <location filename="../gis/db/CDBProject.cpp" line="231"/>
         <source>Force Save</source>
         <translation>Forceer opslaan</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="228"/>
+        <location filename="../gis/db/CDBProject.cpp" line="232"/>
         <source>Take remote</source>
         <translation>Neem huidige</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="531"/>
+        <location filename="../gis/db/CDBProject.cpp" line="514"/>
         <source>Missing folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="532"/>
+        <location filename="../gis/db/CDBProject.cpp" line="515"/>
         <source>Failed to save project. The folder has been deleted in the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="539"/>
+        <location filename="../gis/db/CDBProject.cpp" line="522"/>
         <source>Save ...</source>
         <translation>Opslaan...</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="602"/>
+        <location filename="../gis/db/CDBProject.cpp" line="585"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="602"/>
+        <location filename="../gis/db/CDBProject.cpp" line="585"/>
         <source>There was an unexpected database error:
 
 %1</source>
@@ -327,12 +328,12 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
 %1</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="727"/>
+        <location filename="../gis/db/CDBProject.cpp" line="700"/>
         <source>The project '%1' is about to update itself from the database. However there are changes not saved.</source>
         <translation>Het project '%1' zal geupdated worden met de database.Er zijn nog veranderingen niet opgeslagen.</translation>
     </message>
     <message>
-        <location filename="../gis/db/CDBProject.cpp" line="728"/>
+        <location filename="../gis/db/CDBProject.cpp" line="701"/>
         <source>Save changes?</source>
         <translation>Veranderingen opslaan?</translation>
     </message>
@@ -340,12 +341,12 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
 <context>
     <name>CDemList</name>
     <message>
-        <location filename="../dem/CDemList.cpp" line="202"/>
+        <location filename="../dem/CDemList.cpp" line="195"/>
         <source>Deactivate</source>
         <translation>Deactiveer</translation>
     </message>
     <message>
-        <location filename="../dem/CDemList.cpp" line="202"/>
+        <location filename="../dem/CDemList.cpp" line="195"/>
         <source>Activate</source>
         <translation>Activeer</translation>
     </message>
@@ -435,86 +436,86 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
 <context>
     <name>CDetailsPrj</name>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="126"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
         <source>You want to sort waypoints along a track, but you switched off track and waypoint correlation. Do you want to switch it on again?</source>
         <translation>Om wayponts van een track te sorteren dient de correlatie van track en waypoints ingeschakeld zijn.. Moet dit weer ingeschakeld worden?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="127"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="128"/>
         <source>Correlation...</source>
         <translation>Correlatie...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="270"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="791"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="265"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="775"/>
         <source>none</source>
         <translation>geen</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="343"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="338"/>
         <source>Build diary...</source>
         <translation>Dagboek maken...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="398"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="393"/>
         <source><b>Summary over all tracks in project</b><br/></source>
         <translation><b>Overzicht van alle tracks in project</b><br/></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="446"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="435"/>
         <source><h2>Waypoints</h2></source>
         <translation><h2>Waypoints</h2></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="453"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="479"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="608"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="726"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="756"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="442"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="468"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="592"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="710"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="740"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="454"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="480"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="609"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="727"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="757"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="443"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="469"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="593"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="711"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="741"/>
         <source>Comment</source>
         <translation>Notitie</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="472"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="461"/>
         <source><h2>Tracks</h2></source>
         <translation><h2>Tracks</h2></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>From Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>To Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="627"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="611"/>
         <source>To End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="630"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="614"/>
         <source>distance: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="640"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="624"/>
         <source>ascent: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="650"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="634"/>
         <source>descend: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -531,39 +532,39 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation type="vanished">daling: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="719"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="703"/>
         <source><h2>Areas</h2></source>
         <translation><h2>Gebieden</h2></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="749"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="733"/>
         <source><h2>Routes</h2></source>
         <translation><h2>Routes</h2></translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="761"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="788"/>
         <source>Edit name...</source>
         <translation>Bewerk naam...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="777"/>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="804"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="761"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="788"/>
         <source>Enter new project name.</source>
         <translation>Geef  project een nieuwe naam.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="770"/>
         <source>Edit keywords...</source>
         <translation>Bewerkt sleutelwoorden...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="786"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="770"/>
         <source>Enter keywords.</source>
         <translation>Geef sleutelwoorden.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/CDetailsPrj.cpp" line="935"/>
+        <location filename="../gis/prj/CDetailsPrj.cpp" line="916"/>
         <source>Print Diary</source>
         <translation>Dagboek afdrukken</translation>
     </message>
@@ -602,27 +603,27 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation type="obsolete">Vaste kleur</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="181"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="166"/>
         <source>Reduce visible track points</source>
         <translation>Reduceer zichtbare trackpunten</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="184"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="169"/>
         <source>Change elevation of track points</source>
         <translation>Verander hoogte van trackpunten</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="187"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="172"/>
         <source>Change timestamp of track points</source>
         <translation>Verander tijdstempels van trackpunten</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="190"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="175"/>
         <source>Modify track points' extensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="193"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="178"/>
         <source>Cut track into pieces</source>
         <translation>Knip track in delen</translation>
     </message>
@@ -631,12 +632,12 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation type="vanished">%1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="426"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="399"/>
         <source>Color</source>
         <translation>Kleur</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="427"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="400"/>
         <source>Activity</source>
         <translation>Activiteit</translation>
     </message>
@@ -649,19 +650,18 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation type="obsolete">Geef track nieuwe naam.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="629"/>
         <source>Reset activities...</source>
         <translation>Herstel activiteiten...</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="651"/>
+        <location filename="../gis/trk/CDetailsTrk.cpp" line="629"/>
         <source>This will remove all activities from the track. Proceed?</source>
         <translation>Dit zal alle activiteiten uit de track verwijderen. Doorgaan?</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CDetailsTrk.cpp" line="657"/>
         <source>None</source>
-        <translation>Geen</translation>
+        <translation type="vanished">Geen</translation>
     </message>
 </context>
 <context>
@@ -767,7 +767,7 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation>Kan bestand %1 niet laden...</translation>
     </message>
     <message>
-        <location filename="../gis/fit/CFitProject.cpp" line="91"/>
+        <location filename="../gis/fit/CFitProject.cpp" line="93"/>
         <source>Failed to open FIT file %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -832,52 +832,52 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation>_Kloon</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="385"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="391"/>
         <source>Area: %1%2</source>
         <translation>Gebied: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="447"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="451"/>
         <source>Changed area shape.</source>
         <translation>Vorm gebied aangepast.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="455"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="459"/>
         <source>Changed name.</source>
         <translation>Naam aangepast.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="461"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="465"/>
         <source>Changed border width.</source>
         <translation>Lijndikte aangepast.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="467"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="471"/>
         <source>Changed fill pattern.</source>
         <translation>Opvulling aangepast.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="473"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="477"/>
         <source>Changed opacity.</source>
         <translation>Transparantie aangepast.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="479"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="483"/>
         <source>Changed comment.</source>
         <translation>Notitie aangepast.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="485"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="489"/>
         <source>Changed description.</source>
         <translation>Beschrijving aangepast.</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="491"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="495"/>
         <source>Changed links</source>
         <translation>Link aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="502"/>
+        <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="506"/>
         <source>Changed color</source>
         <translation>Kleur aangepast</translation>
     </message>
@@ -890,73 +890,73 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation>_Kloon</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="284"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="283"/>
         <source>track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="311"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="310"/>
         <source>Changed name.</source>
         <translation>Naam aangepast.</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="317"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="316"/>
         <source>Changed comment</source>
         <translation>Notitie aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="323"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="322"/>
         <source>Changed description</source>
         <translation>Beschrijving aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="329"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="328"/>
         <source>Changed links</source>
         <translation>Link aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="347"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="346"/>
         <source>Length: %1 %2</source>
         <translation>Lengte: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="351"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="350"/>
         <source>Length: -</source>
         <translation>Lengte: -</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="358"/>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="559"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="357"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="595"/>
         <source>Time: %1 %2</source>
         <translation>Tijd: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="362"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="361"/>
         <source>Time: -</source>
         <translation>Tijd: -</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="372"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="371"/>
         <source>%1%2 %3, %4%5 %6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="378"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="377"/>
         <source>Last time routed:<br/>%1</source>
         <translation>Laatste routeberekening:<br/>%1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="380"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="379"/>
         <source>with %1</source>
         <translation>met %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="561"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="597"/>
         <source>Distance: %1 %2</source>
         <translation>Afstand: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/rte/CGisItemRte.cpp" line="675"/>
+        <location filename="../gis/rte/CGisItemRte.cpp" line="712"/>
         <source>Changed route points.</source>
         <translation>Routepunten aangepast.</translation>
     </message>
@@ -995,22 +995,22 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation>Lezen gegevens mislukt.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="118"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="117"/>
         <source>_Clone</source>
         <translation>_Kloon</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="290"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="289"/>
         <source>Changed trackpoints, sacrificed all previous data.</source>
         <translation>Trackpunten aangepast, vorige gegevens overschreven.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="394"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="393"/>
         <source>Length: %1 %2</source>
         <translation>Lengte: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="401"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="400"/>
         <source>, %1%2 %3, %4%5 %6</source>
         <translation>, %1%2 %3, %4%5 %6</translation>
     </message>
@@ -1027,121 +1027,126 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation type="obsolete">Beweging: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="435"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="434"/>
         <source>Start: %1</source>
         <translation>Start: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="439"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="438"/>
         <source>Start: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="445"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="444"/>
         <source>End: %1</source>
         <translation>Einde: %1</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="449"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="448"/>
         <source>End: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="453"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="452"/>
         <source>Points: %1 (%2)</source>
         <translation>Punten: %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="457"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="456"/>
         <source>Invalid elevations!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="462"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="461"/>
         <source>Invalid timestamps!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="467"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="466"/>
         <source>Invalid positions!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="558"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="475"/>
+        <source>Activities: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="586"/>
         <source>Index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="562"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="590"/>
         <source>Index: visible %1, total %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="573"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="601"/>
         <source>Ele.: %1 %2</source>
         <translation>Hoogte.: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="576"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
         <source> slope: %1%3 (%2%)</source>
         <translation> helling: %1%3 (%2%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="581"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
         <source> speed: %1%2</source>
         <translation> snelheid: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="609"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
         <source>... and %1 tags not displayed</source>
         <translation>... en %1 tags niet getoont</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="620"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="648"/>
         <source>Descend: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="621"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="649"/>
         <source>Distance: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="622"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="650"/>
         <source>Moving: - (-)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="627"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="655"/>
         <source>Ascend: %1%2 (%3%)</source>
         <translation>Stijging: %1%2 (%3%)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1317"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1330"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1390"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1434"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1599"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1345"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1358"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1418"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1462"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1627"/>
         <source>track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1535"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1563"/>
         <source>Hide point %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1539"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1567"/>
         <source>Hide points %1..%2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="619"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="647"/>
         <source>Ascend: - (-)</source>
         <translation>Stijging: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="633"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
         <source> Descend: %1%2 (%3%)</source>
         <translation> Daling: %1%2 (%3%)</translation>
     </message>
@@ -1158,7 +1163,7 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation type="obsolete">Afstand.: - (-)</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="645"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="673"/>
         <source> Moving: %1%2 (%3%)</source>
         <translation> Beweging: %1%2 (%3%)</translation>
     </message>
@@ -1167,28 +1172,28 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation type="obsolete"> Beweging: - (-) </translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="695"/>
         <source>Ascend: %1%2</source>
         <translation>Stijging: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="672"/>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="700"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="712"/>
         <source>, %1%2</source>
         <translation>, %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
         <source>Ascend: -</source>
         <translation>Stijging: -</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="679"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="707"/>
         <source> Descend: %1%2</source>
         <translation> Daling: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="662"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="690"/>
         <source>Descend: -</source>
         <translation>Daling: -</translation>
     </message>
@@ -1197,7 +1202,7 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation type="obsolete">Afstand.: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="694"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="722"/>
         <source> Time: %1%2</source>
         <translation> Tijd: %1%2</translation>
     </message>
@@ -1210,42 +1215,42 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation type="vanished">Geef track nieuwe naam.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="405"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="404"/>
         <source>, %1-, %2-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="413"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="412"/>
         <source>Time: %1, Speed: %2 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="417"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="416"/>
         <source>Time: -, Speed: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="425"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="424"/>
         <source>Moving: %1, Speed: %2 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="429"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="428"/>
         <source>Moving: -, Speed: -</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="639"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="667"/>
         <source>Distance: %1%2 (%3%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="717"/>
         <source>Distance: %1%2</source>
         <translation type="unfinished">Afstand: %1%2</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1380"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1408"/>
         <source>Permanently removed points %1..%2</source>
         <translation>Permanent verwijderde punten %1..%2</translation>
     </message>
@@ -1254,42 +1259,42 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation type="obsolete">Verberg punten.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="1579"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="1607"/>
         <source>Show points.</source>
         <translation>Toon punten.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2142"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
         <source>Changed name</source>
         <translation>Naam aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2148"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
         <source>Changed comment</source>
         <translation>Notitie aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2154"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2166"/>
         <source>Changed description</source>
         <translation>Beschrijving aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2160"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2172"/>
         <source>Changed links</source>
         <translation>Link aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2171"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2183"/>
         <source>Changed elevation of point %1 to %2 %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2198"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2212"/>
         <source>Changed activity to '%1' for complete track.</source>
         <translation>Activiteit aangepast naar '%1' voor gehele track.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/CGisItemTrk.cpp" line="2256"/>
+        <location filename="../gis/trk/CGisItemTrk.cpp" line="2262"/>
         <source>Changed activity to '%1' for range(%2..%3).</source>
         <translation>Activiteit aangepast naar '%1' voor bereik(%2..%3).</translation>
     </message>
@@ -1391,62 +1396,62 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation>_Kloon</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="267"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="272"/>
         <source>Elevation: %1 %2</source>
         <translation>Hoogte: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="278"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="283"/>
         <source>Proximity: %1 %2</source>
         <translation>Nabijheid: %1 %2</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="352"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="355"/>
         <source>Changed name</source>
         <translation>Naam aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="362"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="365"/>
         <source>Changed position</source>
         <translation>Positie aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="368"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="371"/>
         <source>Changed elevation</source>
         <translation>Hoogte aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="374"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="377"/>
         <source>Changed proximity</source>
         <translation>Nabijheid aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="388"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="391"/>
         <source>Changed icon</source>
         <translation>Pictogram aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="394"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="397"/>
         <source>Changed comment</source>
         <translation>Notitie aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="400"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="403"/>
         <source>Changed description</source>
         <translation>Beschrijving aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="406"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="409"/>
         <source>Changed links</source>
         <translation>Link aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="412"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="415"/>
         <source>Changed images</source>
         <translation>Afbeelding aangepast</translation>
     </message>
     <message>
-        <location filename="../gis/wpt/CGisItemWpt.cpp" line="418"/>
+        <location filename="../gis/wpt/CGisItemWpt.cpp" line="421"/>
         <source>Add image</source>
         <translation>Afbeelding toevoegen</translation>
     </message>
@@ -1454,94 +1459,138 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
 <context>
     <name>CGisListDB</name>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="81"/>
+        <location filename="../gis/CGisListDB.cpp" line="83"/>
         <source>Due to changes in the database system QMapShack forgot about the filename of your database '%1'. You have to select it again in the next step.</source>
         <translation>Door  een aanpassing in het database systeem is QMapShack de bestandnaam van database ''%1' vergeten. Selecteer dit weer in de volgende stap.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="82"/>
+        <location filename="../gis/CGisListDB.cpp" line="84"/>
         <source>Select database file.</source>
         <translation>Selecteer database bestand.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="115"/>
+        <location filename="../gis/CGisListDB.cpp" line="117"/>
         <source>Add Database</source>
         <translation>Database toevoegen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="118"/>
+        <location filename="../gis/CGisListDB.cpp" line="120"/>
         <source>Add Folder</source>
         <translation>Map toevoegen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="119"/>
+        <location filename="../gis/CGisListDB.cpp" line="121"/>
+        <source>Rename Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="122"/>
+        <source>Copy Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="123"/>
+        <source>Move Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="124"/>
         <source>Delete Folder</source>
         <translation>Map verwijderen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="122"/>
-        <location filename="../gis/CGisListDB.cpp" line="133"/>
+        <location filename="../gis/CGisListDB.cpp" line="127"/>
+        <location filename="../gis/CGisListDB.cpp" line="139"/>
         <source>Delete Item</source>
         <translation>Element verwijderen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="126"/>
+        <location filename="../gis/CGisListDB.cpp" line="131"/>
+        <source>Search Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="132"/>
         <source>Sync. with Database</source>
         <translation>Syngroniseren met database</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="127"/>
+        <location filename="../gis/CGisListDB.cpp" line="133"/>
         <source>Remove Database</source>
         <translation>Database verwijderen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="130"/>
+        <location filename="../gis/CGisListDB.cpp" line="136"/>
         <source>Empty</source>
         <translation>Leeg</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="418"/>
+        <location filename="../gis/CGisListDB.cpp" line="432"/>
         <source>Remove database...</source>
         <translation>Database verwijderen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="418"/>
+        <location filename="../gis/CGisListDB.cpp" line="432"/>
         <source>Do you really want to remove '%1' from the list?</source>
         <translation>Moet '%1' werkelijk uit de lijst verwijderd worden?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="476"/>
+        <location filename="../gis/CGisListDB.cpp" line="496"/>
         <source>Delete database folder...</source>
         <translation>Verwijder database map...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="476"/>
+        <location filename="../gis/CGisListDB.cpp" line="496"/>
+        <source>Are you sure you want to delete selected folders and all subfolders from the database?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="664"/>
+        <source>Bad operation....</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="664"/>
+        <source>The target folder is a subfolder of the one to move. This will not work.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="723"/>
+        <source>Folder name...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListDB.cpp" line="723"/>
+        <source>Rename folder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Are you sure you want to delete "%1" from the database?</source>
-        <translation>Moet "%1" werkelijk uit de database verwijderd worden?</translation>
+        <translation type="vanished">Moet "%1" werkelijk uit de database verwijderd worden?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="503"/>
-        <location filename="../gis/CGisListDB.cpp" line="524"/>
+        <location filename="../gis/CGisListDB.cpp" line="744"/>
+        <location filename="../gis/CGisListDB.cpp" line="765"/>
         <source>Remove items...</source>
         <translation>Elementen verwijderen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="503"/>
+        <location filename="../gis/CGisListDB.cpp" line="744"/>
         <source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
         <translation>Moeten alle elementen worden verwijderd uit Verloren & Gevonden? Dit zal pemanent zijn.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="524"/>
+        <location filename="../gis/CGisListDB.cpp" line="765"/>
         <source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
         <translation>Moeten alle geselecteerde elementen worden verwijderd uit Verloren & Gevonden? Dit zal pemanent zijn.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="611"/>
+        <location filename="../gis/CGisListDB.cpp" line="852"/>
         <source>Are you sure you want to delete '%1' from folder '%2'?</source>
         <translation>Moet '%1' uit map '%2' verwijderd worden?</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListDB.cpp" line="612"/>
+        <location filename="../gis/CGisListDB.cpp" line="853"/>
         <source>Delete...</source>
         <translation>Verwijderen...</translation>
     </message>
@@ -1554,175 +1603,186 @@ Om dit conflict op te lossen kan een kloon gemaakt en opgelagen worden, forceer
         <translation>Bewerken..</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="99"/>
+        <location filename="../gis/CGisListWks.cpp" line="100"/>
         <source>Show on Map</source>
         <translation>Toon op kaart</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="100"/>
+        <location filename="../gis/CGisListWks.cpp" line="101"/>
         <source>Hide from Map</source>
         <translation>Toon niet op kaart</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="103"/>
+        <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <source>Sort by Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="108"/>
+        <source>Sort by Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/CGisListWks.cpp" line="111"/>
         <source>Save</source>
         <translation>Opslaan</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="104"/>
+        <location filename="../gis/CGisListWks.cpp" line="112"/>
         <source>Save As...</source>
         <translation>Opslaan als...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="107"/>
+        <location filename="../gis/CGisListWks.cpp" line="115"/>
         <source>Send to Devices</source>
         <translation>Verzend naar GPS</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="108"/>
+        <location filename="../gis/CGisListWks.cpp" line="116"/>
         <source>Sync. with Database</source>
         <translation>Syngroniseren met database</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="111"/>
+        <location filename="../gis/CGisListWks.cpp" line="119"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="121"/>
+        <location filename="../gis/CGisListWks.cpp" line="128"/>
         <source>Update Project on Device</source>
         <translation>Update project op GPS</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="123"/>
-        <location filename="../gis/CGisListWks.cpp" line="144"/>
+        <location filename="../gis/CGisListWks.cpp" line="130"/>
+        <location filename="../gis/CGisListWks.cpp" line="151"/>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="134"/>
+        <location filename="../gis/CGisListWks.cpp" line="141"/>
         <source>Edit...</source>
         <translation>Bewerken...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="135"/>
+        <location filename="../gis/CGisListWks.cpp" line="99"/>
+        <location filename="../gis/CGisListWks.cpp" line="142"/>
         <source>Copy to...</source>
         <translation>Kopieer naar...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="137"/>
+        <location filename="../gis/CGisListWks.cpp" line="144"/>
         <source>Track Profile</source>
         <translation>Track profiel</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="139"/>
+        <location filename="../gis/CGisListWks.cpp" line="146"/>
         <source>Select Range</source>
         <translation>Selecteer afstand</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="140"/>
+        <location filename="../gis/CGisListWks.cpp" line="147"/>
         <source>Edit Track Points</source>
         <translation>Trackpunten bewerken</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="141"/>
+        <location filename="../gis/CGisListWks.cpp" line="148"/>
         <source>Reverse Track</source>
         <translation>Track omdraaien</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="142"/>
+        <location filename="../gis/CGisListWks.cpp" line="149"/>
         <source>Combine Tracks</source>
         <translation>Combineer tracks</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="150"/>
+        <location filename="../gis/CGisListWks.cpp" line="157"/>
         <source>Show Bubble</source>
         <translation>Toon ballon</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="152"/>
+        <location filename="../gis/CGisListWks.cpp" line="159"/>
         <source>Move Waypoint</source>
         <translation>Verplaats waypoint</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="153"/>
+        <location filename="../gis/CGisListWks.cpp" line="160"/>
         <source>Proj. Waypoint...</source>
         <translation>Projecteer waypoint...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="161"/>
+        <location filename="../gis/CGisListWks.cpp" line="168"/>
         <source>Route Instructions</source>
         <translation>Route instructies</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="163"/>
+        <location filename="../gis/CGisListWks.cpp" line="170"/>
         <source>Calculate Route</source>
         <translation>Route berekenen</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="164"/>
+        <location filename="../gis/CGisListWks.cpp" line="171"/>
         <source>Reset Route</source>
         <translation>Route omkeren</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="165"/>
+        <location filename="../gis/CGisListWks.cpp" line="172"/>
         <source>Edit Route</source>
         <translation>Bewerk route</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="166"/>
+        <location filename="../gis/CGisListWks.cpp" line="173"/>
         <source>Convert to Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="175"/>
+        <location filename="../gis/CGisListWks.cpp" line="182"/>
         <source>Edit Area Points</source>
         <translation>Bewerk gebied punten</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="182"/>
+        <location filename="../gis/CGisListWks.cpp" line="189"/>
         <source>Create Route</source>
         <translation>Maak route</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="626"/>
+        <location filename="../gis/CGisListWks.cpp" line="618"/>
         <source>Drop items...</source>
         <translation>Elementen wissen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="651"/>
-        <location filename="../gis/CGisListWks.cpp" line="1593"/>
-        <location filename="../gis/CGisListWks.cpp" line="1631"/>
+        <location filename="../gis/CGisListWks.cpp" line="643"/>
+        <location filename="../gis/CGisListWks.cpp" line="1599"/>
+        <location filename="../gis/CGisListWks.cpp" line="1637"/>
         <source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
         <translation><b>Updaten GPS</b><p>Updaten %1<br/>Moment geduld...</p></translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="780"/>
+        <location filename="../gis/CGisListWks.cpp" line="769"/>
         <source>Saving workspace. Please wait.</source>
         <translation>Werkruimte opslaan. Moment geduld.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="826"/>
+        <location filename="../gis/CGisListWks.cpp" line="815"/>
         <source>Loading workspace. Please wait.</source>
         <translation>Laden werkruimte. Moment geduld.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1143"/>
+        <location filename="../gis/CGisListWks.cpp" line="1149"/>
         <source>Close all projects...</source>
         <translation>Sluit alle projecten...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1143"/>
+        <location filename="../gis/CGisListWks.cpp" line="1149"/>
         <source>This will remove all projects from the workspace.</source>
         <translation>Dit zal alle projecten uit de werkruimte verwijderen.</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1166"/>
+        <location filename="../gis/CGisListWks.cpp" line="1172"/>
         <source>Delete project...</source>
         <translation>Project verwijderen...</translation>
     </message>
     <message>
-        <location filename="../gis/CGisListWks.cpp" line="1166"/>
+        <location filename="../gis/CGisListWks.cpp" line="1172"/>
         <source>Do you really want to delete %1?</source>
         <translation>Moet %1 werkelijk verwijderd worden?</translation>
     </message>
@@ -1829,27 +1889,27 @@ lijn %2, kolom %3:
         <translation type="unfinished">Geen GPX bestand: %1</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="258"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="264"/>
         <source>File exists ...</source>
         <translation type="unfinished">Bestand bestaat al...</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="259"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="265"/>
         <source>The file exists and it has not been created by QMapShack. If you press 'yes' all data in this file will be lost. Even if this file contains GPX data and has been loaded by QMapShack, QMapShack might not be able to load and store all elements of this file.  Those elements will be lost. I recommend to use another file. <b>Do you really want to overwrite the file?</b></source>
         <translation type="unfinished">Dit bestand bestaat al en is niet in QMapShack gemaakt. Wanneer op 'Ja' geklikt wordt zullen er gegevens verloren gaan. Alhoewel QMapShack dit GPX bestand kan openen is het mogelijk dat niet alle elementen opgeslagen kunnen worden. Geadviseerd wordt om een ander bestand te kiezen. <b>Moet dit bestand werkelijk overschreven worden?<b/></translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="367"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="380"/>
         <source>Failed to create file '%1'</source>
         <translation type="unfinished">Maken bestand mislukt '%1'</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="377"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="390"/>
         <source>Failed to write file '%1'</source>
         <translation type="unfinished">Schrijven bestand mislukt '%1'</translation>
     </message>
     <message>
-        <location filename="../gis/gpx/CGpxProject.cpp" line="382"/>
+        <location filename="../gis/gpx/CGpxProject.cpp" line="395"/>
         <source>Saving GIS data failed...</source>
         <translation type="unfinished">Opslaan GIS gegevens mislukt...</translation>
     </message>
@@ -2019,11 +2079,21 @@ lijn %2, kolom %3:
         <source>Select file to load</source>
         <translation>Selecteer bestand</translation>
     </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1061"/>
+        <source>Fatal...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../CMainWindow.cpp" line="1062"/>
+        <source>QMapShack detected a badly installed Proj4 library. The translation tables for EPSG projections usually stored in /usr/share/proj are missing. Please contact the package maintainer of your ditribution to fix it.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CMapDraw</name>
     <message>
-        <location filename="../map/CMapDraw.cpp" line="406"/>
+        <location filename="../map/CMapDraw.cpp" line="420"/>
         <source>There are no maps right now. QMapShack is no fun without maps. You can install maps by pressing the 'Help! I want maps!' button in the 'Maps' dock window. Or you can press the F1 key to open the online documentation that tells you how to use QMapShack. 
 
 If it's no fun, why don't you provide maps? Well to host maps ready for download and installation requires a good server. And this is not a free service. The project lacks the money. Additionally map and DEM data has a copyright. Therefore the copyright holder has to be asked prior to package the data. This is not that easy as it might sound and for some data you have to pay royalties. The project simply lacks resources to do this. And we think installing the stuff yourself is  [...]
@@ -2663,17 +2733,17 @@ If it's no fun, why don't you provide maps? Well to host maps ready fo
 <context>
     <name>CMapList</name>
     <message>
-        <location filename="../map/CMapList.cpp" line="208"/>
+        <location filename="../map/CMapList.cpp" line="202"/>
         <source>Deactivate</source>
         <translation>Deactiveer</translation>
     </message>
     <message>
-        <location filename="../map/CMapList.cpp" line="208"/>
+        <location filename="../map/CMapList.cpp" line="202"/>
         <source>Activate</source>
         <translation>Activeer</translation>
     </message>
     <message>
-        <location filename="../map/CMapList.cpp" line="233"/>
+        <location filename="../map/CMapList.cpp" line="227"/>
         <source>Where do you want to store maps?</source>
         <translation>Waar moeten de kaarten opgeslagen worden?</translation>
     </message>
@@ -2791,7 +2861,7 @@ lijn %2, kolom %3:
         <translation>Deze kaart heeft OpenSSL onderteuning nodig. Door restricte beperkingen in bepaalde landen kan QMapShack geen OpenSSL pakket aanbieden. Neem een kijkje op <a href='https://www.openssl.org/community/binaries.html'>OpenSSL Homepage</a> voor binaries. Er kan wel libeay32.dll en ssleay32.dll in de QMapShack map gekopieerd worden.</translation>
     </message>
     <message>
-        <location filename="../map/CMapTMS.cpp" line="304"/>
+        <location filename="../map/CMapTMS.cpp" line="299"/>
         <source><b>%1</b>: %2 tiles pending<br/></source>
         <translation><b>%1</b>: %2 delen ontvangen<br/></translation>
     </message>
@@ -3064,22 +3134,22 @@ Onbekende structuur.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="98"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="104"/>
         <source>%1 waypoints<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="97"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="99"/>
         <source>%1 tracks<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="99"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="109"/>
         <source>%1 routes<br/></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mouse/CMouseSelect.cpp" line="100"/>
+        <location filename="../mouse/CMouseSelect.cpp" line="114"/>
         <source>%1 areas<br/></source>
         <translation type="unfinished"></translation>
     </message>
@@ -3427,7 +3497,7 @@ is geen geldig coordinaat definitie:
         <translation>Verwijder bestaand bestand %1</translation>
     </message>
     <message>
-        <location filename="../qlgt/CQmsDb.cpp" line="163"/>
+        <location filename="../qlgt/CQmsDb.cpp" line="164"/>
         <source>%1: drop item with QLGT DB ID %2</source>
         <translation>%1: verwerp element met QLTG DB ID %2</translation>
     </message>
@@ -3789,13 +3859,13 @@ is geen geldig coordinaat definitie:
         <translation>%1 Door beperkingen in de Windows POSIX API Routino kunnen geen bestanden groter dan 4GB gebruikt worden.</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="344"/>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="431"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="338"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="425"/>
         <source>Calculate route with %1</source>
         <translation>Bereken route met %1</translation>
     </message>
     <message>
-        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="352"/>
+        <location filename="../gis/rte/router/CRouterRoutino.cpp" line="346"/>
         <source><br/>Calculation time: %1s</source>
         <translation><br/>Berekenen tijd: %1s</translation>
     </message>
@@ -3905,6 +3975,14 @@ is geen geldig coordinaat definitie:
     </message>
 </context>
 <context>
+    <name>CSearchDatabase</name>
+    <message>
+        <location filename="../gis/db/CSearchDatabase.cpp" line="38"/>
+        <source>Search database '%1':</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CSearchGoogle</name>
     <message>
         <location filename="../gis/search/CSearchGoogle.cpp" line="118"/>
@@ -4039,10 +4117,15 @@ lijn %2, kolom %3:
 <context>
     <name>CTextEditWidget</name>
     <message>
-        <location filename="../widgets/CTextEditWidget.cpp" line="73"/>
+        <location filename="../widgets/CTextEditWidget.cpp" line="70"/>
         <source>&Color...</source>
         <translation>&Kleur...</translation>
     </message>
+    <message>
+        <location filename="../widgets/CTextEditWidget.cpp" line="113"/>
+        <source>Reset format</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CTwoNavProject</name>
@@ -4053,20 +4136,20 @@ lijn %2, kolom %3:
         <location filename="../gis/tnv/serialization.cpp" line="617"/>
         <location filename="../gis/tnv/serialization.cpp" line="645"/>
         <location filename="../gis/tnv/serialization.cpp" line="719"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="87"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="191"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
         <source>Error...</source>
         <translation>Fout...</translation>
     </message>
     <message>
         <location filename="../gis/tnv/serialization.cpp" line="560"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="87"/>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="191"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="88"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="192"/>
         <source>Failed to open %1.</source>
         <translation>Kan %1 niet openen.</translation>
     </message>
     <message>
-        <location filename="../gis/tnv/CTwoNavProject.cpp" line="159"/>
+        <location filename="../gis/tnv/CTwoNavProject.cpp" line="160"/>
         <source>Save GIS data to...</source>
         <translation>Sla GIS gegevens op naar...</translation>
     </message>
@@ -4420,7 +4503,7 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
     <name>IDB</name>
     <message>
         <location filename="../gis/db/IDB.cpp" line="60"/>
-        <source>The internal database format of '%1'' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
+        <source>The internal database format of '%1' has changed. QMapShack will migrate your database, now. After the migration the database won't be usable with older versions of QMapShack. It is recommended to backup the database first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4429,28 +4512,48 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
         <translation>Migreren database...</translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="74"/>
+        <location filename="../gis/db/IDB.cpp" line="69"/>
+        <source>Migration aborted by user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="75"/>
         <source>Failed to migrate '%1'.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="76"/>
-        <location filename="../gis/db/IDB.cpp" line="100"/>
+        <location filename="../gis/db/IDB.cpp" line="77"/>
+        <location filename="../gis/db/IDB.cpp" line="106"/>
         <source>Error...</source>
         <translation>Fout...</translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="85"/>
-        <source>The database version of '%1'' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
+        <location filename="../gis/db/IDB.cpp" line="81"/>
+        <source>Migration failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gis/db/IDB.cpp" line="88"/>
+        <source>The database version of '%1' is more advanced as the one understood by your QMapShack installation. This won't work.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="110"/>
+        <source>Initialization failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="91"/>
         <source>Wrong database version...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/db/IDB.cpp" line="98"/>
+        <location filename="../gis/db/IDB.cpp" line="95"/>
+        <source>Database created by newer version of QMapShack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDB.cpp" line="104"/>
         <source>Failed to initialize '%1'.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4458,15 +4561,38 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
 <context>
     <name>IDBMysql</name>
     <message>
-        <location filename="../gis/db/IDBMysql.cpp" line="54"/>
+        <location filename="../gis/db/IDBMysql.cpp" line="60"/>
         <source>Password...</source>
         <translation>Wachtwoord...</translation>
     </message>
     <message>
-        <location filename="../gis/db/IDBMysql.cpp" line="54"/>
+        <location filename="../gis/db/IDBMysql.cpp" line="60"/>
         <source>Password for database '%1':</source>
         <translation>Wachtwoord voor database '%1':</translation>
     </message>
+    <message>
+        <location filename="../gis/db/IDBMysql.cpp" line="222"/>
+        <source>Update to database version 5. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IDBSqlite</name>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="306"/>
+        <source>Update to database version 3. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="375"/>
+        <source>Update to database version 5. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/IDBSqlite.cpp" line="449"/>
+        <source>Update to database version 6. Migrate all GIS items.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IDemPathSetup</name>
@@ -4766,34 +4892,33 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
         <translation>Behoud volgorde van project</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="76"/>
         <source>Sort by time</source>
-        <translation>Sorteer op tijd</translation>
+        <translation type="vanished">Sorteer op tijd</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="76"/>
         <source>Sort along track (multiple)</source>
         <translation>Sorteer langs route (multi)</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="86"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="81"/>
         <source>Sort along track (single)</source>
         <translation>Sorteer langs route (enkel)</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="94"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="118"/>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="138"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="89"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="113"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="133"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="115"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="110"/>
         <source>Print diary</source>
         <translation>Dagboek afdrukken</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IDetailsPrj.ui" line="135"/>
+        <location filename="../gis/prj/IDetailsPrj.ui" line="130"/>
         <source>Rebuild diary.</source>
         <translation>Dagboek herindelen.</translation>
     </message>
@@ -4856,7 +4981,7 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
         <translation>Profiel</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1470"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1498"/>
         <source>Speed</source>
         <translation>Snelheid</translation>
     </message>
@@ -5041,62 +5166,72 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
         <translation>Activiteit</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1375"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1357"/>
+        <source>Set Track Activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1364"/>
+        <source>Remove Track Activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1403"/>
         <source>To differentiate the track statistics select an activity from the list for the complete track. Or select a part of the track to assign an activity.</source>
         <translation>Om de track statistieken te onderscheiden selecteer een activiteit uit de lijst voor de volledige track. Of selecteer een deel van de track om een activieteit toe te kennen.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1402"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1430"/>
         <source>Points</source>
         <translation>Punten</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1450"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1478"/>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1455"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1483"/>
         <source>Ele.</source>
         <translation>Hoogte</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1460"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1488"/>
         <source>Delta</source>
         <translation>Delta</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1465"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1493"/>
         <source>Dist.</source>
         <translation>Afstand.</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1475"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1503"/>
         <source>Slope</source>
         <translation>Helling</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1480"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1508"/>
         <source>Ascend</source>
         <translation>Stijging</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1485"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1513"/>
         <source>Descend</source>
         <translation>Daling</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1490"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1518"/>
         <source>Position</source>
         <translation>Positie</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1499"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1527"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../gis/trk/IDetailsTrk.ui" line="1536"/>
+        <location filename="../gis/trk/IDetailsTrk.ui" line="1564"/>
         <source>Hist.</source>
         <translation>Hist.</translation>
     </message>
@@ -5178,7 +5313,7 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
 <context>
     <name>IDevice</name>
     <message>
-        <location filename="../device/IDevice.cpp" line="287"/>
+        <location filename="../device/IDevice.cpp" line="292"/>
         <source>There is another project with the same name. If you press 'ok' it will be removed and replaced.</source>
         <translation>Er is al een ander project met dezelfde naam. Bij drukken op 'OK' zal deze overschreven worden.</translation>
     </message>
@@ -5552,87 +5687,87 @@ Als er alleen een halve track bewaard moet worden kunnen de overige punten verwi
 <context>
     <name>IGisItem</name>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="43"/>
+        <location filename="../gis/IGisItem.cpp" line="44"/>
         <source>[no name]</source>
         <translation>[geen naam]</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="315"/>
+        <location filename="../gis/IGisItem.cpp" line="316"/>
         <source>The item is not part of the project in the database.</source>
         <translation>Het item is geen deel van het project in de database.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="316"/>
+        <location filename="../gis/IGisItem.cpp" line="317"/>
         <source>
 It is either a new item or it has been deleted in the database by someone else.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="322"/>
+        <location filename="../gis/IGisItem.cpp" line="323"/>
         <source>The item is not in the database.</source>
         <translation>Het item is niet in de database.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="328"/>
+        <location filename="../gis/IGisItem.cpp" line="329"/>
         <source>The item might need to be saved</source>
         <translation>Het item dient opgeslagen te worden</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="412"/>
+        <location filename="../gis/IGisItem.cpp" line="413"/>
         <source>Initial version.</source>
         <translation>Orginele versie.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="520"/>
+        <location filename="../gis/IGisItem.cpp" line="521"/>
         <source><h3>%1</h3> This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press 'Ok'.</source>
         <translation><h3>%1<h3>Dit element is waarschijnlijk alleen lezen omdat dit niet gemaakt is in QMapShack. Normaal hoeven geen gegevens aangepast te worden na het importeren.  Om toch aan te passen druk dan op 'OK'.</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="521"/>
+        <location filename="../gis/IGisItem.cpp" line="522"/>
         <source>Read Only Mode...</source>
         <translation>Alleen lezen modus...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="685"/>
-        <location filename="../gis/IGisItem.cpp" line="744"/>
+        <location filename="../gis/IGisItem.cpp" line="692"/>
+        <location filename="../gis/IGisItem.cpp" line="745"/>
         <source><h4>Description:</h4></source>
         <translation><h4>Beschrijving:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="688"/>
-        <location filename="../gis/IGisItem.cpp" line="747"/>
+        <location filename="../gis/IGisItem.cpp" line="695"/>
+        <location filename="../gis/IGisItem.cpp" line="748"/>
         <source><p>--- no description ---</p></source>
         <translation><p>--- geen beschrijving ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="699"/>
+        <location filename="../gis/IGisItem.cpp" line="706"/>
         <source><h4>Comment:</h4></source>
         <translation><h4>Notitie:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="702"/>
+        <location filename="../gis/IGisItem.cpp" line="709"/>
         <source><p>--- no comment ---</p></source>
         <translation><p>--- geen notitie ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="713"/>
-        <location filename="../gis/IGisItem.cpp" line="758"/>
+        <location filename="../gis/IGisItem.cpp" line="720"/>
+        <location filename="../gis/IGisItem.cpp" line="759"/>
         <source><h4>Links:</h4></source>
         <translation><h4>Links:</h4></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="716"/>
-        <location filename="../gis/IGisItem.cpp" line="761"/>
+        <location filename="../gis/IGisItem.cpp" line="723"/>
+        <location filename="../gis/IGisItem.cpp" line="762"/>
         <source><p>--- no links ---</p></source>
         <translation><p>--- geen links ---</p></translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="843"/>
+        <location filename="../gis/IGisItem.cpp" line="838"/>
         <source>Edit name...</source>
         <translation type="unfinished">Bewerk naam...</translation>
     </message>
     <message>
-        <location filename="../gis/IGisItem.cpp" line="843"/>
+        <location filename="../gis/IGisItem.cpp" line="838"/>
         <source>Enter new %1 name.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5650,59 +5785,59 @@ It is either a new item or it has been deleted in the database by someone else.<
         <translation><h3>%1</h3>Het project is veranderd. Voor het sluiten opslaan?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="258"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="271"/>
         <source>%1: Correlate tracks and waypoints.</source>
         <translation>%1: Correlatie van tracks en waypointen.</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="268"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="281"/>
         <source><h3>%1</h3>Did that take too long for you? Do you want to skip correlation of tracks and waypoints for this project in the future?</source>
         <translation><h3>%1</h3>Duurde dit te lang? Moet de correlatie van tracks en waypointen in dit project in de toekomst overgeslagen worden?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="269"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="282"/>
         <source>Canceled correlation...</source>
         <translation>Correlatie geanuleerd...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="309"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="327"/>
         <source>Save "%1" to...</source>
         <translation>Opslaan "%1" als...</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="420"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="437"/>
         <source><br/>
 Filename: %1</source>
         <translation><br/>
 Bestandsnaam: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="425"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="442"/>
         <source>Waypoints: %1</source>
         <translation>Waypoints: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="429"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="446"/>
         <source>Tracks: %1</source>
         <translation>Tracks: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="433"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="450"/>
         <source>Routes: %1</source>
         <translation>Routes: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="437"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="454"/>
         <source>Areas: %1</source>
         <translation>Gebieden: %1</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="557"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="574"/>
         <source>Are you sure you want to delete '%1' from project '%2'?</source>
         <translation>Moet '%1' werkelijk verwijderd worden uit project '%2'?</translation>
     </message>
     <message>
-        <location filename="../gis/prj/IGisProject.cpp" line="558"/>
+        <location filename="../gis/prj/IGisProject.cpp" line="575"/>
         <source>Delete...</source>
         <translation>Verwijderen...</translation>
     </message>
@@ -6401,62 +6536,62 @@ Ik wil de documentatie niet lezen!</translation>
 <context>
     <name>IMouseEditLine</name>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="264"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="256"/>
         <source><b>New Line</b><br/>Move the mouse and use the left mouse button to drop points. When done use the right mouse button to stop.<br/></source>
         <translation><b>Nieuwe lijn</b><br/>Verplaats de muis en gebruik linker muisknop om een punt te plaatsen. Gebruik rechter muisknop om te stoppen.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="314"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="306"/>
         <source><b>Delete Point</b><br/>Move the mouse close to a point and press the left button to delete it.<br/></source>
         <translation><b>Verwijder punt</b><br/>Beweeg de muis dicht bij een punt en druk op linkermuisknop om te verwijderen.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="323"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="315"/>
         <source><b>Select Range of Points</b><br/>Left click on first point to start selection. Left click second point to complete selection and choose from options. Use the right mouse button to cancel.<br/></source>
         <translation><b>Selecteer reeks punten</b><br/>Klik op eerste punt van reeks. Klik op laatste punt van reeks en selecteer een optie. Gebruik rechter muisknop om te annuleren.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="332"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="324"/>
         <source><b>Move Point</b><br/>Move the mouse close to a point and press the left button to make it stick to the cursor. Move the mouse to move the point. Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Verplaats punt</b><br/>Beweeg de muis dicht bij een punt en druk op linkermuisknop om het punt te laten plakken. Beweeg de muis om het punt te verplaatsen. Laat het punt los met linker muisknop. Gebruik rechterknop om te annuleren.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="341"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="333"/>
         <source><b>Add Point</b><br/>Move the mouse close to a line segment and press the left button to add a point. The point will stick to the cursor and you can move it.  Drop the point by a left click. Use the right mouse button to cancel.<br/></source>
         <translation><b>Punt toevoegen</b><br/>Beweeg de muis dicht bij een lijndeel en druk op linkermuisknop om het punt te laten plakken. Beweeg de muis om het punt te verplaatsen. Laat het punt los met linker muisknop. Gebruik rechterknop om te annuleren.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="350"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="342"/>
         <source><b>No Routing</b><br/>All points will be connected with a straight line.<br/></source>
         <translation><b>Geen routing</b><br/>Alle punten zullen met rechte lijnen verbonden worden.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="356"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="348"/>
         <source><b>Auto Routing</b><br/>The current router setup is used to derive a route between points. <b>Note:</b> The selected router must be able to route on-the-fly. Offline routers usually can do, online routers can't.<br/></source>
         <translation><b>Auto routing</b><br/>De huidige instelling wordt gebruikt voor berekening van een route tussen punten. <b>Notitie:</b>De geselecteerd route moet zelf routes kunnen maken. Offline routers kunnen dit online routers meestal niet.<br/></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="361"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="353"/>
         <source><b>Vector Routing</b><br/>Connect points with a line from a loaded vector map if possible.<br/></source>
         <translation><b>Vector routing</b><br/>Verbind punten met een lijn op een geladen vector kaart indien mogelijk.</br></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="533"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="525"/>
         <source><b>%1 Metrics</b></source>
         <translation><b>%1 gegevens</b></translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="536"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="528"/>
         <source>Distance:</source>
         <translation>Afstand:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="538"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="530"/>
         <source>Ascend:</source>
         <translation>Stijging:</translation>
     </message>
     <message>
-        <location filename="../mouse/line/IMouseEditLine.cpp" line="540"/>
+        <location filename="../mouse/line/IMouseEditLine.cpp" line="532"/>
         <source>Descend:</source>
         <translation>Daling:</translation>
     </message>
@@ -6498,12 +6633,12 @@ Ik wil de documentatie niet lezen!</translation>
         <translation type="unfinished">Maak waypoint</translation>
     </message>
     <message>
-        <location filename="../plot/IPlot.cpp" line="647"/>
+        <location filename="../plot/IPlot.cpp" line="648"/>
         <source>No or bad data.</source>
         <translation>Geen of ontbrekende gegevens.</translation>
     </message>
     <message>
-        <location filename="../plot/IPlot.cpp" line="1244"/>
+        <location filename="../plot/IPlot.cpp" line="1245"/>
         <source>Select output file</source>
         <translation>Selecteer bestand</translation>
     </message>
@@ -7376,6 +7511,35 @@ of
     </message>
 </context>
 <context>
+    <name>ISearchDatabase</name>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="14"/>
+        <source>Search...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="34"/>
+        <source>Type the word you want to search for and press the search button. 
+If you enter 'word' a search with an exact match is done. If you enter 'word*', 'word' has to be at the beginning of a string.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="51"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="79"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gis/db/ISearchDatabase.ui" line="86"/>
+        <source>Close</source>
+        <translation type="unfinished">Sluiten</translation>
+    </message>
+</context>
+<context>
     <name>ISelDevices</name>
     <message>
         <location filename="../gis/ISelDevices.ui" line="14"/>
@@ -7386,14 +7550,12 @@ of
 <context>
     <name>ISelectActivity</name>
     <message>
-        <location filename="../gis/trk/ISelectActivity.ui" line="14"/>
         <source>Activities...</source>
-        <translation>Activiteiten...</translation>
+        <translation type="vanished">Activiteiten...</translation>
     </message>
     <message>
-        <location filename="../gis/trk/ISelectActivity.ui" line="20"/>
         <source>Select one:</source>
-        <translation>Selecteer:</translation>
+        <translation type="vanished">Selecteer:</translation>
     </message>
 </context>
 <context>
@@ -7757,142 +7919,301 @@ of
         <translation>Bewerk tekst...</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="25"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="38"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="51"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="64"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="77"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="97"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="110"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="123"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="136"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="169"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="182"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="195"/>
-        <location filename="../widgets/ITextEditWidget.ui" line="208"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="256"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="25"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="331"/>
         <source>Undo</source>
         <translation>Ongedaan maken</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="259"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="334"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="268"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="38"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="343"/>
         <source>Redo</source>
         <translation>Opnieuw</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="271"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="346"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="51"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="355"/>
         <source>Cut</source>
         <translation>Knippen</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="283"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="358"/>
         <source>Ctrl+X</source>
         <translation>Ctrl+X</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="292"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="64"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="367"/>
         <source>Copy</source>
         <translation>Kopiëren</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="370"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="304"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="77"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="375"/>
         <source>Paste</source>
         <translation>Plakken</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="307"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="100"/>
+        <source>A:L</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="113"/>
+        <source>A:C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="126"/>
+        <source>A:R</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="139"/>
+        <source>A:B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="172"/>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="185"/>
+        <source>I</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="198"/>
+        <source>U</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="218"/>
+        <source>C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="265"/>
+        <source>Standard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="270"/>
+        <source>Bullet List (Disc)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="275"/>
+        <source>Bullet List (Circle)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="280"/>
+        <source>Bullet List (Square)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="285"/>
+        <source>Ordered List (Decimal)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="290"/>
+        <source>Ordered List (Alpha lower)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="295"/>
+        <source>Ordered List (Alpha upper)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="300"/>
+        <source>Ordered List (Roman lower)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="305"/>
+        <source>Ordered List (Roman upper)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="378"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="319"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="390"/>
         <source>Align Left</source>
         <translation>Links uitlijnen</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="322"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="393"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="334"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="405"/>
         <source>Align Right</source>
         <translation>Rechts uitlijnen</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="337"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="408"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="349"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="420"/>
         <source>Align Center</source>
         <translation>Gecentreerd</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="352"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="423"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="364"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="435"/>
         <source>Align Block</source>
         <translation>Uitgevuld</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="367"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="438"/>
         <source>Ctrl+J</source>
         <translation>Ctrl+J</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="379"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="450"/>
         <source>Underline</source>
         <translation>Onderstrepen</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="382"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="453"/>
         <source>Ctrl+U</source>
         <translation>Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="394"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="465"/>
         <source>Bold</source>
         <translation>Vet</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="397"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="468"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="409"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="480"/>
         <source>Italic</source>
         <translation>Cursief</translation>
     </message>
     <message>
-        <location filename="../widgets/ITextEditWidget.ui" line="412"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="483"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="495"/>
+        <source>Plain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="498"/>
+        <source>Reset the text's format before pasting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="503"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="506"/>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="509"/>
+        <source>Ctrl+A</source>
+        <translation type="unfinished">Ctrl+A</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="514"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="517"/>
+        <source>Delete</source>
+        <translation type="unfinished">Verwijder</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="522"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="525"/>
+        <source>Reset Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="530"/>
+        <location filename="../widgets/ITextEditWidget.ui" line="533"/>
+        <source>Reset Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="545"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidget.ui" line="548"/>
+        <source>Paste without resetting the text's format</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ITextEditWidgetSelMenu</name>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="55"/>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="68"/>
+        <source>I</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="81"/>
+        <source>U</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="101"/>
+        <source>Cut</source>
+        <translation type="unfinished">Knippen</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="114"/>
+        <source>Copy</source>
+        <translation type="unfinished">Kopiëren</translation>
+    </message>
+    <message>
+        <location filename="../widgets/ITextEditWidgetSelMenu.ui" line="127"/>
+        <source>Paste</source>
+        <translation type="unfinished">Plakken</translation>
+    </message>
 </context>
 <context>
     <name>ITimeZoneSetup</name>
diff --git a/src/map/cache/CDiskCache.cpp b/src/map/cache/CDiskCache.cpp
index c47e1b9..1c67c23 100644
--- a/src/map/cache/CDiskCache.cpp
+++ b/src/map/cache/CDiskCache.cpp
@@ -17,8 +17,8 @@
 **********************************************************************************************/
 
 #include "CDiskCache.h"
-#include "version.h"
 #include "map/CMapDraw.h"
+#include "version.h"
 
 #include <QtWidgets>
 
@@ -168,7 +168,8 @@ void CDiskCache::cleanupRemovedMaps(const QSet<QString> &maps)
 {
     QString cacheRoot = CMapDraw::getCacheRoot();
 
-    if(cacheRoot.isEmpty()) {
+    if(cacheRoot.isEmpty())
+    {
         qWarning() << "cacheRoot is empty, that should not happen at all";
         return;
     }
@@ -182,14 +183,18 @@ void CDiskCache::cleanupRemovedMaps(const QSet<QString> &maps)
         {
             QDir qdir(cacheRoot + "/" + dir);
 
-            if(QFile(qdir.absoluteFilePath("QMS_cache")).exists()) {
+            if(QFile(qdir.absoluteFilePath("QMS_cache")).exists())
+            {
                 qDebug() << "remove cache directory" << dir << "(reason: map no longer exists)";
-                for(const QString &file : qdir.entryList(QDir::Files)) {
+                for(const QString &file : qdir.entryList(QDir::Files))
+                {
                     qdir.remove(file);
                 }
                 qdir.cdUp();
                 qdir.rmdir(dir);
-            } else {
+            }
+            else
+            {
                 qDebug() << "ignoring " << dir << " (reason: no QMS cache)";
             }
         }
diff --git a/src/mouse/CMouseRangeTrk.cpp b/src/mouse/CMouseRangeTrk.cpp
index 75a0697..e386558 100644
--- a/src/mouse/CMouseRangeTrk.cpp
+++ b/src/mouse/CMouseRangeTrk.cpp
@@ -122,7 +122,7 @@ void CMouseRangeTrk::mousePressEvent(QMouseEvent * e)
                 scrOptRange = new CScrOptRangeTrk(pt, trk, this);
                 connect(scrOptRange->toolHidePoints, &QToolButton::clicked, this, &CMouseRangeTrk::slotHidePoints);
                 connect(scrOptRange->toolShowPoints, &QToolButton::clicked, this, &CMouseRangeTrk::slotShowPoints);
-                connect(scrOptRange->toolActivity,   &QToolButton::clicked, this, &CMouseRangeTrk::slotActivity);
+                connect(scrOptRange, &CScrOptRangeTrk::activitySelected, this, &CMouseRangeTrk::slotActivity);
                 connect(scrOptRange->toolCopy,       &QToolButton::clicked, this, &CMouseRangeTrk::slotCopy);
 
                 state = eStateRangeSelected;
@@ -265,14 +265,14 @@ void CMouseRangeTrk::slotShowPoints()
     canvas->resetMouse();
 }
 
-void CMouseRangeTrk::slotActivity()
+void CMouseRangeTrk::slotActivity(uint32_t flags)
 {
     QMutexLocker lock(&IGisItem::mutexItems);
 
     CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
-    if(trk != nullptr)
+    if(nullptr != trk)
     {
-        trk->setActivity();
+        trk->setActivityRange(flags);
         canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
     }
 
diff --git a/src/mouse/CMouseRangeTrk.h b/src/mouse/CMouseRangeTrk.h
index 1f2388e..f8b81ab 100644
--- a/src/mouse/CMouseRangeTrk.h
+++ b/src/mouse/CMouseRangeTrk.h
@@ -45,7 +45,7 @@ public:
 private slots:
     void slotHidePoints();
     void slotShowPoints();
-    void slotActivity();
+    void slotActivity(uint32_t flags);
     void slotCopy();
 
 private:
diff --git a/src/mouse/CScrOptRangeTrk.cpp b/src/mouse/CScrOptRangeTrk.cpp
index 46e6b33..8385562 100644
--- a/src/mouse/CScrOptRangeTrk.cpp
+++ b/src/mouse/CScrOptRangeTrk.cpp
@@ -42,8 +42,10 @@ CScrOptRangeTrk::CScrOptRangeTrk(const QPointF &point, CGisItemTrk * trk, IMouse
 
     connect(toolHidePoints, &QToolButton::clicked, this, &CScrOptRangeTrk::hide);
     connect(toolShowPoints, &QToolButton::clicked, this, &CScrOptRangeTrk::hide);
-    connect(toolActivity,   &QToolButton::clicked, this, &CScrOptRangeTrk::hide);
+    //connect(toolActivity,   &QToolButton::clicked, this, &CScrOptRangeTrk::hide);
     connect(toolCopy,       &QToolButton::clicked, this, &CScrOptRangeTrk::hide);
+
+    connect(toolActivity,   &QToolButton::clicked, this, &CScrOptRangeTrk::selectActivity);
 }
 
 CScrOptRangeTrk::~CScrOptRangeTrk()
@@ -58,3 +60,13 @@ void CScrOptRangeTrk::draw(QPainter& p)
     }
 }
 
+void CScrOptRangeTrk::selectActivity()
+{
+    uint32_t flags = CActivityTrk::selectActivity(this);
+    if(0 != flags)
+    {
+        emit activitySelected(flags);
+    }
+
+    hide();
+}
diff --git a/src/mouse/CScrOptRangeTrk.h b/src/mouse/CScrOptRangeTrk.h
index 6c149d8..9463fcb 100644
--- a/src/mouse/CScrOptRangeTrk.h
+++ b/src/mouse/CScrOptRangeTrk.h
@@ -26,11 +26,19 @@ class CGisItemTrk;
 
 class CScrOptRangeTrk : public IScrOpt, public Ui::IScrOptRangeTrk
 {
+    Q_OBJECT
+
 public:
     CScrOptRangeTrk(const QPointF& point, CGisItemTrk *trk, IMouse *mouse, QWidget *parent = nullptr);
     virtual ~CScrOptRangeTrk();
 
     void draw(QPainter& p) override;
+
+signals:
+    void activitySelected(uint32_t flag);
+
+private:
+    void selectActivity();
 };
 
 #endif //CSCROPTRANGETRK_H
diff --git a/src/plot/IPlot.cpp b/src/plot/IPlot.cpp
index 26a33bb..266c885 100644
--- a/src/plot/IPlot.cpp
+++ b/src/plot/IPlot.cpp
@@ -419,9 +419,10 @@ void IPlot::mousePressEvent(QMouseEvent * e)
                 scrOptRange = new CScrOptRangeTrk(pos, trk, &dummyMouse, this);
                 connect(scrOptRange->toolHidePoints, &QToolButton::clicked, this, &IPlot::slotHidePoints);
                 connect(scrOptRange->toolShowPoints, &QToolButton::clicked, this, &IPlot::slotShowPoints);
-                connect(scrOptRange->toolActivity,   &QToolButton::clicked, this, &IPlot::slotActivity);
                 connect(scrOptRange->toolCopy,       &QToolButton::clicked, this, &IPlot::slotCopy);
 
+                connect(scrOptRange, &CScrOptRangeTrk::activitySelected, this, &IPlot::slotActivity);
+
                 /* Adjust position of screen option widget if the widget is out of the visible area*/
                 QRect r1 = scrOptRange->geometry();
                 QRect r2 = geometry();
@@ -1280,9 +1281,9 @@ void IPlot::slotShowPoints()
     slotStopRange();
 }
 
-void IPlot::slotActivity()
+void IPlot::slotActivity(uint32_t flags)
 {
-    trk->setActivity();
+    trk->setActivityRange(flags);
     slotStopRange();
 }
 
diff --git a/src/plot/IPlot.h b/src/plot/IPlot.h
index 4a13634..f65e349 100644
--- a/src/plot/IPlot.h
+++ b/src/plot/IPlot.h
@@ -65,7 +65,7 @@ private slots:
     void slotSave();
     void slotHidePoints();
     void slotShowPoints();
-    void slotActivity();
+    void slotActivity(uint32_t flags);
     void slotCopy();
     void slotStopRange();
     void slotResetZoom();
diff --git a/src/qlgt/CQmsDb.cpp b/src/qlgt/CQmsDb.cpp
index 9c97efb..8345929 100644
--- a/src/qlgt/CQmsDb.cpp
+++ b/src/qlgt/CQmsDb.cpp
@@ -260,12 +260,13 @@ quint64 CQmsDb::store(IGisItem& item)
 
     QSqlQuery query(db);
     // item is unknown to database -> create item in database
-    query.prepare("INSERT INTO items (type, keyqms, icon, name, comment, data, hash) VALUES (:type, :keyqms, :icon, :name, :comment, :data, :hash)");
+    query.prepare("INSERT INTO items (type, keyqms, icon, name, date, comment, data, hash) VALUES (:type, :keyqms, :icon, :name, :date, :comment, :data, :hash)");
     query.bindValue(":type",    item.type());
     query.bindValue(":keyqms",     item.getKey().item);
     query.bindValue(":icon",    buffer.data());
     query.bindValue(":name",    item.getName());
-    query.bindValue(":comment", item.getInfo());
+    query.bindValue(":date",    item.getTimestamp());
+    query.bindValue(":comment", item.getInfo(true, true));
     query.bindValue(":data", data);
     query.bindValue(":hash", item.getHash());
     QUERY_EXEC(return 0);
diff --git a/src/resources.qrc b/src/resources.qrc
index 16c57e8..6c7557a 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -212,6 +212,8 @@
         <file>icons/32x32/TrackOn.png</file>
         <file>icons/32x32/RouteOn.png</file>
         <file>icons/32x32/AreaOn.png</file>
+        <file>icons/32x32/SearchDatabase.png</file>
+        <file>icons/32x32/SortName.png</file>
         
 
         <file>icons/48x48/Add.png</file>
@@ -397,6 +399,8 @@
         <file>icons/48x48/TrackOn.png</file>
         <file>icons/48x48/RouteOn.png</file>
         <file>icons/48x48/AreaOn.png</file>
+        <file>icons/48x48/SearchDatabase.png</file>
+        <file>icons/48x48/SortName.png</file>
 
 
         <file>icons/cache/32x32/bluepin.png</file>
diff --git a/src/widgets/CTextEditWidget.cpp b/src/widgets/CTextEditWidget.cpp
index 98d1a76..4c4ee46 100644
--- a/src/widgets/CTextEditWidget.cpp
+++ b/src/widgets/CTextEditWidget.cpp
@@ -36,9 +36,9 @@ CTextEditWidget::CTextEditWidget(const QString &html, QWidget * parent)
     setupUi(this);
 
     selectionWindow = new CTextEditWidgetSelMenu(this,
-        /* font style actions */ actionTextBold, actionTextItalic, actionTextUnderline,
-        /* copy/paste actions */ actionCut,      actionCopy,       actionPaste
-    );
+                                                 /* font style actions */ actionTextBold, actionTextItalic, actionTextUnderline,
+                                                 /* copy/paste actions */ actionCut,      actionCopy,       actionPaste
+                                                 );
 
     QScrollBar *vbar = textEdit->verticalScrollBar();
     connect(vbar, &QAbstractSlider::valueChanged, this, &CTextEditWidget::textEditScrolled);
@@ -232,7 +232,8 @@ void CTextEditWidget::textStyle(int styleIndex)
         QTextCursor cursor = textEdit->textCursor();
         QTextListFormat::Style style = QTextListFormat::ListDisc;
 
-        static QTextListFormat::Style indexToFormat[] = {
+        static QTextListFormat::Style indexToFormat[] =
+        {
             QTextListFormat::ListDisc,
             QTextListFormat::ListCircle,
             QTextListFormat::ListSquare,
@@ -243,7 +244,8 @@ void CTextEditWidget::textStyle(int styleIndex)
             QTextListFormat::ListUpperRoman
         };
 
-        if( (unsigned) styleIndex <= sizeof(indexToFormat)/sizeof(QTextListFormat::Style)) {
+        if( (unsigned) styleIndex <= sizeof(indexToFormat)/sizeof(QTextListFormat::Style))
+        {
             style = indexToFormat[styleIndex - 1];
         }
 
@@ -491,10 +493,10 @@ void CTextEditWidget::updateSelectionWindow()
     if(cursor.hasSelection() && rect.y() >= 0 && rect.y() <= textEdit->height())
     {
         int dy = cursor.anchor() < cursor.position()
-              ? (  6 + rect.height() )
-              : ( -6 - selectionWindow->height() );
+                 ? (  6 + rect.height() )
+                 : ( -6 - selectionWindow->height() );
 
-        int dx = - selectionWindow->width() / 2;
+        int dx = -selectionWindow->width() / 2;
 
         selectionWindow->move(textEdit->mapToGlobal(QPoint(rect.x(), rect.y())) + QPoint(dx, dy));
         selectionWindow->show();
@@ -503,5 +505,4 @@ void CTextEditWidget::updateSelectionWindow()
     {
         selectionWindow->hide();
     }
-
 }
diff --git a/src/widgets/CTextEditWidgetSelMenu.cpp b/src/widgets/CTextEditWidgetSelMenu.cpp
index 76544d5..b739df0 100644
--- a/src/widgets/CTextEditWidgetSelMenu.cpp
+++ b/src/widgets/CTextEditWidgetSelMenu.cpp
@@ -23,9 +23,9 @@
 #include <QtWidgets>
 
 CTextEditWidgetSelMenu::CTextEditWidgetSelMenu(QWidget *parent,
-    QAction *actionTextBold, QAction *actionTextItalic, QAction *actionTextUnderline,
-    QAction *actionCut,      QAction *actionCopy,       QAction *actionPaste
-)
+                                               QAction *actionTextBold, QAction *actionTextItalic, QAction *actionTextUnderline,
+                                               QAction *actionCut,      QAction *actionCopy,       QAction *actionPaste
+                                               )
     : QWidget(parent, Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint)
 {
     setupUi(this);
diff --git a/src/widgets/CTextEditWidgetSelMenu.h b/src/widgets/CTextEditWidgetSelMenu.h
index 01b8194..a515090 100644
--- a/src/widgets/CTextEditWidgetSelMenu.h
+++ b/src/widgets/CTextEditWidgetSelMenu.h
@@ -28,9 +28,9 @@ class CTextEditWidgetSelMenu : public QWidget, private Ui::ITextEditWidgetSelMen
     Q_OBJECT
 public:
     CTextEditWidgetSelMenu(QWidget *parent,
-        QAction *actionTextBold, QAction *actionTextItalic, QAction *actionTextUnderline,
-        QAction *actionCut,      QAction *actionCopy,       QAction *actionPaste
-    );
+                           QAction *actionTextBold, QAction *actionTextItalic, QAction *actionTextUnderline,
+                           QAction *actionCut,      QAction *actionCopy,       QAction *actionPaste
+                           );
     virtual ~CTextEditWidgetSelMenu() {}
 };
 #endif // CTEXTEDITWIDGETCONTEXTMENU_H

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



More information about the Pkg-grass-devel mailing list