Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Evaluate alarms in free drive mode

Browse source
This commit is contained in:
Victor Shcherb 2013-03-31 01:20:50 +01:00
parent ccc15e797f
commit 679193555b
40 changed files with 96 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/values-af/strings.xml
View file

@ -887,10 +887,10 @@
<string name="default_buttons_selectall">Kies alles</string>
<string name="continue_follow_previous_route_auto">Die vorige navigasie was onvoltooid. Wil jy dit nog volg? (%1$s sekondes)</string>
<string name="show_cameras_descr">Wys spoedkameras (mag in sommige lande verbied wees)</string>
<string name="show_speed_limits_descr">Wys spoedbeperkings en verkeershobbels</string>
<string name="show_traffic_warnings_descr">Wys spoedbeperkings en verkeershobbels</string>
<string name="avoid_toll_roads_descr">Vermy tolpaaie vir roete berekening</string>
<string name="show_cameras">Wys spoedkameras</string>
<string name="show_speed_limits">Wys spoedbeperkings</string>
<string name="show_traffic_warnings">Wys spoedbeperkings</string>
<string name="avoid_toll_roads">Vermy tolpaaie</string>
<string name="tip_recent_changes_0_8_2_t">"Veranderinge in 0.8.2:
\n\t* Verbeterde Roeteberekening

4
OsmAnd/res/values-bg/strings.xml
View file

@ -886,10 +886,10 @@
<string name="route_updated_loc_found">Route will be recalculated when location will be found</string>
<string name="continue_follow_previous_route_auto">Previous navigation was unfinished. Continue following it? (%1$s seconds)</string>
<string name="show_cameras_descr">Show speed cameras (may be forbidden in some countries)</string>
<string name="show_speed_limits_descr">Show speed limits and traffic bumps</string>
<string name="show_traffic_warnings_descr">Show speed limits and traffic bumps</string>
<string name="avoid_toll_roads_descr">Avoid toll roads for route calculation</string>
<string name="show_cameras">Show speed cameras</string>
<string name="show_speed_limits">Show speed limits</string>
<string name="show_traffic_warnings">Show speed limits</string>
<string name="avoid_toll_roads">Avoid toll roads</string>
<string name="tip_recent_changes_0_8_2_t">"Changes in 0.8.2 : \n\t* Improved Routing "</string>
<string name="map_widget_top_text">Street name</string>

4
OsmAnd/res/values-bs/strings.xml
View file

@ -874,10 +874,10 @@
<string name="route_updated_loc_found">Route will be recalculated when location will be found</string>
<string name="continue_follow_previous_route_auto">Previous navigation was unfinished. Continue following it? (%1$s seconds)</string>
<string name="show_cameras_descr">Show speed cameras (may be forbidden in some countries)</string>
<string name="show_speed_limits_descr">Show speed limits and traffic bumps</string>
<string name="show_traffic_warnings_descr">Show speed limits and traffic bumps</string>
<string name="avoid_toll_roads_descr">Avoid toll roads for route calculation</string>
<string name="show_cameras">Show speed cameras</string>
<string name="show_speed_limits">Show speed limits</string>
<string name="show_traffic_warnings">Show speed limits</string>
<string name="avoid_toll_roads">Avoid toll roads</string>
<string name="tip_recent_changes_0_8_2_t">"Changes in 0.8.2 : \n\t* Improved Routing "</string>
<string name="map_widget_top_text">Street name</string>

2
OsmAnd/res/values-ca/strings.xml
View file

@ -13,7 +13,7 @@
<string name="map_widget_altitude">Altitud</string>
<string name="map_widget_time">Temps per arribar-hi</string>
<string name="show_cameras">Mostra les càmeres de velocitat</string>
<string name="show_speed_limits">Mostra els límits de velocitat</string>
<string name="show_traffic_warnings">Mostra els límits de velocitat</string>
<string name="route_updated_loc_found">La ruta es tornarà a calcular quan es determini la localització</string>
<string name="update_downlod_list">Torna a carregar la llista</string>
<string name="starting_point_too_far">El punt d\'inici és massa lluny de la carretera més propera.</string>

4
OsmAnd/res/values-cs/strings.xml
View file

@ -961,10 +961,10 @@
<string name="route_updated_loc_found">Trasa bude přepočítána, jakmile bude nalezena pozice</string>
<string name="continue_follow_previous_route_auto">Předchozí trasa nebyla dokončena. Chcete pokračovat? (%1$s sekund)</string>
<string name="show_cameras_descr">Zobrazovat dopravní radary (v některých zemích může být zakázané)</string>
<string name="show_speed_limits_descr">Zobrazovat rychlostní omezení a retardéry</string>
<string name="show_traffic_warnings_descr">Zobrazovat rychlostní omezení a retardéry</string>
<string name="avoid_toll_roads_descr">Vyhnout se placeným silnicím při výpočtu trasy</string>
<string name="show_cameras">Zobrazovat dopravní radary</string>
<string name="show_speed_limits">Zobrazovat rychlostní omezení</string>
<string name="show_traffic_warnings">Zobrazovat rychlostní omezení</string>
<string name="avoid_toll_roads">Vyhnout se placeným silnicím</string>
<string name="tip_recent_changes_0_8_2_t">"Změny ve verzi 0.8.2:
\n\t* Vylepšená navigace

4
OsmAnd/res/values-cy/strings.xml
View file

