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

Squashed commit of the following:

commit 96de0be220ba1f05eb39693da1d0134f16fc4df7
Merge: a7e02bd c8411eb
Author: Hosted Weblate <hosted@weblate.org>
Date:   Fri Oct 5 07:11:07 2018 +0200

    Merge branch 'origin/master' into Weblate

commit c8411eb1bfc372cab3d5c213a3ee16312a38fb69
Merge: ed4e201 c581271
Author: Hosted Weblate <hosted@weblate.org>
Date:   Thu Oct 4 23:02:49 2018 +0200

    Merge branch 'origin/master' into Weblate

commit c58127179085143b6e74970f002f55156f11a92c
Merge: 06901d8 ffec7d8
Author: Hosted Weblate <hosted@weblate.org>
Date:   Thu Oct 4 01:37:35 2018 +0200

    Merge branch 'origin/master' into Weblate

commit ffec7d8f25c4d0af9dbfc57914d5d1ac55e2d8f0
Merge: 698f14c aa5fde7
Author: Hosted Weblate <hosted@weblate.org>
Date:   Tue Oct 2 22:22:22 2018 +0200

    Merge branch 'origin/master' into Weblate

commit aa5fde7bedf6930cf8790f55cfc9667438084edc
Merge: f880641 4c539a1
Author: Hosted Weblate <hosted@weblate.org>
Date:   Tue Oct 2 22:19:54 2018 +0200

    Merge branch 'origin/master' into Weblate

commit 4c539a1e5d98e9ed83060773be187636eb6e91ce
Merge: 52e8eb1 2b8deb9
Author: Hosted Weblate <hosted@weblate.org>
Date:   Tue Oct 2 22:05:00 2018 +0200

    Merge branch 'origin/master' into Weblate

commit 2b8deb974ccbde60f9f6eae63838450a122cefca
Author: Allan Nordhøy <epost@anotheragency.no>
Date:   Tue Oct 2 20:02:35 2018 +0000

    Translated using Weblate (Norwegian Bokmål)

    Currently translated at 92.5% (298 of 322 strings)

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

commit f7d03c73ace7a8bde5dc7255abfe88f7aac5c84e
Merge: 0483d39 383ab1f
Author: Hosted Weblate <hosted@weblate.org>
Date:   Tue Oct 2 22:02:34 2018 +0200

    Merge branch 'origin/master' into Weblate

commit 383ab1fa834e0d0e124e0d5ccd78f3c47ca42026
Author: Allan Nordhøy <epost@anotheragency.no>
Date:   Tue Oct 2 20:00:54 2018 +0000

    Translated using Weblate (Norwegian Bokmål)

    Currently translated at 90.9% (293 of 322 strings)

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

commit 0b833eae60340905bf1ef541bc90ad38233b5d77
Merge: 5aa2138 e2df88b
Author: Hosted Weblate <hosted@weblate.org>
Date:   Tue Oct 2 21:57:00 2018 +0200

    Merge branch 'origin/master' into Weblate

commit e2df88b716a0679b336a56a8453640f66655977b
Author: Allan Nordhøy <epost@anotheragency.no>
Date:   Tue Oct 2 09:49:57 2018 +0000

    Translated using Weblate (Norwegian Bokmål)

    Currently translated at 89.7% (289 of 322 strings)

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

commit 6ba37af419a6398819d0570950981a75ba3252bd
Author: Åke Engelbrektson <eson@svenskasprakfiler.se>
Date:   Sun Sep 30 10:23:13 2018 +0000

    Translated using Weblate (Swedish)

    Currently translated at 100.0% (324 of 324 strings)

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

commit e5fa1d82f67654db0e37364fb2b25c37529ec79f
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Sun Sep 30 13:34:23 2018 +0000

    Translated using Weblate (Finnish)

    Currently translated at 98.1% (318 of 324 strings)

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

commit a6bdd375192c945507b12aaac130aca9078bf545
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Sun Sep 30 13:33:39 2018 +0000

    Translated using Weblate (Russian)

    Currently translated at 100.0% (324 of 324 strings)

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

