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

Merge pull request #10365 from osmandapp/master

Browse source 
update test branch
This commit is contained in:
Hardy 2020-12-09 08:36:21 +01:00 committed by GitHub
commit e51e3ad3a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 378 additions and 304 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd-telegram/res/values-da/strings.xml
View file

@ -20,7 +20,7 @@
<string name="add_device">Tilføj enhed</string>
<string name="share_location_as">Del placering som</string>
<string name="live_now_description">Kontakter og grupper som der deles placering med.</string>
<string name="logout_from_osmand_telegram_descr">"Bekræft log af OsmAnd Tracker, der kan ikke deles placering eller se placering af andre\?"</string>
<string name="logout_from_osmand_telegram_descr">Bekræft log af OsmAnd Tracker, der kan ikke deles placering eller se placering af andre\?</string>
<string name="logout_from_osmand_telegram">Log ud af OsmAnd Tracker\?</string>
<string name="shared_string_name">Navn</string>
<string name="by_distance">Efter afstand</string>
@ -142,9 +142,7 @@
<string name="shared_string_hour_short">t</string>
<string name="shared_string_minute_short">min</string>
<string name="shared_string_second_short">sek</string>
<string name="welcome_descr">
<b>OsmAnd Tracker</b> giver mulighed for at dele placering og se placering af andre i OsmAnd.<br/>
<br/>Programmet bruger Telegram API, så der skal bruges en Telegram konto.</string>
<string name="welcome_descr"><b>OsmAnd Tracker</b> giver mulighed for at dele placering og se placering af andre i OsmAnd.<br/><br/>Programmet bruger Telegram API, så der skal bruges en Telegram konto.</string>
<string name="my_location">Placering</string>
<string name="last_updated_location">Sidste ajourførte placering:</string>
<string name="successfully_sent_and_updated">Sendt korrekt og opdateret</string>

1
OsmAnd/AndroidManifest.xml
View file

@ -1053,7 +1053,6 @@
android:label="@string/process_downloading_service"
android:stopWithTask="false" />
<receiver android:name="net.osmand.plus.OnNavigationServiceAlarmReceiver" />
<receiver android:name="net.osmand.plus.notifications.NotificationDismissReceiver" />
<activity android:name="net.osmand.plus.activities.PrintDialogActivity" />

23
OsmAnd/res/drawable/ic_action_trail_overview.xml Normal file
View file

@ -0,0 +1,23 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M4,15H20V17H4V15Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M4,19H17V21H4V19Z"
android:strokeAlpha="0.4"
android:fillColor="#ffffff"
android:fillAlpha="0.4"/>
<path
android:pathData="M6,2C4.8954,2 4,2.8954 4,4V13H20V4C20,2.8954 19.1046,2 18,2H6ZM6,11L9,6L11.5,8L14,4L18,11H6ZM8,5C8,5.5523 7.5523,6 7,6C6.4477,6 6,5.5523 6,5C6,4.4477 6.4477,4 7,4C7.5523,4 8,4.4477 8,5Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
<path
android:pathData="M7,5m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
android:strokeAlpha="0.5"
android:fillColor="#ffffff"
android:fillAlpha="0.5"/>
</vector>

17
OsmAnd/res/drawable/warnings_railways_ca.xml Normal file
View file

@ -0,0 +1,17 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="92dp"
android:height="92dp"
android:viewportWidth="92"
android:viewportHeight="92">
<path
android:pathData="M83.8787,40.8787L51.1213,8.1213C49.7631,6.7631 47.9209,6 46,6C44.0791,6 42.2369,6.7631 40.8787,8.1213L8.1213,40.8787C6.7631,42.2369 6,44.0791 6,46C6,47.9209 6.7631,49.7631 8.1213,51.1213L40.8787,83.8787C42.2369,85.2369 44.0791,86 46,86C47.9209,86 49.7631,85.2369 51.1213,83.8787L83.8787,51.1213C85.2369,49.7631 86,47.9209 86,46C86,44.0791 85.2369,42.2369 83.8787,40.8787Z"
android:fillColor="#FFD200"/>
<path
android:pathData="M79.4645,44.7071L47.2929,12.5355C46.95,12.1926 46.4849,12 46,12C45.5151,12 45.05,12.1926 44.7071,12.5355L12.5355,44.7071C12.1926,45.05 12,45.5151 12,46C12,46.4849 12.1926,46.95 12.5355,47.2929L44.7071,79.4645C45.05,79.8074 45.5151,80 46,80C46.4849,80 46.95,79.8074 47.2929,79.4645L79.4645,47.2929C79.8074,46.95 80,46.4849 80,46C80,45.5151 79.8074,45.05 79.4645,44.7071ZM49.4142,10.4142L81.5858,42.5858C82.4913,43.4913 83,44.7194 83,46C83,47.2806 82.4913,48.5087 81.5858,49.4142L49.4142,81.5858C48.5087,82.4913 47.2806,83 46,83C44.7194,83 43.4913,82.4913 42.5858,81.5858L10.4142,49.4142C9.5087,48.5087 9,47.2806 9,46C9,44.7194 9.5087,43.4913 10.4142,42.5858L42.5858,10.4142C43.4913,9.5087 44.7194,9 46,9C47.2806,9 48.5087,9.5087 49.4142,10.4142Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>
<path
android:pathData="M49,22H43V41H36V39H32V41H28V39H24V41H20V44H25V48H20V51H24V53H28V51H32V53H36V51H43V70H49V51H56V53H60V51H64V53H68V51H72V48H67V44H72V41H68V39H64V41H60V39H56V41H49V22ZM43,44H35V48H43V44ZM49,48V44H57V48H49ZM59,44H65V48H59V44ZM27,44V48H33V44H27Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>
</vector>

15
OsmAnd/res/values-ar/strings.xml
View file

@ -289,7 +289,7 @@
<string name="intermediate_items_sort_by_distance">فرز من الباب إلى الباب</string>
<string name="wait_current_task_finished">الرجاء الانتظار حتى انتهاء المهمة الحالية</string>
<string name="available_downloads_left">توفر %1$d ملفات للتحميل</string>
<string name="cancel_route">إلغاء مسار</string>
<string name="cancel_route">رفض المسار؟</string>
<string name="monitoring_settings">تسجيل المسار</string>
<string name="monitoring_settings_descr">قم بضبط كيفية تسجيل الرحلات.</string>
<string name="choose_osmand_theme_descr">تحديد سمة للتطبيق: ليلي، نهاري.</string>
@ -3990,4 +3990,17 @@
<string name="lang_de_casual">الألمانية (تقليدية)</string>
<string name="elevation_data">يمكنك استخدام بيانات الارتفاع للنظر في الصعود / الهبوط لرحلتك</string>
<string name="app_mode_light_aircraft">طائرة</string>
<string name="plan_route_join_segments">ربط الأجزاء</string>
<string name="plan_route_split_before">تقسيم قبل</string>
<string name="plan_route_split_after">تقسيم بعد</string>
<string name="plan_route_add_new_segment">إضافة شريحة جديدة</string>
<string name="release_3_9">• خيار مضاف لتصدير واستيراد جميع البيانات بما في ذلك الإعدادات والموارد والأماكن الخاصة بي
\n
\n • مخطط الطريق: الرسوم البيانية للأجزاء مع المسار ، إضافة القدرة على إنشاء وتحرير مسارات مقطع مضاعفة
\n
\n • تمت إضافة طريقة مصادقة OAuth لـ OpenStreetMap ، واجهة مستخدم محسنة لمربعات حوار OSM
\n
\n • ألوان مخصصة للمفضلة والمسارات نقاط الطريق
\n
\n</string>
</resources>

5
OsmAnd/res/values-ca/phrases.xml
View file

@ -2883,4 +2883,9 @@
<string name="poi_access_bus">Accés d\'autobús</string>
<string name="poi_access_caravan">Accés de caravana</string>
<string name="poi_access_motorhome">Accés per a autocaravanes</string>
<string name="poi_locksmith">Serralleria</string>
<string name="poi_electrical">Material elèctric</string>
<string name="poi_cuisine_cajun">Cajun</string>
<string name="poi_cuisine_burrito">Burritos</string>
<string name="poi_cuisine_waffle">Gofres</string>
</resources>

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

@ -233,7 +233,7 @@
<string name="select_animate_speedup">Velocitat de simulació de la ruta:</string>
<string name="select_navigation_mode">Mitjà de transport:</string>
<string name="offline_edition">Edició fora de línia</string>
<string name="offline_edition_descr">"En desconnexió la edició està activada però llavors els canvis es desen d\'entrada localment i es pujaran quan es demani; altrament els canvis s\'actualitzen immediatament."</string>
<string name="offline_edition_descr">En desconnexió la edició està activada, però llavors els canvis es desen localment primer i ja es pujaran quan es demani; altrament els canvis s\'actualitzen immediatament.</string>
<string name="local_openstreetmap_descr_title">Edició asincrònica de l\'OSM:</string>
<string name="accessibility_mode_descr">Activa les funcions per a usuaris amb discapacitats.</string>
<string name="update_poi_does_not_change_indexes">Els canvis realitzats en els PDI a l\'aplicació no afecten els fitxers de mapa baixats, els canvis es desen en un fitxer local.</string>
@ -941,7 +941,7 @@
<string name="files_limit">Queden %1$d fitxers</string>
<string name="available_downloads_left">%1$d fitxers pendents de baixar</string>
<string name="install_paid">Versió completa</string>
<string name="cancel_route">Descarta la ruta</string>
<string name="cancel_route">Voleu descartar la ruta\?</string>
<string name="cancel_navigation">Atura la navegació</string>
<string name="clear_destination">Neteja la destinació</string>
<string name="download_using_mobile_internet">No esteu connectats amb Wi-Fi. Voleu utilitzar la connexió a Internet actual per les baixades?</string>
@ -3903,4 +3903,12 @@
\nWeb / Wikimedia: fotos dels PDIs especificats a les dades d\'OpenStreetMap.</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="icon_group_amenity">Equipament</string>
<string name="elevation_data">Podeu utilitzar les dades d’elevació per tenir en compte l\'ascens / descens de la vostra ruta</string>
<string name="app_mode_light_aircraft">Avioneta</string>
<string name="gpx_upload_identifiable_visibility_descr">\"Identificable\" vol dir que la traça es mostrarà públicament a les vostres traces GPS i als llistats públics de traces GPS, és a dir, els altres usuaris la podran baixar en brut i associada al vostre usuari. Les dades cronològiques de pas per les fites de l’API GPS que es publiquen mitjançant l’API de fites faran referència a la pàgina de la vostra traça original.</string>
<string name="gpx_upload_private_visibility_descr">\"Privada\" vol dir que la traça no es mostra a cap llistat públic, però les fites que conté estan disponibles a través de l\'API pública GPS, desordenades i sense enregistraments temporals.</string>
<string name="plan_route_join_segments">Uneix segments</string>
<string name="plan_route_split_before">Separa abans</string>
<string name="plan_route_split_after">Separa després</string>
<string name="plan_route_add_new_segment">Afegeix un segment nou</string>
</resources>