@ -39,10 +39,10 @@
<string name="bg_service_screen_unlock">Sgrin datgloi</string>
<string name="bg_service_screen_lock_toast">Mae\'r sgrin wedi cloi</string>
<string name="bg_service_interval">Gosod cyfnod deffro:</string>
<string name="show_speed_limits_descr">Dangos terfynau cyflymder a thwmpathau traffig</string>
<string name="show_traffic_warnings_descr">Dangos terfynau cyflymder a thwmpathau traffig</string>
<string name="avoid_toll_roads_descr">Osgoi tollffyrdd wrth gyfrifo taith</string>
<string name="show_cameras">Dangos camerâu cyflymder</string>
<string name="show_speed_limits">Dangos cyfyngiadau cyflymder</string>
<string name="show_traffic_warnings">Dangos cyfyngiadau cyflymder</string>
<string name="avoid_toll_roads">Osgoi tollffyrdd</string>
<string name="tip_recent_changes_0_8_2_t"> Newidiadau yn 0.8.2 :↵
\n\t* Gwell Cynllunio Taith↵

4
OsmAnd/res/values-de/strings.xml
View file

@ -1085,10 +1085,10 @@
<string name="route_updated_loc_found">Route wird neu berechnet sobald Standort ermittelt</string>
<string name="continue_follow_previous_route_auto">Vorherige Navigation wurde nicht beendet. Der Route weiter folgen? (%1$s Sekunden)</string>
<string name="show_cameras_descr">Radarkontrollen anzeigen (in einigen Ländern illegal!)</string>
<string name="show_speed_limits_descr">Geschwindigkeitsbegrenzungen und Verkehrsberuhigungen anzeigen</string>
<string name="show_traffic_warnings_descr">Geschwindigkeitsbegrenzungen und Verkehrsberuhigungen anzeigen</string>
<string name="avoid_toll_roads_descr">Mautpflichtige Straßen vermeiden</string>
<string name="show_cameras">Radarfallen anzeigen</string>
<string name="show_speed_limits">Verkehrswarnungen anzeigen</string>
<string name="show_traffic_warnings">Verkehrswarnungen anzeigen</string>
<string name="avoid_toll_roads">Vermeide Mautstraßen</string>
<string name="map_widget_top_text">Straßenname</string>
<string name="map_widget_config">Konfiguration</string>

2
OsmAnd/res/values-el/strings.xml
View file

@ -98,7 +98,7 @@
<string name="bg_service_screen_lock_toast">Η οθόνη είναι κλειδωμένη</string>
<string name="bg_service_interval">Ορισμός διαστήματος αφύπνισης:</string>
<string name="show_cameras">Εμφάνιση καμερών ταχύτητας</string>
<string name="show_speed_limits">Εμφάνιση προειδοποιήσεων κυκλοφορίας</string>
<string name="show_traffic_warnings">Εμφάνιση προειδοποιήσεων κυκλοφορίας</string>
<string name="avoid_toll_roads">Αποφυγή διοδίων</string>
<string name="continue_follow_previous_route_auto">Το προηγούμενο δρομολόγιο δεν είχε τελειώσει. Να συνεχιστεί;? (%1$s δευτ.)</string>
<string name="route_updated_loc_found">Η διαδρομή θα υπολογιστεί όταν βρεθεί η θέση</string>

4
OsmAnd/res/values-es/strings.xml
View file

@ -926,10 +926,10 @@ Memoria proporcional %4$s MB (Limite Android %5$s MB, Dalvik %6$s MB).</string>
<string name="route_updated_loc_found">La ruta será recalculada cuando se encuentre la localización</string>
<string name="continue_follow_previous_route_auto">La navegación anterior no ha finalizado. ¿Continuar siguiéndola? (%1$s segundos)</string>
<string name="show_cameras_descr">Muestra radares (puede estar prohibido en algunos países)</string>
<string name="show_speed_limits_descr">Muestra límites de velocidad y puntos negros</string>
<string name="show_traffic_warnings_descr">Muestra límites de velocidad y puntos negros</string>
<string name="avoid_toll_roads_descr">Evita peajes para cálculo de la ruta</string>
<string name="show_cameras">Mostrar radares</string>
<string name="show_speed_limits">Mostrar límites de velocidad</string>
<string name="show_traffic_warnings">Mostrar límites de velocidad</string>
<string name="avoid_toll_roads">Evitar peajes</string>
<string name="tip_recent_changes_0_8_2_t">"Cambios en 0.8.2 :
\n\t* Mejoras en Navegación\n\t* Widgets de mapas dinámicos\n\t* Configuración de mapa movido a la pantalla de mapa\n\t* Botón de bloqueo de mapa con servicios de registro\n\t* Arreglado Árabe, Kannada y lenguajes RTL "</string>

4
OsmAnd/res/values-eu/strings.xml
View file

@ -882,10 +882,10 @@
<string name="route_updated_loc_found">Route will be recalculated when location will be found</string>
<string name="continue_follow_previous_route_auto">Previous navigation was unfinished. Continue following it? (%1$s seconds)</string>
<string name="show_cameras_descr">Radarrak erakutsi (herrialde batzuetan debekatuta egon daiteke)</string>
<string name="show_speed_limits_descr">Abiadura mugak eta puntu arriskutsuak erakutsi</string>
<string name="show_traffic_warnings_descr">Abiadura mugak eta puntu arriskutsuak erakutsi</string>
<string name="avoid_toll_roads_descr">Saihestu bidesariak ibilbidea kalkulatzeko</string>
<string name="show_cameras">Radarrak erakutsi</string>
<string name="show_speed_limits">Abiadura mugak erakutsi</string>
<string name="show_traffic_warnings">Abiadura mugak erakutsi</string>
<string name="avoid_toll_roads">Saihestu bidesariak</string>
<string name="tip_recent_changes_0_8_2_t">Aldaketak 0.8.2 :↵
\n\t* Ibilbidearen hobekuntza↵

2
OsmAnd/res/values-fi/strings.xml
View file

