Merge branch 'master' of ssh://github.com/osmandapp/Osmand
This commit is contained in:
commit
82322ac7ec
2 changed files with 6 additions and 6 deletions
8
LICENSE
8
LICENSE
|
@ -41,10 +41,10 @@
|
|||
* UI Design and UX work, such as layout, icons is covered by CC-BY-ND
|
||||
- https://github.com/osmandapp/Osmand/tree/master/OsmAnd/res and others
|
||||
|
||||
* Integration with QT library in (https://github.com/osmandapp/Osmand-core/) - dynammic linking
|
||||
* Integration with QT library in (https://github.com/osmandapp/Osmand-core/) - dynamic linking
|
||||
- LGPL (https://qt-project.org/products/licensing)
|
||||
|
||||
* Map icons and their derived primities are covered by proprietary license:
|
||||
* Map icons and their derived primitives are covered by proprietary license:
|
||||
- © icons8.com (https://github.com/osmandapp/OsmAnd-resources/tree/master/icons/svg/icons8)
|
||||
|
||||
* Generated voice files from TTS files are covered by proprietary license:
|
||||
|
@ -56,7 +56,7 @@
|
|||
* Map icons (Mapnik):
|
||||
- Open-SVG-Map-Icons - Public Domain
|
||||
|
||||
* Non patched source libraries:
|
||||
* Non-patched source libraries:
|
||||
- SherlockBar - Apache Lisense - https://github.com/osmandapp/Osmand/tree/master/SherlockBar (https://github.com/JakeWharton/ActionBarSherlock/blob/master/LICENSE.txt)
|
||||
|
||||
* Patched libraries:
|
||||
|
@ -102,6 +102,6 @@
|
|||
|
||||
* Data files
|
||||
- Country boundaries - https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/geo-polygons © by Geofabrik - data free to use
|
||||
- Country boundaries https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/gislab-polygons © by http://be.gis-lab.info - data free to use
|
||||
- Country boundaries - https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/gislab-polygons © by http://be.gis-lab.info - data free to use
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<string name="traffic_warning_speed_limit">Geschwindigkeitsbegrenzung</string>
|
||||
<string name="traffic_warning_border_control">Grenzkontrolle</string>
|
||||
|
@ -1970,7 +1970,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
|
|||
<string name="targets">Ziele</string>
|
||||
<string name="way_alarms">Verkehrswarnungen</string>
|
||||
<string name="record_plugin_description">Speichern Sie Ihre Tracks mit einem Klick. Zeigt die Einstellung, wie Strecken aufgezeichnet werden – in lokale GPX-Dateien oder online via Web-Service.</string>
|
||||
<string name="route_descr_destination"/>
|
||||
<string name="route_descr_destination"></string>
|
||||
<string name="local_index_description">Antippen eines Elements um mehr Details zu erfahren, Tippen und Halten zum Deaktivieren oder Löschen des Elements. Aktuell auf dem Gerät vorhandene Daten (%1$s frei):</string>
|
||||
<string name="text_size_descr">Karten-Schriftgröße festlegen</string>
|
||||
<string name="text_size">Schriftgröße</string>
|
||||
|
|
Loading…
Reference in a new issue