8
OsmAnd/res/values-da/strings.xml
View file

@ -3146,7 +3146,7 @@
\n
\n</string>
<string name="app_mode_personal_transporter">Person transport</string>
<string name="app_mode_monowheel">Monowheel</string>
<string name="app_mode_monowheel">Monohjul</string>
<string name="app_mode_scooter">Scooter</string>
<string name="precision_hdop_and_vdop">Vandret nøjagtighed: %1$s, lodret: %2$s</string>
<string name="precision_hdop">Vandret præcision: %s</string>
@ -3863,4 +3863,10 @@
<string name="use_dev_url">Brug dev.openstreetmap.org</string>
<string name="cannot_upload_image">Kan ikke overføre billedet, prøv igen senere</string>
<string name="select_picture">Vælg billede</string>
<string name="lang_de_casual">Tysk (uformel)</string>
<string name="navigate_point_mgrs">MGRS</string>
<string name="what_is_new">Hvad er nyt</string>
<string name="snowmobile_render_descr">Til kørsel med snescooter med dedikerede veje og spor.</string>
<string name="navigate_point_format_mgrs">MGRS</string>
<string name="mgrs_format_descr">OsmAnd bruger MGRS, som svarer til UTM NATO-formatet.</string>
</resources>

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

@ -1048,7 +1048,7 @@
<string name="available_downloads_left">Es können noch %1$d Dateien heruntergeladen werden</string>
<string name="install_paid">Vollversion</string>
<string name="cancel_navigation">Navigation stoppen</string>
<string name="cancel_route">Route verwerfen</string>
<string name="cancel_route">Route verwerfen\?</string>
<string name="use_kalman_filter_compass_descr">Kompass-Rauschreduzierung (erhöht die Kompassträgheit etwas).</string>
<string name="use_kalman_filter_compass">Kalman-Filter verwenden</string>
<string name="use_magnetic_sensor_descr">Für den Kompass Magnetsensor statt Lagesensor verwenden.</string>

6
OsmAnd/res/values-eo/phrases.xml
View file

@ -3618,7 +3618,7 @@
<string name="poi_vehicle_military">Aliro por veturiloj: nur armeaj</string>
<string name="poi_vehicle_delivery">Aliro por veturiloj: nur liverado</string>
<string name="poi_vehicle_forestry">Aliro por veturiloj: nur arbara servo</string>
<string name="poi_motorcar_yes">Aliro por aŭtoj:</string>
<string name="poi_motorcar_yes">Aliro por aŭtoj: jes</string>
<string name="poi_motorcar_private">Aliro por aŭtoj: nur laŭ privata permeso</string>
<string name="poi_motorcar_no">Aliro por aŭtoj: ne</string>
<string name="poi_motorcar_destination">Aliro por aŭtoj: nur al celo</string>
@ -3873,4 +3873,8 @@
<string name="poi_diplomatic_services_non_immigrant_visas_yes">jes</string>
<string name="poi_liaison_subnational">subŝtata/provinca oficejo</string>
<string name="poi_liaison_representative_office">reprezenta oficejo</string>
<string name="poi_siren">Alarmsireno</string>
<string name="poi_nurse">Flegist(in)o</string>
<string name="poi_mobile_money_agent">Agentejo de poŝtelefonaj pagoj</string>
<string name="poi_lifeguard_base">Bazo de akvaj savistoj</string>
</resources>

17
OsmAnd/res/values-eo/strings.xml
View file

@ -915,7 +915,7 @@
<string name="files_limit">Ankoraŭ %1$d dosieroj</string>
<string name="available_downloads_left">%1$d dosieroj pli por elŝuti</string>
<string name="install_paid">Plena versio</string>
<string name="cancel_route">Forĵeti kurson</string>
<string name="cancel_route">Ĉu rezigni kurson\?</string>
<string name="cancel_navigation">Ĉesigi navigadon</string>
<string name="clear_destination">Forviŝi celpunkton</string>
<string name="street_name">Strat-nomo</string>
@ -4000,4 +4000,19 @@
<string name="select_picture">Elektu bildon</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="lang_de_casual">Germana (ordinara)</string>
<string name="elevation_data">Vi povas uzi datumojn pri altitudo por kalkuli suprenirojn/malsuprenirojn de via kurso</string>
<string name="app_mode_light_aircraft">Malpeza aviadilo</string>
<string name="plan_route_join_segments">Kunigi segmentojn</string>
<string name="plan_route_split_before">Dividi antaŭ</string>
<string name="plan_route_split_after">Dividi post</string>
<string name="plan_route_add_new_segment">Aldoni novan segmenton</string>
<string name="release_3_9">• aldonita agordo por el-/en-porti ĉiujn datumojn, inkluzivante agordojn, map‑datumojn kaj miajn lokojn
\n
\n • plani kurson: diagramoj por segmentoj kun la kurso, aldonita eblo por krei kaj redakti plurajn segmentojn de kurso
\n
\n • aldonita aŭtentiga metodo OAuth por OpenStreetMap, plibonigita fasado de OSM‑rilataj dialogujoj
\n
\n • propraj koloroj por ŝatataj ejoj kaj navigadpunktoj de spuro
\n
\n</string>
</resources>

3
OsmAnd/res/values-es-rAR/phrases.xml
View file

@ -3632,7 +3632,7 @@
<string name="poi_vehicle_military">Acceso para vehículos: militar</string>
<string name="poi_vehicle_delivery">Acceso para vehículos: entregas</string>
<string name="poi_vehicle_forestry">Acceso para vehículos: forestal</string>
<string name="poi_motorcar_yes">Acceso para automóviles:</string>
<string name="poi_motorcar_yes">Acceso para automóviles: sí</string>
<string name="poi_motorcar_private">Acceso para automóviles: privado</string>
<string name="poi_motorcar_no">Acceso para automóviles: no</string>
<string name="poi_motorcar_destination">Acceso para automóviles: destino</string>
@ -3890,4 +3890,5 @@
<string name="poi_siren">Sirena</string>
<string name="poi_nurse">Enfermera</string>
<string name="poi_mobile_money_agent">Agente de dinero móvil</string>
<string name="poi_lifeguard_base">Base de salvavidas</string>
</resources>

15
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -602,7 +602,7 @@
<string name="files_limit">Quedan %1$d archivos</string>
<string name="available_downloads_left">Faltan descargar %1$d archivos</string>
<string name="install_paid">Versión completa</string>
<string name="cancel_route">Descartar ruta</string>
<string name="cancel_route">¿Descartar ruta\?</string>
<string name="cancel_navigation">Parar navegación</string>
<string name="clear_destination">Limpiar destino</string>
<string name="download_using_mobile_internet">No está conectado a una red Wi-Fi. ¿Usar la conexión actual a Internet para descargar?</string>
@ -4008,4 +4008,17 @@
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="elevation_data">Puedes usar los datos de elevación para considerar el ascenso o descenso de su viaje</string>
<string name="app_mode_light_aircraft">Avión ligero</string>
<string name="plan_route_join_segments">Unir segmentos</string>
<string name="plan_route_split_before">Dividir antes</string>
<string name="plan_route_split_after">Dividir después</string>
<string name="plan_route_add_new_segment">Añadir nuevo segmento</string>
<string name="release_3_9">• Se ha añadido la opción de exportar e importar todos los datos, incluyendo los ajustes, los recursos y «Mis sitios»
\n
\n • Planificar ruta: se añadieron gráficos para los segmentos con la ruta y capacidad de crear o editar trazas de segmentos múltiples
\n
\n • Se ha añadido el método de autenticación OAuth para OpenStreetMap y se ha mejorado la interfaz de usuario de los diálogos de OSM
\n
\n • Se añadieron colores personalizados para los favoritos y los puntos de referencia de la traza
\n
\n</string>
</resources>

6
OsmAnd/res/values-es-rUS/phrases.xml
View file

@ -3632,7 +3632,7 @@
<string name="poi_vehicle_military">Acceso para vehículos: militar</string>
<string name="poi_vehicle_delivery">Acceso para vehículos: entregas</string>
<string name="poi_vehicle_forestry">Acceso para vehículos: forestal</string>
<string name="poi_motorcar_yes">Acceso para automóviles:</string>
<string name="poi_motorcar_yes">Acceso para automóviles: sí</string>
<string name="poi_motorcar_private">Acceso para automóviles: privado</string>
<string name="poi_motorcar_no">Acceso para automóviles: no</string>
<string name="poi_motorcar_destination">Acceso para automóviles: destino</string>
@ -3887,4 +3887,8 @@
<string name="poi_consulate_consulate_general">Consulado general</string>
<string name="poi_consulate_consular_office">Oficina consular</string>
<string name="poi_consulate_consular_agency">Agencia consular</string>
<string name="poi_lifeguard_base">Base de salvavidas</string>
<string name="poi_siren">Sirena</string>
<string name="poi_nurse">Enfermera</string>
<string name="poi_mobile_money_agent">Agente de dinero móvil</string>
</resources>

19
OsmAnd/res/values-es-rUS/strings.xml
View file