@ -73,7 +73,7 @@
<string name="bg_service_screen_lock">Lukitse näyttö</string>
<string name="bg_service_screen_lock_toast">Näyttö on lukittu</string>
<string name="show_cameras">Näytä nopeuskamerat</string>
<string name="show_speed_limits">Näytä liikennevaroitukset</string>
<string name="show_traffic_warnings">Näytä liikennevaroitukset</string>
<string name="avoid_toll_roads">Vältä tietulleja</string>
<string name="route_updated_loc_found">Reitti lasketaan uudelleen kun sijainti löytyy</string>
<string name="osmand_parking_hours">Tunteja</string>

4
OsmAnd/res/values-fr/strings.xml
View file

@ -964,10 +964,10 @@
<string name="route_updated_loc_found">L\'itinéraire sera recalculé quand le lieu sera trouvé</string>
<string name="continue_follow_previous_route_auto">La navigation précédente ne s\'était pas terminée. Continuer à la suivre ? (%1$s secondes)</string>
<string name="show_cameras_descr">Montrer les radars (peut être interdit dans certains pays)</string>
<string name="show_speed_limits_descr">Montrer les limitations de vitesse et les bosses</string>
<string name="show_traffic_warnings_descr">Montrer les limitations de vitesse et les bosses</string>
<string name="avoid_toll_roads_descr">Éviter les péages lors du calcul de l\'itinéraire</string>
<string name="show_cameras">Montrer les radars</string>
<string name="show_speed_limits">Montrer les limitations de vitesse</string>
<string name="show_traffic_warnings">Montrer les limitations de vitesse</string>
<string name="avoid_toll_roads">Éviter les péages</string>
<string name="tip_recent_changes_0_8_2_t">Changements en 0.8.2 :
\n\t* Navigation améliorée

2
OsmAnd/res/values-he/strings.xml
View file

@ -147,7 +147,7 @@
<string name="bg_service_screen_lock_toast">המסך נעול</string>
<string name="bg_service_interval">הגדרת משך התעוררות:</string>
<string name="show_cameras">הצגת מכמונות מהירות</string>
<string name="show_speed_limits">הצגת אזהרות תנועה</string>
<string name="show_traffic_warnings">הצגת אזהרות תנועה</string>
<string name="avoid_toll_roads">המנעות מכבישי אגרה</string>
<string name="continue_follow_previous_route_auto">הניווט הקודם לא הושלם. האם להמשיך לעקוב אחריו? (%1$s שניות)</string>
<string name="route_updated_loc_found">המסלול יחושב מחדש כאשר המיקום יימצא</string>

4
OsmAnd/res/values-hi/strings.xml
View file

@ -885,10 +885,10 @@
<string name="route_updated_loc_found">Route will be recalculated when location will be found</string>
<string name="continue_follow_previous_route_auto">Previous navigation was unfinished. Continue following it? (%1$s seconds)</string>
<string name="show_cameras_descr">Show speed cameras (may be forbidden in some countries)</string>
<string name="show_speed_limits_descr">Show speed limits and traffic bumps</string>
<string name="show_traffic_warnings_descr">Show speed limits and traffic bumps</string>
<string name="avoid_toll_roads_descr">Avoid toll roads for route calculation</string>
<string name="show_cameras">Show speed cameras</string>
<string name="show_speed_limits">Show speed limits</string>
<string name="show_traffic_warnings">Show speed limits</string>
<string name="avoid_toll_roads">Avoid toll roads</string>
<string name="tip_recent_changes_0_8_2_t">"Changes in 0.8.2 : \n\t* Improved Routing "</string>
<string name="map_widget_top_text">Street name</string>

4
OsmAnd/res/values-hu/strings.xml
View file

@ -887,10 +887,10 @@
<string name="route_updated_loc_found">Amint megvan a pozíció, az útvonal újra lesz tervezve</string>
<string name="continue_follow_previous_route_auto">Az előző navigáció még nem ért véget. Folytassuk? (%1$s másodperc)</string>
<string name="show_cameras_descr">Traffipaxok megjelenítése (néhány országban tilos használni)</string>
<string name="show_speed_limits_descr">Sebességhatárok és fekvőrendőrök megjelenítése</string>
<string name="show_traffic_warnings_descr">Sebességhatárok és fekvőrendőrök megjelenítése</string>
<string name="avoid_toll_roads_descr">Fizetős útszakaszok elkerülése útvonaltervezéskor</string>
<string name="show_cameras">Traffipaxok megjelenítése</string>
<string name="show_speed_limits">Sebességhatárok megjelenítése</string>
<string name="show_traffic_warnings">Sebességhatárok megjelenítése</string>
<string name="avoid_toll_roads">Fizetős utak elkerülése</string>
<string name="tip_recent_changes_0_8_2_t">0.8.2 verzió változásai: \n\t* Továbbfejlesztett útvonaltervezés \n\t* Dinamikus térkép widgetek \n\t* A térképbeállítások mostantól a térképképernyőről érhetők el \n\t* Képernyő lezárása gomb rögzítési beállít ásokkal </string>
<string name="map_widget_top_text">Utca neve</string>

4
OsmAnd/res/values-hy/strings.xml
View file

@ -887,10 +887,10 @@
<string name="route_updated_loc_found">Route will be recalculated when location will be found</string>
<string name="continue_follow_previous_route_auto">Previous navigation was unfinished. Continue following it? (%1$s seconds)</string>
<string name="show_cameras_descr">Show speed cameras (may be forbidden in some countries)</string>
<string name="show_speed_limits_descr">Show speed limits and traffic bumps</string>
<string name="show_traffic_warnings_descr">Show speed limits and traffic bumps</string>
<string name="avoid_toll_roads_descr">Avoid toll roads for route calculation</string>
<string name="show_cameras">Show speed cameras</string>
<string name="show_speed_limits">Show speed limits</string>
<string name="show_traffic_warnings">Show speed limits</string>
<string name="avoid_toll_roads">Avoid toll roads</string>
<string name="tip_recent_changes_0_8_2_t">"Changes in 0.8.2 : \n\t* Improved Routing "</string>
<string name="map_widget_top_text">Street name</string>

