Fixed EXIF altitude handling

Currently translated at 100.0% (340 of 340 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/es/

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 7.3.{build}
+version: 7.5.{build}
 configuration: Release
 platform: Any CPU
 environment:

CONTRIBUTING.md

@@ -1,7 +1,6 @@
 Only localization contributions are accepted at the moment, code pull requests will be rejected.
 
 The rationale is, that I want leave the possibility to distribute GPXsee builds in the OS X/Windows
-stores under a non-GPL licence open. In the future, code pull requests under a QT-like contribution
-agreement [1] will be possible.
-
-[1] https://d21tv0wm5mksdn.cloudfront.net/wp-content/uploads/2015/03/Qt-ContributionLicenseAgreement_v1_2_FINAL.pdf
+stores under a non-GPL licence open. In the future, code pull requests under a
+[QT-like contribution agreement](https://d21tv0wm5mksdn.cloudfront.net/wp-content/uploads/2015/03/Qt-ContributionLicenseAgreement_v1_2_FINAL.pdf)
+may become possible.

README.md

@@ -4,7 +4,7 @@ GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common G
 ## Features
 * Opens GPX, TCX, FIT, KML, IGC, NMEA, SLF, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT) and Garmin CSV files.
 * User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS).
-* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin JNX maps, GeoTIFF images).
+* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases, Garmin JNX maps, TwoNav RMaps, GeoTIFF images).
 * Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts graphs.
 * Support for DEM files (SRTM HGT).
 * Support for multiple tracks in one view.
@@ -19,7 +19,7 @@ GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common G
 ## Build
 Build requirements:
 * Qt 4.8 or QT 5.x (Qt >= 5.10.1 recommended for all features)