@ -602,7 +602,7 @@
<string name="files_limit">Quedan %1$d archivos</string>
<string name="available_downloads_left">Faltan descargar %1$d archivos</string>
<string name="install_paid">Versión completa</string>
<string name="cancel_route">Descartar ruta</string>
<string name="cancel_route">¿Descartar ruta\?</string>
<string name="cancel_navigation">Parar navegación</string>
<string name="clear_destination">Limpiar destino</string>
<string name="download_using_mobile_internet">No está conectado a una red Wi-Fi. ¿Usar la conexión actual a Internet para descargar?</string>
@ -4001,4 +4001,21 @@
<string name="select_groups_for_import">Marca los grupos que serán importados.</string>
<string name="cannot_upload_image">No se puede subir la imagen, inténtalo más tarde</string>
<string name="app_mode_gap">Separador</string>
<string name="release_3_9">• Se ha añadido la opción de exportar e importar todos los datos, incluyendo los ajustes, los recursos y «Mis sitios»
\n
\n • Planificar ruta: se añadieron gráficos para los segmentos con la ruta y capacidad de crear o editar trazas de segmentos múltiples
\n
\n • Se ha añadido el método de autenticación OAuth para OpenStreetMap y se ha mejorado la interfaz de usuario de los diálogos de OSM
\n
\n • Se añadieron colores personalizados para los favoritos y los puntos de referencia de la traza
\n
\n</string>
<string name="plan_route_split_before">Dividir antes</string>
<string name="plan_route_split_after">Dividir después</string>
<string name="plan_route_join_segments">Unir segmentos</string>
<string name="plan_route_add_new_segment">Añadir nuevo segmento</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="lang_de_casual">Alemán (casual)</string>
<string name="elevation_data">Puedes usar los datos de elevación para considerar el ascenso o descenso del viaje</string>
<string name="app_mode_light_aircraft">Avión ligero</string>
</resources>

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

@ -3941,4 +3941,13 @@
<string name="select_data_to_export">Seleccione los datos para exportar al fichero.</string>
<string name="file_size_needed_for_import">Necesario para importar</string>
<string name="export_not_enough_space">No hay espacio suficiente</string>
<string name="release_3_9">• Se ha añadido la opción de exportar e importar todos los datos, incluyendo los ajustes, los recursos y «Mis sitios»
\n
\n • Planificar ruta: se añadieron gráficos para los segmentos con la ruta y capacidad de crear o editar trazas de segmentos múltiples
\n
\n • Se ha añadido el método de autenticación OAuth para OpenStreetMap y se ha mejorado la interfaz de usuario de los diálogos de OSM
\n
\n • Se añadieron colores personalizados para los favoritos y los puntos de referencia de la traza
\n
\n</string>
</resources>

14
OsmAnd/res/values-fr/phrases.xml
View file

@ -3633,7 +3633,7 @@
<string name="poi_goods_designated">Indiqué</string>
<string name="poi_disabled_yes">Oui</string>
<string name="poi_glacier_type_hanging">suspendu</string>
<string name="poi_motorcar_yes">accès-voiture :</string>
<string name="poi_motorcar_yes">Accès véhicules : oui</string>
<string name="poi_motorcar_private">accès-voiture : privé</string>
<string name="poi_motorcar_no">accès-voiture : impossible</string>
<string name="poi_motorcar_permissive">accès-voiture : possible</string>
@ -3873,4 +3873,16 @@
<string name="poi_parking_sheds">Parking couvert</string>
<string name="poi_parking_rooftop">Parking en terrasse</string>
<string name="poi_gpx_point">Point GPX</string>
<string name="poi_lifeguard_base">Base de sauveteur</string>
<string name="poi_siren">Sirène</string>
<string name="poi_nurse">Infirmier</string>
<string name="poi_mobile_money_agent">Agent de monnaie mobile</string>
<string name="poi_liaison_subnational">Infranational</string>
<string name="poi_embassy_interests_section">Section intérêts</string>
<string name="poi_embassy_branch_embassy">Succursale</string>
<string name="poi_nuts">Magasin de noix</string>
<string name="poi_diplomatic_services_citizen_services_filter">Services aux citoyens</string>
<string name="poi_diplomatic_services_immigrant_visas_filter">Visas d\'immigrant</string>
<string name="poi_diplomatic_services_non_immigrant_visas_filter">Visas pour non-immigrants</string>
<string name="poi_diplomatic_liaison">Liaison diplomatique</string>
</resources>

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

@ -964,7 +964,7 @@
<string name="local_openstreetmap_act_title">Modifications OSM</string>
<string name="shared_string_more_actions">Autres actions</string>
<string name="download_using_mobile_internet">Le WiFi n\'est pas activé. Voulez-vous effectuer le téléchargement avec la connexion Internet actuelle ?</string>
<string name="cancel_route">Arrêter la navigation</string>
<string name="cancel_route">Arrêter la navigation \?</string>
<string name="cancel_navigation">Arrêter la navigation</string>
<string name="clear_destination">Supprimer l\'arrivée</string>
<string name="other_location">Autre</string>
@ -3408,7 +3408,7 @@
<string name="login_and_pass">Nom d\'utilisateur et mot de passe</string>
<string name="plugin_global_prefs_info">Les paramètres du greffon sont globaux et s\'appliquent à tous les profils</string>
<string name="osm_editing">Édition OSM</string>
<string name="osm_edits_view_descr">Vous pouvez consulter vos modifications et vos bugs OSM non envoyés dans %1$s. Les points envoyés ne s\'affichentr plus dans OsmAnd.</string>
<string name="osm_edits_view_descr">Vous pouvez consulter vos modifications et vos bugs OSM non envoyés dans %1$s. Les points envoyés ne sont plus affichés dans OsmAnd.</string>
<string name="app_mode_osm">OSM</string>
<string name="select_nav_icon_descr">Icône affiché pendant la navigation ou en déplacement.</string>
<string name="select_map_icon_descr">Icône affiché à l\'arrêt.</string>
@ -3978,4 +3978,20 @@
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="lang_de_casual">Allemand (courant)</string>
<string name="app_mode_light_aircraft">Aviation légère</string>
<string name="elevation_data">Vous pouvez utiliser l\'altitude pour prendre en compte les dénivellés sur votre itinéraire</string>
<string name="gpx_upload_trackable_visibility_descr">« Traçable » signifie que la trace ne s\'affichera pas dans les listes publiques, mais que les points de cheminement horodatés qu\'elle contient seront téléchargeables depuis l\'API GPS publique (ces points sont traités afin de n\'avoir aucun lien direct avec vous).</string>
<string name="release_3_9">• Ajout d\'une option pour exporter et importer toutes les données, y compris les paramètres, les ressources, mes lieux
\n
\n • Planifier l\'itinéraire : graphiques pour les segments avec l\'itinéraire, ajout de la possibilité de créer et de modifier des pistes à segments multiples
\n
\n • Ajout de la méthode d\'authentification OAuth pour OpenStreetMap, amélioration de l\'interface utilisateur des boîtes de dialogue OSM
\n
\n • Couleurs personnalisées pour les favoris et les points de passage
\n
\n</string>
<string name="plan_route_join_segments">Joindre les segments</string>
<string name="plan_route_split_before">Couper avant</string>
<string name="plan_route_split_after">Couper après</string>
<string name="plan_route_add_new_segment">Ajouter un nouveau segment</string>
<string name="gpx_upload_identifiable_visibility_descr">« Identifiable » siginifie que la trace sera affichée publiquement dans « Vos traces GPS » ainsi que dans les listes de traces GPS publiques. Ceci signifie que les autres utilisateurs peuvent télécharger la trace brute et l\'associer avec votre nom d\'utilisateur. Quand ils sont servis par l\'API de point de cheminement, les données de points de trace horodatés provenant de l\'API GPS publique feront référence à la page de votre trace originelle.</string>
</resources>

3
OsmAnd/res/values-gl/phrases.xml
View file

@ -3873,4 +3873,7 @@
<string name="poi_liaison_filter">Ligazón</string>
<string name="poi_consulate_filter">Consulado</string>
<string name="poi_embassy_filter">Embaixada</string>
<string name="poi_siren">Serea</string>
<string name="poi_nurse">Enfermeira</string>
<string name="poi_mobile_money_agent">Axente de diñeiro móbil</string>
</resources>

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

@ -339,7 +339,7 @@
<string name="files_limit">Faltan %1$d ficheiros</string>
<string name="available_downloads_left">Aínda faltan %1$d ficheiros para baixar</string>
<string name="install_paid">Versión completa</string>
<string name="cancel_route">Rexeitar rota</string>
<string name="cancel_route">Rexeitar rota\?</string>
<string name="cancel_navigation">Deter a navegación</string>
<string name="clear_destination">Limpar o destino</string>
<string name="download_using_mobile_internet">Non estás conectado a unha rede Wi-Fi. Empregar a conexión actual á Internet para baixar\?</string>

3
OsmAnd/res/values-hu/phrases.xml
View file

@ -3660,7 +3660,7 @@
<string name="poi_vehicle_military">Járművel katonai célra használható</string>
<string name="poi_vehicle_delivery">Járművel áruszállításra használható</string>
<string name="poi_vehicle_forestry">Járművel erdészeti célra használható</string>
<string name="poi_motorcar_yes">Személyautóval használható:</string>
<string name="poi_motorcar_yes">Személyautóval használható</string>
<string name="poi_motorcar_private">Személyautóval a tulajdonos engedélyével használható</string>
<string name="poi_motorcar_no">Személyautóval nem használható</string>
<string name="poi_motorcar_destination">Személyautóval célforgalomra használható</string>
@ -3875,4 +3875,5 @@
<string name="poi_nurse">Ápoló</string>
<string name="poi_siren">Sziréna</string>
<string name="poi_mobile_money_agent">Mobilpénzfizetési iroda</string>
<string name="poi_lifeguard_base">Vízimentő-támaszpont</string>
</resources>

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

@ -966,7 +966,7 @@
<string name="local_openstreetmap_act_title">OSM-módosítások</string>
<string name="shared_string_more_actions">További műveletek</string>
<string name="download_using_mobile_internet">Jelenleg nincs Wi-Fi kapcsolat. Szeretnéd a jelenlegi internetkapcsolatot használni a letöltéshez?</string>
<string name="cancel_route">Útvonal elvetése</string>
<string name="cancel_route">Elveti az útvonalat\?</string>
<string name="cancel_navigation">Navigáció megállítása</string>
<string name="clear_destination">Célpont törlése</string>
<string name="other_location">Egyéb</string>
@ -3994,4 +3994,17 @@
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="elevation_data">A magassági adatokat az utazás során előforduló emelkedés/lejtés megfontolásához használhatja</string>
<string name="app_mode_light_aircraft">Könnyű légi jármű</string>
<string name="plan_route_split_before">Elvágás előtte</string>
<string name="plan_route_split_after">Elvágás utána</string>
<string name="plan_route_join_segments">Szakaszok egyesítése</string>
<string name="plan_route_add_new_segment">Új szakasz hozzáadása</string>
<string name="release_3_9">"• Lehetőség az összes adat – többek között beállítások, erőforrások és helyek – exportálására és importálására
\n
\n • Útvonaltervezés: grafikonok az útvonalat tartalmazó szegmensekhez, útszakasznyomvonalak létrehozása és szerkesztése
\n
\n • OAuth hitelesítési módszer az OpenStreetMap-hez, javított felhasználói felület az OSM-párbeszédpanelekhez
\n
\n • Egyéni színek a kedvencekhez és az útvonalak útpontjaihoz
\n
\n"</string>
</resources>

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

