Merge branch 'master' into custom_track_colors
This commit is contained in:
Vitaliy
commit
9e5232fca8
26 changed files with 269 additions and 140 deletions
10
.github/workflows/gradle-wrapper-validation.yml
vendored
Normal file
10
.github/workflows/gradle-wrapper-validation.yml
vendored
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
name: "Validate Gradle Wrapper"
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
validation:
|
||||
name: "Validation"
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: gradle/wrapper-validation-action@v1
|
||||
|
|
@ -40,6 +40,10 @@ public class RenderingRulesStorage {
|
|||
|
||||
private final static int SHIFT_TAG_VAL = 16;
|
||||
|
||||
|
||||
private final static String SEQ_ATTR_KEY = "seq";
|
||||
private final static String SEQ_PLACEHOLDER = "#SEQ";
|
||||
|
||||
// C++
|
||||
List<String> dictionary = new ArrayList<String>();
|
||||
Map<String, Integer> dictionaryMap = new LinkedHashMap<String, Integer>();
|
||||
|
|
@ -191,8 +195,19 @@ public class RenderingRulesStorage {
|
|||
List<XmlTreeSequence> children = new ArrayList<RenderingRulesStorage.XmlTreeSequence>();
|
||||
|
||||
private void process(RenderingRulesHandler handler, int el) throws XmlPullParserException, IOException {
|
||||
// TODO create new attrsMap and replace #SEQ -> el
|
||||
handler.startElement(attrsMap, name);
|
||||
Map<String, String> seqAttrsMap = new HashMap<String, String>(attrsMap);
|
||||
if (attrsMap.containsKey(SEQ_ATTR_KEY)) {
|
||||
attrsMap.remove(SEQ_ATTR_KEY);
|
||||
}
|
||||
|
||||
for (Entry<String, String> attr: attrsMap.entrySet()) {
|
||||
if (attr.getValue().contains(SEQ_PLACEHOLDER)) {
|
||||
seqAttrsMap.put(attr.getKey(), attr.getValue().replace(SEQ_PLACEHOLDER, el+""));
|
||||
} else {
|
||||
seqAttrsMap.put(attr.getKey(), attr.getValue());
|
||||
}
|
||||
}
|
||||
handler.startElement(seqAttrsMap, name);
|
||||
for(XmlTreeSequence s : children) {
|
||||
s.process(handler, el);
|
||||
}
|
||||
|
|
@ -223,13 +238,13 @@ public class RenderingRulesStorage {
|
|||
attrsMap.clear();
|
||||
parseAttributes(parser, attrsMap);
|
||||
String name = parser.getName();
|
||||
if (!Algorithms.isEmpty(parser.getAttributeValue("", "seq")) || currentSeqElement != null) {
|
||||
if (!Algorithms.isEmpty(parser.getAttributeValue("", SEQ_ATTR_KEY)) || currentSeqElement != null) {
|
||||
XmlTreeSequence seq = new XmlTreeSequence();
|
||||
seq.name = name;
|
||||
seq.attrsMap = attrsMap;
|
||||
seq.attrsMap = new HashMap<String, String>(attrsMap);
|
||||
seq.parent = currentSeqElement;
|
||||
if (currentSeqElement == null) {
|
||||
seq.seqOrder = parser.getAttributeValue("", "seq");
|
||||
seq.seqOrder = parser.getAttributeValue("", SEQ_ATTR_KEY);
|
||||
} else {
|
||||
currentSeqElement.children.add(seq);
|
||||
seq.seqOrder = currentSeqElement.seqOrder;
|
||||
|
|
@ -246,7 +261,8 @@ public class RenderingRulesStorage {
|
|||
currentSeqElement = currentSeqElement.parent;
|
||||
if (currentSeqElement == null) {
|
||||
// Here we process sequence element
|
||||
for(int i = 1; i < 5; i++) {
|
||||
int seqEnd = Integer.parseInt(process.seqOrder.substring(process.seqOrder.indexOf(':') + 1, process.seqOrder.length()));
|
||||
for(int i = 1; i < seqEnd; i++) {
|
||||
process.process(this, i);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3095,7 +3095,7 @@
|
|||
<string name="quick_action_hillshade_hide">إخفاء التضاريس</string>
|
||||
<string name="quick_action_show_hide_hillshade">إظهار/إخفاء التضاريس</string>
|
||||
<string name="tts_initialization_error">لا يمكن بدء تشغيل أداة تحويل النص إلى كلام.</string>
|
||||
<string name="export_profile">تصدير الوضع</string>
|
||||
<string name="export_profile">تصدير الملف الشخصي</string>
|
||||
<string name="exported_osmand_profile">وضع أوسماند: %1$s</string>
|
||||
<string name="overwrite_profile_q">الوضع \'%1$s\' موجود بالفعل، هل تريد استبداله؟</string>
|
||||
<string name="export_profile_failed">لا يمكن تصدير الوضع.</string>
|
||||
|
|
@ -3828,4 +3828,5 @@
|
|||
<string name="plan_route_create_new_route">إنشاء مسار جديد</string>
|
||||
<string name="plan_route_select_track_file_for_open">حدد ملف المسار للفتح.</string>
|
||||
<string name="shared_string_done">تم</string>
|
||||
<string name="overwrite_track">الكتابة فوق المسار</string>
|
||||
</resources>
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
<string name="traffic_warning_border_control">Grenzkontrolle</string>
|
||||
<string name="traffic_warning_payment">Mautstelle</string>
|
||||
<string name="traffic_warning_stop">Stoppzeichen</string>
|
||||
<string name="traffic_warning_calming">Verkehrsberuhigung</string>
|
||||
<string name="traffic_warning_calming">Bodenschwelle</string>
|
||||
<string name="traffic_warning_speed_camera">Blitzer</string>
|
||||
<string name="traffic_warning">Verkehrswarnung</string>
|
||||
<string name="speak_favorites">Favoriten in der Nähe</string>
|
||||
|
|
@ -3845,4 +3845,5 @@
|
|||
<string name="plan_route_create_new_route">Neue Route erstellen</string>
|
||||
<string name="plan_route_select_track_file_for_open">Wählen Sie eine Trackdatei zum Öffnen aus.</string>
|
||||
<string name="shared_string_done">Fertig</string>
|
||||
<string name="overwrite_track">Track überschreiben</string>
|
||||
</resources>
|
||||
|
|
@ -580,7 +580,7 @@
|
|||
<string name="traffic_warning_border_control">Landlima kontrolado</string>
|
||||
<string name="traffic_warning_payment">Vojpagejo</string>
|
||||
<string name="traffic_warning_stop">Stop\' signo</string>
|
||||
<string name="traffic_warning_calming">Trafik-trankviligejo</string>
|
||||
<string name="traffic_warning_calming">Trafik-trankviligilo</string>
|
||||
<string name="traffic_warning_speed_camera">Rapid-kontrolilo</string>
|
||||
<string name="traffic_warning">Trafika averto</string>
|
||||
<string name="speak_poi">Proksimaj interesejoj</string>
|
||||
|
|
@ -3838,4 +3838,5 @@
|
|||
<string name="plan_route_create_new_route">Krei novan kurson</string>
|
||||
<string name="plan_route_select_track_file_for_open">Elekti dosieron de spuro por malfermi.</string>
|
||||
<string name="shared_string_done">Farita</string>
|
||||
<string name="overwrite_track">Superskribi kurson</string>
|
||||
</resources>
|
||||
|
|
@ -3837,4 +3837,11 @@
|
|||
<string name="shared_string_custom">Personalizado</string>
|
||||
<string name="gpx_direction_arrows">Flechas de dirección</string>
|
||||
<string name="track_coloring_solid">Sólido</string>
|
||||
<string name="plan_route_last_edited">Última edición</string>
|
||||
<string name="plan_route_import_track">Importar traza</string>
|
||||
<string name="plan_route_open_existing_track">Abrir traza existente</string>
|
||||
<string name="plan_route_create_new_route">Crear nueva ruta</string>
|
||||
<string name="plan_route_select_track_file_for_open">Marca un archivo de traza para abrir.</string>
|
||||
<string name="shared_string_done">Hecho</string>
|
||||
<string name="overwrite_track">Sobrescribir traza</string>
|
||||
</resources>
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
<string name="shared_string_skip">Jäta vahele</string>
|
||||
<string name="poi_action_add">lisa</string>
|
||||
<string name="shared_string_message">Sõnum</string>
|
||||
<string name="agps_data_last_downloaded">A-GPS andmed alla laetud: %1$s</string>
|
||||
<string name="agps_data_last_downloaded">A-GPS andmed on allalaetud: %1$s</string>
|
||||
<string name="welmode_download_maps">Kaartide allalaadimine</string>
|
||||
<string name="welcome_header">Tere tulemast</string>
|
||||
<string name="mark_to_delete">Märgi kustutamiseks</string>
|
||||
|
|
@ -160,11 +160,11 @@
|
|||
<string name="mapillary_menu_title_dates">Kuupäev</string>
|
||||
<string name="mapillary_menu_edit_text_hint">Sisesta kasutajatunnus</string>
|
||||
<string name="mapillary_menu_title_username">Kasutajatunnus</string>
|
||||
<string name="improve_coverage_install_mapillary_desc">Paigalda Mapillary rakendus sellesse asukohta kaardil ühe või enama pildi lisamiseks.</string>
|
||||
<string name="improve_coverage_install_mapillary_desc">Paigalda Mapillary piltide lisamiseks sellesse asukohta kaardil.</string>
|
||||
<string name="no_photos_descr">Siin puuduvad fotod.</string>
|
||||
<string name="restart_search">Taaskäivita otsing</string>
|
||||
<string name="quick_action_showhide_osmbugs_title">Lülita OSM märkmed sisse või välja</string>
|
||||
<string name="quick_action_osmbugs_show">Näita OSM Notes</string>
|
||||
<string name="quick_action_osmbugs_show">Näita OSM märkmed</string>
|
||||
<string name="quick_action_osmbugs_hide">Peida OSM Notes</string>
|
||||
<string name="thank_you_for_feedback">Täname sind tagasiside eest</string>
|
||||
<string name="poi_cannot_be_found">Punkti või teed ei leitud.</string>
|
||||
|
|
@ -292,8 +292,8 @@
|
|||
<string name="quick_action_replace_destination">Asenda sihtkoht</string>
|
||||
<string name="quick_action_add_first_intermediate">Lisa esimene vahepealne</string>
|
||||
<string name="quick_action_auto_zoom">Automaatne kaardi suurendamine sisse/välja</string>
|
||||
<string name="quick_action_auto_zoom_on">Luba kaardi automaatne suurendamine</string>
|
||||
<string name="quick_action_auto_zoom_off">Keela kaardi automaatne suurendamine</string>
|
||||
<string name="quick_action_auto_zoom_on">Lülita kaardi automaatne suumimine sisse</string>
|
||||
<string name="quick_action_auto_zoom_off">Lülita kaardi automaatne suumimine välja</string>
|
||||
<string name="type_city_town">Kirjuta linn/maakond</string>
|
||||
<string name="type_postcode">Kirjuta postiindeks</string>
|
||||
<string name="nearest_cities">Lähimad linnad</string>
|
||||
|
|
@ -327,7 +327,7 @@
|
|||
<string name="map_widget_ruler_control">Raadiuse joonlaud</string>
|
||||
<string name="quick_action_resume_pause_navigation">Peata/jätka navigeerimist</string>
|
||||
<string name="quick_action_start_stop_navigation">Käivita/lõpeta navigeerimine</string>
|
||||
<string name="quick_action_start_stop_navigation_descr">Vajuta seda nuppu navigeerimise alustamiseks või lõpetamiseks.</string>
|
||||
<string name="quick_action_start_stop_navigation_descr">Navigeerimise alustamise või lõpetamise nupp.</string>
|
||||
<string name="measurement_tool">Mõõda vahemaa</string>
|
||||
<string name="measurement_tool_action_bar">Sirvi kaarti ja lisa punkte</string>
|
||||
<string name="none_point_error">Palun lisa vähemalt üks punkt.</string>
|
||||
|
|
@ -350,7 +350,7 @@
|
|||
<string name="keep_showing_on_map">Jätka kaardil kuvamist</string>
|
||||
<string name="exit_without_saving">Välju ilma salvestamata\?</string>
|
||||
<string name="do_not_use_animations">Animatsioonideta</string>
|
||||
<string name="do_not_use_animations_descr">Keelab animatsioonid rakenduses.</string>
|
||||
<string name="do_not_use_animations_descr">Lülitab kaardianimatsioonid välja.</string>
|
||||
<string name="move_all_to_history">Teisalda kõik ajalukku</string>
|
||||
<string name="sort_by">Sorteerimisalus</string>
|
||||
<string name="map_orientation_change_in_accordance_with_speed">Kaardi orientatsiooni lävi</string>
|
||||
|
|
@ -462,7 +462,7 @@
|
|||
<string name="will_open_tomorrow_at">Avaneb homme kell</string>
|
||||
<string name="show_closed_notes">Kuva suletud teated</string>
|
||||
<string name="switch_osm_notes_visibility_desc">Kuva/peida OSM teated kaardil.</string>
|
||||
<string name="osc_file_desc">OSC - sobib andmete laadimiseks OpenStreetMap\'i andmebaasi</string>
|
||||
<string name="osc_file_desc">OSC - sobib andmete laadimiseks OpenStreetMap\'i andmebaasi.</string>
|
||||
<string name="osc_file">OSC fail</string>
|
||||
<string name="choose_file_type">Vali faililiik</string>
|
||||
<string name="all_data">Kõik andmed</string>
|
||||
|
|
@ -750,7 +750,7 @@
|
|||
<string name="base_profile_descr_car">Auto, veoauto, mootorratas</string>
|
||||
<string name="base_profile_descr_bicycle">Maastikuratas, mopeed, hobune</string>
|
||||
<string name="base_profile_descr_pedestrian">Kõndimine, matkamine, jooksmine</string>
|
||||
<string name="base_profile_descr_public_transport">Kõik ühistranspordi liigid</string>
|
||||
<string name="base_profile_descr_public_transport">Ühistranspordi liigid</string>
|
||||
<string name="base_profile_descr_boat">Laev, sõudmine, purjetamine</string>
|
||||
<string name="base_profile_descr_aircraft">Lennuk, purilend</string>
|
||||
<string name="routing_profile_geocoding">Geokoodeerimine</string>
|
||||
|
|
@ -772,7 +772,7 @@
|
|||
<string name="default_speed_setting_title">Vaikimisi kiirus</string>
|
||||
<string name="default_speed_setting_descr">Muuda vaikimisi kiiruse seadeid</string>
|
||||
<string name="minmax_speed_dialog_title">Määra vähim/suurim kiirus</string>
|
||||
<string name="default_speed_dialog_msg">Hindab saamumisaega tundmatute teede korral ja kiirusepiiranguid kõikidel teedel (võib muuta teekonda)</string>
|
||||
<string name="default_speed_dialog_msg">Hindab saabumisaega tundmatute teede korral ja kiirusepiiranguid kõikidel teedel (võib muuta teekonda)</string>
|
||||
<string name="new_profile">Uus profiil</string>
|
||||
<string name="shared_string_crash">Kokkujooksmine</string>
|
||||
<string name="last_launch_crashed">OsmAnd jooksis viimati kasutades kokku. Palun aita meil veateadet jagades OsmAnd rakendust parandada.</string>
|
||||
|
|
@ -810,7 +810,7 @@
|
|||
<string name="edit_profile_screen_options_subtitle">Vali profiili ekraaniseadistused</string>
|
||||
<string name="edit_profile_nav_settings_subtitle">Vali profiili navigeerimisseadistused</string>
|
||||
<string name="routing_attr_max_num_changes_description">Määra muudatuste ülemine piir</string>
|
||||
<string name="routing_attr_max_num_changes_name">Muudatuste arv</string>
|
||||
<string name="routing_attr_max_num_changes_name">Ümberistumiste arv</string>
|
||||
<string name="turn_screen_on_router">Ärka pöördel</string>
|
||||
<string name="turn_screen_on_time_descr">Reguleeri kui kaua ekraan peaks olema sisse lülitatud.</string>
|
||||
<string name="turn_screen_on_sensor">Kasuta lähedusandurit</string>
|
||||
|
|
@ -880,7 +880,7 @@
|
|||
<string name="apply_to_all_profiles">Rakenda kõikidele profiilidele</string>
|
||||
<string name="start_up_message_pref">Käivitamise sõnum</string>
|
||||
<string name="analytics_pref_title">Analüütika</string>
|
||||
<string name="turn_screen_on_info">Kuva kaart lukustuskuval navigeerimise ajal.</string>
|
||||
<string name="turn_screen_on_info">Kuva navigeerimise ajal lukustuskuval kaarti.</string>
|
||||
<string name="route_parameters_info">Marsruutimise seaded valitud profiilis \"%1$s\".</string>
|
||||
<string name="wake_time">Ärkamisaeg</string>
|
||||
<string name="units_and_formats">Ühikud ja formaadid</string>
|
||||
|
|
@ -927,7 +927,7 @@
|
|||
<string name="change_osmand_data_folder_question">Muuta OsmAnd andmekausta\?</string>
|
||||
<string name="move_maps_to_new_destination">Liiguta uude asukohta</string>
|
||||
<string name="internal_app_storage_description">Sisemine salvestusruum, kasutaja ja teiste rakenduste eest peidetud, juurdepääsetav ainult OsmAnd\'ile.</string>
|
||||
<string name="change_data_storage_folder">Muuda andmete salvestamise kausta</string>
|
||||
<string name="change_data_storage_folder">Muuda salvestamise kausta</string>
|
||||
<string name="rendering_attr_piste_type_snow_park_name">Maastikupark</string>
|
||||
<string name="rendering_attr_piste_type_sleigh_name">Saan</string>
|
||||
<string name="rendering_attr_piste_type_sled_name">Kelk</string>
|
||||
|
|
@ -992,13 +992,13 @@
|
|||
<string name="apply_preference_to_all_profiles">Võid rakendada seda muudatust kõikidele või ainult valitud profiilile.</string>
|
||||
<string name="shared_preference">Jagatud</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_name">Eelista katteta teid</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_description">Eelista katteta teid.</string>
|
||||
<string name="routing_attr_driving_style_prefer_unpaved_description">Teekonna koostamisel eelista katteta teid pinnatud teedele.</string>
|
||||
<string name="layer_osm_edits">OSM muudatused</string>
|
||||
<string name="quick_action_contour_lines_descr">Lüliti kaardil kõrgusjoonte kuvamiseks või peitmiseks.</string>
|
||||
<string name="quick_action_contour_lines_descr">Nupp kõrgusjoonte kuvamiseks või peitmiseks kaardil.</string>
|
||||
<string name="quick_action_contour_lines_show">Kuva kõrgusjooned</string>
|
||||
<string name="quick_action_contour_lines_hide">Peida kõrgusjooned</string>
|
||||
<string name="quick_action_show_hide_contour_lines">Kuva/peida kõrgusjooned</string>
|
||||
<string name="quick_action_hillshade_descr">Lüliti künkavarjutuste kaardil kuvamiseks või peitmiseks.</string>
|
||||
<string name="quick_action_hillshade_descr">Nupp künkavarjutuste kuvamiseks või peitmiseks kaardil.</string>
|
||||
<string name="quick_action_hillshade_show">Kuva künkavarjutus</string>
|
||||
<string name="quick_action_hillshade_hide">Peida künkavarjutus</string>
|
||||
<string name="quick_action_show_hide_hillshade">Kuva/peida künkavarjutus</string>
|
||||
|
|
@ -1021,7 +1021,7 @@
|
|||
<string name="clear_confirmation_msg">Tühjenda %1$s\?</string>
|
||||
<string name="download_map_dialog">Kaardi allalaadimise dialoog</string>
|
||||
<string name="dialogs_and_notifications_title">Dialoogid ja teated</string>
|
||||
<string name="dialogs_and_notifications_descr">Halda OsmAnd kasutamise ajal kuvatavaid hüpikaknaid, dialooge ja teateid.</string>
|
||||
<string name="dialogs_and_notifications_descr">Halda hüpikaknaid, dialooge ja teateid.</string>
|
||||
<string name="rendering_value_walkingRoutesOSMCNodes_name">Sõlmede võrgud</string>
|
||||
<string name="suggested_maps">Soovitatud kaardid</string>
|
||||
<string name="suggested_maps_descr">Need kaardid on laienduse kasutamisel nõutud.</string>
|
||||
|
|
@ -1030,7 +1030,7 @@
|
|||
<string name="shared_string_turn_off">Lülita välja</string>
|
||||
<string name="new_plugin_added">Uus laiendus lisatud</string>
|
||||
<string name="join_segments">Liida lõigud</string>
|
||||
<string name="add_new_profile_q">Lisada uus profiil \'%1$s\'\?</string>
|
||||
<string name="add_new_profile_q">Kas lisame uue profiii „%1$s“\?</string>
|
||||
<string name="save_heading">Kaasa pealkiri</string>
|
||||
<string name="save_heading_descr">Salvestamise ajal salvesta kurss igasse teekonnapunkti.</string>
|
||||
<string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
|
||||
|
|
@ -1038,7 +1038,7 @@
|
|||
<string name="personal_category_name">Isiklik</string>
|
||||
<string name="shared_string_downloading_formatted">Allalaadimine %s</string>
|
||||
<string name="rendering_value_thick_name">Jäme</string>
|
||||
<string name="desert_render_descr">Kõrbete ja muude hõredalt asustatud piirkondade jaoks. Kuvab üksikasjad vaateskaalal.</string>
|
||||
<string name="desert_render_descr">Kõrbete ja muude hõredalt asustatud piirkondade jaoks. Üksikasjalikum.</string>
|
||||
<string name="select_navigation_icon">Liikumisel kuvatav asukohaikoon</string>
|
||||
<string name="select_map_icon">Peatumisel kuvatav asukohaikoon</string>
|
||||
<string name="delete_profiles_descr">Rakenda-nupu vajutamisel on eemaldatakse kustutatud profiilid jäädavalt.</string>
|
||||
|
|
@ -1046,10 +1046,10 @@
|
|||
<string name="select_color">Vali värv</string>
|
||||
<string name="edit_profiles_descr">OsmAnd vaikimisi profiile ei saa kustutada, aga saate need eelmisel ekraanil keelata või lõppu nihutada.</string>
|
||||
<string name="edit_profiles">Muuda profiile</string>
|
||||
<string name="select_nav_profile_dialog_message">Navigeerimise liik mõjutab teekonna arvutamise reegleid.</string>
|
||||
<string name="select_nav_profile_dialog_message">Navigeerimise liik mõjutab teekonna arvutamise loogikat.</string>
|
||||
<string name="profile_appearance">Profiili välimus</string>
|
||||
<string name="choose_icon_color_name">Vali ikoon, värv ja nimi</string>
|
||||
<string name="reorder_profiles">Muuda profiilide loetelu</string>
|
||||
<string name="choose_icon_color_name">Ikoon, värv ja nimi</string>
|
||||
<string name="reorder_profiles">Muuda profiililoendit</string>
|
||||
<string name="selected_profile">Valitud profiil</string>
|
||||
<string name="right_side_navigation">Parempoolne liiklus</string>
|
||||
<string name="driving_region_automatic">Automaatne</string>
|
||||
|
|
@ -2177,7 +2177,7 @@
|
|||
<string name="hint_search_online">Veebiotsing: majanumber, tänav, linn</string>
|
||||
<string name="search_online_address">Veebiotsing</string>
|
||||
<string name="max_level_download_tile">Suurim veebipõhine suurendustase</string>
|
||||
<string name="max_level_download_tile_descr">Ära sirvi veebikaartide paane suuremate suurendustasemete korral.</string>
|
||||
<string name="max_level_download_tile_descr">Ära sirvi veebikaartide paane sellest suuremate suumitasemete korral.</string>
|
||||
<string name="router_service_descr">Veebipõhine või võrguühenduseta navigeerimisteenus.</string>
|
||||
<string name="update_existing">Asenda</string>
|
||||
<string name="loading_streets_buildings">Tänavate/hoonete laadimine…</string>
|
||||
|
|
@ -2394,7 +2394,7 @@
|
|||
<string name="shared_string_move_up">Teisalda ↑</string>
|
||||
<string name="shared_string_move_down">Teisalda</string>
|
||||
<string name="full_report">Kogu ettekanne</string>
|
||||
<string name="open_street_map_login_and_pass">OpenStreetMap kasutajanimi ja salasõna</string>
|
||||
<string name="open_street_map_login_and_pass">OSM\'i kasutajanimi ja salasõna</string>
|
||||
<string name="open_street_map_login_descr">Vajalik opestreetmap.org kaastööde jaoks.</string>
|
||||
<string name="storage_permission_restart_is_required">Rakendusel on nüüd lubatud kirjutada välisele andmekandjale, aga vajab selleks taaskäivitamist.</string>
|
||||
<string name="report">Kanna ette</string>
|
||||
|
|
@ -2440,9 +2440,9 @@
|
|||
<string name="osm_live_banner_desc">Hangi piiramatu kaartide alla laadimine, lisades uuendused iga nädal, päev või isegi tund.</string>
|
||||
<string name="osmand_plus_banner_desc">Piiramatud kaartide allalaadimised, uuendused ja Vikipeedia laiendus.</string>
|
||||
<string name="get_it">Hangi see</string>
|
||||
<string name="osm_live_payment_desc">Tellimustasu võetakse igakuiselt. Saad sellest Google Play kaudu igal ajal loobuda.</string>
|
||||
<string name="donation_to_osm">Annetus OpenStreetMap kogukonnale</string>
|
||||
<string name="donation_to_osm_desc">Osa Sinu annetusest saadetakse OSM kasutajatele, kes teevad OpenStreetMap kaastööd. Tellimuse hind jääb samaks.</string>
|
||||
<string name="osm_live_payment_desc">Tellimustasu võetakse valitud ajavahemiku kohaselt. Saad sellest Google Play kaudu igal ajal loobuda.</string>
|
||||
<string name="donation_to_osm">Annetus OSM kogukonnale</string>
|
||||
<string name="donation_to_osm_desc">Osa Sinu annetusest saadetakse OSM\'i kaastöötajatele. Tellimuse hind jääb samaks.</string>
|
||||
<string name="osm_live_subscription_desc">Tellimus võimaldab uuendused igas tunnis, päevas või nädalas ja piiramatu kogu maailma kaartide alla laadimise.</string>
|
||||
<string name="si_mi_feet">Miilid/jalad</string>
|
||||
<string name="driving_region_australia">Austraalia</string>
|
||||
|
|
@ -2583,10 +2583,10 @@
|
|||
\n</string>
|
||||
<string name="analyze_on_map">Analüüsi kaardil</string>
|
||||
<string name="subscribe_email_desc">Liitu meie meililistiga rakenduse allahindluste kohta teabe saamiseks ja saate veel 3 kaardi allalaadimist!</string>
|
||||
<string name="quick_action_add_destination_desc">Nupp ekraani keskkoha teekonna sihtkohaks muutmiseks; igast varem valitud sihtkohast saab viimane vahesihtkoht.</string>
|
||||
<string name="quick_action_add_destination_desc">Nupp ekraani keskkoha teekonna sihtkohaks muutmiseks; ühest varem valitud sihtkohast saab viimane vahesihtkoht.</string>
|
||||
<string name="quick_action_replace_destination_desc">Selle nupu vajutamine muudab ekraani keskkoha uueks teekonna sihtkohaks, asendades eelnevalt valitud sihtkoha (kui olemas).</string>
|
||||
<string name="quick_action_add_first_intermediate_desc">Nupp ekraani keskkoha esimeseks vahesihtkohaks muutmiseks.</string>
|
||||
<string name="quick_action_auto_zoom_desc">Lülita automaatne kiirusetundlik kaardi suurendamine sisse või välja.</string>
|
||||
<string name="quick_action_auto_zoom_desc">Nupp, mis lülitab automaatse kiirusetundliku suumimise sisse või välja.</string>
|
||||
<string name="shared_string_paused">Peatatud</string>
|
||||
<string name="animate_my_location_desc">Lülita sisse animeeritud oma asukohas kaardi panoraamimine navigeerimise ajal.</string>
|
||||
<string name="srtm_menu_download_descr">Lae alla \'Kõrgusjoonte\' kaart selles piirkonnas kasutamiseks.</string>
|
||||
|
|
@ -2615,8 +2615,8 @@
|
|||
<string name="live_monitoring_max_interval_to_send_desrc">Määra võrguühenduse puudumisel säilitatavate asukohtade ajaline puhver</string>
|
||||
<string name="mappilary_no_internet_desc">Mapillary fotod on saadaval ainult internetiühenduse olemasolul.</string>
|
||||
<string name="show_direction">Vahemaa näit</string>
|
||||
<string name="map_orientation_change_in_accordance_with_speed_descr">Vali allpool \'liikumise suunalt\' \'kompassi suunale\' vastavalt orientatsiooni ümber lülitamise kiirus.</string>
|
||||
<string name="marker_show_distance_descr">Valige, kuidas näidata kaardiekraanil kaugust ja kaardimarkerite suunda:</string>
|
||||
<string name="map_orientation_change_in_accordance_with_speed_descr">Vali allpool „liikumise suunalt“ „kompassi suunale“ vastavalt orientatsiooni ümberlülitamise kiirus.</string>
|
||||
<string name="marker_show_distance_descr">Valige, kuidas esitame kaardil kaugust ja kaardimarkerite suunda:</string>
|
||||
<string name="marker_save_as_track_descr">Ekspordi oma markerid järgmisesse GPX faili:</string>
|
||||
<string name="group_will_be_removed_after_restart">Järgmisel rakenduse käivitamisel on grupp kadunud.</string>
|
||||
<string name="make_round_trip_descr">Lisa lähtepunkti koopia sihtpunktiks.</string>
|
||||
|
|
@ -2677,7 +2677,7 @@
|
|||
<string name="routing_attr_piste_type_sled_name">Kelk</string>
|
||||
<string name="routing_attr_piste_type_sled_description">Kelgutamisnõlvad.</string>
|
||||
<string name="routing_attr_freeride_policy_name">Hooldamata nõlv</string>
|
||||
<string name="routing_attr_freeride_policy_description">Vabasõidu ja hooldamata nõlvad on mitteametlikud rajad ja läbipääsud. Tavaliselt ametlikult hooldamata ja õhtuti kontrollimata. Sisene omal vastutusel.</string>
|
||||
<string name="routing_attr_freeride_policy_description">Vabasõidu ja hooldamata nõlvad on mitteametlikud rajad ja läbipääsud. Tavaliselt hooldamata ja õhtuti kontrollimata. Sisene omal vastutusel.</string>
|
||||
<string name="external_input_device">Välised sisendseadmed</string>
|
||||
<string name="external_input_device_descr">Vali väline juhtseade nagu klaviatuur või WunderLINQ.</string>
|
||||
<string name="sett_no_ext_input">Mitte ühtegi</string>
|
||||
|
|
@ -2933,7 +2933,7 @@
|
|||
<string name="previous_run_crashed">OsmAnd jooksis viimasel kasutamisel kokku. Logifail asub {0}. Palun teata probleemist ja edasta logifail.</string>
|
||||
<string name="saving_gpx_tracks">GPX faili salvestamine…</string>
|
||||
<string name="finished_task">Valmis</string>
|
||||
<string name="osm_settings_descr">Määra OSM ettekanneteks vajalikud OpenStreetMap.org (OSM) sätted.</string>
|
||||
<string name="osm_settings_descr">Määra OSM kaastööks vajalikud OpenStreetMap.org (OSM) sätted.</string>
|
||||
<string name="data_settings_descr">Määra keel, lae alla või lae andmed uuesti.</string>
|
||||
<string name="data_settings">Andmed</string>
|
||||
<string name="additional_settings">Lisaseadistused</string>
|
||||
|
|
@ -3185,8 +3185,8 @@
|
|||
<string name="quick_action_add_poi_descr">Nupp huvipunkti lisamiseks ekraani keskele.</string>
|
||||
<string name="quick_action_navigation_voice_descr">Nupp navigeerimise ajal hääljuhiste keelamiseks või lubamiseks.</string>
|
||||
<string name="quick_action_add_parking_descr">Nupp parkimiskoha lisamiseks ekraani keskele.</string>
|
||||
<string name="quick_action_showhide_favorites_descr">Lüliti, et kuvada või peita kaardil olevad Lemmikpunktid.</string>
|
||||
<string name="quick_action_showhide_poi_descr">Lüliti, et kuvada või peita huvipunktid kaardil.</string>
|
||||
<string name="quick_action_showhide_favorites_descr">Nupp, et kuvada või peita kaardil olevad Lemmikpunktid.</string>
|
||||
<string name="quick_action_showhide_poi_descr">Nupp, et kuvada või peita huvipunktid kaardil.</string>
|
||||
<string name="quick_action_bug_descr">See teade kaasatakse kommentaari väljale.</string>
|
||||
<string name="quick_action_category_descr">Salvestada lemmik kategoorias:</string>
|
||||
<string name="quick_action_gpx_category_descr">Vali valikuline kategooria.</string>
|
||||
|
|
@ -3332,7 +3332,7 @@
|
|||
<string name="test_voice_desrc">Puuduta nuppu ja kuula sellele vastavat häält, et kuulda, kas see puudub või on vigane</string>
|
||||
<string name="run_full_osmand_msg">Kasutad {0} kaarti, mida pakub OsmAnd. Kas soovid käivitada OsmAnd täisversiooni\?</string>
|
||||
<string name="run_full_osmand_header">Käivitada OsmAnd\?</string>
|
||||
<string name="quick_action_switch_day_night_descr">Nupp OsmAnd päeva- ja öörežiimi vahetamiseks.</string>
|
||||
<string name="quick_action_switch_day_night_descr">Nupp OsmAnd\'i päeva- ja öörežiimi vahetamiseks.</string>
|
||||
<string name="quick_action_switch_day_mode">Päevarežiim</string>
|
||||
<string name="quick_action_switch_night_mode">Öörežiim</string>
|
||||
<string name="quick_action_day_night_switch_mode">Päeva- ja öörežiimi vahetamine</string>
|
||||
|
|
@ -3383,7 +3383,7 @@
|
|||
<string name="osm_edits_view_descr">Kõiki üleslaadimata muudatusi või OSM vigu saad vaadata menüüs %1$s. Üleslaaditud punkte OsmAnd ei kuva.</string>
|
||||
<string name="app_mode_osm">OSM</string>
|
||||
<string name="select_nav_icon_descr">Ikooni kuvatakse vaid navigeerimise või liikumise ajal.</string>
|
||||
<string name="select_map_icon_descr">Kaardiikoon kuvatakse ainult kaardil ja muutub navigeerimise ajal navigeerimise ikooniks.</string>
|
||||
<string name="select_map_icon_descr">Peatumisel näidatav ikoon.</string>
|
||||
<string name="logcat_buffer_descr">Kontrolli ja jaga rakenduse detailseid logisid</string>
|
||||
<string name="search_offline_geo_error">Geokavatsuse väärtusest \'%s\' ei saanud aru.</string>
|
||||
<string name="permission_is_required">Selle valiku kasutamine vajab luba.</string>
|
||||
|
|
@ -3391,7 +3391,7 @@
|
|||
<string name="monitoring_min_speed_descr_side_effect">Kõrvaltoime: teie rajal puuduvad kõik lõigud, kus minimaalse kiiruse kriteerium ei olnud täidetud (nt kus lükkate oma ratta järsust mäest üles). Samuti puudub teave puhkeperioodide, näiteks puhkepauside kohta. See mõjutab iga analüüsi või järeltöötlust, näiteks kui proovite määrata reisi kogupikkust, liikumisaega või keskmist kiirust.</string>
|
||||
<string name="monitoring_min_speed_descr_recommendation">Soovitus: proovige kõigepealt kasutada liikumisandurit minimaalse nihkefiltri (B) kaudu, kuna see võib anda paremaid tulemusi ja te kaotate vähem andmeid. Kui teie rajad jäävad madalatel kiirustel lärmakaks, proovige siin nullist erinevat väärtust. Pange tähele, et mõned mõõtmised ei pruugi kiiruse väärtust üldse anda (mõned võrgupõhised meetodid), sellisel juhul ei salvestaks te midagi.</string>
|
||||
<string name="monitoring_min_speed_descr_remark">Märkus: kiirus > 0 kontroll: enamik GPS-kiibikomplekte teatab kiiruse väärtuse ainult siis, kui algoritm määrab teie liikumise, ja mitte ükski, kui te pole. Seega kasutab filtri sätte > 0 kasutamine teatud mõttes GPS-kiibistiku liikumistuvastust. Kuid isegi kui seda siin salvestuse ajal ei filtreerita, kasutame seda funktsiooni oma GPX analüüsis korrigeeritud vahemaa määramiseks, st sellel väljal kuvatav väärtus on liikumisel salvestatud vahemaa.</string>
|
||||
<string name="monitoring_min_accuracy_descr">See registreerib ainult minimaalse täpsusnäiduga mõõdetud punktid (meetrites / jalgades, nagu Androidi teatas teie kiibistiku kohta). Täpsus tähendab korduvate mõõtmiste hajumist ega ole otseselt seotud täpsusega, mis määratleb, kui lähedal on teie mõõtmised teie tegelikule asukohale.</string>
|
||||
<string name="monitoring_min_accuracy_descr">See registreerib ainult minimaalse täpsusnäiduga mõõdetud punktid (meetrites / jalgades, nagu Androidi teatas teie kiibistiku kohta). Täpsus on mõõtmiste lähedus tegelikule asukohale ega ole otseselt seotud täpsusega, mis on korduvate mõõtmiste hajumine.</string>
|
||||
<string name="monitoring_min_accuracy_descr_side_effect">Kõrvaltoime: täpsusega filtreerimise tulemusel võivad punktid olla näiteks sildade all, puude all, kõrgete hoonete vahel või teatud ilmastikutingimuste korral.</string>
|
||||
<string name="monitoring_min_accuracy_descr_recommendation">Soovitus: raske on ennustada, mida salvestatakse ja mida mitte, võib-olla oleks parem see filter välja lülitada.</string>
|
||||
<string name="monitoring_min_accuracy_descr_remark">Märkus: kui GPS oleks välja lülitatud vahetult enne salvestust, võib esimese mõõdetud punkti täpsus olla vähenenud, nii et meie koodis võiksime enne punkti salvestamist oodata umbes sekund (või salvestada 3 järjestikuse punkti parimad andmed jne.), kuid seda pole veel rakendatud.</string>
|
||||
|
|
@ -3614,4 +3614,45 @@
|
|||
<string name="lenght_limit_description">Kuna mõnedel marsruutidel võidakse kohaldada piiranguid pikkade sõidukite suhtes, siis palun märkige oma sõiduki pikkus.</string>
|
||||
<string name="weight_limit_description">Kuna mõnedel marsruutidel võidakse kohaldada sõidukite kaalupiiranguid, siis palun märkige oma sõiduki kaal.</string>
|
||||
<string name="gpx_parse_error">OsmAnd GPX faili vorming pole korrektne. Täpsemaks uurimiseks palun suhtle meie tugimeeskonnaga.</string>
|
||||
<string name="sort_by_category">Sorteeri kategooria järgi</string>
|
||||
<string name="shared_string_resume">Jätka</string>
|
||||
<string name="import_profile_dialog_description">Imporditavas profiilis leidub täiendavaid andmeid. Vajutades „Impordi“ imporditakse vaid profiili andmed, täiendavate andmete jaoks pead märkima vastava valiku.</string>
|
||||
<string name="shared_string_include_data">Kaasa täiendavad andmed</string>
|
||||
<string name="sunrise_at">Päikesetõus kell %1$s</string>
|
||||
<string name="sunset_at">Päikeseloojang kell %1$s</string>
|
||||
<string name="ltr_or_rtl_combine_via_slash">%1$s/%2$s</string>
|
||||
<string name="rendering_attr_streetLightingNight_name">Näita vaid öösel</string>
|
||||
<string name="add_custom_category">Lisa oma kategooria</string>
|
||||
<string name="shared_string_available">Saadaval</string>
|
||||
<string name="copy_coordinates">Kopeeri koordinaadid</string>
|
||||
<string name="clear_recorded_data">Kustuta salvestatud andmed</string>
|
||||
<string name="routing_profile_direct_to">Otse sihtpunkti</string>
|
||||
<string name="ui_customization">Kasutajaliidese kohendamine</string>
|
||||
<string name="context_menu_actions">Kontekstimenüü toimingud</string>
|
||||
<string name="divider_descr">Siit järgnevate elementide ees on eraldaja.</string>
|
||||
<string name="shared_string_divider">Eraldaja</string>
|
||||
<string name="shared_string_hidden">Peidetud</string>
|
||||
<string name="reset_items_descr">Seadistuste peitmine taastab nende algsed väärtused.</string>
|
||||
<string name="main_actions_descr">On ainult neli nuppu.</string>
|
||||
<string name="select_track_file">Vali rajafail</string>
|
||||
<string name="tracker_item">OsmAnd jälgija</string>
|
||||
<string name="measure_distance_item">Mõõda vahemaad</string>
|
||||
<string name="travel_item">Reisimine (Wikivoyage ja Wikipedia)</string>
|
||||
<string name="map_markers_item">Kaardimarkerid</string>
|
||||
<string name="favorites_item">Lemmikud</string>
|
||||
<string name="subscription_osmandlive_item">OsmAnd Live tellimus</string>
|
||||
<string name="osmand_purchases_item">Ostud OsmAnd rakenduses</string>
|
||||
<string name="legend_item_description">Kaardisümboleid kirjeldav juhend.</string>
|
||||
<string name="back_to_editing">Tagasi muutmise juurde</string>
|
||||
<string name="shared_string_always">Alati</string>
|
||||
<string name="shared_string_delete_all_q">Kas kustutame kõik\?</string>
|
||||
<string name="uninstall_speed_cameras">Eemalda kiiruskaamerate andmed</string>
|
||||
<string name="speed_camera_pois">Kiiruskaamerad</string>
|
||||
<string name="keep_active">Hoia kasutuses</string>
|
||||
<string name="speed_cameras_alert">Kiiruskaamerate hoiatused on mõnedes riikides seadusega keelatud.</string>
|
||||
<string name="screen_timeout_descr">Kui %1$s on sisse lülitatud, siis aktiivseks loetav aeg sõltub sellest.</string>
|
||||
<string name="default_screen_timeout">Ekraani väljalülitamise vaikimisi aeg</string>
|
||||
<string name="shared_string_tones">toonid</string>
|
||||
<string name="shared_string_meters">meetrit</string>
|
||||
<string name="details_dialog_decr">Näita või peida täiendavaid andmeid kaardil</string>
|
||||
</resources>
|
||||
|
|
@ -2345,7 +2345,7 @@
|
|||
<string name="auto_split_recording_descr">بعد از ۶ دقیقه وقفه، بخش جدید شروع میشود. بعد از ۲ ساعت وقفه، رد جدید شروع میشود. بعد از وقفهٔ طولانیتر در صورتی که تاریخ تغییر کند فایل جدید ایجاد میشود.</string>
|
||||
<string name="upload_osm_note_description">یادداشتهای OSM خود را بهصورت ناشناس یا با نام کاربریتان در سایت OpenStreetMap.org، آپلود کنید.</string>
|
||||
<string name="route_roundabout_short">خروجی %1$d را بگیرید و بروید</string>
|
||||
<string name="trip_rec_notification_settings_desc">در نوار اعلان دستگاه یک اعلان برای ضبط سفر نشان میدهد.</string>
|
||||
<string name="trip_rec_notification_settings_desc">در نوار اعلان دستگاه یک اعلان برای شروع ضبط سفر نشان میدهد.</string>
|
||||
<string name="save_track_min_speed_descr">پالایه: هیچ نقطهای ثبت نمیشود مگر به این سرعت برسد.</string>
|
||||
<string name="save_track_min_distance_descr">پالایه: کمترین مسافتی که یک نقطه باید از موقعیت قبلی داشته باشد تا ثبت شود.</string>
|
||||
<string name="save_track_precision_descr">پالایه: ضبط انجام نمیشود مگر با رسیدن به این میزان صحت.</string>
|
||||
|
|
@ -3846,4 +3846,21 @@
|
|||
<string name="plugin_wikipedia_description">از ویکیپدیا دربارهٔ نقاط توجه اطلاعات کسب کنید. یک راهنمای آفلاین جیبی. کافی است افزونهٔ ویکیپدیا را فعال کنید و از مقالهها دربارهٔ چیزهای دوروبرتان لذت ببرید.</string>
|
||||
<string name="app_mode_wheelchair">صندلی چرخدار</string>
|
||||
<string name="osm_edit_closed_note">یادداشت اُاِساِمی بسته</string>
|
||||
<string name="add_hidden_group_info">نقطهٔ اضافهشده روی نقشه دیده نمیشود، زیرا گروه انتخابشده پنهان است. آن را در «%s» پیدا میکنید.</string>
|
||||
<string name="set_working_days_to_continue">برای ادامه روزهای کاری را تنظیم کنید</string>
|
||||
<string name="route_between_points">مسیر بین نقطهها</string>
|
||||
<string name="plan_a_route">طرحریزی مسیر</string>
|
||||
<string name="track_show_start_finish_icons">نمایش آیکونهای شروع و پایان</string>
|
||||
<string name="select_track_width">انتخاب عرض</string>
|
||||
<string name="gpx_split_interval_descr">انتخاب کنید نشانههای روی رد بر اساس زمان یا مسافت با چه تناوبی نمایش یابند.</string>
|
||||
<string name="gpx_split_interval_none_descr">گزینهٔ تقسیمبندی دلخواه را انتخاب کنید: بر اساس زمان یا مسافت.</string>
|
||||
<string name="shared_string_custom">سفارشی</string>
|
||||
<string name="gpx_direction_arrows">فلشهای جهتنما</string>
|
||||
<string name="plan_route_last_edited">آخرین ویرایش</string>
|
||||
<string name="plan_route_import_track">درونبرد رد</string>
|
||||
<string name="plan_route_open_existing_track">بازکردن رد موجود</string>
|
||||
<string name="plan_route_create_new_route">ساخت مسیر جدید</string>
|
||||
<string name="plan_route_select_track_file_for_open">یک فایل رد انتخاب کنید تا باز شود.</string>
|
||||
<string name="shared_string_done">تمام</string>
|
||||
<string name="overwrite_track">بَرنویسی رد</string>
|
||||
</resources>
|
||||
|
|
@ -3820,4 +3820,5 @@
|
|||
<string name="plan_route_create_new_route">Créer un nouvel itinéraire</string>
|
||||
<string name="plan_route_select_track_file_for_open">Sélectionnez un fichier de trace à ouvrir.</string>
|
||||
<string name="shared_string_done">Terminé</string>
|
||||
<string name="overwrite_track">Remplacer la trace</string>
|
||||
</resources>
|
||||
|
|
@ -3846,4 +3846,5 @@
|
|||
<string name="plan_route_create_new_route">יצירת מסלול חדש</string>
|
||||
<string name="plan_route_select_track_file_for_open">נא לבחור קובץ מסלול לפתיחה.</string>
|
||||
<string name="shared_string_done">בוצע</string>
|
||||
<string name="overwrite_track">שכתוב מסלול</string>
|
||||
</resources>
|
||||
|
|
@ -3369,7 +3369,7 @@
|
|||
<string name="rendering_value_white_name">Branco</string>
|
||||
<string name="swap_two_places">Trocar %1$s e %2$s</string>
|
||||
<string name="route_start_point">Ponto de partida</string>
|
||||
<string name="default_speed_dialog_msg">Estima a hora de chegada de tipos de estradas desconhecidos e limita a velocidade de todas as estradas (pode afetar o roteamento)</string>
|
||||
<string name="default_speed_dialog_msg">Estima a hora de chegada de tipos de estradas desconhecidas e limita a velocidade de todas as estradas (pode afetar o roteamento)</string>
|
||||
<string name="track_saved">Trilha salva</string>
|
||||
<string name="empty_filename">O nome do arquivo está vazio</string>
|
||||
<string name="shared_string_revert">Reverter</string>
|
||||
|
|
@ -3767,7 +3767,7 @@
|
|||
<string name="clear_tiles_warning">A aplicação dessas alterações limpará os dados em cache dessa origem de bloco</string>
|
||||
<string name="vessel_height_warning_link">Definir altura da embarcação</string>
|
||||
<string name="vessel_height_warning">Você pode definir a altura da embarcação para evitar pontes baixas. Lembre-se, se a ponte for móvel, usaremos sua altura no estado aberto.</string>
|
||||
<string name="vessel_height_limit_description">Defina a altura do vaso para evitar pontes baixas. Lembre-se, se a ponte for móvel, usaremos sua altura no estado aberto.</string>
|
||||
<string name="vessel_height_limit_description">Defina a altura da embarcação para evitar pontes baixas. Lembre-se, se a ponte for móvel, usaremos sua altura no estado aberto.</string>
|
||||
<string name="vessel_width_limit_description">Defina a largura da embarcação para evitar pontes estreitas</string>
|
||||
<string name="quick_action_showhide_mapillary_title">Mostrar/ocultar Mapillary</string>
|
||||
<string name="quick_action_mapillary_hide">Ocultar Mapillary</string>
|
||||
|
|
@ -3826,4 +3826,5 @@
|
|||
<string name="plan_route_create_new_route">Criar nova rota</string>
|
||||
<string name="plan_route_select_track_file_for_open">Selecione um arquivo de faixa para abrir.</string>
|
||||
<string name="shared_string_done">Concluído</string>
|
||||
<string name="overwrite_track">Substituir trilha</string>
|
||||
</resources>
|
||||
|
|
@ -3394,7 +3394,7 @@
|
|||
<string name="quick_action_show_hide_hillshade">Mostrar/ocultar sombras de relevo</string>
|
||||
<string name="tts_initialization_error">Não é possível iniciar o mecanismo de conversão de texto em fala.</string>
|
||||
<string name="simulate_your_location_gpx_descr">Simule a sua posição usando um caminho GPX gravado.</string>
|
||||
<string name="export_profile">Perfil de exportação</string>
|
||||
<string name="export_profile">Exportar o perfil</string>
|
||||
<string name="exported_osmand_profile">Perfil OsmAnd: %1$s</string>
|
||||
<string name="overwrite_profile_q">O perfil \'%1$s\' já existe. Sobregravar\?</string>
|
||||
<string name="export_profile_failed">Não podia exportar o perfil.</string>
|
||||
|
|
@ -3845,4 +3845,5 @@
|
|||
<string name="plan_route_select_track_file_for_open">Selecione um ficheiro de trilho para abrir.</string>
|
||||
<string name="plan_route_create_new_route">Criar rota</string>
|
||||
<string name="shared_string_done">Pronto</string>
|
||||
<string name="overwrite_track">Sobrescrever trilho</string>
|
||||
</resources>
|
||||
|
|
@ -3837,4 +3837,5 @@
|
|||
<string name="plan_route_create_new_route">Создать новый маршрут</string>
|
||||
<string name="plan_route_select_track_file_for_open">Выберите файл трека для открытия.</string>
|
||||
<string name="shared_string_done">Готово</string>
|
||||
<string name="overwrite_track">Перезаписать трек</string>
|
||||
</resources>
|
||||
|
|
@ -3840,4 +3840,5 @@
|
|||
<string name="plan_route_create_new_route">Crea un\'àndala noa</string>
|
||||
<string name="plan_route_select_track_file_for_open">Ischerta unu documentu de rasta de abèrrere.</string>
|
||||
<string name="shared_string_done">Fatu</string>
|
||||
<string name="overwrite_track">Subraiscrie sa rasta</string>
|
||||
</resources>
|
||||
|
|
@ -1123,7 +1123,7 @@
|
|||
<string name="poi_pump_powered">Poháňaná</string>
|
||||
<string name="poi_pump_no">Žiadna pumpa</string>
|
||||
<string name="poi_water_characteristic_mineral">Minerálna</string>
|
||||
<string name="poi_water_characteristic_mud">Vlastnosti vody: blato</string>
|
||||
<string name="poi_water_characteristic_mud">Blato</string>
|
||||
<string name="poi_water_characteristic_sulfuric">Sírnatá</string>
|
||||
<string name="poi_water_point">Vodný bod</string>
|
||||
<string name="poi_cuisine">Kuchyňa</string>
|
||||
|
|
@ -2110,7 +2110,7 @@
|
|||
<string name="poi_vending_sim_cards">SIM karty</string>
|
||||
<string name="poi_branch">Pobočka</string>
|
||||
<string name="poi_memorial_blue_plaque">Modrá plaketa</string>
|
||||
<string name="poi_memorial_cross">V tvare kríža</string>
|
||||
<string name="poi_memorial_cross">Tvar kríža</string>
|
||||
<string name="poi_memorial_vehicle">Vozidlo</string>
|
||||
<string name="poi_memorial_stolperstein">Značka na chodníku</string>
|
||||
<string name="poi_memorial_obelisk">Obelisk</string>
|
||||
|
|
@ -2210,7 +2210,7 @@
|
|||
<string name="poi_fuel_91ul">Palivo 91UL</string>
|
||||
<string name="poi_fuel_100ll">Palivo 100LL</string>
|
||||
<string name="poi_fuel_jeta1">Letecké palivo A-1</string>
|
||||
<string name="poi_fuel_adblue">Palivo AdBlue</string>
|
||||
<string name="poi_fuel_adblue">Naftová výfuková tekutina (AdBlue)</string>
|
||||
<string name="poi_fuel_wood">Palivo: drevo</string>
|
||||
<string name="poi_fuel_charcoal">Palivo: drevné uhlie</string>
|
||||
<string name="poi_fuel_coal">Palivo: uhlie</string>
|
||||
|
|
@ -2521,7 +2521,7 @@
|
|||
<string name="poi_historic_period_new_kingdom">Historické obdobie: nové kráľovstvo (1550 – 1069 p. n. l.)</string>
|
||||
<string name="poi_historic_period_middle_kingdom">Historické obdobie: stredné kráľovstvo (2055 – 1650 p. n. l.)</string>
|
||||
<string name="poi_historic_period_predynastic_egypt">Historické obdobie: preddynastický Egypt</string>
|
||||
<string name="poi_historic_period_early_dynastic_period">Historické obdobie: obdobie rannej dynastie (3100 – 2686 p. n. l.)</string>
|
||||
<string name="poi_historic_period_early_dynastic_period">Historické obdobie: ranná dynastia (3100 – 2686 p. n. l.)</string>
|
||||
<string name="poi_historic_period_old_kingdom">Historické obdobie: staré kráľovstvo (2686 – 2181 p. n. l.)</string>
|
||||
<string name="poi_historic_period_first_intermediate_period">Historické obdobie: prvé prechodné obdobie (2181 – 2055 p. n. l.)</string>
|
||||
<string name="poi_historic_period_second_intermediate_period">Historické obdobie: druhé prechodné obdobie (1650 – 1550 p. n. l.)</string>
|
||||
|
|
|
|||
|
|
@ -3838,4 +3838,5 @@
|
|||
<string name="plan_route_create_new_route">Vytvoriť novú trasu</string>
|
||||
<string name="plan_route_select_track_file_for_open">Zvoľte súbor so stopou na otvorenie.</string>
|
||||
<string name="shared_string_done">Hotovo</string>
|
||||
<string name="overwrite_track">Prepísať stopu</string>
|
||||
</resources>
|
||||
|
|
@ -2397,4 +2397,5 @@
|
|||
<string name="poi_scooter_no">Mobilet: hayır</string>
|
||||
<string name="poi_scooter_yes">Mobilet: evet</string>
|
||||
<string name="poi_motorcycle_type_scooter">Mobilet</string>
|
||||
<string name="poi_site_type_city">Şehir</string>
|
||||
</resources>
|
||||
|
|
@ -3796,4 +3796,5 @@
|
|||
<string name="plan_route_create_new_route">Yeni güzergah oluştur</string>
|
||||
<string name="plan_route_select_track_file_for_open">Açmak için bir yol dosyası seçin.</string>
|
||||
<string name="shared_string_done">Bitti</string>
|
||||
<string name="overwrite_track">Yolun üzerine yaz</string>
|
||||
</resources>
|
||||
|
|
@ -3835,4 +3835,5 @@
|
|||
<string name="plan_route_create_new_route">建立新路線</string>
|
||||
<string name="plan_route_select_track_file_for_open">選取要開啟的軌跡檔。</string>
|
||||
<string name="shared_string_done">完成</string>
|
||||
<string name="overwrite_track">覆寫軌跡</string>
|
||||
</resources>
|
||||
|
|
@ -236,14 +236,6 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
|
|||
mainIcon = (ImageView) mainView.findViewById(R.id.main_icon);
|
||||
final NewGpxData newGpxData = editingCtx.getNewGpxData();
|
||||
if (newGpxData != null) {
|
||||
List<WptPt> points = newGpxData.getGpxFile().getRoutePoints();
|
||||
if (!points.isEmpty()) {
|
||||
ApplicationMode snapToRoadAppMode = ApplicationMode
|
||||
.valueOfStringKey(points.get(points.size() - 1).getProfileType(), null);
|
||||
if (snapToRoadAppMode != null) {
|
||||
enableSnapToRoadMode(snapToRoadAppMode);
|
||||
}
|
||||
}
|
||||
ActionType actionType = newGpxData.getActionType();
|
||||
if (actionType == ActionType.ADD_SEGMENT || actionType == ActionType.EDIT_SEGMENT) {
|
||||
mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_polygom_dark));
|
||||
|
|
@ -502,6 +494,14 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
|
|||
showSnapToRoadControls();
|
||||
|
||||
if (newGpxData != null && !gpxPointsAdded) {
|
||||
List<WptPt> points = newGpxData.getGpxFile().getRoutePoints();
|
||||
if (!points.isEmpty()) {
|
||||
ApplicationMode snapToRoadAppMode = ApplicationMode
|
||||
.valueOfStringKey(points.get(points.size() - 1).getProfileType(), null);
|
||||
if (snapToRoadAppMode != null) {
|
||||
enableSnapToRoadMode(snapToRoadAppMode);
|
||||
}
|
||||
}
|
||||
ActionType actionType = newGpxData.getActionType();
|
||||
if (actionType == ActionType.ADD_ROUTE_POINTS) {
|
||||
displayRoutePoints();
|
||||
|
|
@ -820,7 +820,10 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
|
|||
public void addNewGpxData(GPXFile gpxFile) {
|
||||
QuadRect rect = gpxFile.getRect();
|
||||
TrkSegment segment = getTrkSegment(gpxFile);
|
||||
NewGpxData newGpxData = new NewGpxData(gpxFile, rect, ActionType.EDIT_SEGMENT, segment);
|
||||
NewGpxData newGpxData = new NewGpxData(gpxFile, rect, segment == null
|
||||
? ActionType.ADD_ROUTE_POINTS
|
||||
: ActionType.EDIT_SEGMENT,
|
||||
segment);
|
||||
editingCtx.setNewGpxData(newGpxData);
|
||||
initMeasurementMode(newGpxData);
|
||||
QuadRect qr = newGpxData.getRect();
|
||||
|
|
|
|||
|
|
@ -172,25 +172,43 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
|
|||
}
|
||||
|
||||
private void setQuickActionButtonMargin() {
|
||||
int defRightMargin = calculateTotalSizePx(R.dimen.map_button_size, R.dimen.map_button_spacing_land) * 2;
|
||||
int defBottomMargin = calculateTotalSizePx(R.dimen.map_button_size, R.dimen.map_button_spacing) * 2;
|
||||
FrameLayout.LayoutParams param = (FrameLayout.LayoutParams) quickActionButton.getLayoutParams();
|
||||
if (AndroidUiHelper.isOrientationPortrait(mapActivity)) {
|
||||
Pair<Integer, Integer> fabMargin = settings.getPortraitFabMargin();
|
||||
if (fabMargin != null) {
|
||||
param.rightMargin = fabMargin.first;
|
||||
param.bottomMargin = fabMargin.second;
|
||||
} else {
|
||||
param.bottomMargin = calculateTotalSizePx(R.dimen.map_button_size, R.dimen.map_button_spacing) * 2;
|
||||
}
|
||||
setQuickActionButtonMargin(param, fabMargin, 0, defBottomMargin);
|
||||
} else {
|
||||
Pair<Integer, Integer> fabMargin = settings.getLandscapeFabMargin();
|
||||
if (fabMargin != null) {
|
||||
param.rightMargin = fabMargin.first;
|
||||
param.bottomMargin = fabMargin.second;
|
||||
} else {
|
||||
param.rightMargin = calculateTotalSizePx(R.dimen.map_button_size, R.dimen.map_button_spacing_land) * 2;
|
||||
}
|
||||
setQuickActionButtonMargin(param, fabMargin, defRightMargin, 0);
|
||||
}
|
||||
quickActionButton.setLayoutParams(param);
|
||||
}
|
||||
|
||||
private void setQuickActionButtonMargin(FrameLayout.LayoutParams params,
|
||||
Pair<Integer, Integer> fabMargin,
|
||||
int defRightMargin, int defBottomMargin) {
|
||||
int screenHeight = AndroidUtils.getScreenHeight(mapActivity);
|
||||
int screenWidth = AndroidUtils.getScreenWidth(mapActivity);
|
||||
int btnHeight = quickActionButton.getHeight();
|
||||
int btnWidth = quickActionButton.getWidth();
|
||||
int rightMargin;
|
||||
int bottomMargin;
|
||||
if (fabMargin != null) {
|
||||
rightMargin = fabMargin.first;
|
||||
bottomMargin = fabMargin.second;
|
||||
if (rightMargin < 0 || rightMargin > screenWidth - btnWidth) {
|
||||
rightMargin = defRightMargin;
|
||||
}
|
||||
if (bottomMargin < 0 || bottomMargin > screenHeight - btnHeight) {
|
||||
bottomMargin = defBottomMargin;
|
||||
}
|
||||
} else {
|
||||
rightMargin = defRightMargin;
|
||||
bottomMargin = defBottomMargin;
|
||||
}
|
||||
params.rightMargin = rightMargin;
|
||||
params.bottomMargin = bottomMargin;
|
||||
quickActionButton.setLayoutParams(params);
|
||||
}
|
||||
|
||||
private int calculateTotalSizePx(@DimenRes int... dimensId) {
|
||||
|
|
|
|||
|
|
@ -977,6 +977,9 @@ public class MapInfoWidgetsFactory {
|
|||
updateVisibility(true);
|
||||
AndroidUiHelper.updateVisibility(addressText, false);
|
||||
AndroidUiHelper.updateVisibility(addressTextShadow, false);
|
||||
AndroidUiHelper.updateVisibility(turnIcon, false);
|
||||
AndroidUiHelper.updateVisibility(shieldIcon, false);
|
||||
AndroidUiHelper.updateVisibility(exitRefText, false);
|
||||
} else if (streetName == null) {
|
||||
updateVisibility(false);
|
||||
} else {
|
||||
|
|
|
|||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -1,6 +1,5 @@
|
|||
#Thu Sep 15 09:42:47 MSK 2016
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
|
||||
|
|
|
|||
110
gradlew
vendored
110
gradlew
vendored
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env bash
|
||||
#!/usr/bin/env sh
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
|
|
@ -6,47 +6,6 @@
|
|||
##
|
||||
##############################################################################
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS=""
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
|
||||
warn ( ) {
|
||||
echo "$*"
|
||||
}
|
||||
|
||||
die ( ) {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
esac
|
||||
|
||||
# For Cygwin, ensure paths are in UNIX format before anything is touched.
|
||||
if $cygwin ; then
|
||||
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
|
||||
fi
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
|
|
@ -61,9 +20,49 @@ while [ -h "$PRG" ] ; do
|
|||
fi
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >&-
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >&-
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS=""
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
NONSTOP* )
|
||||
nonstop=true
|
||||
;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
|
@ -90,7 +89,7 @@ location of your Java installation."
|
|||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
|
|
@ -114,6 +113,7 @@ fi
|
|||
if $cygwin ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
|
|
@ -154,11 +154,19 @@ if $cygwin ; then
|
|||
esac
|
||||
fi
|
||||
|
||||
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
|
||||
function splitJvmOpts() {
|
||||
JVM_OPTS=("$@")
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
|
||||
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
|
||||
APP_ARGS=$(save "$@")
|
||||
|
||||
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
|
||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||
|
||||
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
||||
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
||||
cd "$(dirname "$0")"
|
||||
fi
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
|
|
|
|||
14
gradlew.bat
vendored
14
gradlew.bat
vendored
|
|
@ -8,14 +8,14 @@
|
|||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS=
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS=
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
|
|
@ -46,10 +46,9 @@ echo location of your Java installation.
|
|||
goto fail
|
||||
|
||||
:init
|
||||
@rem Get command-line arguments, handling Windowz variants
|
||||
@rem Get command-line arguments, handling Windows variants
|
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||
if "%@eval[2+2]" == "4" goto 4NT_args
|
||||
|
||||
:win9xME_args
|
||||
@rem Slurp the command line arguments.
|
||||
|
|
@ -60,11 +59,6 @@ set _SKIP=2
|
|||
if "x%~1" == "x" goto execute
|
||||
|
||||
set CMD_LINE_ARGS=%*
|
||||
goto execute
|
||||
|
||||
:4NT_args
|
||||
@rem Get arguments from the 4NT Shell from JP Software
|
||||
set CMD_LINE_ARGS=%$
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
|
|
|||
Loading…
Reference in a new issue