1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 11:45:53 +01:00

Compare commits

..

No commits in common. "82ea54cacccaec8fe230da380ddf7a61dfeefc2d" and "5041d935f0a44215e1c18947e44a1a574a3f3f83" have entirely different histories.

5 changed files with 13 additions and 17 deletions

View File

@ -158,8 +158,6 @@
<file alias="pile.png">icons/IMG/marine/pile.png</file> <file alias="pile.png">icons/IMG/marine/pile.png</file>
<file alias="spar-buoy.png">icons/IMG/marine/spar-buoy.png</file> <file alias="spar-buoy.png">icons/IMG/marine/spar-buoy.png</file>
<file alias="mooring-buoy.png">icons/IMG/marine/mooring-buoy.png</file> <file alias="mooring-buoy.png">icons/IMG/marine/mooring-buoy.png</file>
<file alias="tower.png">icons/IMG/marine/tower.png</file>
<file alias="chimney.png">icons/IMG/marine/chimney.png</file>
</qresource> </qresource>
<!-- Mapsforge rendertheme --> <!-- Mapsforge rendertheme -->

Binary file not shown.

Before

Width:  |  Height:  |  Size: 578 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 478 B

View File

@ -864,7 +864,7 @@
<message> <message>
<location filename="../src/GUI/gui.cpp" line="996"/> <location filename="../src/GUI/gui.cpp" line="996"/>
<source>Error loading POI file:</source> <source>Error loading POI file:</source>
<translation>Feil ved innlasting av interessepunktfil:</translation> <translation>Kunne ikke laste inn interessepunktfil:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/gui.cpp" line="1226"/> <location filename="../src/GUI/gui.cpp" line="1226"/>
@ -1129,7 +1129,7 @@
<message> <message>
<location filename="../src/map/maplist.cpp" line="127"/> <location filename="../src/map/maplist.cpp" line="127"/>
<source>Garmin IMG maps</source> <source>Garmin IMG maps</source>
<translation>Garmin IMG-kart</translation> <translation>Garming IMG-kart</translation>
</message> </message>
<message> <message>
<location filename="../src/map/maplist.cpp" line="130"/> <location filename="../src/map/maplist.cpp" line="130"/>
@ -1164,7 +1164,7 @@
<message> <message>
<location filename="../src/map/maplist.cpp" line="139"/> <location filename="../src/map/maplist.cpp" line="139"/>
<source>TrekBuddy maps/atlases</source> <source>TrekBuddy maps/atlases</source>
<translation>TrekBuddy-kart/atlas</translation> <translation>TrekBuddy kart/atlas</translation>
</message> </message>
<message> <message>
<location filename="../src/map/maplist.cpp" line="140"/> <location filename="../src/map/maplist.cpp" line="140"/>
@ -1225,12 +1225,12 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="66"/> <location filename="../src/GUI/optionsdialog.cpp" line="66"/>
<source>Standard</source> <source>Standard</source>
<translation>Standard</translation> <translation>Forvalg</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="71"/> <location filename="../src/GUI/optionsdialog.cpp" line="71"/>
<source>Non-HiDPI maps are loaded as HiDPI maps. The map is sharp but map objects are small/hard to read.</source> <source>Non-HiDPI maps are loaded as HiDPI maps. The map is sharp but map objects are small/hard to read.</source>
<translation>Ikke-HiDPI-kart lastes som HiDPI-kart. Kartet er skarpt, men kartobjekter er små/vanskelige å lese.</translation> <translation>Ikke-HiDPI -kart lastes som HiDPI-kart. Kartet er skarpt, men kartobjekter kan være små/vanskelige å lese.</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="73"/> <location filename="../src/GUI/optionsdialog.cpp" line="73"/>
@ -1347,7 +1347,7 @@
<location filename="../src/GUI/optionsdialog.cpp" line="148"/> <location filename="../src/GUI/optionsdialog.cpp" line="148"/>
<location filename="../src/GUI/optionsdialog.cpp" line="249"/> <location filename="../src/GUI/optionsdialog.cpp" line="249"/>
<source>Use anti-aliasing</source> <source>Use anti-aliasing</source>
<translation>Bruk kantutjevning</translation> <translation>Bruk kanutjevning</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="218"/> <location filename="../src/GUI/optionsdialog.cpp" line="218"/>
@ -1437,7 +1437,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="310"/> <location filename="../src/GUI/optionsdialog.cpp" line="310"/>
<source>Moving average window size</source> <source>Moving average window size</source>
<translation>Vindusstørrelse for glidende gjennomsnitt</translation> <translation>Flytter gjennomsnittlig kartstørrelse</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="335"/> <location filename="../src/GUI/optionsdialog.cpp" line="335"/>
@ -1463,7 +1463,7 @@
<location filename="../src/GUI/optionsdialog.cpp" line="338"/> <location filename="../src/GUI/optionsdialog.cpp" line="338"/>
<location filename="../src/GUI/optionsdialog.cpp" line="348"/> <location filename="../src/GUI/optionsdialog.cpp" line="348"/>
<source>Cadence:</source> <source>Cadence:</source>
<translation>Kadens:</translation> <translation>Stegfrekvens:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="339"/> <location filename="../src/GUI/optionsdialog.cpp" line="339"/>
@ -1490,7 +1490,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="376"/> <location filename="../src/GUI/optionsdialog.cpp" line="376"/>
<source>mi/h</source> <source>mi/h</source>
<translation>mi/h</translation> <translation>mi/t</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="379"/> <location filename="../src/GUI/optionsdialog.cpp" line="379"/>
@ -1586,7 +1586,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="523"/> <location filename="../src/GUI/optionsdialog.cpp" line="523"/>
<source>Pause detection</source> <source>Pause detection</source>
<translation>Pausedetektering</translation> <translation>Sett oppdagelse pause</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="545"/> <location filename="../src/GUI/optionsdialog.cpp" line="545"/>
@ -1658,7 +1658,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="566"/> <location filename="../src/GUI/optionsdialog.cpp" line="566"/>
<source>Use HTTP authentication</source> <source>Use HTTP authentication</source>
<translation>Bruk HTTP-autentisering</translation> <translation>Bruk HTTP-identitetsbekreftelse</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="572"/> <location filename="../src/GUI/optionsdialog.cpp" line="572"/>
@ -1695,7 +1695,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="648"/> <location filename="../src/GUI/optionsdialog.cpp" line="648"/>
<source>The printed area is approximately the display area. The map zoom level does not change.</source> <source>The printed area is approximately the display area. The map zoom level does not change.</source>
<translation>Det utskrevne området er omtrent det samme som visningsområdet. Kartforstørrelsesnivået endrer seg ikke.</translation> <translation>Det utskrevne området er omentrent det samme som visningsområdet. Kartforstørrelsesnivået endrer seg ikke.</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="650"/> <location filename="../src/GUI/optionsdialog.cpp" line="650"/>