@ -931,7 +931,7 @@
<string name="favourites_list_activity">Seleziona Preferito</string>
<string name="local_openstreetmap_act_title">Modifiche OSM</string>
<string name="download_using_mobile_internet">Non connesso al Wi-Fi. Usare la connessione a Internet attuale per il download\?</string>
<string name="cancel_route">Cancella il percorso</string>
<string name="cancel_route">Cancellare il percorso\?</string>
<string name="cancel_navigation">Interrompere la navigazione</string>
<string name="clear_destination">Cancella la destinazione</string>
<string name="other_location">Altra</string>

6
OsmAnd/res/values-iw/strings.xml
View file

@ -970,7 +970,7 @@
<string name="local_openstreetmap_act_title">שינויים ב־OSM</string>
<string name="shared_string_more_actions">פעולות אחרות</string>
<string name="download_using_mobile_internet">אין חיבור לרשת אלחוטית כרגע. להשתמש בחיבור האינטרנט הנוכחי להורדה?</string>
<string name="cancel_route">התעלמות מהמסלול</string>
<string name="cancel_route">להתעלם מהמסלול\?</string>
<string name="cancel_navigation">הפסקת הניווט</string>
<string name="clear_destination">מחיקת היעד</string>
<string name="other_location">אחר</string>
@ -4005,4 +4005,8 @@
<string name="ltr_or_rtl_combine_via_star">‏%1$s‏ * %2$s</string>
<string name="elevation_data">אפשר להשתמש בנתוני רום לצורך התחשבות בעליה / ירידה במהלך הטיול</string>
<string name="app_mode_light_aircraft">כלי טיס קל</string>
<string name="plan_route_join_segments">צירוף מקטעים</string>
<string name="plan_route_split_before">לפצל לפני</string>
<string name="plan_route_split_after">לפצל אחרי</string>
<string name="plan_route_add_new_segment">הוספת מקטע חדש</string>
</resources>

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

@ -2159,7 +2159,7 @@
<string name="audionotes_plugin_description">Lag audio/foto/video-notater på en tur, enten ved bruk av en knapp på kartet eller posisjon-kontekstmeny.</string>
<string name="average">Gjennomsnitt</string>
<string name="of">%1$d av %2$d</string>
<string name="ascent_descent">Stigning/fall</string>
<string name="ascent_descent">Stigning/nedstigning</string>
<string name="moving_time">Tid i bevegelse</string>
<string name="max_min">Maks./min.</string>
<string name="min_max">Min./maks.</string>
@ -3856,7 +3856,7 @@
<string name="delete_all_actions_message_q">Er du sikker på at du vil slette %d hurtighandlinger for godt\?</string>
<string name="screen_timeout">Skjermtidsavbrudd</string>
<string name="default_screen_timeout">Forvalgt skjermtidsavbrudd</string>
<string name="street_level_imagery">Gatenivåbildedata</string>
<string name="street_level_imagery">Bilder på gatenivå</string>
<string name="plan_route_trim_before">Beskjær før</string>
<string name="plan_route_trim_after">Beskjær før</string>
<string name="development">Utvikling</string>
@ -3924,4 +3924,11 @@
<string name="add_to_mapillary">Legg til i Mapillary</string>
<string name="add_to_opr">Legg til i OpenPlaceReviews</string>
<string name="use_dev_url">Bruk dev.openstreetmap.org</string>
<string name="add_photos_descr">OsmAnd viser bilder fra flere kilder:
\nOpenPlaceReviews - interessepunktbilder;
\nMapillary - bilder på gatenivå;
\nWeb / Wikimedia - interessepunktbilder spesifisert i OpenStreetMap-data.</string>
<string name="elevation_data">Du kan bruke høydedata for å ta i betraktning stigning/nedstigning på turen din</string>
<string name="app_mode_light_aircraft">Småfly</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
</resources>

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

@ -972,7 +972,7 @@
<string name="download_using_mobile_internet">Brak połączenia z Wi-Fi. Użyć do pobierania obecnego połączenia z Internetem?</string>
<string name="clear_destination">Usuń cel trasy</string>
<string name="cancel_navigation">Zakończ nawigację</string>
<string name="cancel_route">Odrzucenie trasy</string>
<string name="cancel_route">Odrzucić trasę\?</string>
<string name="install_paid">Pełna wersja</string>
<string name="other_location">Inna</string>
<string name="files_limit">Pozostało %1$d plików</string>
@ -4005,4 +4005,6 @@
<string name="cannot_upload_image">Nie można przesłać obrazu, spróbuj ponownie później</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="lang_de_casual">Niemiecki (styl potoczny)</string>
<string name="gpx_upload_public_visibility_descr">\"Publiczny\" oznacza, że ślad jest pokazywany publicznie w śladach GPS i na publicznych listach śladów GPS oraz na publicznej liście śladów z surowymi znacznikami czasowymi. Dane obsługiwane przez API nie odnoszą się do strony śladów. Znaczniki czasu punktów śladowych nie są dostępne za pośrednictwem publicznego API GPS, a punkty śladowe nie są uporządkowane chronologicznie.</string>
<string name="app_mode_light_aircraft">Lekki samolot</string>
</resources>

3
OsmAnd/res/values-pt-rBR/phrases.xml
View file

@ -3626,7 +3626,7 @@
<string name="poi_vehicle_military">Acesso de veículos: militar</string>
<string name="poi_vehicle_delivery">Acesso de veículos: entrega</string>
<string name="poi_vehicle_forestry">Acesso de veículos: florestal</string>
<string name="poi_motorcar_yes">Acesso de automóveis:</string>
<string name="poi_motorcar_yes">Acesso de automóveis: sim</string>
<string name="poi_motorcar_private">Acesso de automóveis: privado</string>
<string name="poi_motorcar_no">Acesso de automóveis: não</string>
<string name="poi_motorcar_destination">Acesso de automóveis: para trânsito local</string>
@ -3883,4 +3883,5 @@
<string name="poi_siren">Sereia</string>
<string name="poi_nurse">Enfermaria</string>
<string name="poi_mobile_money_agent">Agente de dinheiro móvel</string>
<string name="poi_lifeguard_base">Base do salva-vidas</string>
</resources>

15
OsmAnd/res/values-pt-rBR/strings.xml
View file

@ -641,7 +641,7 @@
<string name="files_limit">Restando %1$d arquivos</string>
<string name="available_downloads_left">%1$d arquivos restantes para download</string>
<string name="install_paid">Versão completa</string>
<string name="cancel_route">Descartar rota</string>
<string name="cancel_route">Descartar rota\?</string>
<string name="cancel_navigation">Parar navegação</string>
<string name="clear_destination">Apagar destino</string>
<string name="download_using_mobile_internet">Não conectado ao Wi-Fi. Use a conexão atual com a Internet para baixar\?</string>
@ -3998,4 +3998,17 @@
<string name="lang_de_casual">Alemão (casual)</string>
<string name="elevation_data">Você pode usar os dados de elevação para consideração de subida / descida para sua viagem</string>
<string name="app_mode_light_aircraft">Avião leve</string>
<string name="release_3_9">"• Adicionada opção para exportar e importar todos os dados, incluindo configurações, recursos, meus lugares
\n
\n • Planejar rota: gráficos para segmentos com a rota, adicionada a capacidade de criar e editar faixas de múltiplos segmentos
\n
\n • Método de autenticação OAuth adicionado para OpenStreetMap, interface de usuário aprimorada de caixas de diálogo OSM
\n
\n • Cores personalizadas para favoritos e rastreia pontos de referência
\n
\n"</string>
<string name="plan_route_join_segments">Unir segmentos</string>
<string name="plan_route_split_before">Dividir antes</string>
<string name="plan_route_split_after">Dividir depois</string>
<string name="plan_route_add_new_segment">Adicionar novo segmento</string>
</resources>

6
OsmAnd/res/values-pt/phrases.xml
View file

@ -3610,7 +3610,7 @@
<string name="poi_vehicle_military">Acesso de veículos: militar</string>
<string name="poi_vehicle_delivery">Acesso de veículos: entrega</string>
<string name="poi_vehicle_forestry">Acesso de veículos: florestal</string>
<string name="poi_motorcar_yes">Acesso de automóveis:</string>
<string name="poi_motorcar_yes">Acesso de automóveis: sim</string>
<string name="poi_motorcar_private">Acesso de automóveis: privado</string>
<string name="poi_motorcar_no">Acesso de automóveis: não</string>
<string name="poi_motorcar_destination">Acesso de automóveis: para trânsito local</string>
@ -3865,4 +3865,8 @@
<string name="poi_liaison_filter">Ligação</string>
<string name="poi_consulate_filter">Consulado</string>
<string name="poi_embassy_filter">Embaixada</string>
<string name="poi_siren">Sereia</string>
<string name="poi_nurse">Enfermeira</string>
<string name="poi_mobile_money_agent">Agente de dinheiro móvel</string>
<string name="poi_lifeguard_base">Base de salva-vidas</string>
</resources>

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

@ -949,7 +949,7 @@
<string name="files_limit">Restando %1$d ficheiros</string>
<string name="available_downloads_left">Faltam %1$d ficheiros para descarregar</string>
<string name="install_paid">Versão completa</string>
<string name="cancel_route">Descartar rota</string>
<string name="cancel_route">Descartar a rota\?</string>
<string name="cancel_navigation">Parar navegação</string>
<string name="local_osm_changes_backup_successful">Ficheiro de alterações OSM gerado %1$s</string>
<string name="local_osm_changes_backup_failed">Não foi possível fazer backup das alterações do OSM.</string>
@ -4005,4 +4005,17 @@
<string name="lang_de_casual">Alemão (casual)</string>
<string name="elevation_data">Pode usar os dados de elevação para considerar a ascensão / descida na sua viagem</string>
<string name="app_mode_light_aircraft">Aeronaves ligeiras</string>
<string name="plan_route_join_segments">Unir segmentos</string>
<string name="plan_route_split_before">Dividir antes</string>
<string name="plan_route_split_after">Dividir após</string>
<string name="plan_route_add_new_segment">Adicionar novo segmento</string>
<string name="release_3_9">• Opção de exportar e importar todos os dados adicionada, que inclui configurações, recursos, meus lugares
\n
\n• Planear rota: gráficos para segmentos com a rota, adicionado a capacidade de criar e editar trilhos de segmentos múltiplos
\n
\n• Método de autenticação OAuth para OpenStreetMap adicionado, melhor IU dos diálogos OSM
\n
\n• Cores personalizadas para favoritos e pontos de rotas de trilhos
\n
\n</string>
</resources>