4
OsmAnd/res/values-id/strings.xml
View file

@ -886,10 +886,10 @@
<string name="route_updated_loc_found">Route will be recalculated when location will be found</string>
<string name="continue_follow_previous_route_auto">Previous navigation was unfinished. Continue following it? (%1$s seconds)</string>
<string name="show_cameras_descr">Show speed cameras (may be forbidden in some countries)</string>
<string name="show_speed_limits_descr">Show speed limits and traffic bumps</string>
<string name="show_traffic_warnings_descr">Show speed limits and traffic bumps</string>
<string name="avoid_toll_roads_descr">Avoid toll roads for route calculation</string>
<string name="show_cameras">Show speed cameras</string>
<string name="show_speed_limits">Show speed limits</string>
<string name="show_traffic_warnings">Show speed limits</string>
<string name="avoid_toll_roads">Avoid toll roads</string>
<string name="tip_recent_changes_0_8_2_t">"Changes in 0.8.2 : \n\t* Improved Routing "</string>
<string name="map_widget_top_text">Street name</string>

4
OsmAnd/res/values-it/strings.xml
View file

@ -949,10 +949,10 @@
<string name="route_updated_loc_found">Il percorso verrà calcolato quando sarà individuata la posizione</string>
<string name="continue_follow_previous_route_auto">La precedente navigazione non è stata terminata. Continuare a seguirla? (%1$s secondi)</string>
<string name="show_cameras_descr">Mostra gli autovelox (potrebbe essere vietato in qualche nazione)</string>
<string name="show_speed_limits_descr">Mostra limiti di velocità descr</string>
<string name="show_traffic_warnings_descr">Mostra limiti di velocità descr</string>
<string name="avoid_toll_roads_descr">Evita strade a pedaggio per il calcolo dell\'itinerario</string>
<string name="show_cameras">Mostra autovelox</string>
<string name="show_speed_limits">Mostra limiti di velocità</string>
<string name="show_traffic_warnings">Mostra limiti di velocità</string>
<string name="avoid_toll_roads">Evita strade a pedaggio</string>
<string name="tip_recent_changes_0_8_2_t">"Cambiamenti nella versione 0.8.2:
\n* Migliorato il calcolo dei percorsi

4
OsmAnd/res/values-ka/strings.xml
View file

@ -895,10 +895,10 @@
<string name="route_updated_loc_found">გზის გადათვლა სასურველი წერტილის პოვნის შემთხვევაში</string>
<string name="continue_follow_previous_route_auto">წინა გზა არ დასრულებულა. გნებავთ მისი გაყოლა? (%1$s წმ)</string>
<string name="show_cameras_descr">სიჩქარის კამერების ჩვენება (ზოგიერთ ქვეყანაში აკრძალულია)</string>
<string name="show_speed_limits_descr">სიჩქარის ლიმიტისა და საცობების ჩვენება</string>
<string name="show_traffic_warnings_descr">სიჩქარის ლიმიტისა და საცობების ჩვენება</string>
<string name="avoid_toll_roads_descr">გზის გადათვლისას ფასიანი გზების ამოღება</string>
<string name="show_cameras">სიჩქარის კამერების ჩვენება</string>
<string name="show_speed_limits">სიჩქარის ლიმიტების ჩვენება</string>
<string name="show_traffic_warnings">სიჩქარის ლიმიტების ჩვენება</string>
<string name="avoid_toll_roads">ფასიანი გზებისათვის გვერდის ავლა</string>
<string name="tip_recent_changes_0_8_2_t">"ცვლილებები 0.8.2-ში : \n\t* გზის არჩევნის გაუმჯობესება\n\t* რუკის დინამიური ღილაკები "</string>
<string name="map_widget_top_text">ქუჩის სახელი</string>

4
OsmAnd/res/values-lt/strings.xml
View file

@ -982,10 +982,10 @@
<string name="route_updated_loc_found">Maršrutas bus perskaičiuotas, kai bus gauta dabartinė vieta</string>
<string name="continue_follow_previous_route_auto">Paskutinis maršrutas nebuvo baigtas. Tęsti jį toliau? (%1$s sekundės)</string>
<string name="show_cameras_descr">Rodyti greičio radarus (kai kuriose šalyse tai draudžiama)</string>
<string name="show_speed_limits_descr">Rodyti leistinus greičius</string>
<string name="show_traffic_warnings_descr">Rodyti leistinus greičius</string>
<string name="avoid_toll_roads_descr">Skaičiuojant maršrutą vengti mokamų kelių</string>
<string name="show_cameras">Rodyti greičio radarus</string>
<string name="show_speed_limits">Rodyti greičio ribojimus</string>
<string name="show_traffic_warnings">Rodyti greičio ribojimus</string>
<string name="avoid_toll_roads">Vengti mokamų kelių</string>
<string name="tip_recent_changes_0_8_2_t">Pakeitimai 0.8.2 versijoje :
\n\t* Patobulintas maršruto sudarymas

4
OsmAnd/res/values-lv/strings.xml
View file

