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

Merge branch 'master' of https://github.com/osmandapp/Osmand

Browse source
This commit is contained in:
Alexey Kulish 2016-07-25 20:51:08 +03:00
commit 6c0888b3f1
15 changed files with 267 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
OsmAnd/res/drawable-hdpi/ic_direction_arrow.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
OsmAnd/res/drawable-mdpi/ic_direction_arrow.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
OsmAnd/res/drawable-xhdpi/ic_direction_arrow.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
OsmAnd/res/drawable-xxhdpi/ic_direction_arrow.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

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

@ -2191,4 +2191,9 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
<string name="osmo_create_groups_confirm">من أجل إنشاء مجموعات يجب أن تكون مستخدما مسجلا في OsMo.</string>
<string name="osmo_set_moving_target">تعيين كهدف متنقل</string>
<string name="osmo_group">مجموعة أوسمو OsMo</string>
<string name="show_something_on_map">اظهر %1$s على الخريطة</string>
<string name="release_2_4">" باحث نصوص جديد مجاني وكفئ.\n\nتحسين الصوت كثيرا عن طريق البلوتوث.\n\nتحسين مرشد الطرقات مع التفاف الممرات.\n\nالعديد من التحسينات الاخرى واصلاح الخلل.\n\nواكثر … "</string>
<string name="dist_away_from_my_location">%1$s بعيد</string>
<string name="show_on_map">اظهر على الخريطة</string>
<string name="share_history_subject">" تمت مشاركته من طرف OsmAnd"</string>
</resources>

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

@ -2394,4 +2394,6 @@
<string name="share_history_subject">" Delt via OsmAnd"</string>
<string name="show_on_map">Vis på kortet</string>
<string name="release_2_4">" • Ny meget kraftfuld fritekstsøgning.\n\n • Meget forbedret lyd via Bluetooth.\n\n • Forbedret rutevejledning med svingbaner.\n\n • Mange andre forbedringer og fejlrettelser.\n\n og mere… "</string>
<string name="show_something_on_map">Vis %1$s på kortet</string>
<string name="dist_away_from_my_location">%1$s væk</string>
</resources>

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

@ -2007,4 +2007,30 @@
<string name="poi_crop_grass">Kultivaĵo: herbo</string>
<string name="poi_crop_corn">Kultivaĵo: maizo</string>
<string name="poi_crop_cereal">Kultivaĵo: panherbo</string>
<string name="poi_crop_sugarcane">Kultivaĵo: sukerkano</string>
<string name="poi_crop_wheat">Kultivaĵo: tritiko</string>
<string name="poi_crop_soy">Kultivaĵo: sojo</string>
<string name="poi_crop_barley">Kultivaĵo: hordeo</string>
<string name="poi_crop_vegetables">Kultivaĵo: legomoj</string>
<string name="poi_crop_hop">Kultivaĵo: lupulo</string>
<string name="poi_crop_rape">Kultivaĵo: kolzo</string>
<string name="poi_crop_beet">Kultivaĵo: beto</string>
<string name="poi_crop_lavender">Kultivaĵo: lavendo</string>
<string name="poi_crop_tea">Kultivaĵo: teo</string>
<string name="poi_crop_coffee">Kultivaĵo: kafarbo</string>
<string name="poi_crop_poultry">Kultivaĵo: manĝaĵo por kortobirdoj</string>
<string name="poi_crop_sunflower">Kultivaĵo: sunfloro (helianto)</string>
<string name="poi_crop_raspberry">Kultivaĵo: frambo</string>
<string name="poi_crop_tobacco">Kultivaĵo: tabako</string>
<string name="poi_crop_strawberry">Kultivaĵo: frago</string>
<string name="poi_crop_vegetables_flowers">Kultivaĵo: legomoj, floroj</string>
<string name="poi_crop_cassava">Kultivaĵo: manioko</string>
<string name="poi_crop_cranberry">Kultivaĵo: oksikoko</string>
<string name="poi_crop_asparagus">Kultivaĵo: asparago</string>
<string name="poi_crop_flowers">Kultivaĵo: floroj</string>
<string name="poi_surveillance_indoor">Fara kontrolado: ene</string>
<string name="poi_surveillance_outdoor">Fara kontrolado: ekstere</string>
<string name="poi_surveillance_public">Fara kontrolado: publika ejo</string>
</resources>

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

