From 7e1bbbbd6a4a7a381cb47c6062e4458a7f8e3c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Mon, 24 Feb 2025 13:33:46 +0100 Subject: [PATCH 01/31] Version++ --- .appveyor.yml | 2 +- gpxsee.pro | 2 +- pkg/windows/gpxsee64.nsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index a9ce6291..82250587 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,4 @@ -version: 13.36.{build} +version: 13.37.{build} configuration: - Release diff --git a/gpxsee.pro b/gpxsee.pro index fb09e503..c606a855 100644 --- a/gpxsee.pro +++ b/gpxsee.pro @@ -3,7 +3,7 @@ unix:!macx:!android { } else { TARGET = GPXSee } -VERSION = 13.36 +VERSION = 13.37 QT += core \ gui \ diff --git a/pkg/windows/gpxsee64.nsi b/pkg/windows/gpxsee64.nsi index d97fb058..f782e669 100644 --- a/pkg/windows/gpxsee64.nsi +++ b/pkg/windows/gpxsee64.nsi @@ -49,7 +49,7 @@ Unicode true ; The name of the installer Name "GPXSee" ; Program version -!define VERSION "13.36" +!define VERSION "13.37" ; The file to write OutFile "GPXSee-${VERSION}_x64.exe" From f5f27c0212a65ca60b5d10e923274caefea58458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Mon, 24 Feb 2025 13:34:17 +0100 Subject: [PATCH 02/31] Remove some more Qt < 5.15 hack --- src/map/downloader.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/map/downloader.cpp b/src/map/downloader.cpp index dd06ee71..bc2bc5be 100644 --- a/src/map/downloader.cpp +++ b/src/map/downloader.cpp @@ -151,8 +151,7 @@ bool Downloader::doDownload(const Download &dl, const QList &headers for (int i = 0; i < headers.size(); i++) { const HTTPHeader &hdr = headers.at(i); request.setRawHeader(hdr.key(), hdr.value()); - // QByteArray::compare() not available in Qt < 5.12 - if (!QString(hdr.key()).compare("User-Agent", Qt::CaseInsensitive)) + if (!hdr.key().compare("User-Agent", Qt::CaseInsensitive)) userAgent = true; } if (!userAgent) From 17ad10ba238889ce53149c9b3f56c7b001233157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Tue, 25 Feb 2025 20:20:38 +0100 Subject: [PATCH 03/31] Fixed broken date ranges when there is no date in some data --- src/GUI/gui.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/GUI/gui.cpp b/src/GUI/gui.cpp index 52bba0d5..a3f24162 100644 --- a/src/GUI/gui.cpp +++ b/src/GUI/gui.cpp @@ -1193,10 +1193,12 @@ void GUI::loadData(const Data &data) _time += track.time(); _movingTime += track.movingTime(); const QDateTime date = track.date().toTimeZone(_options.timeZone.zone()); - if (_dateRange.first.isNull() || _dateRange.first > date) - _dateRange.first = date; - if (_dateRange.second.isNull() || _dateRange.second < date) - _dateRange.second = date; + if (date.isValid()) { + if (_dateRange.first.isNull() || _dateRange.first > date) + _dateRange.first = date; + if (_dateRange.second.isNull() || _dateRange.second < date) + _dateRange.second = date; + } } _trackCount += data.tracks().count(); From c5f51e935ecf614d788bff3d5a40793ee4939f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Tue, 25 Feb 2025 20:23:01 +0100 Subject: [PATCH 04/31] Limit maximal allowed CSV entries size --- src/common/csv.cpp | 7 +++++-- src/common/csv.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/common/csv.cpp b/src/common/csv.cpp index f2e1cb32..c8adabed 100644 --- a/src/common/csv.cpp +++ b/src/common/csv.cpp @@ -7,15 +7,18 @@ RFC 4180 parser with the following enchancements: - allows LF line ends in addition to CRLF line ends */ -bool CSV::readEntry(QByteArrayList &list) +bool CSV::readEntry(QByteArrayList &list, int limit) { - int state = 0; + int state = 0, len = 0; char c; QByteArray field; list.clear(); while (_device->getChar(&c)) { + if (limit && ++len > limit) + return false; + switch (state) { case 0: if (c == '\r') diff --git a/src/common/csv.h b/src/common/csv.h index a80e715f..861553dc 100644 --- a/src/common/csv.h +++ b/src/common/csv.h @@ -9,7 +9,7 @@ public: CSV(QIODevice *device, char delimiter = ',') : _device(device), _delimiter(delimiter), _line(1) {} - bool readEntry(QByteArrayList &list); + bool readEntry(QByteArrayList &list, int limit = 4096); bool atEnd() const {return _device->atEnd();} int line() const {return _line;} From 044770bc84ef812f4cbecdf8c43d1c0cf04479b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Tue, 25 Feb 2025 20:24:26 +0100 Subject: [PATCH 05/31] Added support for 70mai dashcams GPS log files --- gpxsee.pro | 2 ++ src/data/data.cpp | 4 +++ src/data/txtparser.cpp | 80 ++++++++++++++++++++++++++++++++++++++++++ src/data/txtparser.h | 18 ++++++++++ 4 files changed, 104 insertions(+) create mode 100644 src/data/txtparser.cpp create mode 100644 src/data/txtparser.h diff --git a/gpxsee.pro b/gpxsee.pro index c606a855..98055ee1 100644 --- a/gpxsee.pro +++ b/gpxsee.pro @@ -117,6 +117,7 @@ HEADERS += src/common/config.h \ src/data/gpsdumpparser.h \ src/data/style.h \ src/data/twonavparser.h \ + src/data/txtparser.h \ src/map/IMG/light.h \ src/map/downloader.h \ src/map/demloader.h \ @@ -343,6 +344,7 @@ SOURCES += src/main.cpp \ src/GUI/pngexportdialog.cpp \ src/GUI/projectioncombobox.cpp \ src/GUI/passwordedit.cpp \ + src/data/txtparser.cpp \ src/map/downloader.cpp \ src/map/demloader.cpp \ src/map/ENC/atlasdata.cpp \ diff --git a/src/data/data.cpp b/src/data/data.cpp index 30dc5add..6ed63882 100644 --- a/src/data/data.cpp +++ b/src/data/data.cpp @@ -23,6 +23,7 @@ #include "onmoveparsers.h" #include "twonavparser.h" #include "gpsdumpparser.h" +#include "txtparser.h" #include "data.h" @@ -49,6 +50,7 @@ static OMDParser omd; static GHPParser ghp; static TwoNavParser twonav; static GPSDumpParser gpsdump; +static TXTParser txt; static QMultiMap parsers() { @@ -82,6 +84,7 @@ static QMultiMap parsers() map.insert("rte", &twonav); map.insert("wpt", &twonav); map.insert("wpt", &gpsdump); + map.insert("txt", &txt); return map; } @@ -241,6 +244,7 @@ QString Data::formats() + qApp->translate("Data", "SLF files") + " (*.slf);;" + qApp->translate("Data", "SML files") + " (*.sml);;" + qApp->translate("Data", "TCX files") + " (*.tcx);;" + + qApp->translate("Data", "70mai GPS log files") + " (*.txt);;" + qApp->translate("Data", "TwoNav files") + " (*.rte *.trk *.wpt);;" + qApp->translate("Data", "GPSDump files") + " (*.wpt);;" + qApp->translate("Data", "All files") + " (*)"; diff --git a/src/data/txtparser.cpp b/src/data/txtparser.cpp new file mode 100644 index 00000000..f953d162 --- /dev/null +++ b/src/data/txtparser.cpp @@ -0,0 +1,80 @@ +#include +#include "common/csv.h" +#include "txtparser.h" + +static Coordinates coordinates(const QByteArrayList &entry) +{ + bool lonOk, latOk; + double lon = entry.at(3).toDouble(&lonOk); + double lat = entry.at(2).toDouble(&latOk); + + return (lonOk && latOk) ? Coordinates(lon, lat) : Coordinates(); +} + +bool TXTParser::parse(QFile *file, QList &tracks, + QList &routes, QList &polygons, QVector &waypoints) +{ + Q_UNUSED(routes); + Q_UNUSED(polygons); + Q_UNUSED(waypoints); + CSV csv(file); + QByteArrayList entry; + SegmentData *sg = 0; + + _errorLine = 1; + _errorString.clear(); + + while (!csv.atEnd()) { + if (!csv.readEntry(entry)) { + _errorString = "CSV parse error"; + _errorLine = csv.line() - 1; + return false; + } + + if (entry.size() == 1) { + if (entry.at(0) == "$V02") { + tracks.append(TrackData(SegmentData())); + sg = &tracks.last().last(); + } else { + _errorString = "Invalid track start marker"; + _errorLine = csv.line() - 1; + return false; + } + } else if (entry.size() == 13) { + if (!sg) { + _errorString = "Missing start marker"; + _errorLine = csv.line() - 1; + return false; + } + + if (entry.at(1) == "A") { + Coordinates c(coordinates(entry)); + if (!c.isValid()) { + _errorString = "Invalid coordinates"; + _errorLine = csv.line() - 1; + return false; + } + Trackpoint tp(c); + + bool ok; + qulonglong ts = entry.at(0).toULongLong(&ok); + if (!ok) { + _errorString = "Invalid timestamp"; + _errorLine = csv.line() - 1; + return false; + } + tp.setTimestamp(QDateTime::fromSecsSinceEpoch(ts, + QTimeZone::utc())); + + uint speed = entry.at(5).toULong(&ok); + if (ok) + tp.setSpeed(speed * 0.01); + + if (c != Coordinates(0, 0)) + sg->append(tp); + } + } + } + + return true; +} diff --git a/src/data/txtparser.h b/src/data/txtparser.h new file mode 100644 index 00000000..e4bb5361 --- /dev/null +++ b/src/data/txtparser.h @@ -0,0 +1,18 @@ +#ifndef TXTPARSER_H +#define TXTPARSER_H + +#include "parser.h" + +class TXTParser : public Parser +{ + bool parse(QFile *file, QList &tracks, QList &routes, + QList &polygons, QVector &waypoints); + QString errorString() const {return _errorString;} + int errorLine() const {return _errorLine;} + +private: + QString _errorString; + int _errorLine; +}; + +#endif // TXTPARSER_H From 1f31a5d6c503f07abddcba175f90a6f7af9995f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Tue, 25 Feb 2025 20:41:52 +0100 Subject: [PATCH 06/31] 70mai GPS logs Linux desktop integration --- pkg/linux/gpxsee.appdata.xml | 5 +++-- pkg/linux/gpxsee.desktop | 2 +- pkg/linux/gpxsee.xml | 10 ++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pkg/linux/gpxsee.appdata.xml b/pkg/linux/gpxsee.appdata.xml index 164f575a..07c7339f 100644 --- a/pkg/linux/gpxsee.appdata.xml +++ b/pkg/linux/gpxsee.appdata.xml @@ -15,8 +15,8 @@
  • Opens GPX, TCX, FIT, KML, IGC, NMEA, SIGMA SLF, Suunto SML, LOC, OziExplorer (PLT, WPT, RTE), GeoJSON, SeeYou CUP, Garmin GPI & CSV, TomTom OV2 & ITN, ONmove OMD/GHP, - TwoNav (TRK, RTE, WPT), GPSDump WPT and geotagged JPEG - files.
    • + TwoNav (TRK, RTE, WPT), GPSDump WPT, 70mai GPS logs and + geotagged JPEG files.
  • Opens geo URIs (RFC 5870).
  • User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS, QuadTiles).
    • @@ -113,6 +113,7 @@ application/vnd.iho.s57-catalogue application/vnd.gpsdump.wpt application/vnd.gpstuner.gmi + application/vnd.70mai.txt x-scheme-handler/geo diff --git a/pkg/linux/gpxsee.desktop b/pkg/linux/gpxsee.desktop index 7354be78..b6bba86b 100644 --- a/pkg/linux/gpxsee.desktop +++ b/pkg/linux/gpxsee.desktop @@ -16,4 +16,4 @@ Icon=gpxsee Terminal=false Type=Application Categories=Graphics;Viewer;Education;Geography;Maps;Sports;Qt -MimeType=x-scheme-handler/geo;application/gpx+xml;application/vnd.garmin.tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/vnd.groundspeak.loc+xml;application/vnd.sigma.slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/vnd.suunto.sml+xml;image/jpeg;text/csv;application/vnd.garmin.img;application/vnd.garmin.jnx;application/vnd.garmin.gmap+xml;image/vnd.maptech.kap;application/vnd.oziexplorer.map;application/vnd.mapbox.mbtiles;application/vnd.twonav.rmap;application/vnd.trekbuddy.tba;application/vnd.gpxsee.map+xml;application/x-tar;image/tiff;application/vnd.google-earth.kmz;application/vnd.alpinequest.aqm;application/vnd.cgtk.gemf;application/vnd.rmaps.sqlite;application/vnd.osmdroid.sqlite;application/vnd.mapsforge.map;application/vnd.tomtom.ov2;application/vnd.tomtom.itn;application/vnd.esri.wld;application/vnd.onmove.omd;application/vnd.onmove.ghp;application/vnd.memory-map.qct;application/vnd.twonav.trk;application/vnd.twonav.rte;application/vnd.twonav.wpt;application/vnd.orux.map+xml;application/vnd.iho.s57-data;application/vnd.iho.s57-catalogue;application/vnd.gpsdump.wpt;application/vnd.gpstuner.gmi +MimeType=x-scheme-handler/geo;application/gpx+xml;application/vnd.garmin.tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/vnd.groundspeak.loc+xml;application/vnd.sigma.slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/vnd.suunto.sml+xml;image/jpeg;text/csv;application/vnd.garmin.img;application/vnd.garmin.jnx;application/vnd.garmin.gmap+xml;image/vnd.maptech.kap;application/vnd.oziexplorer.map;application/vnd.mapbox.mbtiles;application/vnd.twonav.rmap;application/vnd.trekbuddy.tba;application/vnd.gpxsee.map+xml;application/x-tar;image/tiff;application/vnd.google-earth.kmz;application/vnd.alpinequest.aqm;application/vnd.cgtk.gemf;application/vnd.rmaps.sqlite;application/vnd.osmdroid.sqlite;application/vnd.mapsforge.map;application/vnd.tomtom.ov2;application/vnd.tomtom.itn;application/vnd.esri.wld;application/vnd.onmove.omd;application/vnd.onmove.ghp;application/vnd.memory-map.qct;application/vnd.twonav.trk;application/vnd.twonav.rte;application/vnd.twonav.wpt;application/vnd.orux.map+xml;application/vnd.iho.s57-data;application/vnd.iho.s57-catalogue;application/vnd.gpsdump.wpt;application/vnd.gpstuner.gmi;application/vnd.70mai.txt diff --git a/pkg/linux/gpxsee.xml b/pkg/linux/gpxsee.xml index cf1cf965..9286a2ec 100644 --- a/pkg/linux/gpxsee.xml +++ b/pkg/linux/gpxsee.xml @@ -188,6 +188,16 @@ + + 70mai GPS Log File + + + + + + + + From b1aa32d23b177dede2f1f8c413e76cfb4a0b635b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Tue, 25 Feb 2025 21:05:13 +0100 Subject: [PATCH 07/31] 70mai GPS logs MacOS desktop integration --- pkg/mac/Info.plist | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/pkg/mac/Info.plist b/pkg/mac/Info.plist index 6b25c4a1..2f4c005a 100644 --- a/pkg/mac/Info.plist +++ b/pkg/mac/Info.plist @@ -736,6 +736,20 @@ CFBundleTypeRole Viewer + + CFBundleTypeExtensions + + txt + + CFBundleTypeMIMETypes + + application/vnd.70mai.txt + + CFBundleTypeName + 70mai GPS Log File + CFBundleTypeRole + Viewer + CFBundleURLTypes @@ -1718,6 +1732,27 @@ application/vnd.iho.s57-catalogue + + UTTypeIdentifier + com.70mai.txt + UTTypeReferenceURL + https://forum.mapillary.com/t/using-the-70mai-a810-dashcam-for-mapillary/9130/7?u=boris + UTTypeDescription + 70mai GPS Log File + UTTypeConformsTo + + public.data + + UTTypeTagSpecification + + public.filename-extension + + txt + + public.mime-type + application/vnd.70mai.txt + + UTExportedTypeDeclarations From 099ce0ad6c8aca6d799635834fac29e6ed6cddda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Tue, 25 Feb 2025 21:05:49 +0100 Subject: [PATCH 08/31] 70mai GPS logs Windows desktop integration --- pkg/windows/gpxsee64.nsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/windows/gpxsee64.nsi b/pkg/windows/gpxsee64.nsi index f782e669..e2ab96d4 100644 --- a/pkg/windows/gpxsee64.nsi +++ b/pkg/windows/gpxsee64.nsi @@ -265,6 +265,7 @@ Section "GPXSee" SEC_APP WriteRegStr HKCR ".gemf\OpenWithList" "GPXSee.exe" "" WriteRegStr HKCR ".000\OpenWithList" "GPXSee.exe" "" WriteRegStr HKCR ".031\OpenWithList" "GPXSee.exe" "" + WriteRegStr HKCR ".txt\OpenWithList" "GPXSee.exe" "" System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' @@ -492,6 +493,7 @@ Section "Uninstall" DeleteRegValue HKCR ".gemf\OpenWithList" "GPXSee.exe" DeleteRegValue HKCR ".000\OpenWithList" "GPXSee.exe" DeleteRegValue HKCR ".031\OpenWithList" "GPXSee.exe" + DeleteRegValue HKCR ".txt\OpenWithList" "GPXSee.exe" DeleteRegKey HKCR "Applications\GPXSee.exe" System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' From 7249c85a02067fde7c0a846cc24fb8e3ff1994ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Tue, 25 Feb 2025 21:08:03 +0100 Subject: [PATCH 09/31] Localization update --- lang/gpxsee_ca.ts | 532 ++++++++++++++++++++++--------------------- lang/gpxsee_cs.ts | 530 +++++++++++++++++++++--------------------- lang/gpxsee_da.ts | 530 +++++++++++++++++++++--------------------- lang/gpxsee_de.ts | 530 +++++++++++++++++++++--------------------- lang/gpxsee_eo.ts | 530 +++++++++++++++++++++--------------------- lang/gpxsee_es.ts | 530 +++++++++++++++++++++--------------------- lang/gpxsee_fi.ts | 530 +++++++++++++++++++++--------------------- lang/gpxsee_fr.ts | 530 +++++++++++++++++++++--------------------- lang/gpxsee_hu.ts | 530 +++++++++++++++++++++--------------------- lang/gpxsee_it.ts | 530 +++++++++++++++++++++--------------------- lang/gpxsee_ko.ts | 532 ++++++++++++++++++++++--------------------- lang/gpxsee_nb.ts | 530 +++++++++++++++++++++--------------------- lang/gpxsee_pl.ts | 530 +++++++++++++++++++++--------------------- lang/gpxsee_pt_BR.ts | 530 +++++++++++++++++++++--------------------- lang/gpxsee_ru.ts | 530 +++++++++++++++++++++--------------------- lang/gpxsee_sv.ts | 530 +++++++++++++++++++++--------------------- lang/gpxsee_tr.ts | 530 +++++++++++++++++++++--------------------- lang/gpxsee_uk.ts | 530 +++++++++++++++++++++--------------------- lang/gpxsee_zh_CN.ts | 532 ++++++++++++++++++++++--------------------- 19 files changed, 5171 insertions(+), 4905 deletions(-) diff --git a/lang/gpxsee_ca.ts b/lang/gpxsee_ca.ts index 666f8655..252fe279 100644 --- a/lang/gpxsee_ca.ts +++ b/lang/gpxsee_ca.ts @@ -70,112 +70,117 @@ Data - + Supported files Fitxers compatibles - + CSV files Fitxers CSV - + CUP files Fitxers CUP - + FIT files Fitxers FIT - + GeoJSON files Fitxers GeoJSON - + GPI files Fitxers GPI - + GPX files Fitxers GPX - + IGC files Fitxers IGC - + ITN files Fitxers ITN - + JPEG images Imatges JPEG - + KML files Fitxers KML - + LOC files Fitxers LOC - + NMEA files Fitxers NMEA - + ONmove files Fitxer ONmove - + OV2 files Fitxers OV2 - + OziExplorer files Fitxers OziExplorer - + SLF files Fitxers SLF - + SML files Fitxers SML - + TCX files Fitxers TCX - + + 70mai GPS log files + + + + TwoNav files Fitxers TwoNav - + GPSDump files Ffitxers d'abocament de GPS - + All files Tots els fitxers @@ -317,29 +322,32 @@ Format - - + + ft peus + mi milles - + + nmi nmi - - + + m m - + + km km @@ -347,708 +355,714 @@ GUI - + Quit Sortir - - - + + + Paths Camins - - + + Keyboard controls Controls del teclat - - + + About GPXSee Sobre GPXSee - + Open... Obrir... - + Open directory... Obrir directori... - + Print... Imprimir... - + Export to PDF... Exportar a PDF... - + Export to PNG... Exportar a PNG... - + Close Tancar - + Reload Recarregar - + Statistics... Estadístiques... - + Clear list Esborrar la llista - + Load POI file... Carregar arxiu POI... - + Select all files Seleccionar tots els fitxers - + Unselect all files Deseleccionar tots els fitxers - + Overlap POIs Sobreposar POIs - + Show POI icons Mostra icones POI - + Show POI labels Mostra etiquetes POI - + Show POIs Mostra POIs - + Show map Mostra el mapa - + Load map... Carrega el mapa... - + Load map directory... Carrega directori de mapes... - + Clear tile cache Buida la memòria de tessel·les - - - + + + Next map Següent mapa - + Show cursor coordinates Mostra les coordenades del cursor - + All Tot - + Raster only Només ràster - + Vector only Només vector - + Show position Mostra la posició - + Follow position Segueix la posició - + Show coordinates Mostra les coordenades - + Show motion info Mostra informació de moviment - + Show tracks Mostra les traces - + Show routes Mostra les rutes - + Show waypoints Mostra els punts de pas - + Show areas Mostra les àrees - + Waypoint icons Icones de punts de pas - + Waypoint labels Etiquetes de punts de pas - + Route waypoints Punts de pas de ruta - + km/mi markers Fites km/mi - + Do not show No mostris - + Marker only Només marcador - + Date/time Data i hora - + Coordinates Coordenades - + Use styles Empra estils - + Download data DEM Descarregar dades DEM - + Download map DEM Descarregar mapa DEM - + Show local DEM tiles Mostra tessel·les DEM locals - + Show hillshading Mostra l'ombrejat - + Show graphs Mostra gràfiques - - - + + + Distance Distància - - - - + + + + Time Temps - + Show grid Mostra malla - + Show slider info Mostra informació lliscant - + Show tabs Mostra pestanyes - + Show toolbars Mostra les barres d'eines - + Total time Temps total - - - + + + Moving time Temps en moviment - + Metric Mètric - + Imperial Imperial - + Nautical Nàutic - + Decimal degrees (DD) Graus decimals (DD) - + Degrees and decimal minutes (DMM) Graus i minuts decimals (DMM) - + Degrees, minutes, seconds (DMS) Graus, minuts, segons (DMS) - + Fullscreen mode Mode de pantalla completa - + Options... Opcions... - + Next Següent - + Previous Anterior - + Last Darrer - + First Primer - + &File &Fitxer - + Open recent Obert fa poc - + &Map &Mapa - + Layers Capes - + &Graph &Gràfic - + &Data &Dades - + Position info Informació de la posició - + &POI &POI - + DEM DEM - + Position Posició - + &Settings &Configuració - + Units Unitats - + Coordinates format Format de coordenades - + &Help &Ajuda - + File Fitxer - + Show Mostra - + Navigation Navegació - - + + Version %1 Versió %1 - - + + 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. GPXSee es distribueix sota els termes de la Llicència Pública General de GNU versió 3. Per a més informació sobre GPXSee visiteu la web del projecte a %1. - + Next file Següent fitxer - + Previous file Fitxer anterior - + First file Primer fitxer - + Last file Darrer fitxer - + Append file Afegeix un fitxer - + Next/Previous Següent/Anterior - + Toggle graph type Canvia el tipus de gràfic - + Toggle time type Canvia el tipus de temps - + Toggle position info Commuta la informació de la posició - + Previous map Mapa anterior - + Zoom in Apropar - + Zoom out Allunyar - + Digital zoom Zoom digital - + Zoom Zoom - + Copy coordinates Copiar coordenades - + Left Click Clic esquerre - - + + Map directory: Directori de mapes: - - + + POI directory: Directori de POI: - - + + CRS directory: Directori CRS: - - + + DEM directory: Directori DEM: - - + + Styles directory: Directori d'estils: - - + + Symbols directory: Directori de simbologia: - - + + Tile cache directory: Directori de la memòria cau de tessel·les: - - + + Open file Obrir fitxer - + Open directory Obrir directori - + + Error loading geo URI: + + + + Error loading data file: Error en carregar fitxer de dades: - - + + Line: %1 Línia: %1 - - - + + + + Don't show again No ho tornis a mostrar - - + + Open POI file Obrir fitxer POI - + Error loading POI file: Error en carregar fitxer POI: - - + + Tracks Traces - - + + Routes Rutes - - + + Waypoints Punts de pas - - + + Areas Àrees - - - - + + + + Date Data - - - + + + Statistics Estadístiques - + Name Nom - - + + Open map file Obrir arxiu de mapa - - - - + + + + Error loading map: Error en carregar mapa: - + Select map directory Escollir directori de mapes - + Clear "%1" tile cache? Buidar "%1"memòria cau de tessel·les? - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. S'ha superat el límit de descàrrega de tessel·les DEM. Si realment necessiteu dades per a una àrea tan gran, descarregueu els fitxers manualment. - + Download %n DEM tiles? Descarregar %n tessel·la DEM? @@ -1056,22 +1070,22 @@ - + Could not download all required DEM files. No s'ha pogut descarregar tots els fitxers DEM necessaris. - + No local DEM tiles found. No s'ha trobat tessel·les DEM locals. - + No files loaded Cap fitxer carregat - + %n files %n fitxer @@ -1139,59 +1153,59 @@ GraphView - + Data not available Sense dades - - + + Distance Distància + - ft peus - + mi mi - + nmi nmi - + m m - + km km - + s s - + min mín - + h h - + Time Temps @@ -1634,7 +1648,7 @@ - + Graphs Gràfics @@ -1724,7 +1738,7 @@ - + s s @@ -1765,8 +1779,8 @@ - - + + System Sistema @@ -1847,7 +1861,7 @@ - + POI POI @@ -1896,7 +1910,7 @@ - + Source Font @@ -1906,18 +1920,18 @@ Ombrejat - + Plugin: Connector: - + WYSIWYG WYSIWYG - + High-Resolution Alta resolució @@ -1927,151 +1941,151 @@ Clarejar: - + The printed area is approximately the display area. The map zoom level does not change. L'àrea impresa és aproximadament l'àrea de visualització. El nivell de zoom del mapa no canvia. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. El nivell de zoom es canviarà de manera que tot el contingut (traces/punts de pas) s'ajusti a l'àrea impresa i la resolució del mapa sigui el més propera possible a la resolució d'impressió. - + Name Nom - + Date Data - + Distance Distància - + Time Temps - + Moving time Temps en moviment - + Item count (>1) Recompte d'elements (>1) - + Separate graph page Pàgina de gràfic separada - + Print mode Mode d'impressió - + Header Capçalera - + Use OpenGL Utilitzeu OpenGL - + Enable HTTP/2 Activeu HTTP/2 - - + + MB MB - - + + Image cache size: Mida de la memòria cau d'imatges: - - + + Connection timeout: Temps d'espera de connexió: - - + + DEM cache size: Mida de la memòria cau MDE: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. Seleccioneu les rutes inicials dels diàlegs d'obrir fitxers. Deixeu el camp buit per a l'opció predeterminada del sistema. - + Data: Dades: - + Maps: Mapes: - + POI: POI: - + Initial paths Rutes inicials - + Appearance Aspecte - + Maps Mapes - + Data Dades - + DEM DEM - + Position Posició - + Print & Export Imprimeix i exporta - + Options Opcions diff --git a/lang/gpxsee_cs.ts b/lang/gpxsee_cs.ts index 27097213..04f5b052 100644 --- a/lang/gpxsee_cs.ts +++ b/lang/gpxsee_cs.ts @@ -70,112 +70,117 @@ Data - + Supported files Podporované soubory - + CSV files Soubory CSV - + CUP files Soubory CUP - + FIT files Soubory FIT - + GeoJSON files Soubory GeoJSON - + GPI files Soubory GPI - + GPX files Soubory GPX - + IGC files Soubory IGC - + ITN files Soubory ITN - + JPEG images Obrázky JPEG - + KML files Soubory KML - + LOC files Soubory LOC - + NMEA files Soubory NMEA - + OV2 files Soubory OV2 - + OziExplorer files Soubory OziExploreru - + SML files Soubory SML - + TCX files Soubory TCX - + SLF files Soubory SLF - + ONmove files Soubory ONmove - + + 70mai GPS log files + + + + TwoNav files Soubory TwoNavu - + GPSDump files Soubory GPSDumpu - + All files Všechny soubory @@ -317,29 +322,32 @@ Format - - + + ft ft + mi mi - + + nmi nmi - - + + m m - + + km km @@ -347,624 +355,630 @@ GUI - - + + Open file Otevřít soubor - - + + Open POI file Otevřít POI soubor - + Quit Ukončit - - + + Keyboard controls Ovládací klávesy - + Close Zavřít - + Reload Znovu načíst - + Show Zobrazit - + File Soubor - + Overlap POIs Překrývat POI - + Show POI labels Zobrazit názvy POI - + Show POIs Zobrazit POI - + Show map Zobrazit mapu - + Clear tile cache Vymazat mezipaměť dlaždic - + Open... Otevřít... - - - + + + Paths Cesty - + Open directory... Otevřít adresář... - + Export to PNG... Exportovat do PNG... - + Statistics... Statistika... - + Clear list Smazat seznam - + Load POI file... Nahrát POI soubor... - + Select all files Vybrat všechny soubory - + Unselect all files Odznačit všechny soubory - + Show POI icons Zobrazit POI ikony - + Load map... Nahrát mapu... - + Load map directory... Nahrát adresář s mapami... - - - + + + Next map Následující mapa - + Show cursor coordinates Zobrazit souřadnice kurzoru - + All Všechny - + Raster only Pouze rastrové - + Vector only Pouze vektorové - + Show position Zobrazit pozici - + Follow position Sledovat pozici - + Show coordinates Zobrazit souřadnice - + Show motion info Zobrazit informace o pohybu - + Show tracks Zobrazit cesty - + Show routes Zobrazit trasy - + Show waypoints Zobrazit navigační body - + Show areas Zobrazit plochy - + Waypoint icons Ikony navigačních bodů - + Waypoint labels Názvy navigačních bodů - + km/mi markers Kilometrovníky - + Do not show Nezobrazovat - + Marker only Pouze ukazatel - + Date/time Datum/čas - + Coordinates Souřadnice - + Use styles Použít styly - + Show local DEM tiles Zobrazit lokální DEM dlaždice - + Show hillshading Stínování kopců - + Show graphs Zobrazit grafy - + Show grid Zobrazit mřížku - + Show slider info Zobrazit informace o posuvníku - + Show tabs Zobrazit karty - + Show toolbars Zobrazovat nástrojové lišty - + Total time Celkový čas - - - + + + Moving time Čistý čas - + Metric Metrické - + Imperial Imperiální - + Nautical Námořní - + Decimal degrees (DD) Desetinné stupně (DD) - + Degrees and decimal minutes (DMM) Stupně a desetinné minuty (DMM) - + Degrees, minutes, seconds (DMS) Stupně, minuty, vteřiny (DMS) - + Fullscreen mode Celoobrazovkový režim - + Options... Nastavení... - + Next Následující - + Previous Předchozí - + Last Poslední - + First První - + Open recent Otevřít nedávný - + Layers Vrstvy - + Position info Informace o poloze - + DEM DEM - + Position Pozice - + Units Jednotky - + Coordinates format Formát souřadnic - - + + Version %1 Verze %1 - - + + 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. 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. - + Append file Přidat soubor - + Next/Previous Následující/Předchozí - + Toggle graph type Přepnout typ grafu - + Toggle time type Přepnout typ času - + Toggle position info Přepnout informace o poloze - + Previous map Předchozí mapa - + Zoom in Přiblížit - + Zoom out Oddálit - + Digital zoom Digitální zoom - + Zoom Zoom - + Copy coordinates Kopírovat souřadnice - + Left Click Levý klik myši - - + + DEM directory: Adresář s DEM daty: - - + + Styles directory: Adresář se styly: - - + + Symbols directory: Adresář se symboly: - + Open directory Otevřít adresář - - + Error loading geo URI: + + + + + + + Don't show again Již nezobrazovat - - + + Areas Plochy - - - + + + Statistics Statistika - - + + Open map file Otevřít mapový soubor - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. Překročen limit pro počet stahovaných DEM dlaždic. Pokud opravdu potřebujete data pro takto velikou oblast, stáhněte dlaždice manuálně. - + Could not download all required DEM files. Nepodařilo se stáhnout všechny DEM soubory. - + No files loaded Nejsou načteny žádné soubory - - - - + + + + Date Datum - + &File &Soubor - + &Map &Mapa - + &Graph &Graf - + &POI &POI - + &Data &Data - + Download data DEM Stáhnout DEM pro data - + Download map DEM Stáhnout DEM pro mapu - + &Settings &Nastavení - + &Help N&ápověda - - + + Map directory: Adresář s mapami: - - + + POI directory: Adresář s POI body: - - + + CRS directory: Adresář s CRS daty: - - + + Tile cache directory: Adresář mezipaměti dlaždic: - - + + Routes Trasy - - - - + + + + Error loading map: Mapu nelze načíst: - + Select map directory Vybrat adresář s mapami - + Clear "%1" tile cache? Vymazat mezipaměť mapy "%1"? - + Download %n DEM tiles? Stáhnout %n DEM dlaždici? @@ -973,12 +987,12 @@ - + No local DEM tiles found. Nebyly nalezeny žádné lokální DEM dlaždice. - + %n files %n soubor @@ -987,96 +1001,96 @@ - + Next file Následující soubor - + Print... Tisknout... - + Export to PDF... Exportovat do PDF... - - + + Waypoints Navigační body - + Previous file Předchozí soubor - + Route waypoints Body tras - + First file První soubor - + Last file Poslední soubor - + Error loading data file: Datový soubor nelze načíst: - - + + Line: %1 Řádka: %1 - + Error loading POI file: Soubor POI nelze načíst: - + Name Název - - + + Tracks Cesty - - + + About GPXSee O aplikaci GPXSee - + Navigation Navigace - - - + + + Distance Vzdálenost - - - - + + + + Time Čas @@ -1141,59 +1155,59 @@ GraphView - + m m - + km km + - ft ft - + Data not available Data nejsou k dispozici - + mi mi - + nmi nmi - + s s - + min min - + h h - - + + Distance Vzdálenost - + Time Čas @@ -1473,7 +1487,7 @@ - + Graphs Grafy @@ -1669,7 +1683,7 @@ - + s s @@ -1832,7 +1846,7 @@ - + POI POI @@ -1881,7 +1895,7 @@ - + Source Zdroj dat @@ -1891,18 +1905,18 @@ Stínování kopců - + Plugin: Plugin: - + WYSIWYG WYSIWYG - + High-Resolution Vysoké rozlišení @@ -1922,158 +1936,158 @@ Zesvětlení: - + The printed area is approximately the display area. The map zoom level does not change. Oblast tisku přibližně odpovídá zobrazované oblasti. Přiblížení mapy se nemění. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. Přiblížení mapy bude upraveno tak, aby se celý obsah (trasy/body) vešel do oblasti tisku a rozlišení mapy bylo co nejblíže rozlišení tisku. - + Name Název - + Date Datum - + Distance Vzdálenost - + Time Čas - + Moving time Čistý čas - + Item count (>1) Počet objektů (>1) - + Separate graph page Samostatná stránka s grafy - + Print mode Režim tisku - + Header Záhlaví - + Use OpenGL Používat OpenGL - + Enable HTTP/2 Povolit HTTP/2 - - + + MB MB - - + + Image cache size: Mezipaměť obrázků: - - + + Connection timeout: Časový limit připojení: - - + + System Systém - - + + DEM cache size: Mezipaměť DEM: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. Výchozí cesty v dialozích pro výběr souborů. Nevyplňené pole odpovídá výchozímu nastavení systému. - + Data: Data: - + Maps: Mapy: - + POI: POI: - + Initial paths Výchozí cesty - + Appearance Vzhled - + Maps Mapy - + Data Data - + DEM DEM - + Position Pozice - + Print & Export Tisk a export - + Options Nastavení diff --git a/lang/gpxsee_da.ts b/lang/gpxsee_da.ts index 2bde7970..432ef888 100644 --- a/lang/gpxsee_da.ts +++ b/lang/gpxsee_da.ts @@ -70,112 +70,117 @@ Data - + Supported files Understøttede filer - + CSV files CSV-filer - + CUP files CUP-filer - + FIT files FIT-filer - + GeoJSON files GeoJSON-filer - + GPI files GPI-filer - + GPX files GPX-filer - + IGC files IGC-filer - + ITN files ITN-filer - + JPEG images JPEG-billeder - + KML files KML-filer - + LOC files LOC-filer - + NMEA files NMEA-filer - + ONmove files ONmove-filer - + OV2 files OV2-filer - + OziExplorer files OziExplorer-filer - + SLF files SLF-filer - + SML files SML-filer - + TCX files TCX-filer - + + 70mai GPS log files + + + + TwoNav files TwoNav-filer - + GPSDump files GPSDump-filer - + All files Alle filer @@ -317,29 +322,32 @@ Format - - + + ft fod + mi mil - + + nmi sømil - - + + m m - + + km km @@ -347,430 +355,436 @@ GUI - + Quit Afslut - - - + + + Paths Stier - - + + Keyboard controls Tastaturgenveje - - + + About GPXSee Om GPXSee - + Open... Åbn... - + Open directory... Åbn mappe... - + Print... Udskriv… - + Export to PDF... Eksportér til PDF… - + Export to PNG... Eksportér til PNG… - + Close Luk - + Reload Genindlæs - + Statistics... Statistik... - + Clear list Ryd liste - + Load POI file... Indlæs IP-fil... - + Select all files Vælg alle filer - + Unselect all files Fravælg alle filer - + Overlap POIs Overlap IP'er - + Show POI icons Vis IP-ikoner - + Show POI labels Vis IP-etiketter - + Show POIs Vis IP'er - + Show map Vis kort - + Load map... Indlæs kort... - + Load map directory... Indlæs kortmappe... - + Clear tile cache Ryd flisemellemlager (cache) - - - + + + Next map Næste kort - + Show cursor coordinates Vis markørens koordinater - + All Alle - + Raster only Kun raster - + Vector only Kun vektor - + Show position Vis position - + Follow position Følg position - + Show coordinates Vis koordinater - + Show motion info Vis bevægelsesoplysninger - + Show tracks Vis spor - + Show routes Vis ruter - + Show waypoints Vis rutepunkter - + Show areas Vis områder - + Waypoint icons Rutepunkt-ikoner - + Waypoint labels Rutepunktsetiketter - + Route waypoints Vej rutepunkter - + km/mi markers km/mi-markører - + Do not show Vis ikke - + Marker only Kun markør - + Date/time Dato/tid - + Coordinates Koordinater - + Use styles Brug stilarter - + Show local DEM tiles Vis lokale DEM-fliser - + Show hillshading Vis terrænskygge - + Show graphs Vis grafer - - - + + + Distance Afstand - - - - + + + + Time Tid - + Show grid Vis gitter - + Show slider info Vis skyder info - + Show tabs Vis faner - + Show toolbars Vis værktøjslinjer - + Total time Samlet tid - - - + + + Moving time Tid i bevægelse - + Metric Metrisk - + Imperial Imperial - + Nautical Nautisk - + Decimal degrees (DD) Decimalgrader (DD) - + Degrees and decimal minutes (DMM) Grader og decimalminutter (DMM) - + Degrees, minutes, seconds (DMS) Grader, minutter, sekunder (DMS) - + Fullscreen mode Fuldskærmstilstand - + Options... Indstillinger… - + Next Næste - + Previous Forrige - + Last Sidste - + First Første - + &File &Fil - + Open recent Åbn seneste - + &Map &Kort - + Layers Lag - + &Graph &Graf - + &POI &IP - + Position Position - - + + CRS directory: CRS-katalog: - - + + Symbols directory: Symbolmappe: - + Open directory Åbn mappe - - + Error loading geo URI: + + + + + + + Don't show again Vis ikke igen - + Clear "%1" tile cache? Ryd "%1" flise-cache? - + Download %n DEM tiles? Download %n DEM-flise? @@ -778,300 +792,300 @@ - + &Data &Data - + Download data DEM Download data-DEM - + Download map DEM Download kort-DEM - + Position info Positionsinfo - + DEM DEM - + &Settings &Indstillinger - + Units Enheder - + Coordinates format Koordinatformat - + &Help &Hjælp - + File Fil - + Show Vis - + Navigation Navigation - - + + Version %1 Version %1 - - + + 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. GPXSee er distribueret under betingelserne i GNU General Public License version 3. For mere info om GPXSee besøg projektets hjemmeside på %1. - + Next file Næste fil - + Previous file Forrige fil - + First file Første fil - + Last file Sidste fil - + Append file Vedhæft fil - + Next/Previous Næste/Forrige - + Toggle graph type Skift graftype - + Toggle time type Skift tidstype - + Toggle position info Skift positionsoplysninger - + Previous map Forrige kort - + Zoom in Zoom ind - + Zoom out Zoom ud - + Digital zoom Digital zoom - + Zoom Zoom - + Copy coordinates Kopiér koordinater - + Left Click Venstreklik - - + + DEM directory: DEM-mappe: - - + + Styles directory: Stilmappe: - - + + Tile cache directory: Flisecache-mappe: - + Select map directory Vælg kortmappe - - + + Map directory: Kortmappe: - - + + POI directory: IP-mappe: - - + + Open file Åbn fil - + Error loading data file: Fejl ved indlæsning af data-fil: - - + + Line: %1 Linje: %1 - - + + Open POI file Åbn IP-fil - + Error loading POI file: Fejl ved indlæsning af IP-fil: - - + + Tracks Spor - - + + Routes Ruter - - + + Waypoints Rutepunkter - - + + Areas Områder - - - - + + + + Date Dato - - - + + + Statistics Statistikker - + Name Navn - - + + Open map file Åbn kort-fil - - - - + + + + Error loading map: Fejl ved indlæsning af kort: - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. Downloadgrænsen for DEM-fliser er overskredet. Hvis du virkelig har brug for data for så stort et område, skal du downloade filerne manuelt. - + Could not download all required DEM files. Kunne ikke downloade alle de nødvendige DEM-filer. - + No local DEM tiles found. Der blev ikke fundet lokale DEM-fliser. - + No files loaded Ingen filer indlæst - + %n files %n fil @@ -1139,59 +1153,59 @@ GraphView - + Data not available Data er ikke tilgængelig - - + + Distance Afstand + - ft fod - + mi mil - + nmi sømil - + m m - + km km - + s s - + min min - + h t - + Time Tid @@ -1583,7 +1597,7 @@ - + Graphs Grafer @@ -1662,7 +1676,7 @@ - + s s @@ -1840,7 +1854,7 @@ - + POI IP @@ -1889,7 +1903,7 @@ - + Source Kilde @@ -1899,18 +1913,18 @@ Terrænskygge - + Plugin: Plugin: - + WYSIWYG WYSIWYG - + High-Resolution Højopløsning @@ -1920,158 +1934,158 @@ Belysning: - + The printed area is approximately the display area. The map zoom level does not change. Det udskrevne område er ca. det samme som visningsområdet. Kortes zoomniveau ændres ikke. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. Zoom-niveauet vil blive ændret, således at hele indholdet (spor/rutepunkter) passer til udskriftsområdet og kortopløsning er så tæt som muligt på udskriftsopløsningen. - + Name Navn - + Date Dato - + Distance Afstand - + Time Tid - + Moving time Tid i bevægelse - + Item count (>1) Elementantal (>1) - + Separate graph page Separat grafside - + Print mode Udskrivningstilstand - + Header Toptekst - + Use OpenGL Brug OpenGL - + Enable HTTP/2 Aktiver HTTP/2 - - + + MB MB - - + + Image cache size: Billed cachestørrelse: - - + + Connection timeout: Timeout for forbindelse: - - + + System System - - + + DEM cache size: DEM-cachestørrelse: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. Vælg de indledende stier i dialogboksene til filåbning. Lad feltet være tomt for at bruge systemets standardindstilling. - + Data: Data: - + Maps: Kort: - + POI: IP: - + Initial paths Indledende stier - + Appearance Udseende - + Maps Kort - + Data Data - + DEM DEM - + Position Position - + Print & Export Udskriv & eksport - + Options Indstillinger diff --git a/lang/gpxsee_de.ts b/lang/gpxsee_de.ts index 8bc461e9..d12cd68d 100644 --- a/lang/gpxsee_de.ts +++ b/lang/gpxsee_de.ts @@ -70,112 +70,117 @@ Data - + Supported files Unterstützte Dateien - + CSV files CSV-Dateien - + CUP files CUP-Dateien - + FIT files FIT-Dateien - + GeoJSON files GeoJSON-Dateien - + GPI files GPI-Dateien - + GPX files GPX-Dateien - + IGC files IGC-Dateien - + ITN files ITN-Dateien - + JPEG images JPEG-Bilder - + KML files KML-Dateien - + LOC files LOC-Dateien - + NMEA files NMEA-Dateien - + OV2 files OV2-Dateien - + OziExplorer files OziExplorer-Dateien - + SML files SML-Dateien - + TCX files TCX-Dateien - + SLF files SLF-Dateien - + ONmove files ONmove-Dateien - + + 70mai GPS log files + + + + TwoNav files TwoNav-Dateien - + GPSDump files GPSDump-Dateien - + All files Alle Dateien @@ -317,29 +322,32 @@ Format - - + + ft ft + mi mi - + + nmi nmi - - + + m m - + + km km @@ -347,543 +355,549 @@ GUI - - + + Map directory: Kartenverzeichnis: - - + + POI directory: POI-Verzeichnis: - - + + Open file Datei öffnen - - + + Open POI file POI-Datei öffnen - + Quit Beenden - - + + Keyboard controls Tastaturkürzel - + Close Schließen - + Reload Neu laden - + Show Ansicht - + File Datei - + Overlap POIs POIs überlappen - + Show POI labels POI-Labels anzeigen - + Show POIs POIs anzeigen - + Show map Karte anzeigen - + Clear tile cache Kachel-Cache bereinigen - + Open... Öffnen … - - - + + + Paths Pfade - + Open directory... Verzeichnis öffnen … - + Export to PNG... Als PNG exportieren … - + Statistics... Statistiken … - + Clear list Liste leeren - + Load POI file... POI-Datei laden … - + Select all files Alle Dateien wählen - + Unselect all files Alle Dateien abwählen - + Show POI icons POI-Symbole anzeigen - + Load map... Karte laden … - + Load map directory... Kartenverzeichnis laden ... - - - + + + Next map Nächste Karte - + Show cursor coordinates Cursor-Koordinaten anzeigen - + All Alle - + Raster only Nur Raster - + Vector only Nur Vektor - + Show position Position anzeigen - + Follow position Position folgen - + Show coordinates Koordinaten anzeigen - + Show motion info Bewegungsinfo anzeigen - + Show tracks Strecken anzeigen - + Show routes Routen anzeigen - + Show waypoints Wegpunkte anzeigen - + Show areas Flächen anzeigen - + Waypoint icons Wegpunkt-Symbole - + Waypoint labels Wegpunkt-Labels - + km/mi markers km/mi-Markierungen - + Do not show Nicht anzeigen - + Marker only Nur Markierung - + Date/time Datum/Zeit - + Coordinates Koordinaten - + Use styles Stile verwenden - + Show local DEM tiles Lokale DEM-Kacheln anzeigen - + Show hillshading Schummerung anzeigen - + Show graphs Graphen anzeigen - + Show grid Gitter anzeigen - + Show slider info Schieberinfo anzeigen - + Show tabs Registerkarten anzeigen - + Show toolbars Toolbars anzeigen - + Total time Gesamtzeit - - - + + + Moving time Bewegungszeit - + Metric Metrisch - + Imperial Angloamerikanisch - + Nautical Nautisch - + Decimal degrees (DD) Dezimalgrad (DD) - + Degrees and decimal minutes (DMM) Grad und Dezimalminuten (DMM) - + Degrees, minutes, seconds (DMS) Grad, Minuten, Sekunden (DMS) - + Fullscreen mode Vollbildmodus - + Options... Einstellungen … - + Next Nächste - + Previous Vorherige - + Last Letzte - + First Erste - + Open recent Zuletzt geöffnete Dateien - + Layers Schichten - + Position info Positionsinfos - + DEM DEM - + Position Position - + Units Einheiten - + Coordinates format Koordinatenformate - - + + Version %1 Version %1 - - + + 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. GPXSee wird unter der GNU General Public License version 3 veröffentlicht. Mehr Informationen zu GPXSee auf der Homepage %1. - + Append file An Datei anhängen - + Next/Previous Nächste/Vorherige - + Toggle graph type Graphtyp umschalten - + Toggle time type Zeittyp umschalten - + Toggle position info Positionsinfo umschalten - + Previous map Vorherige Karte - + Zoom in Hineinzoomen - + Zoom out Herauszoomen - + Digital zoom Digitaler Zoom - + Zoom Zoom - + Copy coordinates Koordinaten kopieren - + Left Click Links-Klick - - + + DEM directory: DEM-Verzeichnis: - - + + Styles directory: Formatvorlagen-Verzeichnis: - - + + Symbols directory: Symbole-Verzeichnis: - + Open directory Verzeichnis öffnen - - + Error loading geo URI: + + + + + + + Don't show again Nicht wieder anzeigen - - + + Areas Flächen - - - + + + Statistics Statistiken - - + + Open map file Kartendatei öffnen - - - - + + + + Error loading map: Fehler beim Laden der Kartendatei: - + Select map directory Kartenverzeichnis auswählen - + Clear "%1" tile cache? Kachel-Cache von "%1" bereinigen? - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. Das Download-Limit für die DEM-Kacheln wurde überschritten. Wenn Sie wirklich Daten für so ein großes Gebiet benötigen, laden Sie die Dateien manuell herunter. - + Download %n DEM tiles? %n DEM-Kachel herunterladen? @@ -891,22 +905,22 @@ - + Could not download all required DEM files. Es konnten nicht alle erforderlichen DEM-Dateien heruntergeladen werden. - + No local DEM tiles found. Keine lokalen DEM-Kacheln gefunden. - + No files loaded Keine Dateien geladen - + %n files %n Datei @@ -914,167 +928,167 @@ - - - - + + + + Date Datum - - + + Routes Routen - + Next file Nächste Datei - + Print... Drucken … - + Export to PDF... Als PDF exportieren … - - + + Waypoints Wegpunkte - + Previous file Vorherige Datei - + Route waypoints Routen-Wegpunkte - + &File &Datei - + &Map &Karte - + &Graph &Graph - + &POI &POI - + &Data D&ata - + Download data DEM DEM für Daten herunterladen - + Download map DEM DEM für die Karte herunterladen - + &Settings &Einstellungen - + &Help &Hilfe - + First file Erste Datei - + Last file Letzte Datei - - + + CRS directory: CRS-Verzeichnis: - - + + Tile cache directory: Kachel-Cache-Verzeichnis: - + Error loading data file: Fehler beim Laden der Datendatei: - - + + Line: %1 Zeile: %1 - + Error loading POI file: Fehler beim Laden der POI-Datei: - + Name Name - - + + Tracks Strecken - - + + About GPXSee Über GPXSee - + Navigation Navigation - - - + + + Distance Distanz - - - - + + + + Time Zeit @@ -1139,59 +1153,59 @@ GraphView - + m m - + km km + - ft ft - + Data not available Keine Daten verfügbar - + mi mi - + nmi nmi - + s sek - + min min - + h h - - + + Distance Distanz - + Time Zeit @@ -1471,7 +1485,7 @@ - + Graphs Graphen @@ -1667,7 +1681,7 @@ - + s sek @@ -1830,7 +1844,7 @@ - + POI POI @@ -1879,7 +1893,7 @@ - + Source Datenquelle @@ -1889,18 +1903,18 @@ Schummerung - + Plugin: Plugin: - + WYSIWYG WYSIWYG - + High-Resolution Hohe Auflösung @@ -1920,158 +1934,158 @@ Aufhellung: - + The printed area is approximately the display area. The map zoom level does not change. Der Druckbereich entspricht ungefähr dem Anzeigebereich. Das Karten-Zoom ändert sich nicht. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. Das Karten-Zoom ändert sich so, dass der ganze Inhalt (Strecken/Wegpunkte) in den Druckbereich passen und die Kartenauflösung so nah wie möglich an der Druckauflösung ist. - + Name Name - + Date Datum - + Distance Distanz - + Time Zeit - + Moving time Bewegungszeit - + Item count (>1) Elementanzahl (>1) - + Separate graph page Separate Seite für Graphen - + Print mode Druckmodus - + Header Kopfzeile - + Use OpenGL OpenGL verwenden - + Enable HTTP/2 HTTP/2 verwenden - - + + MB MB - - + + Image cache size: Bild-Cachegröße: - - + + Connection timeout: Verbindungs-Timeout: - - + + System System - - + + DEM cache size: DEM-Cachegröße: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. Wählen Sie die Anfangspfade der Dateiöffnungsdialoge aus. Für die Systemvorgabe lassen Sie das Feld leer. - + Data: Daten: - + Maps: Karten: - + POI: POI: - + Initial paths Anfangspfade - + Appearance Erscheinungsbild - + Maps Karten - + Data Daten - + DEM DEM - + Position Position - + Print & Export Druck / Export - + Options Einstellungen diff --git a/lang/gpxsee_eo.ts b/lang/gpxsee_eo.ts index f334eb69..d8b7675d 100644 --- a/lang/gpxsee_eo.ts +++ b/lang/gpxsee_eo.ts @@ -70,112 +70,117 @@ Data - + Supported files Subtenataj dosieroj - + CSV files CSV-dosieroj - + CUP files CUP-dosieroj - + FIT files FIT-dosieroj - + GeoJSON files GeoJSON-dosieroj - + GPI files GPI-dosieroj - + GPX files GPX-dosieroj - + IGC files IGC-dosieroj - + ITN files ITN-dosieroj - + JPEG images JPEG-bildoj - + KML files KML-dosieroj - + LOC files LOC-dosieroj - + NMEA files NMEA-dosieroj - + ONmove files ONmove-dosieroj - + OV2 files OV2-dosieroj - + OziExplorer files OziExplorer-dosieroj - + SLF files SLF-dosieroj - + SML files SML-dosieroj - + TCX files TCX-dosieroj - + + 70mai GPS log files + + + + TwoNav files TwoNav-dosieroj - + GPSDump files GPSDump-dosieroj - + All files Ĉiuj dosieroj @@ -317,29 +322,32 @@ Format - - + + ft ft + mi mi - + + nmi nmi - - + + m m - + + km km @@ -347,430 +355,436 @@ GUI - + Quit Ĉesi - - - + + + Paths Vojprefiksoj - - + + Keyboard controls Klavarokomandoj - - + + About GPXSee Pri GPXSee - + Open... Malfermi... - + Open directory... Malfermi dosierujon… - + Print... Presi... - + Export to PDF... Eksporti kiel PDF... - + Export to PNG... Eksporti kiel PNG... - + Close Fermi - + Reload Reŝargi - + Statistics... Statistiko... - + Clear list Vakigi liston - + Load POI file... Ŝargi POI-dosieron... - + Select all files Elekti ĉiujn dosierojn - + Unselect all files Malelekti ĉiujn dosierojn - + Overlap POIs Kovri POI-punktojn - + Show POI icons Montri POI-bildsimbolojn - + Show POI labels Montri POI-nomojn - + Show POIs Montri POI-punktojn - + Show map Montri mapon - + Load map... Ŝargi mapon... - + Load map directory... Ŝargi dosierujon de mapoj… - + Clear tile cache Vakigi kaŝmemoron - - - + + + Next map Sekva mapo - + Show cursor coordinates - + All Ĉiuj - + Raster only - + Vector only - + Show position Montri pozicion - + Follow position Sekvi pozicion - + Show coordinates Montri koordinatojn - + Show motion info - + Show tracks Montri vojojn - + Show routes Montri itinerojn - + Show waypoints Montri vojpunktojn - + Show areas Montri areojn - + Waypoint icons Vojpunktaj bildsimboloj - + Waypoint labels Vojpunktaj etikedoj - + Route waypoints Itinerpunktoj - + km/mi markers km/mi markoj - + Do not show Ne montri - + Marker only - + Date/time Dato/tempo - + Coordinates Koordinatoj - + Use styles Uzi stilojn - + Show local DEM tiles - + Show hillshading - + Show graphs Montri grafikaĵojn - - - + + + Distance Distanco - - - - + + + + Time Tempo - + Show grid Montri kradon - + Show slider info Montri valoron de la ŝovilo - + Show tabs Montri langetojn - + Show toolbars Montri ilobretojn - + Total time Totala tempo - - - + + + Moving time Movada tempo - + Metric Metraj - + Imperial Britimperiaj - + Nautical Maraj - + Decimal degrees (DD) Decimalaj gradoj (DG) - + Degrees and decimal minutes (DMM) Gradoj kaj decimalaj minutoj (GDM) - + Degrees, minutes, seconds (DMS) Gradoj, minutoj, sekundoj (GMS) - + Fullscreen mode Plenekrana reĝimo - + Options... Opcioj... - + Next Sekva - + Previous Antaŭa - + Last Lasta - + First Unua - + &File &Dosiero - + Open recent Malfermi lastatempajn - + &Map &Mapo - + Layers - + &Graph &Grafikaĵo - + &POI &POI - + Position Pozicio - - + + CRS directory: CRS-dosierujo: - - + + Symbols directory: Dosierujo de simboloj: - + Open directory Malfermi dosierujon - - + Error loading geo URI: + + + + + + + Don't show again Ne montri denove - + Clear "%1" tile cache? - + Download %n DEM tiles? @@ -778,300 +792,300 @@ - + &Data Da&teno - + Download data DEM - + Download map DEM - + Position info Informo pri pozicio - + DEM DEM - + &Settings &Agordoj - + Units Unuoj - + Coordinates format Koordinata formato - + &Help &Helpo - + File Dosiero - + Show Montri - + Navigation Navigado - - + + Version %1 Versio %1 - - + + 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. GPXSee estas distribuita laŭ la kondiĉoj de la GNU Ĝenerala Publika Permesilo, la versio 3. Por pliaj informoj pri GPXSee, vizitu la hejmpaĝo de projekto %1. - + Next file Sekva dosiero - + Previous file Antaŭa dosiero - + First file Unua dosiero - + Last file Lasta dosiero - + Append file Postaldoni dosieron - + Next/Previous Sekva/Antaŭa - + Toggle graph type Baskuligi tipon de la grafikaĵo - + Toggle time type Baskuligi tipon de la tempo - + Toggle position info Baskuligi informon pr pozicio - + Previous map Antaŭa mapo - + Zoom in Zomi - + Zoom out Malzomi - + Digital zoom Diĝita zomo - + Zoom Zoom - + Copy coordinates Kopii koordinatojn - + Left Click Maldekstra klako - - + + Map directory: Dosierujo kun mapoj: - - + + POI directory: Dosierujo kun POI: - - + + DEM directory: Dosierujo kun DEM-dateno: - - + + Styles directory: Dosierujo kun stildosieroj: - - + + Tile cache directory: Kaŝmemora dosierujo: - - + + Open file Malfermi dosieron - + Error loading data file: Eraro dum la ŝargado de la datumdosiero: - - + + Line: %1 Linio: %1 - - + + Open POI file Malfermi POI-dosieron - + Error loading POI file: Eraro dum la ŝargado de la POI-dosiero: - - + + Tracks Vojoj - - + + Routes Itineroj - - + + Waypoints Vojpunktoj - - + + Areas Areoj - - - - + + + + Date Dato - - - + + + Statistics Statistiko - + Name Nomo - - + + Open map file Malfermi mapdosieron - - - - + + + + Error loading map: Eraro dum la ŝargado de la mapo: - + Select map directory Elekti dosierujon kun mapoj - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. - + Could not download all required DEM files. - + No local DEM tiles found. - + No files loaded Neniuj dosieroj estas ŝargitaj - + %n files %n dosiero @@ -1139,59 +1153,59 @@ GraphView - + Data not available Dateno ne estas disponebla - - + + Distance Distanco + - ft ft - + mi mi - + nmi nmi - + m m - + km km - + s s - + min min - + h h - + Time Tempo @@ -1598,7 +1612,7 @@ - + Graphs Grafikaĵoj @@ -1683,7 +1697,7 @@ - + s s @@ -1734,8 +1748,8 @@ - - + + System Sistemo @@ -1837,7 +1851,7 @@ - + POI POI @@ -1886,7 +1900,7 @@ - + Source Fonto @@ -1896,18 +1910,18 @@ - + Plugin: Kromprogramo: - + WYSIWYG WYSIWYG - + High-Resolution Granda distingivo @@ -1927,151 +1941,151 @@ - + The printed area is approximately the display area. The map zoom level does not change. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. - + Name Nomo - + Date Dato - + Distance Distanco - + Time Tempo - + Moving time Movada tempo - + Item count (>1) Nombro de objektoj (>1) - + Separate graph page Grafikaĵo sur aparta paĝo - + Print mode Presa reĝimo - + Header Paĝokapo - + Use OpenGL Uzi OpenGL - + Enable HTTP/2 Ŝalti HTTP/2 - - + + MB MB - - + + Image cache size: Bildkaŝmemora grando: - - + + Connection timeout: Tempolimo de konekto: - - + + DEM cache size: DEM-kaŝmemora grandeco: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. - + Data: Dateno: - + Maps: Mapoj: - + POI: POI: - + Initial paths - + Appearance Aspekto - + Maps Mapoj - + Data Dateno - + DEM DEM - + Position Pozicio - + Print & Export Preso kaj eksporto - + Options Opcioj diff --git a/lang/gpxsee_es.ts b/lang/gpxsee_es.ts index eabb3b46..2e942294 100644 --- a/lang/gpxsee_es.ts +++ b/lang/gpxsee_es.ts @@ -70,112 +70,117 @@ Data - + Supported files Formatos admitidos - + CSV files Archivos CSV - + CUP files Archivos CUP - + FIT files Archivos FIT - + GeoJSON files Archivos GeoJSON - + GPI files Archivos GPI - + GPX files Archivos GPX - + IGC files Archivos IGC - + ITN files Archivos ITN - + JPEG images Imágenes JPEG - + KML files Archivos KML - + LOC files Archivos LOC - + NMEA files Archivos NMEA - + ONmove files Archivos ONmove - + OV2 files Archivos OV2 - + OziExplorer files Archivos OziExplorer - + SLF files Archivos SLF - + SML files Archivos SML - + TCX files Archivos TCX - + + 70mai GPS log files + + + + TwoNav files Archivos TwoNav - + GPSDump files Archivos GPSDump - + All files Todos los archivos @@ -317,29 +322,32 @@ Format - - + + ft ft + mi mi - + + nmi nmi - - + + m m - + + km km @@ -347,430 +355,436 @@ GUI - + Quit Cerrar - - - + + + Paths Trayectos - - + + Keyboard controls Atajos de teclado - - + + About GPXSee Acerca de GPXSee - + Open... Abrir... - + Open directory... Abriendo el directorio... - + Print... Imprimir... - + Export to PDF... Exportar a PDF... - + Export to PNG... Exportar a PNG... - + Close Cerrar - + Reload Recargar - + Statistics... Estadísticas... - + Clear list Borrar la lista - + Load POI file... Cargar archivo de POI... - + Select all files Seleccionar todos los archivos - + Unselect all files Deseleccionar todos los archivos - + Overlap POIs Sobreponer POI - + Show POI icons Mostrar los iconos de los POI - + Show POI labels Ver etiquetas en los POI - + Show POIs Ver POI - + Show map Ver mapa - + Load map... Cargar mapa... - + Load map directory... Cargar el directorio de los mapas... - + Clear tile cache Limpiar antememoria de teselas - - - + + + Next map Próximo mapa - + Show cursor coordinates Mostrar las coordenadas del cursor - + All Todo - + Raster only Solo cuadrícula - + Vector only Solo vectores - + Show position Mostrar la posición - + Follow position Seguir la posición - + Show coordinates Mostrar las coordenadas - + Show motion info Mostrar la información del movimiento - + Show tracks Ver pistas - + Show routes Ver rutas - + Show waypoints Ver puntos de referencia - + Show areas Ver áreas - + Waypoint icons Iconos de los puntos de referencia - + Waypoint labels Etiquetas de los waypoints - + Route waypoints Puntos de referencia de ruta - + km/mi markers Hitos kilométricos o cada milla - + Do not show No mostrar - + Marker only Sólo marcador - + Date/time Fecha/hora - + Coordinates Coordenadas - + Use styles Estilos de uso - + Show local DEM tiles Mostrar los mosaicos locales DEM - + Show hillshading Mostrar el sombreado - + Show graphs Ver gráficas - - - + + + Distance Distancia - - - - + + + + Time Tiempo - + Show grid Ver cuadrícula - + Show slider info Ver datos al señalar - + Show tabs Mostrar las pestañas - + Show toolbars Ver barra de herramientas - + Total time Tiempo total - - - + + + Moving time Tiempo en movimiento - + Metric Métrico - + Imperial Anglosajón - + Nautical Náutica - + Decimal degrees (DD) Grados decimales (DD) - + Degrees and decimal minutes (DMM) Grados y minutos decimales (DMM) - + Degrees, minutes, seconds (DMS) Grados, minutos, segundos (GMS) - + Fullscreen mode Pantalla completa - + Options... Opciones... - + Next Siguiente - + Previous Anterior - + Last Último - + First Primer - + &File &Archivo - + Open recent Abierto reciente - + &Map &Mapa - + Layers Capas - + &Graph &Gráfico - + &POI P&OI - + Position Posición - - + + CRS directory: Directorio CRS: - - + + Symbols directory: Directorio de los símbolos: - + Open directory Abrir el directorio - - + Error loading geo URI: + + + + + + + Don't show again No volver a mostrar - + Clear "%1" tile cache? ¿Vaciar "%1" caché de los mosaicos? - + Download %n DEM tiles? ¿Descargar %n mosaico DEM? @@ -778,300 +792,300 @@ - + &Data &Datos - + Download data DEM Descargar los datos DEM - + Download map DEM Descargar el mapa DEM - + Position info Información de la posición - + DEM DEM - + &Settings &Preferencias - + Units Unidades - + Coordinates format Formato de coordenadas - + &Help Ay&uda - + File Archivo - + Show Ver - + Navigation Navegación - - + + Version %1 Versión %1 - - + + 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. GPXSee se distribuye bajo Licencia Plica General GNU versión 3. Más información en la web del proyecto %1. - + Next file Siguiente archivo - + Previous file Archivo anterior - + First file Primer archivo - + Last file Último archivo - + Append file Adjuntar archivo - + Next/Previous Siguiente/Anterior - + Toggle graph type Tipo de gráfica - + Toggle time type Cambiar hora - + Toggle position info Alternar la información de la posición - + Previous map Anterior mapa - + Zoom in Acercar - + Zoom out Alejar - + Digital zoom Escala digital - + Zoom Escala - + Copy coordinates Copiar las coordenadas - + Left Click Clic izquierdo - - + + Map directory: Carpeta de mapas: - - + + POI directory: Carpeta de POI: - - + + DEM directory: Carpeta del MDT : - - + + Styles directory: Directorio de estilos: - - + + Tile cache directory: Cache de teselas: - - + + Open file Abrir archivo - + Error loading data file: Error de carga del archivo: - - + + Line: %1 Renglón: %1 - - + + Open POI file Cargar archivo de POI - + Error loading POI file: Error al cargar el archivo de POI: - - + + Tracks Tracks - - + + Routes Rutas - - + + Waypoints Puntos de referencia - - + + Areas Áreas - - - - + + + + Date Fecha - - - + + + Statistics Estadísticas - + Name Nombre - - + + Open map file Abrir archivo de mapa - - - - + + + + Error loading map: Error al cargar el mapa: - + Select map directory Seleccionar el directorio de los mapas - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. Límite de descarga de mosaicos DEM superado. Si realmente necesitas datos para un área tan grande, descarga los archivos manualmente. - + Could not download all required DEM files. No se han podido descargar todos los archivos DEM necesarios. - + No local DEM tiles found. No se encontraron los mosaicos locales DEM. - + No files loaded Sin archivos cargados - + %n files %n archivo @@ -1139,59 +1153,59 @@ GraphView - + Data not available Sin datos disponibles - - + + Distance Distancia + - ft ft - + mi mi - + nmi nmi - + m m - + km km - + s s - + min min - + h h - + Time Tiempo @@ -1583,7 +1597,7 @@ - + Graphs Gráficas @@ -1662,7 +1676,7 @@ - + s s @@ -1840,7 +1854,7 @@ - + POI POI @@ -1889,7 +1903,7 @@ - + Source Fuente @@ -1899,18 +1913,18 @@ Sombreado - + Plugin: Complemento: - + WYSIWYG WYSIWYG - + High-Resolution Alta resolución @@ -1920,158 +1934,158 @@ Focos: - + The printed area is approximately the display area. The map zoom level does not change. El área que se imprime es aproximadamente la que muestra la pantalla. La escala del mapa no cambiará. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. La escala del mapa se cambia para que el área impresa se ajuste a todos los elementos (pistas, puntos de referencia...) y la resolución sea lo mas próxima posible a la de impresión. - + Name Nombre - + Date Fecha - + Distance Distancia - + Time Hora - + Moving time Tiempo en movimiento - + Item count (>1) Recuento de elementos (>1) - + Separate graph page Pagina de gráficas separada - + Print mode Modo de impresión - + Header Titulo - + Use OpenGL Usar OpenGL - + Enable HTTP/2 Activar HTTP/2 - - + + MB MB - - + + Image cache size: Tamaño de antememoria de imágenes: - - + + Connection timeout: Caducidad de la conexión: - - + + System Sistema - - + + DEM cache size: Tamaño de la caché DEM: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. Seleccione las rutas iniciales de los diálogos de apertura de los archivos. Deje el campo vacío para el valor predeterminado por el sistema. - + Data: Fecha: - + Maps: Mapas: - + POI: PDI: - + Initial paths Rutas iniciales - + Appearance Apariencia - + Maps Mapas - + Data Fecha - + DEM DEM - + Position Posición - + Print & Export Imprimir y exportar - + Options Opciones diff --git a/lang/gpxsee_fi.ts b/lang/gpxsee_fi.ts index 7b79c62e..14dc837f 100644 --- a/lang/gpxsee_fi.ts +++ b/lang/gpxsee_fi.ts @@ -70,112 +70,117 @@ Data - + Supported files Tuetut tiedostot - + CSV files CSV-tiedostot - + CUP files CUP-tiedostot - + FIT files FIT-tiedostot - + GeoJSON files GeoJSON-tiedostot - + GPI files GPI-tiedostot - + GPX files GPX-tiedostot - + IGC files IGC-tiedostot - + ITN files ITN-tiedostot - + JPEG images JPEG-kuvat - + KML files KML-tiedostot - + LOC files LOC-tiedostot - + NMEA files NMEA-tiedostot - + OV2 files OV2-tiedostot - + OziExplorer files OziExplorer-tiedostot - + SML files SML-tiedostot - + TCX files TCX-tiedostot - + SLF files SLF-tiedostot - + ONmove files ONmove-tiedostot - + + 70mai GPS log files + + + + TwoNav files TwoNav-tiedostot - + GPSDump files GPSDump-tiedostot - + All files Kaikki tiedostot @@ -317,29 +322,32 @@ Format - - + + ft ft + mi mi - + + nmi mpk - - + + m m - + + km km @@ -347,624 +355,630 @@ GUI - - + + Open file Avaa tiedosto - - + + Open POI file Avaa POI-tiedosto - + Quit Lopeta - - + + Keyboard controls Näppäimistön säätimet - + Close Sulje - + Reload Lataa uudelleen - + Show Näytä - + File Tiedosto - + Overlap POIs Aseta POI:t limittäin - + Show POI labels Näytä POI:n nimiöt - + Show POIs Näytä POI:t - + Show map Näytä kartta - + Clear tile cache Tyhjennä välimuisti - + Open... Avaa... - - - + + + Paths Tiedostopolut - + Open directory... Avaa hakemisto… - + Export to PNG... Vie PNG:ksi... - + Statistics... Tilasto... - + Clear list Tyhjennä lista - + Load POI file... Lataa POI-tiedosto... - + Select all files Valitse kaikki tiedostot - + Unselect all files Poista kaikkien tiedostojen valinta - + Show POI icons Näytä POI -kuvakkeet - + Load map... Lataa kartta... - + Load map directory... Lataa karttahakemisto… - - - + + + Next map Seuraava kartta - + Show cursor coordinates Näytä kohdistimen koordinaatit - + All Kaikki - + Raster only Vain rasteri - + Vector only Vain vektori - + Show position Näytä sijainti - + Follow position Seuraa sijaintia - + Show coordinates Näytä koordinaatit - + Show motion info Näytä liiketiedot - + Show tracks Näytä jäljet - + Show routes Näytä reitit - + Show waypoints Näytä reittipisteet - + Show areas Näytä alueet - + Waypoint icons Reittipisteen kuvakkeet - + Waypoint labels Reittipisteen nimiöt - + km/mi markers km/mi merkit - + Do not show Älä näytä - + Marker only Vain merkki - + Date/time Pvm/aika - + Coordinates Koordinaatit - + Use styles Käytä tyylejä - + Show local DEM tiles Näytä paikalliset DEM-laatat - + Show hillshading - + Show graphs Näytä kaaviokuvat - + Show grid Näytä ruudukko - + Show slider info Näytä liukusäätimen arvo - + Show tabs Näytä välilehdet - + Show toolbars Näytä työkalupalkit - + Total time Kokonaisaika - - - + + + Moving time Liikkumisaika - + Metric Metriset - + Imperial Brittiläiset - + Nautical Merelliset - + Decimal degrees (DD) Desimaaliasteet (DD) - + Degrees and decimal minutes (DMM) Asteet, desimaaliminuutit (DMM) - + Degrees, minutes, seconds (DMS) Asteet, minuutit, sekunnit (DMS) - + Fullscreen mode Kokoruututila - + Options... Valinnat... - + Next Seuraava - + Previous Edellinen - + Last Viimeinen - + First Ensimmäinen - + Open recent Avaa viimeisimmät - + Layers Kerrokset - + Position info Sijaintitiedot - + DEM DEM - + Position Sijainti - + Units Yksiköt - + Coordinates format Koordinaattien muoto - - + + Version %1 Versio %1 - - + + 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. GPXSee levitetään GNU yleisen lisenssin version 3 alaisena. Voit katsoa lisätietoja GPXSee:stä projektin kotisivulla %1. - + Append file Lisää tiedosto - + Next/Previous Seuraava/edellinen - + Toggle graph type Vaihda kaaviokuvan tyyppi - + Toggle time type Vaihda ajan tyyppi - + Toggle position info Vaihda sijaintitiedot - + Previous map Edellinen kartta - + Zoom in Lähennä - + Zoom out Loitonna - + Digital zoom Digitaalinen zoomi - + Zoom Zoom - + Copy coordinates Kopioi koordinaatit - + Left Click Vasen painallus - - + + DEM directory: DEM -tietojen hakemisto: - - + + Styles directory: Tyylitiedostoiden hakemisto: - - + + Symbols directory: Symbolien hakemisto: - + Open directory Avaa hakemisto - - + Error loading geo URI: + + + + + + + Don't show again Älä näytä uudelleen - - + + Areas Alueet - - - + + + Statistics Tilasto - - + + Open map file Avaa karttatiedosto - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. DEM-laattojen latausraja ylitetty. Jos todella tarvitset tietoja niin suurelta alueelta, lataa tiedostot manuaalisesti. - + Could not download all required DEM files. Kaikkia vaadittuja DEM-tiedostoja ei voitu ladata. - + No files loaded Yhtään tiedostoa ei ladattu - - - - + + + + Date Päivämäärä - + &File &Tiedosto - + &Map &Kartat - + &Graph Kaa&viokuva - + &POI &POI - + &Data Tie&dot - + Download data DEM Lataa data-DEM - + Download map DEM Lataa kartta-DEM - + &Settings &Asetukset - + &Help &Ohje - - + + Map directory: Karttojen hakemisto: - - + + POI directory: POI:n hakemisto: - - + + CRS directory: CRS-hakemisto: - - + + Tile cache directory: Välimuistin hakemisto: - - + + Routes Reitit - - - - + + + + Error loading map: Virhe ladattaessa karttaa: - + Select map directory Valitse karttahakemisto - + Clear "%1" tile cache? Tyhjennetäänkö "%1" ruutuvälimuisti? - + Download %n DEM tiles? @@ -972,12 +986,12 @@ - + No local DEM tiles found. - + %n files %n tiedosto @@ -985,96 +999,96 @@ - + Next file Seuraava tiedosto - + Print... Tulosta... - + Export to PDF... Vie PDF:ksi... - - + + Waypoints Reittipisteet - + Previous file Edellinen tiedosto - + Route waypoints Reittipisteet - + First file Ensimmäinen tiedosto - + Last file Viimeinen tiedosto - + Error loading data file: Virhe ladattaessa datatiedostoa: - - + + Line: %1 Rivi: %1 - + Error loading POI file: Virhe ladattaessa POI-tiedostoa: - + Name Nimi - - + + Tracks Jäljet - - + + About GPXSee Tietoja GPXSee:stä - + Navigation Navigointi - - - + + + Distance Etäisyys - - - - + + + + Time Aika @@ -1139,59 +1153,59 @@ GraphView - + m m - + km km + - ft ft - + Data not available Tietoja ei ole saatavilla - + mi mi - + nmi mpk - + s s - + min min - + h t - - + + Distance Etäisyys - + Time Aika @@ -1471,7 +1485,7 @@ - + Graphs Kaaviokuvat @@ -1667,7 +1681,7 @@ - + s s @@ -1830,7 +1844,7 @@ - + POI POI @@ -1879,7 +1893,7 @@ - + Source Lähde @@ -1889,18 +1903,18 @@ - + Plugin: Lisäosa: - + WYSIWYG WYSIWYG - + High-Resolution Korkea resoluutio @@ -1920,158 +1934,158 @@ - + The printed area is approximately the display area. The map zoom level does not change. Painettu alue on suunnilleen näyttöalue. Kartan zoomaustaso ei muutu. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. Zoomaustasoa muutetaan niin, että koko sisältö (jäljet/reittipisteet) sopii painettuun alueeseen ja kartan resoluutio on mahdollisimman lähellä tulostusresoluutiota. - + Name Nimi - + Date Päivämäärä - + Distance Etäisyys - + Time Aika - + Moving time Liikkumisaika - + Item count (>1) Kohteiden määrä (>1) - + Separate graph page Erillinen sivu kaaviokuvalle - + Print mode Tulostustila - + Header Otsikko - + Use OpenGL Käytä OpenGL:ää - + Enable HTTP/2 Ota HTTP/2 käyttöön - - + + MB Mt - - + + Image cache size: Kuvavälimuistin koko: - - + + Connection timeout: Yhteyden aikakatkaisu: - - + + System Järjestelmä - - + + DEM cache size: DEM-välimuistin koko: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. - + Data: Tiedot: - + Maps: Kartat: - + POI: POI: - + Initial paths - + Appearance Ulkoasu - + Maps Kartat - + Data Tiedot - + DEM DEM - + Position Sijainti - + Print & Export Tulostus & vienti - + Options Valinnat diff --git a/lang/gpxsee_fr.ts b/lang/gpxsee_fr.ts index dd5de79d..437b82be 100644 --- a/lang/gpxsee_fr.ts +++ b/lang/gpxsee_fr.ts @@ -70,112 +70,117 @@ Data - + Supported files Formats pris en charge - + CSV files Données CSV - + CUP files Données CUP - + FIT files Données FIT - + GeoJSON files Données GeoJSON - + GPI files Données GPI - + GPX files Données GPX - + IGC files Données IGC - + ITN files Fichiers ITN - + JPEG images Images JPEG - + KML files Données KML - + LOC files Données LOC - + NMEA files Données NMEA - + OV2 files Fichiers OV2 - + OziExplorer files Données OziExplorer - + SML files Données SML - + TCX files Données TCX - + SLF files Données SLF - + ONmove files Données ONmove - + + 70mai GPS log files + + + + TwoNav files Données TwoNav - + GPSDump files Fichiers GPSDump - + All files Tous les fichiers @@ -317,29 +322,32 @@ Format - - + + ft pieds + mi mi - + + nmi NM - - + + m m - + + km km @@ -347,543 +355,549 @@ GUI - - + + Map directory: Dossier de cartes : - - + + POI directory: Dossier des POI : - - + + Open file Ouvrir un fichier - - + + Open POI file Ouvrir un fichier POI - + Quit Quitter - - + + Keyboard controls Raccourcis clavier - + Close Fermer - + Reload Actualiser - + Show Afficher - + File Fichier - + Overlap POIs Superposer les POI - + Show POI labels Afficher les notes des POI - + Show POIs Afficher les POI - + Show map Afficher la carte - + Clear tile cache Effacer les tuiles en cache - + Open... Ouvrir... - - - + + + Paths Chemins d'accès - + Open directory... Ouvrir dossier... - + Export to PNG... Exporter au format PNG... - + Statistics... Statistiques... - + Clear list Vider la liste - + Load POI file... Charger un fichier POI... - + Select all files Sélectionner tous les fichiers - + Unselect all files Tous désélectionner - + Show POI icons Afficher les icônes POI - + Load map... Charger une carte... - + Load map directory... Charger un dossier de cartes… - - - + + + Next map Carte suivante - + Show cursor coordinates Afficher les coordonnées du pointeur - + All Toutes - + Raster only Raster uniquement - + Vector only Vecteur uniquement - + Show position Afficher la position - + Follow position Suivre la position - + Show coordinates Afficher les coordonnées - + Show motion info Afficher les infos de déplacement - + Show tracks Afficher la trace - + Show routes Afficher la route - + Show waypoints Afficher les points de cheminement - + Show areas Afficher les zones - + Waypoint icons Icônes de points de cheminement - + Waypoint labels Étiquettes des points de cheminement - + km/mi markers Bornes kilométriques ou milliaires - + Do not show Aucun affichage - + Marker only Seulement les points - + Date/time Date et heure - + Coordinates Coordonnées - + Use styles Utiliser styles - + Show local DEM tiles Afficher les tuiles MNT locales - + Show hillshading Afficher les ombrages du relief - + Show graphs Afficher les graphes - + Show grid Afficher la grille - + Show slider info Afficher les infos du curseur - + Show tabs Voir les onglets - + Show toolbars Afficher la barre d'outils - + Total time Durée totale - - - + + + Moving time Durée en déplacement - + Metric Métrique - + Imperial Anglo-saxon - + Nautical Nautique - + Decimal degrees (DD) Degrés décimaux (DD) - + Degrees and decimal minutes (DMM) Degrés, minutes décimales (DMM) - + Degrees, minutes, seconds (DMS) Degrés, minutes, secondes (DMS) - + Fullscreen mode Mode plein écran - + Options... Options... - + Next Suivant - + Previous Précédent - + Last Dernier - + First Premier - + Open recent Fichiers récents - + Layers Couches - + Position info Infos de position - + DEM MNT - + Position Position - + Units Système d'unités - + Coordinates format Unités des coordonnées - - + + Version %1 Version %1 - - + + 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. GPXSee est distribué selon les termes de la licence publique générale GNU (version 3). Pour plus d'information sur GPXSee, visiter le site du projet %1. - + Append file Joindre un fichier - + Next/Previous Suivant/Précédant - + Toggle graph type Controler le type de graphe - + Toggle time type Controler le type de durée - + Toggle position info Activer ou non les infos de position - + Previous map Carte précédente - + Zoom in Zoomer - + Zoom out Dézoomer - + Digital zoom Zoom numérique - + Zoom Zoom - + Copy coordinates Copier les coordonnées - + Left Click Clic gauche - - + + DEM directory: Dossier DEM : - - + + Styles directory: Dossier de styles : - - + + Symbols directory: Dossier de symboles : - + Open directory Ouvrir dossier - - + Error loading geo URI: + + + + + + + Don't show again Ne plus afficher - - + + Areas Zones - - - + + + Statistics Statistiques - - + + Open map file Ouvrir un fichier de carte - - - - + + + + Error loading map: Erreur lors du chargement de la carte : - + Select map directory Sélectionner un dossier de cartes - + Clear "%1" tile cache? Vider le cache de tuiles "%1" ? - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. Le téléchargement des tuiles MNT a atteint sa limite. Si vous avez vraiment besoin des données pour une zone aussi énorme, téléchargez les fichiers manuellement. - + Download %n DEM tiles? Télécharger %n tuile de MNT ? @@ -891,22 +905,22 @@ - + Could not download all required DEM files. Le téléchargement de tout les fichiers MNT a échoué. - + No local DEM tiles found. Aucune tuile MNT trouvée en local. - + No files loaded Aucun fichier chargé - + %n files %n fichier @@ -914,167 +928,167 @@ - - - - + + + + Date Date - - + + Routes Routes - + Next file Fichier suivant - + Print... Imprimer... - + Export to PDF... Exporter au format PDF... - - + + Waypoints Jalons - + Previous file Fichier précédent - + Route waypoints Jalons de route - + &File &Fichier - + &Map &Carte - + &Graph &Graphe - + &POI &POI - + &Data &Données - + Download data DEM Télécharger les données du MNT - + Download map DEM Télécharger la carte du MNT - + &Settings &Paramètres - + &Help &Aide - + First file Premier fichier - + Last file Dernier fichier - - + + CRS directory: Dossier CRS : - - + + Tile cache directory: Dossier du cache de tuiles : - + Error loading data file: Erreur lors du chargement des données : - - + + Line: %1 Ligne : %1 - + Error loading POI file: Erreur lors du chargement du fichier POI : - + Name Nom - - + + Tracks Traces - - + + About GPXSee À propos de GPXSee - + Navigation Navigation - - - + + + Distance Distance - - - - + + + + Time Temps @@ -1139,59 +1153,59 @@ GraphView - + m m - + km km + - ft pieds - + Data not available Données non disponibles - + mi mi - + nmi NM - + s s - + min min - + h h - - + + Distance Distance - + Time Temps @@ -1471,7 +1485,7 @@ - + Graphs Graphe @@ -1667,7 +1681,7 @@ - + s s @@ -1830,7 +1844,7 @@ - + POI POI @@ -1879,7 +1893,7 @@ - + Source Source @@ -1889,18 +1903,18 @@ Ombrage du relief - + Plugin: Module complémentaire : - + WYSIWYG WYSIWYG - + High-Resolution Résolution élevée @@ -1920,158 +1934,158 @@ Éclaircissement : - + The printed area is approximately the display area. The map zoom level does not change. La zone d'impression est presque celle affichée. L'échelle reste la même. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. L'échelle est ajustée pour que tout le contenu (traces et points de jalonnement) rentre dans la zone d'impression tout en gardant proches les résolutions d'impression et de carte. - + Name Nom - + Date Date - + Distance Distance - + Time Durée - + Moving time Durée en déplacement - + Item count (>1) Nombre d'éléments (>1) - + Separate graph page Sauter une page pour les graphes - + Print mode Mode d'impression - + Header Entête - + Use OpenGL Utiliser OpenGL - + Enable HTTP/2 Activer l'HTTP/2 - - + + MB Mo - - + + Image cache size: Volume du cache à images : - - + + Connection timeout: Délai d'attente de connexion : - - + + System Système - - + + DEM cache size: Taille du cache DEM : - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. Personnaliser le dossier initial à l'ouverture de fichier. Laisser vide pour le dossier par défaut du système. - + Data: Données : - + Maps: Cartes : - + POI: POI : - + Initial paths Chemins initiaux - + Appearance Apparence - + Maps Cartes - + Data Données - + DEM MNT - + Position Position - + Print & Export Imprimer et exporter - + Options Options diff --git a/lang/gpxsee_hu.ts b/lang/gpxsee_hu.ts index 99328b45..4545b015 100644 --- a/lang/gpxsee_hu.ts +++ b/lang/gpxsee_hu.ts @@ -70,112 +70,117 @@ Data - + Supported files Támogatott fájlok - + CSV files CSV fájlok - + CUP files CUP fájlok - + FIT files FIT fájlok - + GeoJSON files GeoJSON fájlok - + GPI files GPI fájlok - + GPX files GPX fájlok - + IGC files IGC fájlok - + ITN files ITN fájlok - + JPEG images JPEG képek - + KML files KML fájlok - + LOC files LOC fájlok - + NMEA files NMEA fájlok - + ONmove files ONmove fájlok - + OV2 files OV2 fájlok - + OziExplorer files OziExplorer fájlok - + SLF files SLF fájlok - + SML files SML fájlok - + TCX files TCX fájlok - + + 70mai GPS log files + + + + TwoNav files TwoNav fájlok - + GPSDump files GPSDump fájlok - + All files Minden fájl @@ -317,29 +322,32 @@ Format - - + + ft láb + mi mérföld - + + nmi tengeri mérföld - - + + m m - + + km km @@ -347,730 +355,736 @@ GUI - + Quit Kilépés - - - + + + Paths Elérési útvonalak - - + + Keyboard controls Gyorsbillentyűk - - + + About GPXSee A GPXSee névjegye - + Open... Megnyitás… - + Open directory... Könyvtár megnyitása… - + Print... Nyomtatás… - + Export to PDF... Exportálás PDF-be… - + Export to PNG... Exportálás PNG-be… - + Close Bezárás - + Reload Újratöltés - + Statistics... Statisztika… - + Clear list Lista törlése - + Load POI file... POI fájl betöltése… - + Select all files Összes fájl kijelölése - + Unselect all files Összes kijelölésének visszavonása - + Overlap POIs POI-k átfedése - + Show POI icons POI ikonok mutatása - + Show POI labels POI-k nevének mutatása - + Show POIs POI-k mutatása - + Show map Térkép mutatása - + Load map... Térkép betöltése… - + Load map directory... Térképmappa megadása… - + Clear tile cache Gyorsítótár törlése - - - + + + Next map Következő térkép - + Show cursor coordinates Mutassa a kurzor koordinátáit - + All Mind - + Raster only Csak raszter - + Vector only Csak vektor - + Show position Pozíció mutatása - + Follow position Pozíció követése - + Show coordinates Koordináták mutatása - + Show motion info Mozgásadatok mutatása - + Show tracks Nyomvonalak mutatása - + Show routes Útvonalak mutatása - + Show waypoints Köztespontok mutatása - + Show areas Területek mutatása - + Waypoint icons Útpont ikonok - + Waypoint labels Köztespontok neve - + Route waypoints Útvonal köztespontok - + km/mi markers km(mérföld) jelölők - + Do not show Ne mutassa - + Marker only Csak jelölő - + Date/time Időpont - + Coordinates Koordináták - + Use styles Stílusok használata - + Show local DEM tiles Helyi DEM csempék mutatása - + Show hillshading Domborzatárnyékolás - + Show graphs Grafikon mutatása - - - + + + Distance Távolság - - - - + + + + Time Idő - + Show grid Rácsvonalak mutatása - + Show slider info Adatok a csúszka mellett - + Show tabs Fülek mutatása - + Show toolbars Gombok mutatása - + Total time Teljes időtartam - - - + + + Moving time Mozgásban töltött idő - + Metric Metrikus - + Imperial Angolszász - + Nautical Tengeri - + Decimal degrees (DD) Fok, tizedfok (DD) - + Degrees and decimal minutes (DMM) Fok, perc (DMM) - + Degrees, minutes, seconds (DMS) Fok, perc, másodperc (DMS) - + Fullscreen mode Teljes képernyős - + Options... Beállítások… - + Next Következő - + Previous Előző - + Last Utolsó - + First Első - + &File &Fájl - + Open recent Legutóbbiak megnyitása - + &Map &Térkép - + Layers Rétegek - + &Graph &Grafikon - + &POI &POI - + Position Pozíció - - + + CRS directory: CRS könyvtár: - - + + Symbols directory: Szimbólumkönyvtár: - + Open directory Könyvtár megnyitása - - + Error loading geo URI: + + + + + + + Don't show again Ne mutassa újra - + Clear "%1" tile cache? "%1" csempe gyorsítótár törlése? - + Download %n DEM tiles? %n DEM csempe letöltése? - + &Data &Adatok - + Download data DEM DEM adat letöltése - + Download map DEM DEM térkép letöltése - + Position info Pozíció információ - + DEM DEM - + &Settings &Beállítások - + Units Mértékegységek - + Coordinates format Koordináta formátum - + &Help &Segítség - + File Műveletgombok - + Show Szűrőgombok - + Navigation Léptető gombok - - + + Version %1 %1. verzió - - + + 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. A GPXSee-t a GNU General Public License 3. verziója szerint terjesztik. A GPXSee-re vonatkozó további információkért látogasson el a projekt honlapjára a %1 oldalon. - + Next file Következő fájl - + Previous file Előző fájl - + First file Első fájl - + Last file Utolsó fájl - + Append file További fájl (hozzáadás) - + Next/Previous Következő/előző - + Toggle graph type Grafikon: idő/távolság váltás - + Toggle time type Idő: összes/mozgásban váltás - + Toggle position info Pozíció információ váltás - + Previous map Előző térkép - + Zoom in Nagyítás - + Zoom out Kicsinyítés - + Digital zoom Digitális nagyítás - + Zoom Nagyítás - + Copy coordinates Koordináták másolása - + Left Click Bal kattintás - - + + Map directory: Térképmappa: - - + + POI directory: POI mappa: - - + + DEM directory: DEM mappa: - - + + Styles directory: Stílusok mappa: - - + + Tile cache directory: Gyorsítótár mappa: - - + + Open file Fájl megnyitása - + Error loading data file: Adatfájl betöltési hiba: - - + + Line: %1 Sor: %1 - - + + Open POI file POI fájl megnyitása - + Error loading POI file: Hiba a POI fájl betöltése során: - - + + Tracks Nyomvonalak - - + + Routes Útvonalak - - + + Waypoints Köztespontok - - + + Areas Területek - - - - + + + + Date Dátum - - - + + + Statistics Összesítés - + Name Név - - + + Open map file Térképfájl megnyitása - - - - + + + + Error loading map: Térképbetöltési hiba: - + Select map directory Térképmappa választása - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. DEM csempe letöltési limit túllépve. Ha valóban szüksége van ilyen nagy területre vonatkozó adatokra, töltse le a fájlokat kézzel. - + Could not download all required DEM files. Nem volt letölthető minden szükséges DEM fájl. - + No local DEM tiles found. Nem található helyi DEM csempe. - + No files loaded Nincs betöltött fájl - + %n files %n fájl @@ -1137,59 +1151,59 @@ GraphView - + Data not available Nem elérhető - - + + Distance Távolság + - ft láb - + mi mérföld - + nmi tengeri mérföld - + m m - + km km - + s mp - + min perc - + h óra - + Time Idő @@ -1581,7 +1595,7 @@ - + Graphs Grafikonok @@ -1666,7 +1680,7 @@ - + s mp @@ -1813,7 +1827,7 @@ - + POI POI @@ -1862,7 +1876,7 @@ - + Source Forrás @@ -1872,18 +1886,18 @@ Domborzatárnyékolás - + Plugin: Beépülő: - + WYSIWYG Alakhű - + High-Resolution Nagy felbontás @@ -1903,92 +1917,92 @@ Világosítás: - + The printed area is approximately the display area. The map zoom level does not change. A nyomtatott terület megközelítőleg a megjelenítési terület. A térképnagyítás mértéke nem változik. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. A nagyítás mértéke megváltozik, hogy a teljes tartalom (nyomvonal / köztespontok) illeszkedjen a nyomtatott területhez, és a térkép felbontása a lehető legközelebb legyen a nyomtatási felbontáshoz. - + Name Név - + Date Dátum - + Distance Távolság - + Time Idő - + Moving time Mozgásban töltött idő - + Item count (>1) nyomvonalak száma (ha>1) - + Separate graph page A grafikon külön oldalra - + Print mode Nyomtatási mód - + Header Fejléc - + Use OpenGL OpenGL használata - + Enable HTTP/2 HTTP/2 engedélyezése - - + + MB MB - - + + Image cache size: Kép gyorsítótár mérete: - - + + Connection timeout: Kapcsolat időtúllépés: - - + + System Rendszer @@ -2008,68 +2022,68 @@ Vetület - - + + DEM cache size: DEM gyorsítótár: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. Alapértelmezetten megnyíló mappa a lenti elemekhez. Üresen hagyva a mezőt, a program által alapértelmezett. - + Data: Adat: - + Maps: Térképek: - + POI: POI: - + Initial paths Könyvtárak - + Appearance Megjelenés - + Maps Térképek - + Data Adatok - + DEM DEM - + Position Pozíció - + Print & Export Kimenet - + Options Beállítások diff --git a/lang/gpxsee_it.ts b/lang/gpxsee_it.ts index 29a3c654..27e79c96 100644 --- a/lang/gpxsee_it.ts +++ b/lang/gpxsee_it.ts @@ -70,112 +70,117 @@ Data - + Supported files File supportati - + CSV files File CSV - + CUP files File CUP - + FIT files File FIT - + GeoJSON files File GeoJSON - + GPI files File GPI - + GPX files File GPX - + IGC files File IGC - + ITN files File ITN - + JPEG images File JPEG - + KML files File KML - + LOC files File LOC - + NMEA files File NMEA - + ONmove files File ONmove - + OV2 files File OV2 - + OziExplorer files File OziExplorer - + SLF files File SLF - + SML files File SML - + TCX files File TCX - + + 70mai GPS log files + + + + TwoNav files File TwoNav - + GPSDump files - + All files Tutti i file @@ -317,29 +322,32 @@ Format - - + + ft ft + mi mi - + + nmi nmi - - + + m m - + + km km @@ -347,430 +355,436 @@ GUI - + Quit Esci - - - + + + Paths Percorsi - - + + Keyboard controls Scorciatoie da tastiera - - + + About GPXSee A proposito di GPXSee - + Open... Apri... - + Open directory... - + Print... Stampa... - + Export to PDF... Esporta in PDF... - + Export to PNG... Esporta in PNG... - + Close Chiudi - + Reload Ricarica - + Statistics... Statistiche... - + Clear list - + Load POI file... Carica file POI... - + Select all files Seleziona tutti i file - + Unselect all files Deseleziona tutti i file - + Overlap POIs Sovrapponi POI - + Show POI icons Mostra icone POI - + Show POI labels Mostra etichette POI - + Show POIs Mostra POI - + Show map Mostra mappa - + Load map... Carica mappa... - + Load map directory... Carica la directory della mappa… - + Clear tile cache Cancella cache mappe - - - + + + Next map Mappa successiva - + Show cursor coordinates Mostra coordinate del cursore - + All - + Raster only - + Vector only - + Show position Visualizza posizione - + Follow position Segui posizione - + Show coordinates Visualizza coordinate - + Show motion info Visualizza informazioni movimento - + Show tracks Mostra tracce - + Show routes Mostra percorso - + Show waypoints Mostra punti - + Show areas Mostra aree - + Waypoint icons Icone punti - + Waypoint labels Etichette punti - + Route waypoints Punti del percorso - + km/mi markers Pietre miliari - + Do not show Non mostrare - + Marker only Solo indicatori - + Date/time Data e ora - + Coordinates Coordinate - + Use styles - + Show local DEM tiles - + Show hillshading - + Show graphs Mostra grafici - - - + + + Distance Distanza - - - - + + + + Time Tempo - + Show grid Mostra griglia - + Show slider info Mostra informazioni cursore - + Show tabs - + Show toolbars Mostra barra degli strumenti - + Total time Tempo totale - - - + + + Moving time Tempo in movimento - + Metric Metrico - + Imperial Imperiale - + Nautical Nautico - + Decimal degrees (DD) Gradi decimali (DD) - + Degrees and decimal minutes (DMM) Gradi e minuti decimali (DMM) - + Degrees, minutes, seconds (DMS) Gradi, minuti e secondi (DMS) - + Fullscreen mode Schermo intero - + Options... Opzioni... - + Next Successivo - + Previous Precedente - + Last Ultimo - + First Primo - + &File &File - + Open recent - + &Map &Mappa - + Layers - + &Graph &Grafico - + &POI &POI - + Position Posizione - - + + CRS directory: - - + + Symbols directory: Cartella simboli - + Open directory - - + Error loading geo URI: + + + + + + + Don't show again - + Clear "%1" tile cache? - + Download %n DEM tiles? @@ -778,300 +792,300 @@ - + &Data &Dati - + Download data DEM - + Download map DEM - + Position info Info sulla posizione - + DEM DEM - + &Settings Impo&stazioni - + Units Unità - + Coordinates format Formato coordinate - + &Help &Aiuto - + File File - + Show Mostra - + Navigation Navigazione - - + + Version %1 Versione %1 - - + + 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. GPXSee è distribuito sotto i termini della GNU General Public License versione 3. Per maggiori informazioni su GPXSee visitare il sito del progetto %1. - + Next file File successivo - + Previous file File precedente - + First file Primo file - + Last file Ultimo file - + Append file Aggiungi file - + Next/Previous Successivo/Precedente - + Toggle graph type Cambia formato del grafico - + Toggle time type Cambia formato del tempo - + Toggle position info Attiva/disattiva le informazioni posizione - + Previous map Mappa precedente - + Zoom in Zoom in - + Zoom out Zoom out - + Digital zoom Zoom digitale - + Zoom Zoom - + Copy coordinates Copia le coordinate - + Left Click Clic sinistro - - + + Map directory: Cartella mappe: - - + + POI directory: Cartella POI: - - + + DEM directory: Cartella DEM: - - + + Styles directory: Cartella stili: - - + + Tile cache directory: Cartella cache mappe: - - + + Open file Apri file - + Error loading data file: Errore caricamento file: - - + + Line: %1 Linea: %1 - - + + Open POI file Apri file POI - + Error loading POI file: Errore caricamento file POI: - - + + Tracks Tracce - - + + Routes Percorsi - - + + Waypoints Punti - - + + Areas Aree - - - - + + + + Date Data - - - + + + Statistics Statistiche - + Name Nome - - + + Open map file Apri file mappa - - - - + + + + Error loading map: Errore caricamento mappa: - + Select map directory Seleziona la directory mappa - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. - + Could not download all required DEM files. Impossibile scaricare tutti i file DEM. - + No local DEM tiles found. Nessun file DEM trovato. - + No files loaded Nessun file caricato - + %n files %n file @@ -1139,59 +1153,59 @@ GraphView - + Data not available Dati non disponibili - - + + Distance Distanza + - ft ft - + mi mi - + nmi nmi - + m m - + km km - + s s - + min min - + h h - + Time Tempo @@ -1598,7 +1612,7 @@ - + Graphs Grafici @@ -1683,7 +1697,7 @@ - + s s @@ -1734,8 +1748,8 @@ - - + + System Sistema @@ -1837,7 +1851,7 @@ - + POI POI @@ -1886,7 +1900,7 @@ - + Source @@ -1896,18 +1910,18 @@ - + Plugin: - + WYSIWYG WYSIWYG - + High-Resolution Alta risoluzione @@ -1927,151 +1941,151 @@ - + The printed area is approximately the display area. The map zoom level does not change. L'area stampata corrisponde approssimativamente all'area mostrata. Il livello di zoom della mappa non cambia. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. Il livello di zoom viene cambiato, in modo che tutto il contenuto (tracce/tappe) rientri nell'area di stampa, e che la risoluzione della mappa sia più vicina possibile alla risoluzione di stampa. - + Name Nome - + Date Data - + Distance Distanza - + Time Tempo - + Moving time Tempo in movimento - + Item count (>1) Numero elementi (>1) - + Separate graph page Pagina separata per i grafici - + Print mode Modalità di stampa - + Header Intestazione - + Use OpenGL Usa OpenGL - + Enable HTTP/2 Abilita HTTP/2 - - + + MB MB - - + + Image cache size: Dimensione cache immagini: - - + + Connection timeout: Timeout connessione: - - + + DEM cache size: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. - + Data: - + Maps: - + POI: - + Initial paths - + Appearance Aspetto - + Maps Mappe - + Data Dati - + DEM DEM - + Position Posizione - + Print & Export Stampa e esporta - + Options Opzioni diff --git a/lang/gpxsee_ko.ts b/lang/gpxsee_ko.ts index 0c03f41e..874a203c 100644 --- a/lang/gpxsee_ko.ts +++ b/lang/gpxsee_ko.ts @@ -70,112 +70,117 @@ Data - + Supported files 지원되는 파일 - + CSV files CSV 파일 - + CUP files CUP 파일 - + FIT files FIT 파일 - + GeoJSON files GeoJSON 파일 - + GPI files GPI 파일 - + GPX files GPX 파일 - + IGC files IGC 파일 - + ITN files ITN 파일 - + JPEG images JPEG 이미지 - + KML files KML 파일 - + LOC files LOC 파일 - + NMEA files NMEA 파일 - + ONmove files ONmove 파일 - + OV2 files OV2 파일 - + OziExplorer files OziExplorer 파일 - + SLF files SLF 파일 - + SML files SML 파일 - + TCX files TCX 파일 - + + 70mai GPS log files + + + + TwoNav files TwoNav 파일 - + GPSDump files GPSDump 파일 - + All files 모든 파일 @@ -317,29 +322,32 @@ Format - - + + ft ft + mi mi - + + nmi nmi - - + + m m - + + km km @@ -347,730 +355,736 @@ GUI - + Quit 종료 - - - + + + Paths 경로 - - + + Keyboard controls 키보드 제어 - - + + About GPXSee GPXSee 정보 - + Open... 열기... - + Open directory... 디렉터리 열기... - + Print... 인쇄... - + Export to PDF... PDF로 내보내기... - + Export to PNG... PNG로 내보내기... - + Close 닫기 - + Reload 다시 불러오기 - + Statistics... 통계... - + Clear list 목록 지우기 - + Load POI file... POI 파일 불러오기... - + Select all files 모든 파일 선택 - + Unselect all files 모든 파일 선택 취소 - + Overlap POIs 중첩 POI - + Show POI icons POI 아이콘 표시 - + Show POI labels POI 레이블 표시 - + Show POIs POI 표시 - + Show map 지도 표시 - + Load map... 지도 불러오기... - + Load map directory... 지도 디렉터리 불러오기... - + Clear tile cache 타일 캐시 지우기 - - - + + + Next map 다음 지도 - + Show cursor coordinates 커서 좌표 표시 - + All 모두 - + Raster only 래스터만 - + Vector only 벡터만 - + Show position 위치 표시 - + Follow position 추종 위치 - + Show coordinates 좌표 표시 - + Show motion info 모션 정보 표시 - + Show tracks 트랙 표시 - + Show routes 경로 표시 - + Show waypoints 경유지 표시 - + Show areas 영역 표시 - + Waypoint icons 경유지 아이콘 - + Waypoint labels 경유지 레이블 - + Route waypoints 경유지 경로 - + km/mi markers km/mi 마커 - + Do not show 표시 안 함 - + Marker only 마커만 - + Date/time 날짜/시간 - + Coordinates 좌표 - + Use styles 스타일 사용 - + Download data DEM 데이터 DEM 다운로드 - + Download map DEM 지도 DEM 다운로드 - + Show local DEM tiles 로컬 DEM 타일 표시 - + Show hillshading 언덕 음영 표시 - + Show graphs 그래프 표시 - - - + + + Distance 거리 - - - - + + + + Time 시간 - + Show grid 격자 표시 - + Show slider info 슬라이더 정보 표시 - + Show tabs 탭 표시 - + Show toolbars 도구 모음 표시 - + Total time 총 시간 - - - + + + Moving time 이동시간 - + Metric 미터법 - + Imperial 야드·파운드법 - + Nautical 항해 - + Decimal degrees (DD) 십진법 (DD) - + Degrees and decimal minutes (DMM) 도 및 소수 분 (DMM) - + Degrees, minutes, seconds (DMS) 도, 분, 초 (DMS) - + Fullscreen mode 전체 화면 모드 - + Options... 옵션... - + Next 다음 - + Previous 이전 - + Last 마지막 - + First 처음 - + &File 파일(&F) - + Open recent 최근 열기 - + &Map 지도(&M) - + Layers 레이어 - + &Graph 그래프(&G) - + &Data 데이터(&D) - + Position info 위치 정보 - + &POI POI(&P) - + DEM DEM - + Position 위치 - + &Settings 설정(&S) - + Units 단위 - + Coordinates format 좌표 형식 - + &Help 도움말(&H) - + File 파일 - + Show 표시 - + Navigation 네비게이션 - - + + Version %1 버전 %1 - - + + 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. GPXSee는 GNU General Public License 버전 3의 조건에 따라 배포됩니다. GPX에 대한 자세한 내용은 %1의 프로젝트 홈페이지를 참조하십시오. - + Next file 다음 파일 - + Previous file 이전 파일 - + First file 첫 번째 파일 - + Last file 마지막 파일 - + Append file 파일 추가 - + Next/Previous 다음/이전 - + Toggle graph type 그래프 유형 전환 - + Toggle time type 시간 유형 전환 - + Toggle position info 위치 정보 전환 - + Previous map 이전 지도 - + Zoom in 확대 - + Zoom out 축소 - + Digital zoom 디지털 줌 - + Zoom 확대/축소 - + Copy coordinates 좌표 복사 - + Left Click 왼쪽 클릭 - - + + Map directory: 지도 디렉터리: - - + + POI directory: POI 디렉터리: - - + + CRS directory: CRS 디렉토리: - - + + DEM directory: DEM 디렉터리: - - + + Styles directory: 스타일 디렉터리: - - + + Symbols directory: 기호 디렉터리: - - + + Tile cache directory: 타일 캐시 디렉터리: - - + + Open file 파일 열기 - + Open directory 디렉터리 열기 - + + Error loading geo URI: + + + + Error loading data file: 데이터 파일 불어오는 중 오류 발생: - - + + Line: %1 줄: %1 - - - + + + + Don't show again 다시 표시 안 함 - - + + Open POI file POI 파일 열기 - + Error loading POI file: POI 파일 불어오는 중 오류 발생: - - + + Tracks 트랙 - - + + Routes 경로 - - + + Waypoints 경유지 - - + + Areas 영역 - - - - + + + + Date 날짜 - - - + + + Statistics 통계 - + Name 이름 - - + + Open map file 지도 파일 열기 - - - - + + + + Error loading map: 지도 불러오는 중 오류 발생: - + Select map directory 지도 디렉터리 선택 - + Clear "%1" tile cache? %1 타일 캐시를 지우시겠습니까? - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. DEM 타일 다운로드 제한을 초과했습니다. 이렇게 넓은 지역에 대한 데이터가 정말 필요하다면 수동으로 파일을 다운로드하세요. - + Download %n DEM tiles? %n개의 DEM 타일을 다운로드하시겠습니까? - + Could not download all required DEM files. 필요한 모든 DEM 파일을 다운로드할 수 없습니다. - + No local DEM tiles found. 로컬 DEM 타일을 찾을 수 없습니다. - + No files loaded 불러온 파일이 없습니다 - + %n files %n개 파일 @@ -1137,59 +1151,59 @@ GraphView - + Data not available 데이터를 사용할 수 없음 - - + + Distance 거리 + - ft ft - + mi mi - + nmi nmi - + m m - + km km - + s 초 - + min 분 - + h 시 - + Time 시간 @@ -1632,7 +1646,7 @@ - + Graphs 그래프 @@ -1722,7 +1736,7 @@ - + s 초 @@ -1763,8 +1777,8 @@ - - + + System 시스템 @@ -1845,7 +1859,7 @@ - + POI POI @@ -1894,7 +1908,7 @@ - + Source 소스 @@ -1904,18 +1918,18 @@ 언덕 음영 - + Plugin: 플러그인: - + WYSIWYG WYSIWYG - + High-Resolution 고해상도 @@ -1925,151 +1939,151 @@ 라이트닝: - + The printed area is approximately the display area. The map zoom level does not change. 인쇄된 영역은 대략 표시 영역입니다. 지도 확대/축소 수준은 변경되지 않습니다. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. 전체 콘텐츠 (트랙/경유지)가 인쇄 영역에 맞고 지도 해상도가 인쇄 해상도에 최대한 근접하도록 확대/축소 수준이 변경됩니다. - + Name 이름 - + Date 날짜 - + Distance 거리 - + Time 시간 - + Moving time 이동 시간 - + Item count (>1) 항목수 (>1) - + Separate graph page 별도 그래프 페이지 - + Print mode 인쇄 모드 - + Header 머리말 - + Use OpenGL OpenGL 사용 - + Enable HTTP/2 HTTP/2 사용 - - + + MB MB - - + + Image cache size: 이미지 캐시 크기: - - + + Connection timeout: 연결 시간 초과: - - + + DEM cache size: DEM 캐시 크기: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. 파일 열기 대화 상자의 초기 경로를 선택합니다. 시스템 기본값의 경우 필드를 비워 둡니다. - + Data: 날짜: - + Maps: 지도: - + POI: POI: - + Initial paths 초기 경로 - + Appearance 모양새 - + Maps 지도 - + Data 데이터 - + DEM DEM - + Position 위치 - + Print & Export 인쇄 및 내보내기 - + Options 옵션 diff --git a/lang/gpxsee_nb.ts b/lang/gpxsee_nb.ts index 3fdfd61e..748cfe9b 100644 --- a/lang/gpxsee_nb.ts +++ b/lang/gpxsee_nb.ts @@ -70,112 +70,117 @@ Data - + Supported files Støttede filer - + CSV files CSV-filer - + CUP files CUP-filer - + FIT files FIT-filer - + GeoJSON files GeoJSON-filer - + GPI files GPI-filer - + GPX files GPX-filer - + IGC files IGC-filer - + ITN files ITN-filer - + JPEG images JPEG-bilder - + KML files KML-filer - + LOC files LOC-filer - + NMEA files NMEA-filer - + ONmove files ONmove-filer - + OV2 files OV2-filer - + OziExplorer files OziExplorer-filer - + SLF files SLF-filer - + SML files SML-filer - + TCX files TCX-filer - + + 70mai GPS log files + + + + TwoNav files TwoNav-filer - + GPSDump files GPSDump-filer - + All files Alle filer @@ -317,29 +322,32 @@ Format - - + + ft ft + mi mi - + + nmi nmi - - + + m m - + + km km @@ -347,430 +355,436 @@ GUI - + Quit Avslutt - - - + + + Paths Mappebaner - - + + Keyboard controls Tastatursnarveier - - + + About GPXSee Om - + Open... Åpne… - + Open directory... Åpne mappe … - + Print... Skriv ut… - + Export to PDF... Eksporter til PDF… - + Export to PNG... Eksporter til PNG… - + Close Lukk - + Reload Last inn igjen - + Statistics... Statistikk… - + Clear list Tøm liste - + Load POI file... Last inn interessepunkt-fil… - + Select all files Velg alle filer - + Unselect all files Fravelg alle filer - + Overlap POIs Overlapp interessepunkter - + Show POI icons Vis interessepunktikoner - + Show POI labels Vis interessepunktetiketter - + Show POIs Vis interessepunkter - + Show map Vis kart - + Load map... Last inn kart… - + Load map directory... Last inn kartmappe… - + Clear tile cache Tøm flishurtiglager - - - + + + Next map Neste kart - + Show cursor coordinates Vis peker-koordinater - + All Alle - + Raster only Kun raster - + Vector only Kun vektor - + Show position Vis posisjon - + Follow position Følg posisjon - + Show coordinates Vis koordinater - + Show motion info Vis bevegelsesinfo - + Show tracks Vis spor - + Show routes Vis ruter - + Show waypoints Vis veipunkter - + Show areas Vis områder - + Waypoint icons Veipunktikoner - + Waypoint labels Veipunktetiketter - + Route waypoints Ruteveipunkter - + km/mi markers km/mi-markører - + Do not show Ikke vis - + Marker only Kun markør - + Date/time Dato/tid - + Coordinates Koordinater - + Use styles Bruk stiler - + Show local DEM tiles Vis lokale DEM-fliser - + Show hillshading Vis relieffskygge - + Show graphs Vis diagrammer - - - + + + Distance Distanse - - - - + + + + Time Tid - + Show grid Vis rutenett - + Show slider info Vis skyverinfo - + Show tabs Vis faner - + Show toolbars Vis verktøylinjer - + Total time Total tid - - - + + + Moving time Tid i bevegelse - + Metric Metrisk - + Imperial Britisk - + Nautical Nautisk - + Decimal degrees (DD) Desimalgrader (DD) - + Degrees and decimal minutes (DMM) Grader og desimalminutter (DMM) - + Degrees, minutes, seconds (DMS) Grader, minutter, sekunder (DMS) - + Fullscreen mode Fullskjermmodus - + Options... Alternativer… - + Next Neste - + Previous Forrige - + Last Siste - + First Første - + &File &Fil - + Open recent Åpne nylige - + &Map &Kart - + Layers Lag - + &Graph &Graf - + &POI I&nteressepunkt - + Position Posisjon - - + + CRS directory: CRS-mappe: - - + + Symbols directory: Symbolmappe: - + Open directory Åpne mappe - - + Error loading geo URI: + + + + + + + Don't show again Ikke vis igjen - + Clear "%1" tile cache? Tøm «%1»-flishurtiglager? - + Download %n DEM tiles? Laste ned %n DEM-flis? @@ -778,300 +792,300 @@ - + &Data &Data - + Download data DEM Last ned data-DEM - + Download map DEM Last ned kart-DEM - + Position info Posisjonsinfo - + DEM DEM - + &Settings &Innstillinger - + Units Enheter - + Coordinates format Koordinatformat - + &Help &Hjelp - + File Fil - + Show Vis - + Navigation Navigasjon - - + + Version %1 Versjon %1 - - + + 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. 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. - + Next file Neste fil - + Previous file Forrige fil - + First file Første fil - + Last file Siste fil - + Append file Legg til fil - + Next/Previous Neste/forrige - + Toggle graph type Veksle diagramtype - + Toggle time type Veksle tidstype - + Toggle position info Veksle posisjonsinfo - + Previous map Forrige kart - + Zoom in Zoom inn - + Zoom out Zoom ut - + Digital zoom Digital zoom - + Zoom Zoom - + Copy coordinates Kopier koordinater - + Left Click Venstreklikk - - + + DEM directory: DEM-mappe: - - + + Styles directory: Stilmappe: - - + + Tile cache directory: Flishurtiglagringsmappe: - + Select map directory Velg kartmappe - - + + Map directory: Kartmappe: - - + + POI directory: Interessepunktmappe: - - + + Open file Åpne fil - + Error loading data file: Feil ved innlasting av datafil: - - + + Line: %1 Linje: %1 - - + + Open POI file Åpne interessepunktfil - + Error loading POI file: Feil ved innlasting av interessepunktfil: - - + + Tracks Spor - - + + Routes Ruter - - + + Waypoints Veipunkter - - + + Areas Områder - - - - + + + + Date Dato - - - + + + Statistics Statistikk - + Name Navn - - + + Open map file Åpne kartfil - - - - + + + + Error loading map: Feil ved innlasting av kart: - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. Nedlastingsgrensen for DEM-fliser er overskredet. Hvis du virkelig trenger data for et så stort område, last ned filene manuelt. - + Could not download all required DEM files. Kunne ikke laste ned alle påkrevde DEM-filer. - + No local DEM tiles found. Fant ingen lokale DEM-fliser. - + No files loaded Ingen filer lastet - + %n files %n fil @@ -1139,59 +1153,59 @@ GraphView - + Data not available Data ikke tilgjengelig - - + + Distance Distanse + - ft fot - + mi mi - + nmi nmi - + m m - + km km - + s s - + min min - + h t - + Time Tid @@ -1583,7 +1597,7 @@ - + Graphs Diagrammer @@ -1662,7 +1676,7 @@ - + s s @@ -1840,7 +1854,7 @@ - + POI Interessepunkt @@ -1889,7 +1903,7 @@ - + Source Kilde @@ -1899,18 +1913,18 @@ Relieffskygge - + Plugin: Programtillegg: - + WYSIWYG WYSIWYG - + High-Resolution Høyoppløsning @@ -1920,158 +1934,158 @@ Bleking: - + The printed area is approximately the display area. The map zoom level does not change. Det utskrevne området er omtrent det samme som visningsområdet. Kartets zoomnivå endres ikke. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. Zoomnivået vil endres slik at hele innholdet (spor/veipunkter) passer med utskrevet område og kartoppløsningen er så lik utskriftsoppløsningen som mulig. - + Name Navn - + Date Dato - + Distance Distanse - + Time Tid - + Moving time Tid i bevegelse - + Item count (>1) Elementantall (>1) - + Separate graph page Separat diagramside - + Print mode Utskriftsmodus - + Header Topptekst - + Use OpenGL Bruk OpenGL - + Enable HTTP/2 Aktiver HTTP/2 - - + + MB MB - - + + Image cache size: Bildehurtiglagerstørrelse: - - + + Connection timeout: Tilkoblingstidsavbrudd: - - + + System System - - + + DEM cache size: DEM-hurtiglagerstørrelse: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. Velg forvalgte mappebaner for filåpningsdialoger. La feltet stå tomt for systemstandard. - + Data: Data: - + Maps: Kart: - + POI: Interessepunkt: - + Initial paths Forvalgte mappebaner - + Appearance Utseende - + Maps Kart - + Data Data - + DEM DEM - + Position Posisjon - + Print & Export Utskrift og eksport - + Options Alternativer diff --git a/lang/gpxsee_pl.ts b/lang/gpxsee_pl.ts index d97511fd..fb878e91 100644 --- a/lang/gpxsee_pl.ts +++ b/lang/gpxsee_pl.ts @@ -70,112 +70,117 @@ Data - + Supported files Obsługiwane pliki - + CSV files Pliki CSV - + CUP files Pliki CUP - + FIT files Pliki FIT - + GeoJSON files Pliki GeoJSON - + GPI files Pliki GPI - + GPX files Pliki GPX - + IGC files Pliki IGC - + ITN files Pliki ITN - + JPEG images Pliki JPEG - + KML files Pliki KML - + LOC files Pliki LOC - + NMEA files Pliki NMEA - + OV2 files Pliki OV2 - + OziExplorer files Pliki OziExplorer - + SML files Pliki SML - + TCX files Pliki TCX - + SLF files Pliki SLF - + ONmove files - + + 70mai GPS log files + + + + TwoNav files - + GPSDump files - + All files Wszystkie pliki @@ -317,29 +322,32 @@ Format - - + + ft ft + mi mi - + + nmi nmi - - + + m m - + + km km @@ -347,624 +355,630 @@ GUI - - + + Open file Otwórz plik - - + + Open POI file Otwórz plik POI - + Quit Zakończ - - + + Keyboard controls Elementy sterujące klawiatury - + Close Zamknij - + Reload Odśwież - + Show Pokaż - + File Plik - + Overlap POIs Nakładka POI - + Show POI labels Pokaż etykiety POI - + Show POIs Pokaż punkty POI - + Show map Pokaż mapę - + Clear tile cache Wyczyść pamięć podręczną kafelków - + Open... Otwórz... - - - + + + Paths Ścieżki - + Open directory... - + Export to PNG... Eksportuj do PNG... - + Statistics... Statystyka... - + Clear list - + Load POI file... Załaduj plik POI... - + Select all files Wybierz wszystkie pliki - + Unselect all files Odznacz wszystkie pliki - + Show POI icons - + Load map... Załaduj mapę... - + Load map directory... Załaduj katalog map ... - - - + + + Next map Następna mapa - + Show cursor coordinates Pokaż współrzędne kursora - + All - + Raster only - + Vector only - + Show position - + Follow position - + Show coordinates - + Show motion info - + Show tracks Pokaż ślady - + Show routes Pokaż trasy - + Show waypoints Pokaż punkty nawigacyjne - + Show areas Pokaż obszary - + Waypoint icons - + Waypoint labels Etykiety punktów nawigacyjnych - + km/mi markers Znaczniki km/mi - + Do not show Nie pokazuj - + Marker only Tylko znacznik - + Date/time Data/czas - + Coordinates Współrzędne - + Use styles - + Show local DEM tiles - + Show hillshading - + Show graphs Pokaż wykresy - + Show grid Pokaż siatkę - + Show slider info Pokaż informację o suwaku - + Show tabs - + Show toolbars Pokaż paski narzędzi - + Total time Całkowity czas - - - + + + Moving time Czas ruchu - + Metric Metryczne - + Imperial Imperialne - + Nautical Morskie - + Decimal degrees (DD) Stopnie dziesiętne (DD) - + Degrees and decimal minutes (DMM) Stopnie i minuty dziesiętne (DMM) - + Degrees, minutes, seconds (DMS) Stopnie, minuty, sekundy (DMS) - + Fullscreen mode Tryb pełnoekranowy - + Options... Opcje... - + Next Następny - + Previous Poprzedni - + Last Ostatni - + First Pierwszy - + Open recent - + Layers - + Position info Informacje o pozycji - + DEM - + Position - + Units Jednostki - + Coordinates format Format współrzędnych - - + + Version %1 Wersja %1 - - + + 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. 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. - + Append file Dołącz plik - + Next/Previous Następny/Poprzedni - + Toggle graph type Zmień typ wykresu - + Toggle time type Zmień typ czasu - + Toggle position info Przełącz informacje o pozycji - + Previous map Poprzednia mapa - + Zoom in Przybliż - + Zoom out Oddal - + Digital zoom Zoom cyfrowy - + Zoom Zoom - + Copy coordinates Skopiuj współrzędne - + Left Click Lewy przycisk myszy - - + + DEM directory: Katalog z danymi DEM: - - + + Styles directory: Katalog ze stylami: - - + + Symbols directory: - + Open directory - - + Error loading geo URI: + + + + + + + Don't show again - - + + Areas Obszary - - - + + + Statistics Statystyka - - + + Open map file Otwórz plik mapy - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. - + Could not download all required DEM files. - + No files loaded Nie załadowano żadnych plików - - - - + + + + Date Data - + &File &Plik - + &Map &Mapa - + &Graph &Wykres - + &POI P&OI - + &Data &Dane - + Download data DEM - + Download map DEM - + &Settings &Ustawienia - + &Help Pomo&c - - + + Map directory: Katalog z mapami: - - + + POI directory: Katalog z POI: - - + + CRS directory: - - + + Tile cache directory: Katalog pamięci podręcznej kafelków: - - + + Routes Trasy - - - - + + + + Error loading map: Wystąpił błąd podczas ładowania mapy: - + Select map directory Wybierz katalog map - + Clear "%1" tile cache? - + Download %n DEM tiles? @@ -973,12 +987,12 @@ - + No local DEM tiles found. - + %n files %n plik @@ -987,96 +1001,96 @@ - + Next file Następny plik - + Print... Drukuj... - + Export to PDF... Eksportuj do PDF... - - + + Waypoints Punkty nawigacyjne - + Previous file Poprzedni plik - + Route waypoints Punkty trasy - + First file Pierwszy plik - + Last file Ostatni plik - + Error loading data file: Błąd podczas ładowania pliku danych: - - + + Line: %1 Linia: %1 - + Error loading POI file: Błąd podczas ładowania pliku POI: - + Name Nazwa - - + + Tracks Ślady - - + + About GPXSee O programie GPXSee - + Navigation Nawigacja - - - + + + Distance Dystans - - - - + + + + Time Czas @@ -1141,59 +1155,59 @@ GraphView - + m m - + km km + - ft ft - + Data not available Brak danych - + mi mi - + nmi nmi - + s s - + min min - + h h - - + + Distance Dystans - + Time Czas @@ -1473,7 +1487,7 @@ - + Graphs Wykresy @@ -1669,7 +1683,7 @@ - + s s @@ -1832,7 +1846,7 @@ - + POI POI @@ -1881,7 +1895,7 @@ - + Source @@ -1891,18 +1905,18 @@ - + Plugin: - + WYSIWYG WYSIWYG - + High-Resolution Wysoka rozdzielczość @@ -1922,158 +1936,158 @@ - + The printed area is approximately the display area. The map zoom level does not change. Wydrukowany obszar jest w przybliżeniu obszarem wyświetlania. Poziom powiększenia mapy nie zmienia się. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. Poziom powiększenia mapy zostanie dostosowany w taki sposób, aby cała zawartość (ścieżki/punkty) wchodziła do drukowanego obszaru, a rozdzielczość mapy była jak najbliższa rozdzielczości wydruku. - + Name Nazwa - + Date Data - + Distance Dystans - + Time Czas - + Moving time Czas ruchu - + Item count (>1) Liczba elementów (>1) - + Separate graph page Oddzielna strona wykresu - + Print mode Tryb wydruku - + Header Nagłówek - + Use OpenGL Używaj OpenGL - + Enable HTTP/2 Włącz HTTP/2 - - + + MB MB - - + + Image cache size: Rozmiar pamięci podręcznej obrazu: - - + + Connection timeout: Limit czasu połączenia: - - + + System System - - + + DEM cache size: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. - + Data: - + Maps: - + POI: - + Initial paths - + Appearance Wygląd - + Maps Mapy - + Data Dane - + DEM - + Position - + Print & Export Drukowanie i eksport - + Options Opcje diff --git a/lang/gpxsee_pt_BR.ts b/lang/gpxsee_pt_BR.ts index f64c79a2..9eb38516 100644 --- a/lang/gpxsee_pt_BR.ts +++ b/lang/gpxsee_pt_BR.ts @@ -70,112 +70,117 @@ Data - + Supported files Formatos suportados - + CSV files Arquivos CSV - + CUP files Arquivos CUP - + FIT files Arquivos FIT - + GeoJSON files Arquivos GeoJSON - + GPI files Arquivos GPI - + GPX files Arquivos GPX - + IGC files Arquivos IGC - + ITN files - + JPEG images Imagens JPEG - + KML files Arquivos KML - + LOC files Arquivos LOC - + NMEA files Arquivos NMEA - + ONmove files - + OV2 files - + OziExplorer files Arquivos OziExplorer - + SLF files Arquivos SLF - + SML files Arquivos SML - + TCX files Arquivos TCX - + + 70mai GPS log files + + + + TwoNav files - + GPSDump files - + All files Todos os arquivos @@ -317,29 +322,32 @@ Format - - + + ft ft + mi mi - + + nmi nmi - - + + m m - + + km km @@ -347,430 +355,436 @@ GUI - + Quit Sair - - - + + + Paths Caminhos - - + + Keyboard controls Controles de teclado - - + + About GPXSee Sobre o GPXSee - + Open... Abrir... - + Open directory... - + Print... Imprimir... - + Export to PDF... Exportar para PDF... - + Export to PNG... Exportar para PNG... - + Close Fechar - + Reload Recarregar - + Statistics... Estatísticas... - + Clear list - + Load POI file... Carregar arquivo POI... - + Select all files - + Unselect all files - + Overlap POIs Sobrepor POIs - + Show POI icons - + Show POI labels Mostrar etiquetas POI - + Show POIs Mostrar POIs - + Show map Mostrar mapa - + Load map... Carregar mapa... - + Load map directory... Carregar diretório de mapa... - + Clear tile cache Limpar o cache de ladrilhos - - - + + + Next map Próximo mapa - + Show cursor coordinates Mostrar coordenadas do cursor - + All - + Raster only - + Vector only - + Show position - + Follow position - + Show coordinates - + Show motion info - + Show tracks Mostrar trilhas - + Show routes Mostrar rotas - + Show waypoints Mostrar waypoints - + Show areas Mostrar áreas - + Waypoint icons - + Waypoint labels Etiquetas de waypoint - + Route waypoints Waypoints da rota - + km/mi markers Marcadores de km/mi - + Do not show - + Marker only - + Date/time - + Coordinates Coordenadas - + Use styles - + Show local DEM tiles - + Show hillshading - + Show graphs Mostrar gráficos - - - + + + Distance Distância - - - - + + + + Time Tempo - + Show grid Mostrar grade - + Show slider info Mostrar informações do cursor - + Show tabs - + Show toolbars Mostrar barra de ferramentas - + Total time Tempo total - - - + + + Moving time Tempo em movimento - + Metric Métrica - + Imperial Imperial - + Nautical Naútica - + Decimal degrees (DD) Graus decimais (DD) - + Degrees and decimal minutes (DMM) Graus e minutos decimais (DMM) - + Degrees, minutes, seconds (DMS) Graus, minutos, segundos (DMS) - + Fullscreen mode Tela inteira - + Options... Preferências... - + Next Próximo - + Previous Anterior - + Last Último - + First Primeiro - + &File &Arquivo - + Open recent - + &Map &Mapa - + Layers - + &Graph &Gráfico - + &POI &POI - + Position - - + + CRS directory: - - + + Symbols directory: - + Open directory - - + Error loading geo URI: + + + + + + + Don't show again - + Clear "%1" tile cache? - + Download %n DEM tiles? @@ -778,300 +792,300 @@ - + &Data &Dados - + Download data DEM - + Download map DEM - + Position info - + DEM - + &Settings &Configurações - + Units Unidades - + Coordinates format Formato de coordenadas - + &Help Aj&uda - + File Arquivo - + Show Exibir - + Navigation Navegação - - + + Version %1 Versão %1 - - + + 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. 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. - + Next file Próximo arquivo - + Previous file Arquivo anterior - + First file Primeiro arquivo - + Last file Último arquivo - + Append file Anexar arquivo - + Next/Previous Próximo/Anterior - + Toggle graph type Alterna o tipo do gráfico - + Toggle time type Alterna o tipo de tempo - + Toggle position info - + Previous map Mapa anterior - + Zoom in Aumentar o zoom - + Zoom out Reduzir o zoom - + Digital zoom Zoom digital - + Zoom Zoom - + Copy coordinates Copiar coordenadas - + Left Click Clique esquerdo - - + + Map directory: Diretório de mapas: - - + + POI directory: Diretório de POI: - - + + DEM directory: Diretório de DEM: - - + + Styles directory: Diretório de estilos: - - + + Tile cache directory: Diretório de cache de ladrilhos: - - + + Open file Abrir arquivo - + Error loading data file: Erro ao carregar arquivo de dados: - - + + Line: %1 Linha: %1 - - + + Open POI file Abrir aquivo POI - + Error loading POI file: Erro ao carregar arquivo POI: - - + + Tracks Trilhas - - + + Routes Rotas - - + + Waypoints Waypoints - - + + Areas Áreas - - - - + + + + Date Data - - - + + + Statistics Estatísticas - + Name Nome - - + + Open map file Abrir arquivo de mapa - - - - + + + + Error loading map: Erro ao carregar o mapa: - + Select map directory Selecionar diretório de mapa - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. - + Could not download all required DEM files. - + No local DEM tiles found. - + No files loaded Nenhum arquivo carregado - + %n files %n arquivo @@ -1139,59 +1153,59 @@ GraphView - + Data not available Dados não disponíveis - - + + Distance Distância + - ft ft - + mi mi - + nmi nmi - + m m - + km km - + s s - + min min - + h h - + Time Tempo @@ -1583,7 +1597,7 @@ - + Graphs Gráficos @@ -1668,7 +1682,7 @@ - + s s @@ -1815,7 +1829,7 @@ - + POI POI @@ -1864,7 +1878,7 @@ - + Source @@ -1874,18 +1888,18 @@ - + Plugin: - + WYSIWYG WYSIWYG - + High-Resolution Alta resolução @@ -1905,92 +1919,92 @@ - + The printed area is approximately the display area. The map zoom level does not change. A área de impressão é aproximadamente a área de tela. O nível de zoom do mapa não é alterado. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. O nível de zoom será alterado de modo que todo o conteúdo (trilhas/waypoints) caiba na área de impressão e a resolução seja tão próxima quanto possível da resolução de impressão. - + Name Nome - + Date Data - + Distance Distância - + Time Tempo - + Moving time Tempo em movimento - + Item count (>1) Número de itens (>1) - + Separate graph page Separar página de gráficos - + Print mode Modo de impressão - + Header Cabeçalho - + Use OpenGL Usar OpenGL - + Enable HTTP/2 Habilitar HTTP/2 - - + + MB MB - - + + Image cache size: Tamanho do cache de imagens: - - + + Connection timeout: Tempo de espera de conexão: - - + + System Sistema @@ -2010,68 +2024,68 @@ - - + + DEM cache size: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. - + Data: - + Maps: - + POI: - + Initial paths - + Appearance Aparência - + Maps Mapas - + Data Dados - + DEM - + Position - + Print & Export Imprimir e Exportar - + Options Preferências diff --git a/lang/gpxsee_ru.ts b/lang/gpxsee_ru.ts index 50385ceb..795ec15c 100644 --- a/lang/gpxsee_ru.ts +++ b/lang/gpxsee_ru.ts @@ -70,112 +70,117 @@ Data - + Supported files Все поддерживаемые файлы - + CSV files CSV файлы - + CUP files CUP файлы - + FIT files FIT файлы - + GeoJSON files GeoJSON файлы - + GPI files GPI файлы - + GPX files GPX файлы - + IGC files IGC файлы - + ITN files Файлы ITN - + JPEG images JPEG изображения - + KML files KML файлы - + LOC files LOC файлы - + NMEA files NMEA файлы - + OV2 files OV2 файлы - + OziExplorer files OziExplorer файлы - + SML files SML файлы - + TCX files TCX файлы - + SLF files SLF файлы - + ONmove files ONmove файлы - + + 70mai GPS log files + + + + TwoNav files TwoNav файлы - + GPSDump files GPSDump файлы - + All files Все файлы @@ -317,29 +322,32 @@ Format - - + + ft фт + mi мл - + + nmi мор. мл - - + + m м - + + km км @@ -347,624 +355,630 @@ GUI - - + + Open file Открыть файл - - + + Open POI file Открыть файл с точками POI - + Quit Выход - - + + Keyboard controls Управление с помощью клавиатуры - + Close Закрыть - + Reload Обновить - + Show Показать - + File Файл - + Overlap POIs Перекрывать точки POI - + Show POI labels Показывать подписи к точкам POI - + Show POIs Показывать точки POI - + Show map Показывать карту - + Clear tile cache Очистить кэш тайлов - + Open... Открыть… - - - + + + Paths Пути - + Open directory... Открыть каталог… - + Export to PNG... Экспорт в PNG... - + Statistics... Статистика… - + Clear list Очистить список - + Load POI file... Загрузить файл с точками POI… - + Select all files Выбрать все файлы - + Unselect all files Отменить выбор всех файлов - + Show POI icons Показывать иконки POI - + Load map... Загрузить карту… - + Load map directory... Загрузить каталог карт… - - - + + + Next map Следующая карта - + Show cursor coordinates Показывать координаты курсора - + All Все - + Raster only Только растр - + Vector only Только вектор - + Show position Показать позицию - + Follow position Следовать позиции - + Show coordinates Показать координаты - + Show motion info Показать информацию о движении - + Show tracks Показывать треки - + Show routes Показывать маршруты - + Show waypoints Показывать точки - + Show areas Показывать области - + Waypoint icons Иконки путевых точек - + Waypoint labels Подписи точек - + km/mi markers км/мл отметки - + Do not show Не показывать - + Marker only Только отметки - + Date/time Дата/время - + Coordinates Координаты - + Use styles Использовать стили - + Show local DEM tiles Показать локальные DEM тайлы - + Show hillshading Показывать отмывку рельефа - + Show graphs Показывать графики - + Show grid Показывать сетку - + Show slider info Показывать значение на слайдере - + Show tabs Показать вкладки - + Show toolbars Показывать панель инструментов - + Total time Общее время - - - + + + Moving time Время движения - + Metric Метрические - + Imperial Британские - + Nautical Морские - + Decimal degrees (DD) Десятичные градусы (DD) - + Degrees and decimal minutes (DMM) Градусы, десятичные минуты (DMM) - + Degrees, minutes, seconds (DMS) Градусы, минуты, секунды (DMS) - + Fullscreen mode Полноэкранный режим - + Options... Параметры… - + Next Следующий - + Previous Предыдущий - + Last Последний - + First Первый - + Open recent Открыть недавние - + Layers Слои - + Position info Информация о позиции - + DEM DEM - + Position Позиция - + Units Единицы - + Coordinates format Формат координат - - + + Version %1 Версия %1 - - + + 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. GPXSee распространяется в соответствии с условиями GNU General Public License 3 версии. Для получения дополнительной информации о GPXSee посетите страницу проекта %1. - + Append file Добавить файл - + Next/Previous Следующий/предыдущий - + Toggle graph type Переключить тип графика - + Toggle time type Переключить тип времени - + Toggle position info Переключить информацию о позиции - + Previous map Предыдущая карта - + Zoom in Увеличить - + Zoom out Уменьшить - + Digital zoom Цифровой зум - + Zoom Zoom - + Copy coordinates Скопировать координаты - + Left Click Левый клик мышью - - + + DEM directory: Каталог с DEM данными: - - + + Styles directory: Каталог со стилями: - - + + Symbols directory: Каталог символов: - + Open directory Открыть каталог - - + Error loading geo URI: + + + + + + + Don't show again Больше не показывать - - + + Areas Области - - - + + + Statistics Статистика - - + + Open map file Открыть файл карты - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. Превышен лимит загрузки DEM тайлов. Если вам действительно нужны данные для такой огромной области, загрузите файлы вручную. - + Could not download all required DEM files. Не удалось загрузить все необходимые DEM файлы. - + No files loaded Нет загруженных файлов - - - - + + + + Date Дата - + &File &Файл - + &Map &Карты - + &Graph &График - + &POI &Точки POI - + &Data &Данные - + Download data DEM Скачать данные DEM - + Download map DEM Скачать карту DEM - + &Settings &Настройки - + &Help &Справка - - + + Map directory: Каталог с картами: - - + + POI directory: Каталог с POI: - - + + CRS directory: Каталог CRS: - - + + Tile cache directory: Каталог кеша тайлов: - - + + Routes Маршруты - - - - + + + + Error loading map: Ошибка загрузки карты: - + Select map directory Выберите каталог с картами - + Clear "%1" tile cache? Очистить кеш тайлов "%1"? - + Download %n DEM tiles? Скачать %n DEM тайл? @@ -973,12 +987,12 @@ - + No local DEM tiles found. Не найдено локальных DEM тайлов. - + %n files %n файл @@ -987,96 +1001,96 @@ - + Next file Следующий файл - + Print... Печать… - + Export to PDF... Экспорт в PDF… - - + + Waypoints Путевые точки - + Previous file Предыдущий файл - + Route waypoints Маршрутные точки - + First file Первый файл - + Last file Последний файл - + Error loading data file: Ошибка загрузки файла данных: - - + + Line: %1 Строка: %1 - + Error loading POI file: Ошибка загрузки файла с точками POI: - + Name Имя - - + + Tracks Треки - - + + About GPXSee О GPXSee - + Navigation Навигация - - - + + + Distance Расстояние - - - - + + + + Time Время @@ -1141,59 +1155,59 @@ GraphView - + m м - + km км + - ft фт - + Data not available Данные отсутствуют - + mi мл - + nmi мор. мл - + s с - + min мин - + h ч - - + + Distance Расстояние - + Time Время @@ -1473,7 +1487,7 @@ - + Graphs Графики @@ -1669,7 +1683,7 @@ - + s с @@ -1832,7 +1846,7 @@ - + POI Точки POI @@ -1881,7 +1895,7 @@ - + Source Источник @@ -1891,18 +1905,18 @@ Отмывка рельефа - + Plugin: Плагин: - + WYSIWYG WYSIWYG - + High-Resolution Высокое разрешение @@ -1922,158 +1936,158 @@ Осветление: - + The printed area is approximately the display area. The map zoom level does not change. Печатная область примерно совпадает с областью отображения. Уровень приближения карты не изменяется. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. Уровень приближения будет изменен так, чтобы всё содержимое (треки/точки) уместились в печатную область и разрешение карты было бы как можно ближе к разрешению печати. - + Name Имя - + Date Дата - + Distance Расстояние - + Time Время - + Moving time Время движения - + Item count (>1) Количество объектов (>1) - + Separate graph page Отдельная страница с графиком - + Print mode Режим печати - + Header Заголовок - + Use OpenGL Использовать OpenGL - + Enable HTTP/2 Включить HTTP/2 - - + + MB МБ - - + + Image cache size: Размер кэша изображений: - - + + Connection timeout: Таймаут соединения: - - + + System Система - - + + DEM cache size: Размер кэша DEM: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. Выберите начальные пути диалогов открытия файлов. Оставьте поле пустым для системного значения по умолчанию. - + Data: Данные: - + Maps: Карты: - + POI: POI: - + Initial paths Начальные пути - + Appearance Внешний вид - + Maps Карты - + Data Данные - + DEM DEM - + Position Позиция - + Print & Export Печать и экспорт - + Options Параметры diff --git a/lang/gpxsee_sv.ts b/lang/gpxsee_sv.ts index 27e436c7..dd771f26 100644 --- a/lang/gpxsee_sv.ts +++ b/lang/gpxsee_sv.ts @@ -70,112 +70,117 @@ Data - + Supported files Filer som stöds - + CSV files CSV-filer - + CUP files CUP-filer - + FIT files FIT-filer - + GeoJSON files GeoJSON-filer - + GPI files GPI-filer - + GPX files GPX-filer - + IGC files IGC-filer - + ITN files ITN-filer - + JPEG images JPEG-bilder - + KML files KML-filer - + LOC files LOC-filer - + NMEA files NMEA-filer - + OV2 files OV2-filer - + OziExplorer files OziExplorer-filer - + SML files SML-filer - + TCX files TCX-filer - + SLF files SLF-filer - + ONmove files ONmove-filer - + + 70mai GPS log files + + + + TwoNav files TwoNav-filer - + GPSDump files GPSDump-filer - + All files Alla filer @@ -317,29 +322,32 @@ Format - - + + ft ft + mi mi - + + nmi nmi - - + + m m - + + km km @@ -347,543 +355,549 @@ GUI - - + + Map directory: Kartmapp: - - + + POI directory: POI-mapp: - - + + Open file Öppna fil - - + + Open POI file Öppna POI-fil - + Quit Avsluta - - + + Keyboard controls Snabbtangenter - + Close Stäng - + Reload Uppdatera - + Show Visa - + File Arkiv - + Overlap POIs Överlappa POI:er - + Show POI labels Visa POI-namn - + Show POIs Visa POI:er - + Show map Visa karta - + Clear tile cache Rensa kart-cache - + Open... Öppna... - - - + + + Paths Sökvägar - + Open directory... Öppna mapp... - + Export to PNG... Exportera till PNG... - + Statistics... Statistik... - + Clear list Rensa lista - + Load POI file... Läs in POI-fil... - + Select all files Markera alla filer - + Unselect all files Avmarkera alla filer - + Show POI icons Visa POI-ikoner - + Load map... Läs in karta... - + Load map directory... Läs in kartmapp... - - - + + + Next map Nästa karta - + Show cursor coordinates Visa markörkoordinater - + All Alla - + Raster only Endast raster - + Vector only Endast vektor - + Show position Visa position - + Follow position Följ positionen - + Show coordinates Visa koordinater - + Show motion info Visa rörelseinformation - + Show tracks Visa spår - + Show routes Visa rutter - + Show waypoints Visa vägpunkter - + Show areas Visa områden - + Waypoint icons Vägpunktsikoner - + Waypoint labels Vägpunktsnamn - + km/mi markers km/mi-markörer - + Do not show Visa inte - + Marker only Endast markör - + Date/time Datum/tid - + Coordinates Koordinater - + Use styles Använd stilmallar - + Show local DEM tiles Visa lokala DEM-rutor - + Show hillshading Visa bergsskuggning - + Show graphs Visa diagram - + Show grid Visa stödlinjer - + Show slider info Visa reglageinfo - + Show tabs Visa flikar - + Show toolbars Visa verktygsfält - + Total time Total tid - - - + + + Moving time Förflyttningstid - + Metric Meter - + Imperial Imperial - + Nautical Nautiska - + Decimal degrees (DD) Decimala grader (DD) - + Degrees and decimal minutes (DMM) Grader och decimala minuter (DMM) - + Degrees, minutes, seconds (DMS) Grader, minuter, sekunder (DMS) - + Fullscreen mode Helskärmsläge - + Options... Alternativ... - + Next Nästa - + Previous Föregående - + Last Sista - + First Första - + Open recent Öppna senaste - + Layers Lager - + Position info Positionsinformation - + DEM DEM - + Position Position - + Units Enhet - + Coordinates format Koordinatformat - - + + Version %1 Version %1 - - + + 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. GPXSee distribueras under vilkoren för GNU General Public License version 3. För mer info om GPXSee, besök hemsidan på %1. - + Append file Lägg till fil - + Next/Previous Nästa/Föregående - + Toggle graph type Växla diagramtyp - + Toggle time type Växla tidstyp - + Toggle position info Positionsinfo av/på - + Previous map Föregående karta - + Zoom in Zooma in - + Zoom out Zooma ut - + Digital zoom Digital zoom - + Zoom Zoom - + Copy coordinates Kopiera koordinater - + Left Click Vänsterklick - - + + DEM directory: DEM-mapp: - - + + Styles directory: Mapp för stilar: - - + + Symbols directory: Symbolmapp: - + Open directory Öppna mapp - - + Error loading geo URI: + + + + + + + Don't show again Visa inte igen - - + + Areas Områden - - - + + + Statistics Statistik - - + + Open map file Öppna kartfil - - - - + + + + Error loading map: Fel vid inläsning av karta: - + Select map directory Välj kartmapp - + Clear "%1" tile cache? Vill du rensa kartcachen "%1"? - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. DEM-kartrutors nedladdningsgräns har överskridits. Ladda ner filer manuellt, om du verkligen behöver data för ett så stort område. - + Download %n DEM tiles? Vill du ladda ner %n DEM-kartruta? @@ -891,22 +905,22 @@ - + Could not download all required DEM files. Kunde inte ladda ner alla nödvändiga DEM-filer. - + No local DEM tiles found. Inga lokala DEM -rutor hittades. - + No files loaded Inga filer inlästa - + %n files %n fil @@ -914,167 +928,167 @@ - - - - + + + + Date Datum - - + + Routes Rutter - + Next file Nästa fil - + Print... Skriv ut... - + Export to PDF... Exportera till PDF... - - + + Waypoints Vägpunkter - + Previous file Föregående fil - + Route waypoints Ruttvägpunkter - + &File &Arkiv - + &Map &Karta - + &Graph &Diagram - + &POI &POI - + &Data Da&ta - + Download data DEM Ladda ner data DEM - + Download map DEM Ladda ner karta DEM - + &Settings &Inställningar - + &Help &Hjälp - + First file Första filen - + Last file Sista filen - - + + CRS directory: CRS-mapp: - - + + Tile cache directory: Mapp för kart-cache: - + Error loading data file: Fel vid inläsning av datafil: - - + + Line: %1 Rad: %1 - + Error loading POI file: Fel vid inläsning av POI-fil: - + Name Namn - - + + Tracks Spår - - + + About GPXSee Om GPXSee - + Navigation Navigation - - - + + + Distance Avstånd - - - - + + + + Time Tid @@ -1139,59 +1153,59 @@ GraphView - + m m - + km km + - ft ft - + Data not available Ingen data tillgänglig - + mi mi - + nmi nmi - + s sek - + min min - + h tim - - + + Distance Avstånd - + Time Tid @@ -1471,7 +1485,7 @@ - + Graphs Diagram @@ -1667,7 +1681,7 @@ - + s sek @@ -1830,7 +1844,7 @@ - + POI POI @@ -1879,7 +1893,7 @@ - + Source Källa @@ -1889,18 +1903,18 @@ Bergskuggning - + Plugin: Insticksmodul: - + WYSIWYG WYSIWYG - + High-Resolution Högupplösning @@ -1920,158 +1934,158 @@ Belysning: - + The printed area is approximately the display area. The map zoom level does not change. Det utskrivna området är ungefär detsamma som synligt område på skärmen. Kartans zoomnivå ändras inte. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. Zoomnivån kommer att ändras så att hela innehållet (spår/vägpunkter) passar utskriftsområdet och kartresolutionen är så nära som möjligt till utskriftsupplösningen. - + Name Namn - + Date Datum - + Distance Avstånd - + Time Tid - + Moving time Förflyttningstid - + Item count (>1) Objektantal (>1) - + Separate graph page Separat diagramsida - + Print mode Utskriftsläge - + Header Rubrik - + Use OpenGL Använd OpenGL - + Enable HTTP/2 Aktivera HTTP/2 - - + + MB MB - - + + Image cache size: Cashe-storlek för bilder: - - + + Connection timeout: Anslutningens tidsgräns: - - + + System System - - + + DEM cache size: DEM cache-storlek: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. Välj inledande sökväg för filöppningsdialoger. Lämna fältet tomt för systemstandard. - + Data: Data: - + Maps: Kartor: - + POI: POI: - + Initial paths Inledande sökväg - + Appearance Utseende - + Maps Kartor - + Data Data - + DEM DEM - + Position Position - + Print & Export Utskrift & Export - + Options Alternativ diff --git a/lang/gpxsee_tr.ts b/lang/gpxsee_tr.ts index 38c6afe0..36185b9f 100644 --- a/lang/gpxsee_tr.ts +++ b/lang/gpxsee_tr.ts @@ -70,112 +70,117 @@ Data - + Supported files Desteklenen dosyalar - + CSV files CSV dosyaları - + CUP files CUP dosyaları - + FIT files FIT dosyaları - + GeoJSON files GeoJSON dosyaları - + GPI files GPI dosyaları - + GPX files GPX dosyaları - + IGC files IGC dosyaları - + ITN files ITN dosyaları - + JPEG images JPEG görüntüleri - + KML files KML dosyaları - + LOC files LOC dosyaları - + NMEA files NMEA dosyaları - + ONmove files ONmove dosyaları - + OV2 files OV2 dostaları - + OziExplorer files OziExplorer dosyaları - + SLF files SLF dosyaları - + SML files SML dosyaları - + TCX files TCX dosyaları - + + 70mai GPS log files + + + + TwoNav files TwoNav dosyaları - + GPSDump files GPSDump dosyaları - + All files Tüm dosyalar @@ -317,29 +322,32 @@ Format - - + + ft ft + mi mi - + + nmi nmi - - + + m m - + + km km @@ -347,730 +355,736 @@ GUI - + Quit Çıkış - - - + + + Paths Klasör konumları - - + + Keyboard controls Klavye denetimleri - - + + About GPXSee GPXSee hakkında - + Open... Aç... - + Open directory... Dizin aç... - + Print... Yazdır... - + Export to PDF... PDF olarak dışa aktar... - + Export to PNG... PNG olarak dışa aktar... - + Close Kapat - + Reload Yeniden yükle - + Statistics... İstatistikler... - + Clear list Listeyi temizle - + Load POI file... POI dosyası yükle... - + Select all files Tüm dosyaları seç - + Unselect all files Tüm dosyaların seçimini kaldır - + Overlap POIs POI'leri üst üste getir - + Show POI icons POI simgelerini göster - + Show POI labels POI etiketlerini göster - + Show POIs POI'leri göster - + Show map Haritayı göster - + Load map... Harita yükle... - + Load map directory... Harita dizinini yükle... - + Clear tile cache Döşeme önbelleğini temizle - - - + + + Next map Sonraki harita - + Show cursor coordinates İmleç koordinatlarını göster - + All Tümü - + Raster only Yalnızca raster - + Vector only Yalnızca vektör - + Show position Konumu göster - + Follow position Konumu takip et - + Show coordinates Koordinatları göster - + Show motion info Hareket bilgilerini göster - + Show tracks İzleri göster - + Show routes Rotaları göster - + Show waypoints Yer işaretlerini göster - + Show areas Alanları göster - + Waypoint icons Ara nokta simgeleri - + Waypoint labels Yer işareti etiketleri - + Route waypoints Rota yer işaretleri - + km/mi markers km/mil işaretleri - + Do not show Gösterme - + Marker only Yalnızca işaretleyici - + Date/time Tarih/saat - + Coordinates Koordinatlar - + Use styles Tarzları kullan - + Show local DEM tiles Yerel DEM döşemelerini göster - + Show hillshading Tepe gölgelendirmesini göster - + Show graphs Grafikleri göster - - - + + + Distance Mesafe - - - - + + + + Time Zaman - + Show grid Izgarayı göster - + Show slider info Kaydırıcı bilgisi göster - + Show tabs Sekmeleri göster - + Show toolbars Araç çubuklarını göster - + Total time Toplam süre - - - + + + Moving time Hareket süresi - + Metric Metrik - + Imperial İngiliz - + Nautical Denizcilik - + Decimal degrees (DD) Desimal derece (DD) - + Degrees and decimal minutes (DMM) Derece ve desimal dakika (DDD) - + Degrees, minutes, seconds (DMS) Derece, dakika, saniye (DDS) - + Fullscreen mode Tam ekran modu - + Options... Seçenekler... - + Next Sonraki - + Previous Önceki - + Last Son - + First İlk - + &File &Dosya - + Open recent Son kullanılanları aç - + &Map &Harita - + Layers Katmanlar - + &Graph &Grafik - + &POI &POI - + Position Konum - - + + CRS directory: CRS dizini: - - + + Symbols directory: Semboller dizini: - + Open directory Dizin aç - - + Error loading geo URI: + + + + + + + Don't show again Tekrar gösterme - + Clear "%1" tile cache? "%1" döşeme önbelleği temizlensin mi? - + Download %n DEM tiles? %n DEM döşemesi indirilsin mi? - + &Data &Veri - + Download data DEM DEM verisini indir - + Download map DEM DEM haritasını indir - + Position info Konum bilgisi - + DEM DEM - + &Settings &Ayarlar - + Units Birimler - + Coordinates format Koordinat biçimi - + &Help &Yardım - + File Dosya - + Show Göster - + Navigation Navigasyon - - + + Version %1 Sürüm %1 - - + + 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. 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. - + Next file Sonraki dosya - + Previous file Önceki dosya - + First file İlk dosya - + Last file Son dosya - + Append file Dosya ekle - + Next/Previous Sonraki/Önceki - + Toggle graph type Geçiş grafik türü - + Toggle time type Geçiş zaman türü - + Toggle position info Konum bilgilerini değiştir - + Previous map Önceki harita - + Zoom in Yaklaş - + Zoom out Uzaklaş - + Digital zoom Dijital yakınlaştırma - + Zoom Yakınlaştırma - + Copy coordinates Koordinatları kopyala - + Left Click Sol Tık - - + + Map directory: Harita dizini: - - + + POI directory: POI dizini: - - + + DEM directory: DEM dizini: - - + + Styles directory: Tarz dizini: - - + + Tile cache directory: Döşeme önbellek dizini: - - + + Open file Dosya aç - + Error loading data file: Veri dosyası yüklenirken hata oluştu: - - + + Line: %1 Satır: %1 - - + + Open POI file POI dosyası aç - + Error loading POI file: POI dosyası yükleme hatası: - - + + Tracks İzler - - + + Routes Rotalar - - + + Waypoints Yer işaretleri - - + + Areas Alanlar - - - - + + + + Date Tarih - - - + + + Statistics İstatistikler - + Name Adı - - + + Open map file Harita dosyası aç - - - - + + + + Error loading map: Harita yüklenirken hata oluştu: - + Select map directory Harita dizinini seç - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. DEM döşemeleri indirme sınırı aşıldı. Bu kadar büyük bir alan için gerçekten veriye ihtiyacınız varsa, dosyaları elle indirin. - + Could not download all required DEM files. Gerekli tüm DEM dosyaları indirilemedi. - + No local DEM tiles found. Yerel DEM döşemesi bulunamadı. - + No files loaded Hiç dosya yüklenmedi - + %n files %n dosya @@ -1137,59 +1151,59 @@ GraphView - + Data not available Veri yok - - + + Distance Mesafe + - ft ft - + mi mi - + nmi nmi - + m m - + km km - + s s - + min dak - + h sa - + Time Zaman @@ -1581,7 +1595,7 @@ - + Graphs Grafikler @@ -1660,7 +1674,7 @@ - + s s @@ -1838,7 +1852,7 @@ - + POI POI @@ -1887,7 +1901,7 @@ - + Source Kaynak @@ -1897,18 +1911,18 @@ Tepe gölgelendirmesi - + Plugin: Eklenti: - + WYSIWYG WYSIWYG - + High-Resolution Yüksek çözünürlük @@ -1918,158 +1932,158 @@ Işıklandırma: - + The printed area is approximately the display area. The map zoom level does not change. Yazdırılan alan yaklaşık olarak görüntü alanıdır. Harita zum seviyesi değişmez. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. Yakınlaştırma seviyesi, tüm içeriğin (izler/yer işaretleri) yazdırılan alana sığması ve harita çözünürlüğünün baskı çözünürlüğüne olabildiğince yakın olacak şekilde değiştirilecektir. - + Name Adı - + Date Tarih - + Distance Mesafe - + Time Zaman - + Moving time Hareket süresi - + Item count (>1) Öge sayısı (>1) - + Separate graph page Ayrı grafik sayfası - + Print mode Yazdırma modu - + Header Başlık - + Use OpenGL OpenGL kullan - + Enable HTTP/2 HTTP/2 etkinleştir - - + + MB MB - - + + Image cache size: Görüntü önbellek boyutu: - - + + Connection timeout: Bağlantı zaman aşımı: - - + + System Sistem - - + + DEM cache size: DEM önbellek boyutu: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. Dosya açma iletişim kutularının ilk yollarını seçin. Sistem öntanımlı değeri için alanı boş bırakın. - + Data: Veri: - + Maps: Haritalar: - + POI: POI: - + Initial paths İlk yollar - + Appearance Görünüm - + Maps Haritalar - + Data Veri - + DEM DEM - + Position Konum - + Print & Export Yazdır & Dışa aktar - + Options Seçenekler diff --git a/lang/gpxsee_uk.ts b/lang/gpxsee_uk.ts index 90a08e9a..2219d8de 100644 --- a/lang/gpxsee_uk.ts +++ b/lang/gpxsee_uk.ts @@ -70,112 +70,117 @@ Data - + Supported files Всі підтримувані формати - + CSV files CSV файли - + CUP files CUP файли - + FIT files FIT файли - + GeoJSON files GeoJSON файли - + GPI files GPI файли - + GPX files GPX файли - + IGC files IGC файли - + ITN files ITN файли - + JPEG images JPEG зображення - + KML files KML файли - + LOC files LOC файли - + NMEA files NMEA файли - + ONmove files ONmove файли - + OV2 files OV2 файли - + OziExplorer files OziExplorer файли - + SLF files SLF файли - + SML files SML файли - + TCX files TCX файли - + + 70mai GPS log files + + + + TwoNav files TwoNav файли - + GPSDump files GPSDump файли - + All files Всі файли @@ -317,29 +322,32 @@ Format - - + + ft фт + mi миля - + + nmi мор.миля - - + + m м - + + km км @@ -347,430 +355,436 @@ GUI - + Quit Вихід - - - + + + Paths Шляхи - - + + Keyboard controls Управління з клавіатури - - + + About GPXSee Про GPXSee - + Open... Відкрити... - + Open directory... Відкрити теку... - + Print... Друк... - + Export to PDF... Експорт до PDF... - + Export to PNG... Експорт до PNG... - + Close Закрити - + Reload Оновити - + Statistics... Статистика... - + Clear list Очистити список - + Load POI file... Завантажити POI файл... - + Select all files Вибрати всі файли - + Unselect all files Скасування виділення всіх файлів - + Overlap POIs Перекривати точки POI - + Show POI icons Показувати піктограми POI - + Show POI labels Показати мітки до точок POI - + Show POIs Відображати точки POI - + Show map Відображати мапу - + Load map... Завантажити мапу... - + Load map directory... Завантажити каталог карт... - + Clear tile cache Очистити кеш-пам’ять - - - + + + Next map Наступна мапа - + Show cursor coordinates Відображати координати курсора - + All Все - + Raster only Лише растр - + Vector only Лише вектор - + Show position Показати позицію - + Follow position Дотримуватися положення - + Show coordinates Показати координати - + Show motion info Показувати інформацію про рух - + Show tracks Відображати треки - + Show routes Відображати маршрути - + Show waypoints Відображати маршрутні точки - + Show areas Відображати області - + Waypoint icons Піктограми точок шляху - + Waypoint labels Підписи маршрутних точок - + Route waypoints Маршрутні точки маршруту - + km/mi markers км/миля позначки - + Do not show Не показувати - + Marker only Лише позначки - + Date/time Дата/час - + Coordinates Координати - + Use styles Використовувати стилі - + Show local DEM tiles Показувати локальні DEM тайли - + Show hillshading Показати затінення пагорба - + Show graphs Відображати графіки - - - + + + Distance Відстань - - - - + + + + Time Час - + Show grid Відображати сітку - + Show slider info Відображати інформацію на повзунку - + Show tabs Показати вкладки - + Show toolbars Відображати панелі інструментів - + Total time Загальний час - - - + + + Moving time Час руху - + Metric Метричні - + Imperial Імперські - + Nautical Морські - + Decimal degrees (DD) Десяткові градуси (DD) - + Degrees and decimal minutes (DMM) Градуси та десяткові мінути (DMM) - + Degrees, minutes, seconds (DMS) Градуси, мінути, секунди (DMS) - + Fullscreen mode Повноекранний режим - + Options... Налаштування... - + Next Наступний - + Previous Попередній - + Last Останній - + First Перший - + &File &Файл - + Open recent Відкрити недавні - + &Map &Мапи - + Layers Шари - + &Graph &Графік - + &POI &Точки POI - + Position Позиція - - + + CRS directory: Каталог CRS: - - + + Symbols directory: Каталог символів: - + Open directory Відкрити теку - - + Error loading geo URI: + + + + + + + Don't show again Більше не показувати - + Clear "%1" tile cache? Очистити кеш тайлів "%1"? - + Download %n DEM tiles? Завантажити %n плитку DEM? @@ -779,300 +793,300 @@ - + &Data &Дані - + Download data DEM Завантажити дані DEM - + Download map DEM Завантажити карту DEM - + Position info Інформація про позицію - + DEM DEM - + &Settings &Налаштування - + Units Одиниці - + Coordinates format Формат координат - + &Help &Допомога - + File Файл - + Show Відобразити - + Navigation Навігація - - + + Version %1 Версія %1 - - + + 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. GPXSee розповсюджується згідно умов ліцензії GNU General Public License version 3. Більше інформації про GPXSee знаходиться на офіційній сторінці проєкту, що доступна за посиланням %1. - + Next file Наступний файл - + Previous file Попередній файл - + First file Перший файл - + Last file Останній файл - + Append file Додати файл - + Next/Previous Наступний/попередній - + Toggle graph type Змінити тип графіка - + Toggle time type Змінити тип часу - + Toggle position info Перемкнути інформацію про позицію - + Previous map Попередня мапа - + Zoom in Збільшити - + Zoom out Зменшити - + Digital zoom Цифровий зум - + Zoom Зум - + Copy coordinates Скопіювати координати - + Left Click Клацання лівою КМ - - + + Map directory: Каталог мап: - - + + POI directory: Каталог POI: - - + + DEM directory: Каталог DEM: - - + + Styles directory: Каталог стилів: - - + + Tile cache directory: Каталог кеша тайлів: - - + + Open file Відкрити файл - + Error loading data file: Помилка завантаження файлу даних: - - + + Line: %1 Строка: %1 - - + + Open POI file Відкрити файл із точками POI - + Error loading POI file: Помилка під час завантаження файлу POI: - - + + Tracks Треки - - + + Routes Маршрути - - + + Waypoints Маршрутні точки - - + + Areas Області - - - - + + + + Date Дата - - - + + + Statistics Статистика - + Name Ім’я - - + + Open map file Відкрити файл мапи - - - - + + + + Error loading map: Помилка завантаження мапи: - + Select map directory Оберіть каталог з картами - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. Перевищено ліміт завантаження плиток DEM. Якщо вам дійсно потрібні дані для такої величезної території, завантажте файли вручну. - + Could not download all required DEM files. Не вдалося завантажити всі необхідні DEM-файли. - + No local DEM tiles found. Не знайдено локальних DEM тайлів. - + No files loaded Файли не завантажені - + %n files %n файл @@ -1141,59 +1155,59 @@ GraphView - + Data not available Дані відсутні - - + + Distance Відстань + - ft фт - + mi миля - + nmi мор.миля - + m м - + km км - + s с - + min хв - + h год - + Time Час @@ -1585,7 +1599,7 @@ - + Graphs Графіки @@ -1670,7 +1684,7 @@ - + s с @@ -1817,7 +1831,7 @@ - + POI Точки POI @@ -1866,7 +1880,7 @@ - + Source Джерело @@ -1876,18 +1890,18 @@ Затінення пагорба - + Plugin: Плагін: - + WYSIWYG WYSIWYG (Візуальний редактор) - + High-Resolution Висока роздільна здатність @@ -1907,92 +1921,92 @@ Освітлення: - + The printed area is approximately the display area. The map zoom level does not change. Область друку є приблизною областю відображення. Рівень масштабування мапи не змінюється. - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. Масштаб буде змінено так, щоби весь зміст (треки/маршрутні точки) вмістився на друковану область, а роздільна здатність мапи була якомога наближеною до роздільної здатності друку. - + Name Ім’я - + Date Дата - + Distance Відстань - + Time Час - + Moving time Час руху - + Item count (>1) Кількість об’єктів (>1) - + Separate graph page Окрема сторінка із графіком - + Print mode Режим друку - + Header Заголовок - + Use OpenGL Використовувати OpenGL - + Enable HTTP/2 Дозволити HTTP/2 - - + + MB МБ - - + + Image cache size: Розмір кешу зображень: - - + + Connection timeout: Час з’єднання вичерпаний: - - + + System Система @@ -2012,68 +2026,68 @@ Проєкція - - + + DEM cache size: Розмір кешу DEM: - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. Оберіть початкові шляхи для діалогових вікон відкриття файлу. Залиште поле порожнім для типових значень. - + Data: Дані: - + Maps: Мапи: - + POI: POI: - + Initial paths Початкові шляхи - + Appearance Зовнішній вигляд - + Maps Мапи - + Data Дані - + DEM DEM - + Position Позиція - + Print & Export Друк та експорт - + Options Налаштування diff --git a/lang/gpxsee_zh_CN.ts b/lang/gpxsee_zh_CN.ts index 880de478..a7130535 100644 --- a/lang/gpxsee_zh_CN.ts +++ b/lang/gpxsee_zh_CN.ts @@ -70,112 +70,117 @@ Data - + Supported files 支持的文件 - + CSV files CSV 文件 - + CUP files CUP 文件 - + FIT files FIT 文件 - + GeoJSON files GeoJSON 文件 - + GPI files GPI 文件 - + GPX files GPX 文件 - + IGC files IGC 文件 - + ITN files ITN 文件 - + JPEG images JPEG 图片 - + KML files KML 文件 - + LOC files LOC 文件 - + NMEA files NMEA 文件 - + ONmove files ONmove 文件 - + OV2 files OV2 文件 - + OziExplorer files OziExplorer 文件 - + SLF files SLF 文件 - + SML files SML 文件 - + TCX files TCX 文件 - + + 70mai GPS log files + + + + TwoNav files TwoNav 文件 - + GPSDump files GPSDump 文件 - + All files 所有文件 @@ -317,29 +322,32 @@ Format - - + + ft ft + mi mi - + + nmi nmi - - + + m m - + + km km @@ -347,730 +355,736 @@ GUI - + Quit 退出 - - - + + + Paths 路径 - - + + Keyboard controls 键盘控制 - - + + About GPXSee 关于 GPXSee - + Open... 打开... - + Open directory... 打开目录... - + Print... 打印... - + Export to PDF... 导出为 PDF... - + Export to PNG... 导出为 PNG... - + Close 关闭 - + Reload 重新加载 - + Statistics... 统计... - + Clear list 清空列表 - + Load POI file... 载入 POI 文件... - + Select all files 选择所有文件 - + Unselect all files 取消选择所有文件 - + Overlap POIs 叠加 POI - + Show POI icons 显示 POI 图标 - + Show POI labels 显示 POI 标签 - + Show POIs 显示 POI - + Show map 显示地图 - + Load map... 载入地图... - + Load map directory... 载入地图目录... - + Clear tile cache 清除瓦片缓存 - - - + + + Next map 下一个地图 - + Show cursor coordinates 显示光标的坐标 - + All 所有图层 - + Raster only 仅栅格层 - + Vector only 仅矢量层 - + Show position 显示位置 - + Follow position 跟随位置 - + Show coordinates 显示坐标 - + Show motion info 显示移动信息 - + Show tracks 显示航迹 - + Show routes 显示航线 - + Show waypoints 显示航点 - + Show areas 显示区域 - + Waypoint icons 航点图标 - + Waypoint labels 航点标签 - + Route waypoints 航线航点 - + km/mi markers km/mi 标记 - + Do not show 不显示 - + Marker only 仅标记 - + Date/time 日期/时间 - + Coordinates 坐标 - + Use styles 使用样式 - + Download data DEM 下载 DEM 数据 - + Download map DEM 下载 DEM 地图 - + Show local DEM tiles 显示本地 DEM 瓦片 - + Show hillshading 显示山体阴影 - + Show graphs 显示图表 - - - + + + Distance 距离 - - - - + + + + Time 时间 - + Show grid 显示网格 - + Show slider info 显示滑块信息 - + Show tabs 显示选项卡 - + Show toolbars 显示工具栏 - + Total time 总时长 - - - + + + Moving time 移动时长 - + Metric 公制 - + Imperial 英制 - + Nautical 航海 - + Decimal degrees (DD) 小数度数 (DD) - + Degrees and decimal minutes (DMM) 度、十进制分 (DMM) - + Degrees, minutes, seconds (DMS) 度、分、秒 (DMS) - + Fullscreen mode 全屏模式 - + Options... 选项... - + Next 下一个 - + Previous 上一个 - + Last 最后一个 - + First 第一个 - + &File 文件(&F) - + Open recent 最近打开文件 - + &Map 地图(&M) - + Layers 图层 - + &Graph 图表(&G) - + &Data 数据(&D) - + Position info 位置信息 - + &POI POI(&P) - + DEM DEM - + Position 位置 - + &Settings 设置(&S) - + Units 单位 - + Coordinates format 坐标格式 - + &Help 帮助(&H) - + File 文件 - + Show 显示 - + Navigation 导航 - - + + Version %1 版本 %1 - - + + 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. GPXSee 依照《GNU 通用公共许可证 v3.0》之条款发布。有关 GPXSee 的详细信息，请访问项目主页 %1 。 - + Next file 下一个文件 - + Previous file 上一个文件 - + First file 第一个文件 - + Last file 最后一个文件 - + Append file 追加文件 - + Next/Previous 下一个/上一个 - + Toggle graph type 切换图表类型 - + Toggle time type 切换时间类型 - + Toggle position info 切换位置信息 - + Previous map 上一个地图 - + Zoom in 放大 - + Zoom out 缩小 - + Digital zoom 数字缩放 - + Zoom 缩放 - + Copy coordinates 复制坐标 - + Left Click 左击 - - + + Map directory: 地图目录： - - + + POI directory: POI 目录： - - + + CRS directory: CRS 目录： - - + + DEM directory: DEM 目录： - - + + Styles directory: 样式目录： - - + + Symbols directory: 符号目录： - - + + Tile cache directory: 瓦片缓存目录： - - + + Open file 打开文件 - + Open directory 打开目录 - + + Error loading geo URI: + + + + Error loading data file: 加载数据文件出错： - - + + Line: %1 行：%1 - - - + + + + Don't show again 不要再次显示 - - + + Open POI file 打开 POI 文件 - + Error loading POI file: 加载POI文件出错： - - + + Tracks 航迹 - - + + Routes 航线 - - + + Waypoints 航点 - - + + Areas 区域 - - - - + + + + Date 日期 - - - + + + Statistics 统计 - + Name 名称 - - + + Open map file 打开地图文件 - - - - + + + + Error loading map: 加载地图出错： - + Select map directory 选择地图目录 - + Clear "%1" tile cache? 清除"%1 "瓦片缓存？ - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. 已超过 DEM 瓦片下载限额。如您确需大量数据，请手动下载。 - + Download %n DEM tiles? 下载 %n DEM 瓦片？ - + Could not download all required DEM files. 无法下载所有需要的 DEM 文件。 - + No local DEM tiles found. 未找到本地 DEM 瓦片。 - + No files loaded 没有加载文件 - + %n files %n 文件 @@ -1137,59 +1151,59 @@ GraphView - + Data not available 数据不可用 - - + + Distance 距离 + - ft ft - + mi mi - + nmi nmi - + m m - + km km - + s s - + min min - + h h - + Time 时间 @@ -1632,7 +1646,7 @@ - + Graphs 图表 @@ -1722,7 +1736,7 @@ - + s s @@ -1763,8 +1777,8 @@ - - + + System 系统 @@ -1845,7 +1859,7 @@ - + POI POI @@ -1894,7 +1908,7 @@ - + Source 源 @@ -1904,18 +1918,18 @@ 山体阴影 - + Plugin: 插件： - + WYSIWYG 所见即所得 - + High-Resolution 高分辨率 @@ -1925,151 +1939,151 @@ 明亮度： - + The printed area is approximately the display area. The map zoom level does not change. 打印区域近似于显示区域。地图的缩放级别不会改变。 - + The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution. 缩放级别将被改变以使整个内容（航迹/航点）适应打印区域，并且地图分辨率尽可能接近打印分辨率。 - + Name 名称 - + Date 日期 - + Distance 距离 - + Time 时间 - + Moving time 移动时长 - + Item count (>1) 项目数(>1) - + Separate graph page 单独图表页 - + Print mode 打印模式 - + Header 页眉 - + Use OpenGL 启用 OpenGL - + Enable HTTP/2 启用 HTTP/2 - - + + MB MB - - + + Image cache size: 图像缓存大小： - - + + Connection timeout: 连接超时： - - + + DEM cache size: DEM 缓存大小： - + Select the initial paths of the file open dialogues. Leave the field empty for the system default. 为文件打开对话框设置初始路径。留空则为系统默认。 - + Data: 数据： - + Maps: 地图： - + POI: POI： - + Initial paths 初始路径 - + Appearance 外观 - + Maps 地图 - + Data 数据 - + DEM DEM - + Position 位置 - + Print & Export 打印 & 导出 - + Options 选项 From 60fd7fb7c3d8c2133e793d8c8837356ec572f121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Tue, 25 Feb 2025 21:14:55 +0100 Subject: [PATCH 10/31] Czech translation update --- lang/gpxsee_cs.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/gpxsee_cs.ts b/lang/gpxsee_cs.ts index 04f5b052..67438fe1 100644 --- a/lang/gpxsee_cs.ts +++ b/lang/gpxsee_cs.ts @@ -167,7 +167,7 @@ 70mai GPS log files - + GPS logy z kamer 70mai @@ -832,7 +832,7 @@ Error loading geo URI: - + geo URI nelze načíst: From 5d1ba90f09398506433d62765b75b9424cbd93fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Tue, 25 Feb 2025 21:15:16 +0100 Subject: [PATCH 11/31] German translation update --- lang/gpxsee_de.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/gpxsee_de.ts b/lang/gpxsee_de.ts index d12cd68d..c2afb215 100644 --- a/lang/gpxsee_de.ts +++ b/lang/gpxsee_de.ts @@ -167,7 +167,7 @@ 70mai GPS log files - + 70mai GPS-Logdateien @@ -844,7 +844,7 @@ Error loading geo URI: - + Fehler beim Laden der Geo-URI: From 451782ce2004871332662d0a7491c86eea08c9ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 26 Feb 2025 07:44:33 +0100 Subject: [PATCH 12/31] Be more strict when parsing the TXT files --- src/data/txtparser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/txtparser.cpp b/src/data/txtparser.cpp index f953d162..782a3e0f 100644 --- a/src/data/txtparser.cpp +++ b/src/data/txtparser.cpp @@ -40,14 +40,14 @@ bool TXTParser::parse(QFile *file, QList &tracks, _errorLine = csv.line() - 1; return false; } - } else if (entry.size() == 13) { + } else { if (!sg) { _errorString = "Missing start marker"; _errorLine = csv.line() - 1; return false; } - if (entry.at(1) == "A") { + if (entry.size() == 13 && entry.at(1) == "A") { Coordinates c(coordinates(entry)); if (!c.isValid()) { _errorString = "Invalid coordinates"; From 2808768f130aaf87e3284402b5be219faaaa0201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 26 Feb 2025 07:49:41 +0100 Subject: [PATCH 13/31] Added 70mai GPS log files support info --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d61d3706..2a120cf3 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ GPS log file formats. ## Features * Opens GPX, TCX, FIT, KML, NMEA, IGC, CUP, SIGMA SLF, Suunto SML, LOC, GeoJSON, OziExplorer (PLT, RTE, WPT), Garmin GPI&CSV, TomTom OV2&ITN, ONmove OMD/GHP, - TwoNav (TRK, RTE, WPT), GPSDump WPT and geotagged JPEG files. + TwoNav (TRK, RTE, WPT), GPSDump WPT, 70mai GPS logs and geotagged JPEG files. * Opens geo URIs (RFC 5870). * User-definable online maps (OpenStreetMap/Google tiles, WMTS, WMS, TMS, QuadTiles). From 39edcd4a1e1d884278ac4bfec9f3dd27a027510c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85ke=20Engelbrektson?= Date: Wed, 26 Feb 2025 07:35:42 +0000 Subject: [PATCH 14/31] Translated using Weblate (Swedish) Currently translated at 100.0% (490 of 490 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/ --- lang/gpxsee_sv.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/gpxsee_sv.ts b/lang/gpxsee_sv.ts index dd771f26..ef726069 100644 --- a/lang/gpxsee_sv.ts +++ b/lang/gpxsee_sv.ts @@ -167,7 +167,7 @@ 70mai GPS log files - + 70mai GPS-loggfiler @@ -844,7 +844,7 @@ Error loading geo URI: - + Kunde inte läsa in geo-URI: From 1f81d867d5822d14c5c8255fe6b914b28214c658 Mon Sep 17 00:00:00 2001 From: Cloud Esp Date: Wed, 26 Feb 2025 10:43:17 +0000 Subject: [PATCH 15/31] Translated using Weblate (French) Currently translated at 100.0% (490 of 490 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fr/ --- lang/gpxsee_fr.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/gpxsee_fr.ts b/lang/gpxsee_fr.ts index 437b82be..79c1218b 100644 --- a/lang/gpxsee_fr.ts +++ b/lang/gpxsee_fr.ts @@ -167,7 +167,7 @@ 70mai GPS log files - + Fichiers de journalisation GPS 70mai @@ -844,7 +844,7 @@ Error loading geo URI: - + Erreur de chargement de l'URI géo : From cee53eab90d0f2b18ac3ab7c0260790aaab17bec Mon Sep 17 00:00:00 2001 From: 99 efi Date: Thu, 27 Feb 2025 14:35:24 +0000 Subject: [PATCH 16/31] Translated using Weblate (Hungarian) Currently translated at 100.0% (490 of 490 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/ --- lang/gpxsee_hu.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/gpxsee_hu.ts b/lang/gpxsee_hu.ts index 4545b015..f7ab24f8 100644 --- a/lang/gpxsee_hu.ts +++ b/lang/gpxsee_hu.ts @@ -167,7 +167,7 @@ 70mai GPS log files - + 70mai GPS naplófájlok @@ -768,7 +768,7 @@ Error loading geo URI: - + Hiba a geo URI betöltésekor: From 792ede2a961465b476ed3e7203eec5ef942fd6ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sat, 1 Mar 2025 09:49:33 +0100 Subject: [PATCH 17/31] Code cleanup --- src/map/ENC/iso8211.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/map/ENC/iso8211.cpp b/src/map/ENC/iso8211.cpp index 1ae28bc8..d7063e99 100644 --- a/src/map/ENC/iso8211.cpp +++ b/src/map/ENC/iso8211.cpp @@ -142,12 +142,11 @@ int ISO8211::readDR(QVector &fields) bool ISO8211::readDDA(const FieldDefinition &def, SubFields &fields) { static QRegularExpression re("(\\d*)(\\w+)\\(*(\\d*)\\)*"); - QByteArray ba; + QByteArray ba(def.size, Qt::Initialization::Uninitialized); bool repeat = false; QVector defs; QVector defTags; - ba.resize(def.size); if (!(_file.seek(def.pos) && _file.read(ba.data(), ba.size()) == ba.size())) return false; @@ -236,9 +235,8 @@ bool ISO8211::readDDR() bool ISO8211::readUDA(quint64 pos, const FieldDefinition &def, const QVector &fields, bool repeat, Data &data) { - QByteArray ba; + QByteArray ba(def.size, Qt::Initialization::Uninitialized); - ba.resize(def.size); if (!(_file.seek(pos + def.pos) && _file.read(ba.data(), ba.size()) == ba.size())) return false; @@ -248,8 +246,7 @@ bool ISO8211::readUDA(quint64 pos, const FieldDefinition &def, const char *ep = ba.constData() + ba.size() - 1; do { - QVector row; - row.resize(fields.size()); + QVector row(fields.size()); for (int i = 0; i < fields.size(); i++) { const SubFieldDefinition &f = fields.at(i); From 7cf957a48d3965417b9834cd224aaedfd8959167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sun, 2 Mar 2025 07:58:23 +0100 Subject: [PATCH 18/31] Cosmetics --- src/data/kmlparser.cpp | 2 +- src/map/ENC/iso8211.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/kmlparser.cpp b/src/data/kmlparser.cpp index c5d39acc..d6aa18dd 100644 --- a/src/data/kmlparser.cpp +++ b/src/data/kmlparser.cpp @@ -541,7 +541,7 @@ void KMLParser::photoOverlay(const Ctx &ctx, QVector &waypoints, Waypoint w; QMap unused; QMap unused2; - static QRegularExpression re("\\$\\[[^\\]]+\\]"); + static const QRegularExpression re("\\$\\[[^\\]]+\\]"); while (_reader.readNextStartElement()) { if (_reader.name() == QLatin1String("name")) diff --git a/src/map/ENC/iso8211.cpp b/src/map/ENC/iso8211.cpp index d7063e99..46f86582 100644 --- a/src/map/ENC/iso8211.cpp +++ b/src/map/ENC/iso8211.cpp @@ -141,7 +141,7 @@ int ISO8211::readDR(QVector &fields) bool ISO8211::readDDA(const FieldDefinition &def, SubFields &fields) { - static QRegularExpression re("(\\d*)(\\w+)\\(*(\\d*)\\)*"); + static const QRegularExpression re("(\\d*)(\\w+)\\(*(\\d*)\\)*"); QByteArray ba(def.size, Qt::Initialization::Uninitialized); bool repeat = false; QVector defs; From 6c80d89c89951d3c53bc5804c8f048c541dc313b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sun, 2 Mar 2025 08:39:22 +0100 Subject: [PATCH 19/31] Distinguish white/yellow lights on ENC charts --- src/map/ENC/style.cpp | 3 +++ src/map/ENC/style.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp index bf09ac79..6d052e63 100644 --- a/src/map/ENC/style.cpp +++ b/src/map/ENC/style.cpp @@ -482,6 +482,7 @@ Style::Style(qreal ratio) _lightRed = QImage(":/marine/light-red.png"); _lightGreen = QImage(":/marine/light-green.png"); _lightYellow = QImage(":/marine/light-yellow.png"); + _lightWhite = QImage(":/marine/light-white.png"); _lightOffset = QPoint(11, 11); _signal = QImage(":/marine/fog-signal.png"); _signalOffset = QPoint(-9, 9); @@ -541,6 +542,7 @@ const QImage *Style::light(Color color) const case Green: return &_lightGreen; case White: + return &_lightWhite; case Yellow: case Amber: case Orange: @@ -558,6 +560,7 @@ QColor Style::color(Style::Color c) case Green: return Qt::green; case White: + return Qt::white; case Yellow: case Amber: case Orange: diff --git a/src/map/ENC/style.h b/src/map/ENC/style.h index 9d6edf7c..cf8d78b6 100644 --- a/src/map/ENC/style.h +++ b/src/map/ENC/style.h @@ -121,7 +121,7 @@ private: /* Fonts and images must be initialized after QGuiApplication! */ QFont _small, _normal, _large; - QImage _light, _lightRed, _lightGreen, _lightYellow, _signal; + QImage _light, _lightRed, _lightGreen, _lightYellow, _lightWhite, _signal; QPoint _lightOffset, _signalOffset; }; From a3f1d25d63f9ee7947429de67bea2719a4b35564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sun, 2 Mar 2025 17:44:04 +0100 Subject: [PATCH 20/31] Improved ENC fishing farms rendering --- gpxsee.qrc | 1 + icons/map/marine/fishing-farm.png | Bin 0 -> 269 bytes src/map/ENC/mapdata.cpp | 2 ++ src/map/ENC/style.cpp | 6 +++++- 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 icons/map/marine/fishing-farm.png diff --git a/gpxsee.qrc b/gpxsee.qrc index 1708da6f..fd883090 100644 --- a/gpxsee.qrc +++ b/gpxsee.qrc @@ -216,6 +216,7 @@ icons/map/marine/tanker-anchorage.png icons/map/marine/nature-reserve-line.png icons/map/marine/sanctuary-line.png + icons/map/marine/fishing-farm.png diff --git a/icons/map/marine/fishing-farm.png b/icons/map/marine/fishing-farm.png new file mode 100644 index 0000000000000000000000000000000000000000..b348c37db4c35a6d098094ca86c8404c0d7ea9bd GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^q98U08<2FHq?!Pv*pj^6T^I})7BEP2*H146if|Tq zL>2>8T?b)CCym(^K*6=1E{-7GR@ zYkf959#rAhZhe{abB3h4+a*KiNsJC>YP*xqYb#{FV3=elA}u>Nq0oC;aN-8m30+tG zF7X~vzQ#B8S+R^+^c1H|rONe2x;Inn-Fw{dseJ*1}0` zN1YihJgxL(R%q@$xkZM9A#?J&NoVeU5A;pB@n!Mr$L~3RAHQGE)O#;|)1!h8MWDkO NJYD@<);T3K0RUv-V$T2o literal 0 HcmV?d00001 diff --git a/src/map/ENC/mapdata.cpp b/src/map/ENC/mapdata.cpp index ad46b72a..775dee72 100644 --- a/src/map/ENC/mapdata.cpp +++ b/src/map/ENC/mapdata.cpp @@ -362,6 +362,8 @@ MapData::Point::Point(uint type, const Coordinates &c, const Attributes &attr, subtype = CATACH; else if (type == I_ACHARE) subtype = I_CATACH; + else if (type == MARKUL) + subtype = CATMFA; QList list(_attr.value(subtype).split(',')); std::sort(list.begin(), list.end()); diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp index 6d052e63..011aaafe 100644 --- a/src/map/ENC/style.cpp +++ b/src/map/ENC/style.cpp @@ -141,6 +141,7 @@ void Style::polygonStyle() 1.5, Qt::DashLine)); _polygons[TYPE(CBLARE)] = Polygon(QImage(":/marine/cable-area-line.png")); _polygons[TYPE(PIPARE)] = Polygon(QImage(":/marine/pipeline-area-line.png")); + _polygons[SUBTYPE(MARKUL, 0)] = Polygon(QImage(":/marine/fishing-farm-line.png")); _polygons[SUBTYPE(MARKUL, 3)] = Polygon(QImage(":/marine/fishing-farm-line.png")); _polygons[TYPE(BERTHS)] = Polygon(Qt::NoBrush, QPen(QColor(0xeb, 0x49, 0xeb), 1, Qt::DashLine)); @@ -180,7 +181,8 @@ void Style::polygonStyle() << SUBTYPE(RESARE, 17) << SUBTYPE(I_RESARE, 17) << SUBTYPE(RESARE, 22) << SUBTYPE(I_RESARE, 22) << SUBTYPE(RESARE, 23) << SUBTYPE(I_RESARE, 23) << SUBTYPE(RESARE, 1) << TYPE(CBLARE) << TYPE(PIPARE) << TYPE(PRCARE) - << TYPE(I_TRNBSN) << SUBTYPE(MARKUL, 3) << TYPE(CONZNE); + << TYPE(I_TRNBSN) << SUBTYPE(MARKUL, 0) << SUBTYPE(MARKUL, 3) + << TYPE(CONZNE); } void Style::lineStyle(qreal ratio) @@ -393,6 +395,8 @@ void Style::pointStyle(qreal ratio) _points[TYPE(LNDARE)].setHaloColor(QColor()); _points[TYPE(LNDRGN)].setHaloColor(QColor()); _points[TYPE(RADRFL)] = Point(QImage(":/marine/radar-reflector.png")); + _points[SUBTYPE(MARKUL, 0)] = Point(QImage(":/marine/fishing-farm.png")); + _points[SUBTYPE(MARKUL, 3)] = Point(QImage(":/marine/fishing-farm.png")); _points[SUBTYPE(I_BERTHS, 6)] = Point(QImage(":/marine/fleeting-area.png"), Small); From 4121c99e5623fae0c664bdcba03aa5aaee8f0a6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bora=20At=C4=B1c=C4=B1?= Date: Mon, 3 Mar 2025 03:32:00 +0100 Subject: [PATCH 21/31] Translated using Weblate (Turkish) Currently translated at 100.0% (490 of 490 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/tr/ --- lang/gpxsee_tr.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/gpxsee_tr.ts b/lang/gpxsee_tr.ts index 36185b9f..be0e80ca 100644 --- a/lang/gpxsee_tr.ts +++ b/lang/gpxsee_tr.ts @@ -167,7 +167,7 @@ 70mai GPS log files - + 70mai GPS kayıt dosyaları @@ -768,7 +768,7 @@ Error loading geo URI: - + GEO URI yükleme hatası: From 4eec328dbf7ff69776cd989596efa9f45dff68e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Mon, 3 Mar 2025 21:43:39 +0100 Subject: [PATCH 22/31] Cosmetics --- src/common/rectc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/rectc.h b/src/common/rectc.h index 5b608c1e..79a05db8 100644 --- a/src/common/rectc.h +++ b/src/common/rectc.h @@ -53,7 +53,7 @@ public: bool intersects(const RectC &r) const {return (right() >= r.left() && bottom() <= r.top() && left() <= r.right() && top() >= r.bottom());} - bool contains(const Coordinates&c) const + bool contains(const Coordinates &c) const {return (c.lon() >= left() && c.lon() <= right() && c.lat() <= top() && c.lat() >= bottom());} From 66693cd5c9697ca0923f85d82be59e4f39c0a717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Mon, 3 Mar 2025 21:44:08 +0100 Subject: [PATCH 23/31] Added missing const specifier --- src/common/rtree.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/rtree.h b/src/common/rtree.h index 50e25f2a..40876307 100644 --- a/src/common/rtree.h +++ b/src/common/rtree.h @@ -115,7 +115,7 @@ public: /// Count the data elements in this container. This is slow as no internal /// counter is maintained. - int Count(); + int Count() const; /// Iterator is not remove safe. @@ -363,7 +363,7 @@ protected: void* a_context) const; void RemoveAllRec(Node* a_node); void Reset(); - void CountRec(Node* a_node, int& a_count); + void CountRec(Node* a_node, int& a_count) const; /// Root of tree Node* m_root; @@ -473,7 +473,7 @@ int RTREE_QUAL::Search(const ELEMTYPE a_min[NUMDIMS], const ELEMTYPE a_max[NUMDI RTREE_TEMPLATE -int RTREE_QUAL::Count() +int RTREE_QUAL::Count() const { int count = 0; CountRec(m_root, count); @@ -483,7 +483,7 @@ int RTREE_QUAL::Count() RTREE_TEMPLATE -void RTREE_QUAL::CountRec(Node* a_node, int& a_count) +void RTREE_QUAL::CountRec(Node* a_node, int& a_count) const { if (a_node->IsInternalNode()) { // not a leaf node for (int index = 0; index < a_node->m_count; ++index) From 2595926b7fd7b5154b1e146f7a174637cf4fd4d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Thu, 6 Mar 2025 07:55:01 +0100 Subject: [PATCH 24/31] Overlay two consecutive layers when drawing ENC atlases --- gpxsee.pro | 1 + src/map/ENC/atlasdata.cpp | 9 +-- src/map/ENC/atlasdata.h | 8 +-- src/map/ENC/data.h | 79 +++++++++++++++++++++++++ src/map/ENC/mapdata.cpp | 12 +--- src/map/ENC/mapdata.h | 73 ++--------------------- src/map/ENC/rastertile.cpp | 118 +++++++++++++++++-------------------- src/map/ENC/rastertile.h | 41 ++++++------- src/map/ENC/style.cpp | 27 ++++----- src/map/encatlas.cpp | 16 ++++- src/map/encatlas.h | 1 + src/map/encmap.cpp | 2 +- 12 files changed, 198 insertions(+), 189 deletions(-) create mode 100644 src/map/ENC/data.h diff --git a/gpxsee.pro b/gpxsee.pro index 98055ee1..be04573e 100644 --- a/gpxsee.pro +++ b/gpxsee.pro @@ -118,6 +118,7 @@ HEADERS += src/common/config.h \ src/data/style.h \ src/data/twonavparser.h \ src/data/txtparser.h \ + src/map/ENC/data.h \ src/map/IMG/light.h \ src/map/downloader.h \ src/map/demloader.h \ diff --git a/src/map/ENC/atlasdata.cpp b/src/map/ENC/atlasdata.cpp index 6e31ae66..13e5cb2f 100644 --- a/src/map/ENC/atlasdata.cpp +++ b/src/map/ENC/atlasdata.cpp @@ -39,15 +39,12 @@ bool AtlasData::polyCb(MapEntry *map, void *context) ctx->cacheLock.unlock(); MapData *data = new MapData(map->path); - data->polygons(ctx->rect, ctx->polygons); - data->lines(ctx->rect, ctx->lines); + data->polys(ctx->rect, ctx->polygons, ctx->lines); ctx->cacheLock.lock(); ctx->cache.insert(map->path, data); - } else { - cached->polygons(ctx->rect, ctx->polygons); - cached->lines(ctx->rect, ctx->lines); - } + } else + cached->polys(ctx->rect, ctx->polygons, ctx->lines); ctx->cacheLock.unlock(); map->lock.unlock(); diff --git a/src/map/ENC/atlasdata.h b/src/map/ENC/atlasdata.h index 786fa51c..e2ca8908 100644 --- a/src/map/ENC/atlasdata.h +++ b/src/map/ENC/atlasdata.h @@ -10,18 +10,18 @@ namespace ENC { typedef QCache MapCache; -class AtlasData +class AtlasData : public Data { public: AtlasData(MapCache &cache, QMutex &cacheLock) : _cache(cache), _cacheLock(cacheLock) {} - ~AtlasData(); + virtual ~AtlasData(); void addMap(const RectC &bounds, const QString &path); - void polys(const RectC &rect, QList *polygons, + virtual void polys(const RectC &rect, QList *polygons, QList *lines); - void points(const RectC &rect, QList *points); + virtual void points(const RectC &rect, QList *points); private: struct MapEntry { diff --git a/src/map/ENC/data.h b/src/map/ENC/data.h new file mode 100644 index 00000000..a620cdac --- /dev/null +++ b/src/map/ENC/data.h @@ -0,0 +1,79 @@ +#ifndef ENC_DATA_H +#define ENC_DATA_H + +#include "common/rectc.h" +#include "common/polygon.h" + +namespace ENC { + +class Data +{ +public: + typedef QMap Attributes; + + class Poly { + public: + Poly(uint type, const Polygon &path, const Attributes &attr, uint HUNI); + + RectC bounds() const {return _path.boundingRect();} + const Polygon &path() const {return _path;} + uint type() const {return _type;} + const Attributes &attributes() const {return _attr;} + uint HUNI() const {return _HUNI;} + + private: + uint _type; + Polygon _path; + Attributes _attr; + uint _HUNI; + }; + + class Line { + public: + Line(uint type, const QVector &path, const Attributes &attr); + + RectC bounds() const; + const QVector &path() const {return _path;} + uint type() const {return _type;} + const QString &label() const {return _label;} + const Attributes &attributes() const {return _attr;} + + private: + uint _type; + QVector _path; + QString _label; + Attributes _attr; + }; + + class Point { + public: + Point(uint type, const Coordinates &c, const Attributes &attr, + uint HUNI, bool polygon = false); + Point(uint type, const Coordinates &s, const QString &label); + + const Coordinates &pos() const {return _pos;} + uint type() const {return _type;} + const QString &label() const {return _label;} + const Attributes &attributes() const {return _attr;} + bool polygon() const {return _polygon;} + + bool operator<(const Point &other) const + {return _id < other._id;} + + private: + uint _type; + Coordinates _pos; + QString _label; + quint64 _id; + Attributes _attr; + bool _polygon; + }; + + virtual void polys(const RectC &rect, QList *polygons, + QList *lines) = 0; + virtual void points(const RectC &rect, QList *points) = 0; +}; + +} + +#endif // ENC_DATA_H diff --git a/src/map/ENC/mapdata.cpp b/src/map/ENC/mapdata.cpp index 775dee72..fad38bc4 100644 --- a/src/map/ENC/mapdata.cpp +++ b/src/map/ENC/mapdata.cpp @@ -866,7 +866,7 @@ MapData::~MapData() delete _points.GetAt(pit); } -void MapData::points(const RectC &rect, QList *points) const +void MapData::points(const RectC &rect, QList *points) { double min[2], max[2]; @@ -876,18 +876,12 @@ void MapData::points(const RectC &rect, QList *points) const _lines.Search(min, max, linePointCb, points); } -void MapData::lines(const RectC &rect, QList *lines) const +void MapData::polys(const RectC &rect, QList *polygons, + QList *lines) { double min[2], max[2]; rectcBounds(rect, min, max); _lines.Search(min, max, lineCb, lines); -} - -void MapData::polygons(const RectC &rect, QList *polygons) const -{ - double min[2], max[2]; - - rectcBounds(rect, min, max); _areas.Search(min, max, polygonCb, polygons); } diff --git a/src/map/ENC/mapdata.h b/src/map/ENC/mapdata.h index 74de79bb..a767c790 100644 --- a/src/map/ENC/mapdata.h +++ b/src/map/ENC/mapdata.h @@ -1,82 +1,21 @@ #ifndef ENC_MAPDATA_H #define ENC_MAPDATA_H -#include "common/rectc.h" #include "common/rtree.h" -#include "common/polygon.h" #include "iso8211.h" +#include "data.h" namespace ENC { -class MapData +class MapData : public Data { public: - typedef QMap Attributes; - - class Poly { - public: - Poly(uint type, const Polygon &path, const Attributes &attr, uint HUNI); - - RectC bounds() const {return _path.boundingRect();} - const Polygon &path() const {return _path;} - uint type() const {return _type;} - const Attributes &attributes() const {return _attr;} - uint HUNI() const {return _HUNI;} - - private: - uint _type; - Polygon _path; - Attributes _attr; - uint _HUNI; - }; - - class Line { - public: - Line(uint type, const QVector &path, const Attributes &attr); - - RectC bounds() const; - const QVector &path() const {return _path;} - uint type() const {return _type;} - const QString &label() const {return _label;} - const Attributes &attributes() const {return _attr;} - - private: - uint _type; - QVector _path; - QString _label; - Attributes _attr; - }; - - class Point { - public: - Point(uint type, const Coordinates &c, const Attributes &attr, - uint HUNI, bool polygon = false); - Point(uint type, const Coordinates &s, const QString &label); - - const Coordinates &pos() const {return _pos;} - uint type() const {return _type;} - const QString &label() const {return _label;} - const Attributes &attributes() const {return _attr;} - bool polygon() const {return _polygon;} - - bool operator<(const Point &other) const - {return _id < other._id;} - - private: - uint _type; - Coordinates _pos; - QString _label; - quint64 _id; - Attributes _attr; - bool _polygon; - }; - MapData(const QString &path); - ~MapData(); + virtual ~MapData(); - void polygons(const RectC &rect, QList *polygons) const; - void lines(const RectC &rect, QList *lines) const; - void points(const RectC &rect, QList *points) const; + virtual void polys(const RectC &rect, QList *polygons, + QList *lines); + virtual void points(const RectC &rect, QList *points); private: struct Sounding { diff --git a/src/map/ENC/rastertile.cpp b/src/map/ENC/rastertile.cpp index 2bc5668b..2788bb9e 100644 --- a/src/map/ENC/rastertile.cpp +++ b/src/map/ENC/rastertile.cpp @@ -28,14 +28,14 @@ static double angle(uint type, const QVariant ¶m) ? 90 + param.toDouble() : NAN; } -static bool showLabel(const QImage *img, const Range &range, int zoom, int type) +bool RasterTile::showLabel(const QImage *img, int type) const { if (type>>16 == I_DISMAR) return true; - int limit = (!range.size()) - ? range.min() : range.min() + (range.size() + 1) / 2; - if ((img || (type>>16 == SOUNDG)) && (zoom < limit)) + int limit = (!_zoomRange.size()) + ? _zoomRange.min() : _zoomRange.min() + (_zoomRange.size() + 1) / 2; + if ((img || (type>>16 == SOUNDG)) && (_zoom < limit)) return false; return true; @@ -139,10 +139,10 @@ static void drawArrow(QPainter *painter, const QPolygonF &polygon, uint type) } void RasterTile::drawArrows(QPainter *painter, - const QList &points) const + const QList &points) const { for (int i = 0; i < points.size(); i++) { - const MapData::Point &point = points.at(i); + const Data::Point &point = points.at(i); if (point.type()>>16 == TSSLPT || point.type()>>16 == RCTLPT) { QPolygonF polygon(tsslptArrow(ll2xy(point.pos()), @@ -153,11 +153,11 @@ void RasterTile::drawArrows(QPainter *painter, } void RasterTile::drawPolygons(QPainter *painter, - const QList &polygons) const + const QList &polygons) const { for (int n = 0; n < _style->drawOrder().size(); n++) { for (int i = 0; i < polygons.size(); i++) { - const MapData::Poly &poly = polygons.at(i); + const Data::Poly &poly = polygons.at(i); if (poly.type() != _style->drawOrder().at(n)) continue; const Style::Polygon &style = _style->polygon(poly.type()); @@ -185,12 +185,12 @@ void RasterTile::drawPolygons(QPainter *painter, } } -void RasterTile::drawLines(QPainter *painter, const QList &lines) const +void RasterTile::drawLines(QPainter *painter, const QList &lines) const { painter->setBrush(Qt::NoBrush); for (int i = 0; i < lines.size(); i++) { - const MapData::Line &line = lines.at(i); + const Data::Line &line = lines.at(i); const Style::Line &style = _style->line(line.type()); if (!style.img().isNull()) { @@ -257,9 +257,9 @@ void RasterTile::drawSectorLights(QPainter *painter, } } -void RasterTile::processPoints(QList &points, +void RasterTile::processPoints(QList &points, QList &textItems, QList &lights, - QList §orLights) + QList §orLights, bool overZoom) { LightMap lightsMap; SignalSet signalsSet; @@ -270,10 +270,10 @@ void RasterTile::processPoints(QList &points, /* Lights & Signals */ for (i = 0; i < points.size(); i++) { - const MapData::Point &point = points.at(i); + const Data::Point &point = points.at(i); if (point.type()>>16 == LIGHTS) { - const MapData::Attributes &attr = point.attributes(); + const Data::Attributes &attr = point.attributes(); Style::Color color = (Style::Color)(attr.value(COLOUR).toUInt()); double range = attr.value(VALNMR).toDouble(); @@ -293,13 +293,13 @@ void RasterTile::processPoints(QList &points, /* Everything else */ for ( ; i < points.size(); i++) { - const MapData::Point &point = points.at(i); + const Data::Point &point = points.at(i); QPoint pos(ll2xy(point.pos()).toPoint()); const Style::Point &style = _style->point(point.type()); const QString *label = point.label().isEmpty() ? 0 : &(point.label()); const QImage *img = style.img().isNull() ? 0 : &style.img(); - const QFont *fnt = showLabel(img, _zoomRange, _zoom, point.type()) + const QFont *fnt = (overZoom || showLabel(img, point.type())) ? _style->font(style.textFontSize()) : 0; const QColor *color = &style.textColor(); const QColor *hColor = style.haloColor().isValid() @@ -327,11 +327,11 @@ void RasterTile::processPoints(QList &points, } } -void RasterTile::processLines(const QList &lines, +void RasterTile::processLines(const QList &lines, QList &textItems) { for (int i = 0; i < lines.size(); i++) { - const MapData::Line &line = lines.at(i); + const Data::Line &line = lines.at(i); const Style::Line &style = _style->line(line.type()); if (style.img().isNull() && style.pen() == Qt::NoPen) @@ -351,11 +351,20 @@ void RasterTile::processLines(const QList &lines, } } -void RasterTile::fetchData(QList &polygons, - QList &lines, QList &points) +void RasterTile::render() { - QPoint ttl(_rect.topLeft()); + QImage img(_rect.width() * _ratio, _rect.height() * _ratio, + QImage::Format_ARGB32_Premultiplied); + img.setDevicePixelRatio(_ratio); + img.fill(Qt::transparent); + + QPainter painter(&img); + painter.setRenderHint(QPainter::SmoothPixmapTransform); + painter.setRenderHint(QPainter::Antialiasing); + painter.translate(-_rect.x(), -_rect.y()); + + QPoint ttl(_rect.topLeft()); QRectF polyRect(ttl, QPointF(ttl.x() + _rect.width(), ttl.y() + _rect.height())); RectD polyRectD(_transform.img2proj(polyRect.topLeft()), @@ -368,50 +377,31 @@ void RasterTile::fetchData(QList &polygons, _transform.img2proj(pointRect.bottomRight())); RectC pointRectC(pointRectD.toRectC(_proj, 20)); - if (_map) { - _map->lines(polyRectC, &lines); - _map->polygons(polyRectC, &polygons); - _map->points(pointRectC, &points); - } else { - _atlas->polys(polyRectC, &polygons, &lines); - _atlas->points(pointRectC, &points); + for (int i = 0; i < _data.size(); i++) { + QList lines; + QList polygons; + QList points; + QList textItems, lights; + QList sectorLights; + + _data.at(i)->polys(polyRectC, &polygons, &lines); + _data.at(i)->points(pointRectC, &points); + + processPoints(points, textItems, lights, sectorLights, + _data.size() > 1 && i == 0); + processLines(lines, textItems); + + drawPolygons(&painter, polygons); + drawLines(&painter, lines); + drawArrows(&painter, points); + + drawTextItems(&painter, lights); + drawSectorLights(&painter, sectorLights); + drawTextItems(&painter, textItems); + + qDeleteAll(textItems); + qDeleteAll(lights); } -} - -void RasterTile::render() -{ - QImage img(_rect.width() * _ratio, _rect.height() * _ratio, - QImage::Format_ARGB32_Premultiplied); - QList lines; - QList polygons; - QList points; - QList textItems, lights; - QList sectorLights; - - img.setDevicePixelRatio(_ratio); - img.fill(Qt::transparent); - - fetchData(polygons, lines, points); - - processPoints(points, textItems, lights, sectorLights); - processLines(lines, textItems); - - QPainter painter(&img); - painter.setRenderHint(QPainter::SmoothPixmapTransform); - painter.setRenderHint(QPainter::Antialiasing); - painter.translate(-_rect.x(), -_rect.y()); - - drawPolygons(&painter, polygons); - drawLines(&painter, lines); - drawArrows(&painter, points); - - - drawTextItems(&painter, lights); - drawSectorLights(&painter, sectorLights); - drawTextItems(&painter, textItems); - - qDeleteAll(textItems); - qDeleteAll(lights); //painter.setPen(Qt::red); //painter.setBrush(Qt::NoBrush); diff --git a/src/map/ENC/rastertile.h b/src/map/ENC/rastertile.h index 259ca72b..9ca53107 100644 --- a/src/map/ENC/rastertile.h +++ b/src/map/ENC/rastertile.h @@ -5,7 +5,7 @@ #include "common/range.h" #include "map/projection.h" #include "map/transform.h" -#include "mapdata.h" +#include "data.h" #include "style.h" #include "atlasdata.h" @@ -17,14 +17,17 @@ class RasterTile { public: RasterTile(const Projection &proj, const Transform &transform, - const Style *style, const MapData *data, int zoom, const Range &zoomRange, - const QRect &rect, qreal ratio) : - _proj(proj), _transform(transform), _style(style), _map(data), _atlas(0), - _zoom(zoom), _zoomRange(zoomRange), _rect(rect), _ratio(ratio) {} + const Style *style, Data *data, int zoom, + const Range &zoomRange, const QRect &rect, qreal ratio) : + _proj(proj), _transform(transform), _style(style), + _zoom(zoom), _zoomRange(zoomRange), _rect(rect), _ratio(ratio) + { + _data.append(data); + } RasterTile(const Projection &proj, const Transform &transform, - const Style *style, AtlasData *data, int zoom, const Range &zoomRange, - const QRect &rect, qreal ratio) : - _proj(proj), _transform(transform), _style(style), _map(0), _atlas(data), + const Style *style, const QList &data, int zoom, + const Range &zoomRange, const QRect &rect, qreal ratio) : + _proj(proj), _transform(transform), _style(style), _data(data), _zoom(zoom), _zoomRange(zoomRange), _rect(rect), _ratio(ratio) {} int zoom() const {return _zoom;} @@ -51,8 +54,6 @@ private: typedef QMap LightMap; typedef QSet SignalSet; - void fetchData(QList &polygons, QList &lines, - QList &points); QPointF ll2xy(const Coordinates &c) const {return _transform.proj2img(_proj.ll2xy(c));} QPainterPath painterPath(const Polygon &polygon) const; @@ -60,25 +61,21 @@ private: QVector polylineM(const QVector &path) const; QPolygonF tsslptArrow(const QPointF &p, qreal angle) const; QPointF centroid(const QVector &polygon) const; - void processPoints(QList &points, + void processPoints(QList &points, QList &textItems, QList &lights, - QList §orLights); - void processLines(const QList &lines, - QList &textItems); - void drawArrows(QPainter *painter, const QList &points) const; - void drawPolygons(QPainter *painter, const QList &polygons) const; - void drawLines(QPainter *painter, const QList &lines) const; + QList §orLights, bool overZoom); + void processLines(const QList &lines, QList &textItems); + void drawArrows(QPainter *painter, const QList &points) const; + void drawPolygons(QPainter *painter, const QList &polygons) const; + void drawLines(QPainter *painter, const QList &lines) const; void drawTextItems(QPainter *painter, const QList &textItems) const; void drawSectorLights(QPainter *painter, const QList &lights) const; - - static bool polyCb(MapData *data, void *context); - static bool pointCb(MapData *data, void *context); + bool showLabel(const QImage *img, int type) const; Projection _proj; Transform _transform; const Style *_style; - const MapData *_map; - AtlasData *_atlas; + QList _data; int _zoom; Range _zoomRange; QRect _rect; diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp index 011aaafe..8a9fe2f2 100644 --- a/src/map/ENC/style.cpp +++ b/src/map/ENC/style.cpp @@ -27,7 +27,6 @@ static QFont pixelSizeFont(int pixelSize) void Style::polygonStyle() { - _polygons[TYPE(M_COVR)] = Polygon(QBrush(QColor(0xff, 0xff, 0xff))); _polygons[TYPE(LNDARE)] = Polygon(QBrush(QColor(0xe8, 0xe0, 0x64))); _polygons[TYPE(BUAARE)] = Polygon(QBrush(QColor(0xd9, 0x8b, 0x21))); _polygons[TYPE(BUISGL)] = Polygon(QBrush(QColor(0xd9, 0x8b, 0x21)), @@ -153,19 +152,19 @@ void Style::polygonStyle() 1, Qt::DashDotLine)); _drawOrder - << TYPE(M_COVR) << TYPE(LNDARE) << SUBTYPE(DEPARE, 0) - << SUBTYPE(DEPARE, 1) << SUBTYPE(DEPARE, 2) << SUBTYPE(DEPARE, 3) - << TYPE(UNSARE) << SUBTYPE(DEPARE, 4) << SUBTYPE(DEPARE, 5) - << SUBTYPE(DEPARE, 6) << TYPE(LAKARE) << TYPE(CANALS) << TYPE(DYKCON) - << TYPE(RIVERS) << TYPE(DRGARE) << TYPE(FAIRWY) << TYPE(LOKBSN) - << TYPE(I_LOKBSN) << TYPE(BUAARE) << TYPE(BUISGL) << TYPE(SILTNK) - << TYPE(AIRARE) << TYPE(BRIDGE) << TYPE(I_BRIDGE) << TYPE(TUNNEL) - << TYPE(I_TERMNL) << TYPE(SLCONS) << TYPE(I_SLCONS) << TYPE(PONTON) - << TYPE(I_PONTON) << TYPE(HULKES) << TYPE(I_HULKES) << TYPE(FLODOC) - << TYPE(I_FLODOC) << TYPE(DRYDOC) << TYPE(DAMCON) << TYPE(PYLONS) - << TYPE(MORFAC) << TYPE(GATCON) << TYPE(I_GATCON) << TYPE(BERTHS) - << TYPE(I_BERTHS) << SUBTYPE(I_BERTHS, 6) << TYPE(DMPGRD) << TYPE(TSEZNE) - << TYPE(OBSTRN) << TYPE(UWTROC) << TYPE(DWRTPT) << SUBTYPE(ACHARE, 1) + << TYPE(LNDARE) << SUBTYPE(DEPARE, 0) << SUBTYPE(DEPARE, 1) + << SUBTYPE(DEPARE, 2) << SUBTYPE(DEPARE, 3) << TYPE(UNSARE) + << SUBTYPE(DEPARE, 4) << SUBTYPE(DEPARE, 5) << SUBTYPE(DEPARE, 6) + << TYPE(LAKARE) << TYPE(CANALS) << TYPE(DYKCON) << TYPE(RIVERS) + << TYPE(DRGARE) << TYPE(FAIRWY) << TYPE(LOKBSN) << TYPE(I_LOKBSN) + << TYPE(BUAARE) << TYPE(BUISGL) << TYPE(SILTNK) << TYPE(AIRARE) + << TYPE(BRIDGE) << TYPE(I_BRIDGE) << TYPE(TUNNEL) << TYPE(I_TERMNL) + << TYPE(SLCONS) << TYPE(I_SLCONS) << TYPE(PONTON) << TYPE(I_PONTON) + << TYPE(HULKES) << TYPE(I_HULKES) << TYPE(FLODOC) << TYPE(I_FLODOC) + << TYPE(DRYDOC) << TYPE(DAMCON) << TYPE(PYLONS) << TYPE(MORFAC) + << TYPE(GATCON) << TYPE(I_GATCON) << TYPE(BERTHS) << TYPE(I_BERTHS) + << SUBTYPE(I_BERTHS, 6) << TYPE(DMPGRD) << TYPE(TSEZNE) << TYPE(OBSTRN) + << TYPE(UWTROC) << TYPE(DWRTPT) << SUBTYPE(ACHARE, 1) << SUBTYPE(ACHARE, 2) << SUBTYPE(ACHARE, 3) << SUBTYPE(ACHARE, 4) << SUBTYPE(ACHARE, 5) << SUBTYPE(ACHARE, 6) << SUBTYPE(ACHARE, 7) << SUBTYPE(ACHARE, 8) << SUBTYPE(ACHARE, 9) << SUBTYPE(I_ACHARE, 1) diff --git a/src/map/encatlas.cpp b/src/map/encatlas.cpp index fe7eea86..dab827d9 100644 --- a/src/map/encatlas.cpp +++ b/src/map/encatlas.cpp @@ -154,7 +154,7 @@ ENCAtlas::ENCAtlas(const QString &fileName, QObject *parent) _zoom = zooms(_usage).min(); updateTransform(); - _cache.setMaxCost(10); + _cache.setMaxCost(16); _valid = true; } @@ -345,9 +345,21 @@ QString ENCAtlas::key(int zoom, const QPoint &xy) const + QString::number(xy.x()) + "_" + QString::number(xy.y()); } +QList ENCAtlas::levels() const +{ + QList list; + QMap::const_iterator it = _data.find(_usage); + + list.append(it.value()); + if (it != _data.cbegin()) + list.prepend((--it).value()); + + return list; +} + void ENCAtlas::draw(QPainter *painter, const QRectF &rect, Flags flags) { - AtlasData *data = _data.value(_usage); + QList data(levels()); Range zr(zooms(_usage)); QPointF tl(floor(rect.left() / TILE_SIZE) * TILE_SIZE, floor(rect.top() / TILE_SIZE) * TILE_SIZE); diff --git a/src/map/encatlas.h b/src/map/encatlas.h index 6a856549..e5fdd8f7 100644 --- a/src/map/encatlas.h +++ b/src/map/encatlas.h @@ -74,6 +74,7 @@ private: void cancelJobs(bool wait); QString key(int zoom, const QPoint &xy) const; void addMap(const QDir &dir, const QByteArray &file, const RectC &bounds); + QList levels() const; static bool processRecord(const ENC::ISO8211::Record &record, QByteArray &file, RectC &bounds); diff --git a/src/map/encmap.cpp b/src/map/encmap.cpp index 0ba8192a..6aa687bc 100644 --- a/src/map/encmap.cpp +++ b/src/map/encmap.cpp @@ -338,7 +338,7 @@ void ENCMap::draw(QPainter *painter, const QRectF &rect, Flags flags) if (QPixmapCache::find(key(_zoom, ttl), &pm)) painter->drawPixmap(ttl, pm); else - tiles.append(RasterTile(_projection, _transform, _style, _data, + tiles.append(RasterTile(_projection, _transform, _style, _data, _zoom, _zooms, QRect(ttl, QSize(TILE_SIZE, TILE_SIZE)), _tileRatio)); } From d91acb66f2ef53651cf0defb3fc5fc1512ff0b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Fri, 7 Mar 2025 21:13:54 +0100 Subject: [PATCH 25/31] Only render the levels that need to be rendered --- src/map/ENC/attributes.h | 1 + src/map/ENC/mapdata.cpp | 2 + src/map/ENC/rastertile.cpp | 100 +++++++++++++++++++++++++------------ src/map/ENC/rastertile.h | 20 ++++++-- src/map/encatlas.cpp | 6 +-- 5 files changed, 90 insertions(+), 39 deletions(-) diff --git a/src/map/ENC/attributes.h b/src/map/ENC/attributes.h index 01ee9b91..167a0ad5 100644 --- a/src/map/ENC/attributes.h +++ b/src/map/ENC/attributes.h @@ -3,6 +3,7 @@ #define CATACH 8 #define CATBUA 10 +#define CATCOV 18 #define CATDIS 21 #define CATHAF 30 #define CATLMK 35 diff --git a/src/map/ENC/mapdata.cpp b/src/map/ENC/mapdata.cpp index fad38bc4..210bfa4e 100644 --- a/src/map/ENC/mapdata.cpp +++ b/src/map/ENC/mapdata.cpp @@ -425,6 +425,8 @@ MapData::Poly::Poly(uint type, const Polygon &path, const Attributes &attr, subtype = CATMFA; else if (type == I_BERTHS) subtype = I_CATBRT; + else if (type == M_COVR) + subtype = CATCOV; switch (type) { case DEPARE: diff --git a/src/map/ENC/rastertile.cpp b/src/map/ENC/rastertile.cpp index 2788bb9e..a9dbb3fa 100644 --- a/src/map/ENC/rastertile.cpp +++ b/src/map/ENC/rastertile.cpp @@ -257,17 +257,15 @@ void RasterTile::drawSectorLights(QPainter *painter, } } -void RasterTile::processPoints(QList &points, +void RasterTile::processPoints(const QList &points, QList &textItems, QList &lights, - QList §orLights, bool overZoom) + QList §orLights, bool overZoom) const { LightMap lightsMap; SignalSet signalsSet; QSet slMap; int i; - std::sort(points.begin(), points.end()); - /* Lights & Signals */ for (i = 0; i < points.size(); i++) { const Data::Point &point = points.at(i); @@ -328,7 +326,7 @@ void RasterTile::processPoints(QList &points, } void RasterTile::processLines(const QList &lines, - QList &textItems) + QList &textItems) const { for (int i = 0; i < lines.size(); i++) { const Data::Line &line = lines.at(i); @@ -351,19 +349,45 @@ void RasterTile::processLines(const QList &lines, } } -void RasterTile::render() +void RasterTile::drawLevels(QPainter *painter, const QList &levels) { - QImage img(_rect.width() * _ratio, _rect.height() * _ratio, - QImage::Format_ARGB32_Premultiplied); + for (int i = levels.size() - 1; i >= 0; i--) { + QList textItems, lights; + QList sectorLights; + const Level &l = levels.at(i); - img.setDevicePixelRatio(_ratio); - img.fill(Qt::transparent); + processPoints(l.points, textItems, lights, sectorLights, l.overZoom); + processLines(l.lines, textItems); - QPainter painter(&img); - painter.setRenderHint(QPainter::SmoothPixmapTransform); - painter.setRenderHint(QPainter::Antialiasing); - painter.translate(-_rect.x(), -_rect.y()); + drawPolygons(painter, l.polygons); + drawLines(painter, l.lines); + drawArrows(painter, l.points); + drawTextItems(painter, lights); + drawSectorLights(painter, sectorLights); + drawTextItems(painter, textItems); + + qDeleteAll(textItems); + qDeleteAll(lights); + } +} + +QPainterPath RasterTile::shape(const QList &polygons) const +{ + QPainterPath shp; + + for (int i = 0; i < polygons.size(); i++) { + const Data::Poly &p = polygons.at(i); + if (p.type() == SUBTYPE(M_COVR, 1)) + shp.addPath(painterPath(p.path())); + } + + return shp; +} + +QList RasterTile::fetchLevels() +{ + QList list; QPoint ttl(_rect.topLeft()); QRectF polyRect(ttl, QPointF(ttl.x() + _rect.width(), ttl.y() + _rect.height())); @@ -378,31 +402,41 @@ void RasterTile::render() RectC pointRectC(pointRectD.toRectC(_proj, 20)); for (int i = 0; i < _data.size(); i++) { - QList lines; - QList polygons; - QList points; - QList textItems, lights; - QList sectorLights; + Level level; - _data.at(i)->polys(polyRectC, &polygons, &lines); - _data.at(i)->points(pointRectC, &points); + _data.at(i)->polys(polyRectC, &level.polygons, &level.lines); + _data.at(i)->points(pointRectC, &level.points); + level.overZoom = i > 0; - processPoints(points, textItems, lights, sectorLights, - _data.size() > 1 && i == 0); - processLines(lines, textItems); + std::sort(level.points.begin(), level.points.end()); - drawPolygons(&painter, polygons); - drawLines(&painter, lines); - drawArrows(&painter, points); + if (!level.isNull()) + list.append(level); - drawTextItems(&painter, lights); - drawSectorLights(&painter, sectorLights); - drawTextItems(&painter, textItems); - - qDeleteAll(textItems); - qDeleteAll(lights); + if (shape(level.polygons).contains(_rect)) + break; } + return list; +} + +void RasterTile::render() +{ + QList levels(fetchLevels()); + + QImage img(_rect.width() * _ratio, _rect.height() * _ratio, + QImage::Format_ARGB32_Premultiplied); + + img.setDevicePixelRatio(_ratio); + img.fill(Qt::transparent); + + QPainter painter(&img); + painter.setRenderHint(QPainter::SmoothPixmapTransform); + painter.setRenderHint(QPainter::Antialiasing); + painter.translate(-_rect.x(), -_rect.y()); + + drawLevels(&painter, levels); + //painter.setPen(Qt::red); //painter.setBrush(Qt::NoBrush); //painter.setRenderHint(QPainter::Antialiasing, false); diff --git a/src/map/ENC/rastertile.h b/src/map/ENC/rastertile.h index 9ca53107..3287896e 100644 --- a/src/map/ENC/rastertile.h +++ b/src/map/ENC/rastertile.h @@ -51,6 +51,16 @@ private: double end; }; + struct Level { + QList lines; + QList polygons; + QList points; + bool overZoom; + + bool isNull() const + {return lines.isEmpty() && polygons.isEmpty() && points.isEmpty();} + }; + typedef QMap LightMap; typedef QSet SignalSet; @@ -61,16 +71,20 @@ private: QVector polylineM(const QVector &path) const; QPolygonF tsslptArrow(const QPointF &p, qreal angle) const; QPointF centroid(const QVector &polygon) const; - void processPoints(QList &points, + void processPoints(const QList &points, QList &textItems, QList &lights, - QList §orLights, bool overZoom); - void processLines(const QList &lines, QList &textItems); + QList §orLights, bool overZoom) const; + void processLines(const QList &lines, + QList &textItems) const; void drawArrows(QPainter *painter, const QList &points) const; void drawPolygons(QPainter *painter, const QList &polygons) const; void drawLines(QPainter *painter, const QList &lines) const; void drawTextItems(QPainter *painter, const QList &textItems) const; void drawSectorLights(QPainter *painter, const QList &lights) const; bool showLabel(const QImage *img, int type) const; + void drawLevels(QPainter *painter, const QList &levels); + QList fetchLevels(); + QPainterPath shape(const QList &polygons) const; Projection _proj; Transform _transform; diff --git a/src/map/encatlas.cpp b/src/map/encatlas.cpp index dab827d9..52cf2ee3 100644 --- a/src/map/encatlas.cpp +++ b/src/map/encatlas.cpp @@ -350,9 +350,9 @@ QList ENCAtlas::levels() const QList list; QMap::const_iterator it = _data.find(_usage); - list.append(it.value()); - if (it != _data.cbegin()) - list.prepend((--it).value()); + do { + list.append(it.value()); + } while (it-- != _data.cbegin()); return list; } From db6e891c30e3fe4d96e6a10400d1e7a273c7731c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Fri, 7 Mar 2025 21:57:24 +0100 Subject: [PATCH 26/31] Levels overlay fixes/tweaks --- src/map/ENC/rastertile.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/map/ENC/rastertile.cpp b/src/map/ENC/rastertile.cpp index a9dbb3fa..e8c489a7 100644 --- a/src/map/ENC/rastertile.cpp +++ b/src/map/ENC/rastertile.cpp @@ -169,8 +169,13 @@ void RasterTile::drawPolygons(QPainter *painter, } else { if (style.brush() != Qt::NoBrush) { painter->setPen(Qt::NoPen); + QPainterPath path(painterPath(poly.path())); + if (poly.type() == TYPE(DRGARE)) { + painter->setBrush(Qt::white); + painter->drawPath(path); + } painter->setBrush(style.brush()); - painter->drawPath(painterPath(poly.path())); + painter->drawPath(path); } if (style.pen() != Qt::NoPen) { painter->setPen(style.pen()); @@ -413,7 +418,7 @@ QList RasterTile::fetchLevels() if (!level.isNull()) list.append(level); - if (shape(level.polygons).contains(_rect)) + if (_data.size() > 0 && shape(level.polygons).contains(_rect)) break; } From 8ea84c5c86aa3d8682b25cd066ce1fea22ea8583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sat, 8 Mar 2025 03:32:05 +0100 Subject: [PATCH 27/31] Fixed microoptimization --- src/map/ENC/rastertile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/map/ENC/rastertile.cpp b/src/map/ENC/rastertile.cpp index e8c489a7..a4f8adc6 100644 --- a/src/map/ENC/rastertile.cpp +++ b/src/map/ENC/rastertile.cpp @@ -418,7 +418,7 @@ QList RasterTile::fetchLevels() if (!level.isNull()) list.append(level); - if (_data.size() > 0 && shape(level.polygons).contains(_rect)) + if (_data.size() > 1 && shape(level.polygons).contains(_rect)) break; } From 64b29f8aac36b31e76c7c066f0c0e938f2541313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sat, 8 Mar 2025 03:43:09 +0100 Subject: [PATCH 28/31] Code cleanup --- src/map/ENC/rastertile.cpp | 9 ++++----- src/map/ENC/rastertile.h | 3 --- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/map/ENC/rastertile.cpp b/src/map/ENC/rastertile.cpp index a4f8adc6..3abf4c7b 100644 --- a/src/map/ENC/rastertile.cpp +++ b/src/map/ENC/rastertile.cpp @@ -266,9 +266,8 @@ void RasterTile::processPoints(const QList &points, QList &textItems, QList &lights, QList §orLights, bool overZoom) const { - LightMap lightsMap; - SignalSet signalsSet; - QSet slMap; + QMap lightsMap; + QSet signalsSet, sectorLightsSet; int i; /* Lights & Signals */ @@ -285,7 +284,7 @@ void RasterTile::processPoints(const QList &points, sectorLights.append(SectorLight(point.pos(), color, attr.value(LITVIS).toUInt(), range, attr.value(SECTR1).toDouble(), attr.value(SECTR2).toDouble())); - slMap.insert(point.pos()); + sectorLightsSet.insert(point.pos()); } else lightsMap.insert(point.pos(), color); } else if (point.type()>>16 == FOGSIG) @@ -316,7 +315,7 @@ void RasterTile::processPoints(const QList &points, TextPointItem *item = new TextPointItem(pos + offset, label, fnt, img, color, hColor, 0, 2, rotate); - if (item->isValid() && (slMap.contains(point.pos()) + if (item->isValid() && (sectorLightsSet.contains(point.pos()) || (point.polygon() && img) || !item->collides(textItems))) { textItems.append(item); if (lightsMap.contains(point.pos())) diff --git a/src/map/ENC/rastertile.h b/src/map/ENC/rastertile.h index 3287896e..24b6c839 100644 --- a/src/map/ENC/rastertile.h +++ b/src/map/ENC/rastertile.h @@ -61,9 +61,6 @@ private: {return lines.isEmpty() && polygons.isEmpty() && points.isEmpty();} }; - typedef QMap LightMap; - typedef QSet SignalSet; - QPointF ll2xy(const Coordinates &c) const {return _transform.proj2img(_proj.ll2xy(c));} QPainterPath painterPath(const Polygon &polygon) const; From 39ed798a48defb2baeb6110d0ad40307c417f9a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sat, 8 Mar 2025 03:58:28 +0100 Subject: [PATCH 29/31] Some more code cleanup --- src/map/ENC/rastertile.cpp | 19 +++++++++---------- src/map/ENC/rastertile.h | 12 ++++++------ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/map/ENC/rastertile.cpp b/src/map/ENC/rastertile.cpp index 3abf4c7b..e9357f03 100644 --- a/src/map/ENC/rastertile.cpp +++ b/src/map/ENC/rastertile.cpp @@ -226,11 +226,11 @@ static QRectF lightRect(const QPointF &pos, double range) } void RasterTile::drawSectorLights(QPainter *painter, - const QList &lights) const + const QMap &lights) const { - for (int i = 0; i < lights.size(); i++) { - const SectorLight &l = lights.at(i); - QPointF pos(ll2xy(l.pos)); + for (auto it = lights.cbegin(); it != lights.cend(); ++it) { + const SectorLight &l = it.value(); + QPointF pos(ll2xy(it.key())); QRectF rect(lightRect(pos, (l.range == 0) ? 6 : l.range)); double a1 = -(l.end + 90); double a2 = -(l.start + 90); @@ -264,10 +264,10 @@ void RasterTile::drawSectorLights(QPainter *painter, void RasterTile::processPoints(const QList &points, QList &textItems, QList &lights, - QList §orLights, bool overZoom) const + QMap §orLights, bool overZoom) const { QMap lightsMap; - QSet signalsSet, sectorLightsSet; + QSet signalsSet; int i; /* Lights & Signals */ @@ -281,10 +281,9 @@ void RasterTile::processPoints(const QList &points, if (attr.contains(SECTR1) || (range >= MAJOR_RANGE && !(point.type() & 0xFFFF))) { - sectorLights.append(SectorLight(point.pos(), color, + sectorLights.insert(point.pos(), SectorLight(color, attr.value(LITVIS).toUInt(), range, attr.value(SECTR1).toDouble(), attr.value(SECTR2).toDouble())); - sectorLightsSet.insert(point.pos()); } else lightsMap.insert(point.pos(), color); } else if (point.type()>>16 == FOGSIG) @@ -315,7 +314,7 @@ void RasterTile::processPoints(const QList &points, TextPointItem *item = new TextPointItem(pos + offset, label, fnt, img, color, hColor, 0, 2, rotate); - if (item->isValid() && (sectorLightsSet.contains(point.pos()) + if (item->isValid() && (sectorLights.contains(point.pos()) || (point.polygon() && img) || !item->collides(textItems))) { textItems.append(item); if (lightsMap.contains(point.pos())) @@ -357,7 +356,7 @@ void RasterTile::drawLevels(QPainter *painter, const QList &levels) { for (int i = levels.size() - 1; i >= 0; i--) { QList textItems, lights; - QList sectorLights; + QMap sectorLights; const Level &l = levels.at(i); processPoints(l.points, textItems, lights, sectorLights, l.overZoom); diff --git a/src/map/ENC/rastertile.h b/src/map/ENC/rastertile.h index 24b6c839..db8266ab 100644 --- a/src/map/ENC/rastertile.h +++ b/src/map/ENC/rastertile.h @@ -39,11 +39,10 @@ public: private: struct SectorLight { - SectorLight(const Coordinates &pos, Style::Color color, uint visibility, - double range, double start, double end) : pos(pos), color(color), - visibility(visibility), range(range), start(start), end(end) {} + SectorLight(Style::Color color, uint visibility, double range, + double start, double end) : color(color), visibility(visibility), + range(range), start(start), end(end) {} - Coordinates pos; Style::Color color; uint visibility; double range; @@ -70,14 +69,15 @@ private: QPointF centroid(const QVector &polygon) const; void processPoints(const QList &points, QList &textItems, QList &lights, - QList §orLights, bool overZoom) const; + QMap §orLights, bool overZoom) const; void processLines(const QList &lines, QList &textItems) const; void drawArrows(QPainter *painter, const QList &points) const; void drawPolygons(QPainter *painter, const QList &polygons) const; void drawLines(QPainter *painter, const QList &lines) const; void drawTextItems(QPainter *painter, const QList &textItems) const; - void drawSectorLights(QPainter *painter, const QList &lights) const; + void drawSectorLights(QPainter *painter, + const QMap &lights) const; bool showLabel(const QImage *img, int type) const; void drawLevels(QPainter *painter, const QList &levels); QList fetchLevels(); From fdd5d46c03713a290bfdb94729539de1da3e8124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sat, 8 Mar 2025 04:21:55 +0100 Subject: [PATCH 30/31] Refactoring --- src/map/ENC/rastertile.cpp | 28 ++++++++++++++-------------- src/map/ENC/rastertile.h | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/map/ENC/rastertile.cpp b/src/map/ENC/rastertile.cpp index e9357f03..998147c4 100644 --- a/src/map/ENC/rastertile.cpp +++ b/src/map/ENC/rastertile.cpp @@ -263,11 +263,11 @@ void RasterTile::drawSectorLights(QPainter *painter, } void RasterTile::processPoints(const QList &points, - QList &textItems, QList &lights, + QList &textItems, QList &lightItems, QMap §orLights, bool overZoom) const { - QMap lightsMap; - QSet signalsSet; + QMap lights; + QSet sigs; int i; /* Lights & Signals */ @@ -285,9 +285,9 @@ void RasterTile::processPoints(const QList &points, attr.value(LITVIS).toUInt(), range, attr.value(SECTR1).toDouble(), attr.value(SECTR2).toDouble())); } else - lightsMap.insert(point.pos(), color); + lights.insert(point.pos(), color); } else if (point.type()>>16 == FOGSIG) - signalsSet.insert(point.pos()); + sigs.insert(point.pos()); else break; } @@ -317,11 +317,11 @@ void RasterTile::processPoints(const QList &points, if (item->isValid() && (sectorLights.contains(point.pos()) || (point.polygon() && img) || !item->collides(textItems))) { textItems.append(item); - if (lightsMap.contains(point.pos())) - lights.append(new TextPointItem(pos + _style->lightOffset(), - 0, 0, _style->light(lightsMap.value(point.pos())), 0, 0, 0, 0)); - if (signalsSet.contains(point.pos())) - lights.append(new TextPointItem(pos + _style->signalOffset(), + if (lights.contains(point.pos())) + lightItems.append(new TextPointItem(pos + _style->lightOffset(), + 0, 0, _style->light(lights.value(point.pos())), 0, 0, 0, 0)); + if (sigs.contains(point.pos())) + lightItems.append(new TextPointItem(pos + _style->signalOffset(), 0, 0, _style->signal(), 0, 0, 0, 0)); } else delete item; @@ -355,23 +355,23 @@ void RasterTile::processLines(const QList &lines, void RasterTile::drawLevels(QPainter *painter, const QList &levels) { for (int i = levels.size() - 1; i >= 0; i--) { - QList textItems, lights; + QList textItems, lightItems; QMap sectorLights; const Level &l = levels.at(i); - processPoints(l.points, textItems, lights, sectorLights, l.overZoom); + processPoints(l.points, textItems, lightItems, sectorLights, l.overZoom); processLines(l.lines, textItems); drawPolygons(painter, l.polygons); drawLines(painter, l.lines); drawArrows(painter, l.points); - drawTextItems(painter, lights); + drawTextItems(painter, lightItems); drawSectorLights(painter, sectorLights); drawTextItems(painter, textItems); qDeleteAll(textItems); - qDeleteAll(lights); + qDeleteAll(lightItems); } } diff --git a/src/map/ENC/rastertile.h b/src/map/ENC/rastertile.h index db8266ab..fe69d7b8 100644 --- a/src/map/ENC/rastertile.h +++ b/src/map/ENC/rastertile.h @@ -68,7 +68,7 @@ private: QPolygonF tsslptArrow(const QPointF &p, qreal angle) const; QPointF centroid(const QVector &polygon) const; void processPoints(const QList &points, - QList &textItems, QList &lights, + QList &textItems, QList &lightItems, QMap §orLights, bool overZoom) const; void processLines(const QList &lines, QList &textItems) const; From a9572d05fe1717b242bd608f7563e09742a591d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sat, 8 Mar 2025 04:27:40 +0100 Subject: [PATCH 31/31] Fixed broken sector lights rendering after recent code changes --- src/map/ENC/rastertile.cpp | 6 +++--- src/map/ENC/rastertile.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/map/ENC/rastertile.cpp b/src/map/ENC/rastertile.cpp index 998147c4..a02e2238 100644 --- a/src/map/ENC/rastertile.cpp +++ b/src/map/ENC/rastertile.cpp @@ -226,7 +226,7 @@ static QRectF lightRect(const QPointF &pos, double range) } void RasterTile::drawSectorLights(QPainter *painter, - const QMap &lights) const + const QMultiMap &lights) const { for (auto it = lights.cbegin(); it != lights.cend(); ++it) { const SectorLight &l = it.value(); @@ -264,7 +264,7 @@ void RasterTile::drawSectorLights(QPainter *painter, void RasterTile::processPoints(const QList &points, QList &textItems, QList &lightItems, - QMap §orLights, bool overZoom) const + QMultiMap §orLights, bool overZoom) const { QMap lights; QSet sigs; @@ -356,7 +356,7 @@ void RasterTile::drawLevels(QPainter *painter, const QList &levels) { for (int i = levels.size() - 1; i >= 0; i--) { QList textItems, lightItems; - QMap sectorLights; + QMultiMap sectorLights; const Level &l = levels.at(i); processPoints(l.points, textItems, lightItems, sectorLights, l.overZoom); diff --git a/src/map/ENC/rastertile.h b/src/map/ENC/rastertile.h index fe69d7b8..b915c252 100644 --- a/src/map/ENC/rastertile.h +++ b/src/map/ENC/rastertile.h @@ -69,7 +69,7 @@ private: QPointF centroid(const QVector &polygon) const; void processPoints(const QList &points, QList &textItems, QList &lightItems, - QMap §orLights, bool overZoom) const; + QMultiMap §orLights, bool overZoom) const; void processLines(const QList &lines, QList &textItems) const; void drawArrows(QPainter *painter, const QList &points) const; @@ -77,7 +77,7 @@ private: void drawLines(QPainter *painter, const QList &lines) const; void drawTextItems(QPainter *painter, const QList &textItems) const; void drawSectorLights(QPainter *painter, - const QMap &lights) const; + const QMultiMap &lights) const; bool showLabel(const QImage *img, int type) const; void drawLevels(QPainter *painter, const QList &levels); QList fetchLevels();