View File

@ -520,9 +520,7 @@ void Style::defaultPointStyle()
_points[0x10214] = Point(QImage(":/IMG/beacon.png")); _points[0x10214] = Point(QImage(":/IMG/beacon.png"));
_points[0x10215] = Point(QImage(":/IMG/beacon.png")); _points[0x10215] = Point(QImage(":/IMG/beacon.png"));
_points[0x10216] = Point(QImage(":/IMG/mooring-buoy.png")); _points[0x10216] = Point(QImage(":/IMG/mooring-buoy.png"));
_points[0x10305] = Point(QImage(":/IMG/chimney.png"));
_points[0x10306] = Point(QImage(":/IMG/church.png")); _points[0x10306] = Point(QImage(":/IMG/church.png"));
_points[0x10308] = Point(QImage(":/IMG/tower.png"));
_points[0x1030a] = Point(QImage(":/IMG/triangulation-point.png")); _points[0x1030a] = Point(QImage(":/IMG/triangulation-point.png"));
_points[0x10400] = Point(QImage(":/IMG/obstruction.png")); _points[0x10400] = Point(QImage(":/IMG/obstruction.png"));
_points[0x10401] = Point(QImage(":/IMG/obstruction.png")); _points[0x10401] = Point(QImage(":/IMG/obstruction.png"));