3
OsmAnd/res/values-ru/phrases.xml
View file

@ -3572,7 +3572,7 @@
<string name="poi_vehicle_military">Доступ для транспортных средств: военные</string>
<string name="poi_vehicle_delivery">Доступ для транспортных средств: курьеры/доставка</string>
<string name="poi_vehicle_forestry">Доступ для транспортных средств: лесное хозяйство</string>
<string name="poi_motorcar_yes">Доступ для автомобилей:</string>
<string name="poi_motorcar_yes">Доступ для автомобилей: да</string>
<string name="poi_motorcar_private">Доступ для автомобилей: частный</string>
<string name="poi_motorcar_no">Доступ для автомобилей: нет</string>
<string name="poi_motorcar_destination">Доступ для автомобилей: пункт назначения</string>
@ -3869,5 +3869,4 @@
<string name="poi_embassy_interests_section">Раздел интересов</string>
<string name="poi_consulate_filter">Консульство</string>
<string name="poi_siren">Сирена</string>
</resources>

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

@ -199,7 +199,7 @@
<string name="files_limit">tenes galu %1$d documentos</string>
<string name="available_downloads_left">%1$d documentos galu de iscarrigare</string>
<string name="install_paid">Versione cumprida</string>
<string name="cancel_route">Iscantzella s’àndala</string>
<string name="cancel_route">Iscantzellare s’àndala\?</string>
<string name="cancel_navigation">Firma sa navigatzione</string>
<string name="clear_destination">Iscantzella sa destinatzione</string>
<string name="download_using_mobile_internet">Non ses connessu a su WiFi. Boles sighire a iscarrigare impreende sa connessione a ìnternet atuale?</string>
@ -3998,6 +3998,6 @@
<string name="select_picture">Ischerta un\'immàgine</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="lang_de_casual">Tedescu (informale)</string>
<string name="elevation_data">Podes impreare sos datos de s\'artària pro pigare in cunsideru s\'Artziada / Achirrada pro su biàgiu tuo</string>
<string name="elevation_data">Podes impreare sos datos de s\'artària pro valutare s\'Artziada / Achirrada pro su biàgiu tuo</string>
<string name="app_mode_light_aircraft">Aèreu lèbiu</string>
</resources>

6
OsmAnd/res/values-sk/phrases.xml
View file

@ -3364,7 +3364,7 @@
<string name="poi_access_bus">Prístup autobusom</string>
<string name="poi_access_caravan">Prístup karavanom</string>
<string name="poi_access_motorhome">Prístup obytným autom</string>
<string name="poi_access_trailer">Prístup s autom s prívesom</string>
<string name="poi_access_trailer">Prístup s prívesom</string>
<string name="poi_access_motorcycle">Prístup motocyklom</string>
<string name="poi_access_moped">Prístup mopedom</string>
<string name="poi_access_mofa">Prístup malým motocyklom</string>
@ -3397,7 +3397,7 @@
<string name="poi_vehicle_military">Prístup vozidiel: vojenské</string>
<string name="poi_vehicle_delivery">Prístup vozidiel: zásobovanie</string>
<string name="poi_vehicle_forestry">Prístup vozidiel: lesnícke</string>
<string name="poi_motorcar_yes">Prístup áut:</string>
<string name="poi_motorcar_yes">Prístup áut: áno</string>
<string name="poi_motorcar_private">Prístup áut: súkromný</string>
<string name="poi_motorcar_no">Prístup áut: nie</string>
<string name="poi_motorcar_destination">Prístup áut: návštevníci cieľa</string>
@ -3441,7 +3441,7 @@
<string name="poi_foot_customers">Prístup chodcov: zákazníci</string>
<string name="poi_caravan_no">Prístup karavanov: nie</string>
<string name="poi_motorhome_no">Prístup obytných vozidiel: nie</string>
<string name="poi_trailer_no">Prístup ťahačov: nie</string>
<string name="poi_trailer_no">Prístup s prívesom: nie</string>
<string name="poi_psv_yes">Prístup vozidiel verejnej prepravy osôb: áno</string>
<string name="poi_psv_designated">Prístup vozidiel verejnej prepravy osôb: určený</string>
<string name="poi_psv_no">Prístup vozidiel verejnej prepravy osôb: nie</string>

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

@ -934,7 +934,7 @@
<string name="favourites_list_activity">Vybrať Obľúbený bod</string>
<string name="local_openstreetmap_act_title">OSM úpravy</string>
<string name="download_using_mobile_internet">Nie je pripojenie na Wi-Fi. Použiť aktuálne pripojenie na Internet pre sťahovanie?</string>
<string name="cancel_route">Zrušiť cestu</string>
<string name="cancel_route">Zrušiť cestu\?</string>
<string name="cancel_navigation">Zastaviť navigáciu</string>
<string name="clear_destination">Zmazať cieľ</string>
<string name="other_location">Iné</string>
@ -3997,4 +3997,10 @@
<string name="select_picture">Zvoľte obrázok</string>
<string name="lang_de_casual">Nemecky (Deutsch) úsporne</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="gpx_upload_public_visibility_descr">\"Identifikovateľná\" znamená, že trasa sa zobrazí verejne vo vašich GPS stopách, vo verejných zoznamoch GPS stôp a v zozname verejných trás s časovými pečiatkami v nespracovanej forme. Údaje poskytované cez rozhranie (API) nebudú odkazovať na vašu pôvodnú stránku s trasou. Časové pečiatky bodov trasy nebudú dostupné cez verejné GPS rozhranie (API) a body trasy nebudú v chronologickom poradí.</string>
<string name="gpx_upload_private_visibility_descr">\"Súkromná\" znamená, že trasa sa nezobrazí vo verejných zoznamoch, ale body trasy z nej v budú dostupné v neusporiadanom poradí cez verejné GPS rozhranie (API) bez časových pečiatok.</string>
<string name="gpx_upload_identifiable_visibility_descr">\"Identifikovateľná\" znamená, že trasa sa zobrazí verejne vo vašich GPS stopách a vo verejných zoznamoch GPS stôp, tzn. iní používatelia budú môcť stiahnuť nespracovanú trasu a prepojiť su s vašim používateľkým menom. Verejné body trasy s časovými pečiatkami poskytované cez GPS rozhranie (API) budú odkazovať na vašu pôvodnú stránku s trasou.</string>
<string name="gpx_upload_trackable_visibility_descr">\"Sledovateľná\" znamená, že trasa sa nezobrazí vo verejných zoznamoch, ale spracované body trasy s časovými pečiatkami (ktoré nie je možné spojiť s vami), budú dostupné na stiahnutie cez verejné GPS rozhranie (API).</string>
<string name="elevation_data">Môžete použiť údaje nadmorskej výšky pre zohľadnenie výstupu / zostupu na vašom výlete</string>
<string name="app_mode_light_aircraft">Ľahké lietadlo</string>
</resources>

6
OsmAnd/res/values-sr/phrases.xml
View file

@ -2525,7 +2525,7 @@
<string name="poi_vehicle_military">Приступ возилом: војни</string>
<string name="poi_vehicle_delivery">Приступ возилом: достава</string>
<string name="poi_vehicle_forestry">Приступ возилом: шумски саобраћај</string>
<string name="poi_motorcar_yes">Приступ моторним аутом:</string>
<string name="poi_motorcar_yes">Приступ моторним аутом: да</string>
<string name="poi_motorcar_private">Приступ моторним аутом: приватни</string>
<string name="poi_motorcar_no">Приступ моторним аутом: не</string>
<string name="poi_motorcar_destination">Приступ моторним аутом: само до одредишта</string>
@ -3862,4 +3862,8 @@
<string name="poi_embassy_filter">Амбасада</string>
<string name="poi_departures_board">Табла</string>
<string name="poi_drinking_water_refill">Доливање воде за пиће</string>
<string name="poi_lifeguard_base">База спасиоца</string>
<string name="poi_siren">Сирена</string>
<string name="poi_nurse">Медицинска сестра</string>
<string name="poi_mobile_money_agent">Мобилни агент за новац</string>
</resources>

17
OsmAnd/res/values-sr/strings.xml
View file

@ -888,7 +888,7 @@
<string name="rendering_attr_hideIcons_name">Сличице тачака од интереса</string>
<string name="select_month_and_country">Месец и држава:</string>
<string name="weekly">Седмично</string>
<string name="cancel_route">Откажи путању</string>
<string name="cancel_route">Одбаци путању\?</string>
<string name="accessibility_options">Опције приступачности</string>
<string name="map_widget_gps_info">GPS подаци</string>
<string name="index_name_openmaps">Отворене карте ЕУ-а</string>
@ -3994,4 +3994,19 @@
<string name="use_dev_url">Употреби dev.openstreetmap.org</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="lang_de_casual">Немачки (говорни)</string>
<string name="elevation_data">Податке о надморској висини можете користити за разматрање успона / спуштања за ваше путовање</string>
<string name="app_mode_light_aircraft">Лака летелица</string>
<string name="plan_route_join_segments">Споји сегменте</string>
<string name="plan_route_split_before">Подели пре</string>
<string name="plan_route_split_after">После подели</string>
<string name="plan_route_add_new_segment">Додајте нови сегмент</string>
<string name="release_3_9">• Додата је опција за извоз и увоз свих података, укључујући подешавања, ресурсе, моја места
\n
\n • Планирање руте: графикони за сегменте са рутом, додата је могућност креирања и уређивања вишеструких сегмената стаза
\n
\n • Додан је метод аутентификације ОАут за ОпенСтритМап, побољшан кориснички интерфејс ОСМ дијалога
\n
\n • Прилагођене боје за омиљене и путне тачаке стаза
\n
\n</string>
</resources>

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