@ -891,10 +891,10 @@
<string name="route_updated_loc_found">Tiko tiks noteiktas koordinātes, ceļš tiks pārrēķināts</string>
<string name="continue_follow_previous_route_auto">Iepriekšējā navigācija netika pabeigta. Atsākt norādes? (%1$s sekundes)</string>
<string name="show_cameras_descr">Rādīt fotoradarus (var būt aizliegts dažās valstīs)</string>
<string name="show_speed_limits_descr">"Rādīt ātruma ierobežojumus un ātruma samazināšanas šķēršļus"</string>
<string name="show_traffic_warnings_descr">"Rādīt ātruma ierobežojumus un ātruma samazināšanas šķēršļus"</string>
<string name="avoid_toll_roads_descr">Izvairīties no maksas ceļiem maršruta aprēķinā</string>
<string name="show_cameras">Rādīt radarus</string>
<string name="show_speed_limits">Rādīt ātruma ierobežojumus</string>
<string name="show_traffic_warnings">Rādīt ātruma ierobežojumus</string>
<string name="avoid_toll_roads">Izvairīties no maksas ceļiem</string>
<string name="tip_recent_changes_0_8_2_t">Changes in 0.8.2 :
\n\t* Uzlabota navigācija

4
OsmAnd/res/values-mr/strings.xml
View file

@ -882,10 +882,10 @@
<string name="route_updated_loc_found">Route will be recalculated when location will be found</string>
<string name="continue_follow_previous_route_auto">Previous navigation was unfinished. Continue following it? (%1$s seconds)</string>
<string name="show_cameras_descr">Show speed cameras (may be forbidden in some countries)</string>
<string name="show_speed_limits_descr">Show speed limits and traffic bumps</string>
<string name="show_traffic_warnings_descr">Show speed limits and traffic bumps</string>
<string name="avoid_toll_roads_descr">Avoid toll roads for route calculation</string>
<string name="show_cameras">Show speed cameras</string>
<string name="show_speed_limits">Show speed limits</string>
<string name="show_traffic_warnings">Show speed limits</string>
<string name="avoid_toll_roads">Avoid toll roads</string>
<string name="tip_recent_changes_0_8_2_t">Changes in 0.8.2 :
\n\t* Improved Routing

2
OsmAnd/res/values-nb/strings.xml
View file

@ -86,7 +86,7 @@
<string name="bg_service_screen_lock_toast">Skjermen er låst</string>
<string name="bg_service_interval">Sett oppvåkningsintervall:</string>
<string name="show_cameras">Vis fotobokser</string>
<string name="show_speed_limits">Vis fartsgrenser</string>
<string name="show_traffic_warnings">Vis fartsgrenser</string>
<string name="avoid_toll_roads">Unngå bomveier</string>
<string name="continue_follow_previous_route_auto">Forrige navigering var ikke ferdig. Fortsette å følge den? (%1$s sekunder)</string>
<string name="route_updated_loc_found">Ruten blir beregnet på nytt når sted blir funnet</string>

4
OsmAnd/res/values-nl/strings.xml
View file

@ -940,10 +940,10 @@
<string name="route_updated_loc_found">Route wordt herberekend als de locatie gevonden is</string>
<string name="continue_follow_previous_route_auto">Vorige navigatie was nog niet klaar. Nu daarmee doorgaan? (%1$s seconden)</string>
<string name="show_cameras_descr">Toon snelheidscontrole-camera\'s (is mogelijk verboden in sommige landen)</string>
<string name="show_speed_limits_descr">Toon maximaal toegestane snelheden en verkeersdrempels</string>
<string name="show_traffic_warnings_descr">Toon maximaal toegestane snelheden en verkeersdrempels</string>
<string name="avoid_toll_roads_descr">Vermijd tolwegen bij routeberekening</string>
<string name="show_cameras">Toon snelheidscontroles</string>
<string name="show_speed_limits">Toon maximumsnelheden</string>
<string name="show_traffic_warnings">Toon maximumsnelheden</string>
<string name="avoid_toll_roads">Vermijd tolwegen</string>
<string name="tip_recent_changes_0_8_2_t">"Changes in 0.8.2:\n\t* Verbeterde routeberekening\n\t* Dynamische kaartschermwidgets\n\t* Kaart-instellingen verplaatst naar het kaartscherm\n\t* Lockscreen knop met track logging services\n\t* Verbeterde talen: Arabisch, Kannada en RNL talen "</string>
<string name="map_widget_top_text">Straatnaam</string>

4
OsmAnd/res/values-pl/strings.xml
View file

@ -903,10 +903,10 @@
<string name="route_updated_loc_found">Trasa będzie przeliczona, gdy lokalizacja zostanie odnaleziona</string>
<string name="continue_follow_previous_route_auto">Poprzednia trasa nie została ukończona. Kontynuować ją? (%1$s sekund)</string>
<string name="show_cameras_descr">Pokaż fotoradary (może to być zabronione w niektórych krajach)</string>
<string name="show_speed_limits_descr">"Pokaż ograniczenia prędkości i progi zwalniające "</string>
<string name="show_traffic_warnings_descr">"Pokaż ograniczenia prędkości i progi zwalniające "</string>
<string name="avoid_toll_roads_descr">Unikaj płatnych dróg przy wyliczaniu trasy</string>
<string name="show_cameras">Fotoradary</string>
<string name="show_speed_limits">Ograniczenia prędkości</string>
<string name="show_traffic_warnings">Ograniczenia prędkości</string>
<string name="avoid_toll_roads">Dróg płatnych</string>
<string name="tip_recent_changes_0_8_2_t">"Zmiany w 0.8.2:
\n\t* Poprawiony routing

4
OsmAnd/res/values-pt/strings.xml
View file