@ -2021,4 +2021,7 @@
<string name="lang_hsb">Soraba Supra</string>
<string name="share_history_subject">" kunhavigita per OsmAnd"</string>
<string name="show_on_map">Montri sur la mapo</string>
<string name="show_something_on_map">Montri %1$s sur la mapo</string>
<string name="release_2_4">" • Nova ebloplena tekstoserĉilo.\n\n• Plibonigitaj aŭd-sciigoj per Bludento.\n\n• Plibonigita elekto de koridoro dum navigado.\n\n• Multaj aliaj plibonigoj kaj korektoj.\n\nkaj pli... "</string>
<string name="dist_away_from_my_location">%1$s ankoraŭ</string>
</resources>

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

@ -2205,4 +2205,6 @@
<string name="release_2_4">" • Nueva búsqueda de texto libre muy potente.
\n\n • Muchas mejoras de audio mediante Bluetooth.\n\n • Mejoras en las indicaciones por voz con carriles de giro.
\n\n • Muchas otras mejoras y correcciones de errores.\n\n y más… "</string>
<string name="show_something_on_map">Mostrar %1$s en el mapa</string>
<string name="dist_away_from_my_location">a %1$s</string>
</resources>

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

@ -111,7 +111,7 @@
<string name="shared_string_more_actions">Bestelako ekintzak</string>
<string name="layer_hillshade">Erliebe geruza</string>
<string name="layer_hillshade">Erliebe-itzalak geruza</string>
<string name="map_widget_gps_info">GPS informazioa</string>
<string name="access_arrival_time">Iritsiera denbora</string>
@ -124,7 +124,7 @@
<string name="max_speed_none">bat ere ez</string>
<string name="index_name_openmaps">OpenMaps EU</string>
<string name="download_hillshade_maps">Erliebe itzalak</string>
<string name="download_hillshade_maps">Erliebe-itzalak</string>
<string name="local_indexes_cat_srtm">Sestra-kurbak</string>
@ -725,8 +725,8 @@
<string name="shared_string_previous">Aurrekoa</string>
<string name="unit_of_length_descr">Aldatu luzera unitateak</string>
<string name="unit_of_length">Luzera unitatea</string>
<string name="si_mi_foots">Milak/oinak</string>
<string name="si_mi_yard">Milak/yardak</string>
<string name="si_mi_foots">Miliak/oinak</string>
<string name="si_mi_yard">Miliak/yardak</string>
<string name="si_km_m">Kilometroak/metroak</string>
<string name="yard">yd</string>
<string name="foot">oin</string>
@ -1342,7 +1342,7 @@
<string name="osmo_mode_off">Hasi OsMo saioa</string>
<string name="osmo_settings_debug">Debugeatzeko informazioa</string>
<string name="voice_pref_title">Ahotsa</string>
<string name="misc_pref_title">Nahaste</string>
<string name="misc_pref_title">Denetarik</string>
<string name="localization_pref_title">Kokapena</string>
<string name="lang_zh">Txinoa</string>
<string name="lang_pt_br">Portugalera (Brasil)</string>
@ -1605,7 +1605,7 @@
<string name="shared_string_import2osmand">Inportatu OsmAnd-era</string>
<string name="read_full_article">Irakurri artikulu osoa (linean)</string>
<string name="shared_string_wikipedia">Wikipedia</string>
<string name="local_indexes_cat_wiki"/>
<string name="local_indexes_cat_wiki">Wikipedia</string>
<string name="shared_string_show_details">Erakutsi xehetasunak</string>
<string name="osm_edit_context_menu_delete">Ezabatu OSM edizioa</string>
<string name="rendering_value_disabled_name">Ezgaituta</string>
@ -1827,4 +1827,219 @@
<string name="map_downloaded_descr">%1$s mapa deskargatu da. Joan atzera mapara erabiltzen hasteko.</string>
<string name="file_name_containes_illegal_char">Fitxategiaren izenak karaktere baliogaberen bat du</string>
</resources>
<string name="show_something_on_map">Erakutsi %1$s mapan</string>
<string name="release_2_4">" • Testu librearen bilaketa boteretsu berria.
\n\n • Asko hobetutako Bluetooth bidezko audioa.\n\n • Hobetutako ibilbide gidatzea erraia aldaketarekin.
\n\n • Hobekuntzak eta konpondutako arazoak.\n\neta gehiago… "</string>
<string name="dist_away_from_my_location">%1$sra</string>
<string name="show_on_map">Erakutsi mapan</string>
<string name="share_history_subject">" OsmAnd bidez partekatua"</string>
<string name="search_categories">Kategoriak</string>
<string name="postcode">Postakodea</string>
<string name="shared_string_from">nondik</string>
<string name="city_type_district">Distritua</string>
<string name="city_type_neighbourhood">Auzoa</string>
<string name="map_widget_search">Bilatu</string>
<string name="shared_string_is_open_24_7">24/7 irekita</string>
<string name="storage_directory_card">Memoria txartela</string>
<string name="hillshade_layer_disabled">Erliebe-itzalak geruza desgaituta</string>
<string name="nm">nmi</string>
<string name="si_nm">Itsas miliak</string>
<string name="si_mph">Miliak orduko</string>
<string name="si_min_m">Minutuak miliako</string>
<string name="si_nm_h">Itsas miliak orduko (korapiloak)</string>
<string name="nm_h">nmi/h</string>
<string name="av_locations_descr">GPX fitxategia ohar-kokapenekin</string>
<string name="traffic_warning_hazard">Arriskua</string>
<string name="rendering_value_boldOutline_name">Ingerada lodia</string>
<string name="download_live_updates">Berehalako eguneraketak</string>
<string name="rendering_value_defaultTranslucentCyan_name">Lehenetsitakoa (Urdin gardena)</string>
<string name="rendering_attr_currentTrackColor_name">GPX kolorea</string>
<string name="rendering_attr_currentTrackColor_description">GPX kolorea</string>
<string name="rendering_attr_currentTrackWidth_name">GPX zabalera</string>
<string name="rendering_attr_currentTrackWidth_description">GPX zabalera</string>
<string name="rendering_value_purple_name">Purpura</string>
<string name="rendering_value_translucent_purple_name">Purpura gardena</string>
<string name="lang_bn">Bengalera</string>
<string name="lang_br">Bretoiera</string>
<string name="lang_sq">Albaniera</string>
<string name="lang_is">Islandiera</string>
<string name="lang_bpy">Bishnupriya</string>
<string name="lang_ga">Irlandera</string>
<string name="lang_la">Latina</string>
<string name="lang_ku">Kurduera</string>
<string name="lang_eo">Esperantoa</string>
<string name="lang_es_us">Espainiera (Amerikarra)</string>
<string name="lang_es_ar">Espainiera (Argentina)</string>
<string name="lang_nb">Norbegiera (Bokmål)</string>
<string name="lang_vo">Volapuk</string>
<string name="lang_th">Thailandiera</string>
<string name="lang_nn">Norvegiera (Nynorsk)</string>
<string name="lang_ms">Malaysiera</string>
<string name="lang_gl">Galiziera</string>
<string name="lang_et">Estoniera</string>
<string name="lang_ast">Asturiera</string>
<string name="disable_recording_once_app_killed">Eragotzi bigarren planoko egunkaria</string>
<string name="disable_recording_once_app_killed_descrp">GPX erregistroa geldiaraziko du aplikazioa hiltzean (azken aplikazioak pantailaren bidez). (OsmAnd bigarren planoan dabilela adierazten duen ikonoa Android jakinarazpen barratik desagertuko da)</string>
<string name="rendering_value_walkingRoutesOSMC_name">OSMC araberako koloreztatzea</string>
<string name="application_dir_change_warning3">OsmAnd aplikazioak bere datu fitxategiak xede berrira kopiatzea nahi duzu ere?</string>
<string name="storage_directory_multiuser">Erabiltzaile anitzeko biltegiratzea</string>
<string name="rendering_attr_OSMMapperAssistant_name">OSM kartografia laguntzailea</string>
<string name="welcome_select_region">Trafiko seinaleak eta arauak ongi adierazteko, mesedez hautatu zure gidatze eremua:</string>
<string name="welcome_text">OsmAnd aplikazioak internet gabeko mapen araketa globala eta internet gabeko nabigazio globala eskaintzen du!</string>
<string name="osm_changes_added_to_local_edits">OSM aldaketak tokiko aldaketa multzora gehituta</string>
<string name="osmand_parking_hour">h</string>
<string name="shared_string_collapse">Tolestu</string>
<string name="plugin_touringview_name">Mapa turistikoa ikuspegia</string>
<string name="plugin_nautical_name">Itsas mapa ikuspegia</string>
<string name="rename_failed">Izen aldaketak huts egin du.</string>
<string name="days_behind">egun atzeratua</string>
<string name="back_to_map">Itzuli mapara</string>
<string name="share_note">Partekatu oharra</string>
<string name="location_on_map">Kokapena:\n Lat %1$s\n Lon %2$s</string>
<string name="notes">Oharrak</string>
<string name="online_map">Sareko mapa</string>
<string name="rendering_attr_pisteRoutes_name">Ski pistak</string>
<string name="free">"%1$s libre "</string>
<string name="device_memory">Gailuaren memoria</string>
<string name="world_ski_missing">Ski pistak ikusteko, lineaz kanpoko mapa bereziak deskargatu behar dira</string>
<string name="nautical_maps_missing">Itsas mapak bistaratzeko, lineaz kanpoko mapa bereziak deskargatu behar dira</string>
<string name="edit_group">Editatu taldea</string>
<string name="parking_place">Aparkalekua</string>
<string name="remove_the_tag">KENDU ETIKETA</string>
<string name="gps_status">GPSaren egoera</string>
<string name="version_settings_descr">Deskargatu gaueroko konpilaketak</string>
<string name="version_settings">Konpilaketak</string>
<string name="rendering_attr_streetLighting_name">Kale argitzea</string>
<string name="proxy_pref_title">Proxya</string>
<string name="proxy_pref_descr">Ezarri proxy bidezko internet sarbidea</string>
<string name="settings_privacy">Pribatutasuna</string>
<string name="points">Puntuak</string>
<string name="speak_pedestrian">Zebrabideak</string>
<string name="rendering_value__name">Lehenetsia</string>
<string name="rendering_value_default_name">Lehenetsia</string>
<string name="traffic_warning_pedestrian">Zebrabidea</string>
<string name="show_pedestrian_warnings">Zebrabideak</string>
<string name="routing_attr_no_new_routing_name">v1.9 nabigazio araurik gabe</string>
<string name="routing_attr_no_new_routing_description">Ez erabili 1.9 bertsioan sartutako nabigazio arauak</string>
<string name="dash_download_msg_none">Lineaz kanpoko mapak deskargatu nahi dituzu?</string>
<string name="dash_download_msg">%1$s mapa deskargatu dituzu</string>
<string name="dash_download_new_one">Deskargatu mapa berria</string>
<string name="dash_download_manage">Kudeatu</string>
<string name="map_locale">Maparen hizkuntza</string>
<string name="rendering_attr_transportStops_name">Garraioaren geldialdiak</string>
<string name="navigate_point_zone">Zonaldea</string>
<string name="download_tab_downloads">Deskarga guztiak</string>
<string name="download_tab_updates">Eguneraketak</string>
<string name="download_tab_local">Tokikoa</string>
<string name="no_internet_connection">Ezin izan da deskargatu, egiaztatu zure internet konexioa.</string>
<string name="everything_up_to_date">Fitxategi guztiak egunean daude</string>
<string name="use_opengl_render">Erabili OpenGL errendatzea</string>
<string name="use_opengl_render_descr">Erabili hardware bidez azkartutako OpenGL errendatzea (ez dabil gailu guztietan)</string>
<string name="error_avoid_specific_road">Ez da saihesbiderik aurkitu</string>
<string name="home_button">Hasiera</string>
<string name="map_update">Eguneraketak eskuragarri %1$s mapentzako</string>
<string name="search_for">Bilatu</string>
<string name="coordinates">Koordenatuak</string>
<string name="lock_screen_request_explanation">"%1$s aplikazioak pantaila itzaltzeko baimen hau behar du energia aurrezteko ezaugarriarentzat."</string>
<string name="wake_on_voice">Piztu pantaila</string>
<string name="wake_on_voice_descr">Piztu pantaila (itzalita badago) bihurgune batera hurbiltzean</string>
<string name="rendering_category_hide">Ezkutatu</string>
<string name="rendering_category_details">Xehetasunak</string>
<string name="rendering_category_transport">Garraioa</string>
<string name="rendering_category_others">Maparen beste ezaugarri batzuk</string>
<string name="map_widget_appearance_rem">Geratzen diren elementuak</string>
<string name="map_widget_top">Egoera barra</string>
<string name="map_widget_right">Eskumako panela</string>
<string name="map_widget_left">Ezkerreko panela</string>
<string name="osmo_device_not_found">Ez da gailua aurkitu</string>
<string name="anonymous_user">Erabiltzaile anonimoa</string>
<string name="logged_as">%1$s bezala hasi duzu saioa</string>
<string name="speed_limit_exceed">Abiadura mugaren tolerantzia</string>
<string name="speed_limit_exceed_message">Hautatu abiadura mugaren tolerantzia, gainditutakoan ahots bidezko abisua jasoko duzu.</string>
<string name="fav_point_dublicate">Gogoko puntuaren izen bikoiztua</string>
<string name="text_size_descr">Ezarri mapako testu-tamaina.</string>
<string name="text_size">Testu-tamaina</string>
<string name="traffic_warning_speed_limit">Abiadura muga</string>
<string name="traffic_warning_border_control">Muga kontrola</string>
<string name="traffic_warning_payment">Bidesaria</string>
<string name="traffic_warning_stop">Stop seinalea</string>
<string name="traffic_warning_calming">Abiadura murriztailea</string>
<string name="traffic_warning">Trafiko abisua</string>
<string name="speak_favorites">Inguruneko gogokoak</string>
<string name="way_alarms">Trafiko abisuak</string>
<string name="confirm_every_run">Galdetu beti</string>
<string name="int_hour">h</string>
<string name="duration">Iraupena</string>
<string name="distance">Distantzia</string>
<string name="index_tours">Ibilaldiak</string>
<string name="shared_string_all">Guztiak</string>
<string name="targets">Helburuak</string>
<string name="rendering_value_browse_map_name">Arakatu mapa</string>
<string name="rendering_value_car_name">Kotxea</string>
<string name="rendering_value_bicycle_name">Bizikleta</string>
<string name="rendering_value_pedestrian_name">Oinezkoa</string>
<string name="rendering_attr_hideAccess_name">Sarbide murrizketak</string>
<string name="rendering_attr_showAccess_name">Erakutsi sarbide murrizketak eta bidesariak</string>
<string name="osmo_group_by_invite">Sartu gonbidapen bidez</string>
<string name="osmo_group_information">Mesedez irakurri talde bat sortu aurretik!</string>
<string name="osmo_not_signed_in">OsMo saioa hasteak huts egin du</string>
<string name="osmo_auto_connect_descr">Automatikoki konektatu zerbitzura aplikazioa abiarazi eta gero</string>
<string name="osmo_auto_connect">Automatikoki konektatu</string>
<string name="local_index_select_gpx_file">Hautatu erakusteko</string>
<string name="sort_by_distance">Ordenatu distantziaren arabera</string>
<string name="sort_by_name">Ordenatu izenaren arabera</string>
<string name="show_zoom_buttons_navigation">Erakutsi zoom botoiak</string>
<string name="save_as_favorites_points">Gorde gogokoen talde gisa</string>
<string name="select_destination_and_intermediate_points">Hautatu helburuak</string>
<string name="layer_amenity_label">Puntuen etiketak</string>
<string name="osmo_user_joined">%1$s erabiltzailea %2$s taldera batu da</string>
<string name="osmo_user_left">%1$s erabiltzaileak %2$s taldea utzi du</string>
<string name="lang_sh">Serbokroaziera</string>
<string name="lang_nv">Navajoa</string>
<string name="lang_ta">Tamilera</string>
<string name="lang_ml">Malabarera</string>
<string name="lang_lb">Luxenburgera</string>
<string name="lang_os">Osetiera</string>
<string name="lang_te">Telugu</string>
<string name="lang_ht">Haitiko kreolera</string>
<string name="lang_ceb">Cebuera</string>
<string name="lang_hsb">Goi-sorabiera</string>
<string name="simulate_initial_startup_descr">Lehen abioaren marka ezartzen du, beste ezarpen guztiak ukitu gabe</string>
<string name="lang_pms">Piemontera</string>
<string name="lang_tl">Tagalo</string>
<string name="lang_az">Azerbaijanera</string>
<string name="lang_new"/>
<string name="delay_to_start_navigation">Hasi biraz-birako nabigazioa hau eta gero…</string>
<string name="delay_navigation_start">Hasi biraz-birako gidaketa automatikoki</string>
<string name="watch">Ikusi</string>
<string name="search_radius_proximity">Erradioa</string>
<string name="save_global_track_interval">Erregistro tarte orokorra</string>
<string name="save_track_to_gpx_globally_descr">Kokaleku orokorra GPX fitxategian erregistratzea gaitu eta desgaitu daiteke mapa pantailako GPX erregistro trepetarekin</string>
<string name="save_track_interval_globally">Erregistroaren tartea</string>
<string name="enable_proxy_title">Gaitu HTTP proxya</string>
<string name="enable_proxy_descr">Konfiguratu HTTP proxya sare eskaera guztietarako</string>
<string name="proxy_host_title">Proxy ostalaria</string>
<string name="proxy_host_descr">Konfiguratu zure proxyaren ostalari izena (adib. 127.0.0.1)</string>
<string name="proxy_port_title">Proxyaren ataka</string>
<string name="proxy_port_descr">Konfiguratu zure proxyaren ataka zenbakia (adib. 8118)</string>
<string name="download_additional_maps">Deskargatu falta diren mapak %1$s (%2$d MB)?</string>
<string name="number_of_edits">Edizio kopurua</string>
<string name="number_of_contributors">Kolaboratzaile kopurua</string>
<string name="night">Gauez</string>
<string name="select_month_and_country">Hautatu hilabetea eta herrialdea</string>
<string name="last_map_change">Maparen azken aldaketa: %s</string>
<string name="hourly">Orduero</string>
<string name="daily">Egunero</string>
<string name="weekly">Astero</string>
<string name="morning">Goizez</string>
<string name="last_update">Azken eguneraketa: %s</string>
<string name="update_time">Eguneraketa ordua</string>
<string name="updates_size">Eguneraketaren tamaina</string>
<string name="only_download_over_wifi">Deskargatu Wi-Fi bidez besterik ez</string>
<string name="live_update">Berehalako eguneraketa</string>
<string name="update_now">Eguneratu orain</string>
<string name="missing_write_external_storage_permission">Aplikazioak ez du SD txartela erabiltzeko baimenik</string>
<string name="dashboard_or_drawer_title">Kontrol panela edo kontrol menua</string>
</resources>

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