@ -700,7 +700,7 @@
<string name="use_magnetic_sensor">Manyetik sensörü kullan</string>
<string name="other_location">Diğer</string>
<string name="install_paid">Tam sürüm</string>
<string name="cancel_route">Rotaya son ver</string>
<string name="cancel_route">Rotaya son verilsin mi\?</string>
<string name="cancel_navigation">Navigasyonu durdur</string>
<string name="clear_destination">Varış noktasını temizle</string>
<string name="download_using_mobile_internet">Kablosuz ağa bağlı değil. İndirmek için şimdiki İnternet bağlantısı kullanılsın mı\?</string>
@ -1638,7 +1638,7 @@
<string name="no_index_file_to_download">İndirme bulunamadı, lütfen internet bağlantınızı gözden geçirin.</string>
<string name="none_selected_gpx">Önce uzun dokunarak bir GPX dosyası belirtin.</string>
<string name="local_index_select_gpx_file">Bir izlenen yol seçin</string>
<string name="gpx_split_interval">Bölünmüş aralık</string>
<string name="gpx_split_interval">Bölme aralığı</string>
<string name="show_zoom_buttons_navigation_descr">Navigasyon sırasında yakınlaştırma düğmelerini göster.</string>
<string name="show_zoom_buttons_navigation">Yakınlaştırma düğmelerini göster</string>
<string name="save_as_favorites_points">Sık Kullanılanlar grubu olarak kaydet</string>
@ -2757,7 +2757,7 @@
\nLütfen tam bir kod girin</string>
<string name="navigate_point_olc_info_area">Geçerli tam OLC
\nTemsil ettiği alan: %1$s x %2$s</string>
<string name="auto_split_recording_title">Boşluktan sonra kayıtları otomatik bölme</string>
<string name="auto_split_recording_title">Boşluktan sonra kayıtları otomatik böl</string>
<string name="auto_split_recording_descr">6 dakikalık aralıktan sonra yeni segmenti, 2 saatlik aralıktan sonra yeni izlenen yolu veya tarih değiştiyse daha uzun aralıktan sonra yeni dosyayı başlatın.</string>
<string name="rendering_attr_depthContours_description">Eş derinlik eğrilerini ve noktalarını göster.</string>
<string name="route_points_category_name">Bu rotadan geçmek için döner</string>
@ -3337,7 +3337,7 @@
<string name="added_profiles_descr">Eklenti tarafından eklenen profiller</string>
<string name="shared_string_turn_off">Kapat</string>
<string name="new_plugin_added">Yeni eklenti eklendi</string>
<string name="join_segments">Segmentleri birleştir</string>
<string name="join_segments">Bölümleri birleştir</string>
<string name="add_new_profile_q">\'%1$s\' yeni profil eklensin mi\?</string>
<string name="save_heading">Başlığı dahil et</string>
<string name="save_heading_descr">Kayıt sırasında her izleme noktasına başlığı kaydet.</string>
@ -3958,4 +3958,17 @@
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="elevation_data">Yolculuğunuzun Çıkış / İniş değerleri için Yükseklik verilerini kullanabilirsiniz</string>
<string name="app_mode_light_aircraft">Hafif uçak</string>
<string name="plan_route_join_segments">Bölümleri birleştir</string>
<string name="plan_route_split_before">Önce böl</string>
<string name="plan_route_split_after">Sonra böl</string>
<string name="plan_route_add_new_segment">Yeni bölüm ekle</string>
<string name="release_3_9">• Ayarlar, kaynaklar, yerlerim dahil tüm verileri dışa ve içe aktarma seçeneği eklendi
\n
\n • Güzergah Planla: güzergahla birlikte bölümler için grafikler, birden çok bölüm izi oluşturma ve düzenleme yeteneği eklendi
\n
\n • OpenStreetMap için OAuth kimlik doğrulama yöntemi eklendi, OSM iletişim kutularının kullanıcı arayüzü iyileştirildi
\n
\n • Sık kullanılanlar ve yol ara noktaları için özel renkler
\n
\n</string>
</resources>

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

@ -994,7 +994,7 @@
<string name="distance_measurement_finish_editing">Завершити редагування</string>
<string name="distance_measurement_clear_route">Очистити всі точки</string>
<string name="distance_measurement_load_gpx">Відкрити збережений GPX-файл</string>
<string name="cancel_route">Відхилити маршрут</string>
<string name="cancel_route">Відхилити маршрут\?</string>
<string name="search_street_in_neighborhood_cities">Шукати вулицю в навколишніх містах</string>
<string name="intermediate_items_sort_return">Оптимальний порядок проміжних точок на шляху до пункту призначення.</string>
<string name="intermediate_items_sort_by_distance">Впорядкувати від дверей до дверей</string>
@ -2045,7 +2045,7 @@
<string name="skip_map_downloading_desc">У Вас немає завантажених мап. Ви можете вибрати мапу зі списку або завантажити її пізніше за допомогою меню — %1$s.</string>
<string name="search_another_country">Виберіть інший регіон</string>
<string name="search_map">Пошук мапи…</string>
<string name="first_usage_wizard_desc">OsmAnd визначить ваше місце розташування і запропонує завантажити мапи для цього регіону.</string>
<string name="first_usage_wizard_desc">OsmAnd визначить ваше розташування і запропонує завантажити мапи для цього регіону.</string>
<string name="location_not_found">Неможливо визначити місце розташування</string>
<string name="no_inet_connection">З’єднання з Інтернетом відсутнє</string>
<string name="no_inet_connection_desc_map">Необхідно завантажити мапи.</string>

3
OsmAnd/res/values-zh-rTW/phrases.xml
View file

@ -3624,7 +3624,7 @@
<string name="poi_vehicle_military">車輛進入：軍事</string>
<string name="poi_vehicle_delivery">車輛進入：送貨</string>
<string name="poi_vehicle_forestry">車輛進入：林業</string>
<string name="poi_motorcar_yes">汽車進入：</string>
<string name="poi_motorcar_yes">汽車進入：是</string>
<string name="poi_motorcar_private">汽車進入：私人</string>
<string name="poi_motorcar_no">汽車進入：否</string>
<string name="poi_motorcar_destination">汽車進入：目的地</string>
@ -3882,4 +3882,5 @@
<string name="poi_siren">警報器</string>
<string name="poi_nurse">護理師</string>
<string name="poi_mobile_money_agent">行動貨幣代理商</string>
<string name="poi_lifeguard_base">救生員基地</string>
</resources>

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

@ -863,7 +863,7 @@
<string name="use_magnetic_sensor">使用磁性感應器</string>
<string name="other_location">其它</string>
<string name="install_paid">完整版</string>
<string name="cancel_route">排除路線</string>
<string name="cancel_route">排除路線？</string>
<string name="cancel_navigation">停止導航</string>
<string name="clear_destination">清除目的地</string>
<string name="download_using_mobile_internet">並未連線至 Wi-Fi。使用目前的連線進行下載嗎？</string>
@ -3998,4 +3998,17 @@
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="elevation_data">您可以將海拔資料用於您旅程的上升與下降</string>
<string name="app_mode_light_aircraft">輕型飛機</string>
<string name="plan_route_join_segments">加入線段</string>
<string name="plan_route_split_before">分離前</string>
<string name="plan_route_split_after">分離後</string>
<string name="plan_route_add_new_segment">加入新線段</string>
<string name="release_3_9">• 新增匯出與匯入所有資料（包含設定、資源與我的位置）的選項
\n
\n • 路線計畫：有路線的線段圖，並有建立與編輯多個線段軌跡的功能
\n
\n • 加入 OpenStreetMap 的 OAuth 驗證方式，改善 OSM 對話框的使用者介面
\n
\n • 自訂最愛與軌跡航點的顏色
\n
\n</string>
</resources>

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