@ -879,10 +879,10 @@
<string name="route_updated_loc_found">Route will be recalculated when location will be found</string>
<string name="continue_follow_previous_route_auto">A navegação anterior nao foi terminada, quer continua-la? (%1$s segundos)</string>
<string name="show_cameras_descr">Show speed cameras (may be forbidden in some countries)</string>
<string name="show_speed_limits_descr">Show speed limits and traffic bumps</string>
<string name="show_traffic_warnings_descr">Show speed limits and traffic bumps</string>
<string name="avoid_toll_roads_descr">Avoid toll roads for route calculation</string>
<string name="show_cameras">Mostrar radares</string>
<string name="show_speed_limits">Exibir limites de velocidade</string>
<string name="show_traffic_warnings">Exibir limites de velocidade</string>
<string name="avoid_toll_roads">Evitar portagens</string>
<string name="tip_recent_changes_0_8_2_t">"Changes in 0.8.2 : \n\t* Improved Routing "</string>
<string name="map_widget_top_text">Nome da Rua</string>

2
OsmAnd/res/values-ro/strings.xml
View file

@ -148,7 +148,7 @@
<string name="bg_service_screen_lock_toast">Ecranul este blocat</string>
<string name="bg_service_interval">Stabilire interval de activare:</string>
<string name="show_cameras">Arată camerele radar</string>
<string name="show_speed_limits">Arată atenționări de trafic</string>
<string name="show_traffic_warnings">Arată atenționări de trafic</string>
<string name="avoid_toll_roads">Evită drumuri cu taxă</string>
<string name="continue_follow_previous_route_auto">"Navigarea anterioară nu s-a încheiat. Doriți s-o continuați (implicit \'Da\')? (%1$s seconds)"</string>
<string name="route_updated_loc_found">Ruta va fi calculată când se va stabili poziția curentă</string>

4
OsmAnd/res/values-ru/strings.xml
View file

@ -983,10 +983,10 @@
<string name="route_updated_loc_found">Маршрут будет пересчитан после определения местоположения</string>
<string name="continue_follow_previous_route_auto">Предыдущий маршрут не был закончен. Продолжить следование по нему? (%1$s секунд)</string>
<string name="show_cameras_descr">Показать скоростные камеры (может быть запрещено в некоторых странах)</string>
<string name="show_speed_limits_descr">Показать ограничения скорости и лежачих полицейских</string>
<string name="show_traffic_warnings_descr">Показать ограничения скорости и лежачих полицейских</string>
<string name="avoid_toll_roads_descr">Избегать платных дорог при прокладке маршрута</string>
<string name="show_cameras">Показать камеры контроля скорости</string>
<string name="show_speed_limits">Показать ограничения скорости</string>
<string name="show_traffic_warnings">Показать ограничения скорости</string>
<string name="avoid_toll_roads">Избегать платных дорог</string>
<string name="tip_recent_changes_0_8_2_t">"Изменения в 0.8.2 :\n\n\t* Улучшенная прокладка маршрута.\n\n\t* Возможность выбора информационных элементов (виджетов), отображаемых на карте (кнопка Настройки в правом верхнему углу карты).\n\n\t* Изменение стиля отрисовки карты и дневного/ночного режима с экрана карты (кнопка Настройки в правом верхнем углу карты).\n\n\t* Возможность блокировки экрана, запуска записи GPX и Live слежения с экрана карты (кнопка в левом верхнем углу карты). "</string>
<string name="screen_is_locked">Для разблокировки экрана коснитесь значка блокировки</string>

4
OsmAnd/res/values-sk/strings.xml
View file

@ -1043,10 +1043,10 @@
<string name="route_updated_loc_found">Cesta bude prepočítaná, keď sa nájde umiestnenie</string>
<string name="continue_follow_previous_route_auto">Predošlá navigácia nebola dokončená. Pokračovať v jej nasledovaní? (%1$s sekúnd)</string>
<string name="show_cameras_descr">Zobrazenie radarov (môže byť zakázané v niektorých krajinách)</string>
<string name="show_speed_limits_descr">Zobrazenie radarov a spomaľovačov</string>
<string name="show_traffic_warnings_descr">Zobrazenie radarov a spomaľovačov</string>
<string name="avoid_toll_roads_descr">Vyvarovanie sa plateným cestám pri kalkulácii trasy</string>
<string name="show_cameras">Radary</string>
<string name="show_speed_limits">Rýchlostné obmedzenia</string>
<string name="show_traffic_warnings">Rýchlostné obmedzenia</string>
<string name="avoid_toll_roads">Spoplatneným cestám</string>
<string name="tip_recent_changes_0_8_2_t">"Zmeny vo verzii 0.8.2:
\n\t* Vylepšená navigácia

2
OsmAnd/res/values-sl/strings.xml
View file

@ -174,7 +174,7 @@
<string name="bg_service_screen_lock_toast">Ekran je zaklenjen</string>
<string name="bg_service_interval">Nastavitev intervala prebujanja:</string>
<string name="show_cameras">Pokaži hitrostne kamere</string>
<string name="show_speed_limits">Prikaži omejitve hitrosti</string>
<string name="show_traffic_warnings">Prikaži omejitve hitrosti</string>
<string name="avoid_toll_roads">Izogibanje cestninskih cest</string>
<string name="continue_follow_previous_route_auto">Prejšnje vodenje ni končano. Nadaljujem vodenje? (%1$s sekund)</string>
<string name="route_updated_loc_found">Pot bo ponovno izračunana, ko bo določena lokacija</string>

2
OsmAnd/res/values-sv/strings.xml
View file

@ -103,7 +103,7 @@
<string name="bg_service_screen_lock_toast">Skärmen är låst</string>
<string name="bg_service_interval">Ställ in väckningsintervall:</string>
<string name="show_cameras">Visa fartkameror</string>
<string name="show_speed_limits">Visa hastighetsgränser</string>
<string name="show_traffic_warnings">Visa hastighetsgränser</string>
<string name="avoid_toll_roads">Undvik betalvägar</string>
<string name="continue_follow_previous_route_auto">En tidigare navigering avbröts. Fortsätta att följa den? (%1$s sekunder)</string>
<string name="route_updated_loc_found">Resvägen kommer att beräknas så snart positionen hittas</string>