commit 1db745c700dc4e7803d0ba295ea94cf199fdca43
Merge: 254deae 8443cd9
Author: Hosted Weblate <hosted@weblate.org>
Date:   Sun Sep 30 12:16:52 2018 +0200

    Merge branch 'origin/master' into Weblate

commit 8443cd91f9cc2dbb511d74c9b47f1c530f27d4e1
Merge: 076a091 cdba9e7
Author: Hosted Weblate <hosted@weblate.org>
Date:   Sun Sep 30 11:35:56 2018 +0200

    Merge branch 'origin/master' into Weblate

commit cdba9e779444269e15ac9ff13c9ae59ed5b0c7a2
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Tue Sep 25 20:43:37 2018 +0000

    Translated using Weblate (Russian)

    Currently translated at 100.0% (323 of 323 strings)

    Translation: GPXSee/Translations
    Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/
This commit is contained in:
Martin Tůma 2018-10-06 19:39:30 +02:00
parent a7e02bdc8b
commit a3625ac89d

View File

@ -697,7 +697,7 @@
<message>
<location filename="../src/GUI/gui.cpp" line="702"/>
<source>Global</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Global</translation>
</message>
<message>
<location filename="../src/GUI/gui.cpp" line="702"/>
@ -1010,12 +1010,12 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="51"/>
<source>Non-HiDPI maps are loaded as HiDPI maps. The map is sharp but map objects are small/hard to read.</source>
<translation type="unfinished"></translation>
<translation>Ikke-HiDPI -kart lastes som HiDPI-kart. Kartet er skarpt, men kartobjekter kan være små/vanskelige å lese.</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="53"/>
<source>Non-HiDPI maps are loaded such as they are. Map objects have the expected size but the map is blurry.</source>
<translation type="unfinished"></translation>
<translation>Ikke-HiDPI -kart lastes som de er. Kartobjekter har forventet størrelse, men kartet er uskarpt.</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="86"/>
@ -1035,7 +1035,7 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="106"/>
<source>Palette shift:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Palettforskyvning:</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="108"/>
@ -1045,12 +1045,12 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="119"/>
<source>Track width:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Sporbredde:</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="120"/>
<source>Track style:</source>
<translation type="unfinished"></translation>
<translation type="unfinished">Sporstil:</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="122"/>
@ -1072,12 +1072,12 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="135"/>
<source>Route width:</source>
<translation type="unfinished"></translation>
<translation>Rutebredde:</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="136"/>
<source>Route style:</source>
<translation type="unfinished"></translation>
<translation>Rutestil:</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="140"/>
@ -1088,7 +1088,7 @@
<location filename="../src/GUI/optionsdialog.cpp" line="144"/>
<location filename="../src/GUI/optionsdialog.cpp" line="226"/>
<source>Use anti-aliasing</source>
<translation type="unfinished"></translation>
<translation>Bruk kanutjevning</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="176"/>
@ -1308,7 +1308,7 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="401"/>
<source>WYSIWYG</source>
<translation type="unfinished"></translation>
<translation>WYSIWYG</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="402"/>
@ -1318,12 +1318,12 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="407"/>
<source>The printed area is approximately the display area. The map zoom level does not change.</source>
<translation type="unfinished"></translation>
<translation>Det utskrevne området er omentrent det samme som visningsområdet. Kartforstørrelsesnivået endrer seg ikke.</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="409"/>
<source>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.</source>
<translation type="unfinished"></translation>
<translation>Forstørrelsesnivået vil endres slik at hele innholdet (spor/veipunkter) passer med utskrevet område, og kartoppløsningen er lik utskriftsoppløsningen som mulig.</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="431"/>
@ -1353,7 +1353,7 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="441"/>
<source>Item count (&gt;1)</source>
<translation type="unfinished"></translation>
<translation>Elementantall (&gt;1)</translation>
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="456"/>