@ -13,18 +13,18 @@
-->
<string name="release_3_9">
• Added option to export and import all data including settings, resources, my places\n\n
• Plan Route: graphs for segments with the route, added the ability to create and edit multiply segment tracks\n\n
• Added OAuth authentication method for OpenStreetMap, improved UI of OSM dialogs \n\n
• Custom colors for favorites and tracks waypoints\n\n
• Plan Route: graphs for track segments with route, and added the ability to create and edit multiple track segments\n\n
• Added OAuth authentication method for OpenStreetMap, improved UI of OSM dialogs\n\n
• Support custom colors for favorites and track waypoints\n\n
</string>
<string name="plan_route_add_new_segment">Add new segment</string>
<string name="plan_route_add_new_segment">Add a new segment</string>
<string name="plan_route_split_after">Split after</string>
<string name="plan_route_split_before">Split before</string>
<string name="plan_route_join_segments">Join segments</string>
<string name="app_mode_light_aircraft">Light aircraft</string>
<string name="elevation_data">You can use Elevation data for consideration of Ascent / Descent for your trip</string>
<string name="elevation_data">You can use elevation data to account for ascent/descent of your trip</string>
<string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
<string name="add_photos_descr">OsmAnd shows photos from several sources:\nOpenPlaceReviews - POI photos;\nMapillary - street-level imagery;\nWeb / Wikimedia - POI photos specified in OpenStreetMap data.</string>
<string name="add_photos_descr">OsmAnd shows photos from several sources:\nOpenPlaceReviews - POI photos;\nMapillary - street-level imagery;\nWeb / Wikimedia - POI photos as per OpenStreetMap data.</string>
<string name="use_dev_url">Use dev.openstreetmap.org</string>
<string name="use_dev_url_descr">Switch to use "dev.openstreetmap.org" instead of "openstreetmap.org" to testing uploading OSM Note / POI / GPX.</string>
<string name="add_to_opr">Add to OpenPlaceReviews</string>
@ -32,7 +32,7 @@
<string name="select_items_for_import">Select items that will be imported.</string>
<string name="select_groups_for_import">Select groups that will be imported.</string>
<string name="export_not_enough_space">There is not enough space</string>
<string name="export_not_enough_space_descr">Your device only has %1$s free. Please free up some space or unselect some items to export.</string>
<string name="export_not_enough_space_descr">Your device only has %1$s free. Please free up some space or deselect some items to export.</string>
<string name="file_size_needed_for_import">Needed for import</string>
<string name="select_data_to_export">Select the data to be exported to the file.</string>
<string name="approximate_file_size">Approximate file size</string>
@ -44,14 +44,14 @@
<string name="shared_string_search_history">Search history</string>
<string name="register_opr_have_account">I already have an account</string>
<string name="register_opr_create_new_account">Create new account</string>
<string name="register_on_openplacereviews_desc">Photos are provided by open data project OpenPlaceReviews.org. In order to upload your photos you need to sign up on website.</string>
<string name="register_on_openplacereviews_desc">Photos are provided by the OpenPlaceReviews.org open data project. In order to upload your photos you need to sign up on their website.</string>
<string name="register_on_openplacereviews">Register on\nOpenPlaceReviews.org</string>
<string name="shared_string_add_photo">Add photo</string>
<string name="osm_login_descr">You can log in using the safe OAuth method or use your login and password.</string>
<string name="osm_edit_comment_note">Comment OSM Note</string>
<string name="osm_edit_close_note">Close OSM Note</string>
<string name="gpx_upload_trackable_visibility_descr">\"Trackable\" means the trace does not show up in any public listings, but processed trackpoints with timestamps from it (that can\'t be associated with you directly) do through downloads from the public GPS API.</string>
<string name="gpx_upload_identifiable_visibility_descr">\"Identifiable\" means that the trace will be shown publicly in Your GPS traces and in public GPS trace listings, i.e. other users will be able to download the raw trace and associate it with your username. Public timestamped tracepoint data from the GPS API served via the trackpoints API will reference your original trace page.</string>
<string name="gpx_upload_identifiable_visibility_descr">\"Identifiable\" means that the trace will be shown publicly in your GPS traces and in public GPS trace listings, i.e. other users will be able to download the raw trace and associate it with your username. Public timestamped tracepoint data from the GPS API served via the trackpoints API will reference your original trace page.</string>
<string name="gpx_upload_private_visibility_descr">\"Private\" means the trace does not show up in any public listings, but trackpoints from it in unchronological order are available through the public GPS API without timestamps.</string>
<string name="gpx_upload_public_visibility_descr">\"Public\" means the trace is shown publicly in your GPS traces and in public GPS trace listings, and in the public trace list with timestamps in raw form. Data served via the API does not reference your trace page. Tracepoint timestamps are not available through the public GPS API, and tracepoints are not chronologically ordered.</string>
<string name="enter_text_separated">Enter tags separated by comma.</string>
@ -60,7 +60,7 @@
<string name="subscription_on_hold_title">OsmAnd Live subscription is on hold</string>
<string name="subscription_paused_title">OsmAnd Live subscription has been paused</string>
<string name="subscription_expired_title">OsmAnd Live subscription has been expired</string>
<string name="subscription_payment_issue_title">There is a problem with your subscription. Click the button to go to the Google Play subscription settings to fix your payment method.</string>
<string name="subscription_payment_issue_title">There is a problem with your subscription. Tap the button to go to the Google Play subscription settings to fix your payment method.</string>
<string name="manage_subscription">Manage subscription</string>
<string name="user_login">Login</string>
<string name="user_password">Password</string>
@ -71,8 +71,8 @@
<string name="sign_in_with_open_street_map">Sign in with OpenStreetMap</string>
<string name="login_open_street_map_org">Login to OpenStreetMap.org</string>
<string name="login_open_street_map">Login to OpenStreetMap</string>
<string name="plugin_global_prefs_info">These plugin setting are global, and apply to all profiles</string>
<string name="message_you_need_add_two_points_to_show_graphs">You need to add at least two points</string>
<string name="plugin_global_prefs_info">These plugin settings are global, and apply to all profiles</string>
<string name="message_you_need_add_two_points_to_show_graphs">Add at least two points</string>
<string name="icon_group_travel">Travel</string>
<string name="icon_group_emergency">Emergency</string>
<string name="icon_group_sport">Sport</string>
@ -84,8 +84,8 @@
<string name="app_mode_gap">Gap</string>
<string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
<string name="shared_string_local_maps">Local maps</string>
<string name="message_graph_will_be_available_after_recalculation">Wait for the route recalculation.\nGraph will be available after recalculation.</string>
<string name="message_need_calculate_route_before_show_graph">%1$s data available only on the roads, you need to calculate a route using “Route between points” to get it.</string>
<string name="message_graph_will_be_available_after_recalculation">Please wait.\nGraph will be available after route recalculation.</string>
<string name="message_need_calculate_route_before_show_graph">%1$s data available only on roads, calculate a route using “Route between points” to see graphs.</string>
<string name="shared_string_graph">Graph</string>
<string name="use_two_phase_routing">Use 2-phase A* routing algorithm</string>
<string name="file_already_imported">File is already imported in OsmAnd</string>
@ -93,9 +93,9 @@
<string name="clear_osm_token">Clear OpenStreetMap OAuth token</string>
<string name="perform_oauth_authorization">Log in via OAuth</string>
<string name="perform_oauth_authorization_description">Log in with OAuth to use osmedit features</string>
<string name="use_native_pt_desc">Switch to Java (safe) Public Transport routing calculation</string>
<string name="use_native_pt_desc">Switch to Java (safe) Public Transport route calculation</string>
<string name="use_native_pt">Native Public Transport development</string>
<string name="use_fast_recalculation_desc">Recalculates only the initial part of the route. Can be used for long trips.</string>
<string name="use_fast_recalculation_desc">Recalculates only the initial part of the route, useful for long trips.</string>
<string name="complex_routing_descr">Two-phase routing for car navigation.</string>
<string name="use_live_routing">OsmAnd Live data</string>
<string name="use_live_public_transport">OsmAnd Live data</string>

3
OsmAnd/src/net/osmand/plus/AppInitializer.java
View file

@ -760,8 +760,7 @@ public class AppInitializer implements IProgress {
}
}
if(app.getSettings().SAVE_GLOBAL_TRACK_TO_GPX.get() && OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class) != null){
int interval = app.getSettings().SAVE_GLOBAL_TRACK_INTERVAL.get();
app.startNavigationService(NavigationService.USED_BY_GPX, app.navigationServiceGpsInterval(interval));
app.startNavigationService(NavigationService.USED_BY_GPX);
}
}

163
OsmAnd/src/net/osmand/plus/NavigationService.java
View file

@ -1,9 +1,6 @@
package net.osmand.plus;
import android.annotation.SuppressLint;
import android.app.AlarmManager;
import android.app.Notification;
import android.app.PendingIntent;
import android.app.Service;
import android.content.Context;
import android.content.Intent;
@ -11,13 +8,8 @@ import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.os.Binder;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.os.PowerManager;
import android.os.PowerManager.WakeLock;
import android.os.SystemClock;
import android.util.Log;
import android.widget.Toast;
@ -28,26 +20,17 @@ import net.osmand.plus.settings.backend.OsmandSettings;
public class NavigationService extends Service implements LocationListener {
public static class NavigationServiceBinder extends Binder {
}
// global id don't conflict with others
public static int USED_BY_NAVIGATION = 1;
public static int USED_BY_GPX = 2;
public final static String USAGE_INTENT = "SERVICE_USED_BY";
public final static String USAGE_OFF_INTERVAL = "SERVICE_OFF_INTERVAL";
private final NavigationServiceBinder binder = new NavigationServiceBinder();
private int serviceOffInterval;
private String serviceOffProvider;
private int serviceErrorTimeout;
private long nextManualWakeup;
private OsmandSettings settings;
private Handler handler;
private static WakeLock lockStatic;
private PendingIntent pendingIntent;
protected int usedBy = 0;
private OsmAndLocationProvider locationProvider;
@ -57,26 +40,6 @@ public class NavigationService extends Service implements LocationListener {
return binder;
}
protected synchronized static PowerManager.WakeLock getLock(Context context) {
if (lockStatic == null) {
PowerManager mgr = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
lockStatic = mgr.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "OsmAnd:NavigationServiceLock");
}
return lockStatic;
}
public long getNextManualWakeup() {
return nextManualWakeup;
}
public void setNextManualWakeup(long value) {
nextManualWakeup = value;
}
public int getServiceOffInterval() {
return serviceOffInterval;
}
public int getUsedBy() {
return usedBy;
}
@ -97,24 +60,7 @@ public class NavigationService extends Service implements LocationListener {
final Intent serviceIntent = new Intent(ctx, NavigationService.class);
ctx.stopService(serviceIntent);
} else {
// Issue #3604
final OsmandApplication app = (OsmandApplication) getApplication();
if ((usedBy == USED_BY_GPX) && (app.navigationServiceGpsInterval(app.getSettings().SAVE_GLOBAL_TRACK_INTERVAL.get()) != 0) && (serviceOffInterval == 0)) {
serviceOffInterval = app.getSettings().SAVE_GLOBAL_TRACK_INTERVAL.get();
setupServiceErrorTimeout();
app.setNavigationService(this);
AlarmManager alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
pendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(this, OnNavigationServiceAlarmReceiver.class), PendingIntent.FLAG_UPDATE_CURRENT);
nextManualWakeup = SystemClock.elapsedRealtime() + serviceOffInterval;
if (Build.VERSION.SDK_INT >= 23) {
alarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, pendingIntent);
} else if (Build.VERSION.SDK_INT >= 19) {
// setRepeating() became inexact starting with SDK 19
alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, pendingIntent);
} else {
alarmManager.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, serviceOffInterval, pendingIntent);
}
}
app.getNotificationHelper().updateTopNotification();
app.getNotificationHelper().refreshNotifications();
}
@ -122,46 +68,25 @@ public class NavigationService extends Service implements LocationListener {
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
handler = new Handler();
final OsmandApplication app = (OsmandApplication) getApplication();
settings = app.getSettings();
usedBy = intent.getIntExtra(USAGE_INTENT, 0);
serviceOffInterval = intent.getIntExtra(USAGE_OFF_INTERVAL, 0);
if ((usedBy & USED_BY_NAVIGATION) != 0) {
serviceOffInterval = 0;
}
// use only gps provider
serviceOffProvider = LocationManager.GPS_PROVIDER;
setupServiceErrorTimeout();
locationProvider = app.getLocationProvider();
app.setNavigationService(this);
// requesting
if (isContinuous()) {
// request location updates
LocationManager locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
try {
locationManager.requestLocationUpdates(serviceOffProvider, 0, 0, NavigationService.this);
} catch (SecurityException e) {
Toast.makeText(this, R.string.no_location_permission, Toast.LENGTH_LONG).show();
Log.d(PlatformUtil.TAG, "Location service permission not granted"); //$NON-NLS-1$
} catch (IllegalArgumentException e) {
Toast.makeText(this, R.string.gps_not_available, Toast.LENGTH_LONG).show();
Log.d(PlatformUtil.TAG, "GPS location provider not available"); //$NON-NLS-1$
}
} else {
AlarmManager alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
pendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(this, OnNavigationServiceAlarmReceiver.class), PendingIntent.FLAG_UPDATE_CURRENT);
nextManualWakeup = SystemClock.elapsedRealtime() + serviceOffInterval;
if (Build.VERSION.SDK_INT >= 23) {
alarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, pendingIntent);
} else if (Build.VERSION.SDK_INT >= 19) {
// setRepeating() became inexact starting with SDK 19
alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, pendingIntent);
} else {
alarmManager.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + 500, serviceOffInterval, pendingIntent);
}
// request location updates
LocationManager locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
try {
locationManager.requestLocationUpdates(serviceOffProvider, 0, 0, NavigationService.this);
} catch (SecurityException e) {
Toast.makeText(this, R.string.no_location_permission, Toast.LENGTH_LONG).show();
Log.d(PlatformUtil.TAG, "Location service permission not granted"); //$NON-NLS-1$
} catch (IllegalArgumentException e) {
Toast.makeText(this, R.string.gps_not_available, Toast.LENGTH_LONG).show();
Log.d(PlatformUtil.TAG, "GPS location provider not available"); //$NON-NLS-1$
}
// registering icon at top level
@ -185,20 +110,6 @@ public class NavigationService extends Service implements LocationListener {
// initializing variables
}
private boolean isContinuous() {
return serviceOffInterval == 0;
}
private void setupServiceErrorTimeout() {
serviceErrorTimeout = serviceOffInterval / 5;
// 1. not more than 12 mins
serviceErrorTimeout = Math.min(serviceErrorTimeout, 12 * 60 * 1000);
// 2. not less than 30 seconds
serviceErrorTimeout = Math.max(serviceErrorTimeout, 30 * 1000);
// 3. not more than serviceOffInterval
serviceErrorTimeout = Math.min(serviceErrorTimeout, serviceOffInterval);
}
@Override
public void onDestroy() {
super.onDestroy();
@ -212,20 +123,6 @@ public class NavigationService extends Service implements LocationListener {
} catch (SecurityException e) {
Log.d(PlatformUtil.TAG, "Location service permission not granted"); //$NON-NLS-1$
}
if (!isContinuous()) {
WakeLock lock = getLock(this);
if (lock.isHeld()) {
lock.release();
}
}
if (pendingIntent != null) {
// remove alarm
AlarmManager alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
alarmManager.cancel(pendingIntent);
}
// remove notification
stopForeground(Boolean.TRUE);
app.getNotificationHelper().updateTopNotification();
@ -237,47 +134,11 @@ public class NavigationService extends Service implements LocationListener {
}, 500);
}
@SuppressLint("MissingPermission")
public void onWakeUp() {
// request location updates
final LocationManager locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
try {
locationManager.requestLocationUpdates(serviceOffProvider, 0, 0, this);
if (serviceOffInterval > serviceErrorTimeout) {
handler.postDelayed(new Runnable() {
@Override
public void run() {
WakeLock lock = getLock(NavigationService.this);
if (lock.isHeld()) {
lock.release();
locationManager.removeUpdates(NavigationService.this);
}
}
}, serviceErrorTimeout);
}
} catch (RuntimeException e) {
// ignore
}
}
@Override
public void onLocationChanged(Location l) {
if (l != null && !settings.MAP_ACTIVITY_ENABLED.get()) {
net.osmand.Location location = OsmAndLocationProvider.convertLocation(l, (OsmandApplication) getApplication());
if (!isContinuous()) {
// unregister listener and wait next time
LocationManager locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
try {
locationManager.removeUpdates(this);
} catch (SecurityException e) {
Log.d(PlatformUtil.TAG, "Location service permission not granted"); //$NON-NLS-1$
}
WakeLock lock = getLock(this);
if (lock.isHeld()) {
lock.release();
}
}
locationProvider.setLocationFromService(location, isContinuous());
locationProvider.setLocationFromService(location);
}
}