2
OsmAnd/res/values-tr/strings.xml
View file

@ -79,7 +79,7 @@
<string name="bg_service_screen_unlock">Ekran kilidini kaldır</string>
<string name="bg_service_screen_lock_toast">Ekran kilitli</string>
<string name="show_cameras">Hız kameralarını göster</string>
<string name="show_speed_limits">Trafik uyarılarını göster</string>
<string name="show_traffic_warnings">Trafik uyarılarını göster</string>
<string name="avoid_toll_roads">Ücretli yollardan sakın</string>
<string name="osmand_parking_hours">Saat</string>
<string name="osmand_parking_minutes">Dakika</string>

4
OsmAnd/res/values-uk/strings.xml
View file

@ -898,10 +898,10 @@
<string name="route_updated_loc_found">Маршрут буде перераховано після визначення місцерозташування</string>
<string name="continue_follow_previous_route_auto">Попередній маршрут не закінчили. Продовжувати рух по ньому, (%1$s секунд)</string>
<string name="show_cameras_descr">Show speed cameras (may be forbidden in some countries)</string>
<string name="show_speed_limits_descr">Show speed limits and traffic bumps</string>
<string name="show_traffic_warnings_descr">Show speed limits and traffic bumps</string>
<string name="avoid_toll_roads_descr">Avoid toll roads for route calculation</string>
<string name="show_cameras">Показувати камери контролю швидкості</string>
<string name="show_speed_limits">Show speed limits</string>
<string name="show_traffic_warnings">Show speed limits</string>
<string name="avoid_toll_roads">Уникати платних доріг</string>
<string name="tip_recent_changes_0_8_2_t">"Changes in 0.8.2 : \n\t* Improved Routing "</string>
<string name="map_widget_top_text">Назва вулиці</string>

2
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -178,7 +178,7 @@
<string name="bg_service_screen_lock_toast">螢幕已鎖</string>
<string name="bg_service_interval">設定喚醒時間：</string>
<string name="show_cameras">顯示測速照相</string>
<string name="show_speed_limits">顯示交通狀況提醒</string>
<string name="show_traffic_warnings">顯示交通狀況提醒</string>
<string name="avoid_toll_roads">避開付費道路</string>
<string name="continue_follow_previous_route_auto">之前的導航未結束，要繼續嗎？ (%1$s 秒)</string>
<string name="route_updated_loc_found">定位時導航路徑將重新規劃</string>

2
OsmAnd/res/values/strings.xml
View file

@ -313,7 +313,7 @@
<string name="bg_service_screen_lock_toast">The screen is locked</string>
<string name="bg_service_interval">Set wake-up interval:</string>
<string name="show_cameras">Show speed cameras</string>
<string name="show_speed_limits">Show traffic warnings</string>
<string name="show_traffic_warnings">Show traffic warnings</string>
<string name="avoid_toll_roads">Avoid toll roads</string>
<string name="continue_follow_previous_route_auto">Previous navigation was unfinished. Continue following it? (%1$s seconds)</string>
<string name="route_updated_loc_found">Route will be calculated once position is found</string>

5
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -479,11 +479,6 @@ public class MapActivity extends AccessibleActivity {
}
public RouteDataObject getLastRouteDataObject(){
OsmAndLocationProvider locationProvider = app.getLocationProvider();
return locationProvider.getLastKnownRouteSegment();
}
public LatLon getMapLocation(){
return new LatLon(mapView.getLatitude(), mapView.getLongitude());
}

4
OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
View file