-* C++03 compiler (tested: msvc2015, gcc >= 4.8, clang/Apple LLVM version 8.1.0)
+* C++03 or newer compiler (tested: msvc2015, gcc >= 4.8, clang/Apple LLVM version 8.1.0)
 
 Build steps:
 ```shell
@@ -36,7 +36,7 @@ make # nmake on windows
 [Changelog](https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes)
 
 ## Homepage
-http://www.gpxsee.org
+[https://www.gpxsee.org](https://www.gpxsee.org)
 
 ## Maps
 [GPXSee maps repository](https://github.com/tumic0/GPXSee-maps)

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx {
 } else {
     TARGET = GPXSee
 }
-VERSION = 7.3
+VERSION = 7.5
 
 QT += core \
     gui \
@@ -29,6 +29,7 @@ HEADERS += src/common/config.h \
     src/common/kv.h \
     src/common/greatcircle.h \
     src/common/programpaths.h \
+    src/common/tifffile.h \
     src/GUI/app.h \
     src/GUI/icons.h \
     src/GUI/gui.h \
@@ -108,7 +109,6 @@ HEADERS += src/common/config.h \
     src/map/pcs.h \
     src/map/transform.h \
     src/map/mapfile.h \
-    src/map/tifffile.h \
     src/map/gcs.h \
     src/map/angularunits.h \
     src/map/primemeridian.h \
@@ -158,7 +158,12 @@ HEADERS += src/common/config.h \
     src/data/polygon.h \
     src/data/area.h \
     src/map/obliquestereographic.h \
-    src/GUI/coordinatesitem.h
+    src/GUI/coordinatesitem.h \
+    src/map/rmap.h \
+    src/map/calibrationpoint.h \
+    src/map/color.h \
+    src/data/exifparser.h \
+    src/data/imageinfo.h
 SOURCES += src/main.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \
@@ -166,6 +171,7 @@ SOURCES += src/main.cpp \
     src/common/util.cpp \
     src/common/greatcircle.cpp \
     src/common/programpaths.cpp \
+    src/common/tifffile.cpp \
     src/GUI/app.cpp \
     src/GUI/gui.cpp \
     src/GUI/axisitem.cpp \
@@ -230,7 +236,6 @@ SOURCES += src/main.cpp \
     src/map/pcs.cpp \
     src/map/transform.cpp \
     src/map/mapfile.cpp \
-    src/map/tifffile.cpp \
     src/map/projection.cpp \
     src/map/gcs.cpp \
     src/map/angularunits.cpp \
@@ -273,7 +278,9 @@ SOURCES += src/main.cpp \
     src/data/dem.cpp \
     src/data/polygon.cpp \
     src/map/obliquestereographic.cpp \
-    src/GUI/coordinatesitem.cpp
+    src/GUI/coordinatesitem.cpp \
+    src/map/rmap.cpp \
+    src/data/exifparser.cpp
 
 greaterThan(QT_MAJOR_VERSION, 4) {
     HEADERS += src/data/geojsonparser.h

lang/gpxsee_cs.ts

@@ -47,67 +47,72 @@
 <context>
     <name>Data</name>
     <message>
-        <location filename="../src/data/data.cpp" line="143"/>
+        <location filename="../src/data/data.cpp" line="147"/>
         <source>Supported files</source>
         <translation>Podporované soubory</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="144"/>
+        <location filename="../src/data/data.cpp" line="148"/>
         <source>CSV files</source>
         <translation>Soubory CSV</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="145"/>
+        <location filename="../src/data/data.cpp" line="149"/>
         <source>FIT files</source>
         <translation>Soubory FIT</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="147"/>
+        <location filename="../src/data/data.cpp" line="151"/>
         <source>GeoJSON files</source>
         <translation>Soubory GeoJSON</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="149"/>
+        <location filename="../src/data/data.cpp" line="153"/>
         <source>GPX files</source>
         <translation>Soubory GPX</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="150"/>
+        <location filename="../src/data/data.cpp" line="154"/>
         <source>IGC files</source>
         <translation>Soubory IGC</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="151"/>
+        <location filename="../src/data/data.cpp" line="155"/>
+        <source>JPEG images</source>
+        <translation>Obrázky JPEG</translation>
+    </message>
+    <message>
+        <location filename="../src/data/data.cpp" line="156"/>
         <source>KML files</source>
         <translation>Soubory KML</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="152"/>
+        <location filename="../src/data/data.cpp" line="157"/>
         <source>LOC files</source>
         <translation>Soubory LOC</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="153"/>
+        <location filename="../src/data/data.cpp" line="158"/>
         <source>NMEA files</source>
         <translation>Soubory NMEA</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="154"/>
+        <location filename="../src/data/data.cpp" line="159"/>
         <source>OziExplorer files</source>
         <translation>Soubory OziExploreru</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="156"/>
+        <location filename="../src/data/data.cpp" line="161"/>
         <source>TCX files</source>
         <translation>Soubory TCX</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="155"/>
+        <location filename="../src/data/data.cpp" line="160"/>
         <source>SLF files</source>
         <translation>Soubory SLF</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="157"/>
+        <location filename="../src/data/data.cpp" line="162"/>
         <source>All files</source>
         <translation>Všechny soubory</translation>
     </message>
@@ -326,12 +331,12 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="734"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Open file</source>
         <translation>Otevřít soubor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="841"/>
+        <location filename="../src/GUI/gui.cpp" line="844"/>
         <source>Open POI file</source>
         <translation>Otevřít POI soubor</translation>
     </message>
@@ -342,8 +347,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="210"/>
-        <location filename="../src/GUI/gui.cpp" line="679"/>
-        <location filename="../src/GUI/gui.cpp" line="680"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
+        <location filename="../src/GUI/gui.cpp" line="683"/>
         <source>Keyboard controls</source>
         <translation>Ovládací klávesy</translation>
     </message>
@@ -358,7 +363,7 @@
         <translation>Znovu načíst</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="587"/>
+        <location filename="../src/GUI/gui.cpp" line="588"/>
         <source>Show</source>
         <translation>Zobrazit</translation>
     </message>
@@ -404,8 +409,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="207"/>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
-        <location filename="../src/GUI/gui.cpp" line="714"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="717"/>
         <source>Paths</source>
         <translation>Cesty</translation>
     </message>
@@ -427,7 +432,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="302"/>
         <location filename="../src/GUI/gui.cpp" line="307"/>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
         <source>Next map</source>
         <translation>Následující mapa</translation>
     </message>
@@ -493,8 +498,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="409"/>
-        <location filename="../src/GUI/gui.cpp" line="1051"/>
-        <location filename="../src/GUI/gui.cpp" line="1117"/>
+        <location filename="../src/GUI/gui.cpp" line="1054"/>
+        <location filename="../src/GUI/gui.cpp" line="1120"/>
         <source>Moving time</source>
         <translation>Čistý čas</translation>
     </message>
@@ -579,97 +584,97 @@
         <translation>Formát souřadnic</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="658"/>
+        <location filename="../src/GUI/gui.cpp" line="661"/>
         <source>Version %1</source>
         <translation>Verze %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="662"/>
+        <location filename="../src/GUI/gui.cpp" line="665"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1.</source>
         <translation>Program GPXSee je distribuován pod podmínkami licence GNU General Public License verze 3. Pro více informací navštivte stránky programu na adrese %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="689"/>
+        <location filename="../src/GUI/gui.cpp" line="692"/>
         <source>Append file</source>
         <translation>Přidat soubor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="690"/>
+        <location filename="../src/GUI/gui.cpp" line="693"/>
         <source>Next/Previous</source>
         <translation>Následující/Předchozí</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="695"/>
         <source>Toggle graph type</source>
         <translation>Přepnout typ grafu</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="694"/>
+        <location filename="../src/GUI/gui.cpp" line="697"/>
         <source>Toggle time type</source>
         <translation>Přepnout typ času</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="701"/>
         <source>Previous map</source>
         <translation>Předchozí mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="702"/>
         <source>Zoom in</source>
         <translation>Přiblížit</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Zoom out</source>
         <translation>Oddálit</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="703"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>Digital zoom</source>
         <translation>Digitální zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="707"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="721"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>GCS/PCS directory:</source>
         <translation>Adresář s GCS/PCS daty:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="723"/>
+        <location filename="../src/GUI/gui.cpp" line="726"/>
         <source>DEM directory:</source>
         <translation>Adresář s DEM daty:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1029"/>
-        <location filename="../src/GUI/gui.cpp" line="1097"/>
+        <location filename="../src/GUI/gui.cpp" line="1032"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
         <source>Areas</source>
         <translation>Plochy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1072"/>
-        <location filename="../src/GUI/gui.cpp" line="1073"/>
+        <location filename="../src/GUI/gui.cpp" line="1075"/>
+        <location filename="../src/GUI/gui.cpp" line="1076"/>
         <source>Statistics</source>
         <translation>Statistika</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1318"/>
+        <location filename="../src/GUI/gui.cpp" line="1309"/>
         <source>Open map file</source>
         <translation>Otevřít mapový soubor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1352"/>
+        <location filename="../src/GUI/gui.cpp" line="1343"/>
         <source>No files loaded</source>
         <translation>Nejsou načteny žádné soubory</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1035"/>
-        <location filename="../src/GUI/gui.cpp" line="1039"/>
-        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1038"/>
+        <location filename="../src/GUI/gui.cpp" line="1042"/>
         <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
@@ -709,33 +714,33 @@
         <translation>N&amp;ápověda</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="717"/>
+        <location filename="../src/GUI/gui.cpp" line="720"/>
         <source>Map directory:</source>
         <translation>Adresář s mapami:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="719"/>
+        <location filename="../src/GUI/gui.cpp" line="722"/>
         <source>POI directory:</source>
         <translation>Adresář s POI body:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
+        <location filename="../src/GUI/gui.cpp" line="728"/>
         <source>Tile cache directory:</source>
         <translation>Adresář mezipaměti dlaždic:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1023"/>
-        <location filename="../src/GUI/gui.cpp" line="1093"/>
+        <location filename="../src/GUI/gui.cpp" line="1026"/>
+        <location filename="../src/GUI/gui.cpp" line="1096"/>
         <source>Routes</source>
         <translation>Trasy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1341"/>
+        <location filename="../src/GUI/gui.cpp" line="1332"/>
         <source>Error loading map:</source>
         <translation>Mapu nelze načíst:</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1356"/>
+        <location filename="../src/GUI/gui.cpp" line="1347"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n soubor</numerusform>
@@ -744,7 +749,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="683"/>
+        <location filename="../src/GUI/gui.cpp" line="686"/>
         <source>Next file</source>
         <translation>Následující soubor</translation>
     </message>
@@ -759,13 +764,13 @@
         <translation>Exportovat do PDF...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1026"/>
-        <location filename="../src/GUI/gui.cpp" line="1095"/>
+        <location filename="../src/GUI/gui.cpp" line="1029"/>
+        <location filename="../src/GUI/gui.cpp" line="1098"/>
         <source>Waypoints</source>
         <translation>Navigační body</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="684"/>
+        <location filename="../src/GUI/gui.cpp" line="687"/>
         <source>Previous file</source>
         <translation>Předchozí soubor</translation>
     </message>
@@ -775,65 +780,65 @@
         <translation>Body tras</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="686"/>
+        <location filename="../src/GUI/gui.cpp" line="689"/>
         <source>First file</source>
         <translation>První soubor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="688"/>
+        <location filename="../src/GUI/gui.cpp" line="691"/>
         <source>Last file</source>
         <translation>Poslední soubor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="830"/>
+        <location filename="../src/GUI/gui.cpp" line="833"/>
         <source>Error loading data file:</source>
         <translation>Datový soubor nelze načíst:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="833"/>
-        <location filename="../src/GUI/gui.cpp" line="868"/>
+        <location filename="../src/GUI/gui.cpp" line="836"/>
+        <location filename="../src/GUI/gui.cpp" line="871"/>
         <source>Line: %1</source>
         <translation>Řádka: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="865"/>
+        <location filename="../src/GUI/gui.cpp" line="868"/>
         <source>Error loading POI file:</source>
         <translation>Soubor POI nelze načíst:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1087"/>
+        <location filename="../src/GUI/gui.cpp" line="1090"/>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1020"/>
-        <location filename="../src/GUI/gui.cpp" line="1091"/>
+        <location filename="../src/GUI/gui.cpp" line="1023"/>
+        <location filename="../src/GUI/gui.cpp" line="1094"/>
         <source>Tracks</source>
         <translation>Cesty</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="213"/>
-        <location filename="../src/GUI/gui.cpp" line="657"/>
+        <location filename="../src/GUI/gui.cpp" line="660"/>
         <source>About GPXSee</source>
         <translation>O aplikaci GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="593"/>
+        <location filename="../src/GUI/gui.cpp" line="595"/>
         <source>Navigation</source>
         <translation>Navigace</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="365"/>
-        <location filename="../src/GUI/gui.cpp" line="1046"/>
-        <location filename="../src/GUI/gui.cpp" line="1113"/>
+        <location filename="../src/GUI/gui.cpp" line="1049"/>
+        <location filename="../src/GUI/gui.cpp" line="1116"/>
         <source>Distance</source>
         <translation>Vzdálenost</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="372"/>
         <location filename="../src/GUI/gui.cpp" line="547"/>
-        <location filename="../src/GUI/gui.cpp" line="1049"/>
-        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1052"/>
+        <location filename="../src/GUI/gui.cpp" line="1118"/>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
@@ -986,37 +991,42 @@
 <context>
     <name>MapList</name>
     <message>
-        <location filename="../src/map/maplist.cpp" line="116"/>
+        <location filename="../src/map/maplist.cpp" line="119"/>
         <source>Supported files</source>
         <translation>Podporované soubory</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="118"/>
+        <location filename="../src/map/maplist.cpp" line="121"/>
         <source>MBTiles maps</source>
         <translation>MBTiles mapy</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="119"/>
+        <location filename="../src/map/maplist.cpp" line="122"/>
         <source>Garmin JNX maps</source>
         <translation>Garmin JNX mapy</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="120"/>
+        <location filename="../src/map/maplist.cpp" line="123"/>
         <source>OziExplorer maps</source>
         <translation>OziExplorer mapy</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="121"/>
+        <location filename="../src/map/maplist.cpp" line="124"/>
         <source>TrekBuddy maps/atlases</source>
         <translation>TrekBuddy mapy/atlasy</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="122"/>
+        <location filename="../src/map/maplist.cpp" line="125"/>
         <source>GeoTIFF images</source>
         <translation>GeoTIFF obrázky</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="123"/>
+        <location filename="../src/map/maplist.cpp" line="126"/>
+        <source>TwoNav maps</source>
+        <translation>TwoNav mapy</translation>
+    </message>
+    <message>
+        <location filename="../src/map/maplist.cpp" line="127"/>
         <source>Online map sources</source>
         <translation>Online mapové zdroje</translation>
     </message>

lang/gpxsee_da.ts

@@ -47,67 +47,72 @@
 <context>
     <name>Data</name>
     <message>
-        <location filename="../src/data/data.cpp" line="143"/>
+        <location filename="../src/data/data.cpp" line="147"/>
         <source>Supported files</source>
         <translation>Understøttede filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="144"/>
+        <location filename="../src/data/data.cpp" line="148"/>
         <source>CSV files</source>
         <translation>CSV-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="145"/>
+        <location filename="../src/data/data.cpp" line="149"/>
         <source>FIT files</source>
         <translation>FIT-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="147"/>
+        <location filename="../src/data/data.cpp" line="151"/>
         <source>GeoJSON files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="149"/>
+        <location filename="../src/data/data.cpp" line="153"/>
         <source>GPX files</source>
         <translation>GPX-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="150"/>
+        <location filename="../src/data/data.cpp" line="154"/>
         <source>IGC files</source>
         <translation>IGC-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="151"/>
+        <location filename="../src/data/data.cpp" line="155"/>
+        <source>JPEG images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/data/data.cpp" line="156"/>
         <source>KML files</source>
         <translation>KML-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="152"/>
+        <location filename="../src/data/data.cpp" line="157"/>
         <source>LOC files</source>
         <translation>LOC-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="153"/>
+        <location filename="../src/data/data.cpp" line="158"/>
         <source>NMEA files</source>
         <translation>NMEA-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="154"/>
+        <location filename="../src/data/data.cpp" line="159"/>
         <source>OziExplorer files</source>
         <translation>OziExplorer-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="155"/>
+        <location filename="../src/data/data.cpp" line="160"/>
         <source>SLF files</source>
         <translation>SLF-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="156"/>
+        <location filename="../src/data/data.cpp" line="161"/>
         <source>TCX files</source>
         <translation>TCX-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="157"/>
+        <location filename="../src/data/data.cpp" line="162"/>
         <source>All files</source>
         <translation>Alle filer</translation>
     </message>
@@ -332,21 +337,21 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="207"/>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
-        <location filename="../src/GUI/gui.cpp" line="714"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="717"/>
         <source>Paths</source>
         <translation>Stier</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="210"/>
-        <location filename="../src/GUI/gui.cpp" line="679"/>
-        <location filename="../src/GUI/gui.cpp" line="680"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
+        <location filename="../src/GUI/gui.cpp" line="683"/>
         <source>Keyboard controls</source>
         <translation type="unfinished">Tastaturgenveje</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="213"/>
-        <location filename="../src/GUI/gui.cpp" line="657"/>
+        <location filename="../src/GUI/gui.cpp" line="660"/>
         <source>About GPXSee</source>
         <translation>Om GPXSee</translation>
     </message>
@@ -423,7 +428,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="302"/>
         <location filename="../src/GUI/gui.cpp" line="307"/>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
         <source>Next map</source>
         <translation>Næste kort</translation>
     </message>
@@ -469,16 +474,16 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="365"/>
-        <location filename="../src/GUI/gui.cpp" line="1046"/>
-        <location filename="../src/GUI/gui.cpp" line="1113"/>
+        <location filename="../src/GUI/gui.cpp" line="1049"/>
+        <location filename="../src/GUI/gui.cpp" line="1116"/>
         <source>Distance</source>
         <translation>Afstand</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="372"/>
         <location filename="../src/GUI/gui.cpp" line="547"/>
-        <location filename="../src/GUI/gui.cpp" line="1049"/>
-        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1052"/>
+        <location filename="../src/GUI/gui.cpp" line="1118"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
@@ -509,8 +514,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="409"/>
-        <location filename="../src/GUI/gui.cpp" line="1051"/>
-        <location filename="../src/GUI/gui.cpp" line="1117"/>
+        <location filename="../src/GUI/gui.cpp" line="1054"/>
+        <location filename="../src/GUI/gui.cpp" line="1120"/>
         <source>Moving time</source>
         <translation>Tid i bevægelse</translation>
     </message>
@@ -635,201 +640,201 @@
         <translation>Fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="587"/>
+        <location filename="../src/GUI/gui.cpp" line="588"/>
         <source>Show</source>
         <translation>Vis</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="593"/>
+        <location filename="../src/GUI/gui.cpp" line="595"/>
         <source>Navigation</source>
         <translation>Navigation</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="658"/>
+        <location filename="../src/GUI/gui.cpp" line="661"/>
         <source>Version %1</source>
         <translation>Version %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="662"/>
+        <location filename="../src/GUI/gui.cpp" line="665"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1.</source>
         <translation>GPXSee er distribueret under betingelserne i GNU General Public License version 3. For mere info om GPXSee besøg projektets hjemmeside på %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="683"/>
+        <location filename="../src/GUI/gui.cpp" line="686"/>
         <source>Next file</source>
         <translation>Næste fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="684"/>
+        <location filename="../src/GUI/gui.cpp" line="687"/>
         <source>Previous file</source>
         <translation>Forrige fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="686"/>
+        <location filename="../src/GUI/gui.cpp" line="689"/>
         <source>First file</source>
         <translation>Første fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="688"/>
+        <location filename="../src/GUI/gui.cpp" line="691"/>
         <source>Last file</source>
         <translation>Sidste fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="689"/>
+        <location filename="../src/GUI/gui.cpp" line="692"/>
         <source>Append file</source>
         <translation>Vedhæft fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="690"/>
+        <location filename="../src/GUI/gui.cpp" line="693"/>
         <source>Next/Previous</source>
         <translation>Næste/Forrige</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="695"/>
         <source>Toggle graph type</source>
         <translation>Skift graftype</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="694"/>
+        <location filename="../src/GUI/gui.cpp" line="697"/>
         <source>Toggle time type</source>
         <translation>Skift tidstype</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="701"/>
         <source>Previous map</source>
         <translation>Forrige kort</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="702"/>
         <source>Zoom in</source>
         <translation>Zoom ind</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Zoom out</source>
         <translation>Zoom ud</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="703"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>Digital zoom</source>
         <translation>Digital zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="707"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="723"/>
+        <location filename="../src/GUI/gui.cpp" line="726"/>
         <source>DEM directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
+        <location filename="../src/GUI/gui.cpp" line="728"/>
         <source>Tile cache directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="717"/>
+        <location filename="../src/GUI/gui.cpp" line="720"/>
         <source>Map directory:</source>
         <translation>Kortmappe:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="719"/>
+        <location filename="../src/GUI/gui.cpp" line="722"/>
         <source>POI directory:</source>
         <translation>IP-mappe:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="721"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>GCS/PCS directory:</source>
         <translation>GCS/PSC-mappe:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="734"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Open file</source>
         <translation>Åbn fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="830"/>
+        <location filename="../src/GUI/gui.cpp" line="833"/>
         <source>Error loading data file:</source>
         <translation>Fejl ved indlæsning af data-fil:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="833"/>
-        <location filename="../src/GUI/gui.cpp" line="868"/>
+        <location filename="../src/GUI/gui.cpp" line="836"/>
+        <location filename="../src/GUI/gui.cpp" line="871"/>
         <source>Line: %1</source>
         <translation>Linje: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="841"/>
+        <location filename="../src/GUI/gui.cpp" line="844"/>
         <source>Open POI file</source>
         <translation>Åbn IP-fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="865"/>
+        <location filename="../src/GUI/gui.cpp" line="868"/>
         <source>Error loading POI file:</source>
         <translation>Fejl ved indlæsning af IP-fil:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1020"/>
-        <location filename="../src/GUI/gui.cpp" line="1091"/>
+        <location filename="../src/GUI/gui.cpp" line="1023"/>
+        <location filename="../src/GUI/gui.cpp" line="1094"/>
         <source>Tracks</source>
         <translation>Spor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1023"/>
-        <location filename="../src/GUI/gui.cpp" line="1093"/>
+        <location filename="../src/GUI/gui.cpp" line="1026"/>
+        <location filename="../src/GUI/gui.cpp" line="1096"/>
         <source>Routes</source>
         <translation>Ruter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1026"/>
-        <location filename="../src/GUI/gui.cpp" line="1095"/>
+        <location filename="../src/GUI/gui.cpp" line="1029"/>
+        <location filename="../src/GUI/gui.cpp" line="1098"/>
         <source>Waypoints</source>
         <translation>Rutepunkter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1029"/>
-        <location filename="../src/GUI/gui.cpp" line="1097"/>
+        <location filename="../src/GUI/gui.cpp" line="1032"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
         <source>Areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1035"/>
-        <location filename="../src/GUI/gui.cpp" line="1039"/>
-        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1038"/>
+        <location filename="../src/GUI/gui.cpp" line="1042"/>
         <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1072"/>
-        <location filename="../src/GUI/gui.cpp" line="1073"/>
+        <location filename="../src/GUI/gui.cpp" line="1075"/>
+        <location filename="../src/GUI/gui.cpp" line="1076"/>
         <source>Statistics</source>
         <translation>Statistikker</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1087"/>
+        <location filename="../src/GUI/gui.cpp" line="1090"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1318"/>
+        <location filename="../src/GUI/gui.cpp" line="1309"/>
         <source>Open map file</source>
         <translation>Åbn kort-fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1341"/>
+        <location filename="../src/GUI/gui.cpp" line="1332"/>
         <source>Error loading map:</source>
         <translation>Fejl ved indlæsning af kort:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1352"/>
+        <location filename="../src/GUI/gui.cpp" line="1343"/>
         <source>No files loaded</source>
         <translation>Ingen filer indlæst</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1356"/>
+        <location filename="../src/GUI/gui.cpp" line="1347"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n fil</numerusform>
@@ -985,37 +990,42 @@
 <context>
     <name>MapList</name>
     <message>
-        <location filename="../src/map/maplist.cpp" line="116"/>
+        <location filename="../src/map/maplist.cpp" line="119"/>
         <source>Supported files</source>
         <translation>Understøttede filer</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="118"/>
+        <location filename="../src/map/maplist.cpp" line="121"/>
         <source>MBTiles maps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="119"/>
+        <location filename="../src/map/maplist.cpp" line="122"/>
         <source>Garmin JNX maps</source>
         <translation>Garmin JNX-kort</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="120"/>
+        <location filename="../src/map/maplist.cpp" line="123"/>
         <source>OziExplorer maps</source>
         <translation>OziExplorer-kort</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="121"/>
+        <location filename="../src/map/maplist.cpp" line="124"/>
         <source>TrekBuddy maps/atlases</source>
         <translation>TrekBuddy kort/atlas</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="122"/>
+        <location filename="../src/map/maplist.cpp" line="125"/>
         <source>GeoTIFF images</source>
         <translation>GeoTIFF billeder</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="123"/>
+        <location filename="../src/map/maplist.cpp" line="126"/>
+        <source>TwoNav maps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/map/maplist.cpp" line="127"/>
         <source>Online map sources</source>
         <translation type="unfinished">Online-kort kilder</translation>
     </message>

lang/gpxsee_de.ts

@@ -47,67 +47,72 @@
 <context>
     <name>Data</name>
     <message>
-        <location filename="../src/data/data.cpp" line="143"/>
+        <location filename="../src/data/data.cpp" line="147"/>
         <source>Supported files</source>
         <translation>Unterstützte Dateien</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="144"/>
+        <location filename="../src/data/data.cpp" line="148"/>
         <source>CSV files</source>
         <translation>CSV-Dateien</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="145"/>
+        <location filename="../src/data/data.cpp" line="149"/>
         <source>FIT files</source>
         <translation>FIT-Dateien</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="147"/>
+        <location filename="../src/data/data.cpp" line="151"/>
         <source>GeoJSON files</source>
         <translation>GeoJSON-Dateien</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="149"/>
+        <location filename="../src/data/data.cpp" line="153"/>
         <source>GPX files</source>
         <translation>GPX-Dateien</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="150"/>
+        <location filename="../src/data/data.cpp" line="154"/>
         <source>IGC files</source>
         <translation>IGC-Dateien</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="151"/>
+        <location filename="../src/data/data.cpp" line="155"/>
+        <source>JPEG images</source>
+        <translation>JPEG Bilder</translation>
+    </message>
+    <message>
+        <location filename="../src/data/data.cpp" line="156"/>
         <source>KML files</source>
         <translation>KML-Dateien</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="152"/>
+        <location filename="../src/data/data.cpp" line="157"/>
         <source>LOC files</source>
         <translation>LOC-Dateien</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="153"/>
+        <location filename="../src/data/data.cpp" line="158"/>
         <source>NMEA files</source>
         <translation>NMEA-Dateien</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="154"/>
+        <location filename="../src/data/data.cpp" line="159"/>
         <source>OziExplorer files</source>
         <translation>OziExplorer-Dateien</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="156"/>
+        <location filename="../src/data/data.cpp" line="161"/>
         <source>TCX files</source>
         <translation>TCX-Dateien</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="155"/>
+        <location filename="../src/data/data.cpp" line="160"/>
         <source>SLF files</source>
         <translation>SLF-Dateien</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="157"/>
+        <location filename="../src/data/data.cpp" line="162"/>
         <source>All files</source>
         <translation>Alle Dateien</translation>
     </message>
@@ -326,22 +331,22 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="717"/>
+        <location filename="../src/GUI/gui.cpp" line="720"/>
         <source>Map directory:</source>
         <translation>Kartenverzeichnis:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="719"/>
+        <location filename="../src/GUI/gui.cpp" line="722"/>
         <source>POI directory:</source>
         <translation>POI-Verzeichnis:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="734"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Open file</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="841"/>
+        <location filename="../src/GUI/gui.cpp" line="844"/>
         <source>Open POI file</source>
         <translation>POI Datei öffnen</translation>
     </message>
@@ -352,8 +357,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="210"/>
-        <location filename="../src/GUI/gui.cpp" line="679"/>
-        <location filename="../src/GUI/gui.cpp" line="680"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
+        <location filename="../src/GUI/gui.cpp" line="683"/>
         <source>Keyboard controls</source>
         <translation>Tastaturkürzel</translation>
     </message>
@@ -368,7 +373,7 @@
         <translation>Neu Laden</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="587"/>
+        <location filename="../src/GUI/gui.cpp" line="588"/>
         <source>Show</source>
         <translation>Ansicht</translation>
     </message>
@@ -414,8 +419,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="207"/>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
-        <location filename="../src/GUI/gui.cpp" line="714"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="717"/>
         <source>Paths</source>
         <translation>Pfade</translation>
     </message>
@@ -437,7 +442,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="302"/>
         <location filename="../src/GUI/gui.cpp" line="307"/>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
         <source>Next map</source>
         <translation>Nächste Karte</translation>
     </message>
@@ -503,8 +508,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="409"/>
-        <location filename="../src/GUI/gui.cpp" line="1051"/>
-        <location filename="../src/GUI/gui.cpp" line="1117"/>
+        <location filename="../src/GUI/gui.cpp" line="1054"/>
+        <location filename="../src/GUI/gui.cpp" line="1120"/>
         <source>Moving time</source>
         <translation>Bewegungszeit</translation>
     </message>
@@ -516,7 +521,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="423"/>
         <source>Imperial</source>
-        <translation>Imperial</translation>
+        <translation>Angloamerikanisch</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="429"/>
@@ -589,99 +594,99 @@
         <translation>Koordinatenformate</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="658"/>
+        <location filename="../src/GUI/gui.cpp" line="661"/>
         <source>Version %1</source>
         <translation>Version %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="662"/>
+        <location filename="../src/GUI/gui.cpp" line="665"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1.</source>
         <translation>GPXSee wird unter der GNU General Public License version 3 vertrieben. Mehr Informationen zu GPXSee auf der Homepage %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="689"/>
+        <location filename="../src/GUI/gui.cpp" line="692"/>
         <source>Append file</source>
         <translation>An Datei anhängen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="690"/>
+        <location filename="../src/GUI/gui.cpp" line="693"/>
         <source>Next/Previous</source>
         <translation>Nächste/Vorherige</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="695"/>
         <source>Toggle graph type</source>
         <translation>Graphtyp umschalten</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="694"/>
+        <location filename="../src/GUI/gui.cpp" line="697"/>
         <source>Toggle time type</source>
         <translation>Zeittyp umschalten</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="701"/>
         <source>Previous map</source>
         <translation>Vorherige Karte</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="702"/>
         <source>Zoom in</source>
         <translation>Hineinzoomen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Zoom out</source>
         <translation>Herauszoomen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="703"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>Digital zoom</source>
         <translation>Digitaler Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="707"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="721"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>GCS/PCS directory:</source>
         <translation>GCS/PCS-Verzeichnis:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="723"/>
+        <location filename="../src/GUI/gui.cpp" line="726"/>
         <source>DEM directory:</source>
         <translation>DEM-Verzeichnis:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1029"/>
-        <location filename="../src/GUI/gui.cpp" line="1097"/>
+        <location filename="../src/GUI/gui.cpp" line="1032"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
         <source>Areas</source>
         <translation>Flächen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1072"/>
-        <location filename="../src/GUI/gui.cpp" line="1073"/>
+        <location filename="../src/GUI/gui.cpp" line="1075"/>
+        <location filename="../src/GUI/gui.cpp" line="1076"/>
         <source>Statistics</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1318"/>
+        <location filename="../src/GUI/gui.cpp" line="1309"/>
         <source>Open map file</source>
         <translation>Karte Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1341"/>
+        <location filename="../src/GUI/gui.cpp" line="1332"/>
         <source>Error loading map:</source>
         <translation>Fehler beim Laden der Karte-Datei:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1352"/>
+        <location filename="../src/GUI/gui.cpp" line="1343"/>
         <source>No files loaded</source>
         <translation>Keine Dateien geladen</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1356"/>
+        <location filename="../src/GUI/gui.cpp" line="1347"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n Datei</numerusform>
@@ -689,21 +694,21 @@
         </translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1035"/>
-        <location filename="../src/GUI/gui.cpp" line="1039"/>
-        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1038"/>
+        <location filename="../src/GUI/gui.cpp" line="1042"/>
         <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1023"/>
-        <location filename="../src/GUI/gui.cpp" line="1093"/>
+        <location filename="../src/GUI/gui.cpp" line="1026"/>
+        <location filename="../src/GUI/gui.cpp" line="1096"/>
         <source>Routes</source>
         <translation>Routen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="683"/>
+        <location filename="../src/GUI/gui.cpp" line="686"/>
         <source>Next file</source>
         <translation>Nächste Datei</translation>
     </message>
@@ -718,13 +723,13 @@
         <translation>Als PDF exportieren...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1026"/>
-        <location filename="../src/GUI/gui.cpp" line="1095"/>
+        <location filename="../src/GUI/gui.cpp" line="1029"/>
+        <location filename="../src/GUI/gui.cpp" line="1098"/>
         <source>Waypoints</source>
         <translation>Wegpunkte</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="684"/>
+        <location filename="../src/GUI/gui.cpp" line="687"/>
         <source>Previous file</source>
         <translation>Vorherige Datei</translation>
     </message>
@@ -769,70 +774,70 @@
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="686"/>
+        <location filename="../src/GUI/gui.cpp" line="689"/>
         <source>First file</source>
         <translation>Erste Datei</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="688"/>
+        <location filename="../src/GUI/gui.cpp" line="691"/>
         <source>Last file</source>
         <translation>Letzte Datei</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
+        <location filename="../src/GUI/gui.cpp" line="728"/>
         <source>Tile cache directory:</source>
         <translation>Kachel-Cache-Verzeichnis:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="830"/>
+        <location filename="../src/GUI/gui.cpp" line="833"/>
         <source>Error loading data file:</source>
         <translation>Fehler beim Laden der Datei:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="833"/>
-        <location filename="../src/GUI/gui.cpp" line="868"/>
+        <location filename="../src/GUI/gui.cpp" line="836"/>
+        <location filename="../src/GUI/gui.cpp" line="871"/>
         <source>Line: %1</source>
         <translation>Zeile: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="865"/>
+        <location filename="../src/GUI/gui.cpp" line="868"/>
         <source>Error loading POI file:</source>
         <translation>Fehler beim Laden der POI-Datei:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1087"/>
+        <location filename="../src/GUI/gui.cpp" line="1090"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1020"/>
-        <location filename="../src/GUI/gui.cpp" line="1091"/>
+        <location filename="../src/GUI/gui.cpp" line="1023"/>
+        <location filename="../src/GUI/gui.cpp" line="1094"/>
         <source>Tracks</source>
         <translation>Strecken</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="213"/>
-        <location filename="../src/GUI/gui.cpp" line="657"/>
+        <location filename="../src/GUI/gui.cpp" line="660"/>
         <source>About GPXSee</source>
         <translation>Über GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="593"/>
+        <location filename="../src/GUI/gui.cpp" line="595"/>
         <source>Navigation</source>
         <translation>Navigation</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="365"/>
-        <location filename="../src/GUI/gui.cpp" line="1046"/>
-        <location filename="../src/GUI/gui.cpp" line="1113"/>
+        <location filename="../src/GUI/gui.cpp" line="1049"/>
+        <location filename="../src/GUI/gui.cpp" line="1116"/>
         <source>Distance</source>
         <translation>Distanz</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="372"/>
         <location filename="../src/GUI/gui.cpp" line="547"/>
-        <location filename="../src/GUI/gui.cpp" line="1049"/>
-        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1052"/>
+        <location filename="../src/GUI/gui.cpp" line="1118"/>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
@@ -985,37 +990,42 @@
 <context>
     <name>MapList</name>
     <message>
-        <location filename="../src/map/maplist.cpp" line="116"/>
+        <location filename="../src/map/maplist.cpp" line="119"/>
         <source>Supported files</source>
         <translation>Unterstützte Dateien</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="118"/>
+        <location filename="../src/map/maplist.cpp" line="121"/>
         <source>MBTiles maps</source>
         <translation>MBTiles Karten</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="119"/>
+        <location filename="../src/map/maplist.cpp" line="122"/>
         <source>Garmin JNX maps</source>
         <translation>Garmin JNX Karten</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="120"/>
+        <location filename="../src/map/maplist.cpp" line="123"/>
         <source>OziExplorer maps</source>
         <translation>OziExplorer Karten</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="121"/>
+        <location filename="../src/map/maplist.cpp" line="124"/>
         <source>TrekBuddy maps/atlases</source>
         <translation>TrekBuddy Karten/Atlanten</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="122"/>
+        <location filename="../src/map/maplist.cpp" line="125"/>
         <source>GeoTIFF images</source>
         <translation>GeoTIFF Bilder</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="123"/>
+        <location filename="../src/map/maplist.cpp" line="126"/>
+        <source>TwoNav maps</source>
+        <translation>TwoNav Karten</translation>
+    </message>
+    <message>
+        <location filename="../src/map/maplist.cpp" line="127"/>
         <source>Online map sources</source>
         <translation>Online-Kartenquellen</translation>
     </message>

lang/gpxsee_fi.ts

@@ -47,67 +47,72 @@
 <context>
     <name>Data</name>
     <message>
-        <location filename="../src/data/data.cpp" line="143"/>
+        <location filename="../src/data/data.cpp" line="147"/>
         <source>Supported files</source>
         <translation>Tuetut tiedostot</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="144"/>
+        <location filename="../src/data/data.cpp" line="148"/>
         <source>CSV files</source>
         <translation>CSV-tiedostot</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="145"/>
+        <location filename="../src/data/data.cpp" line="149"/>
         <source>FIT files</source>
         <translation>FIT-tiedostot</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="147"/>
+        <location filename="../src/data/data.cpp" line="151"/>
         <source>GeoJSON files</source>
         <translation>GeoJSON-tiedostot</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="149"/>
+        <location filename="../src/data/data.cpp" line="153"/>
         <source>GPX files</source>
         <translation>GPX-tiedostot</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="150"/>
+        <location filename="../src/data/data.cpp" line="154"/>
         <source>IGC files</source>
         <translation>IGC-tiedostot</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="151"/>
+        <location filename="../src/data/data.cpp" line="155"/>
+        <source>JPEG images</source>
+        <translation>JPEG-kuvat</translation>
+    </message>
+    <message>
+        <location filename="../src/data/data.cpp" line="156"/>
         <source>KML files</source>
         <translation>KML-tiedostot</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="152"/>
+        <location filename="../src/data/data.cpp" line="157"/>
         <source>LOC files</source>
         <translation>LOC-tiedostot</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="153"/>
+        <location filename="../src/data/data.cpp" line="158"/>
         <source>NMEA files</source>
         <translation>NMEA-tiedostot</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="154"/>
+        <location filename="../src/data/data.cpp" line="159"/>
         <source>OziExplorer files</source>
         <translation>OziExplorer-tiedostot</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="156"/>
+        <location filename="../src/data/data.cpp" line="161"/>
         <source>TCX files</source>
         <translation>TCX-tiedostot</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="155"/>
+        <location filename="../src/data/data.cpp" line="160"/>
         <source>SLF files</source>
         <translation>SLF-tiedostot</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="157"/>
+        <location filename="../src/data/data.cpp" line="162"/>
         <source>All files</source>
         <translation>Kaikki tiedostot</translation>
     </message>
@@ -326,12 +331,12 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="734"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Open file</source>
         <translation>Avaa tiedosto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="841"/>
+        <location filename="../src/GUI/gui.cpp" line="844"/>
         <source>Open POI file</source>
         <translation>Avaa POI-tiedosto</translation>
     </message>
@@ -342,8 +347,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="210"/>
-        <location filename="../src/GUI/gui.cpp" line="679"/>
-        <location filename="../src/GUI/gui.cpp" line="680"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
+        <location filename="../src/GUI/gui.cpp" line="683"/>
         <source>Keyboard controls</source>
         <translation>Näppäimistön säätimet</translation>
     </message>
@@ -358,7 +363,7 @@
         <translation>Lataa uudelleen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="587"/>
+        <location filename="../src/GUI/gui.cpp" line="588"/>
         <source>Show</source>
         <translation>Näytä</translation>
     </message>
@@ -404,8 +409,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="207"/>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
-        <location filename="../src/GUI/gui.cpp" line="714"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="717"/>
         <source>Paths</source>
         <translation>Tiedostopolut</translation>
     </message>
@@ -427,7 +432,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="302"/>
         <location filename="../src/GUI/gui.cpp" line="307"/>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
         <source>Next map</source>
         <translation>Seuraava kartta</translation>
     </message>
@@ -493,8 +498,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="409"/>
-        <location filename="../src/GUI/gui.cpp" line="1051"/>
-        <location filename="../src/GUI/gui.cpp" line="1117"/>
+        <location filename="../src/GUI/gui.cpp" line="1054"/>
+        <location filename="../src/GUI/gui.cpp" line="1120"/>
         <source>Moving time</source>
         <translation>Liikkumisaika</translation>
     </message>
@@ -579,97 +584,97 @@
         <translation>Koordinaattien muoto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="658"/>
+        <location filename="../src/GUI/gui.cpp" line="661"/>
         <source>Version %1</source>
         <translation>Versio %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="662"/>
+        <location filename="../src/GUI/gui.cpp" line="665"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1.</source>
         <translation>GPXSee levitetään GNU yleisen lisenssin version 3 alaisena. Voit katsoa lisätietoja GPXSee:stä projektin kotisivulla %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="689"/>
+        <location filename="../src/GUI/gui.cpp" line="692"/>
         <source>Append file</source>
         <translation>Lisää tiedosto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="690"/>
+        <location filename="../src/GUI/gui.cpp" line="693"/>
         <source>Next/Previous</source>
         <translation>Seuraava/edellinen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="695"/>
         <source>Toggle graph type</source>
         <translation>Vaihda kaaviokuvan tyyppi</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="694"/>
+        <location filename="../src/GUI/gui.cpp" line="697"/>
         <source>Toggle time type</source>
         <translation>Vaihda ajan tyyppi</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="701"/>
         <source>Previous map</source>
         <translation>Edellinen kartta</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="702"/>
         <source>Zoom in</source>
         <translation>Lähennä</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Zoom out</source>
         <translation>Loitonna</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="703"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>Digital zoom</source>
         <translation>Digitaalinen zoomi</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="707"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="721"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>GCS/PCS directory:</source>
         <translation>GCS/PCS:n hakemisto:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="723"/>
+        <location filename="../src/GUI/gui.cpp" line="726"/>
         <source>DEM directory:</source>
         <translation>DEM -tietojen hakemisto:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1029"/>
-        <location filename="../src/GUI/gui.cpp" line="1097"/>
+        <location filename="../src/GUI/gui.cpp" line="1032"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
         <source>Areas</source>
         <translation>Alueet</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1072"/>
-        <location filename="../src/GUI/gui.cpp" line="1073"/>
+        <location filename="../src/GUI/gui.cpp" line="1075"/>
+        <location filename="../src/GUI/gui.cpp" line="1076"/>
         <source>Statistics</source>
         <translation>Tilasto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1318"/>
+        <location filename="../src/GUI/gui.cpp" line="1309"/>
         <source>Open map file</source>
         <translation>Avaa karttatiedosto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1352"/>
+        <location filename="../src/GUI/gui.cpp" line="1343"/>
         <source>No files loaded</source>
         <translation>Yhtään tiedostoa ei ladattu</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1035"/>
-        <location filename="../src/GUI/gui.cpp" line="1039"/>
-        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1038"/>
+        <location filename="../src/GUI/gui.cpp" line="1042"/>
         <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
         <source>Date</source>
         <translation>Päivämäärä</translation>
     </message>
@@ -709,33 +714,33 @@
         <translation>&amp;Ohje</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="717"/>
+        <location filename="../src/GUI/gui.cpp" line="720"/>
         <source>Map directory:</source>
         <translation>Karttojen hakemisto:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="719"/>
+        <location filename="../src/GUI/gui.cpp" line="722"/>
         <source>POI directory:</source>
         <translation>POI:n hakemisto:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
+        <location filename="../src/GUI/gui.cpp" line="728"/>
         <source>Tile cache directory:</source>
         <translation>Välimuistin hakemisto:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1023"/>
-        <location filename="../src/GUI/gui.cpp" line="1093"/>
+        <location filename="../src/GUI/gui.cpp" line="1026"/>
+        <location filename="../src/GUI/gui.cpp" line="1096"/>
         <source>Routes</source>
         <translation>Reitit</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1341"/>
+        <location filename="../src/GUI/gui.cpp" line="1332"/>
         <source>Error loading map:</source>
         <translation>Virhe ladattaessa karttaa:</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1356"/>
+        <location filename="../src/GUI/gui.cpp" line="1347"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n tiedosto</numerusform>
@@ -743,7 +748,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="683"/>
+        <location filename="../src/GUI/gui.cpp" line="686"/>
         <source>Next file</source>
         <translation>Seuraava tiedosto</translation>
     </message>
@@ -758,13 +763,13 @@
         <translation>Vie PDF:ksi...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1026"/>
-        <location filename="../src/GUI/gui.cpp" line="1095"/>
+        <location filename="../src/GUI/gui.cpp" line="1029"/>
+        <location filename="../src/GUI/gui.cpp" line="1098"/>
         <source>Waypoints</source>
         <translation>Reittipisteet</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="684"/>
+        <location filename="../src/GUI/gui.cpp" line="687"/>
         <source>Previous file</source>
         <translation>Edellinen tiedosto</translation>
     </message>
@@ -774,65 +779,65 @@
         <translation>Reittipisteet</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="686"/>
+        <location filename="../src/GUI/gui.cpp" line="689"/>
         <source>First file</source>
         <translation>Ensimmäinen tiedosto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="688"/>
+        <location filename="../src/GUI/gui.cpp" line="691"/>
         <source>Last file</source>
         <translation>Viimeinen tiedosto</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="830"/>
+        <location filename="../src/GUI/gui.cpp" line="833"/>
         <source>Error loading data file:</source>
         <translation>Virhe ladattaessa datatiedostoa:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="833"/>
-        <location filename="../src/GUI/gui.cpp" line="868"/>
+        <location filename="../src/GUI/gui.cpp" line="836"/>
+        <location filename="../src/GUI/gui.cpp" line="871"/>
         <source>Line: %1</source>
         <translation>Rivi: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="865"/>
+        <location filename="../src/GUI/gui.cpp" line="868"/>
         <source>Error loading POI file:</source>
         <translation>Virhe ladattaessa POI-tiedostoa:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1087"/>
+        <location filename="../src/GUI/gui.cpp" line="1090"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1020"/>
-        <location filename="../src/GUI/gui.cpp" line="1091"/>
+        <location filename="../src/GUI/gui.cpp" line="1023"/>
+        <location filename="../src/GUI/gui.cpp" line="1094"/>
         <source>Tracks</source>
         <translation>Jäljet</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="213"/>
-        <location filename="../src/GUI/gui.cpp" line="657"/>
+        <location filename="../src/GUI/gui.cpp" line="660"/>
         <source>About GPXSee</source>
         <translation>Tietoja GPXSee:stä</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="593"/>
+        <location filename="../src/GUI/gui.cpp" line="595"/>
         <source>Navigation</source>
         <translation>Navigointi</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="365"/>
-        <location filename="../src/GUI/gui.cpp" line="1046"/>
-        <location filename="../src/GUI/gui.cpp" line="1113"/>
+        <location filename="../src/GUI/gui.cpp" line="1049"/>
+        <location filename="../src/GUI/gui.cpp" line="1116"/>
         <source>Distance</source>
         <translation>Etäisyys</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="372"/>
         <location filename="../src/GUI/gui.cpp" line="547"/>
-        <location filename="../src/GUI/gui.cpp" line="1049"/>
-        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1052"/>
+        <location filename="../src/GUI/gui.cpp" line="1118"/>
         <source>Time</source>
         <translation>Aika</translation>
     </message>
@@ -985,37 +990,42 @@
 <context>
     <name>MapList</name>
     <message>
-        <location filename="../src/map/maplist.cpp" line="116"/>
+        <location filename="../src/map/maplist.cpp" line="119"/>
         <source>Supported files</source>
         <translation>Tuetut tiedostot</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="118"/>
+        <location filename="../src/map/maplist.cpp" line="121"/>
         <source>MBTiles maps</source>
         <translation>MBTiles-kartat</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="119"/>
+        <location filename="../src/map/maplist.cpp" line="122"/>
         <source>Garmin JNX maps</source>
         <translation>Garmin JNX -kartat</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="120"/>
+        <location filename="../src/map/maplist.cpp" line="123"/>
         <source>OziExplorer maps</source>
         <translation>OziExplorer-kartat</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="121"/>
+        <location filename="../src/map/maplist.cpp" line="124"/>
         <source>TrekBuddy maps/atlases</source>
         <translation>TrekBuddy-kartat/kartastot</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="122"/>
+        <location filename="../src/map/maplist.cpp" line="125"/>
         <source>GeoTIFF images</source>
         <translation>GeoTIFF -kuvat</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="123"/>
+        <location filename="../src/map/maplist.cpp" line="126"/>
+        <source>TwoNav maps</source>
+        <translation>TwoNav-kartat</translation>
+    </message>
+    <message>
+        <location filename="../src/map/maplist.cpp" line="127"/>
         <source>Online map sources</source>
         <translation>Online-karttojen lähteet</translation>
     </message>

lang/gpxsee_fr.ts

@@ -47,67 +47,72 @@
 <context>
     <name>Data</name>
     <message>
-        <location filename="../src/data/data.cpp" line="143"/>
+        <location filename="../src/data/data.cpp" line="147"/>
         <source>Supported files</source>
         <translation>Formats pris en charge</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="144"/>
+        <location filename="../src/data/data.cpp" line="148"/>
         <source>CSV files</source>
         <translation>Données CSV</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="145"/>
+        <location filename="../src/data/data.cpp" line="149"/>
         <source>FIT files</source>
         <translation>Données FIT</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="147"/>
+        <location filename="../src/data/data.cpp" line="151"/>
         <source>GeoJSON files</source>
-        <translation type="unfinished"></translation>
+        <translation>Données GeoJSON</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="149"/>
+        <location filename="../src/data/data.cpp" line="153"/>
         <source>GPX files</source>
         <translation>Données GPX</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="150"/>
+        <location filename="../src/data/data.cpp" line="154"/>
         <source>IGC files</source>
         <translation>Données IGC</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="151"/>
+        <location filename="../src/data/data.cpp" line="155"/>
+        <source>JPEG images</source>
+        <translation>Images JPEG</translation>
+    </message>
+    <message>
+        <location filename="../src/data/data.cpp" line="156"/>
         <source>KML files</source>
         <translation>Données KML</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="152"/>
+        <location filename="../src/data/data.cpp" line="157"/>
         <source>LOC files</source>
         <translation>Données LOC</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="153"/>
+        <location filename="../src/data/data.cpp" line="158"/>
         <source>NMEA files</source>
         <translation>Données NMEA</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="154"/>
+        <location filename="../src/data/data.cpp" line="159"/>
         <source>OziExplorer files</source>
         <translation>Données OziExplorer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="156"/>
+        <location filename="../src/data/data.cpp" line="161"/>
         <source>TCX files</source>
         <translation>Données TCX</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="155"/>
+        <location filename="../src/data/data.cpp" line="160"/>
         <source>SLF files</source>
         <translation>Données SLF</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="157"/>
+        <location filename="../src/data/data.cpp" line="162"/>
         <source>All files</source>
         <translation>Tous les fichiers</translation>
     </message>
@@ -299,7 +304,7 @@
         <location filename="../src/GUI/format.cpp" line="61"/>
         <location filename="../src/GUI/format.cpp" line="84"/>
         <source>ft</source>
-        <translation>po</translation>
+        <translation>pieds</translation>
     </message>
     <message>
         <location filename="../src/GUI/format.cpp" line="57"/>
@@ -326,22 +331,22 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="717"/>
+        <location filename="../src/GUI/gui.cpp" line="720"/>
         <source>Map directory:</source>
         <translation>Dossier des cartes :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="719"/>
+        <location filename="../src/GUI/gui.cpp" line="722"/>
         <source>POI directory:</source>
         <translation>Dossier des POI :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="734"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Open file</source>
         <translation>Ouvrir un fichier</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="841"/>
+        <location filename="../src/GUI/gui.cpp" line="844"/>
         <source>Open POI file</source>
         <translation>Ouvrir un fichier POI</translation>
     </message>
@@ -352,8 +357,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="210"/>
-        <location filename="../src/GUI/gui.cpp" line="679"/>
-        <location filename="../src/GUI/gui.cpp" line="680"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
+        <location filename="../src/GUI/gui.cpp" line="683"/>
         <source>Keyboard controls</source>
         <translation>Raccourcis clavier</translation>
     </message>
@@ -368,7 +373,7 @@
         <translation>Actualiser</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="587"/>
+        <location filename="../src/GUI/gui.cpp" line="588"/>
         <source>Show</source>
         <translation>Afficher</translation>
     </message>
@@ -414,8 +419,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="207"/>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
-        <location filename="../src/GUI/gui.cpp" line="714"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="717"/>
         <source>Paths</source>
         <translation>Chemin d&apos;accès</translation>
     </message>
@@ -437,14 +442,14 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="302"/>
         <location filename="../src/GUI/gui.cpp" line="307"/>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
         <source>Next map</source>
         <translation>Carte suivante</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="316"/>
         <source>Show cursor coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher les coordonnées du pointeur</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="323"/>
@@ -464,7 +469,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="338"/>
         <source>Show areas</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher les zones</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="343"/>
@@ -489,7 +494,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="389"/>
         <source>Show path markers</source>
-        <translation type="unfinished"></translation>
+        <translation>Afficher les points de chemin</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="396"/>
@@ -503,8 +508,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="409"/>
-        <location filename="../src/GUI/gui.cpp" line="1051"/>
-        <location filename="../src/GUI/gui.cpp" line="1117"/>
+        <location filename="../src/GUI/gui.cpp" line="1054"/>
+        <location filename="../src/GUI/gui.cpp" line="1120"/>
         <source>Moving time</source>
         <translation>Durée en déplacement</translation>
     </message>
@@ -516,7 +521,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="423"/>
         <source>Imperial</source>
-        <translation>Impérial</translation>
+        <translation>Anglo-saxon</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="429"/>
@@ -556,7 +561,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="473"/>
         <source>Previous</source>
-        <translation>Précèdant</translation>
+        <translation>Précédant</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="477"/>
@@ -589,99 +594,99 @@
         <translation>Unités des coordonnées</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="658"/>
+        <location filename="../src/GUI/gui.cpp" line="661"/>
         <source>Version %1</source>
         <translation>Version %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="662"/>
+        <location filename="../src/GUI/gui.cpp" line="665"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1.</source>
         <translation>GPXSee est distribué selon les termes de la licence publique générale GNU (version 3). Pour plus d&apos;information sur GPXSee, visiter le site du projet sur %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="689"/>
+        <location filename="../src/GUI/gui.cpp" line="692"/>
         <source>Append file</source>
         <translation>Joindre un fichier</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="690"/>
+        <location filename="../src/GUI/gui.cpp" line="693"/>
         <source>Next/Previous</source>
-        <translation>Suivant/Précèdant</translation>
+        <translation>Suivant/Précédant</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="695"/>
         <source>Toggle graph type</source>
         <translation>Controler le type de graphe</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="694"/>
+        <location filename="../src/GUI/gui.cpp" line="697"/>
         <source>Toggle time type</source>
         <translation>Controler le type de durée</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="701"/>
         <source>Previous map</source>
-        <translation>Carte précèdente</translation>
+        <translation>Carte précédente</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="702"/>
         <source>Zoom in</source>
         <translation>Zoomer</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Zoom out</source>
         <translation>Dézoomer</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="703"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>Digital zoom</source>
         <translation>Zoom numérique</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="707"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="721"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>GCS/PCS directory:</source>
         <translation>Dossiers GCS/PCS :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="723"/>
+        <location filename="../src/GUI/gui.cpp" line="726"/>
         <source>DEM directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dossier DEM :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1029"/>
-        <location filename="../src/GUI/gui.cpp" line="1097"/>
+        <location filename="../src/GUI/gui.cpp" line="1032"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
         <source>Areas</source>
-        <translation type="unfinished"></translation>
+        <translation>Zones</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1072"/>
-        <location filename="../src/GUI/gui.cpp" line="1073"/>
+        <location filename="../src/GUI/gui.cpp" line="1075"/>
+        <location filename="../src/GUI/gui.cpp" line="1076"/>
         <source>Statistics</source>
         <translation>Statistiques</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1318"/>
+        <location filename="../src/GUI/gui.cpp" line="1309"/>
         <source>Open map file</source>
         <translation>Ouvrir un fichier de carte</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1341"/>
+        <location filename="../src/GUI/gui.cpp" line="1332"/>
         <source>Error loading map:</source>
         <translation>Erreur lors du chargement de la carte :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1352"/>
+        <location filename="../src/GUI/gui.cpp" line="1343"/>
         <source>No files loaded</source>
         <translation>Aucun fichier chargé</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1356"/>
+        <location filename="../src/GUI/gui.cpp" line="1347"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n fichier</numerusform>
@@ -689,21 +694,21 @@
         </translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1035"/>
-        <location filename="../src/GUI/gui.cpp" line="1039"/>
-        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1038"/>
+        <location filename="../src/GUI/gui.cpp" line="1042"/>
         <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1023"/>
-        <location filename="../src/GUI/gui.cpp" line="1093"/>
+        <location filename="../src/GUI/gui.cpp" line="1026"/>
+        <location filename="../src/GUI/gui.cpp" line="1096"/>
         <source>Routes</source>
         <translation>Routes</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="683"/>
+        <location filename="../src/GUI/gui.cpp" line="686"/>
         <source>Next file</source>
         <translation>Fichier suivant</translation>
     </message>
@@ -718,13 +723,13 @@
         <translation>Exporter au format PDF...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1026"/>
-        <location filename="../src/GUI/gui.cpp" line="1095"/>
+        <location filename="../src/GUI/gui.cpp" line="1029"/>
+        <location filename="../src/GUI/gui.cpp" line="1098"/>
         <source>Waypoints</source>
         <translation>Points de jalonnement</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="684"/>
+        <location filename="../src/GUI/gui.cpp" line="687"/>
         <source>Previous file</source>
         <translation>Fichier précédent</translation>
     </message>
@@ -769,70 +774,70 @@
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="686"/>
+        <location filename="../src/GUI/gui.cpp" line="689"/>
         <source>First file</source>
         <translation>Premier fichier</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="688"/>
+        <location filename="../src/GUI/gui.cpp" line="691"/>
         <source>Last file</source>
         <translation>Dernier fichier</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
+        <location filename="../src/GUI/gui.cpp" line="728"/>
         <source>Tile cache directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dossier du cache de tuiles :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="830"/>
+        <location filename="../src/GUI/gui.cpp" line="833"/>
         <source>Error loading data file:</source>
         <translation>Erreur lors du chargement des données :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="833"/>
-        <location filename="../src/GUI/gui.cpp" line="868"/>
+        <location filename="../src/GUI/gui.cpp" line="836"/>
+        <location filename="../src/GUI/gui.cpp" line="871"/>
         <source>Line: %1</source>
         <translation>Ligne : %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="865"/>
+        <location filename="../src/GUI/gui.cpp" line="868"/>
         <source>Error loading POI file:</source>
         <translation>Erreur lors du chargement du fichier POI :</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1087"/>
+        <location filename="../src/GUI/gui.cpp" line="1090"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1020"/>
-        <location filename="../src/GUI/gui.cpp" line="1091"/>
+        <location filename="../src/GUI/gui.cpp" line="1023"/>
+        <location filename="../src/GUI/gui.cpp" line="1094"/>
         <source>Tracks</source>
         <translation>Traces</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="213"/>
-        <location filename="../src/GUI/gui.cpp" line="657"/>
+        <location filename="../src/GUI/gui.cpp" line="660"/>
         <source>About GPXSee</source>
         <translation>À propos de GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="593"/>
+        <location filename="../src/GUI/gui.cpp" line="595"/>
         <source>Navigation</source>
         <translation>Navigation</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="365"/>
-        <location filename="../src/GUI/gui.cpp" line="1046"/>
-        <location filename="../src/GUI/gui.cpp" line="1113"/>
+        <location filename="../src/GUI/gui.cpp" line="1049"/>
+        <location filename="../src/GUI/gui.cpp" line="1116"/>
         <source>Distance</source>
         <translation>Distance</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="372"/>
         <location filename="../src/GUI/gui.cpp" line="547"/>
-        <location filename="../src/GUI/gui.cpp" line="1049"/>
-        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1052"/>
+        <location filename="../src/GUI/gui.cpp" line="1118"/>
         <source>Time</source>
         <translation>Temps</translation>
     </message>
@@ -985,37 +990,42 @@
 <context>
     <name>MapList</name>
     <message>
-        <location filename="../src/map/maplist.cpp" line="116"/>
+        <location filename="../src/map/maplist.cpp" line="119"/>
         <source>Supported files</source>
         <translation>Formats pris en charge</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="118"/>
+        <location filename="../src/map/maplist.cpp" line="121"/>
         <source>MBTiles maps</source>
         <translation>Cartes MBTiles</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="119"/>
+        <location filename="../src/map/maplist.cpp" line="122"/>
         <source>Garmin JNX maps</source>
         <translation>Cartes Garmin JNX</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="120"/>
+        <location filename="../src/map/maplist.cpp" line="123"/>
         <source>OziExplorer maps</source>
         <translation>Cartes OziExplorer</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="121"/>
+        <location filename="../src/map/maplist.cpp" line="124"/>
         <source>TrekBuddy maps/atlases</source>
         <translation>Cartes ou atlas TrekBuddy</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="122"/>
+        <location filename="../src/map/maplist.cpp" line="125"/>
         <source>GeoTIFF images</source>
         <translation>Images GeoTIFF</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="123"/>
+        <location filename="../src/map/maplist.cpp" line="126"/>
+        <source>TwoNav maps</source>
+        <translation>Cartes TwoNav</translation>
+    </message>
+    <message>
+        <location filename="../src/map/maplist.cpp" line="127"/>
         <source>Online map sources</source>
         <translation>Cartes en ligne</translation>
     </message>
@@ -1298,18 +1308,18 @@
         <location filename="../src/GUI/optionsdialog.cpp" line="369"/>
         <location filename="../src/GUI/optionsdialog.cpp" line="427"/>
         <source>GPS data</source>
-        <translation type="unfinished"></translation>
+        <translation>Données GPS</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="370"/>
         <location filename="../src/GUI/optionsdialog.cpp" line="428"/>
         <source>DEM data</source>
-        <translation type="unfinished"></translation>
+        <translation>Données MNT</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="407"/>
         <source>Elevation</source>
-        <translation type="unfinished">Altitude</translation>
+        <translation>Altitude</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="418"/>
@@ -1319,7 +1329,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="419"/>
         <source>Sources</source>
-        <translation type="unfinished"></translation>
+        <translation>Sources</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="420"/>
@@ -1329,7 +1339,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="453"/>
         <source>Radius:</source>
-        <translation type="unfinished"></translation>
+        <translation>Rayon :</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="401"/>
@@ -1339,27 +1349,27 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="139"/>
         <source>Area border width:</source>
-        <translation type="unfinished"></translation>
+        <translation>Épaisseur de bord de zone :</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="140"/>
         <source>Area border style:</source>
-        <translation type="unfinished"></translation>
+        <translation>Style de bord de zone :</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="141"/>
         <source>Area fill opacity:</source>
-        <translation type="unfinished"></translation>
+        <translation>Opacité du remplissage des zones :</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="145"/>
         <source>Fill opacity:</source>
-        <translation type="unfinished"></translation>
+        <translation>Opacité de remplissage :</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="146"/>
         <source>Areas</source>
-        <translation type="unfinished"></translation>
+        <translation>Zones</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="439"/>
@@ -1460,7 +1470,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="551"/>
         <source>MB</source>
-        <translation>MB</translation>
+        <translation>Mo</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="561"/>
@@ -1509,12 +1519,12 @@
     <message>
         <location filename="../src/GUI/areaitem.cpp" line="15"/>
         <source>Name</source>
-        <translation type="unfinished">Nom</translation>
+        <translation>Nom</translation>
     </message>
     <message>
         <location filename="../src/GUI/areaitem.cpp" line="17"/>
         <source>Description</source>
-        <translation type="unfinished">Description</translation>
+        <translation>Description</translation>
     </message>
 </context>
 <context>
@@ -1628,7 +1638,7 @@
     <message>
         <location filename="../src/GUI/speedgraph.cpp" line="26"/>
         <source>min/km</source>
-        <translation>min/nd</translation>
+        <translation>min/km</translation>
     </message>
     <message>
         <location filename="../src/GUI/speedgraph.cpp" line="27"/>
@@ -1648,7 +1658,7 @@
     <message>
         <location filename="../src/GUI/speedgraph.cpp" line="33"/>
         <source>Pace</source>
-        <translation>pas</translation>
+        <translation>Allure</translation>
     </message>
     <message>
         <location filename="../src/GUI/speedgraph.cpp" line="99"/>
@@ -1706,7 +1716,7 @@
     <message>
         <location filename="../src/GUI/speedgraphitem.cpp" line="37"/>
         <source>Pace</source>
-        <translation>pas</translation>
+        <translation>Allure</translation>
     </message>
 </context>
 <context>

lang/gpxsee_nb.ts

@@ -47,67 +47,72 @@
 <context>
     <name>Data</name>
     <message>
-        <location filename="../src/data/data.cpp" line="143"/>
+        <location filename="../src/data/data.cpp" line="147"/>
         <source>Supported files</source>
         <translation>Støttede filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="144"/>
+        <location filename="../src/data/data.cpp" line="148"/>
         <source>CSV files</source>
         <translation>CSV-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="145"/>
+        <location filename="../src/data/data.cpp" line="149"/>
         <source>FIT files</source>
         <translation>FIT-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="147"/>
+        <location filename="../src/data/data.cpp" line="151"/>
         <source>GeoJSON files</source>
         <translation>GeoJSON-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="149"/>
+        <location filename="../src/data/data.cpp" line="153"/>
         <source>GPX files</source>
         <translation>GPX-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="150"/>
+        <location filename="../src/data/data.cpp" line="154"/>
         <source>IGC files</source>
         <translation>IGC-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="151"/>
+        <location filename="../src/data/data.cpp" line="155"/>
+        <source>JPEG images</source>
+        <translation>JPEG-bilder</translation>
+    </message>
+    <message>
+        <location filename="../src/data/data.cpp" line="156"/>
         <source>KML files</source>
         <translation>KML-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="152"/>
+        <location filename="../src/data/data.cpp" line="157"/>
         <source>LOC files</source>
         <translation>LOC-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="153"/>
+        <location filename="../src/data/data.cpp" line="158"/>
         <source>NMEA files</source>
         <translation>NMEA-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="154"/>
+        <location filename="../src/data/data.cpp" line="159"/>
         <source>OziExplorer files</source>
         <translation>OziExplorer-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="155"/>
+        <location filename="../src/data/data.cpp" line="160"/>
         <source>SLF files</source>
         <translation>SLF-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="156"/>
+        <location filename="../src/data/data.cpp" line="161"/>
         <source>TCX files</source>
         <translation>TCX-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="157"/>
+        <location filename="../src/data/data.cpp" line="162"/>
         <source>All files</source>
         <translation>Alle filer</translation>
     </message>
@@ -332,21 +337,21 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="207"/>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
-        <location filename="../src/GUI/gui.cpp" line="714"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="717"/>
         <source>Paths</source>
         <translation>Stier</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="210"/>
-        <location filename="../src/GUI/gui.cpp" line="679"/>
-        <location filename="../src/GUI/gui.cpp" line="680"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
+        <location filename="../src/GUI/gui.cpp" line="683"/>
         <source>Keyboard controls</source>
         <translation>Tastatursnarveier</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="213"/>
-        <location filename="../src/GUI/gui.cpp" line="657"/>
+        <location filename="../src/GUI/gui.cpp" line="660"/>
         <source>About GPXSee</source>
         <translation>Om</translation>
     </message>
@@ -423,7 +428,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="302"/>
         <location filename="../src/GUI/gui.cpp" line="307"/>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
         <source>Next map</source>
         <translation>Neste kart</translation>
     </message>
@@ -469,16 +474,16 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="365"/>
-        <location filename="../src/GUI/gui.cpp" line="1046"/>
-        <location filename="../src/GUI/gui.cpp" line="1113"/>
+        <location filename="../src/GUI/gui.cpp" line="1049"/>
+        <location filename="../src/GUI/gui.cpp" line="1116"/>
         <source>Distance</source>
         <translation>Avstand</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="372"/>
         <location filename="../src/GUI/gui.cpp" line="547"/>
-        <location filename="../src/GUI/gui.cpp" line="1049"/>
-        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1052"/>
+        <location filename="../src/GUI/gui.cpp" line="1118"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
@@ -509,8 +514,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="409"/>
-        <location filename="../src/GUI/gui.cpp" line="1051"/>
-        <location filename="../src/GUI/gui.cpp" line="1117"/>
+        <location filename="../src/GUI/gui.cpp" line="1054"/>
+        <location filename="../src/GUI/gui.cpp" line="1120"/>
         <source>Moving time</source>
         <translation>Tid i bevegelse</translation>
     </message>
@@ -635,201 +640,201 @@
         <translation>Fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="587"/>
+        <location filename="../src/GUI/gui.cpp" line="588"/>
         <source>Show</source>
         <translation>Vis</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="593"/>
+        <location filename="../src/GUI/gui.cpp" line="595"/>
         <source>Navigation</source>
         <translation>Navigasjon</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="658"/>
+        <location filename="../src/GUI/gui.cpp" line="661"/>
         <source>Version %1</source>
         <translation>Versjon %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="662"/>
+        <location filename="../src/GUI/gui.cpp" line="665"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1.</source>
         <translation>GPXSee er distribuert i henhold til vilkårene i GNU general public lisens, versjon 3. For mer info om GPXSee, besøk prosjekthjemmesiden på %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="683"/>
+        <location filename="../src/GUI/gui.cpp" line="686"/>
         <source>Next file</source>
         <translation>Neste fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="684"/>
+        <location filename="../src/GUI/gui.cpp" line="687"/>
         <source>Previous file</source>
         <translation>Forrige fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="686"/>
+        <location filename="../src/GUI/gui.cpp" line="689"/>
         <source>First file</source>
         <translation>Første fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="688"/>
+        <location filename="../src/GUI/gui.cpp" line="691"/>
         <source>Last file</source>
         <translation>Siste fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="689"/>
+        <location filename="../src/GUI/gui.cpp" line="692"/>
         <source>Append file</source>
         <translation>Legg til fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="690"/>
+        <location filename="../src/GUI/gui.cpp" line="693"/>
         <source>Next/Previous</source>
         <translation>Neste/forrige</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="695"/>
         <source>Toggle graph type</source>
         <translation>Veksle diagramtype</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="694"/>
+        <location filename="../src/GUI/gui.cpp" line="697"/>
         <source>Toggle time type</source>
         <translation>Veksle tidstype</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="701"/>
         <source>Previous map</source>
         <translation>Forrige kart</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="702"/>
         <source>Zoom in</source>
         <translation>Forstørr</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Zoom out</source>
         <translation>Forminsk</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="703"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>Digital zoom</source>
         <translation>Digital forstørrelse</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="707"/>
         <source>Zoom</source>
         <translation>Forstørr</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="723"/>
+        <location filename="../src/GUI/gui.cpp" line="726"/>
         <source>DEM directory:</source>
         <translation>DEM-mappe:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
+        <location filename="../src/GUI/gui.cpp" line="728"/>
         <source>Tile cache directory:</source>
         <translation>Flishurtiglagringsmappe:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="717"/>
+        <location filename="../src/GUI/gui.cpp" line="720"/>
         <source>Map directory:</source>
         <translation>Kartmappe:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="719"/>
+        <location filename="../src/GUI/gui.cpp" line="722"/>
         <source>POI directory:</source>
         <translation>POI-mappe:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="721"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>GCS/PCS directory:</source>
         <translation>GCS-/PCS-mappe:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="734"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Open file</source>
         <translation>Åpne fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="830"/>
+        <location filename="../src/GUI/gui.cpp" line="833"/>
         <source>Error loading data file:</source>
         <translation>Feil ved innlasting av datafil:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="833"/>
-        <location filename="../src/GUI/gui.cpp" line="868"/>
+        <location filename="../src/GUI/gui.cpp" line="836"/>
+        <location filename="../src/GUI/gui.cpp" line="871"/>
         <source>Line: %1</source>
         <translation>Linje: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="841"/>
+        <location filename="../src/GUI/gui.cpp" line="844"/>
         <source>Open POI file</source>
         <translation>Åpne POI-fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="865"/>
+        <location filename="../src/GUI/gui.cpp" line="868"/>
         <source>Error loading POI file:</source>
         <translation>Kunne ikke laste inn POI-fil:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1020"/>
-        <location filename="../src/GUI/gui.cpp" line="1091"/>
+        <location filename="../src/GUI/gui.cpp" line="1023"/>
+        <location filename="../src/GUI/gui.cpp" line="1094"/>
         <source>Tracks</source>
         <translation>Spor</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1023"/>
-        <location filename="../src/GUI/gui.cpp" line="1093"/>
+        <location filename="../src/GUI/gui.cpp" line="1026"/>
+        <location filename="../src/GUI/gui.cpp" line="1096"/>
         <source>Routes</source>
         <translation>Ruter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1026"/>
-        <location filename="../src/GUI/gui.cpp" line="1095"/>
+        <location filename="../src/GUI/gui.cpp" line="1029"/>
+        <location filename="../src/GUI/gui.cpp" line="1098"/>
         <source>Waypoints</source>
         <translation>Veipunkter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1029"/>
-        <location filename="../src/GUI/gui.cpp" line="1097"/>
+        <location filename="../src/GUI/gui.cpp" line="1032"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
         <source>Areas</source>
         <translation>Områder</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1035"/>
-        <location filename="../src/GUI/gui.cpp" line="1039"/>
-        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1038"/>
+        <location filename="../src/GUI/gui.cpp" line="1042"/>
         <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1072"/>
-        <location filename="../src/GUI/gui.cpp" line="1073"/>
+        <location filename="../src/GUI/gui.cpp" line="1075"/>
+        <location filename="../src/GUI/gui.cpp" line="1076"/>
         <source>Statistics</source>
         <translation>Statistikk</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1087"/>
+        <location filename="../src/GUI/gui.cpp" line="1090"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1318"/>
+        <location filename="../src/GUI/gui.cpp" line="1309"/>
         <source>Open map file</source>
         <translation>Åpne kartfil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1341"/>
+        <location filename="../src/GUI/gui.cpp" line="1332"/>
         <source>Error loading map:</source>
         <translation>Feil ved innlasting av kart:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1352"/>
+        <location filename="../src/GUI/gui.cpp" line="1343"/>
         <source>No files loaded</source>
         <translation>Ingen filer lastet opp</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1356"/>
+        <location filename="../src/GUI/gui.cpp" line="1347"/>
         <source>%n files</source>
         <translation type="unfinished">
             <numerusform>%n fil</numerusform>
@@ -985,37 +990,42 @@
 <context>
     <name>MapList</name>
     <message>
-        <location filename="../src/map/maplist.cpp" line="116"/>
+        <location filename="../src/map/maplist.cpp" line="119"/>
         <source>Supported files</source>
         <translation>Støttede filer</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="118"/>
+        <location filename="../src/map/maplist.cpp" line="121"/>
         <source>MBTiles maps</source>
         <translation>MBTiles-kart</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="119"/>
+        <location filename="../src/map/maplist.cpp" line="122"/>
         <source>Garmin JNX maps</source>
         <translation>Garmin JNX-kart</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="120"/>
+        <location filename="../src/map/maplist.cpp" line="123"/>
         <source>OziExplorer maps</source>
         <translation>OziExplorer-kart</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="121"/>
+        <location filename="../src/map/maplist.cpp" line="124"/>
         <source>TrekBuddy maps/atlases</source>
         <translation>TrekBuddy kart/atlas</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="122"/>
+        <location filename="../src/map/maplist.cpp" line="125"/>
         <source>GeoTIFF images</source>
         <translation>GeoTIFF-bilder</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="123"/>
+        <location filename="../src/map/maplist.cpp" line="126"/>
+        <source>TwoNav maps</source>
+        <translation>TwoNav-kart</translation>
+    </message>
+    <message>
+        <location filename="../src/map/maplist.cpp" line="127"/>
         <source>Online map sources</source>
         <translation>Nettbaserte kartkilder</translation>
     </message>

lang/gpxsee_pl.ts

@@ -47,67 +47,72 @@
 <context>
     <name>Data</name>
     <message>
-        <location filename="../src/data/data.cpp" line="143"/>
+        <location filename="../src/data/data.cpp" line="147"/>
         <source>Supported files</source>
         <translation>Obsługiwane pliki</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="144"/>
+        <location filename="../src/data/data.cpp" line="148"/>
         <source>CSV files</source>
         <translation>Pliki CSV</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="145"/>
+        <location filename="../src/data/data.cpp" line="149"/>
         <source>FIT files</source>
         <translation>Pliki FIT</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="147"/>
+        <location filename="../src/data/data.cpp" line="151"/>
         <source>GeoJSON files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="149"/>
+        <location filename="../src/data/data.cpp" line="153"/>
         <source>GPX files</source>
         <translation>Pliki GPX</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="150"/>
+        <location filename="../src/data/data.cpp" line="154"/>
         <source>IGC files</source>
         <translation>Pliki IGC</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="151"/>
+        <location filename="../src/data/data.cpp" line="155"/>
+        <source>JPEG images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/data/data.cpp" line="156"/>
         <source>KML files</source>
         <translation>Pliki KML</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="152"/>
+        <location filename="../src/data/data.cpp" line="157"/>
         <source>LOC files</source>
         <translation>Pliki LOC</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="153"/>
+        <location filename="../src/data/data.cpp" line="158"/>
         <source>NMEA files</source>
         <translation>Pliki NMEA</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="154"/>
+        <location filename="../src/data/data.cpp" line="159"/>
         <source>OziExplorer files</source>
         <translation>Pliki OziExplorer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="156"/>
+        <location filename="../src/data/data.cpp" line="161"/>
         <source>TCX files</source>
         <translation>Pliki TCX</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="155"/>
+        <location filename="../src/data/data.cpp" line="160"/>
         <source>SLF files</source>
         <translation>Pliki SLF</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="157"/>
+        <location filename="../src/data/data.cpp" line="162"/>
         <source>All files</source>
         <translation>Wszystkie pliki</translation>
     </message>
@@ -326,12 +331,12 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="734"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Open file</source>
         <translation>Otwórz plik</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="841"/>
+        <location filename="../src/GUI/gui.cpp" line="844"/>
         <source>Open POI file</source>
         <translation>Otwórz plik POI</translation>
     </message>
@@ -342,8 +347,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="210"/>
-        <location filename="../src/GUI/gui.cpp" line="679"/>
-        <location filename="../src/GUI/gui.cpp" line="680"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
+        <location filename="../src/GUI/gui.cpp" line="683"/>
         <source>Keyboard controls</source>
         <translation>Elementy sterujące klawiatury</translation>
     </message>
@@ -358,7 +363,7 @@
         <translation>Odśwież</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="587"/>
+        <location filename="../src/GUI/gui.cpp" line="588"/>
         <source>Show</source>
         <translation>Pokaż</translation>
     </message>
@@ -404,8 +409,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="207"/>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
-        <location filename="../src/GUI/gui.cpp" line="714"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="717"/>
         <source>Paths</source>
         <translation>Ścieżki</translation>
     </message>
@@ -427,7 +432,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="302"/>
         <location filename="../src/GUI/gui.cpp" line="307"/>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
         <source>Next map</source>
         <translation>Następna mapa</translation>
     </message>
@@ -493,8 +498,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="409"/>
-        <location filename="../src/GUI/gui.cpp" line="1051"/>
-        <location filename="../src/GUI/gui.cpp" line="1117"/>
+        <location filename="../src/GUI/gui.cpp" line="1054"/>
+        <location filename="../src/GUI/gui.cpp" line="1120"/>
         <source>Moving time</source>
         <translation>Czas ruchu</translation>
     </message>
@@ -579,97 +584,97 @@
         <translation>Format współrzędnych</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="658"/>
+        <location filename="../src/GUI/gui.cpp" line="661"/>
         <source>Version %1</source>
         <translation>Wersja %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="662"/>
+        <location filename="../src/GUI/gui.cpp" line="665"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1.</source>
         <translation>Program GPXSee jest rozpowszechniany na warunkach licencji GNU General Public License w wersji 3. Więcej informacji o programie GPXSee można znaleźć na stronie głównej projektu pod adresem %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="689"/>
+        <location filename="../src/GUI/gui.cpp" line="692"/>
         <source>Append file</source>
         <translation>Dołącz plik</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="690"/>
+        <location filename="../src/GUI/gui.cpp" line="693"/>
         <source>Next/Previous</source>
         <translation>Następny/Poprzedni</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="695"/>
         <source>Toggle graph type</source>
         <translation>Zmień typ wykresu</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="694"/>
+        <location filename="../src/GUI/gui.cpp" line="697"/>
         <source>Toggle time type</source>
         <translation>Zmień typ czasu</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="701"/>
         <source>Previous map</source>
         <translation>Poprzednia mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="702"/>
         <source>Zoom in</source>
         <translation>Przybliż</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Zoom out</source>
         <translation>Oddal</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="703"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>Digital zoom</source>
         <translation>Zoom cyfrowy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="707"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="721"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>GCS/PCS directory:</source>
         <translation>Katalog plików GCS/PCS:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="723"/>
+        <location filename="../src/GUI/gui.cpp" line="726"/>
         <source>DEM directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1029"/>
-        <location filename="../src/GUI/gui.cpp" line="1097"/>
+        <location filename="../src/GUI/gui.cpp" line="1032"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
         <source>Areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1072"/>
-        <location filename="../src/GUI/gui.cpp" line="1073"/>
+        <location filename="../src/GUI/gui.cpp" line="1075"/>
+        <location filename="../src/GUI/gui.cpp" line="1076"/>
         <source>Statistics</source>
         <translation>Statystyka</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1318"/>
+        <location filename="../src/GUI/gui.cpp" line="1309"/>
         <source>Open map file</source>
         <translation>Otwórz plik mapy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1352"/>
+        <location filename="../src/GUI/gui.cpp" line="1343"/>
         <source>No files loaded</source>
         <translation>Nie załadowano żadnych plików</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1035"/>
-        <location filename="../src/GUI/gui.cpp" line="1039"/>
-        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1038"/>
+        <location filename="../src/GUI/gui.cpp" line="1042"/>
         <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
@@ -709,33 +714,33 @@
         <translation>Pomo&amp;c</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="717"/>
+        <location filename="../src/GUI/gui.cpp" line="720"/>
         <source>Map directory:</source>
         <translation>Katalog z mapami:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="719"/>
+        <location filename="../src/GUI/gui.cpp" line="722"/>
         <source>POI directory:</source>
         <translation>Katalog z POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
+        <location filename="../src/GUI/gui.cpp" line="728"/>
         <source>Tile cache directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1023"/>
-        <location filename="../src/GUI/gui.cpp" line="1093"/>
+        <location filename="../src/GUI/gui.cpp" line="1026"/>
+        <location filename="../src/GUI/gui.cpp" line="1096"/>
         <source>Routes</source>
         <translation>Trasy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1341"/>
+        <location filename="../src/GUI/gui.cpp" line="1332"/>
         <source>Error loading map:</source>
         <translation>Wystąpił błąd podczas ładowania mapy:</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1356"/>
+        <location filename="../src/GUI/gui.cpp" line="1347"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n plik</numerusform>
@@ -744,7 +749,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="683"/>
+        <location filename="../src/GUI/gui.cpp" line="686"/>
         <source>Next file</source>
         <translation>Następny plik</translation>
     </message>
@@ -759,13 +764,13 @@
         <translation>Eksportuj do PDF...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1026"/>
-        <location filename="../src/GUI/gui.cpp" line="1095"/>
+        <location filename="../src/GUI/gui.cpp" line="1029"/>
+        <location filename="../src/GUI/gui.cpp" line="1098"/>
         <source>Waypoints</source>
         <translation>Punkty nawigacyjne</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="684"/>
+        <location filename="../src/GUI/gui.cpp" line="687"/>
         <source>Previous file</source>
         <translation>Poprzedni plik</translation>
     </message>
@@ -775,65 +780,65 @@
         <translation>Punkty trasy</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="686"/>
+        <location filename="../src/GUI/gui.cpp" line="689"/>
         <source>First file</source>
         <translation>Pierwszy plik</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="688"/>
+        <location filename="../src/GUI/gui.cpp" line="691"/>
         <source>Last file</source>
         <translation>Ostatni plik</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="830"/>
+        <location filename="../src/GUI/gui.cpp" line="833"/>
         <source>Error loading data file:</source>
         <translation>Błąd podczas ładowania pliku danych:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="833"/>
-        <location filename="../src/GUI/gui.cpp" line="868"/>
+        <location filename="../src/GUI/gui.cpp" line="836"/>
+        <location filename="../src/GUI/gui.cpp" line="871"/>
         <source>Line: %1</source>
         <translation>Linia: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="865"/>
+        <location filename="../src/GUI/gui.cpp" line="868"/>
         <source>Error loading POI file:</source>
         <translation>Błąd podczas ładowania pliku POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1087"/>
+        <location filename="../src/GUI/gui.cpp" line="1090"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1020"/>
-        <location filename="../src/GUI/gui.cpp" line="1091"/>
+        <location filename="../src/GUI/gui.cpp" line="1023"/>
+        <location filename="../src/GUI/gui.cpp" line="1094"/>
         <source>Tracks</source>
         <translation>Ślady</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="213"/>
-        <location filename="../src/GUI/gui.cpp" line="657"/>
+        <location filename="../src/GUI/gui.cpp" line="660"/>
         <source>About GPXSee</source>
         <translation>O programie GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="593"/>
+        <location filename="../src/GUI/gui.cpp" line="595"/>
         <source>Navigation</source>
         <translation>Nawigacja</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="365"/>
-        <location filename="../src/GUI/gui.cpp" line="1046"/>
-        <location filename="../src/GUI/gui.cpp" line="1113"/>
+        <location filename="../src/GUI/gui.cpp" line="1049"/>
+        <location filename="../src/GUI/gui.cpp" line="1116"/>
         <source>Distance</source>
         <translation>Dystans</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="372"/>
         <location filename="../src/GUI/gui.cpp" line="547"/>
-        <location filename="../src/GUI/gui.cpp" line="1049"/>
-        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1052"/>
+        <location filename="../src/GUI/gui.cpp" line="1118"/>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
@@ -986,37 +991,42 @@
 <context>
     <name>MapList</name>
     <message>
-        <location filename="../src/map/maplist.cpp" line="116"/>
+        <location filename="../src/map/maplist.cpp" line="119"/>
         <source>Supported files</source>
         <translation>Obsługiwane pliki</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="118"/>
+        <location filename="../src/map/maplist.cpp" line="121"/>
         <source>MBTiles maps</source>
         <translation>Mapy MBTiles</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="119"/>
+        <location filename="../src/map/maplist.cpp" line="122"/>
         <source>Garmin JNX maps</source>
         <translation>Mapy Garmin JNX</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="120"/>
+        <location filename="../src/map/maplist.cpp" line="123"/>
         <source>OziExplorer maps</source>
         <translation>Mapy OziExplorer</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="121"/>
+        <location filename="../src/map/maplist.cpp" line="124"/>
         <source>TrekBuddy maps/atlases</source>
         <translation>Mapy/atlasy TrekBuddy</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="122"/>
+        <location filename="../src/map/maplist.cpp" line="125"/>
         <source>GeoTIFF images</source>
         <translation>Obrazy GeoTIFF</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="123"/>
+        <location filename="../src/map/maplist.cpp" line="126"/>
+        <source>TwoNav maps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/map/maplist.cpp" line="127"/>
         <source>Online map sources</source>
         <translation>Źródła map online</translation>
     </message>

lang/gpxsee_pt_BR.ts

@@ -47,67 +47,72 @@
 <context>
     <name>Data</name>
     <message>
-        <location filename="../src/data/data.cpp" line="143"/>
+        <location filename="../src/data/data.cpp" line="147"/>
         <source>Supported files</source>
         <translation>Formatos suportados</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="144"/>
+        <location filename="../src/data/data.cpp" line="148"/>
         <source>CSV files</source>
         <translation>Arquivos CSV</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="145"/>
+        <location filename="../src/data/data.cpp" line="149"/>
         <source>FIT files</source>
         <translation>Arquivos FIT</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="147"/>
+        <location filename="../src/data/data.cpp" line="151"/>
         <source>GeoJSON files</source>
         <translation>Arquivos GeoJSON</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="149"/>
+        <location filename="../src/data/data.cpp" line="153"/>
         <source>GPX files</source>
         <translation>Arquivos GPX</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="150"/>
+        <location filename="../src/data/data.cpp" line="154"/>
         <source>IGC files</source>
         <translation>Arquivos IGC</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="151"/>
+        <location filename="../src/data/data.cpp" line="155"/>
+        <source>JPEG images</source>
+        <translation>Imagens JPEG</translation>
+    </message>
+    <message>
+        <location filename="../src/data/data.cpp" line="156"/>
         <source>KML files</source>
         <translation>Arquivos KML</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="152"/>
+        <location filename="../src/data/data.cpp" line="157"/>
         <source>LOC files</source>
         <translation>Arquivos LOC</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="153"/>
+        <location filename="../src/data/data.cpp" line="158"/>
         <source>NMEA files</source>
         <translation>Arquivos NMEA</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="154"/>
+        <location filename="../src/data/data.cpp" line="159"/>
         <source>OziExplorer files</source>
         <translation>Arquivos OziExplorer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="155"/>
+        <location filename="../src/data/data.cpp" line="160"/>
         <source>SLF files</source>
         <translation>Arquivos SLF</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="156"/>
+        <location filename="../src/data/data.cpp" line="161"/>
         <source>TCX files</source>
         <translation>Arquivos TCX</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="157"/>
+        <location filename="../src/data/data.cpp" line="162"/>
         <source>All files</source>
         <translation>Todos os arquivos</translation>
     </message>
@@ -332,21 +337,21 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="207"/>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
-        <location filename="../src/GUI/gui.cpp" line="714"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="717"/>
         <source>Paths</source>
         <translation>Caminhos</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="210"/>
-        <location filename="../src/GUI/gui.cpp" line="679"/>
-        <location filename="../src/GUI/gui.cpp" line="680"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
+        <location filename="../src/GUI/gui.cpp" line="683"/>
         <source>Keyboard controls</source>
         <translation>Controles de teclado</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="213"/>
-        <location filename="../src/GUI/gui.cpp" line="657"/>
+        <location filename="../src/GUI/gui.cpp" line="660"/>
         <source>About GPXSee</source>
         <translation>Sobre o GPXSee</translation>
     </message>
@@ -423,7 +428,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="302"/>
         <location filename="../src/GUI/gui.cpp" line="307"/>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
         <source>Next map</source>
         <translation>Próximo mapa</translation>
     </message>
@@ -469,16 +474,16 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="365"/>
-        <location filename="../src/GUI/gui.cpp" line="1046"/>
-        <location filename="../src/GUI/gui.cpp" line="1113"/>
+        <location filename="../src/GUI/gui.cpp" line="1049"/>
+        <location filename="../src/GUI/gui.cpp" line="1116"/>
         <source>Distance</source>
         <translation>Distância</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="372"/>
         <location filename="../src/GUI/gui.cpp" line="547"/>
-        <location filename="../src/GUI/gui.cpp" line="1049"/>
-        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1052"/>
+        <location filename="../src/GUI/gui.cpp" line="1118"/>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
@@ -509,8 +514,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="409"/>
-        <location filename="../src/GUI/gui.cpp" line="1051"/>
-        <location filename="../src/GUI/gui.cpp" line="1117"/>
+        <location filename="../src/GUI/gui.cpp" line="1054"/>
+        <location filename="../src/GUI/gui.cpp" line="1120"/>
         <source>Moving time</source>
         <translation>Tempo em movimento</translation>
     </message>
@@ -635,201 +640,201 @@
         <translation>Arquivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="587"/>
+        <location filename="../src/GUI/gui.cpp" line="588"/>
         <source>Show</source>
         <translation>Exibir</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="593"/>
+        <location filename="../src/GUI/gui.cpp" line="595"/>
         <source>Navigation</source>
         <translation>Navegação</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="658"/>
+        <location filename="../src/GUI/gui.cpp" line="661"/>
         <source>Version %1</source>
         <translation>Versão %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="662"/>
+        <location filename="../src/GUI/gui.cpp" line="665"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1.</source>
         <translation>GPXSee é distribuído nos termos da Licença Pública Geral GNU versão 3. Para mais informações sobre o GPXSee visite a página do projeto em %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="683"/>
+        <location filename="../src/GUI/gui.cpp" line="686"/>
         <source>Next file</source>
         <translation>Próximo arquivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="684"/>
+        <location filename="../src/GUI/gui.cpp" line="687"/>
         <source>Previous file</source>
         <translation>Arquivo anterior</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="686"/>
+        <location filename="../src/GUI/gui.cpp" line="689"/>
         <source>First file</source>
         <translation>Primeiro arquivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="688"/>
+        <location filename="../src/GUI/gui.cpp" line="691"/>
         <source>Last file</source>
         <translation>Último arquivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="689"/>
+        <location filename="../src/GUI/gui.cpp" line="692"/>
         <source>Append file</source>
         <translation>Anexar arquivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="690"/>
+        <location filename="../src/GUI/gui.cpp" line="693"/>
         <source>Next/Previous</source>
         <translation>Próximo/Anterior</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="695"/>
         <source>Toggle graph type</source>
         <translation>Alterna o tipo do gráfico</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="694"/>
+        <location filename="../src/GUI/gui.cpp" line="697"/>
         <source>Toggle time type</source>
         <translation>Alterna o tipo de tempo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="701"/>
         <source>Previous map</source>
         <translation>Mapa anterior</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="702"/>
         <source>Zoom in</source>
         <translation>Aumentar o zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Zoom out</source>
         <translation>Reduzir o zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="703"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>Digital zoom</source>
         <translation>Zoom digital</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="707"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="717"/>
+        <location filename="../src/GUI/gui.cpp" line="720"/>
         <source>Map directory:</source>
         <translation>Diretório de mapas:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="719"/>
+        <location filename="../src/GUI/gui.cpp" line="722"/>
         <source>POI directory:</source>
         <translation>Diretório de POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="721"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>GCS/PCS directory:</source>
         <translation>Diretório de GCS/PCS:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="723"/>
+        <location filename="../src/GUI/gui.cpp" line="726"/>
         <source>DEM directory:</source>
         <translation>Diretório de DEM:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
+        <location filename="../src/GUI/gui.cpp" line="728"/>
         <source>Tile cache directory:</source>
         <translation>Diretório de cache de ladrilhos:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="734"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Open file</source>
         <translation>Abrir arquivo</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="830"/>
+        <location filename="../src/GUI/gui.cpp" line="833"/>
         <source>Error loading data file:</source>
         <translation>Erro ao carregar arquivo de dados:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="833"/>
-        <location filename="../src/GUI/gui.cpp" line="868"/>
+        <location filename="../src/GUI/gui.cpp" line="836"/>
+        <location filename="../src/GUI/gui.cpp" line="871"/>
         <source>Line: %1</source>
         <translation>Linha: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="841"/>
+        <location filename="../src/GUI/gui.cpp" line="844"/>
         <source>Open POI file</source>
         <translation>Abrir aquivo POI</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="865"/>
+        <location filename="../src/GUI/gui.cpp" line="868"/>
         <source>Error loading POI file:</source>
         <translation>Erro ao carregar arquivo POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1020"/>
-        <location filename="../src/GUI/gui.cpp" line="1091"/>
+        <location filename="../src/GUI/gui.cpp" line="1023"/>
+        <location filename="../src/GUI/gui.cpp" line="1094"/>
         <source>Tracks</source>
         <translation>Trilhas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1023"/>
-        <location filename="../src/GUI/gui.cpp" line="1093"/>
+        <location filename="../src/GUI/gui.cpp" line="1026"/>
+        <location filename="../src/GUI/gui.cpp" line="1096"/>
         <source>Routes</source>
         <translation>Rotas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1026"/>
-        <location filename="../src/GUI/gui.cpp" line="1095"/>
+        <location filename="../src/GUI/gui.cpp" line="1029"/>
+        <location filename="../src/GUI/gui.cpp" line="1098"/>
         <source>Waypoints</source>
         <translation>Waypoints</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1029"/>
-        <location filename="../src/GUI/gui.cpp" line="1097"/>
+        <location filename="../src/GUI/gui.cpp" line="1032"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
         <source>Areas</source>
         <translation>Áreas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1035"/>
-        <location filename="../src/GUI/gui.cpp" line="1039"/>
-        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1038"/>
+        <location filename="../src/GUI/gui.cpp" line="1042"/>
         <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1072"/>
-        <location filename="../src/GUI/gui.cpp" line="1073"/>
+        <location filename="../src/GUI/gui.cpp" line="1075"/>
+        <location filename="../src/GUI/gui.cpp" line="1076"/>
         <source>Statistics</source>
         <translation>Estatísticas</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1087"/>
+        <location filename="../src/GUI/gui.cpp" line="1090"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1318"/>
+        <location filename="../src/GUI/gui.cpp" line="1309"/>
         <source>Open map file</source>
         <translation>Abrir arquivo de mapa</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1341"/>
+        <location filename="../src/GUI/gui.cpp" line="1332"/>
         <source>Error loading map:</source>
         <translation>Erro ao carregar o mapa:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1352"/>
+        <location filename="../src/GUI/gui.cpp" line="1343"/>
         <source>No files loaded</source>
         <translation>Nenhum arquivo carregado</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1356"/>
+        <location filename="../src/GUI/gui.cpp" line="1347"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n arquivo</numerusform>
@@ -985,37 +990,42 @@
 <context>
     <name>MapList</name>
     <message>
-        <location filename="../src/map/maplist.cpp" line="116"/>
+        <location filename="../src/map/maplist.cpp" line="119"/>
         <source>Supported files</source>
         <translation>Formatos suportados</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="118"/>
+        <location filename="../src/map/maplist.cpp" line="121"/>
         <source>MBTiles maps</source>
         <translation>Mapas MBTiles</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="119"/>
+        <location filename="../src/map/maplist.cpp" line="122"/>
         <source>Garmin JNX maps</source>
         <translation>Mapas Garmin JNX</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="120"/>
+        <location filename="../src/map/maplist.cpp" line="123"/>
         <source>OziExplorer maps</source>
         <translation>Mapas OziExplorer</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="121"/>
+        <location filename="../src/map/maplist.cpp" line="124"/>
         <source>TrekBuddy maps/atlases</source>
         <translation>Mapas/Atlas TrekBuddy</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="122"/>
+        <location filename="../src/map/maplist.cpp" line="125"/>
         <source>GeoTIFF images</source>
         <translation>Imagens GeoTIFF</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="123"/>
+        <location filename="../src/map/maplist.cpp" line="126"/>
+        <source>TwoNav maps</source>
+        <translation>Mapas TwoNav</translation>
+    </message>
+    <message>
+        <location filename="../src/map/maplist.cpp" line="127"/>
         <source>Online map sources</source>
         <translation>Mapas online</translation>
     </message>

lang/gpxsee_ru.ts

@@ -47,67 +47,72 @@
 <context>
     <name>Data</name>
     <message>
-        <location filename="../src/data/data.cpp" line="143"/>
+        <location filename="../src/data/data.cpp" line="147"/>
         <source>Supported files</source>
         <translation>Все поддерживаемые файлы</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="144"/>
+        <location filename="../src/data/data.cpp" line="148"/>
         <source>CSV files</source>
         <translation>CSV файлы</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="145"/>
+        <location filename="../src/data/data.cpp" line="149"/>
         <source>FIT files</source>
         <translation>FIT файлы</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="147"/>
+        <location filename="../src/data/data.cpp" line="151"/>
         <source>GeoJSON files</source>
         <translation>GeoJSON файлы</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="149"/>
+        <location filename="../src/data/data.cpp" line="153"/>
         <source>GPX files</source>
         <translation>GPX файлы</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="150"/>
+        <location filename="../src/data/data.cpp" line="154"/>
         <source>IGC files</source>
         <translation>IGC файлы</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="151"/>
+        <location filename="../src/data/data.cpp" line="155"/>
+        <source>JPEG images</source>
+        <translation>JPEG изображения</translation>
+    </message>
+    <message>
+        <location filename="../src/data/data.cpp" line="156"/>
         <source>KML files</source>
         <translation>KML файлы</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="152"/>
+        <location filename="../src/data/data.cpp" line="157"/>
         <source>LOC files</source>
         <translation>LOC файлы</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="153"/>
+        <location filename="../src/data/data.cpp" line="158"/>
         <source>NMEA files</source>
         <translation>NMEA файлы</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="154"/>
+        <location filename="../src/data/data.cpp" line="159"/>
         <source>OziExplorer files</source>
         <translation>OziExplorer файлы</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="156"/>
+        <location filename="../src/data/data.cpp" line="161"/>
         <source>TCX files</source>
         <translation>TCX файлы</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="155"/>
+        <location filename="../src/data/data.cpp" line="160"/>
         <source>SLF files</source>
         <translation>SLF файлы</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="157"/>
+        <location filename="../src/data/data.cpp" line="162"/>
         <source>All files</source>
         <translation>Все файлы</translation>
     </message>
@@ -326,12 +331,12 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="734"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Open file</source>
         <translation>Открыть файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="841"/>
+        <location filename="../src/GUI/gui.cpp" line="844"/>
         <source>Open POI file</source>
         <translation>Открыть файл с точками POI</translation>
     </message>
@@ -342,8 +347,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="210"/>
-        <location filename="../src/GUI/gui.cpp" line="679"/>
-        <location filename="../src/GUI/gui.cpp" line="680"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
+        <location filename="../src/GUI/gui.cpp" line="683"/>
         <source>Keyboard controls</source>
         <translation>Управление с помощью клавиатуры</translation>
     </message>
@@ -358,7 +363,7 @@
         <translation>Обновить</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="587"/>
+        <location filename="../src/GUI/gui.cpp" line="588"/>
         <source>Show</source>
         <translation>Показать</translation>
     </message>
@@ -404,8 +409,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="207"/>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
-        <location filename="../src/GUI/gui.cpp" line="714"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="717"/>
         <source>Paths</source>
         <translation>Пути</translation>
     </message>
@@ -427,7 +432,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="302"/>
         <location filename="../src/GUI/gui.cpp" line="307"/>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
         <source>Next map</source>
         <translation>Следующая карта</translation>
     </message>
@@ -493,8 +498,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="409"/>
-        <location filename="../src/GUI/gui.cpp" line="1051"/>
-        <location filename="../src/GUI/gui.cpp" line="1117"/>
+        <location filename="../src/GUI/gui.cpp" line="1054"/>
+        <location filename="../src/GUI/gui.cpp" line="1120"/>
         <source>Moving time</source>
         <translation>Время движения</translation>
     </message>
@@ -579,97 +584,97 @@
         <translation>Формат координат</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="658"/>
+        <location filename="../src/GUI/gui.cpp" line="661"/>
         <source>Version %1</source>
         <translation>Версия %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="662"/>
+        <location filename="../src/GUI/gui.cpp" line="665"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1.</source>
         <translation>GPXSee распространяется в соответствиями с условиями версии 3 Стандартной Общественной Лицензии GNU. Для получения дополнительной информации о GPXSee посетите страницу проекта %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="689"/>
+        <location filename="../src/GUI/gui.cpp" line="692"/>
         <source>Append file</source>
         <translation>Добавить файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="690"/>
+        <location filename="../src/GUI/gui.cpp" line="693"/>
         <source>Next/Previous</source>
         <translation>Следующий/предыдущий</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="695"/>
         <source>Toggle graph type</source>
         <translation>Переключить тип графика</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="694"/>
+        <location filename="../src/GUI/gui.cpp" line="697"/>
         <source>Toggle time type</source>
         <translation>Переключить тип времени</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="701"/>
         <source>Previous map</source>
         <translation>Предыдущая карта</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="702"/>
         <source>Zoom in</source>
         <translation>Увеличить</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Zoom out</source>
         <translation>Уменьшить</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="703"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>Digital zoom</source>
         <translation>Цифровой зум</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="707"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="721"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>GCS/PCS directory:</source>
         <translation>Каталог с GCS/PCS:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="723"/>
+        <location filename="../src/GUI/gui.cpp" line="726"/>
         <source>DEM directory:</source>
         <translation>Каталог с DEM данными:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1029"/>
-        <location filename="../src/GUI/gui.cpp" line="1097"/>
+        <location filename="../src/GUI/gui.cpp" line="1032"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
         <source>Areas</source>
         <translation>Области</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1072"/>
-        <location filename="../src/GUI/gui.cpp" line="1073"/>
+        <location filename="../src/GUI/gui.cpp" line="1075"/>
+        <location filename="../src/GUI/gui.cpp" line="1076"/>
         <source>Statistics</source>
         <translation>Статистика</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1318"/>
+        <location filename="../src/GUI/gui.cpp" line="1309"/>
         <source>Open map file</source>
         <translation>Открыть файл карты</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1352"/>
+        <location filename="../src/GUI/gui.cpp" line="1343"/>
         <source>No files loaded</source>
         <translation>Нет загруженных файлов</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1035"/>
-        <location filename="../src/GUI/gui.cpp" line="1039"/>
-        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1038"/>
+        <location filename="../src/GUI/gui.cpp" line="1042"/>
         <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
@@ -709,33 +714,33 @@
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="717"/>
+        <location filename="../src/GUI/gui.cpp" line="720"/>
         <source>Map directory:</source>
         <translation>Каталог с картами:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="719"/>
+        <location filename="../src/GUI/gui.cpp" line="722"/>
         <source>POI directory:</source>
         <translation>Каталог с POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
+        <location filename="../src/GUI/gui.cpp" line="728"/>
         <source>Tile cache directory:</source>
         <translation>Каталог кеша тайлов:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1023"/>
-        <location filename="../src/GUI/gui.cpp" line="1093"/>
+        <location filename="../src/GUI/gui.cpp" line="1026"/>
+        <location filename="../src/GUI/gui.cpp" line="1096"/>
         <source>Routes</source>
         <translation>Маршруты</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1341"/>
+        <location filename="../src/GUI/gui.cpp" line="1332"/>
         <source>Error loading map:</source>
         <translation>Ошибка загрузки карты:</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1356"/>
+        <location filename="../src/GUI/gui.cpp" line="1347"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n файл</numerusform>
@@ -744,7 +749,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="683"/>
+        <location filename="../src/GUI/gui.cpp" line="686"/>
         <source>Next file</source>
         <translation>Следующий файл</translation>
     </message>
@@ -759,13 +764,13 @@
         <translation>Экспорт в PDF…</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1026"/>
-        <location filename="../src/GUI/gui.cpp" line="1095"/>
+        <location filename="../src/GUI/gui.cpp" line="1029"/>
+        <location filename="../src/GUI/gui.cpp" line="1098"/>
         <source>Waypoints</source>
         <translation>Точки</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="684"/>
+        <location filename="../src/GUI/gui.cpp" line="687"/>
         <source>Previous file</source>
         <translation>Предыдущий файл</translation>
     </message>
@@ -775,65 +780,65 @@
         <translation>Маршрутные точки</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="686"/>
+        <location filename="../src/GUI/gui.cpp" line="689"/>
         <source>First file</source>
         <translation>Первый файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="688"/>
+        <location filename="../src/GUI/gui.cpp" line="691"/>
         <source>Last file</source>
         <translation>Последний файл</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="830"/>
+        <location filename="../src/GUI/gui.cpp" line="833"/>
         <source>Error loading data file:</source>
         <translation>Ошибка загрузки файла данных:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="833"/>
-        <location filename="../src/GUI/gui.cpp" line="868"/>
+        <location filename="../src/GUI/gui.cpp" line="836"/>
+        <location filename="../src/GUI/gui.cpp" line="871"/>
         <source>Line: %1</source>
         <translation>Строка: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="865"/>
+        <location filename="../src/GUI/gui.cpp" line="868"/>
         <source>Error loading POI file:</source>
         <translation>Ошибка загрузки файла с точками POI:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1087"/>
+        <location filename="../src/GUI/gui.cpp" line="1090"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1020"/>
-        <location filename="../src/GUI/gui.cpp" line="1091"/>
+        <location filename="../src/GUI/gui.cpp" line="1023"/>
+        <location filename="../src/GUI/gui.cpp" line="1094"/>
         <source>Tracks</source>
         <translation>Треки</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="213"/>
-        <location filename="../src/GUI/gui.cpp" line="657"/>
+        <location filename="../src/GUI/gui.cpp" line="660"/>
         <source>About GPXSee</source>
         <translation>О GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="593"/>
+        <location filename="../src/GUI/gui.cpp" line="595"/>
         <source>Navigation</source>
         <translation>Навигация</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="365"/>
-        <location filename="../src/GUI/gui.cpp" line="1046"/>
-        <location filename="../src/GUI/gui.cpp" line="1113"/>
+        <location filename="../src/GUI/gui.cpp" line="1049"/>
+        <location filename="../src/GUI/gui.cpp" line="1116"/>
         <source>Distance</source>
         <translation>Расстояние</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="372"/>
         <location filename="../src/GUI/gui.cpp" line="547"/>
-        <location filename="../src/GUI/gui.cpp" line="1049"/>
-        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1052"/>
+        <location filename="../src/GUI/gui.cpp" line="1118"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
@@ -986,37 +991,42 @@
 <context>
     <name>MapList</name>
     <message>
-        <location filename="../src/map/maplist.cpp" line="116"/>
+        <location filename="../src/map/maplist.cpp" line="119"/>
         <source>Supported files</source>
         <translation>Все поддерживаемые файлы</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="118"/>
+        <location filename="../src/map/maplist.cpp" line="121"/>
         <source>MBTiles maps</source>
         <translation>MBTiles карты</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="119"/>
+        <location filename="../src/map/maplist.cpp" line="122"/>
         <source>Garmin JNX maps</source>
         <translation>Garmin JNX карты</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="120"/>
+        <location filename="../src/map/maplist.cpp" line="123"/>
         <source>OziExplorer maps</source>
         <translation>OziExplorer карты</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="121"/>
+        <location filename="../src/map/maplist.cpp" line="124"/>
         <source>TrekBuddy maps/atlases</source>
         <translation>TrekBuddy карты/атласы</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="122"/>
+        <location filename="../src/map/maplist.cpp" line="125"/>
         <source>GeoTIFF images</source>
         <translation>GeoTIFF изображения</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="123"/>
+        <location filename="../src/map/maplist.cpp" line="126"/>
+        <source>TwoNav maps</source>
+        <translation>TwoNav карты</translation>
+    </message>
+    <message>
+        <location filename="../src/map/maplist.cpp" line="127"/>
         <source>Online map sources</source>
         <translation>Источники онлайн карт</translation>
     </message>

lang/gpxsee_sv.ts

@@ -47,67 +47,72 @@
 <context>
     <name>Data</name>
     <message>
-        <location filename="../src/data/data.cpp" line="143"/>
+        <location filename="../src/data/data.cpp" line="147"/>
         <source>Supported files</source>
         <translation>Filer som stöds</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="144"/>
+        <location filename="../src/data/data.cpp" line="148"/>
         <source>CSV files</source>
         <translation>CSV-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="145"/>
+        <location filename="../src/data/data.cpp" line="149"/>
         <source>FIT files</source>
         <translation>FIT-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="147"/>
+        <location filename="../src/data/data.cpp" line="151"/>
         <source>GeoJSON files</source>
         <translation>GeoJSON-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="149"/>
+        <location filename="../src/data/data.cpp" line="153"/>
         <source>GPX files</source>
         <translation>GPX-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="150"/>
+        <location filename="../src/data/data.cpp" line="154"/>
         <source>IGC files</source>
         <translation>IGC-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="151"/>
+        <location filename="../src/data/data.cpp" line="155"/>
+        <source>JPEG images</source>
+        <translation>JPEG-bilder</translation>
+    </message>
+    <message>
+        <location filename="../src/data/data.cpp" line="156"/>
         <source>KML files</source>
         <translation>KML-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="152"/>
+        <location filename="../src/data/data.cpp" line="157"/>
         <source>LOC files</source>
         <translation>LOC-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="153"/>
+        <location filename="../src/data/data.cpp" line="158"/>
         <source>NMEA files</source>
         <translation>NMEA-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="154"/>
+        <location filename="../src/data/data.cpp" line="159"/>
         <source>OziExplorer files</source>
         <translation>OziExplorer-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="156"/>
+        <location filename="../src/data/data.cpp" line="161"/>
         <source>TCX files</source>
         <translation>TCX-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="155"/>
+        <location filename="../src/data/data.cpp" line="160"/>
         <source>SLF files</source>
         <translation>SLF-filer</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="157"/>
+        <location filename="../src/data/data.cpp" line="162"/>
         <source>All files</source>
         <translation>Alla filer</translation>
     </message>
@@ -326,22 +331,22 @@
 <context>
     <name>GUI</name>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="717"/>
+        <location filename="../src/GUI/gui.cpp" line="720"/>
         <source>Map directory:</source>
         <translation>Kartmapp:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="719"/>
+        <location filename="../src/GUI/gui.cpp" line="722"/>
         <source>POI directory:</source>
         <translation>POI-mapp:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="734"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Open file</source>
         <translation>Öppna fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="841"/>
+        <location filename="../src/GUI/gui.cpp" line="844"/>
         <source>Open POI file</source>
         <translation>Öppna POI-fil</translation>
     </message>
@@ -352,8 +357,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="210"/>
-        <location filename="../src/GUI/gui.cpp" line="679"/>
-        <location filename="../src/GUI/gui.cpp" line="680"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
+        <location filename="../src/GUI/gui.cpp" line="683"/>
         <source>Keyboard controls</source>
         <translation>Snabbtangenter</translation>
     </message>
@@ -368,7 +373,7 @@
         <translation>Uppdatera</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="587"/>
+        <location filename="../src/GUI/gui.cpp" line="588"/>
         <source>Show</source>
         <translation>Visa</translation>
     </message>
@@ -414,8 +419,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="207"/>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
-        <location filename="../src/GUI/gui.cpp" line="714"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="717"/>
         <source>Paths</source>
         <translation>Sökvägar</translation>
     </message>
@@ -437,7 +442,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="302"/>
         <location filename="../src/GUI/gui.cpp" line="307"/>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
         <source>Next map</source>
         <translation>Nästa karta</translation>
     </message>
@@ -503,8 +508,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="409"/>
-        <location filename="../src/GUI/gui.cpp" line="1051"/>
-        <location filename="../src/GUI/gui.cpp" line="1117"/>
+        <location filename="../src/GUI/gui.cpp" line="1054"/>
+        <location filename="../src/GUI/gui.cpp" line="1120"/>
         <source>Moving time</source>
         <translation>Förflyttningstid</translation>
     </message>
@@ -589,99 +594,99 @@
         <translation>Koordinatformat</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="658"/>
+        <location filename="../src/GUI/gui.cpp" line="661"/>
         <source>Version %1</source>
         <translation>Version %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="662"/>
+        <location filename="../src/GUI/gui.cpp" line="665"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1.</source>
         <translation>GPXSee distribueras under vilkoren för GNU General Public License version 3. För mer info om GPXSee, besök hemsidan på %1.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="689"/>
+        <location filename="../src/GUI/gui.cpp" line="692"/>
         <source>Append file</source>
         <translation>Lägg till fil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="690"/>
+        <location filename="../src/GUI/gui.cpp" line="693"/>
         <source>Next/Previous</source>
         <translation>Nästa/Föregående</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="695"/>
         <source>Toggle graph type</source>
         <translation>Växla diagramtyp</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="694"/>
+        <location filename="../src/GUI/gui.cpp" line="697"/>
         <source>Toggle time type</source>
         <translation>Växla tidstyp</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="701"/>
         <source>Previous map</source>
         <translation>Föregående karta</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="702"/>
         <source>Zoom in</source>
         <translation>Zooma in</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Zoom out</source>
         <translation>Zooma ut</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="703"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>Digital zoom</source>
         <translation>Digital zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="707"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="721"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>GCS/PCS directory:</source>
         <translation>GCS-/PCS-mapp:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="723"/>
+        <location filename="../src/GUI/gui.cpp" line="726"/>
         <source>DEM directory:</source>
         <translation>DEM-mapp:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1029"/>
-        <location filename="../src/GUI/gui.cpp" line="1097"/>
+        <location filename="../src/GUI/gui.cpp" line="1032"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
         <source>Areas</source>
         <translation>Områden</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1072"/>
-        <location filename="../src/GUI/gui.cpp" line="1073"/>
+        <location filename="../src/GUI/gui.cpp" line="1075"/>
+        <location filename="../src/GUI/gui.cpp" line="1076"/>
         <source>Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1318"/>
+        <location filename="../src/GUI/gui.cpp" line="1309"/>
         <source>Open map file</source>
         <translation>Öppna kartfil</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1341"/>
+        <location filename="../src/GUI/gui.cpp" line="1332"/>
         <source>Error loading map:</source>
         <translation>Fel vid inläsning av karta:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1352"/>
+        <location filename="../src/GUI/gui.cpp" line="1343"/>
         <source>No files loaded</source>
         <translation>Inga filer inlästa</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1356"/>
+        <location filename="../src/GUI/gui.cpp" line="1347"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n fil</numerusform>
@@ -689,21 +694,21 @@
         </translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1035"/>
-        <location filename="../src/GUI/gui.cpp" line="1039"/>
-        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1038"/>
+        <location filename="../src/GUI/gui.cpp" line="1042"/>
         <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1023"/>
-        <location filename="../src/GUI/gui.cpp" line="1093"/>
+        <location filename="../src/GUI/gui.cpp" line="1026"/>
+        <location filename="../src/GUI/gui.cpp" line="1096"/>
         <source>Routes</source>
         <translation>Rutter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="683"/>
+        <location filename="../src/GUI/gui.cpp" line="686"/>
         <source>Next file</source>
         <translation>Nästa fil</translation>
     </message>
@@ -718,13 +723,13 @@
         <translation>Exportera till PDF...</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1026"/>
-        <location filename="../src/GUI/gui.cpp" line="1095"/>
+        <location filename="../src/GUI/gui.cpp" line="1029"/>
+        <location filename="../src/GUI/gui.cpp" line="1098"/>
         <source>Waypoints</source>
         <translation>Vägpunkter</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="684"/>
+        <location filename="../src/GUI/gui.cpp" line="687"/>
         <source>Previous file</source>
         <translation>Föregående fil</translation>
     </message>
@@ -769,70 +774,70 @@
         <translation>&amp;Hjälp</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="686"/>
+        <location filename="../src/GUI/gui.cpp" line="689"/>
         <source>First file</source>
         <translation>Första filen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="688"/>
+        <location filename="../src/GUI/gui.cpp" line="691"/>
         <source>Last file</source>
         <translation>Sista filen</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
+        <location filename="../src/GUI/gui.cpp" line="728"/>
         <source>Tile cache directory:</source>
         <translation>Mapp för kart-cache:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="830"/>
+        <location filename="../src/GUI/gui.cpp" line="833"/>
         <source>Error loading data file:</source>
         <translation>Fel vid inläsning av datafil:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="833"/>
-        <location filename="../src/GUI/gui.cpp" line="868"/>
+        <location filename="../src/GUI/gui.cpp" line="836"/>
+        <location filename="../src/GUI/gui.cpp" line="871"/>
         <source>Line: %1</source>
         <translation>Rad: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="865"/>
+        <location filename="../src/GUI/gui.cpp" line="868"/>
         <source>Error loading POI file:</source>
         <translation>Fel vid inläsning av POI-fil:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1087"/>
+        <location filename="../src/GUI/gui.cpp" line="1090"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1020"/>
-        <location filename="../src/GUI/gui.cpp" line="1091"/>
+        <location filename="../src/GUI/gui.cpp" line="1023"/>
+        <location filename="../src/GUI/gui.cpp" line="1094"/>
         <source>Tracks</source>
         <translation>Spår</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="213"/>
-        <location filename="../src/GUI/gui.cpp" line="657"/>
+        <location filename="../src/GUI/gui.cpp" line="660"/>
         <source>About GPXSee</source>
         <translation>Om GPXSee</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="593"/>
+        <location filename="../src/GUI/gui.cpp" line="595"/>
         <source>Navigation</source>
         <translation>Navigation</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="365"/>
-        <location filename="../src/GUI/gui.cpp" line="1046"/>
-        <location filename="../src/GUI/gui.cpp" line="1113"/>
+        <location filename="../src/GUI/gui.cpp" line="1049"/>
+        <location filename="../src/GUI/gui.cpp" line="1116"/>
         <source>Distance</source>
         <translation>Avstånd</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="372"/>
         <location filename="../src/GUI/gui.cpp" line="547"/>
-        <location filename="../src/GUI/gui.cpp" line="1049"/>
-        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1052"/>
+        <location filename="../src/GUI/gui.cpp" line="1118"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
@@ -985,37 +990,42 @@
 <context>
     <name>MapList</name>
     <message>
-        <location filename="../src/map/maplist.cpp" line="116"/>
+        <location filename="../src/map/maplist.cpp" line="119"/>
         <source>Supported files</source>
         <translation>Filer som stöds</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="118"/>
+        <location filename="../src/map/maplist.cpp" line="121"/>
         <source>MBTiles maps</source>
         <translation>MBTiles-kartor</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="119"/>
+        <location filename="../src/map/maplist.cpp" line="122"/>
         <source>Garmin JNX maps</source>
         <translation>Garmin JNX-kartor</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="120"/>
+        <location filename="../src/map/maplist.cpp" line="123"/>
         <source>OziExplorer maps</source>
         <translation>OziExplorer-kartor</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="121"/>
+        <location filename="../src/map/maplist.cpp" line="124"/>
         <source>TrekBuddy maps/atlases</source>
         <translation>TrekBuddy-kartor/-atlaser</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="122"/>
+        <location filename="../src/map/maplist.cpp" line="125"/>
         <source>GeoTIFF images</source>
         <translation>GeoTIFF-bilder</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="123"/>
+        <location filename="../src/map/maplist.cpp" line="126"/>
+        <source>TwoNav maps</source>
+        <translation>TwoNav-kartor</translation>
+    </message>
+    <message>
+        <location filename="../src/map/maplist.cpp" line="127"/>
         <source>Online map sources</source>
         <translation>Online-kartkällor</translation>
     </message>

lang/gpxsee_tr.ts

@@ -47,67 +47,72 @@
 <context>
     <name>Data</name>
     <message>
-        <location filename="../src/data/data.cpp" line="143"/>
+        <location filename="../src/data/data.cpp" line="147"/>
         <source>Supported files</source>
         <translation>Desteklenen dosyalar</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="144"/>
+        <location filename="../src/data/data.cpp" line="148"/>
         <source>CSV files</source>
         <translation>CSV dosyalar</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="145"/>
+        <location filename="../src/data/data.cpp" line="149"/>
         <source>FIT files</source>
         <translation>FIT dosyalar</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="147"/>
+        <location filename="../src/data/data.cpp" line="151"/>
         <source>GeoJSON files</source>
         <translation>GeoJSON dosyalar</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="149"/>
+        <location filename="../src/data/data.cpp" line="153"/>
         <source>GPX files</source>
         <translation>GPX dosyalar</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="150"/>
+        <location filename="../src/data/data.cpp" line="154"/>
         <source>IGC files</source>
         <translation>IGC dosyalar</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="151"/>
+        <location filename="../src/data/data.cpp" line="155"/>
+        <source>JPEG images</source>
+        <translation>JPEG resimler</translation>
+    </message>
+    <message>
+        <location filename="../src/data/data.cpp" line="156"/>
         <source>KML files</source>
         <translation>KML dosyalar</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="152"/>
+        <location filename="../src/data/data.cpp" line="157"/>
         <source>LOC files</source>
         <translation>LOC dosyalar</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="153"/>
+        <location filename="../src/data/data.cpp" line="158"/>
         <source>NMEA files</source>
         <translation>NMEA dosyalar</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="154"/>
+        <location filename="../src/data/data.cpp" line="159"/>
         <source>OziExplorer files</source>
         <translation>OziExplorer dosyalar</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="155"/>
+        <location filename="../src/data/data.cpp" line="160"/>
         <source>SLF files</source>
         <translation>SLF dosyalar</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="156"/>
+        <location filename="../src/data/data.cpp" line="161"/>
         <source>TCX files</source>
         <translation>TCX dosyalar</translation>
     </message>
     <message>
-        <location filename="../src/data/data.cpp" line="157"/>
+        <location filename="../src/data/data.cpp" line="162"/>
         <source>All files</source>
         <translation>Tüm dosyalar</translation>
     </message>
@@ -332,21 +337,21 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="207"/>
-        <location filename="../src/GUI/gui.cpp" line="713"/>
-        <location filename="../src/GUI/gui.cpp" line="714"/>
+        <location filename="../src/GUI/gui.cpp" line="716"/>
+        <location filename="../src/GUI/gui.cpp" line="717"/>
         <source>Paths</source>
         <translation>Klasör konumları</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="210"/>
-        <location filename="../src/GUI/gui.cpp" line="679"/>
-        <location filename="../src/GUI/gui.cpp" line="680"/>
+        <location filename="../src/GUI/gui.cpp" line="682"/>
+        <location filename="../src/GUI/gui.cpp" line="683"/>
         <source>Keyboard controls</source>
         <translation>Klavye kontrolleri</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="213"/>
-        <location filename="../src/GUI/gui.cpp" line="657"/>
+        <location filename="../src/GUI/gui.cpp" line="660"/>
         <source>About GPXSee</source>
         <translation>Hakkında GPXSee</translation>
     </message>
@@ -423,7 +428,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="302"/>
         <location filename="../src/GUI/gui.cpp" line="307"/>
-        <location filename="../src/GUI/gui.cpp" line="696"/>
+        <location filename="../src/GUI/gui.cpp" line="699"/>
         <source>Next map</source>
         <translation>Sonraki harita</translation>
     </message>
@@ -469,16 +474,16 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="365"/>
-        <location filename="../src/GUI/gui.cpp" line="1046"/>
-        <location filename="../src/GUI/gui.cpp" line="1113"/>
+        <location filename="../src/GUI/gui.cpp" line="1049"/>
+        <location filename="../src/GUI/gui.cpp" line="1116"/>
         <source>Distance</source>
         <translation>Mesafe</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="372"/>
         <location filename="../src/GUI/gui.cpp" line="547"/>
-        <location filename="../src/GUI/gui.cpp" line="1049"/>
-        <location filename="../src/GUI/gui.cpp" line="1115"/>
+        <location filename="../src/GUI/gui.cpp" line="1052"/>
+        <location filename="../src/GUI/gui.cpp" line="1118"/>
         <source>Time</source>
         <translation>Zaman</translation>
     </message>
@@ -509,8 +514,8 @@
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="409"/>
-        <location filename="../src/GUI/gui.cpp" line="1051"/>
-        <location filename="../src/GUI/gui.cpp" line="1117"/>
+        <location filename="../src/GUI/gui.cpp" line="1054"/>
+        <location filename="../src/GUI/gui.cpp" line="1120"/>
         <source>Moving time</source>
         <translation>Hareket süresi</translation>
     </message>
@@ -635,205 +640,204 @@
         <translation>Dosya</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="587"/>
+        <location filename="../src/GUI/gui.cpp" line="588"/>
         <source>Show</source>
         <translation>Göster</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="593"/>
+        <location filename="../src/GUI/gui.cpp" line="595"/>
         <source>Navigation</source>
         <translation>Navigasyon</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="658"/>
+        <location filename="../src/GUI/gui.cpp" line="661"/>
         <source>Version %1</source>
         <translation>Sürüm %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="662"/>
+        <location filename="../src/GUI/gui.cpp" line="665"/>
         <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1.</source>
         <translation>GPXSee, GNU Genel Kamu Lisansı sürüm 3 şartlarına göre dağıtılır. GPXSee hakkında daha fazla bilgi için %1 proje ana sayfasını ziyaret edin.</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="683"/>
+        <location filename="../src/GUI/gui.cpp" line="686"/>
         <source>Next file</source>
         <translation>Sonraki dosya</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="684"/>
+        <location filename="../src/GUI/gui.cpp" line="687"/>
         <source>Previous file</source>
         <translation>Önceki dosya</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="686"/>
+        <location filename="../src/GUI/gui.cpp" line="689"/>
         <source>First file</source>
         <translation>İlk dosya</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="688"/>
+        <location filename="../src/GUI/gui.cpp" line="691"/>
         <source>Last file</source>
         <translation>Son dosya</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="689"/>
+        <location filename="../src/GUI/gui.cpp" line="692"/>
         <source>Append file</source>
         <translation>Dosya ekle</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="690"/>
+        <location filename="../src/GUI/gui.cpp" line="693"/>
         <source>Next/Previous</source>
         <translation>Sonraki/Önceki</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="692"/>
+        <location filename="../src/GUI/gui.cpp" line="695"/>
         <source>Toggle graph type</source>
         <translation>Geçiş grafik türü</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="694"/>
+        <location filename="../src/GUI/gui.cpp" line="697"/>
         <source>Toggle time type</source>
         <translation>Geçiş zaman türü</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="698"/>
+        <location filename="../src/GUI/gui.cpp" line="701"/>
         <source>Previous map</source>
         <translation>Önceki harita</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="699"/>
+        <location filename="../src/GUI/gui.cpp" line="702"/>
         <source>Zoom in</source>
         <translation>Yaklaş</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="701"/>
+        <location filename="../src/GUI/gui.cpp" line="704"/>
         <source>Zoom out</source>
         <translation>Uzaklaş</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="703"/>
+        <location filename="../src/GUI/gui.cpp" line="706"/>
         <source>Digital zoom</source>
         <translation>Sayısal zum</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="704"/>
+        <location filename="../src/GUI/gui.cpp" line="707"/>
         <source>Zoom</source>
         <translation>Zum</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="717"/>
+        <location filename="../src/GUI/gui.cpp" line="720"/>
         <source>Map directory:</source>
         <translation>Harita klasörü:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="719"/>
+        <location filename="../src/GUI/gui.cpp" line="722"/>
         <source>POI directory:</source>
         <translation>POI klasörü:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="721"/>
+        <location filename="../src/GUI/gui.cpp" line="724"/>
         <source>GCS/PCS directory:</source>
         <translation>GCS/PCS klasörü:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="723"/>
+        <location filename="../src/GUI/gui.cpp" line="726"/>
         <source>DEM directory:</source>
         <translation>DEM klasörü:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="725"/>
+        <location filename="../src/GUI/gui.cpp" line="728"/>
         <source>Tile cache directory:</source>
         <translation>Döşeme önbellek klasörü:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="734"/>
+        <location filename="../src/GUI/gui.cpp" line="737"/>
         <source>Open file</source>
         <translation>Dosya aç</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="830"/>
+        <location filename="../src/GUI/gui.cpp" line="833"/>
         <source>Error loading data file:</source>
         <translation>Veri dosyası yüklenirken hata oluştu:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="833"/>
-        <location filename="../src/GUI/gui.cpp" line="868"/>
+        <location filename="../src/GUI/gui.cpp" line="836"/>
+        <location filename="../src/GUI/gui.cpp" line="871"/>
         <source>Line: %1</source>
         <translation>Satır: %1</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="841"/>
+        <location filename="../src/GUI/gui.cpp" line="844"/>
         <source>Open POI file</source>
         <translation>POI dosyası aç</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="865"/>
+        <location filename="../src/GUI/gui.cpp" line="868"/>
         <source>Error loading POI file:</source>
         <translation>POI dosyası yükleme hatası:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1020"/>
-        <location filename="../src/GUI/gui.cpp" line="1091"/>
+        <location filename="../src/GUI/gui.cpp" line="1023"/>
+        <location filename="../src/GUI/gui.cpp" line="1094"/>
         <source>Tracks</source>
         <translation>İzler</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1023"/>
-        <location filename="../src/GUI/gui.cpp" line="1093"/>
+        <location filename="../src/GUI/gui.cpp" line="1026"/>
+        <location filename="../src/GUI/gui.cpp" line="1096"/>
         <source>Routes</source>
         <translation>Rotalar</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1026"/>
-        <location filename="../src/GUI/gui.cpp" line="1095"/>
+        <location filename="../src/GUI/gui.cpp" line="1029"/>
+        <location filename="../src/GUI/gui.cpp" line="1098"/>
         <source>Waypoints</source>
         <translation>Yer işaretleri</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1029"/>
-        <location filename="../src/GUI/gui.cpp" line="1097"/>
+        <location filename="../src/GUI/gui.cpp" line="1032"/>
+        <location filename="../src/GUI/gui.cpp" line="1100"/>
         <source>Areas</source>
         <translation>Alanlar</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1035"/>
-        <location filename="../src/GUI/gui.cpp" line="1039"/>
-        <location filename="../src/GUI/gui.cpp" line="1103"/>
+        <location filename="../src/GUI/gui.cpp" line="1038"/>
+        <location filename="../src/GUI/gui.cpp" line="1042"/>
         <location filename="../src/GUI/gui.cpp" line="1106"/>
+        <location filename="../src/GUI/gui.cpp" line="1109"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1072"/>
-        <location filename="../src/GUI/gui.cpp" line="1073"/>
+        <location filename="../src/GUI/gui.cpp" line="1075"/>
+        <location filename="../src/GUI/gui.cpp" line="1076"/>
         <source>Statistics</source>
         <translation>İstatistikler</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1087"/>
+        <location filename="../src/GUI/gui.cpp" line="1090"/>
         <source>Name</source>
         <translation>Adı</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1318"/>
+        <location filename="../src/GUI/gui.cpp" line="1309"/>
         <source>Open map file</source>
         <translation>Harita dosyası aç</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1341"/>
+        <location filename="../src/GUI/gui.cpp" line="1332"/>
         <source>Error loading map:</source>
         <translation>Harita yüklenirken hata oluştu:</translation>
     </message>
     <message>
-        <location filename="../src/GUI/gui.cpp" line="1352"/>
+        <location filename="../src/GUI/gui.cpp" line="1343"/>
         <source>No files loaded</source>
         <translation>Hiç dosya yüklenmedi</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/GUI/gui.cpp" line="1356"/>
+        <location filename="../src/GUI/gui.cpp" line="1347"/>
         <source>%n files</source>
         <translation>
             <numerusform>%n dosya</numerusform>
-            <numerusform>%n dosya</numerusform>
         </translation>
     </message>
 </context>
@@ -985,37 +989,42 @@
 <context>
     <name>MapList</name>
     <message>
-        <location filename="../src/map/maplist.cpp" line="116"/>
+        <location filename="../src/map/maplist.cpp" line="119"/>
         <source>Supported files</source>
         <translation>Desteklenen dosyalar</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="118"/>
+        <location filename="../src/map/maplist.cpp" line="121"/>
         <source>MBTiles maps</source>
         <translation>MBTiles haritalar</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="119"/>
+        <location filename="../src/map/maplist.cpp" line="122"/>
         <source>Garmin JNX maps</source>
         <translation>Garmin JNX haritalar</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="120"/>
+        <location filename="../src/map/maplist.cpp" line="123"/>
         <source>OziExplorer maps</source>
         <translation>OziExplorer haritalar</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="121"/>
+        <location filename="../src/map/maplist.cpp" line="124"/>
         <source>TrekBuddy maps/atlases</source>
         <translation>TrekBuddy haritalar/atlaslar</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="122"/>
+        <location filename="../src/map/maplist.cpp" line="125"/>
         <source>GeoTIFF images</source>
         <translation>GeoTIFF görüntü</translation>
     </message>
     <message>
-        <location filename="../src/map/maplist.cpp" line="123"/>
+        <location filename="../src/map/maplist.cpp" line="126"/>
+        <source>TwoNav maps</source>
+        <translation>TwoNav haritaları</translation>
+    </message>
+    <message>
+        <location filename="../src/map/maplist.cpp" line="127"/>
         <source>Online map sources</source>
         <translation>Online harita kaynakları</translation>
     </message>

pkg/gpxsee.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.3"
+!define VERSION "7.5"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"

pkg/gpxsee64.nsi

@@ -7,7 +7,7 @@
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "7.3"
+!define VERSION "7.5"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"

src/GUI/cadencegraph.cpp

@@ -63,11 +63,11 @@ QList<GraphItem*> CadenceGraph::loadData(const Data &data)
 qreal CadenceGraph::avg() const
 {
 	qreal sum = 0, w = 0;
-	QList<QPointF>::const_iterator it;
 
-	for (it = _avg.begin(); it != _avg.end(); it++) {
-		sum += it->y() * it->x();
-		w += it->x();
+	for (int i = 0; i < _avg.size(); i++) {
+		const QPointF &p = _avg.at(i);
+		sum += p.y() * p.x();
+		w += p.x();
 	}
 
 	return (sum / w);
@@ -77,7 +77,7 @@ void CadenceGraph::clear()
 {
 	_avg.clear();
 
-	GraphView::clear();
+	GraphTab::clear();
 }
 
 void CadenceGraph::showTracks(bool show)

src/GUI/cadencegraph.h

@@ -21,7 +21,7 @@ private:
 	qreal max() const {return bounds().bottom();}
 	void setInfo();
 
-	QList<QPointF> _avg;
+	QVector<QPointF> _avg;
 
 	bool _showTracks;
 };

src/GUI/elevationgraph.cpp

@@ -120,7 +120,7 @@ void ElevationGraph::clear()
 	_routeMin = NAN;
 	_routeMax = NAN;
 
-	GraphView::clear();
+	GraphTab::clear();
 }
 
 void ElevationGraph::setYUnits(Units units)

src/GUI/gearratiograph.cpp

@@ -86,7 +86,7 @@ void GearRatioGraph::clear()
 {
 	_map.clear();
 
-	GraphView::clear();
+	GraphTab::clear();
 }
 
 void GearRatioGraph::showTracks(bool show)

src/GUI/heartrategraph.cpp

@@ -63,11 +63,11 @@ QList<GraphItem*> HeartRateGraph::loadData(const Data &data)
 qreal HeartRateGraph::avg() const
 {
 	qreal sum = 0, w = 0;
-	QList<QPointF>::const_iterator it;
 
-	for (it = _avg.begin(); it != _avg.end(); it++) {
-		sum += it->y() * it->x();
-		w += it->x();
+	for (int i = 0; i < _avg.size(); i++) {
+		const QPointF &p = _avg.at(i);
+		sum += p.y() * p.x();
+		w += p.x();
 	}
 
 	return (sum / w);
@@ -77,7 +77,7 @@ void HeartRateGraph::clear()
 {
 	_avg.clear();
 
-	GraphView::clear();
+	GraphTab::clear();
 }
 
 void HeartRateGraph::showTracks(bool show)

src/GUI/heartrategraph.h

@@ -20,7 +20,7 @@ private:
 	qreal max() const {return bounds().bottom();}
 	void setInfo();
 
-	QList<QPointF> _avg;
+	QVector<QPointF> _avg;
 
 	bool _showTracks;
 };

src/GUI/powergraph.cpp

@@ -63,11 +63,11 @@ QList<GraphItem*> PowerGraph::loadData(const Data &data)
 qreal PowerGraph::avg() const
 {
 	qreal sum = 0, w = 0;
-	QList<QPointF>::const_iterator it;
 
-	for (it = _avg.begin(); it != _avg.end(); it++) {
-		sum += it->y() * it->x();
-		w += it->x();
+	for (int i = 0; i < _avg.size(); i++) {
+		const QPointF &p = _avg.at(i);
+		sum += p.y() * p.x();
+		w += p.x();
 	}
 
 	return (sum / w);
@@ -77,7 +77,7 @@ void PowerGraph::clear()
 {
 	_avg.clear();
 
-	GraphView::clear();
+	GraphTab::clear();
 }
 
 void PowerGraph::showTracks(bool show)

src/GUI/powergraph.h

@@ -20,7 +20,7 @@ private:
 	qreal max() const {return bounds().bottom();}
 	void setInfo();
 
-	QList<QPointF> _avg;
+	QVector<QPointF> _avg;
 
 	bool _showTracks;
 };

src/GUI/speedgraph.cpp

@@ -74,12 +74,12 @@ QList<GraphItem*> SpeedGraph::loadData(const Data &data)
 qreal SpeedGraph::avg() const
 {
 	qreal sum = 0, w = 0;
-	QList<QPointF>::const_iterator it;
-	const QList<QPointF> &list = (_timeType == Moving) ? _mavg : _avg;
+	const QVector<QPointF> &vector = (_timeType == Moving) ? _mavg : _avg;
 
-	for (it = list.begin(); it != list.end(); it++) {
-		sum += it->y() * it->x();
-		w += it->x();
+	for (int i = 0; i < vector.size(); i++) {
+		const QPointF &p = vector.at(i);
+		sum += p.y() * p.x();
+		w += p.x();
 	}
 
 	return (sum / w);
@@ -90,7 +90,7 @@ void SpeedGraph::clear()
 	_avg.clear();
 	_mavg.clear();
 
-	GraphView::clear();
+	GraphTab::clear();
 }
 
 void SpeedGraph::setYUnits()

src/GUI/speedgraph.h

@@ -24,8 +24,8 @@ private:
 	void setYUnits();
 	void setInfo();
 
-	QList<QPointF> _avg;
-	QList<QPointF> _mavg;
+	QVector<QPointF> _avg;
+	QVector<QPointF> _mavg;
 
 	Units _units;
 	TimeType _timeType;

src/GUI/temperaturegraph.cpp

@@ -66,11 +66,11 @@ QList<GraphItem*> TemperatureGraph::loadData(const Data &data)
 qreal TemperatureGraph::avg() const
 {
 	qreal sum = 0, w = 0;
-	QList<QPointF>::const_iterator it;
 
-	for (it = _avg.begin(); it != _avg.end(); it++) {
-		sum += it->y() * it->x();
-		w += it->x();
+	for (int i = 0; i < _avg.size(); i++) {
+		const QPointF &p = _avg.at(i);
+		sum += p.y() * p.x();
+		w += p.x();
 	}
 
 	return (sum / w);
@@ -80,7 +80,7 @@ void TemperatureGraph::clear()
 {
 	_avg.clear();
 
-	GraphView::clear();
+	GraphTab::clear();
 }
 
 void TemperatureGraph::setYUnits(Units units)

src/GUI/temperaturegraph.h

@@ -23,7 +23,7 @@ private:
 	void setYUnits(Units units);
 	void setInfo();
 
-	QList<QPointF> _avg;
+	QVector<QPointF> _avg;
 
 	bool _showTracks;
 };

src/GUI/tooltip.cpp

@@ -1,22 +1,43 @@
+#include <QImageReader>
 #include "tooltip.h"
 
+
+#define THUMBNAIL_MAX_SIZE 240
+
 void ToolTip::insert(const QString &key, const QString &value)
 {
 	_list.append(KV(key, value));
 }
 
-QString ToolTip::toString()
+QString ToolTip::toString() const
 {
-	if (_list.isEmpty())
-		return QString();
+	QString html;
 
-	QString ret = "<table>";
+	if (_img.isValid()) {
+		int width, height;
+		if (_img.size().width() > _img.size().height()) {
+			width = qMin(_img.size().width(), THUMBNAIL_MAX_SIZE);
+			qreal ratio = _img.size().width() / (qreal)_img.size().height();
+			height = (int)(width / ratio);
+		} else {
+			height = qMin(_img.size().height(), THUMBNAIL_MAX_SIZE);
+			qreal ratio = _img.size().height() / (qreal)_img.size().width();
+			width = (int)(height / ratio);
+		}
 
-	for (int i = 0; i < _list.count(); i++)
-		ret += "<tr><td align=\"right\"><b>" + _list.at(i).key()
-		  + ":&nbsp;</b></td><td>" + _list.at(i).value() + "</td></tr>";
+		html += "<div align=\"center\">";
+		html += QString("<img src=\"file:%0\" width=\"%1\" height=\"%2\"/>")
+		  .arg(_img.path(), QString::number(width), QString::number(height));
+		html += "</div>";
+	}
 
-	ret += "</table>";
+	if (!_list.isEmpty()) {
+		html += "<table>";
+		for (int i = 0; i < _list.count(); i++)
+			html += "<tr><td align=\"right\"><b>" + _list.at(i).key()
+			  + ":&nbsp;</b></td><td>" + _list.at(i).value() + "</td></tr>";
+		html += "</table>";
+	}
 
-	return ret;
+	return html;
 }

src/GUI/tooltip.h

@@ -4,15 +4,18 @@
 #include <QString>
 #include <QList>
 #include "common/kv.h"
+#include "data/imageinfo.h"
 
 class ToolTip
 {
 public:
 	void insert(const QString &key, const QString &value);
-	QString toString();
+	void setImage(const ImageInfo &image) {_img = image;}
+	QString toString() const;
 
 private:
 	QList<KV> _list;
+	ImageInfo _img;
 };
 
 #endif // TOOLTIP_H

src/GUI/waypointitem.cpp

@@ -18,15 +18,16 @@ QString WaypointItem::toolTip(Units units, CoordinatesFormat format)
 		tt.insert(qApp->translate("WaypointItem", "Name"), _waypoint.name());
 	tt.insert(qApp->translate("WaypointItem", "Coordinates"),
 	  Format::coordinates(_waypoint.coordinates(), format));
-	if (!std::isnan(_waypoint.elevation()))
+	if (_waypoint.hasElevation())
 		tt.insert(qApp->translate("WaypointItem", "Elevation"),
 		  Format::elevation(_waypoint.elevation(), units));
-	if (!_waypoint.timestamp().isNull())
+	if (_waypoint.timestamp().isValid())
 		tt.insert(qApp->translate("WaypointItem", "Date"),
 		  _waypoint.timestamp().toString(Qt::SystemLocaleShortDate));
-	if (!_waypoint.description().isNull())
+	if (!_waypoint.description().isEmpty())
 		tt.insert(qApp->translate("WaypointItem", "Description"),
 		  _waypoint.description());
+	tt.setImage(_waypoint.image());
 
 	return tt.toString();
 }

src/common/rectc.cpp

@@ -20,10 +20,10 @@ RectC::RectC(const Coordinates &center, double radius)
 		double deltaLon = asin(sin(radDist) / cos(radlat));
 		minLon = radLon - deltaLon;
 		if (minLon < MIN_LON)
-			minLon += M_2_PI;
+			minLon += 2 * M_PI;
 		maxLon = radLon + deltaLon;
 		if (maxLon > MAX_LON)
-			maxLon -= M_2_PI;
+			maxLon -= 2 * M_PI;
 	} else {
 		// a pole is within the distance
 		minLat = qMax(minLat, MIN_LAT);

src/common/tifffile.cpp

@@ -4,25 +4,25 @@
 #define TIFF_MM     0x4D4D
 #define TIFF_MAGIC  42
 
-bool TIFFFile::readHeader(quint32 &ifd)
+TIFFFile::TIFFFile(QIODevice *device) : _device(device), _ifd(0), _offset(0)
 {
 	quint16 endian, magic;
 
-	if (QFile::read((char*)&endian, sizeof(endian)) < (qint64)sizeof(endian))
-		return false;
+	_offset = _device->pos();
+
+	if (_device->read((char*)&endian, sizeof(endian)) < (qint64)sizeof(endian))
+		return;
 	if (endian == TIFF_II)
 		_be = false;
 	else if (endian == TIFF_MM)
 		_be = true;
 	else
-		return false;
+		return;
 
 	if (!readValue(magic))
-		return false;
+		return;
 	if (magic != TIFF_MAGIC)
-		return false;
-	if (!readValue(ifd))
-		return false;
-
-	return true;
+		return;
+	if (!readValue(_ifd))
+		return;
 }

src/common/tifffile.h

@@ -0,0 +1,58 @@
+#ifndef TIFFFILE_H
+#define TIFFFILE_H
+
+#include <QIODevice>
+#include <QtEndian>
+
+#define TIFF_BYTE      1
+#define TIFF_ASCII     2
+#define TIFF_SHORT     3
+#define TIFF_LONG      4
+#define TIFF_RATIONAL  5
+#define TIFF_DOUBLE    12
+
+class TIFFFile
+{
+public:
+	TIFFFile(QIODevice *device);
+
+	bool isValid() const {return _ifd != 0;}
+	quint32 ifd() const {return _ifd;}
+
+	bool seek(qint64 pos) {return _device->seek(_offset + pos);}
+	qint64 pos() const {return _offset + _device->pos();}
+	QByteArray read(qint64 maxSize) {return _device->read(maxSize);}
+
+	template<class T> bool readValue(T &val)
+	{
+		T data;
+
+		if (_device->read((char*)&data, sizeof(T)) < (qint64)sizeof(T))
+			return false;
+
+#if Q_BYTE_ORDER == Q_BIG_ENDIAN
+			if (_be)
+				val = data;
+			else {
+				for (size_t i = 0; i < sizeof(T); i++)
+					*((char *)&val + i) = *((char*)&data + sizeof(T) - 1 - i);
+			}
+#else
+			if (_be) {
+				for (size_t i = 0; i < sizeof(T); i++)
+					*((char *)&val + i) = *((char*)&data + sizeof(T) - 1 - i);
+			} else
+				val = data;
+#endif
+
+		return true;
+	}
+
+private:
+	QIODevice *_device;
+	bool _be;
+	quint32 _ifd;
+	qint64 _offset;
+};
+
+#endif // TIFFFILE_H

src/data/data.cpp

@@ -15,6 +15,7 @@
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include "geojsonparser.h"
 #endif // QT 5
+#include "exifparser.h"
 #include "dem.h"
 #include "data.h"
 
@@ -34,6 +35,7 @@ static SLFParser slf;
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 static GeoJSONParser geojson;
 #endif // QT 5
+static EXIFParser exif;
 
 static QHash<QString, Parser*> parsers()
 {
@@ -55,6 +57,8 @@ static QHash<QString, Parser*> parsers()
 	hash.insert("json", &geojson);
 	hash.insert("geojson", &geojson);
 #endif // QT 5
+	hash.insert("jpeg", &exif);
+	hash.insert("jpg", &exif);
 
 	return hash;
 }
@@ -148,6 +152,7 @@ QString Data::formats()
 #endif // QT5
 	  + qApp->translate("Data", "GPX files") + " (*.gpx);;"
 	  + qApp->translate("Data", "IGC files") + " (*.igc);;"
+	  + qApp->translate("Data", "JPEG images") + " (*.jpg *.jpeg);;"
 	  + qApp->translate("Data", "KML files") + " (*.kml);;"
 	  + qApp->translate("Data", "LOC files") + " (*.loc);;"
 	  + qApp->translate("Data", "NMEA files") + " (*.nmea);;"

src/data/dem.cpp

@@ -87,8 +87,9 @@ qreal DEM::elevation(const Coordinates &c)
 			return NAN;
 		} else {
 			ba = new QByteArray(file.readAll());
+			qreal ele = height(c, ba);
 			_data.insert(k, ba);
-			return height(c, ba);
+			return ele;
 		}
 	} else
 		return height(c, ba);

src/data/exifparser.cpp

@@ -0,0 +1,255 @@
+#include <QDataStream>
+#include <QFileInfo>
+#include <QImageReader>
+#include "common/tifffile.h"
+#include "exifparser.h"
+
+
+#define SOI_MARKER       0xFFD8
+#define APP1_MARKER      0xFFE1
+
+#define GPSIFDTag        34853
+#define ImageDescription 270
+
+#define GPSLatitudeRef   1
+#define GPSLatitude      2
+#define GPSLongitudeRef  3
+#define GPSLongitude     4
+#define GPSAltitudeRef   5
+#define GPSAltitude      6
+#define GPSTimeStamp     7
+#define GPSDateStamp     29
+
+
+QString EXIFParser::text(TIFFFile &file, const IFDEntry &e) const
+{
+	if (e.type != TIFF_ASCII || !e.count)
+		return QString();
+
+	if (e.count <= sizeof(e.offset))
+		return QString(QByteArray((const char *)&e.offset, sizeof(e.offset)));
+
+	if (!file.seek(e.offset))
+		return QString();
+
+	QByteArray str(file.read(e.count));
+	if (str.size() < (int)e.count)
+		return QString();
+
+	return QString(str);
+}
+
+QTime EXIFParser::time(TIFFFile &file, const IFDEntry &ts) const
+{
+	if (!(ts.type == TIFF_RATIONAL && ts.count == 3))
+		return QTime();
+
+	if (!file.seek(ts.offset))
+		return QTime();
+
+	double hms[3];
+	for (int i = 0; i < 3; i++) {
+		quint32 num, den;
+		if (!file.readValue(num))
+			return QTime();
+		if (!file.readValue(den))
+			return QTime();
+
+		hms[i] = num/(double)den;
+	}
+
+	return QTime((int)hms[0], (int)hms[1], (int)hms[2]);
+}
+
+double EXIFParser::altitude(TIFFFile &file, const IFDEntry &alt,
+  const IFDEntry &altRef) const
+{
+	if (!(alt.type == TIFF_RATIONAL && alt.count == 1))
+		return NAN;
+
+	if (!file.seek(alt.offset))
+		return NAN;
+
+	quint32 num, den;
+	if (!file.readValue(num))
+		return NAN;
+	if (!file.readValue(den))
+		return NAN;
+
+	return (altRef.type == TIFF_BYTE && altRef.count == 1 && altRef.offset)
+	  ? -(num/(double)den) : num/(double)den;
+}
+
+double EXIFParser::coordinate(TIFFFile &file, const IFDEntry &ll) const
+{
+	if (!(ll.type == TIFF_RATIONAL && ll.count == 3))
+		return NAN;
+
+	if (!file.seek(ll.offset))
+		return NAN;
+
+	double dms[3];
+	for (int i = 0; i < 3; i++) {
+		quint32 num, den;
+		if (!file.readValue(num))
+			return NAN;
+		if (!file.readValue(den))
+			return NAN;
+
+		dms[i] = num/(double)den;
+	}
+
+	return dms[0] + dms[1]/60 + dms[2]/3600;
+}
+
+Coordinates EXIFParser::coordinates(TIFFFile &file, const IFDEntry &lon,
+  const IFDEntry &lonRef, const IFDEntry &lat, const IFDEntry &latRef) const
+{
+	if (!(latRef.type == TIFF_ASCII && latRef.count == 2
+	  && lonRef.type == TIFF_ASCII && lonRef.count == 2))
+		return Coordinates();
+
+	Coordinates c(coordinate(file, lon), coordinate(file, lat));
+	if (!c.isValid())
+		return Coordinates();
+
+	if (lonRef.offset == 'W')
+		c.rlon() = -c.lon();
+	if (latRef.offset == 'S')
+		c.rlat() = -c.lat();
+
+	return c;
+}
+
+bool EXIFParser::readEntry(TIFFFile &file, const QSet<quint16> &tags,
+  QMap<quint16, IFDEntry> &entries) const
+{
+	IFDEntry entry;
+	quint16 tag;
+
+	if (!file.readValue(tag))
+		return false;
+	if (!file.readValue(entry.type))
+		return false;
+	if (!file.readValue(entry.count))
+		return false;
+	if (!file.readValue(entry.offset))
+		return false;
+
+	if (tags.contains(tag))
+		entries.insert(tag, entry);
+
+	return true;
+}
+
+bool EXIFParser::readIFD(TIFFFile &file, quint32 offset,
+  const QSet<quint16> &tags, QMap<quint16, IFDEntry> &entries) const
+{
+	quint16 count;
+
+	if (!file.seek(offset))
+		return false;
+	if (!file.readValue(count))
+		return false;
+
+	for (quint16 i = 0; i < count; i++)
+		if (!readEntry(file, tags, entries))
+			return false;
+
+	return true;
+}
+
+bool EXIFParser::parseTIFF(QFile *file, QVector<Waypoint> &waypoints)
+{
+	TIFFFile tiff(file);
+	if (!tiff.isValid()) {
+		_errorString = "Invalid EXIF data";
+		return false;
+	}
+
+	QSet<quint16> IFD0Tags;
+	IFD0Tags << GPSIFDTag << ImageDescription;
+	QMap<quint16, IFDEntry> IFD0;
+	for (quint32 ifd = tiff.ifd(); ifd; ) {
+		if (!readIFD(tiff, ifd, IFD0Tags, IFD0) || !tiff.readValue(ifd)) {
+			_errorString = "Invalid IFD0";
+			return false;
+		}
+	}
+	if (!IFD0.contains(GPSIFDTag)) {
+		_errorString = "GPS IFD not found";
+		return false;
+	}
+
+	QSet<quint16> GPSIFDTags;
+	GPSIFDTags << GPSLatitude << GPSLongitude << GPSLatitudeRef
+	  << GPSLongitudeRef << GPSAltitude << GPSAltitudeRef << GPSDateStamp
+	  << GPSTimeStamp;
+	QMap<quint16, IFDEntry> GPSIFD;
+	for (quint32 ifd = IFD0.value(GPSIFDTag).offset; ifd; ) {
+		if (!readIFD(tiff, ifd, GPSIFDTags, GPSIFD) || !tiff.readValue(ifd)) {
+			_errorString = "Invalid GPS IFD";
+			return false;
+		}
+	}
+
+	Coordinates c(coordinates(tiff, GPSIFD.value(GPSLongitude),
+	  GPSIFD.value(GPSLongitudeRef), GPSIFD.value(GPSLatitude),
+	  GPSIFD.value(GPSLatitudeRef)));
+	if (!c.isValid()) {
+		_errorString = "Invalid/missing GPS coordinates";
+		return false;
+	}
+
+	file->reset();
+	ImageInfo img(file->fileName(), QImageReader(file).size());
+
+	Waypoint wp(c);
+	wp.setName(QFileInfo(file->fileName()).baseName());
+	wp.setImage(img);
+	wp.setElevation(altitude(tiff, GPSIFD.value(GPSAltitude),
+	  GPSIFD.value(GPSAltitudeRef)));
+	wp.setTimestamp(QDateTime(QDate::fromString(text(tiff,
+	  GPSIFD.value(GPSDateStamp)), "yyyy:MM:dd"), time(tiff,
+	  GPSIFD.value(GPSTimeStamp)), Qt::UTC));
+	wp.setDescription(text(tiff, IFD0.value(ImageDescription)).trimmed());
+
+	waypoints.append(wp);
+
+	return true;
+}
+
+bool EXIFParser::parse(QFile *file, QList<TrackData> &tracks,
+  QList<RouteData> &routes, QList<Area> &polygons,
+  QVector<Waypoint> &waypoints)
+{
+	Q_UNUSED(tracks);
+	Q_UNUSED(routes);
+	Q_UNUSED(polygons);
+	quint16 marker;
+
+	QDataStream stream(file);
+	stream.setByteOrder(QDataStream::BigEndian);
+	stream >> marker;
+	if (marker != SOI_MARKER) {
+		_errorString = "Not a JPEG file";
+		return false;
+	}
+
+	while (!stream.atEnd()) {
+		stream >> marker;
+		if (marker == APP1_MARKER) {
+			quint16 size;
+			char magic[6];
+			stream >> size;
+			if (stream.readRawData(magic, sizeof(magic)) == sizeof(magic) &&
+			  !memcmp(magic, "Exif\0\0", sizeof(magic)))
+				return parseTIFF(file, waypoints);
+			else
+				break;
+		}
+	}
+
+	_errorString = "No EXIF data found";
+	return false;
+}

src/data/exifparser.h

@@ -0,0 +1,43 @@
+#ifndef EXIFPARSER_H
+#define EXIFPARSER_H
+
+#include <QDateTime>
+#include "parser.h"
+
+class TIFFFile;
+
+class EXIFParser : public Parser
+{
+public:
+	bool parse(QFile *file, QList<TrackData> &tracks, QList<RouteData> &routes,
+	  QList<Area> &polygons, QVector<Waypoint> &waypoints);
+	QString errorString() const {return _errorString;}
+	int errorLine() const {return 0;}
+
+private:
+	struct IFDEntry {
+		IFDEntry() : type(0), count(0), offset(0) {}
+
+		quint16 type;
+		quint32 count;
+		quint32 offset;
+	};
+
+	bool parseTIFF(QFile *file, QVector<Waypoint> &waypoints);
+	bool readIFD(TIFFFile &file, quint32 offset, const QSet<quint16> &tags,
+	  QMap<quint16, IFDEntry> &entries) const;
+	bool readEntry(TIFFFile &file, const QSet<quint16> &tags,
+	  QMap<quint16, IFDEntry> &entries) const;
+
+	double coordinate(TIFFFile &file, const IFDEntry &ll) const;
+	Coordinates coordinates(TIFFFile &file, const IFDEntry &lon,
+	  const IFDEntry &lonRef, const IFDEntry &lat, const IFDEntry &latRef) const;
+	double altitude(TIFFFile &file, const IFDEntry &alt,
+	  const IFDEntry &altRef) const;
+	QTime time(TIFFFile &file, const IFDEntry &ts) const;
+	QString text(TIFFFile &file, const IFDEntry &e) const;
+
+	QString _errorString;
+};
+
+#endif // EXIFPARSER_H

src/data/igcparser.cpp

@@ -112,7 +112,7 @@ bool IGCParser::readHRecord(const char *line, int len)
 		return false;
 	}
 
-	_date = QDate(y + 2000 < QDate::currentDate().year() ? 2000 + y : 1900 + y,
+	_date = QDate(y + 2000 <= QDate::currentDate().year() ? 2000 + y : 1900 + y,
 	  m, d);
 	if (!_date.isValid()) {
 		_errorString = "Invalid date";
@@ -128,7 +128,6 @@ bool IGCParser::readBRecord(SegmentData &segment, const char *line,
 	qreal lat, lon, ele;
 	QTime time;
 
-
 	if (len < 35)
 		return false;
 
@@ -151,8 +150,8 @@ bool IGCParser::readBRecord(SegmentData &segment, const char *line,
 		return false;
 	}
 
-
-	if (time < _time)
+	if (time < _time && !segment.isEmpty()
+	  && _date == segment.last().timestamp().date())
 		_date = _date.addDays(1);
 	_time = time;
 

src/data/imageinfo.h

@@ -0,0 +1,24 @@
+#ifndef IMAGEINFO_H
+#define IMAGEINFO_H
+
+#include <QString>
+#include <QSize>
+
+class ImageInfo
+{
+public:
+	ImageInfo() {}
+	ImageInfo(const QString &path, const QSize &size)
+	  : _path(path), _size(size) {}
+
+	const QString &path() const {return _path;}
+	const QSize &size() const {return _size;}
+
+	bool isValid() const {return _size.isValid() && !_path.isEmpty();}
+
+private:
+	QString _path;
+	QSize _size;
+};
+
+#endif // IMAGEINFO_H

src/data/kmlparser.cpp

@@ -486,7 +486,7 @@ void KMLParser::multiTrack(TrackData &t)
 
 void KMLParser::multiGeometry(QList<TrackData> &tracks, QList<Area> &areas,
   QVector<Waypoint> &waypoints, const QString &name, const QString &desc,
-  const QDateTime timestamp)
+  const QDateTime &timestamp)
 {
 	while (_reader.readNextStartElement()) {
 		if (_reader.name() == QLatin1String("Point")) {

src/data/kmlparser.h

@@ -24,7 +24,7 @@ private:
 	  QVector<Waypoint> &waypoints);
 	void multiGeometry(QList<TrackData> &tracks, QList<Area> &areas,
 	  QVector<Waypoint> &waypoints, const QString &name, const QString &desc,
-	  const QDateTime timestamp);
+	  const QDateTime &timestamp);
 	void track(SegmentData &segment);
 	void multiTrack(TrackData &t);
 	void lineString(SegmentData &segment);

src/data/poi.cpp

@@ -14,6 +14,7 @@ POI::POI(QObject *parent) : QObject(parent)
 {
 	_errorLine = 0;
 	_radius = 1000;
+	_useDEM = false;
 }
 
 bool POI::loadFile(const QString &path, bool dir)

src/data/waypoint.h

@@ -5,8 +5,8 @@
 #include <QDateTime>
 #include <QHash>
 #include <QDebug>
-#include <cmath>
 #include "common/coordinates.h"
+#include "imageinfo.h"
 
 class Waypoint
 {
@@ -18,6 +18,7 @@ public:
 	const Coordinates &coordinates() const {return _coordinates;}
 	const QString &name() const {return _name;}
 	const QString &description() const {return _description;}
+	const ImageInfo &image() const {return _image;}
 	const QDateTime &timestamp() const {return _timestamp;}
 	qreal elevation() const {return _elevation;}
 
@@ -28,6 +29,7 @@ public:
 	  {_description = description;}
 	void setTimestamp(const QDateTime &timestamp) {_timestamp = timestamp;}
 	void setElevation(qreal elevation) {_elevation = elevation;}
+	void setImage(const ImageInfo &image) {_image = image;}
 
 	bool hasElevation() const {return !std::isnan(_elevation);}
 
@@ -39,6 +41,7 @@ private:
 	Coordinates _coordinates;
 	QString _name;
 	QString _description;
+	ImageInfo _image;
 	QDateTime _timestamp;
 	qreal _elevation;
 };

src/map/albersequal.cpp

@@ -123,9 +123,9 @@ PointD AlbersEqual::ll2xy(const Coordinates &c) const
 
 	dlam = deg2rad(c.lon()) - _longitudeOrigin;
 	if (dlam > M_PI)
-		dlam -= M_2_PI;
+		dlam -= 2 * M_PI;
 	if (dlam < -M_PI)
-		dlam += M_2_PI;
+		dlam += 2 * M_PI;
 
 	sin_lat = sin(deg2rad(c.lat()));
 	e_sin = _e * sin_lat;
@@ -211,9 +211,9 @@ Coordinates AlbersEqual::xy2ll(const PointD &p) const
 	lon = _longitudeOrigin + theta / _n;
 
 	if (lon > M_PI)
-		lon -= M_2_PI;
+		lon -= 2 * M_PI;
 	if (lon < -M_PI)
-		lon += M_2_PI;
+		lon += 2 * M_PI;
 
 	if (lon > M_PI)
 		lon = M_PI;

src/map/calibrationpoint.h

@@ -0,0 +1,31 @@
+#ifndef CALIBRATIONPOINT_H
+#define CALIBRATIONPOINT_H
+
+#include "transform.h"
+#include "projection.h"
+
+class CalibrationPoint {
+public:
+	CalibrationPoint() {}
+	CalibrationPoint(PointD xy, PointD pp) : _xy(xy), _pp(pp) {}
+	CalibrationPoint(PointD xy, Coordinates c) : _xy(xy), _ll(c) {}
+
+	bool isValid() const
+	{
+		return !(_xy.isNull() || (_pp.isNull() && !_ll.isValid()));
+	}
+
+	ReferencePoint rp(const Projection &projection) const
+	{
+		return (_pp.isNull())
+		  ? ReferencePoint(_xy, projection.ll2xy(_ll))
+		  : ReferencePoint(_xy, _pp);
+	}
+
+private:
+	PointD _xy;
+	PointD _pp;
+	Coordinates _ll;
+};
+
+#endif // CALIBRATIONPOINT_H

src/map/color.h

@@ -0,0 +1,18 @@
+#ifndef COLOR_H
+#define COLOR_H
+
+#include <QColor>
+
+namespace Color
+{
+	inline QRgb bgr2rgb(quint32 bgr)
+	{
+		quint32 b = (bgr & 0x000000FF);
+		quint32 g = (bgr & 0x0000FF00) >> 8;
+		quint32 r = (bgr & 0x00FF0000) >> 16;
+
+		return (0xFF000000 | r << 16 | g << 8 | b);
+	}
+}
+
+#endif // COLOR_H

src/map/geocentric.cpp

@@ -57,7 +57,7 @@ Point3D Geocentric::fromGeodetic(const Coordinates &c, const Ellipsoid *e)
 	double Rn = e->radius() / (sqrt(1.0 - e->es() * slat2));
 
 	if (lon > M_PI)
-		lon -= M_2_PI;
+		lon -= 2 * M_PI;
 
 	return Point3D(Rn * clat * cos(lon), Rn * clat * sin(lon),
 	  (Rn * (1 - e->es())) * slat);

src/map/geotiff.cpp

@@ -1,12 +1,9 @@
+#include <QFile>
+#include "common/tifffile.h"
 #include "pcs.h"
-#include "tifffile.h"
 #include "geotiff.h"
 
 
-#define TIFF_DOUBLE                    12
-#define TIFF_SHORT                     3
-#define TIFF_LONG                      4
-
 #define ModelPixelScaleTag             33550
 #define ModelTiepointTag               33922
 #define ModelTransformationTag         34264
@@ -126,7 +123,7 @@ bool GeoTIFF::readEntry(TIFFFile &file, Ctx &ctx) const
 	return true;
 }
 
-bool GeoTIFF::readIFD(TIFFFile &file, quint32 &offset, Ctx &ctx) const
+bool GeoTIFF::readIFD(TIFFFile &file, quint32 offset, Ctx &ctx) const
 {
 	quint16 count;
 
@@ -139,9 +136,6 @@ bool GeoTIFF::readIFD(TIFFFile &file, quint32 &offset, Ctx &ctx) const
 		if (!readEntry(file, ctx))
 			return false;
 
-	if (!file.readValue(offset))
-		return false;
-
 	return true;
 }
 
@@ -475,27 +469,26 @@ bool GeoTIFF::geographicModel(QMap<quint16, Value> &kv)
 
 GeoTIFF::GeoTIFF(const QString &path)
 {
-	quint32 ifd;
 	QList<ReferencePoint> points;
 	PointD scale;
 	QMap<quint16, Value> kv;
 	Ctx ctx;
-	TIFFFile file;
 
 
-	file.setFileName(path);
+	QFile file(path);
 	if (!file.open(QIODevice::ReadOnly)) {
-		_errorString = QString("Error opening TIFF file: %1")
-		  .arg(file.errorString());
-		return;
-	}
-	if (!file.readHeader(ifd)) {
-		_errorString = "Invalid TIFF header";
+		_errorString = file.errorString();
 		return;
 	}
 
-	while (ifd) {
-		if (!readIFD(file, ifd, ctx)) {
+	TIFFFile tiff(&file);
+	if (!tiff.isValid()) {
+		_errorString = "Not a TIFF file";
+		return;
+	}
+
+	for (quint32 ifd = tiff.ifd(); ifd; ) {
+		if (!readIFD(tiff, ifd, ctx) || !tiff.readValue(ifd)) {
 			_errorString = "Invalid IFD";
 			return;
 		}
@@ -507,19 +500,19 @@ GeoTIFF::GeoTIFF(const QString &path)
 	}
 
 	if (ctx.scale) {
-		if (!readScale(file, ctx.scale, scale)) {
+		if (!readScale(tiff, ctx.scale, scale)) {
 			_errorString = "Error reading model pixel scale";
 			return;
 		}
 	}
 	if (ctx.tiepoints) {
-		if (!readTiepoints(file, ctx.tiepoints, ctx.tiepointCount, points)) {
+		if (!readTiepoints(tiff, ctx.tiepoints, ctx.tiepointCount, points)) {
 			_errorString = "Error reading raster->model tiepoint pairs";
 			return;
 		}
 	}
 
-	if (!readKeys(file, ctx, kv)) {
+	if (!readKeys(tiff, ctx, kv)) {
 		_errorString = "Error reading Geo key/value";
 		return;
 	}
@@ -547,7 +540,7 @@ GeoTIFF::GeoTIFF(const QString &path)
 		_transform = Transform(points);
 	else if (ctx.matrix) {
 		double matrix[16];
-		if (!readMatrix(file, ctx.matrix, matrix)) {
+		if (!readMatrix(tiff, ctx.matrix, matrix)) {
 			_errorString = "Error reading transformation matrix";
 			return;
 		}

src/map/geotiff.h

@@ -39,7 +39,7 @@ private:
 	};
 
 	bool readEntry(TIFFFile &file, Ctx &ctx) const;
-	bool readIFD(TIFFFile &file, quint32 &offset, Ctx &ctx) const;
+	bool readIFD(TIFFFile &file, quint32 offset, Ctx &ctx) const;
 	bool readScale(TIFFFile &file, quint32 offset, PointD &scale) const;
 	bool readTiepoints(TIFFFile &file, quint32 offset, quint32 count,
 	  QList<ReferencePoint> &points) const;

src/map/lambertconic.cpp

@@ -65,7 +65,7 @@ LambertConic1::LambertConic1(const Ellipsoid *ellipsoid, double latitudeOrigin,
 	lat_orig = deg2rad(latitudeOrigin);
 	_longitudeOrigin = deg2rad(longitudeOrigin);
 	if (_longitudeOrigin > M_PI)
-		_longitudeOrigin -= M_2_PI;
+		_longitudeOrigin -= 2 * M_PI;
 
 	_falseEasting = falseEasting;
 	_falseNorthing = falseNorthing;
@@ -102,9 +102,9 @@ PointD LambertConic1::ll2xy(const Coordinates &c) const
 	dlam = deg2rad(c.lon()) - _longitudeOrigin;
 
 	if (dlam > M_PI)
-		dlam -= M_2_PI;
+		dlam -= 2 * M_PI;
 	if (dlam < -M_PI)
-		dlam += M_2_PI;
+		dlam += 2 * M_PI;
 
 	theta = _n * dlam;
 
@@ -168,13 +168,13 @@ Coordinates LambertConic1::xy2ll(const PointD &p) const
 			if (lon - M_PI < 3.5e-6)
 				lon = M_PI;
 			else
-				lon -= M_2_PI;
+				lon -= 2 * M_PI;
 		}
 		if (lon < -M_PI) {
 			if (fabs(lon + M_PI) < 3.5e-6)
 				lon = -M_PI;
 			else
-				lon += M_2_PI;
+				lon += 2 * M_PI;
 		}
 
 		if (fabs(lon) < 2.0e-7)

src/map/mapfile.cpp

@@ -5,12 +5,12 @@
 #include "mapfile.h"
 
 
-static double parameter(const QString &str, bool *res, double def = 0.0)
+static double parameter(const QString &str, bool *res, double dflt = 0.0)
 {
 	QString field = str.trimmed();
 	if (field.isEmpty()) {
 		*res = true;
-		return def;
+		return dflt;
 	}
 
 	return field.toDouble(res);
@@ -19,8 +19,9 @@ static double parameter(const QString &str, bool *res, double def = 0.0)
 int MapFile::parse(QIODevice &device, QList<CalibrationPoint> &points,
   QString &projection, Projection::Setup &setup, QString &datum)
 {
-	bool res, r[8];
-	int ln = 1;
+	bool res, utm = false;
+	int ln = 1, zone = 0;
+
 
 	while (!device.atEnd()) {
 		QByteArray line = device.readLine();
@@ -38,20 +39,19 @@ int MapFile::parse(QIODevice &device, QList<CalibrationPoint> &points,
 		else {
 			QList<QByteArray> list = line.split(',');
 			QString key(list.at(0).trimmed());
-			bool ll = true; bool pp = true;
-
 
 			if (key.startsWith("Point") && list.count() == 17
 			  && !list.at(2).trimmed().isEmpty()) {
-				CalibrationPoint p;
-
-				int x = list.at(2).trimmed().toInt(&res);
+				PointD xy;
+				xy.rx() = list.at(2).trimmed().toInt(&res);
 				if (!res)
 					return ln;
-				int y = list.at(3).trimmed().toInt(&res);
+				xy.ry() = list.at(3).trimmed().toInt(&res);
 				if (!res)
 					return ln;
 
+				Coordinates c;
+				bool ll = true;
 				int latd = list.at(6).trimmed().toInt(&res);
 				if (!res)
 					ll = false;
@@ -72,31 +72,34 @@ int MapFile::parse(QIODevice &device, QList<CalibrationPoint> &points,
 					lond = -lond;
 					lonm = -lonm;
 				}
+				if (ll)
+					c = Coordinates(lond + lonm/60.0, latd + latm/60.0);
 
-				p.zone = list.at(13).trimmed().toInt(&res);
-				if (!res)
-					p.zone = 0;
+				PointD pp;
 				double ppx = list.at(14).trimmed().toDouble(&res);
-				if (!res)
-					pp = false;
+				if (res)
+					pp.rx() = ppx;
 				double ppy = list.at(15).trimmed().toDouble(&res);
-				if (!res)
-					pp = false;
-				if (list.at(16).trimmed() == "S")
-					p.zone = -p.zone;
+				if (res)
+					pp.ry() = ppy;
 
-				p.rp.setXY(PointD(x, y));
-				if (ll) {
-					p.ll = Coordinates(lond + lonm/60.0, latd + latm/60.0);
-					if (p.ll.isValid())
-						points.append(p);
-					else
-						return ln;
-				} else if (pp) {
-					p.rp.setPP(PointD(ppx, ppy));
-					points.append(p);
-				} else
+				if (c.isValid())
+					points.append(CalibrationPoint(xy, c));
+				else if (pp.isValid())
+					points.append(CalibrationPoint(xy, pp));
+				else
 					return ln;
+
+				if (utm && !zone) {
+					zone = list.at(13).trimmed().toInt(&res);
+					if (res) {
+						if (list.at(16).trimmed() == "S")
+							zone = -zone;
+					} else {
+						if (c.isValid())
+							zone = UTM::zone(c);
+					}
+				}
 			} else if (key == "IWH") {
 				if (list.count() < 4)
 					return ln;
@@ -111,19 +114,25 @@ int MapFile::parse(QIODevice &device, QList<CalibrationPoint> &points,
 				if (list.count() < 2)
 					return ln;
 				projection = list.at(1);
+				utm = (projection == "(UTM) Universal Transverse Mercator");
 			} else if (key == "Projection Setup") {
 				if (list.count() < 8)
 					return ln;
 
-				setup = Projection::Setup(
-				  parameter(list[1], &r[1]), parameter(list[2], &r[2]),
-				  parameter(list[3], &r[3], 1.0), parameter(list[4], &r[4]),
-				  parameter(list[5], &r[5]), parameter(list[6], &r[6]),
-				  parameter(list[7], &r[7]));
+				if (utm && zone)
+					setup = UTM::setup(zone);
+				else {
+					bool r[8];
+					setup = Projection::Setup(
+					  parameter(list[1], &r[1]), parameter(list[2], &r[2]),
+					  parameter(list[3], &r[3], 1.0), parameter(list[4], &r[4]),
+					  parameter(list[5], &r[5]), parameter(list[6], &r[6]),
+					  parameter(list[7], &r[7]));
 
-				for (int i = 1; i < 8; i++)
-					if (!r[i])
-						return ln;
+					for (int i = 1; i < 8; i++)
+						if (!r[i])
+							return ln;
+				}
 			}
 		}
 
@@ -144,12 +153,12 @@ bool MapFile::parseMapFile(QIODevice &device, QList<CalibrationPoint> &points,
 		return false;
 	}
 
-	if ((el = parse(device, points, projection, setup, datum))) {
+	if ((el = parse(device, points, projection, setup, datum)))
 		_errorString = QString("Parse error on line %1").arg(el);
-		return false;
-	}
 
-	return true;
+	device.close();
+
+	return (!el);
 }
 
 const GCS *MapFile::createGCS(const QString &datum)
@@ -163,35 +172,25 @@ const GCS *MapFile::createGCS(const QString &datum)
 }
 
 bool MapFile::createProjection(const GCS *gcs, const QString &name,
-  const Projection::Setup &setup, QList<CalibrationPoint> &points)
+  const Projection::Setup &setup)
 {
 	PCS pcs;
 
-	if (name == "Mercator")
-		pcs = PCS(gcs, 1024, setup, 9001);
-	else if (name == "Transverse Mercator")
-		pcs = PCS(gcs, 9807, setup, 9001);
-	else if (name == "Latitude/Longitude") {
+	if (name == "Latitude/Longitude") {
 		_projection = Projection(gcs);
 		return true;
-	} else if (name == "Lambert Conformal Conic")
+	} else if (name == "Mercator")
+		pcs = PCS(gcs, 1024, setup, 9001);
+	else if (name == "Transverse Mercator"
+	  || name == "(UTM) Universal Transverse Mercator")
+		pcs = PCS(gcs, 9807, setup, 9001);
+	else if (name == "Lambert Conformal Conic")
 		pcs = PCS(gcs, 9802, setup, 9001);
 	else if (name == "Albers Equal Area")
 		pcs = PCS(gcs, 9822, setup, 9001);
 	else if (name == "(A)Lambert Azimuthual Equal Area")
 		pcs = PCS(gcs, 9820, setup, 9001);
-	else if (name == "(UTM) Universal Transverse Mercator") {
-		int zone;
-		if (points.first().zone)
-			zone = points.first().zone;
-		else if (!points.first().ll.isNull())
-			zone = UTM::zone(points.first().ll);
-		else {
-			_errorString = "Can not determine UTM zone";
-			return false;
-		}
-		pcs = PCS(gcs, 9807, UTM::setup(zone), 9001);
-	} else if (name == "(NZTM2) New Zealand TM 2000")
+	else if (name == "(NZTM2) New Zealand TM 2000")
 		pcs = PCS(gcs, 9807, Projection::Setup(0, 173.0, 0.9996, 1600000,
 		  10000000, NAN, NAN), 9001);
 	else if (name == "(BNG) British National Grid")
@@ -234,16 +233,12 @@ bool MapFile::createProjection(const GCS *gcs, const QString &name,
 	return true;
 }
 
-bool MapFile::computeTransformation(QList<CalibrationPoint> &points)
+bool MapFile::computeTransformation(const QList<CalibrationPoint> &points)
 {
 	QList<ReferencePoint> rp;
 
-	for (int i = 0; i < points.size(); i++) {
-		if (points.at(i).rp.pp().isNull())
-			points[i].rp.setPP(_projection.ll2xy(points.at(i).ll));
-
-		rp.append(points.at(i).rp);
-	}
+	for (int i = 0; i < points.size(); i++)
+		rp.append(points.at(i).rp(_projection));
 
 	_transform = Transform(rp);
 	if (!_transform.isValid()) {
@@ -265,7 +260,7 @@ MapFile::MapFile(QIODevice &file)
 		return;
 	if (!(gcs = createGCS(datum)))
 		return;
-	if (!createProjection(gcs, ct, setup, points))
+	if (!createProjection(gcs, ct, setup))
 		return;
 	if (!computeTransformation(points))
 		return;

src/map/mapfile.h

@@ -3,6 +3,7 @@
 
 #include "transform.h"
 #include "projection.h"
+#include "calibrationpoint.h"
 
 class QIODevice;
 class GCS;
@@ -24,20 +25,14 @@ public:
 	const QSize &size() const {return _size;}
 
 private:
-	struct CalibrationPoint {
-		ReferencePoint rp;
-		Coordinates ll;
-		int zone;
-	};
-
 	int parse(QIODevice &device, QList<CalibrationPoint> &points,
 	  QString &projection, Projection::Setup &setup, QString &datum);
 	bool parseMapFile(QIODevice &device, QList<CalibrationPoint> &points,
 	  QString &projection, Projection::Setup &setup, QString &datum);
 	const GCS *createGCS(const QString &datum);
 	bool createProjection(const GCS *gcs, const QString &projection,
-	  const Projection::Setup &setup, QList<CalibrationPoint> &points);
-	bool computeTransformation(QList<CalibrationPoint> &points);
+	  const Projection::Setup &setup);
+	bool computeTransformation(const QList<CalibrationPoint> &points);
 
 	QString _name;
 	QString _image;

src/map/maplist.cpp

@@ -7,6 +7,7 @@
 #include "geotiffmap.h"
 #include "mapsource.h"
 #include "mbtilesmap.h"
+#include "rmap.h"
 #include "maplist.h"
 
 
@@ -58,6 +59,8 @@ bool MapList::loadFile(const QString &path, bool *atlas, bool dir)
 		map = new GeoTIFFMap(path, this);
 	else if (suffix == "mbtiles")
 		map = new MBTilesMap(path, this);
+	else if (suffix == "rmap" || suffix == "rtmap")
+		map = new RMap(path, this);
 	else
 		map = new OziMap(path, this);
 
@@ -114,12 +117,13 @@ QString MapList::formats()
 {
 	return
 	  tr("Supported files")
-	  + " (*.jnx *.map *.mbtiles *.tar *.tba *.tif *.tiff *.xml);;"
+	  + " (*.jnx *.map *.mbtiles *.rmap *.rtmap *.tar *.tba *.tif *.tiff *.xml);;"
 	  + tr("MBTiles maps") + " (*.mbtiles);;"
 	  + tr("Garmin JNX maps") + " (*.jnx);;"
 	  + tr("OziExplorer maps") + " (*.map);;"
 	  + tr("TrekBuddy maps/atlases") + " (*.tar *.tba);;"
 	  + tr("GeoTIFF images") + " (*.tif *.tiff);;"
+	  + tr("TwoNav maps") + " (*.rmap *.rtmap);;"
 	  + tr("Online map sources") + " (*.xml)";
 }
 
@@ -127,6 +131,6 @@ QStringList MapList::filter()
 {
 	QStringList filter;
 	filter << "*.jnx" << "*.map" << "*.tba" << "*.tar" << "*.xml" << "*.tif"
-	  << "*.tiff" << "*.mbtiles";
+	  << "*.tiff" << "*.mbtiles" << "*.rmap";
 	return filter;
 }

src/map/mbtilesmap.cpp

@@ -147,7 +147,7 @@ MBTilesMap::MBTilesMap(const QString &fileName, QObject *parent)
 			if (query.value(0).toString() == "pbf")
 				_scalable = true;
 		} else
-			qWarning("%s: missing map name", qPrintable(_fileName));
+			qWarning("%s: missing tiles format", qPrintable(_fileName));
 	}
 
 	{

src/map/mercator.cpp

@@ -56,7 +56,7 @@ Mercator::Mercator(const Ellipsoid *ellipsoid, double latitudeOrigin,
 	_latitudeOrigin = deg2rad(latitudeOrigin);
 	_longitudeOrigin = deg2rad(longitudeOrigin);
 	if (_longitudeOrigin > M_PI)
-		_longitudeOrigin -= M_2_PI;
+		_longitudeOrigin -= 2 * M_PI;
 	_falseNorthing = falseNorthing;
 	_falseEasting = falseEasting;
 
@@ -86,16 +86,16 @@ PointD Mercator::ll2xy(const Coordinates &c) const
 	double pow_temp;
 
 	if (lon > M_PI)
-		lon -= M_2_PI;
+		lon -= 2 * M_PI;
 	e_x_sinlat = _e * sin(lat);
 	tan_temp = tan(M_PI_4 + lat / 2.e0);
 	pow_temp = pow((1.e0 - e_x_sinlat) / (1.e0 + e_x_sinlat), _e / 2.e0);
 	ctanz2 = tan_temp * pow_temp;
 	delta_lon = lon - _longitudeOrigin;
 	if (delta_lon > M_PI)
-	  delta_lon -= M_2_PI;
+	  delta_lon -= 2 * M_PI;
 	if (delta_lon < -M_PI)
-	  delta_lon += M_2_PI;
+	  delta_lon += 2 * M_PI;
 
 	return PointD(_scaleFactor * _a * delta_lon + _falseEasting,
 	  _scaleFactor * _a * log(ctanz2) + _falseNorthing);
@@ -115,9 +115,9 @@ Coordinates Mercator::xy2ll(const PointD &p) const
 	lat = xphi + _ab * sin(2.e0 * xphi) + _bb * sin(4.e0 * xphi)
 	  + _cb * sin(6.e0 * xphi) + _db * sin(8.e0 * xphi);
 	if (lon > M_PI)
-		lon -= M_2_PI;
+		lon -= 2 * M_PI;
 	if (lon < -M_PI)
-		lon += M_2_PI;
+		lon += 2 * M_PI;
 
 	return Coordinates(rad2deg(lon), rad2deg(lat));
 }

src/map/ozf.cpp

@@ -1,6 +1,7 @@
 #include <cstring>
 #include <QtEndian>
 #include <QFile>
+#include "color.h"
 #include "ozf.h"
 
 
@@ -128,7 +129,7 @@ bool OZF::readHeaders()
 
 bool OZF::readTileTable()
 {
-	quint32 tableOffset, headerOffset, bgr0, w, h;
+	quint32 tableOffset, headerOffset, w, h;
 	quint16 x, y;
 	int zooms;
 
@@ -164,15 +165,9 @@ bool OZF::readTileTable()
 		zoom.palette = QVector<quint32>(256);
 		if (!read(&(zoom.palette[0]), sizeof(quint32) * 256))
 			return false;
-		for (int i = 0; i < zoom.palette.size(); i++) {
-			bgr0 = qFromLittleEndian(zoom.palette.at(i));
-
-			quint32 b = (bgr0 & 0x000000FF);
-			quint32 g = (bgr0 & 0x0000FF00) >> 8;
-			quint32 r = (bgr0 & 0x00FF0000) >> 16;
-
-			zoom.palette[i] = 0xFF000000 | r << 16 | g << 8 | b;
-		}
+		for (int i = 0; i < zoom.palette.size(); i++)
+			zoom.palette[i] = Color::bgr2rgb(qFromLittleEndian(
+			  zoom.palette.at(i)));
 
 		zoom.tiles = QVector<quint32>(zoom.dim.width() * zoom.dim.height() + 1);
 		for (int i = 0; i < zoom.tiles.size(); i++)

src/map/pointd.h

@@ -18,6 +18,7 @@ public:
 	double &ry() {return _y;}
 
 	bool isNull() const {return std::isnan(_x) && std::isnan(_y);}
+	bool isValid() const {return !(std::isnan(_x) || std::isnan(_y));}
 
 	QPointF toPointF() const {return QPointF((qreal)_x, (qreal)_y);}
 

src/map/rmap.cpp

@@ -0,0 +1,423 @@
+#include <QFileInfo>
+#include <QDataStream>
+#include <QPixmapCache>
+#include <QPainter>
+#include <QRegExp>
+#include <QtEndian>
+#include "common/rectc.h"
+#include "common/wgs84.h"
+#include "common/config.h"
+#include "calibrationpoint.h"
+#include "utm.h"
+#include "pcs.h"
+#include "rectd.h"
+#include "color.h"
+#include "rmap.h"
+
+
+#define MAGIC "CompeGPSRasterImage"
+#define CHECK(condition) \
+	if (!(condition)) { \
+		_errorString = "Invalid/corrupted RMap file"; \
+		return; \
+	}
+
+static CalibrationPoint parseCalibrationPoint(const QString &str)
+{
+	QStringList fields(str.split(","));
+	if (fields.size() != 5)
+		return CalibrationPoint();
+
+	bool ret1, ret2;
+	PointD xy(fields.at(0).toDouble(&ret1), fields.at(1).toDouble(&ret2));
+	if (!ret1 || !ret2)
+		return CalibrationPoint();
+	PointD pp(fields.at(3).toDouble(&ret1), fields.at(4).toDouble(&ret2));
+	if (!ret1 || !ret2)
+		return CalibrationPoint();
+
+	return (fields.at(2) == "A")
+	  ? CalibrationPoint(xy, Coordinates(pp.x(), pp.y()))
+	  : CalibrationPoint(xy, pp);
+}
+
+static Projection parseProjection(const QString &str, const GCS *gcs)
+{
+	QStringList fields(str.split(","));
+	if (fields.isEmpty())
+		return Projection();
+	bool ret;
+	int id = fields.at(0).toDouble(&ret);
+	if (!ret)
+		return Projection();
+	PCS pcs;
+	int zone;
+
+	switch (id) {
+		case 0: // UTM
+			if (fields.size() < 4)
+				return Projection();
+			zone = fields.at(2).toInt(&ret);
+			if (!ret)
+				return Projection();
+			if (fields.at(3) == "S")
+				zone = -zone;
+			pcs = PCS(gcs, 9807, UTM::setup(zone), 9001);
+			return Projection(&pcs);
+		case 1: // LatLon
+			return Projection(gcs);
+		case 2: // Mercator
+			pcs = PCS(gcs, 1024, Projection::Setup(), 9001);
+			return Projection(&pcs);
+		case 3: // Transversal Mercator
+			if (fields.size() < 7)
+				return Projection();
+			pcs = PCS(gcs, 9807, Projection::Setup(fields.at(3).toDouble(),
+			  fields.at(2).toDouble(), fields.at(6).toDouble(),
+			  fields.at(5).toDouble(), fields.at(4).toDouble(),
+			  NAN, NAN), 9001);
+			return Projection(&pcs);
+		case 4: // Lambert 2SP
+			if (fields.size() < 8)
+				return Projection();
+			pcs = PCS(gcs, 9802, Projection::Setup(fields.at(4).toDouble(),
+			  fields.at(5).toDouble(), NAN,
+			  fields.at(6).toDouble(), fields.at(7).toDouble(),
+			  fields.at(3).toDouble(), fields.at(2).toDouble()), 9001);
+			return Projection(&pcs);
+		case 6: // BGN (British National Grid)
+			pcs = PCS(gcs, 9807, Projection::Setup(49, -2, 0.999601, 400000,
+			  -100000, NAN, NAN), 9001);
+			return Projection(&pcs);
+		case 12: // France Lambert II etendu
+			pcs = PCS(gcs, 9801, Projection::Setup(52, 0, 0.99987742, 600000,
+			  2200000, NAN, NAN), 9001);
+			return Projection(&pcs);
+		case 14: // Swiss Grid
+			pcs = PCS(gcs, 9815, Projection::Setup(46.570866, 7.26225, 1.0,
+			  600000, 200000, 90.0, 90.0), 9001);
+			return Projection(&pcs);
+		case 108: // Dutch RD grid
+			pcs = PCS(gcs, 9809, Projection::Setup(52.15616055555555,
+			  5.38763888888889, 0.9999079, 155000, 463000, NAN, NAN), 9001);
+			return Projection(&pcs);
+		case 184: // Swedish Grid
+			pcs = PCS(gcs, 9807, Projection::Setup(0, 15.808278, 1, 1500000, 0,
+			  NAN, NAN), 9001);
+			return Projection(&pcs);
+		default:
+			return Projection();
+	}
+}
+
+bool RMap::parseIMP(const QByteArray &data)
+{
+	QStringList lines = QString(data).split("\r\n");
+	QVector<CalibrationPoint> calibrationPoints;
+	const GCS *gcs = 0;
+	QString projection, datum;
+	QRegExp re("^P[0-9]+=");
+
+	for (int i = 0; i < lines.count(); i++) {
+		const QString &line = lines.at(i);
+
+		if (line.startsWith("Projection="))
+			projection = line.split("=").at(1);
+		else if (line.startsWith("Datum="))
+			datum = line.split("=").at(1);
+		else if (line.contains(re)) {
+			QString point(line.split("=").at(1));
+			CalibrationPoint cp(parseCalibrationPoint(point));
+			if (cp.isValid())
+				calibrationPoints.append(cp);
+			else {
+				_errorString = point + ": invalid calibration point";
+				return false;
+			}
+		}
+	}
+
+	if (!(gcs = GCS::gcs(datum))) {
+		_errorString = datum + ": unknown/invalid datum";
+		return false;
+	}
+	_projection = parseProjection(projection, gcs);
+	if (!_projection.isValid()) {
+		_errorString = projection + ": unknown/invalid projection";
+		return false;
+	}
+
+	QList<ReferencePoint> rp;
+	for (int i = 0; i < calibrationPoints.size(); i++)
+		rp.append(calibrationPoints.at(i).rp(_projection));
+
+	_transform = Transform(rp);
+	if (!_transform.isValid()) {
+		_errorString = _transform.errorString();
+		return false;
+	}
+
+	return true;
+}
+
+RMap::RMap(const QString &fileName, QObject *parent)
+  : Map(parent), _mapRatio(1.0), _fileName(fileName), _zoom(0), _valid(false)
+{
+	QFile file(fileName);
+	if (!file.open(QIODevice::ReadOnly)) {
+		_errorString = file.errorString();
+		return;
+	}
+
+	QDataStream stream(&file);
+	stream.setByteOrder(QDataStream::LittleEndian);
+
+	char magic[sizeof(MAGIC) - 1];
+	if (stream.readRawData(magic, sizeof(magic)) != sizeof(magic)
+	  || memcmp(MAGIC, magic, sizeof(magic))) {
+		_errorString = "Not a raster RMap file";
+		return;
+	}
+
+	quint32 unknown, type, subtype, obfuscated, width, height, bpp, tileWidth,
+	  tileHeight, paletteSize;
+	quint64 IMPOffset;
+
+	stream >> type;
+	if (type > 5)
+		stream >> subtype >> obfuscated;
+	else
+		obfuscated = 0;
+	stream >> width >> height >> bpp >> unknown >> tileWidth >> tileHeight
+	  >> IMPOffset >> paletteSize;
+	CHECK(stream.status() == QDataStream::Ok);
+
+	if (!(type == 5 || (type >= 8 && type <= 10))) {
+		_errorString = QString::number(type) + ": unsupported map type";
+		return;
+	}
+	if (obfuscated) {
+		_errorString = "Obfuscated maps not supported";
+		return;
+	}
+
+	QSize imageSize(width, -(int)height);
+	_tileSize = QSize(tileWidth, tileHeight);
+
+	if (paletteSize) {
+		quint32 bgr;
+		CHECK(paletteSize <= 256);
+
+		_palette.resize(256);
+		for (int i = 0; i < (int)paletteSize; i++) {
+			stream >> bgr;
+			_palette[i] = Color::bgr2rgb(bgr);
+		}
+	}
+
+	qint32 zoomCount;
+	stream >> zoomCount;
+	CHECK(stream.status() == QDataStream::Ok && zoomCount);
+
+	QVector<quint64> zoomOffsets(zoomCount);
+	for (int i = 0; i < zoomCount; i++)
+		stream >> zoomOffsets[i];
+	CHECK(stream.status() == QDataStream::Ok);
+
+	for (int i = 0; i < zoomOffsets.size(); i++) {
+		_zooms.append(Zoom());
+		Zoom &zoom = _zooms.last();
+
+		CHECK(file.seek(zoomOffsets.at(i)));
+
+		quint32 width, height;
+		stream >> width >> height;
+		zoom.size = QSize(width, -(int)height);
+		stream >> width >> height;
+		zoom.dim = QSize(width, height);
+		zoom.scale = QPointF((qreal)zoom.size.width() / (qreal)imageSize.width(),
+		  (qreal)zoom.size.height() / (qreal)imageSize.height());
+		CHECK(stream.status() == QDataStream::Ok);
+
+		zoom.tiles.resize(zoom.dim.width() * zoom.dim.height());
+		for (int j = 0; j < zoom.tiles.size(); j++)
+			stream >> zoom.tiles[j];
+		CHECK(stream.status() == QDataStream::Ok);
+	}
+
+	CHECK(file.seek(IMPOffset));
+	quint32 IMPSize;
+	stream >> unknown >> IMPSize;
+	CHECK(stream.status() == QDataStream::Ok);
+
+	QByteArray IMP(IMPSize + 1, 0);
+	stream.readRawData(IMP.data(), IMP.size());
+	_valid = parseIMP(IMP);
+}
+
+QString RMap::name() const
+{
+	QFileInfo fi(_fileName);
+	return fi.baseName();
+}
+
+QRectF RMap::bounds()
+{
+	return QRectF(QPointF(0, 0), _zooms.at(_zoom).size / _mapRatio);
+}
+
+int RMap::zoomFit(const QSize &size, const RectC &rect)
+{
+	if (!rect.isValid())
+		_zoom = 0;
+	else {
+		RectD prect(rect, _projection);
+		QRectF sbr(_transform.proj2img(prect.topLeft()),
+		  _transform.proj2img(prect.bottomRight()));
+
+		for (int i = 0; i < _zooms.size(); i++) {
+			_zoom = i;
+			const Zoom &z = _zooms.at(i);
+			if (sbr.size().width() * z.scale.x() <= size.width()
+			  && sbr.size().height() * z.scale.y() <= size.height())
+				break;
+		}
+	}
+
+	return _zoom;
+}
+
+int RMap::zoomIn()
+{
+	_zoom = qMax(_zoom - 1, 0);
+	return _zoom;
+}
+
+int RMap::zoomOut()
+{
+	_zoom = qMin(_zoom + 1, _zooms.size() - 1);
+	return _zoom;
+}
+
+QPointF RMap::ll2xy(const Coordinates &c)
+{
+	const QPointF &scale = _zooms.at(_zoom).scale;
+	QPointF p(_transform.proj2img(_projection.ll2xy(c)));
+	return QPointF(p.x() * scale.x(), p.y() * scale.y()) / _mapRatio;
+}
+
+Coordinates RMap::xy2ll(const QPointF &p)
+{
+	const QPointF &scale = _zooms.at(_zoom).scale;
+	return  _projection.xy2ll(_transform.img2proj(QPointF(p.x() / scale.x(),
+	  p.y() / scale.y()) * _mapRatio));
+}
+
+void RMap::load()
+{
+	_file.setFileName(_fileName);
+	_file.open(QIODevice::ReadOnly);
+}
+
+void RMap::unload()
+{
+	_file.close();
+}
+
+QPixmap RMap::tile(int x, int y)
+{
+	const Zoom &zoom = _zooms.at(_zoom);
+
+	qint32 index = y / _tileSize.height() * zoom.dim.width()
+	  + x / _tileSize.width();
+	if (index > zoom.tiles.size())
+		return QPixmap();
+
+	quint64 offset = zoom.tiles.at(index);
+	if (!_file.seek(offset))
+		return QPixmap();
+	QDataStream stream(&_file);
+	stream.setByteOrder(QDataStream::LittleEndian);
+	quint32 tag;
+	stream >> tag;
+	if (stream.status() != QDataStream::Ok)
+		return QPixmap();
+
+	if (tag == 2) {
+		if (_palette.isEmpty())
+			return QPixmap();
+		quint32 width, height, size;
+		stream >> width >> height >> size;
+		QSize tileSize(width, -(int)height);
+
+		quint32 bes = qToBigEndian(tileSize.width() * tileSize.height());
+		QByteArray ba;
+		ba.resize(sizeof(bes) + size);
+		memcpy(ba.data(), &bes, sizeof(bes));
+
+		if (stream.readRawData(ba.data() + sizeof(bes), size) != (int)size)
+			return QPixmap();
+		QByteArray uba = qUncompress(ba);
+		if (uba.size() < tileSize.width() * tileSize.height())
+			return QPixmap();
+		QImage img((const uchar*)uba.constData(), tileSize.width(),
+		  tileSize.height(), QImage::Format_Indexed8);
+		img.setColorTable(_palette);
+
+		return QPixmap::fromImage(img);
+	} else if (tag == 7) {
+		quint32 len;
+		stream >> len;
+
+		QByteArray ba;
+		ba.resize(len);
+		if (stream.readRawData(ba.data(), ba.size()) != ba.size())
+			return QPixmap();
+
+		QImage img(QImage::fromData(ba));
+		return QPixmap::fromImage(img);
+	} else
+		return QPixmap();
+}
+
+void RMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
+{
+	Q_UNUSED(flags);
+
+	QSizeF ts(_tileSize.width() / _mapRatio, _tileSize.height() / _mapRatio);
+	QPointF tl(floor(rect.left() / ts.width()) * ts.width(),
+	  floor(rect.top() / ts.height()) * ts.height());
+
+	QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y());
+	for (int i = 0; i < ceil(s.width() / ts.width()); i++) {
+		for (int j = 0; j < ceil(s.height() / ts.height()); j++) {
+			int x = round(tl.x() * _mapRatio + i * _tileSize.width());
+			int y = round(tl.y() * _mapRatio + j * _tileSize.height());
+
+			QPixmap pixmap;
+			QString key = _fileName + "/" + QString::number(_zoom) + "_"
+			  + QString::number(x) + "_" + QString::number(y);
+			if (!QPixmapCache::find(key, &pixmap)) {
+				pixmap = tile(x, y);
+				if (!pixmap.isNull())
+					QPixmapCache::insert(key, pixmap);
+			}
+
+			if (pixmap.isNull())
+				qWarning("%s: error loading tile image", qPrintable(key));
+			else {
+#ifdef ENABLE_HIDPI
+				pixmap.setDevicePixelRatio(_mapRatio);
+#endif // ENABLE_HIDPI
+				QPointF tp(tl.x() + i * ts.width(), tl.y() + j * ts.height());
+				painter->drawPixmap(tp, pixmap);
+			}
+		}
+	}
+}
+
+void RMap::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)
+{
+	Q_UNUSED(deviceRatio);
+	_mapRatio = mapRatio;
+}

src/map/rmap.h

@@ -0,0 +1,64 @@
+#ifndef RMAP_H
+#define RMAP_H
+
+#include <QFile>
+#include <QColor>
+#include "map.h"
+#include "transform.h"
+#include "projection.h"
+
+class RMap : public Map
+{
+	Q_OBJECT
+
+public:
+	RMap(const QString &fileName, QObject *parent = 0);
+
+	QString name() const;
+
+	QRectF bounds();
+
+	int zoom() const {return _zoom;}
+	void setZoom(int zoom) {_zoom = zoom;}
+	int zoomFit(const QSize &size, const RectC &rect);
+	int zoomIn();
+	int zoomOut();
+
+	QPointF ll2xy(const Coordinates &c);
+	Coordinates xy2ll(const QPointF &p);
+
+	void setDevicePixelRatio(qreal deviceRatio, qreal mapRatio);
+	void load();
+	void unload();
+
+	void draw(QPainter *painter, const QRectF &rect, Flags flags);
+
+	bool isValid() const {return _valid;}
+	QString errorString() const {return _errorString;}
+
+private:
+	struct Zoom {
+		QSize size;
+		QSize dim;
+		QPointF scale;
+		QVector<quint64> tiles;
+	};
+
+	bool parseIMP(const QByteArray &data);
+	QPixmap tile(int x, int y);
+
+	QList<Zoom> _zooms;
+	Projection _projection;
+	Transform _transform;
+	QSize _tileSize;
+	QFile _file;
+	qreal _mapRatio;
+	QString _fileName;
+	int _zoom;
+	QVector<QRgb> _palette;
+
+	bool _valid;
+	QString _errorString;
+};
+
+#endif // RMAP_H

src/map/tifffile.h

@@ -1,43 +0,0 @@
-#ifndef TIFFFILE_H
-#define TIFFFILE_H
-
-#include <QFile>
-#include <QtEndian>
-
-class TIFFFile : public QFile
-{
-public:
-	TIFFFile() : _be(false) {}
-	TIFFFile(const QString &path) : QFile(path), _be(false) {}
-
-	bool readHeader(quint32 &ifd);
-	template<class T> bool readValue(T &val)
-	{
-		T data;
-
-		if (QFile::read((char*)&data, sizeof(T)) < (qint64)sizeof(T))
-			return false;
-
-#if Q_BYTE_ORDER == Q_BIG_ENDIAN
-			if (_be)
-				val = data;
-			else {
-				for (size_t i = 0; i < sizeof(T); i++)
-					*((char *)&val + i) = *((char*)&data + sizeof(T) - 1 - i);
-			}
-#else
-			if (_be) {
-				for (size_t i = 0; i < sizeof(T); i++)
-					*((char *)&val + i) = *((char*)&data + sizeof(T) - 1 - i);
-			} else
-				val = data;
-#endif
-
-		return true;
-	}
-
-private:
-	bool _be;
-};
-
-#endif // TIFFFILE_H

src/map/tile.h

@@ -10,7 +10,7 @@
 class Tile
 {
 public:
-	Tile() {}
+	Tile() : _scaledSize(0) {}
 	Tile(const QPoint &xy, const QVariant &zoom, int scaledSize = 0,
 	  const RectD &bbox = RectD()) : _xy(xy), _zoom(zoom),
 	  _scaledSize(scaledSize), _bbox(bbox) {}

src/map/transversemercator.cpp

@@ -107,9 +107,9 @@ PointD TransverseMercator::ll2xy(const Coordinates &c) const
 	dlam = deg2rad(c.lon()) - _longitudeOrigin;
 
 	if (dlam > M_PI)
-		dlam -= M_2_PI;
+		dlam -= 2 * M_PI;
 	if (dlam < -M_PI)
-		dlam += M_2_PI;
+		dlam += 2 * M_PI;
 	if (fabs(dlam) < 2.e-10)
 		dlam = 0.0;
 
@@ -235,20 +235,20 @@ Coordinates TransverseMercator::xy2ll(const PointD &p) const
 		lat = M_PI - lat;
 		lon += M_PI;
 		if (lon > M_PI)
-			lon -= M_2_PI;
+			lon -= 2 * M_PI;
 	}
 
 	while (lat < deg2rad(-90.0)) {
 		lat = - (lat + M_PI);
 		lon += M_PI;
 		if (lon > M_PI)
-			lon -= M_2_PI;
+			lon -= 2 * M_PI;
 	}
 
-	if (lon > M_2_PI)
-		lon -= M_2_PI;
+	if (lon > 2 * M_PI)
+		lon -= 2 * M_PI;
 	if (lon < -M_PI)
-		lon += M_2_PI;
+		lon += 2 * M_PI;
 
 	return Coordinates(rad2deg(lon), rad2deg(lat));
 }

src/map/wms.cpp

@@ -264,12 +264,12 @@ bool WMS::getCapabilities(const QString &url, const QString &file,
 	if (d.get(dl, authorization))
 		wait.exec();
 
-	if (QFileInfo(file).exists())
-		return true;
-	else {
+	if (!QFileInfo(file).exists()) {
 		_errorString = "Error downloading capabilities XML file";
 		return false;
 	}
+
+	return true;
 }
 
 WMS::WMS(const QString &file, const WMS::Setup &setup) : _valid(false)

src/map/wmts.cpp

@@ -305,12 +305,12 @@ bool WMTS::downloadCapabilities(const QString &url, const QString &file,
 	if (d.get(dl, authorization))
 		wait.exec();
 
-	if (QFileInfo(file).exists())
-		return true;
-	else {
+	if (!QFileInfo(file).exists()) {
 		_errorString = "Error downloading capabilities XML file";
 		return false;
 	}
+
+	return true;
 }
 
 WMTS::WMTS(const QString &file, const WMTS::Setup &setup) : _valid(false)