51
OsmAnd/src/net/osmand/plus/OnNavigationServiceAlarmReceiver.java
View file

@ -1,51 +0,0 @@
package net.osmand.plus;
import android.annotation.SuppressLint;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.PowerManager.WakeLock;
import android.os.SystemClock;
public class OnNavigationServiceAlarmReceiver extends BroadcastReceiver {
@SuppressLint("WakelockTimeout")
@Override
public void onReceive(Context context, Intent intent) {
final WakeLock lock = NavigationService.getLock(context);
final NavigationService service = ((OsmandApplication) context.getApplicationContext()).getNavigationService();
// do not do nothing
if (service == null) {
return;
} else if (lock.isHeld()) {
rescheduleAlarm(context, service);
return;
}
lock.acquire();
rescheduleAlarm(context, service);
service.onWakeUp();
}
private void rescheduleAlarm(Context context, NavigationService service) {
//Unless setRepeating was used, manually re-schedule service to the next measurement point in the future
int serviceOffInterval = service.getServiceOffInterval();
if (Build.VERSION.SDK_INT >= 19 && serviceOffInterval > 0) {
// Avoid drift
while ((service.getNextManualWakeup() - SystemClock.elapsedRealtime()) < 0) {
service.setNextManualWakeup(service.getNextManualWakeup() + serviceOffInterval);
}
AlarmManager alarmManager = (AlarmManager) service.getSystemService(Context.ALARM_SERVICE);
PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 1, new Intent(context, OnNavigationServiceAlarmReceiver.class), PendingIntent.FLAG_UPDATE_CURRENT);
if (Build.VERSION.SDK_INT >= 23) {
alarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, service.getNextManualWakeup(), pendingIntent);
} else {
alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, service.getNextManualWakeup(), pendingIntent);
}
}
}
}

10
OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java
View file

@ -792,18 +792,16 @@ public class OsmAndLocationProvider implements SensorEventListener {
}
}
public void setLocationFromService(net.osmand.Location location, boolean continuous) {
public void setLocationFromService(net.osmand.Location location) {
if (locationSimulation.isRouteAnimating()) {
return;
}
if (location != null) {
notifyGpsLocationRecovered();
}
// if continuous notify about lost location
if (continuous) {
scheduleCheckIfGpsLost(location);
}
// notify about lost location
scheduleCheckIfGpsLost(location);
app.getSavingTrackHelper().updateLocation(location, heading);
OsmandPlugin.updateLocationPlugins(location);
app.getRoutingHelper().updateLocation(location);

22
OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file

@ -945,34 +945,14 @@ public class OsmandApplication extends MultiDexApplication {
}
}
public int navigationServiceGpsInterval(int interval) {
// Issue 5632 Workaround: Keep GPS always on instead of using AlarmManager, as API>=19 restricts repeated AlarmManager reception
// Maybe do not apply to API=19 devices, many still behave acceptably (often restriction not worse than 1/min)
if ((Build.VERSION.SDK_INT > 19) && (getSettings().SAVE_GLOBAL_TRACK_INTERVAL.get() < 5 * 60000)) {
return 0;
}
// Default: Save battery power by turning off GPS between measurements
if (interval >= 30000) {
return interval;
// GPS continuous
} else {
return 0;
}
}
public void startNavigationService(int intent, int interval) {
public void startNavigationService(int intent) {
final Intent serviceIntent = new Intent(this, NavigationService.class);
if (getNavigationService() != null) {
intent |= getNavigationService().getUsedBy();
interval = Math.min(getNavigationService().getServiceOffInterval(), interval);
getNavigationService().stopSelf();
}
serviceIntent.putExtra(NavigationService.USAGE_INTENT, intent);
serviceIntent.putExtra(NavigationService.USAGE_OFF_INTERVAL, interval);
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
startForegroundService(serviceIntent);
} else {

18
OsmAnd/src/net/osmand/plus/measurementtool/command/ReversePointsCommand.java
View file

@ -32,8 +32,22 @@ public class ReversePointsCommand extends MeasurementModeCommand {
MeasurementEditingContext editingCtx = getEditingCtx();
oldPoints = new ArrayList<>(editingCtx.getPoints());
oldRoadSegmentData = editingCtx.getRoadSegmentData();
newPoints = new ArrayList<>(oldPoints);
Collections.reverse(newPoints);
newPoints = new ArrayList<>(oldPoints.size());
for (int i = oldPoints.size() - 1; i >= 0; i--) {
WptPt point = oldPoints.get(i);
WptPt prevPoint = i > 0 ? oldPoints.get(i - 1) : null;
WptPt newPoint = new WptPt(point);
newPoint.copyExtensions(point);
if (prevPoint != null) {
String profileType = prevPoint.getProfileType();
if (profileType != null) {
newPoint.setProfileType(profileType);
} else {
newPoint.removeProfileType();
}
}
newPoints.add(newPoint);
}
executeCommand();
return true;
}

3
OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
View file

@ -500,8 +500,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
settings.SAVE_GLOBAL_TRACK_INTERVAL.set(vs.value);
settings.SAVE_GLOBAL_TRACK_TO_GPX.set(true);
settings.SAVE_GLOBAL_TRACK_REMEMBER.set(choice.value);
int interval = settings.SAVE_GLOBAL_TRACK_INTERVAL.get();
app.startNavigationService(NavigationService.USED_BY_GPX, app.navigationServiceGpsInterval(interval));
app.startNavigationService(NavigationService.USED_BY_GPX);
}
};
if (choice.value || map == null) {

4
OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
View file

@ -164,7 +164,7 @@ public class RoutingHelper {
app.getNotificationHelper().refreshNotifications();
}
} else {
app.startNavigationService(NavigationService.USED_BY_NAVIGATION, 0);
app.startNavigationService(NavigationService.USED_BY_NAVIGATION);
}
}
@ -183,7 +183,7 @@ public class RoutingHelper {
app.getNotificationHelper().refreshNotifications();
}
} else {
app.startNavigationService(NavigationService.USED_BY_NAVIGATION, 0);
app.startNavigationService(NavigationService.USED_BY_NAVIGATION);
}
}

4
OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/AlarmWidget.java
View file

@ -116,7 +116,9 @@ public class AlarmWidget {
} else if (alarm.getType() == AlarmInfo.AlarmInfoType.STOP) {
locimgId = R.drawable.warnings_stop;
} else if (alarm.getType() == AlarmInfo.AlarmInfoType.RAILWAY) {
if (americanType) {
if (isCanadianRegion) {
locimgId = R.drawable.warnings_railways_ca;
} else if (americanType) {
locimgId = R.drawable.warnings_railways_us;
} else {
locimgId = R.drawable.warnings_railways;