@ -784,8 +784,8 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
new OsmandPreference[] { osmandSettings.PREFER_MOTORWAYS});
return true;
} else if (preference == showAlarms) {
showBooleanSettings(new String[] { getString(R.string.show_speed_limits), getString(R.string.show_cameras),
getString(R.string.show_lanes) }, new OsmandPreference[] { osmandSettings.SHOW_SPEED_LIMITS,
showBooleanSettings(new String[] { getString(R.string.show_traffic_warnings), getString(R.string.show_cameras),
getString(R.string.show_lanes) }, new OsmandPreference[] { osmandSettings.SHOW_TRAFFIC_WARNINGS,
osmandSettings.SHOW_CAMERAS, osmandSettings.SHOW_LANES });
return true;
}

6
OsmAnd/src/net/osmand/plus/rastermaps/OsmandRasterMapsPlugin.java
View file

@ -73,15 +73,15 @@ public class OsmandRasterMapsPlugin extends OsmandPlugin {
private void createLayers() {
underlayLayer = new MapTileLayer(false);
// mapView.addLayer(underlayLayer, -0.5f);
overlayLayer = new MapTileLayer(false);
// mapView.addLayer(overlayLayer, 0.7f);
settings.MAP_OVERLAY_TRANSPARENCY.addListener(new StateChangedListener<Integer>() {
@Override
public void stateChanged(Integer change) {
overlayLayer.setAlpha(change);
}
});
// mapView.addLayer(underlayLayer, -0.5f);
overlayLayer = new MapTileLayer(false);
// mapView.addLayer(overlayLayer, 0.7f);
}
@Override

14
OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
View file

@ -13,6 +13,7 @@ import java.util.Set;
import net.osmand.access.AccessibleToast;
import net.osmand.binary.RouteDataObject;
import net.osmand.plus.ApplicationMode;
import net.osmand.plus.OsmAndLocationProvider;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandPlugin;
import net.osmand.plus.OsmandSettings;
@ -184,8 +185,7 @@ public class MapInfoLayer extends OsmandMapLayer {
lanesControl = ric.createLanesControl(app.getRoutingHelper(), view);
lanesControl.setBackgroundDrawable(view.getResources().getDrawable(R.drawable.box_free));
alarmControl = ric.createAlarmInfoControl(app.getRoutingHelper(),
view.getContext(), view.getSettings());
alarmControl = ric.createAlarmInfoControl(app, map);
// register right stack
EnumSet<ApplicationMode> all = EnumSet.allOf(ApplicationMode.class);
EnumSet<ApplicationMode> carBicycleDefault = EnumSet.of(ApplicationMode.CAR, ApplicationMode.DEFAULT, ApplicationMode.BICYCLE);
@ -236,7 +236,7 @@ public class MapInfoLayer extends OsmandMapLayer {
View globus = createGlobus();
mapInfoControls.registerTopWidget(globus, R.drawable.globus, R.string.map_widget_map_select, "progress", MapInfoControls.RIGHT_CONTROL, none, 15);
topText = new TopTextView(routingHelper, map);
topText = new TopTextView(app, map);
mapInfoControls.registerTopWidget(topText, R.drawable.street_name, R.string.map_widget_top_text,
"street_name", MapInfoControls.MAIN_CONTROL, carBicycleDefault, 100);
@ -883,10 +883,12 @@ public class MapInfoLayer extends OsmandMapLayer {
private final RoutingHelper routingHelper;
private final MapActivity map;
private int shadowColor = Color.WHITE;
private OsmAndLocationProvider locationProvider;
public TopTextView(RoutingHelper routingHelper, MapActivity map) {
public TopTextView(OsmandApplication app, MapActivity map) {
super(map);
this.routingHelper = routingHelper;
this.routingHelper = app.getRoutingHelper();
locationProvider = app.getLocationProvider();
this.map = map;
getPaint().setTextAlign(Align.CENTER);
setTextColor(Color.BLACK);
@ -916,7 +918,7 @@ public class MapInfoLayer extends OsmandMapLayer {
}
}
} else if(map.getMapViewTrackingUtilities().isMapLinkedToLocation()) {
RouteDataObject rt = map.getLastRouteDataObject();
RouteDataObject rt = locationProvider.getLastKnownRouteSegment();
if(rt != null) {
text = RoutingHelper.formatStreetName(rt.getName(), rt.getRef());
}

32
OsmAnd/src/net/osmand/plus/views/RouteInfoControls.java
View file

@ -312,6 +312,7 @@ public class RouteInfoControls {
protected TextInfoControl createMaxSpeedControl(final MapActivity map, Paint paintText, Paint paintSubText) {
final RoutingHelper rh = map.getMyApplication().getRoutingHelper();
final OsmAndLocationProvider locationProvider = map.getMyApplication().getLocationProvider();
final MapViewTrackingUtilities trackingUtilities = map.getMapViewTrackingUtilities();
final TextInfoControl speedControl = new TextInfoControl(map, 3, paintText, paintSubText) {
private float cachedSpeed = 0;
@ -320,7 +321,7 @@ public class RouteInfoControls {
public boolean updateInfo() {
float mx = 0;
if ((rh == null || !rh.isFollowingMode()) && trackingUtilities.isMapLinkedToLocation()) {
RouteDataObject ro = map.getLastRouteDataObject();
RouteDataObject ro = locationProvider.getLastKnownRouteSegment();
if(ro != null) {
mx = ro.getMaximumSpeed();
}
@ -648,8 +649,11 @@ public class RouteInfoControls {
}
protected MapInfoControl createAlarmInfoControl(final RoutingHelper routingHelper, Context ctx,
final OsmandSettings settings) {
protected MapInfoControl createAlarmInfoControl(final OsmandApplication app, MapActivity ma) {
final RoutingHelper rh = app.getRoutingHelper();
final OsmandSettings settings = app.getSettings();
final OsmAndLocationProvider locationProvider = app.getLocationProvider();
final MapViewTrackingUtilities trackingUtilities = ma.getMapViewTrackingUtilities();
final Paint paintCircle = new Paint();
final float th = 11 * scaleCoefficient;
paintCircle.setColor(Color.rgb(225, 15, 15));
@ -666,17 +670,29 @@ public class RouteInfoControls {
ptext.setAntiAlias(true);
ptext.setTextAlign(Align.CENTER);
final MapInfoControl alarm = new MapInfoControl(ctx) {
final MapInfoControl alarm = new MapInfoControl(ma) {
private String text = "";
private Bitmap img = null;
private int imgId;
@Override
public boolean updateInfo() {
boolean limits = settings.SHOW_SPEED_LIMITS.get();
boolean trafficWarnings = settings.SHOW_TRAFFIC_WARNINGS.get();
boolean cams = settings.SHOW_CAMERAS.get();
boolean visible = false;
if ((limits || cams) && routingHelper != null && routingHelper.isFollowingMode()) {
AlarmInfo alarm = routingHelper.getMostImportantAlarm(settings.METRIC_SYSTEM.get(), cams);
boolean eval = rh.isFollowingMode() || trackingUtilities.isMapLinkedToLocation();
if ((trafficWarnings || cams) && eval) {
AlarmInfo alarm ;
if(rh.isFollowingMode()) {
alarm = rh.getMostImportantAlarm(settings.METRIC_SYSTEM.get(), cams);
} else {
RouteDataObject ro = locationProvider.getLastKnownRouteSegment();
Location loc = locationProvider.getLastKnownLocation();
if(ro != null && loc != null) {
alarm = rh.calculateMostImportantAlarm(ro, loc, settings.METRIC_SYSTEM.get(), cams);
} else {
alarm = null;
}
}
if(alarm != null) {
int locimgId = 0;
String text = null;
@ -701,7 +717,7 @@ public class RouteInfoControls {
if (alarm.getType() == AlarmInfo.SPEED_CAMERA) {
visible = cams;
} else {
visible = limits;
visible = trafficWarnings;
}
}
if(visible) {