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

Merge branch 'master' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch

Browse source
This commit is contained in:
Alexander Sytnyk 2017-10-02 10:41:50 +03:00
commit 09678d4d7a
31 changed files with 949 additions and 530 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/build.gradle
View file

@ -18,7 +18,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 26
buildToolsVersion "26.0.0"
buildToolsVersion "26.0.1"
signingConfigs {
development {
@ -385,10 +385,10 @@ dependencies {
// compile project(':eclipse-compile:design')
// compile project(':eclipse-compile:cardview')
// compile project(':eclipse-compile:gridlayout')
compile 'com.android.support:gridlayout-v7:25.+'
compile 'com.android.support:cardview-v7:25.+'
compile 'com.android.support:appcompat-v7:25.+'
compile 'com.android.support:design:25.+'
compile 'com.android.support:gridlayout-v7:26.1.0'
compile 'com.android.support:cardview-v7:26.1.0'
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:design:26.1.0'
compile fileTree(include: ['*.jar'], exclude: ['QtAndroid-bundled.jar', 'QtAndroidAccessibility-bundled.jar', 'OsmAndCore_android.jar', 'OsmAndCore_wrapper.jar', 'android-support-multidex.jar'], dir: 'libs')
legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"

25
OsmAnd/res/values-ar/phrases.xml
View file

@ -1582,4 +1582,29 @@
<string name="poi_running_track">مسار جري</string>
<string name="poi_raceway">مضمار سباق</string>
<string name="poi_archery">الرماية</string>
<string name="poi_turning_circle">دائرة دوران</string>
<string name="poi_waterway_turning_point">نقطة دوران في مجرى مائي</string>
<string name="poi_forest">غابة محمية</string>
<string name="poi_brownfield">أرض صناعية سابقة</string>
<string name="poi_greenfield">حقل أخضر</string>
<string name="poi_works">يعمل</string>
<string name="poi_mineshaft">منجم تعدين</string>
<string name="poi_adit">ممر منجم</string>
<string name="poi_gasometer">مقياس الغاز</string>
<string name="poi_silo">صومعة</string>
<string name="poi_bailiff">مأمور</string>
<string name="poi_baby_hatch">حافظة رضيع</string>
<string name="poi_9pin">بولينج 9 دبابيس</string>
<string name="poi_10pin">بولينج 10 دبابيس</string>
<string name="poi_boules">الكرة الحديدية</string>
<string name="poi_cycling">ركوب الدراجات</string>
<string name="poi_field_hockey">حقل هوكي</string>
<string name="poi_golf">غولف</string>
<string name="poi_korfbal">كرة السلة الهولندية</string>
<string name="poi_racquet">المضرب</string>
<string name="poi_roller_skating">تزحلق بالعجلات</string>
<string name="poi_shooting">الرماية</string>
<string name="poi_surfing">ركوب الأمواج</string>
<string name="poi_artwork">عمل فني</string>
<string name="poi_battlefield">ميدان معركة</string>
</resources>

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

@ -2803,4 +2803,11 @@
<string name="marker_save_as_track">حفظ كمسار</string>
<string name="move_to_history">العودة إلى السجل الزمني</string>
<string name="group_will_be_removed_after_restart">ستتم إزالة المجموعة بعد إعادة التشغيل</string>
<string name="shared_string_markers">علامات</string>
<string name="coordinates_format">نسق الإحداثيات</string>
<string name="use_system_keyboard">استخدم لوحة مفاتيح النظام</string>
<string name="fast_coordinates_input_descr">اختر نسق إدخال الأحداثيات. يمكنك دائماً تغييره بالنقر على خيارات.</string>
<string name="fast_coordinates_input">إدخال إحداثيات سريع</string>
<string name="routing_attr_avoid_ice_roads_fords_name">تجنب الطرق الجليدية، المعابر</string>
<string name="routing_attr_avoid_ice_roads_fords_description">تجنب الطرق الجليدية والمعابر</string>
</resources>

17
OsmAnd/res/values-be-rBY/strings.xml
View file

@ -2832,17 +2832,17 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
<string name="widget">Vidžet</string>
<string name="top_bar">Vierchniaja paneĺ</string>
<string name="remove_from_map_markers">Vydalić z markieraŭ mapy</string>
<string name="descendingly">Pa zmianšenni</string>
<string name="ascendingly">Pa ŭzrastanni</string>
<string name="descendingly">pa zmianšenni</string>
<string name="ascendingly">pa ŭzrastanni</string>
<string name="date_added">Data dadadzienaja</string>
<string name="order_by">Sartavać pa:</string>
<string name="show_guide_line">Pakazać liniju kirunku</string>
<string name="show_arrows_on_the_map">Pakazać strelki na karcie</string>
<string name="show_passed">Pakazać datu apošniaha vykarystannia</string>
<string name="hide_passed">Schavać datu apošniaha vykarystannia</string>
<string name="use_location">Vykarystoŭvać miescaznachodžannie</string>
<string name="add_location_as_first_point_descr">Dadać vaša miescaznachodžannie jak pieršuju kropku pry planavanni maršrutu.</string>
<string name="my_location">Majo miescaznachodžannie</string>
<string name="use_location">Vykarystoŭvać stanovišča</string>
<string name="add_location_as_first_point_descr">Dadać vaša stanovišča jak pieršuju kropku pry planavanni maršrutu.</string>
<string name="my_location">Majo stanovišča</string>
<string name="shared_string_finish">Finiš</string>
<string name="plan_route">Pranavać maršrut</string>
<string name="shared_string_sort">Sartavać</string>
@ -2852,4 +2852,11 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
<string name="marker_save_as_track">Zachavać jak slied</string>
<string name="move_to_history">Pieramiascić u historyju</string>
<string name="group_will_be_removed_after_restart">Hrupa budzie vydalienaja paslia pierazapusku</string>
<string name="shared_string_markers">Markiery</string>
<string name="coordinates_format">Farmat kaardynat</string>
<string name="use_system_keyboard">Vykarystoŭvać sistemnuju klavijaturu</string>
<string name="fast_coordinates_input_descr">Abrać farmat uvodu kaardynat. Vy zaŭsiody možacie zmianić jaho, nacisnuŭšy nalady.</string>
<string name="fast_coordinates_input">Chutki ŭvod kaardynat</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Pazbiahać liadovych daroh i brodaŭ</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Pazbiahaje liadovyja darohi i brody</string>
</resources>

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

@ -2881,17 +2881,17 @@
<string name="widget">Віджэт</string>
<string name="top_bar">Верхняя панэль</string>
<string name="remove_from_map_markers">Выдаліць з маркераў мапы</string>
<string name="descendingly">Па змяншэнні</string>
<string name="ascendingly">Па ўзрастанні</string>
<string name="descendingly">па змяншэнні</string>
<string name="ascendingly">па ўзрастанні</string>
<string name="date_added">Дата дададзеная</string>
<string name="order_by">Сартаваць па:</string>
<string name="show_guide_line">Паказаць лінію кірунку</string>
<string name="show_arrows_on_the_map">Паказаць стрэлкі на карце</string>
<string name="show_passed">Паказаць дату апошняга выкарыстання</string>
<string name="hide_passed">Схаваць дату апошняга выкарыстання</string>
<string name="use_location">Выкарыстоўваць месцазнаходжанне</string>
<string name="add_location_as_first_point_descr">Дадаць ваша месцазнаходжанне як першую кропку пры планаванні маршруту.</string>
<string name="my_location">Маё месцазнаходжанне</string>
<string name="use_location">Выкарыстоўваць становішча</string>
<string name="add_location_as_first_point_descr">Дадаць ваша становішча як першую кропку пры планаванні маршруту.</string>
<string name="my_location">Маё становішча</string>
<string name="shared_string_finish">Фініш</string>
<string name="plan_route">Пранаваць маршрут</string>
<string name="shared_string_sort">Сартаваць</string>
@ -2901,4 +2901,11 @@
<string name="marker_save_as_track">Захаваць як след</string>
<string name="move_to_history">Перамясціць у гісторыю</string>
<string name="group_will_be_removed_after_restart">Група будзе выдаленая пасля перазапуску</string>
<string name="shared_string_markers">Маркеры</string>
<string name="coordinates_format">Фармат каардынат</string>
<string name="use_system_keyboard">Выкарыстоўваць сістэмную клавіятуру</string>
<string name="fast_coordinates_input_descr">Абраць фармат уводу каардынат. Вы заўсёды можаце змяніць яго, націснуўшы налады.</string>
<string name="fast_coordinates_input">Хуткі ўвод каардынат</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Пазбягаць лядовых дарог і бродаў</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Пазбягае лядовыя дарогі і броды</string>
</resources>

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

@ -145,7 +145,7 @@
<string name="shared_string_accessibility">Accessibilitat</string>
<string name="use_fluorescent_overlays_descr">Utilitza colors fluorescents per mostrar traces i rutes</string>
<string name="local_openstreetmap_uploading">S\'està pujant…</string>
<string name="show_warnings_descr">Mostra límits de velocitat, radars i bandes rugoses</string>
<string name="show_warnings_descr">Configureu les notificacions de trànsit (límits de velocitat, cues, bandes rugoses), avisos de radars i informació dels carrils</string>
<string name="osmand_parking_add_event">Afegeix un avís a l\'aplicació Calendari</string>
<string name="rendering_attr_noPolygons_description">Fes transparents totes les característiques d\'àrees de sòl al mapa</string>
<string name="edit_filter_create_message">S\'ha creat el filtre {0}</string>
@ -986,7 +986,7 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
<string name="poi_error_io_error_template">S\'ha produït un error d\'E/S durant l\'acció {0}.</string>
<string name="announce_gpx_waypoints">Fites GPX</string>
<string name="speak_title">Anuncia…</string>
<string name="speak_descr">Configureu per anunciar noms de carrer, avisos de trànsit (cues, bandes sonores), avisos de radar, límits de velocitat</string>
<string name="speak_descr">Configureu la notificació dels noms de carrer, incidències de trànsit (cues, bandes sonores), avisos de radar, límits de velocitat</string>
<string name="speak_street_names">Noms de carrers (TTS)</string>
<string name="speak_speed_limit">Límit de velocitat</string>
<string name="speak_cameras">Radars</string>
@ -1191,10 +1191,10 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
<string name="share_route_as_gpx">Comparteix la ruta com un fitxer GPX</string>
<string name="share_route_subject">Ruta compartida via OsmAnd</string>
<string name="arrival_distance">Anunci d\'arribada</string>
<string name="arrival_distance_descr">Quan aviat vol l\'anunci d\'arribada?</string>
<string name="arrival_distance_descr">Amb quina antelació voleu l\'anunci d\'arribada?</string>
<string name="keep_informing_never">Només manualment (premeu fletxa)</string>
<string name="keep_informing_descr">Anunci d\'instruccions de navegació a intervals regulars</string>
<string name="keep_informing">Repetir instruccions de navegació</string>
<string name="keep_informing_descr">Repeteix les instruccions de navegació a intervals regulars</string>
<string name="keep_informing">Repeteix les instruccions de navegació</string>
<string name="navigation_intent_invalid">Format no vàlid: %s</string>
<string name="route_descr_destination">Destí</string>
@ -2633,8 +2633,8 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="widget">Giny</string>
<string name="top_bar">Barra superior</string>
<string name="remove_from_map_markers">Treu dels marcadors de mapa</string>
<string name="descendingly">Descendent</string>
<string name="ascendingly">Ascendent</string>
<string name="descendingly">descendent</string>
<string name="ascendingly">ascendent</string>
<string name="date_added">S\'ha afegit la data</string>
<string name="order_by">Ordena segons:</string>
<string name="marker_show_distance_descr">Seleccioneu com indicar la distància i direcció vers els marcadors de mapa a la pantalla del mapa:</string>
@ -2654,4 +2654,11 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="move_to_history">Mou a l\'historial</string>
<string name="plan_route">Planifica la ruta</string>
<string name="group_will_be_removed_after_restart">Ss\'esborrarà el grup després de reiniciar</string>
<string name="shared_string_markers">Marcadors</string>
<string name="coordinates_format">Format de coordenades</string>
<string name="use_system_keyboard">Utilitza el teclat del sistema</string>
<string name="fast_coordinates_input_descr">Trieu el format d\'entrada de coordenades. Sempre podeu canviar-lo dins les opcions.</string>
<string name="fast_coordinates_input">Entrada ràpida de coordenades</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Evita les vies amb risc de gel, guals</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Evita les vies amb risc de gel i els guals</string>
</resources>

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

@ -2740,7 +2740,7 @@ Pokud potřebujete pomoci s aplikací OsmAnd, prosím kontaktujte naši podporu
<string name="keep_showing_on_map">Stále zobrazovat na mapě</string>
<string name="exit_without_saving">Ukončit bez uložení?</string>
<string name="map_orientation_change_in_accordance_with_speed">Práh změny orientace mapy</string>
<string name="map_orientation_change_in_accordance_with_speed_descr">Vyberte rychlost při které se orientace mapy přepne z \"Ve směru pohybu\" na \"Kompas\"</string>
<string name="map_orientation_change_in_accordance_with_speed_descr">Zvolte rychlost při které se orientace mapy změní z \"Ve směru pohybu\" na \"Podle kompasu\"</string>
<string name="all_markers_moved_to_history">Všechny mapové značky přesunuty do historie</string>
<string name="marker_moved_to_history">Mapová značka přesunuta do historie</string>
<string name="marker_moved_to_active">Mapová značka přesunuta do aktivních</string>
@ -2762,15 +2762,25 @@ Pokud potřebujete pomoci s aplikací OsmAnd, prosím kontaktujte naši podporu
<string name="shared_string_sort">Seřadit</string>
<string name="coordinate_input">Zadání souřadnic</string>
<string name="is_saved">je uložen</string>
<string name="marker_save_as_track_descr">OsmAnd bude ukládat všechny vaše značky do samostatného souboru, můžete zadat název souboru:</string>
<string name="marker_save_as_track_descr">Exportovat vaše značky do souboru, který můžete určit zde:</string>
<string name="marker_save_as_track">Uložit jako trasu</string>
<string name="move_to_history">Přesunout do historie</string>
<string name="group_will_be_removed_after_restart">Skupina bude odstraněna po restartu</string>
<string name="show_guide_line">Zobrazit vodítko</string>
<string name="show_arrows_on_the_map">Zobrazit šipky na mapě</string>
<string name="remove_from_map_markers">Odebrat z mapových značek</string>
<string name="descendingly">Sestupně</string>
<string name="ascendingly">Vzestupně</string>
<string name="descendingly">sestupně</string>
<string name="ascendingly">vzestupně</string>
<string name="date_added">Datum přidání</string>
<string name="order_by">Seřadit podle:</string>
<string name="shared_string_markers">Značky</string>
<string name="coordinates_format">Formát souřadnic</string>
<string name="use_system_keyboard">Použít systémovou klávesnici</string>
<string name="fast_coordinates_input_descr">Zvolte formát souřadnicového vstupu. Můžete ho kdykoli změnit klepnutím na Možnosti.</string>
<string name="fast_coordinates_input">Rychlé vložení souřadnic</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Vyhnout se ledovým cestám, brodům</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Vyhnout se ledovým cestám a brodům</string>
<string name="show_passed">Zobrazit datum \'Naposledy použité\'</string>
<string name="hide_passed">Skrýt datum \'Naposledy použité\'</string>
<string name="marker_show_distance_descr">Vyberte, jak ukazovat vzdálenost a směr k mapovým značkám na obrazovce mapy:</string>
</resources>

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

@ -2882,24 +2882,31 @@ Tidligere destination bliver sidste mellemliggende punkt.</string>
<string name="make_active">Aktivér</string>
<string name="marker_show_distance_descr">Vælg hvordan afstanden og retningen til kortmarkører på kortet angives:</string>
<string name="remove_from_map_markers">Fjern fra kortmarkører</string>
<string name="descendingly">Faldende</string>
<string name="ascendingly">Stigende</string>
<string name="descendingly">faldende</string>
<string name="ascendingly">stigende</string>
<string name="date_added">Dato tilføjet</string>
<string name="order_by">Sorter efter:</string>
<string name="show_guide_line">Vis vejledningslinjer</string>
<string name="show_arrows_on_the_map">Vis pile på kortet</string>
<string name="show_passed">Vis \'sidst anvendt\' dato</string>
<string name="hide_passed">Skjul \'sidst anvendt\' dato</string>
<string name="use_location">Brug placering</string>
<string name="add_location_as_first_point_descr">Tilføj placering som første punkt for at planlægge en perfekt rute.</string>
<string name="my_location">Placering</string>
<string name="use_location">Brug position</string>
<string name="add_location_as_first_point_descr">Tilføj position som første punkt for at planlægge en perfekt rute.</string>
<string name="my_location">Position</string>
<string name="shared_string_finish">Afslut</string>
<string name="plan_route">Planlæg rute</string>
<string name="shared_string_sort">Sorter</string>
<string name="coordinate_input">Koordinatindtastning</string>
<string name="is_saved">er gemt</string>
<string name="marker_save_as_track_descr">Gem alle markører til en separat fil og indtast et filnavn:</string>
<string name="marker_save_as_track_descr">Eksporter markører til en fil, som kan angives her:</string>
<string name="marker_save_as_track">Gem som spor</string>
<string name="move_to_history">Flyt til historik</string>
<string name="group_will_be_removed_after_restart">Gruppen vil blive fjernet efter genstart</string>
<string name="shared_string_markers">Markører</string>
<string name="coordinates_format">Koordinatformat</string>
<string name="use_system_keyboard">Brug systemtastaturet</string>
<string name="fast_coordinates_input_descr">Vælg format for koordinatindtastning. Kan altid ændres ved at trykke på indstillinger.</string>
<string name="fast_coordinates_input">Hurtig koordinatindtastning</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Undgå isglatte veje, vadesteder</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Undgå isglatte veje og vadesteder</string>
</resources>

38
OsmAnd/res/values-de/phrases.xml
View file

@ -198,7 +198,7 @@
<string name="poi_fast_food">Fast Food</string>
<string name="poi_ferry_terminal">Fährhafen</string>
<string name="poi_fire_extinguisher">Feuerlöscher</string>
<string name="poi_fire_flapper">Brandschutzklappe</string>
<string name="poi_fire_flapper">Brandpatsche</string>
<string name="poi_fire_hose">Löschschlauch</string>
<string name="poi_fire_hydrant">Hydrant</string>
<string name="poi_fire_station">Feuerwehr</string>
@ -433,12 +433,12 @@
<string name="poi_seafood">Fischgeschäft</string>
<string name="poi_anchor_berth">Ankerplatz</string>
<string name="poi_anchorage">Ankerplatz</string>
<string name="poi_beacon">Signalfeuer (Schifffahrtszeichen)</string>
<string name="poi_beacon">Bake (Seezeichen)</string>
<string name="poi_beacon_cardinal">Untiefenbake (Kardinal)</string>
<string name="poi_beacon_lateral">Fahrrinnenbake (Lateral)</string>
<string name="poi_beacon_safe_water">Mitte-Fahrwasser-Bake</string>
<string name="poi_beacon_special_purpose">Sonderzeichen-Bake</string>
<string name="poi_berth">Anlegestelle</string>
<string name="poi_berth">Landesteg</string>
<string name="poi_seamark_bridge">Seezeichenbrücke</string>
<string name="poi_seamark_building">Seezeichengebäude</string>
<string name="poi_buoy_cardinal">Untiefentonne (Kardinal)</string>
@ -647,7 +647,7 @@
<string name="poi_osmwiki">Wikipedia</string>
<string name="poi_user_defined_other">Benutzerdefiniert</string>
<string name="poi_aerialway_transport">Luftverkehr</string>
<string name="poi_aerialway_transport">Seilbahntransport</string>
<string name="poi_wine">Weinhandlung</string>
<string name="poi_medical_supply">Medizinische Versorgung</string>
@ -1567,7 +1567,7 @@
<string name="poi_denomination_iglesia_ni_cristo">Iglesia ni Cristo</string>
<string name="poi_denomination_mennonite">Mennoniten</string>
<string name="poi_denomination_quaker">Quäker</string>
<string name="poi_denomination_assemblies_of_god">Vereinigung „Assemblies of God”</string>
<string name="poi_denomination_assemblies_of_god">Assemblies of God</string>
<string name="poi_denomination_nondenominational">Bekenntnisfrei</string>
<string name="poi_denomination_nazarene">Nazaräer</string>
<string name="poi_denomination_united_methodist">Vereinigte Methodisten</string>
@ -2550,7 +2550,7 @@
<string name="poi_official_name">Offizieller Name</string>
<string name="poi_seamark_dyke">Seezeichen Deich</string>
<string name="poi_dolphin">Delphin</string>
<string name="poi_dolphin">Dalbe</string>
<string name="poi_forestry_compartment">Wegweiser: Forstabteilung</string>
<string name="poi_forestry_allotment">Wegweiser: Forstparzelle</string>
@ -2964,14 +2964,14 @@
<string name="poi_display_sundial_yes">Sonnenuhr</string>
<string name="poi_support_pole">Werbeträger: Mast</string>
<string name="poi_support_wall_mounted">Werbeträger: Wand</string>
<string name="poi_support_tree">Werbeträger: Baum</string>
<string name="poi_support_pedestal">Werbeträger: Sockel</string>
<string name="poi_support_ground">Werbeträger: Boden</string>
<string name="poi_support_ceiling">Werbeträger: Decke</string>
<string name="poi_support_roof">Werbeträger: Dach</string>
<string name="poi_support_tower">Werbeträger: Turm</string>
<string name="poi_support_pole">Anbringung: Mast</string>
<string name="poi_support_wall_mounted">Anbringung: Wand</string>
<string name="poi_support_tree">Anbringung: Baum</string>
<string name="poi_support_pedestal">Anbringung: Sockel</string>
<string name="poi_support_ground">Anbringung: Boden</string>
<string name="poi_support_ceiling">Anbringung: Decke</string>
<string name="poi_support_roof">Anbringung: Dach</string>
<string name="poi_support_tower">Anbringung: Turm</string>
<string name="poi_aquaculture">Aquakultur</string>
<string name="poi_aquaculture_shrimp">Aquakultur: Garnelen</string>
@ -2993,7 +2993,7 @@
<string name="poi_greenhouse_horticulture">Gewächshaus</string>
<string name="poi_generator_output_steam_yes">Ausgabe: Dampf</string>
<string name="poi_support_suspended">Werbeträger: hängend</string>
<string name="poi_support_suspended">Anbringung: hängend</string>
<string name="poi_diplomatic_consulate_general">Generalkonsulat</string>
<string name="poi_diplomatic_honorary_consulate">Honorarkonsulat</string>
<string name="poi_observatory_type_gravitational">Schwerkraft</string>
@ -3001,10 +3001,10 @@
<string name="poi_generator_output_hot_water">Ausgangsleistung: heißes Wasser</string>
<string name="poi_generator_output_compressed_air">Ausgangsleistung: Druckluft</string>
<string name="poi_generator_output_biogas">Ausgangsleistung: Biogas</string>
<string name="poi_support_billboard">Werbeträger: Plakatwand</string>
<string name="poi_support_billboard">Anbringung: Werbetafel</string>
<string name="poi_diplomatic_high_commission">Hochkommissar</string>
<string name="poi_fire_operator">Feuerwehrmann</string>
<string name="poi_fire_operator">Feuerwehrbetreiber</string>
<string name="poi_diaper_table_count">Anzahl Wickeltische</string>
@ -3093,7 +3093,7 @@
<string name="poi_bicycle_service">Fahrradwerkstatt</string>
<string name="poi_service_car">Dienstleistung</string>
<string name="poi_self_service">Selbstbedienung</string>
<string name="poi_pharmacy_dispensing">Dosieren</string>
<string name="poi_pharmacy_dispensing">Rezeptur</string>
<string name="poi_archaeological_site_type">Typ</string>
<string name="poi_star_rating">Bewertung in Sternen</string>
<string name="poi_denomination">Konfession</string>
@ -3268,7 +3268,7 @@
<string name="poi_cuisine_diner">Esslokal</string>
<string name="poi_cuisine_yakiniku">Yakiniku</string>
<string name="poi_cuisine_udon">Udon</string>
<string name="poi_cuisine_brasserie">Bierstube</string>
<string name="poi_cuisine_brasserie">Brasserie</string>
<string name="poi_cuisine_yakitori">Yakitori</string>
<string name="poi_cuisine_teriyaki">Teriyaki</string>

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

@ -1544,7 +1544,7 @@ Proporcia memoro %4$s MB (limito de Android %5$s MB, Dalvik %6$s MB).</string>
<string name="local_index_items_deleted">Sukcese forigis %1$d el %2$d ero(j)n.</string>
<string name="local_index_items_restored">Sukcese aktivigis %1$d el %2$d ero(j)n.</string>
<string name="local_index_no_items_to_do">Neniu elemento por %1$s</string>
<string name="local_index_action_do">Ĉu vi volas %1$s %2$s ero(j)n?</string>
<string name="local_index_action_do">Ĉu vi volas %1$s %2$s elemento(j)n?</string>
<string name="local_index_descr_title">Administri map-dosierojn</string>
<string name="local_index_mi_restore">Aktivigi</string>
<string name="local_index_mi_backup">Malaktivigi</string>
@ -1981,7 +1981,7 @@ Provizore estas uzata enreta servo CloudMade.</string>
<string name="poi_edit_title">Redakti interesejon</string>
<string name="poi_create_title">Krei interesejon</string>
<string name="poi_error_poi_not_found">Ne povas trovi nodon aŭ servo konsistas el kelkaj nodoj, tio ĉi ne estas ankoraŭ subtenata.</string>
<string name="poi_remove_confirm_template">Ĉu forigi na {0} (entajpu komenton)?</string>
<string name="poi_remove_confirm_template">Ĉu forigi {0} (entajpu komenton)?</string>
<string name="poi_remove_title">Forigi interesejon</string>
<string name="poi_remove_success">Interesejo forigita sukcese</string>
<string name="poi_action_add">aldoni</string>
@ -2764,7 +2764,7 @@ Indikas lokon: %1$s x %2$s"</string>
<string name="empty_state_my_tracks">Aldoni kaj registri spurojn</string>
<string name="empty_state_my_tracks_desc">Registri aŭ enporti spurojn por vidigi</string>
<string name="empty_state_favourites">Aldoni ŝatatajn</string>
<string name="empty_state_favourites_desc">Aldoni ŝatatajn punktojn al mapo aŭ enporti ilin el memorejo</string>
<string name="empty_state_favourites_desc">Aldonu ŝatatajn punktojn al mapo aŭ enportu ilin el memorejo</string>
<string name="import_track">Enporti spuron</string>
<string name="import_track_desc">Dosiero %1$s ne enhavas navigadpunktojn, ĉe enporti ĝin kiel spuron?</string>
<string name="move_point">Movi punkton</string>
@ -2797,10 +2797,29 @@ Indikas lokon: %1$s x %2$s"</string>
<string name="remove_from_map_markers">Forigi el map-markoj</string>
<string name="descendingly">malkreskante</string>
<string name="ascendingly">kreskante</string>
<string name="date_added">dato de aldono</string>
<string name="date_added">Dato de aldono</string>
<string name="order_by">Ordigi laŭ:</string>
<string name="show_guide_line">Montri gvidan linion</string>
<string name="show_arrows_on_the_map">Montri sagetojn sur la mapo</string>
<string name="show_passed">Montri daton de lasta uzo</string>
<string name="hide_passed">Kaŝi daton de lasta uzo</string>
<string name="shared_string_markers">Markoj</string>
<string name="coordinates_format">Formo de koordinatoj</string>
<string name="use_system_keyboard">Uzi sisteman klavaron</string>
<string name="fast_coordinates_input_descr">Elektu formon de koordinatoj. Vi ĉiam povas ŝanĝi ĝin per malfermi agordojn.</string>
<string name="fast_coordinates_input">Rapida enigo de koordinatoj</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Eviti glaci-vojojn, travadejojn</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Eviti glaciajn vojojn kaj travadejojn</string>
<string name="use_location">Uzi pozicion</string>
<string name="add_location_as_first_point_descr">Aldoni vian pozicion kiel unuan punkton por plani idealan kurson.</string>
<string name="my_location">Mia pozicio</string>
<string name="shared_string_finish">Fini</string>
<string name="plan_route">Plani kurson</string>
<string name="shared_string_sort">Ordigi</string>
<string name="coordinate_input">Enigi koordinatojn</string>
<string name="is_saved">estas konservita</string>
<string name="marker_save_as_track_descr">Elporti map-markojn al dosiero difinita tie ĉi:</string>
<string name="marker_save_as_track">Konservi kiel kurson</string>
<string name="move_to_history">Movi al historio</string>
<string name="group_will_be_removed_after_restart">Grupo estos forigita post restarto</string>
</resources>

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

@ -471,7 +471,7 @@
<string name="poi_fountain">Fuente</string>
<string name="poi_historic_ruins">Ruinas históricas</string>
<string name="poi_rune_stone">Piedra rúnica</string>
<string name="poi_wreck">Naufragio</string>
<string name="poi_wreck">Pecio/naufragio</string>
<string name="poi_historic_ship">Barco histórico</string>
<string name="poi_historic_mine">Mina histórica</string>
<string name="poi_monument">Monumento</string>
@ -697,7 +697,7 @@
<string name="poi_amenity_atm">Cajero automático</string>
<string name="poi_payment_terminal">Terminal de pago</string>
<string name="poi_money_lender">Prestamista</string>
<string name="poi_pawnbroker">Prestamista (empeños)</string>
<string name="poi_pawnbroker">Casa de empeños</string>
<string name="poi_bureau_de_change">Casa de cambio</string>
<string name="poi_accountant">Contador</string>
<string name="poi_bitcoin_yes">Pago de Bitcoin</string>

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

@ -935,7 +935,7 @@ Se aprecia la participación activa, y las contribuciones pueden hacerse directa
<string name="int_continuosly">Continuamente</string>
<string name="screen_is_locked">Para desbloquear la pantalla pulsa el icono del candado</string>
<string name="map_widget_top_text">Nombre de calle</string>
<string name="map_widget_config">Configuración</string>
<string name="map_widget_config">Configurar pantalla</string>
<string name="map_widget_back_to_loc">Dónde estoy</string>
<string name="map_widget_lock_screen">Bloquear pantalla</string>
<string name="map_widget_compass">Brújula</string>
@ -2759,8 +2759,8 @@ Proporciona un código completo</string>
<string name="top_bar">Barra superior</string>
<string name="marker_show_distance_descr">Elige cómo se indica la distancia y dirección a los marcadores del mapa en la pantalla del mapa:</string>
<string name="remove_from_map_markers">Quitar de los marcadores del mapa</string>
<string name="descendingly">Descendente</string>
<string name="ascendingly">Ascendente</string>
<string name="descendingly">descendente</string>
<string name="ascendingly">ascendente</string>
<string name="date_added">Fecha de adición</string>
<string name="order_by">Ordenar por:</string>
<string name="show_guide_line">Mostrar línea guía</string>
@ -2779,4 +2779,11 @@ Proporciona un código completo</string>
<string name="marker_save_as_track">Guardar como traza</string>
<string name="move_to_history">Mover al historial</string>
<string name="group_will_be_removed_after_restart">El grupo se quitará al reiniciar</string>
<string name="shared_string_markers">Marcadores</string>
<string name="coordinates_format">Formato de coordenadas</string>
<string name="use_system_keyboard">Usar teclado del sistema</string>
<string name="fast_coordinates_input_descr">Elige el formato de ingreso de las coordenadas. Siempre se puede cambiar en «Opciones».</string>
<string name="fast_coordinates_input">Ingreso rápido de coordenadas</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Evitar caminos de hielo y vados</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Evita pasar por caminos con hielo y vados</string>
</resources>

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

@ -446,7 +446,7 @@
<string name="poi_fountain">Fuente</string>
<string name="poi_historic_ruins">Ruinas históricas</string>
<string name="poi_rune_stone">Piedra rúnica</string>
<string name="poi_wreck">Naufragio</string>
<string name="poi_wreck">Pecio/naufragio</string>
<string name="poi_historic_ship">Barco histórico</string>
<string name="poi_historic_mine">Mina histórica</string>
<string name="poi_monument">Monumento</string>

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

@ -935,7 +935,7 @@ Se aprecia la participación activa, y las contribuciones pueden hacerse directa
<string name="int_continuosly">Continuamente</string>
<string name="screen_is_locked">Para desbloquear la pantalla pulsa el icono del candado</string>
<string name="map_widget_top_text">Nombre de calle</string>
<string name="map_widget_config">Configuración</string>
<string name="map_widget_config">Configurar pantalla</string>
<string name="map_widget_back_to_loc">Dónde estoy</string>
<string name="map_widget_lock_screen">Bloquear pantalla</string>
<string name="map_widget_compass">Brújula</string>
@ -2760,8 +2760,8 @@ Proporciona un código completo</string>
<string name="top_bar">Barra superior</string>
<string name="marker_show_distance_descr">Elige cómo se indica la distancia y dirección a los marcadores del mapa en la pantalla del mapa:</string>
<string name="remove_from_map_markers">Quitar de los marcadores del mapa</string>
<string name="descendingly">Descendente</string>
<string name="ascendingly">Ascendente</string>
<string name="descendingly">descendente</string>
<string name="ascendingly">ascendente</string>
<string name="date_added">Fecha de adición</string>
<string name="order_by">Ordenar por:</string>
<string name="show_guide_line">Mostrar línea guía</string>
@ -2780,4 +2780,11 @@ Proporciona un código completo</string>
<string name="marker_save_as_track">Guardar como traza</string>
<string name="move_to_history">Mover al historial</string>
<string name="group_will_be_removed_after_restart">El grupo se quitará al reiniciar</string>
<string name="shared_string_markers">Marcadores</string>
<string name="coordinates_format">Formato de coordenadas</string>
<string name="use_system_keyboard">Usar teclado del sistema</string>
<string name="fast_coordinates_input_descr">Elige el formato de ingreso de las coordenadas. Siempre se puede cambiar en «Opciones».</string>
<string name="fast_coordinates_input">Ingreso rápido de coordenadas</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Evitar caminos de hielo y vados</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Evita pasar por caminos con hielo y vados</string>
</resources>

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

@ -2682,7 +2682,7 @@ Por favor proporciona un código completo</string>
<string name="marker_show_distance_descr">Elige cómo se indica la distancia y dirección a los marcadores del mapa en la pantalla del mapa:</string>
<string name="map_orientation_change_in_accordance_with_speed">Umbral de orientación del mapa</string>
<string name="map_orientation_change_in_accordance_with_speed_descr">Elije la velocidad a partir de la cual la orientación del mapa cambia de «Dirección del movimiento» a «Brújula»</string>
<string name="all_markers_moved_to_history">Todos los marcadores del mapa movido al historial</string>
<string name="all_markers_moved_to_history">Todos los marcadores del mapa movidos al historial</string>
<string name="marker_moved_to_history">Marcador del mapa movido al historial</string>
<string name="marker_moved_to_active">Marcador del mapa movido a los activos</string>
<string name="shared_string_list">Lista</string>
@ -2700,12 +2700,12 @@ Por favor proporciona un código completo</string>
<string name="show_passed">Mostrar fecha de «Último uso»</string>
<string name="hide_passed">Ocultar fecha de «Último uso»</string>
<string name="remove_from_map_markers">Eliminar de Map Markers</string>
<string name="descendingly">Descendente</string>
<string name="ascendingly">Ascendente</string>
<string name="descendingly">descendente</string>
<string name="ascendingly">ascendente</string>
<string name="date_added">Fecha añadida</string>
<string name="order_by">Ordenado por:</string>
<string name="use_location">Usar ubicación</string>
<string name="add_location_as_first_point_descr">Añada su ubicación como primer punto para planificar la ruta perfecta.</string>
<string name="add_location_as_first_point_descr">Añade tu ubicación como primer punto para planificar la ruta perfecta.</string>
<string name="my_location">Mi ubicación</string>
<string name="shared_string_finish">Finalizar</string>
<string name="plan_route">Planificar ruta</string>
@ -2716,4 +2716,11 @@ Por favor proporciona un código completo</string>
<string name="marker_save_as_track">Guardar como traza</string>
<string name="move_to_history">Mover al historial</string>
<string name="group_will_be_removed_after_restart">El grupo se quitará al reiniciar</string>
<string name="shared_string_markers">Marcadores</string>
<string name="coordinates_format">Formato de coordenadas</string>
<string name="use_system_keyboard">Usar el teclado del sistema</string>
<string name="fast_coordinates_input_descr">Elige el formato de entrada de coordenadas. Siempre puedes cambiarlo pulsando en Ajustes.</string>
<string name="fast_coordinates_input">Entrada rápida de coordenadas</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Evitar carreteras de hielo, vados</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Evita carreteras de hielo y vados</string>
</resources>

866
OsmAnd/res/values-fa/strings.xml
View file

File diff suppressed because it is too large Load diff

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

@ -2952,4 +2952,11 @@ représentant la zone : %1$s x %2$s</string>
<string name="marker_save_as_track">Enregistrer comme trace</string>
<string name="move_to_history">Déplacer vers l\'historique</string>
<string name="group_will_be_removed_after_restart">Le groupe sera supprimé au prochain démarrage</string>
<string name="shared_string_markers">Marques</string>
<string name="coordinates_format">Format des coordonnées</string>
<string name="use_system_keyboard">Utiliser le clavier système</string>
<string name="fast_coordinates_input_descr">Définissez le format des coordonnées (ce format est modifiable plus tard dans Options).</string>
<string name="fast_coordinates_input">Saisie rapide des coordonnées</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Éviter les routes sur glace, les fjords</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Éviter les routes sur glace et les fjords</string>
</resources>

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

@ -2840,15 +2840,15 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="show_direction">Wskaźnik odległości</string>
<string name="sort_by">Kolejność sortowania</string>
<string name="marker_options">Opcje znacznika</string>
<string name="marker_show_distance_descr">Wybierz w jaki sposób wskazywać odległość i kierunek do znaczników mapy na ekranie:</string>
<string name="map_orientation_change_in_accordance_with_speed">Zmiana orientacji mapy</string>
<string name="marker_show_distance_descr">Proszę wybrać w jaki sposób wskazywać odległość i kierunek do znaczników mapy na ekranie:</string>
<string name="map_orientation_change_in_accordance_with_speed">Próg zmiany orientacji mapy</string>
<string name="map_orientation_change_in_accordance_with_speed_descr">Wybiera prędkość, poniżej której orientacja mapy zmieni się z „względem kierunku ruchu” na „względem kompasu”</string>
<string name="all_markers_moved_to_history">Wszystkie znaczniki mapy przeniesiono do historii</string>
<string name="marker_moved_to_history">Znacznik mapy przeniesiono do historii</string>
<string name="marker_moved_to_active">Znacznik mapy przeniesiono do aktywnych</string>
<string name="shared_string_list">Lista</string>
<string name="shared_string_groups">Grupy</string>
<string name="passed">Minęło: %1$s</string>
<string name="passed">Ostatnio użyty: %1$s</string>
<string name="make_active">Uaktywnij</string>
<string name="today">Dzisiaj</string>
<string name="yesterday">Wczoraj</string>
@ -2861,8 +2861,23 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="ascendingly">Rosnąco</string>
<string name="date_added">Data dodania</string>
<string name="order_by">Porządkowanie według:</string>
<string name="show_guide_line">Wyświetl linię przewodnią</string>
<string name="show_arrows_on_the_map">Wyświetl strzałki na mapie</string>
<string name="show_passed">Wyświetl minione</string>
<string name="hide_passed">Ukryj minione</string>
<string name="show_guide_line">Linia przewodnia</string>
<string name="show_arrows_on_the_map">Strzałki na mapie</string>
<string name="show_passed">Wyświetl datę ostatniego użycia</string>
<string name="hide_passed">Ukryj datę ostatniego użycia</string>
<string name="coordinate_input">Wprowadź współrzędne</string>
<string name="shared_string_markers">Znaczniki</string>
<string name="coordinates_format">Format współrzędnych</string>
<string name="fast_coordinates_input_descr">Przed rozpoczęciem proszę wybrać format współrzędnych. Zawsze można go zmienić za pomocą opcji.</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Omijanie lodowych dróg i brodów</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Omija lodowe drogi i brody</string>
<string name="use_location">Użyj położenia</string>
<string name="my_location">Aktualne położenie</string>
<string name="shared_string_finish">Koniec trasy</string>
<string name="plan_route">Planowanie trasy</string>
<string name="shared_string_sort">Uporządkuj</string>
<string name="marker_save_as_track_descr">Znaczniki zostaną wyeksportowane do poniższego pliku:</string>
<string name="marker_save_as_track">Zapisywanie śladu</string>
<string name="move_to_history">Przenieś do historii</string>
<string name="group_will_be_removed_after_restart">Grupa zostanie usunięta po ponownym uruchomieniu</string>
</resources>

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

@ -1621,7 +1621,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="traffic_warning_railways">Atraessamentu de sa ferrovia</string>
<string name="traffic_warning_pedestrian">Atraessamentu pedonale</string>
<string name="show_railway_warnings">Rugradas ferroviàrias</string>
<string name="show_pedestrian_warnings">Istrìscias pedonales</string>
<string name="show_pedestrian_warnings">Atraessamentos pedonales</string>
<string name="speak_pedestrian">Atraessamentos pedonales</string>
<string name="navigation_over_track">Incumentzare su nàvigu in sa rasta?</string>
@ -2405,7 +2405,7 @@ Si istimas OsmAnd e OSM e los boles suportare, custa est una manera perfeta pro
<string name="search_map_hint">Chirca una tzitade o una regione</string>
<string name="wiki_around">Artìculos de Wikipedia a curtzu</string>
<string name="routing_attr_allow_motorway_name">Inclue sas autostradas</string>
<string name="routing_attr_allow_motorway_description">Permiti sas àndalas in sas autostradas</string>
<string name="routing_attr_allow_motorway_description">Inclue sas autostradas</string>
<string name="lang_sr_latn">Serbu (caràteres latinos)</string>
<string name="lang_zh_hk">Tzinesu (Hong Kong)</string>
<string name="legacy_search">Chirca betza</string>
@ -2570,7 +2570,7 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="routing_attr_driving_style_speed_name">Àndalas prus curtzas</string>
<string name="routing_attr_driving_style_balance_name">Bilantziadu</string>
<string name="routing_attr_driving_style_safety_name">Privilègia sas istradas segundàrias</string>
<string name="routing_attr_relief_smoothness_factor_name">Valore de variatzione de s\'artària</string>
<string name="routing_attr_relief_smoothness_factor_name">Ischerta su valore de variatzione de s\'artària</string>
<string name="full_version_thanks">Gràtzias pro àere comporadu sa versione intrea de OsmAnd!</string>
<string name="do_not_send_anonymous_app_usage">No imbies informatziones anònimas a pitzu de s\'impreu de s\'aplicatzione</string>
<string name="do_not_send_anonymous_app_usage_desc">OsmAnd imbiat informatziones generales a pitzu de sas partes de s\'aplicatzione impreadas. Non retzimus perunu datu de geolocalizatzione, chi pertochet datos insertados dae s\'impreadore o a pitzu de sas àreas chi bides, chircas o iscàrrigas.</string>
@ -2789,4 +2789,23 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="show_arrows_on_the_map">Ammustra sas fritzas in sa mapa</string>
<string name="show_passed">Ammustra sa data de ùrtimu impreu</string>
<string name="hide_passed">Istichi sa data de ùrtimu impreu</string>
<string name="shared_string_markers">Marcadores</string>
<string name="coordinates_format">Formadu de sas coordinatas</string>
<string name="use_system_keyboard">Imprea su tecladu de sistema</string>
<string name="fast_coordinates_input_descr">Issèbera su formadu de sas coordinatas in antis de incumintzare. L\'as a pòdere semper cambiare dae sas Optziones.</string>
<string name="fast_coordinates_input">Insertada lestra de sas coordinatas</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Istransi sas istradas de astra, sos bados</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Istransi sas istradas de astra e sos bados</string>
<string name="use_location">Imprea positzione</string>
<string name="add_location_as_first_point_descr">Annanghe sa positzione tua comente primu puntu pro pranificare un\'àndala perfeta.</string>
<string name="my_location">Positzione mea</string>
<string name="shared_string_finish">Acabba·la</string>
<string name="plan_route">Pranìfica àndala</string>
<string name="shared_string_sort">Òrdina</string>
<string name="coordinate_input">Insertada de sas coordinatas</string>
<string name="is_saved">est istadu sarvadu</string>
<string name="marker_save_as_track_descr">Esporta sos marcadores tuos in unu documentu chi podes dislindare inoghe:</string>
<string name="marker_save_as_track">Sarva comente rasta</string>
<string name="move_to_history">Pone in sa cronologia</string>
<string name="group_will_be_removed_after_restart">Su grupu at a èssere iscantzelladu a pustis de s\'allughìngiu imbeniente</string>
</resources>

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

@ -43,7 +43,7 @@
<string name="avoid_in_routing_title">Vyhnúť sa…</string>
<string name="avoid_in_routing_descr">Obídenie spoplatnených ciest, nespevnených ciest, trajektov</string>
<string name="show_warnings_title">Zobraziť varovania…</string>
<string name="show_warnings_descr">Zobrazenie rýchlostných obmedzení, radarov a spomaľovačov</string>
<string name="show_warnings_descr">Nastavenie dopravných varovaní (rýchlostných obmedzení, značiek stop, spomaľovačov), rýchlostných radarov a jazdných pruhov</string>
<string name="map_widget_fluorescent">Fluorescentné trasy</string>
<string name="map_widget_show_ruler">Pravítko</string>
<string name="map_widget_view_direction">Zorné pole</string>
@ -796,7 +796,7 @@ Proporčná pamäť %4$s MB (Limit Androidu %5$s MB, Dalvik %6$s MB).</string>
<string name="route_updated_loc_found">Cesta bude prepočítaná, keď sa nájde umiestnenie</string>
<string name="continue_follow_previous_route_auto">Predošlá navigácia nebola dokončená. Pokračovať v jej nasledovaní? (%1$s sekúnd)</string>
<string name="show_cameras">Rýchlostné radary</string>
<string name="show_traffic_warnings">Rýchlostné varovania</string>
<string name="show_traffic_warnings">Dopravné varovania</string>
<string name="avoid_toll_roads">Vyhnúť sa spoplatneným cestám</string>
<string name="screen_is_locked">Na odomknutie obrazovky, stlačte ikonu zámku</string>
<string name="bg_service_screen_unlock">Odomknúť obrazovku</string>
@ -1013,7 +1013,7 @@ Niektoré z hlavných funkcií:
<string name="route_to">Kam:</string>
<string name="route_via">Cez:</string>
<string name="route_from">Odkiaľ:</string>
<string name="speak_speed_limit">Obmedzenia rýchlosti</string>
<string name="speak_speed_limit">Obmedzenie rýchlosti</string>
<string name="speak_cameras">Rýchlostné radary</string>
<string name="speak_traffic_warnings">Dopravné varovania</string>
<string name="about_version">Verzia:</string>
@ -1257,7 +1257,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="osmo_plugin_name">OpenStreetMap sledovanie</string>
<string name="osmo_settings">OsMo</string>
<string name="keep_informing_never">Len ručne (použiť šípku)</string>
<string name="keep_informing_descr">Opakuj navigačné pokyny v pravidelných intervaloch</string>
<string name="keep_informing_descr">Opakovať navigačné pokyny v pravidelných intervaloch</string>
<string name="keep_informing">Opakovať navigačné pokyny</string>
<string name="arrival_distance">Oznámenie príjazdu</string>
<string name="arrival_distance_descr">Ako skoro má byť oznámený príjazd do cieľa?</string>
@ -2840,9 +2840,9 @@ Zodpovedá oblasti: %1$s x %2$s</string>
<string name="add_point_before">Pridať bod pred</string>
<string name="add_point_after">Pridať bod za</string>
<string name="shared_string_options">Možnosti</string>
<string name="measurement_tool_snap_to_road_descr">OsmAnd pridá ďalšie body podľa typu navigácie.</string>
<string name="measurement_tool_snap_to_road_descr">OsmAnd spojí body s trasami pre vybraný profil.</string>
<string name="measurement_tool_save_as_new_track_descr">Body môžete uložiť ako body trasy alebo ako čiaru.</string>
<string name="choose_navigation_type">Zvoľte typ navigácie</string>
<string name="choose_navigation_type">Zvoľte profil navigácie</string>
<string name="add_route_points">Pridať body trasy</string>
<string name="add_line">Pridať čiaru</string>
<string name="empty_state_my_tracks">Pridať a nahrať stopy</string>
@ -2859,17 +2859,17 @@ Zodpovedá oblasti: %1$s x %2$s</string>
<string name="exit_without_saving">Ukončiť bez uloženia?</string>
<string name="move_all_to_history">Presunúť všetko do histórie</string>
<string name="build_route">Zostaviť trasu</string>
<string name="show_direction">Zobraziť smer</string>
<string name="show_direction">Indikovať vzdialenosť</string>
<string name="sort_by">Zotriediť podľa</string>
<string name="marker_options">Možnosti značiek</string>
<string name="map_orientation_change_in_accordance_with_speed">Zmena orientácie mapy podľa rýchlosti</string>
<string name="map_orientation_change_in_accordance_with_speed_descr">Pri nízkej rýchlosti použiť na zistenie orientácie mapy zabudovaný kompas namiesto smeru pohybu</string>
<string name="map_orientation_change_in_accordance_with_speed">Citlivosť zmeny orientácie mapy</string>
<string name="map_orientation_change_in_accordance_with_speed_descr">Zvoľte pod akou rýchlosťou sa orientácia mapy zmení zo \"v smere pohybu\" na \"podľa kompasu\"</string>
<string name="all_markers_moved_to_history">Všetky značky presunuté do histórie</string>
<string name="marker_moved_to_history">Značka presunutá do histórie</string>
<string name="marker_moved_to_active">Značka presunutá do archívu</string>
<string name="marker_moved_to_history">Mapová značka presunutá do histórie</string>
<string name="marker_moved_to_active">Mapová značka presunutá do archívu</string>
<string name="shared_string_list">Zoznam</string>
<string name="shared_string_groups">Skupiny</string>
<string name="passed">Prešli sme okolo: %1$s</string>
<string name="passed">Naposledy použité: %1$s</string>
<string name="make_active">Aktivovať</string>
<string name="today">Dnes</string>
<string name="yesterday">Včera</string>
@ -2877,4 +2877,33 @@ Zodpovedá oblasti: %1$s x %2$s</string>
<string name="this_year">Tento rok</string>
<string name="widget">Nástroj</string>
<string name="top_bar">Horná lišta</string>
<string name="shared_string_markers">Značky</string>
<string name="coordinates_format">Formát súradníc</string>
<string name="use_system_keyboard">Použiť systémovú klávesnicu</string>
<string name="fast_coordinates_input_descr">Zvoľte formát súradníc pred štartom. Môžete ich potom zmeniť v Nastaveniach.</string>
<string name="fast_coordinates_input">Rýchle zadávanie súradníc</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Vyhnúť sa ľadovým cestám, brodom</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Vyhnúť sa ľadovým cestám a brodom</string>
<string name="use_location">Použiť polohu</string>
<string name="add_location_as_first_point_descr">Pridajte svoju polohu ako prvý bod pre plán ideálnej trasy.</string>
<string name="my_location">Moja poloha</string>
<string name="shared_string_finish">Dokončiť</string>
<string name="plan_route">Naplánovať trasu</string>
<string name="shared_string_sort">Zotriediť</string>
<string name="coordinate_input">Zadanie súradníc</string>
<string name="is_saved">je uložený</string>
<string name="marker_save_as_track_descr">Exportovať vaše značky do súboru, ktorý môžete určiť tu:</string>
<string name="marker_save_as_track">Uložiť ako stopu</string>
<string name="move_to_history">Presunúť do histórie</string>
<string name="group_will_be_removed_after_restart">Skupina bude odstránená po reštarte</string>
<string name="show_guide_line">Zobraziť vodiacu čiaru</string>
<string name="show_arrows_on_the_map">Zobraziť šípky na mape</string>
<string name="show_passed">Zobraziť dátum \'naposledy použité\'</string>
<string name="hide_passed">Skryť dátum \'naposledy použité\'</string>
<string name="remove_from_map_markers">Odstrániť z Mapových značiek</string>
<string name="descendingly">Zostupne</string>
<string name="ascendingly">Vzostupne</string>
<string name="date_added">Dátum pridania</string>
<string name="order_by">Zoradiť podľa:</string>
<string name="marker_show_distance_descr">Zvoľte ako sa bude zobrazovať vzdialenosť a smer k mapovým značkám na mape:</string>
</resources>

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

@ -50,7 +50,7 @@
<string name="day_night_info">Gündüz/gece bilgisi</string>
<string name="osmand_short_description_80_chars">Küresel Mobil Harita Görüntüleme &amp; Yolbul için Çevrim Dışı ve Çevrim İçi OSM Haritaları</string>
<string name="osmand_short_description_80_chars">Küresel Mobil Harita Görüntüleme ve Yolbul için Çevrim Dışı ve Çevrim İçi OSM Haritaları</string>
<string name="map_widget_view_direction">Görüntüleme yönü</string>
@ -238,7 +238,7 @@
<string name="confirm_interrupt_download">Dosya indirirken iptal etmek istiyor musunuz?</string>
<string name="select_index_file_to_download">Hiçbir şey bulunamadı. Eğer bölgenizi bulamıyorsanız, kendiniz yapabilirsiniz (bakınız: http://osmand.net).</string>
<string name="local_indexes_cat_map">Standart haritalar (vektör)</string>
<string name="shared_string_online_maps">Çevrimiçi haritalar</string>
<string name="shared_string_online_maps">Çevrim içi haritalar</string>
<string name="default_buttons_support">Destek</string>
@ -817,7 +817,7 @@
<string name="files_limit">%1$d dosya kaldı</string>
<string name="available_downloads_left">%1$d dosya indirmek için uygun</string>
<string name="osmand_background_plugin_description">Periyodik GPS cihazı uyanma aracılığıyla arka planda izleme ve navigasyon (kapalı ekranı) modunu etkinleştirmek için ayarları gösterir.</string>
<string name="get_directions">Yol Tarifleri</string>
<string name="get_directions">Yol tarifleri</string>
<string name="menu_layers">Harita katmanları</string>
<string name="gps_status_app_not_found">GPS Durum uygulaması yüklenmedi, mağazada arayın?</string>
@ -1115,7 +1115,7 @@
<string name="shared_string_show_description">Açıklama göster</string>
<string name="shared_string_message">İleti</string>
<string name="agps_data_last_downloaded">A-GPS verisi son indirilen: %1$s</string>
<string name="welmode_download_maps">Haritaları indir</string>
<string name="welmode_download_maps">Harita indir</string>
<string name="welcome_header">Hoş Geldiniz</string>
<string name="current_route">Şu anki rota</string>
<string name="mark_to_delete">Silmek için işaretle</string>
@ -1202,7 +1202,7 @@
<string name="share_note">Not paylaş</string>
<string name="watch">İzle</string>
<string name="notes">Notlar</string>
<string name="online_map">Çevrimiçi harita</string>
<string name="online_map">Çevrim içi harita</string>
<string name="roads_only">Sadece yollar</string>
<string name="device_memory">Aygıt belleği</string>
<string name="edit_group">Grubu düzenle</string>
@ -1241,7 +1241,7 @@
<string name="way_alarms">Trafik uyarıları</string>
<string name="confirm_every_run">Her zaman sor</string>
<string name="shared_string_import2osmand">OsmAnd\'a Aktar</string>
<string name="read_full_article">Tüm metni oku (çevrimiçi)</string>
<string name="read_full_article">Tüm metni oku (çevrim içi)</string>
<string name="rendering_value_walkingRoutesOSMC_name">OSMC göre olan boyama</string>
<string name="local_recordings_delete_all_confirm">%1$d notu silmek üzeresiniz. Emin misiniz?</string>
<string name="local_osm_changes_upload_all_confirm">%1%d düzenlemeyi OSM\'ye yüklemek üzeresiniz? Emin misiniz?</string>
@ -1336,7 +1336,7 @@
<string name="drawer">Düz liste</string>
<string name="short_location_on_map">Enl %1$s\nBoyl %2$s</string>
<string name="shared_string_ellipsis">…</string>
<string name="shared_string_dismiss">Görevden</string>
<string name="shared_string_dismiss">Vazgeç</string>
<string name="shared_string_selected_lowercase">seçili</string>
<string name="shared_string_deselect">Seçimini kaldırın</string>
<string name="shared_string_deselect_all">Tüm Seçimleri Kaldır</string>
@ -1432,14 +1432,14 @@
<string name="other_menu_group">Diğer</string>
<string name="plugins_menu_group">Eklentiler</string>
<string name="first_usage_item">İlk kullanım</string>
<string name="first_usage_item_description">Haritaları indirmek için nasıl temel ayarlarını</string>
<string name="first_usage_item_description">Haritalar nasıl indirilsin, temel ayarları belirle</string>
<string name="navigation_item_description">Navigasyon Kurulum</string>
<string name="planning_trip_item">Bir gezi Planlama</string>
<string name="faq_item">SSS</string>
<string name="faq_item_description">Sık Sorulan Sorular</string>
<string name="map_viewing_item">Harita görüntüleme</string>
<string name="search_on_the_map_item">Harita arama</string>
<string name="application_dir_description">Eğer harita dosyaları kaydetmek istediğiniz yeri seçin.</string>
<string name="application_dir_description">Haritaları ve diğer veri dosyalarını kaydetmek istediğiniz yeri seçin.</string>
<string name="enter_country_name">Ülke adı girin</string>
<string name="confirm_download_roadmaps">Eğer zaten standart (tam) harita var olsa bile, yollar sadece harita indirmek istediğinizden emin misiniz?</string>
@ -1863,8 +1863,8 @@
<string name="rendering_attr_pisteRoutes_name">Kayak pistleri</string>
<string name="free">"%1$s boş "</string>
<string name="rendering_attr_pisteGrooming_name">Pist tımar</string>
<string name="world_ski_missing">Kayak haritaları görüntülemek için, özel çevrim dışı harita indirimek gerekiyor</string>
<string name="nautical_maps_missing">Deniz haritaları görüntülemek için, özel çevrim dışı harita indirmek gerekiyor</string>
<string name="world_ski_missing">Kayak haritalarını görüntülemek için, özel çevrim dışı harita indirimek gerekiyor</string>
<string name="nautical_maps_missing">Deniz haritalarını görüntülemek için, özel çevrim dışı harita indirmek gerekiyor</string>
<string name="remove_the_tag">Etiketi Kaldır</string>
<string name="version_settings_descr">Yenilemesini indir</string>
<string name="version_settings">kurar</string>
@ -2026,18 +2026,18 @@
<string name="clear_updates_proposition_message">İndirilen güncelleştirmeleri kaldırmak ve özgün harita sürümünü geri alabilirsiniz</string>
<string name="add_time_span">Zaman aralığı ekle</string>
<string name="road_blocked">Yol bloke</string>
<string name="shared_string_select">Seçin</string>
<string name="shared_string_select">Seç</string>
<string name="switch_start_finish">Ters bir başlangıç noktası ve hedef</string>
<string name="rendering_attr_hideIcons_name">POI simgeleri</string>
<string name="number_of_contributors">Prim ödeyenlerin sayısı</string>
<string name="number_of_contributors">Katkıcı sayısı</string>
<string name="number_of_edits">Değişiklik sayısı</string>
<string name="reports_for">Rapor için</string>
<string name="reports_for">Şunun için rapor</string>
<string name="data_is_not_available">Veri mevcut değildir</string>
<string name="shared_string_status">Statü</string>
<string name="shared_string_save_changes">Değişiklikleri Kaydet</string>
<string name="shared_string_email_address">E-mail Adresi</string>
<string name="shared_string_email_address">E-posta adresi</string>
<string name="rendering_attr_hideUnderground_name">Yeraltı nesneleri</string>
<string name="shared_string_read_more">Daha fazla bilgi edinin</string>
<string name="shared_string_read_more">Daha çoğunu oku</string>
<string name="show_polygons">Çokgenleri göster</string>
@ -2063,24 +2063,24 @@
<string name="number_of_recipients">Alıcıların sayısı</string>
<string name="osm_user_stat">%1$s , rütbe %2$s , toplam düzenlemeleri %3$s düzenler</string>
<string name="osm_editors_ranking">OSM editörler sıralaması</string>
<string name="osm_live_subscription">OSM Live abonelik</string>
<string name="osm_live_subscribe_btn">Abone</string>
<string name="osm_live_email_desc">Buna katkılar hakkında size bilgi sağlamak için ihtiyaç duyuyoruz</string>
<string name="osm_live_user_public_name">Ortak adı</string>
<string name="osm_live_hide_user_name">Benim adımı raporlarda gösterme</string>
<string name="osm_live_subscription">OSM Live aboneliği</string>
<string name="osm_live_subscribe_btn">Abone Ol</string>
<string name="osm_live_email_desc">Buna, katkılar hakkında size bilgi sağlamak için gereksiniyoruz</string>
<string name="osm_live_user_public_name">Herkese Açık Ad</string>
<string name="osm_live_hide_user_name">Adımı raporlarda gösterme</string>
<string name="osm_live_support_region">Destek bölgesi</string>
<string name="osm_live_month_cost">Ay maliyeti</string>
<string name="osm_live_month_cost">Ay ücreti</string>
<string name="osm_live_month_cost_desc">Aylık ödeme</string>
<string name="osm_live_active">Aktif</string>
<string name="osm_live_not_active">Etkin olmayan</string>
<string name="osm_live_enter_email">Geçerli e-posta adresi giriniz</string>
<string name="osm_live_enter_user_name">Lütfen genel adı girin</string>
<string name="osm_live_thanks">Canlı güncellemeler için abone için teşekkür ederiz!</string>
<string name="osm_live_region_desc">Bağış parçası bu bölgede harita değişiklikleri gönder OSM kullanıcılara gönderilecek</string>
<string name="osm_live_region_desc">Bağışınızın bir bölümü, bu bölgede değişiklik yapan OSM kullanıcılarına gönderilecek</string>
<string name="osm_live_subscription_settings">Abonelik ayarları</string>
<string name="osm_live_ask_for_purchase">Lütfen ilk olarak OSM canlı abonelik satın alın</string>
<string name="osm_live_header">Bu abonelik saat güncelleştirmek için dünyanın her yerinden tüm haritalar sağlar. Gelir büyük bir kısmını OSM topluma geri gider ve her OSM katkı ödenir. Dibi OsmAnd ve OSM seviyorum ve bu destek vermek isteyen, mükemmel bir yolu bu.</string>
<string name="osm_live_header">Bu abonelik, dünya çapındaki tüm haritalar için saatlik güncellemeleri etkinleştirir. Gelirin bir bölümü OSM topluluğuna gitmektedir ve her OSM katkısı için ödenmektedir. Eğer OsmAnd\'ı ve OSM\'yi seviyor ve onları desteklemek istiyorsanız, bu bunu yapmak için en iyi yoldur.</string>
<string name="select_map_marker">Harita işaretleyiciyi seçin</string>
<string name="map_markers_other">Diğer işaretleri</string>
@ -2121,7 +2121,7 @@
<string name="rendering_value_medium_name">Orta</string>
<string name="rendering_value_bold_name">Kalın</string>
<string name="storage_permission_restart_is_required">Şimdi uygulamaya harici kayıt yerine yazma izni verildi. Elle uygulamanın baştan başlatılması gereklidir.</string>
<string name="full_report">Full rapor</string>
<string name="full_report">Tam rapor</string>
<string name="open_street_map_login_and_pass">OpenStreetMap oturum açma ve parola</string>
<string name="file_name_containes_illegal_char">Dosya adı uygunsuz karakter içeriyor</string>
<string name="shared_string_is_open_24_7">7/24 açık</string>
@ -2131,11 +2131,11 @@
<string name="app_mode_bus">Otobüs</string>
<string name="app_mode_train">Tren</string>
<string name="current_track">Şimdiki yol</string>
<string name="map_widget_battery">Pil seviyesi</string>
<string name="map_widget_battery">Pil düzeyi</string>
<string name="change_markers_position">İmlecin konumunu değiştir</string>
<string name="follow_us">Bizi takip edin</string>
<string name="map_widget_bearing">Nispi yön</string>
<string name="first_usage_greeting">İnternet bağlantısı olmadan yönergeler al ve yeni yerler keşfet</string>
<string name="first_usage_greeting">İnternet bağlantısı olmadan yönerge al ve yeni yerler keşfet</string>
<string name="get_started">Başlat</string>
<string name="search_location">Konum aranıyor…</string>
<string name="first_usage_wizard_desc">OsmAnd\'ın konumunuzu bulmasına ve o bölge için harita indirmeyi önermesine izin verin.</string>
@ -2210,4 +2210,44 @@
<string name="mapillary_menu_edit_text_hint">Kullanıcı adını yazın</string>
<string name="mapillary_menu_descr_username">Belirli bir kullanıcı tarafından eklenen görüntüleri görüntüleyin.</string>
<string name="route_point">Güzergah noktası</string>
<string name="nearest_cities">Yakın şehirler</string>
<string name="select_city">Şehir seç</string>
<string name="select_postcode">Posta kodu seç</string>
<string name="quick_action_add_destination">Hedef ekle</string>
<string name="quick_action_replace_destination"></string>
<string name="sea_depth_thanks">Denizel derinlik konturlarını satın aldığınız için teşekkür ederiz!</string>
<string name="index_item_depth_contours_osmand_ext">Denizel derinlik konturları</string>
<string name="index_item_depth_points_southern_hemisphere">Güney yarı küre denizel derinlik noktaları</string>
<string name="index_item_depth_points_northern_hemisphere">Kuzey yarı küre denizel derinlik noktaları</string>
<string name="download_depth_countours">Denizel derinlik konturları</string>
<string name="nautical_maps">Deniz haritaları</string>
<string name="fonts_header">Harita için yazı tipleri</string>
<string name="rendering_attr_depthContours_name">Denizel derinlik konturları</string>
<string name="edit_filter">Kategorileri düzenle</string>
<string name="subcategories">Alt kategoriler</string>
<string name="selected_categories">Seçilen kategoriler</string>
<string name="new_filter_desc">Lütfen yeni süzgeç için bir ad girin, bu Kategoriler sekmenize eklenecek.</string>
<string name="osm_live_payment_desc">Abonelik ücreti her ay kesilecektir. Aboneliğinizi istediğiniz zaman Google Play\'den iptal edebilirsiniz.</string>
<string name="donation_to_osm">OpenStreetMap topluluğuna bağış</string>
<string name="donation_to_osm_desc">Bağışınızın bir bölümü, OpenStreetMap\'e değişiklik yapan OSM kullanıcılarına gönderilir. Abonelik ücretiniz aynı kalır.</string>
<string name="osm_live_subscription_desc">Abonelik; tüm küresel haritalar için sınır indirmeyi ve saatlik, günlük, haftalık güncellemeleri etkinleştirir.</string>
<string name="osm_live_banner_desc">Sınırsız harita indirme edin, ve ayda birden çok harita güncellemesi al: haftalık, günlük veya saatlik.</string>
<string name="osmand_plus_banner_desc">Sınırsız harita indirmeleri, güncellemeleri ve Wikipedia eklentisi.</string>
<string name="skip_map_downloading">Harita indirmeyi atla</string>
<string name="skip_map_downloading_desc">Kurulu hiçbir çevrim dışı haritanız yok. Menü - %1$s aracılığıyla daha sonra listeden bir harita seçmeyi veya indirmeyi isteyebilirsiniz.</string>
<string name="search_map">Haritalar aranıyor…</string>
<string name="location_not_found">Konum bulunamadı</string>
<string name="no_inet_connection">İnternet bağlantısı yok</string>
<string name="no_inet_connection_desc_map">Haritaları indirmek için gereklidir.</string>
<string name="storage_free_space">Boş alan</string>
<string name="coords_search">Koordinat ara</string>
<string name="advanced_coords_search">Gelişmiş koordinat arama</string>
<string name="search_categories">Kategoriler</string>
<string name="configure_screen_quick_action">Hızlı eylem</string>
<string name="quick_action_navigation_voice">Ses açık/kapalı</string>
<string name="quick_action_new_action">Eylem ekle</string>
<string name="dialog_add_action_title">Eylem ekle</string>
<string name="quick_action_duplicates">Belirlenen hızlı eylem adı zaten kullanımda, ikizliği engellemek için %1$s olarak adlandırıldı.</string>
<string name="quick_action_add_create_items">Öge oluştur</string>
<string name="quick_action_sh_poi_descr">Haritada göstermek için bir veya daha çok POI kategorisi ekleyebilirsiniz.</string>
</resources>

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

@ -1526,7 +1526,7 @@
<string name="gpx_option_calculate_first_last_segment">Обчислити маршрут OsmAnd для першого та останнього сегментів маршруту</string>
<string name="use_displayed_track_for_navigation">Чи Ви хочете використовувати відображення треку для навігації?</string>
<string name="keep_and_add_destination_point">Додати як наступний пункт призначення</string>
<string name="select_gpx">Обрати GPX…</string>
<string name="select_gpx">Виберіть GPX…</string>
<string name="route_descr_select_destination">Виберіть пункт призначення</string>
<string name="shared_string_select_on_map">Виберіть на мапі</string>
<string name="shared_string_favorite">Закладки</string>
@ -2232,7 +2232,7 @@
<string name="clear_active_markers_q">Вилучити всі активні позначки?</string>
<string name="clear_markers_history_q">Очистити історію позначок мапи?</string>
<string name="active_markers">Поточні позназчки</string>
<string name="map_markers">Позначки мапи</string>
<string name="map_markers">Маркери мапи</string>
<string name="map_marker">Позначка мапи</string>
<string name="consider_turning_polygons_off">Рекомендується вимкнути показ полігонів.</string>
<string name="av_locations_descr">Файл GPX з координатами нотаток</string>

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

@ -2862,7 +2862,7 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
<string name="this_year">今年</string>
<string name="widget">小工具</string>
<string name="top_bar">頂欄</string>
<string name="marker_show_distance_descr">選擇如何在地圖畫面上指示距離和方向的地圖標記：</string>
<string name="marker_show_distance_descr">選擇如何在地圖畫面上表示距離和方向給地圖標記：</string>
<string name="map_orientation_change_in_accordance_with_speed_descr">選擇下方哪個速度的地圖方向從\'行動方向\'切換到\'羅盤\'</string>
<string name="remove_from_map_markers">從地圖標記中移除</string>
<string name="descendingly">遞減</string>
@ -2885,4 +2885,11 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
<string name="marker_save_as_track">另存為軌跡</string>
<string name="move_to_history">移至歷程</string>
<string name="group_will_be_removed_after_restart">重新啟動後群組將被移除</string>
<string name="shared_string_markers">標記</string>
<string name="coordinates_format">座標格式</string>
<string name="use_system_keyboard">使用系統鍵盤</string>
<string name="fast_coordinates_input_descr">選擇座標輸入格式。您可以隨時輕點選項來更改它。</string>
<string name="fast_coordinates_input">快速座標輸入</string>
<string name="routing_attr_avoid_ice_roads_fords_name">避開結冰道路、涉水</string>
<string name="routing_attr_avoid_ice_roads_fords_description">避開結冰和涉水的道路</string>
</resources>

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

@ -12,13 +12,13 @@
<string name="shared_string_markers">Markers</string>
<string name="coordinates_format">Coordinates format</string>
<string name="use_system_keyboard">Use system keyboard</string>
<string name="fast_coordinates_input_descr">Choose coordinate format before start. You can always change it by tapping Options.</string>
<string name="fast_coordinates_input">Fast Coordinates input</string>
<string name="fast_coordinates_input_descr">Choose coordinate input format. You can always change it by tapping Options.</string>
<string name="fast_coordinates_input">Fast coordinates input</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Avoid ice roads, fords</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Avoid ice roads and fords</string>
<string name="use_location">Use location</string>
<string name="add_location_as_first_point_descr">Add your location as first point to plan perfect route.</string>
<string name="my_location">My Location</string>
<string name="use_location">Use position</string>
<string name="add_location_as_first_point_descr">Add your position as first point to plan perfect route.</string>
<string name="my_location">My position</string>
<string name="shared_string_finish">Finish</string>
<string name="plan_route">Plan route</string>
<string name="shared_string_sort">Sort</string>
@ -33,14 +33,14 @@
<string name="show_passed">Show \'Last used\' date</string>
<string name="hide_passed">Hide \'Last used\' date</string>
<string name="remove_from_map_markers">Remove from Map Markers</string>
<string name="descendingly">Descending</string>
<string name="ascendingly">Ascending</string>
<string name="descendingly">descending</string>
<string name="ascendingly">ascending</string>
<string name="date_added">Date added</string>
<string name="order_by">Order by:</string>
<string name="marker_show_distance_descr">Select how to indicate distance and direction to Map markers on the map screen:</string>
<string name="marker_show_distance_descr">Select how to indicate distance and direction to map markers on the map screen:</string>
<string name="map_orientation_change_in_accordance_with_speed">Map orientation threshold</string>
<string name="map_orientation_change_in_accordance_with_speed_descr">Select below which speed the map orientation switches from \'To direction of movement\' to \'To compass\'</string>
<string name="all_markers_moved_to_history">All Map markers moved to history</string>
<string name="all_markers_moved_to_history">All map markers moved to history</string>
<string name="marker_moved_to_history">Map marker moved to history</string>
<string name="marker_moved_to_active">Map marker moved to active</string>
<string name="shared_string_list">List</string>

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

@ -548,7 +548,10 @@ public class OsmandApplication extends MultiDexApplication {
}
public void startApplication() {
Thread.setDefaultUncaughtExceptionHandler(new DefaultExceptionHandler());
UncaughtExceptionHandler uncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
if (!(uncaughtExceptionHandler instanceof DefaultExceptionHandler)) {
Thread.setDefaultUncaughtExceptionHandler(new DefaultExceptionHandler());
}
appInitializer.startApplication();
}

2
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -2971,7 +2971,7 @@ public class OsmandSettings {
return customBooleanRoutingProps.get(attrName);
}
public final OsmandPreference<Boolean> USE_OSM_LIVE_FOR_ROUTING = new BooleanPreference("enable_osmc_routing", false).makeGlobal();
public final OsmandPreference<Boolean> USE_OSM_LIVE_FOR_ROUTING = new BooleanPreference("enable_osmc_routing", true).makeGlobal();
public final OsmandPreference<Boolean> VOICE_MUTE = new BooleanPreference("voice_mute", false).makeGlobal();

14
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteRecordingMenuFullScreen.java
View file

@ -1,11 +1,9 @@
package net.osmand.plus.audionotes;
import android.animation.ValueAnimator;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Matrix;
import android.support.v4.animation.AnimatorCompatHelper;
import android.support.v4.animation.AnimatorUpdateListenerCompat;
import android.support.v4.animation.ValueAnimatorCompat;
import android.support.v4.app.Fragment;
import android.support.v4.view.ViewCompat;
import android.util.DisplayMetrics;
@ -25,7 +23,7 @@ public class AudioVideoNoteRecordingMenuFullScreen extends AudioVideoNoteRecordi
protected ImageView imageview;
protected ProgressBar progressBar;
protected ValueAnimatorCompat animatorCompat;
protected ValueAnimator animatorCompat;
public AudioVideoNoteRecordingMenuFullScreen(AudioVideoNotesPlugin plugin, double lat, double lon) {
super(plugin, lat, lon);
@ -133,14 +131,14 @@ public class AudioVideoNoteRecordingMenuFullScreen extends AudioVideoNoteRecordi
ViewCompat.setAlpha(progressBar, 1f);
progressBar.setVisibility(View.VISIBLE);
animatorCompat = AnimatorCompatHelper.emptyValueAnimator();
animatorCompat = ValueAnimator.ofInt(0);
final Interpolator interpolator = new LinearInterpolator();
animatorCompat.setDuration(duration);
animatorCompat.setTarget(progressBar);
animatorCompat.addUpdateListener(new AnimatorUpdateListenerCompat() {
animatorCompat.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimatorCompat animation) {
float fraction = interpolator.getInterpolation(animation.getAnimatedFraction());
public void onAnimationUpdate(ValueAnimator valueAnimator) {
float fraction = interpolator.getInterpolation(valueAnimator.getAnimatedFraction());
progressBar.setProgress((int)(500 * fraction));
}
});

40
OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
View file

@ -339,25 +339,27 @@ public class WaypointHelper {
pointsProgress.set(type, kIterator);
while (kIterator < lp.size()) {
LocationPointWrapper lwp = lp.get(kIterator);
if (route.getDistanceToPoint(lwp.routeIndex) > LONG_ANNOUNCE_RADIUS * 2) {
break;
}
LocationPoint point = lwp.point;
double d1 = Math.max(0.0, MapUtils.getDistance(lastKnownLocation.getLatitude(), lastKnownLocation.getLongitude(),
point.getLatitude(), point.getLongitude()) - lwp.getDeviationDistance());
Integer state = locationPointsStates.get(point);
if (state != null && state.intValue() == ANNOUNCED_ONCE
&& getVoiceRouter().isDistanceLess(lastKnownLocation.getSpeed(), d1, SHORT_ANNOUNCE_RADIUS, 0f)) {
locationPointsStates.put(point, ANNOUNCED_DONE);
announcePoints.add(lwp);
} else if (type != ALARMS && (state == null || state == NOT_ANNOUNCED)
&& getVoiceRouter().isDistanceLess(lastKnownLocation.getSpeed(), d1, LONG_ANNOUNCE_RADIUS, 0f)) {
locationPointsStates.put(point, ANNOUNCED_ONCE);
approachPoints.add(lwp);
} else if (type == ALARMS && (state == null || state == NOT_ANNOUNCED)
&& getVoiceRouter().isDistanceLess(lastKnownLocation.getSpeed(), d1, ALARMS_ANNOUNCE_RADIUS, 0f)) {
locationPointsStates.put(point, ANNOUNCED_ONCE);
approachPoints.add(lwp);
if (lwp.announce) {
if (route.getDistanceToPoint(lwp.routeIndex) > LONG_ANNOUNCE_RADIUS * 2) {
break;
}
LocationPoint point = lwp.point;
double d1 = Math.max(0.0, MapUtils.getDistance(lastKnownLocation.getLatitude(), lastKnownLocation.getLongitude(),
point.getLatitude(), point.getLongitude()) - lwp.getDeviationDistance());
Integer state = locationPointsStates.get(point);
if (state != null && state.intValue() == ANNOUNCED_ONCE
&& getVoiceRouter().isDistanceLess(lastKnownLocation.getSpeed(), d1, SHORT_ANNOUNCE_RADIUS, 0f)) {
locationPointsStates.put(point, ANNOUNCED_DONE);
announcePoints.add(lwp);
} else if (type != ALARMS && (state == null || state == NOT_ANNOUNCED)
&& getVoiceRouter().isDistanceLess(lastKnownLocation.getSpeed(), d1, LONG_ANNOUNCE_RADIUS, 0f)) {
locationPointsStates.put(point, ANNOUNCED_ONCE);
approachPoints.add(lwp);
} else if (type == ALARMS && (state == null || state == NOT_ANNOUNCED)
&& getVoiceRouter().isDistanceLess(lastKnownLocation.getSpeed(), d1, ALARMS_ANNOUNCE_RADIUS, 0f)) {
locationPointsStates.put(point, ANNOUNCED_ONCE);
approachPoints.add(lwp);
}
}
kIterator++;
}

4
OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiDialogFragment.java
View file

@ -76,11 +76,13 @@ public class SendPoiDialogFragment extends DialogFragment {
break;
}
}
messageEditText.setText(createDefaultChangeSet());
String defaultChangeSet = createDefaultChangeSet();
messageEditText.setText(defaultChangeSet);
final boolean hasPOI = hasPoiGroup;
messageLabel.setVisibility(hasPOI ? View.VISIBLE : View.GONE);
messageEditText.setVisibility(hasPOI ? View.VISIBLE : View.GONE);
closeChangeSetCheckBox.setVisibility(hasPOI ? View.VISIBLE : View.GONE);
closeChangeSetCheckBox.setChecked(hasPOI && !defaultChangeSet.equals(""));
view.findViewById(R.id.osm_note_header).setVisibility(hasPOI ? View.GONE : View.VISIBLE);
uploadAnonymously.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override

57
OsmAnd/src/net/osmand/plus/views/GPXLayer.java
View file

@ -465,31 +465,44 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
private void drawSelectedFilesSegments(Canvas canvas, RotatedTileBox tileBox,
List<SelectedGpxFile> selectedGPXFiles, DrawSettings settings) {
SelectedGpxFile currentTrack = null;
for (SelectedGpxFile g : selectedGPXFiles) {
GpxDataItem gpxDataItem = null;
if (!g.isShowCurrentTrack()) {
gpxDataItem = view.getApplication().getGpxDatabase().getItem(new File(g.getGpxFile().path));
if (g.isShowCurrentTrack()) {
currentTrack = g;
} else {
drawSelectedFileSegments(g, false, canvas, tileBox, settings);
}
List<TrkSegment> segments = g.getPointsToDisplay();
for (TrkSegment ts : segments) {
int color = gpxDataItem != null ? gpxDataItem.getColor() : 0;
if (g.isShowCurrentTrack()) {
color = currentTrackColor;
}
if (color == 0) {
color = ts.getColor(cachedColor);
}
if (ts.renders.isEmpty() // only do once (CODE HERE NEEDS TO BE UI INSTEAD)
&& !ts.points.isEmpty()) { // hmmm. 0-point tracks happen, but.... how?
if (g.isShowCurrentTrack()) {
ts.renders.add(new Renderable.CurrentTrack(ts.points));
} else {
ts.renders.add(new Renderable.StandardTrack(ts.points, 17.2));
}
}
updatePaints(color, g.isRoutePoints(), g.isShowCurrentTrack(), settings, tileBox);
ts.drawRenderers(view.getZoom(), paint, canvas, tileBox);
}
if (currentTrack != null) {
drawSelectedFileSegments(currentTrack, true, canvas, tileBox, settings);
}
}
private void drawSelectedFileSegments(SelectedGpxFile selectedGpxFile, boolean currentTrack, Canvas canvas,
RotatedTileBox tileBox, DrawSettings settings) {
GpxDataItem gpxDataItem = null;
if (!currentTrack) {
gpxDataItem = view.getApplication().getGpxDatabase().getItem(new File(selectedGpxFile.getGpxFile().path));
}
List<TrkSegment> segments = selectedGpxFile.getPointsToDisplay();
for (TrkSegment ts : segments) {
int color = gpxDataItem != null ? gpxDataItem.getColor() : 0;
if (currentTrack) {
color = currentTrackColor;
}
if (color == 0) {
color = ts.getColor(cachedColor);
}
if (ts.renders.isEmpty() // only do once (CODE HERE NEEDS TO BE UI INSTEAD)
&& !ts.points.isEmpty()) { // hmmm. 0-point tracks happen, but.... how?
if (currentTrack) {
ts.renders.add(new Renderable.CurrentTrack(ts.points));
} else {
ts.renders.add(new Renderable.StandardTrack(ts.points, 17.2));
}
}
updatePaints(color, selectedGpxFile.isRoutePoints(), currentTrack, settings, tileBox);
ts.drawRenderers(view.getZoom(), paint, canvas, tileBox);
}
}

6
OsmAndCore-sample/build.gradle
View file

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 26
buildToolsVersion "26.0.0"
buildToolsVersion "26.0.1"
dexOptions {
jumboMode true
@ -110,8 +110,8 @@ repositories {
dependencies {
compile project(path: ':OsmAnd-java', configuration: 'android')
compile 'com.android.support:appcompat-v7:25.+'
compile 'com.android.support:design:25.+'
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:design:26.1.0'
compile fileTree(dir: "libs", include: ["*.jar"])
compile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
debugCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"