@ -2226,4 +2226,7 @@
<string name="lang_hsb">Górnołużycki</string>
<string name="share_history_subject">" udostępnione przez OsmAnd"</string>
<string name="show_on_map">Pokaż na mapie</string>
<string name="show_something_on_map">Pokaż %1$s na mapie</string>
<string name="release_2_4">" • Nowa wszechstronna metoda wyszukiwania tekstowego.\n\n• Ulepszono działanie z zestawem audio Bleutooth.\n\n• Poprawiono wybór pasów ruchów podczas skrętów.\n\n• Mnóstwo innych ulepszeń i poprawek.\n\ni więcej... "</string>
<string name="dist_away_from_my_location">%1$s pozostało</string>
</resources>

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

@ -2223,4 +2223,6 @@
<string name="show_on_map">Ammustra in sa mapa</string>
<string name="share_history_subject">" cumpartzidu pro mèdiu de OsmAnd"</string>
<string name="lang_hsb">Sorabu (superiore)</string>
<string name="show_something_on_map">Ammustra %1$s in sa mapa</string>
<string name="dist_away_from_my_location">a %1$s dae inoghe</string>
</resources>

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

@ -410,9 +410,6 @@ public class OsmandApplication extends MultiDexApplication {
}
} else {
// Test for Issues #1351 and #2810
//player = null;
if (player == null || !Algorithms.objectEquals(voiceProvider, player.getCurrentVoice()) || force) {
appInitializer.initVoiceDataInDifferentThread(uiContext, voiceProvider, run, showDialog);
}

1
OsmAnd/src/net/osmand/plus/voice/MediaCommandPlayerImpl.java
View file

@ -61,6 +61,7 @@ public class MediaCommandPlayerImpl extends AbstractPrologCommandPlayer implemen
if (mediaPlayer != null){
mediaPlayer.stop();
}
// TODO: Issue #2810: Audio focus issues when "off route" is detected during an ongoing prompt (then stop() is called here)
if (ctx != null) {
abandonAudioFocus();
}

1
OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java
View file

@ -134,6 +134,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
if (mTts != null){
mTts.stop();
}
// TODO: Issue #2810: Audio focus issues when "off route" is detected during an ongoing prompt (then stop() is called here)
if (ctx != null) {
abandonAudioFocus();
}