From c71253a8fd8b663023b28e2476b0dcf6441017df Mon Sep 17 00:00:00 2001
From: Branko Kokanovic <branko@kokanovic.org>
Date: Sun, 18 Apr 2021 00:52:03 +0200
Subject: [PATCH 01/29] Adding Serbian Latin translation for phrases and
 Telegram

It is based on Serbian, but it is transliterated (so, easily obtained by
automation). While it was easy to produce and Serbian is 100%, I decided
to upload it in same commit.
---
 .../res/values-b+sr+Latn/strings.xml          |  274 ++
 OsmAnd/res/values-b+sr+Latn/phrases.xml       | 3911 +++++++++++++++++
 2 files changed, 4185 insertions(+)
 create mode 100644 OsmAnd-telegram/res/values-b+sr+Latn/strings.xml
 create mode 100644 OsmAnd/res/values-b+sr+Latn/phrases.xml

diff --git a/OsmAnd-telegram/res/values-b+sr+Latn/strings.xml b/OsmAnd-telegram/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000000..f281e65c4c
--- /dev/null
+++ b/OsmAnd-telegram/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="shared_string_select">Označi</string>
+    <string name="shared_string_enable">Omogući</string>
+    <string name="altitude">Nadmorska visina</string>
+    <string name="shared_string_search">Traži</string>
+    <string name="shared_string_ok">U redu</string>
+    <string name="shared_string_update">Ažuriraj</string>
+    <string name="average_altitude">Prosečna visina</string>
+    <string name="average_speed">Prosečna brzina</string>
+    <string name="shared_string_map">Karta</string>
+    <string name="shared_string_add">Dodaj</string>
+    <string name="shared_string_hide">Sakrij</string>
+    <string name="shared_string_status">Stanje</string>
+    <string name="shared_string_disable">Onemogući</string>
+    <string name="shared_string_save">Sačuvaj</string>
+    <string name="shared_string_name">Ime</string>
+    <string name="shared_string_sort">Sortiraj</string>
+    <string name="shared_string_exit">Izlaz</string>
+    <string name="shared_string_close">Zatvori</string>
+    <string name="shared_string_all">Sve</string>
+    <string name="shared_string_off">Isključeno</string>
+    <string name="shared_string_install">Instaliraj</string>
+    <string name="shared_string_share">Deli</string>
+    <string name="shared_string_back">Nazad</string>
+    <string name="shared_string_continue">Nastavi</string>
+    <string name="shared_string_cancel">Otkaži</string>
+    <string name="shared_string_settings">Postavke</string>
+    <string name="osmand_service">Pozadinski režim</string>
+    <string name="yard">yd</string>
+    <string name="foot">ft</string>
+    <string name="mile">mi</string>
+    <string name="km">km</string>
+    <string name="m">m</string>
+    <string name="nm">nmi</string>
+    <string name="min_mile">min/m</string>
+    <string name="min_km">min/km</string>
+    <string name="m_s">m/s</string>
+    <string name="km_h">km/h</string>
+    <string name="mile_per_hour">mph</string>
+    <string name="si_kmh">Kilometara na sat</string>
+    <string name="si_mph">Milja na sat</string>
+    <string name="si_m_s">Metara u sekundi</string>
+    <string name="si_min_km">Minuta po kilometru</string>
+    <string name="si_min_m">Minuta po milji</string>
+    <string name="si_mi_feet">Milje/stope</string>
+    <string name="si_mi_yard">Milje/jardi</string>
+    <string name="si_km_m">Kilometri/metri</string>
+    <string name="si_nm">Nautičke milje</string>
+    <string name="si_mi_meters">Milje/metri</string>
+    <string name="shared_string_apply">Primeni</string>
+    <string name="shared_string_enabled">Uključen</string>
+    <string name="units_and_formats">Merne jedinice &amp; formatiranja</string>
+    <string name="unit_of_length_descr">Promeni jedinice za dužinu.</string>
+    <string name="unit_of_length">Jedinice dužine</string>
+    <string name="shared_string_appearance">Izgled</string>
+    <string name="timeline">Vremenska linija</string>
+    <string name="live_now">Uživo sada</string>
+    <string name="my_location">Moja lokacija</string>
+    <string name="welcome_descr"><b>OsmAnd Pratioc</b> omogućava vam da delite svoju lokaciju i vidite lokaciju drugih u OsmAndu.<br/><br/>Aplikacija koristi Telegram API, pa vam je potreban Telegram nalog.</string>
+    <string name="shared_string_second_short">sek</string>
+    <string name="shared_string_minute_short">min</string>
+    <string name="shared_string_hour_short">č</string>
+    <string name="si_nm_h">Nautičkih milja na sat (čvorovi)</string>
+    <string name="nm_h">nmi/č</string>
+    <string name="shared_string_welcome">Dobrodošli</string>
+    <string name="shared_string_authorization_descr">Unesite vaš telefonski broj Telegrama u međunarodnom formatu</string>
+    <string name="shared_string_authorization">Autorizacija</string>
+    <string name="active_chats">Aktivna ćaskanja</string>
+    <string name="show_users_on_map">Prikažite korisnike na mapi</string>
+    <string name="install_osmand">Instalirajte OsmAnd</string>
+    <string name="install_osmand_dialog_message">Prvo morate instalirati besplatnu ili plaćenu verziju OsmAnda</string>
+    <string name="osmand_logo">Logo OsmAnda</string>
+    <string name="process_service">Usluga OsmAnd Pratioca</string>
+    <string name="sharing_location">Deljenje lokacije</string>
+    <string name="share_location">Deli lokaciju</string>
+    <string name="shared_string_distance">Rastojanje</string>
+    <string name="osmand_service_descr">OsmAnd Pratioc radi u pozadini sa isključenim ekranom.</string>
+    <string name="location_service_no_gps_available">Izaberite jednog od dobavljača lokacije da bi deliti vašu lokaciju.</string>
+    <string name="gps_not_available">Uključite „Lokaciju“ u sistemskim podešavanjima</string>
+    <string name="no_location_permission">Aplikaciji nedostaje dozvola za pristup podacima o lokaciji.</string>
+    <string name="not_logged_in">Niste prijavljeni</string>
+    <string name="gps_network_not_enabled">Uključiti „Lokaciju“\?</string>
+    <string name="closing">Zatvaranje</string>
+    <string name="logging_out">Odjavljivanje</string>
+    <string name="initialization">Pokretanje</string>
+    <string name="shared_string_logout">Odjaviti se</string>
+    <string name="shared_string_login">Prijavite se</string>
+    <string name="password_descr">Telegram lozinka</string>
+    <string name="enter_password">Unesite lozinku</string>
+    <string name="authentication_code_descr">Telegram vam je poslao kod za OsmAnd radi prijave na vaš nalog.</string>
+    <string name="authentication_code">Validacioni kod</string>
+    <string name="enter_code">Unesite kod</string>
+    <string name="shared_string_password">Lozinka</string>
+    <string name="phone_number_descr">Broj telefona u međunarodnom formatu</string>
+    <string name="phone_number_title">Broj telefona</string>
+    <string name="app_name">OsmAnd Onlajn GPS Pratioc</string>
+    <string name="show_on_map">Prikaži na mapi</string>
+    <string name="start_location_sharing">Deli lokaciju</string>
+    <string name="my_location_search_hint">Pretražite: Grupu ili kontakt</string>
+    <string name="location_sharing_description">Izaberite kontakte i grupe sa kojima želite da delite lokaciju.</string>
+    <string name="set_time">Podesite vreme</string>
+    <string name="set_time_description">Podesite vreme za koji će izabrani kontakti i grupe videti vašu lokaciju u realnom vremenu.</string>
+    <string name="visible_time_for_all">Vidljivo vreme za sve</string>
+    <string name="hours_format">%1$ č</string>
+    <string name="minutes_format">%1$ m</string>
+    <string name="hours_and_minutes_format">%1$ č %2$ m</string>
+    <string name="set_visible_time_for_all">Podesite vidljivo vreme za sve</string>
+    <string name="enter_authentication_code">Unesite kod za validaciju</string>
+    <string name="enter_phone_number">Unesite broj telefona</string>
+    <string name="do_not_have_telegram">Nemam Telegram nalog</string>
+    <string name="already_registered_in_telegram">Potreban vam je registrovani Telegram nalog i broj telefona</string>
+    <string name="get_telegram_after_creating_account">Tada možete da koristite ovu aplikaciju.</string>
+    <string name="get_telegram_description_continue">Instalirajte Telegram i otvorite nalog.</string>
+    <string name="get_telegram_account_first">Za deljenje lokacije potreban vam je Telegram nalog.</string>
+    <string name="get_telegram_title">Registracija u Telegramu</string>
+    <string name="shared_string_bot">Bot</string>
+    <string name="shared_string_live">Uživo</string>
+    <string name="open_osmand">Otvori OsmAnd</string>
+    <string name="turn_off_location_sharing">Isključite deljenje lokacije</string>
+    <string name="stop_sharing_all">Deljenje je uključeno (isključite)</string>
+    <string name="expire_at">Ističe</string>
+    <string name="sharing_time">Vreme deljenja</string>
+    <string name="gps_and_location">Pozicija</string>
+    <string name="send_my_location">Pošalji moju lokaciju</string>
+    <string name="send_my_location_desc">Podesite minimalni interval za deljenje lokacije.</string>
+    <string name="stale_location">Nepomičan</string>
+    <string name="stale_location_desc">Poslednji put kada se kontakt pomerio.</string>
+    <string name="location_history">Istorija lokacije</string>
+    <string name="location_history_desc">Sakrijte kontakte koji se nisu pomerili u datom vremenu.</string>
+    <string name="osmand_connect">Osmand veza</string>
+    <string name="osmand_connect_desc">Odaberite verziju OsmAnda koju OsmAnd pratioc koristi za prikazivanje pozicija.</string>
+    <string name="in_time">u %1$</string>
+    <string name="shared_string_account">Nalog</string>
+    <string name="connected_account">Povezani nalog</string>
+    <string name="logout_help_desc">Kako isključiti OsmAnd pratioca iz Telegrama</string>
+    <string name="disconnect_from_telegram">Kako isključiti OsmAnd pratioca iz Telegrama</string>
+    <string name="disconnect_from_telegram_desc">Da biste opozvali pristup deljenju lokacije. Otvorite Telegram, idite na Podešavanja → Privatnost i bezbednost → Sesije i prekinete sesiju OsmAnd pratioca.</string>
+    <string name="logout_no_internet_msg">Povežite se na Internet kako biste se pravilno odjavili iz Telegrama.</string>
+    <string name="shared_string_group">Grupa</string>
+    <string name="last_response">Poslednji odgovor</string>
+    <string name="time_ago">pre</string>
+    <string name="turn_off_all">Isključi sve</string>
+    <string name="disable_all_sharing">Onemogući svako deljenje</string>
+    <string name="disable_all_sharing_desc">Isključuje deljenje lokacije prema svim izabranim čatovima (%1$).</string>
+    <string name="choose_osmand">Izaberite verziju OsmAnda koju želite da koristite</string>
+    <string name="choose_osmand_desc">Izaberite verziju OsmAnda gde će se kontakti prikazati na mapi.</string>
+    <string name="shared_string_sort_by">Sortiraj po</string>
+    <string name="by_group">Po grupi</string>
+    <string name="by_name">Po imenu</string>
+    <string name="by_distance">Po udaljenosti</string>
+    <string name="logout_from_osmand_telegram">Odjaviti se sa OsmAnd pratioca\?</string>
+    <string name="logout_from_osmand_telegram_descr">Jeste li sigurni da se želite odjaviti sa OsmAnd pratioca tako da ne možete da delite lokaciju ili vidite lokaciju drugih\?</string>
+    <string name="live_now_description">Kontakti i grupe dele lokaciju vama.</string>
+    <string name="share_location_as">Deljenje lokacije kao</string>
+    <string name="add_device">Dodajte uređaj</string>
+    <string name="no_internet_connection">Nema internet konekcije</string>
+    <string name="no_gps_connection">Nema GPS veze</string>
+    <string name="location_sharing_status">Deljenje: %1$</string>
+    <string name="sharing_status">Deljenje statusa</string>
+    <string name="last_available_location">Poslednja dostupna lokacija</string>
+    <string name="re_send_location">Ponovo pošalji lokaciju</string>
+    <string name="not_found_yet">Još nije pronađeno</string>
+    <string name="not_sent_yet">Još nije poslato</string>
+    <string name="shared_string_later">Kasnije</string>
+    <string name="go_to_settings">Idi na Podešavanja</string>
+    <string name="sharing_in_background">Deljenje u pozadini</string>
+    <string name="battery_optimization_description">Isključite optimizaciju baterije za OsmAnd pratilac tako da se ne isključi iznenada kad je u pozadini.</string>
+    <string name="background_work">Rad u pozadini</string>
+    <string name="background_work_description">Promenite podešavanja za optimizaciju baterije da biste stabilizovali deljenje lokacije.</string>
+    <string name="connecting_to_the_internet">Povezivanje sa Internetom</string>
+    <string name="searching_for_gps">Pozicioniranje…</string>
+    <string name="initializing">Pokretanje</string>
+    <string name="sending_location_messages">Lokacija se šalje</string>
+    <string name="waiting_for_response_from_telegram">Čeka se odgovor iz Telegrama</string>
+    <string name="not_possible_to_send_to_telegram_chats">Nije moguće poslati u Telegram četove:</string>
+    <string name="successfully_sent_and_updated">Uspešno poslato i ažurirano</string>
+    <string name="last_updated_location">Poslednja ažurirana lokacija:</string>
+    <string name="share_location_as_description">Ako želite da povežete više uređaja sa jednim nalogom telegrama, trebate koristiti drugi uređaj da bi delili vašu lokaciju.</string>
+    <string name="share_location_as_description_second_line">Možete da kreirate i vidite ID uređaja u telegram klijentu koristeći %1$ čat bot. %2$</string>
+    <string name="device_name">Ime uređaja</string>
+    <string name="device_name_cannot_be_empty">Ime uređaja ne može biti prazno</string>
+    <string name="device_name_is_too_long">Ime uređaja predugo</string>
+    <string name="enter_device_name_description">Imenujte vaš novi uređaj sa maksimalno 200 simbola.</string>
+    <string name="error_adding_new_device">Nije moguće dodati novi uređaj</string>
+    <string name="device_added_successfully">%1$ dodato.</string>
+    <string name="enter_another_device_name">Izaberite ime koje niste već koristili</string>
+    <string name="last_update_from_telegram">Poslednje ažuriranje od Telegrama</string>
+    <string name="map_and_text">Mapa i tekst</string>
+    <string name="shared_string_text">Tekst</string>
+    <string name="send_location_as_descr">Odaberite kako će izgledati poruke sa vašom lokacijom.</string>
+    <string name="send_location_as">Pošalji lokaciju kao</string>
+    <string name="start_date">Početni datum</string>
+    <string name="end_date">Krajnji datum</string>
+    <string name="open_in_osmand">Prikaži u OsmAndu</string>
+    <string name="time_on_the_move">Vreme kretanja</string>
+    <string name="monitoring_is_disabled">Praćenje je onemogućeno</string>
+    <string name="monitoring_is_enabled">Praćenje je omogućeno</string>
+    <string name="shared_string_sent">Poslato</string>
+    <string name="gps_points">GPS tačke</string>
+    <string name="shared_string_collected">Prikupljeno</string>
+    <string name="shared_string_date">Datum</string>
+    <string name="points_size">%1$ tačaka</string>
+    <string name="gps_points_in_buffer">poslato (%1$ u baferu)</string>
+    <string name="please_update_osmand">Ažurirajte OsmAnd da biste videli podatke na mapi</string>
+    <string name="show_gps_points_descr">Prikaži količinu prikupljenih i poslatih GPS tačaka.</string>
+    <string name="show_gps_points">Pokaži GPS tačke</string>
+    <string name="received_gps_points">Primljene GPKS tačke: %1$</string>
+    <string name="how_it_works">Kako radi</string>
+    <string name="osmand_privacy_policy">OsmAnd politika privatnosti</string>
+    <string name="telegram_privacy_policy">Politika privatnosti Telegrama</string>
+    <string name="shared_string_accept">Prihvati</string>
+    <string name="privacy_policy_agree">Klikom na „Nastavi“ prihvatate uslove politike privatnosti Telegrama i OsmAnda.</string>
+    <string name="privacy_policy_telegram_client">OsmAnd pratilac je jedan od klijenata koji koriste otvorenu platformu Telegram. Vaši kontakti mogu da koriste bilo koji drugi Telegram klijent.</string>
+    <string name="privacy_policy_use_telegram">Telegram (aplikacija za razmenu poruka) koristi se za povezivanje i komunikaciju sa ljudima.</string>
+    <string name="shared_string_telegram">Telegram</string>
+    <string name="app_name_short">OsmAnd pratilac</string>
+    <string name="timeline_description">Omogućite praćenje da biste sačuvali sve lokacije u istoriji.</string>
+    <string name="location_recording_enabled">Snimanje lokacije omogućeno</string>
+    <string name="disable_monitoring">Onemogućite praćenje</string>
+    <string name="timeline_available_for_free_now">Vremenska linija je funkcija koja je sada dostupna besplatno.</string>
+    <string name="type_contact_or_group_name">Unesite ime kontakta ili grupe</string>
+    <string name="search_contacts_descr">Pretraga po svim vašim grupama i kontaktima.</string>
+    <string name="search_contacts">Pretraga kontakta</string>
+    <string name="bearing">Usmerenje</string>
+    <string name="precision">Preciznost</string>
+    <string name="direction">Smer</string>
+    <string name="privacy">Privatnost</string>
+    <string name="proxy">Proksi</string>
+    <string name="proxy_settings">Podešavanja proksija</string>
+    <string name="proxy_disconnected">Prekinut</string>
+    <string name="proxy_connected">Povezan</string>
+    <string name="proxy_type">Tip proksija</string>
+    <string name="shared_string_connection">Veza</string>
+    <string name="proxy_server">Server</string>
+    <string name="proxy_port">Port</string>
+    <string name="proxy_credentials">Akreditivi</string>
+    <string name="proxy_username">Korisničko ime</string>
+    <string name="proxy_password">Lozinka</string>
+    <string name="proxy_key">Ključ</string>
+    <string name="gpx_settings">GPX podešavanja</string>
+    <string name="min_logging_speed_descr">Filter: nema zapisivanja ispod odabrane brzine</string>
+    <string name="min_logging_speed">Minimalna brzina zapisivanja</string>
+    <string name="min_logging_accuracy_descr">Filter: Nema zapisa dok se ne dostigne ova tačnost</string>
+    <string name="min_logging_accuracy">Minimalna tačnost evidentiranja</string>
+    <string name="min_logging_distance_descr">Filter: minimalna udaljenost za evidentiranje nove tačke</string>
+    <string name="min_logging_distance">Minimalna udaljenost evidentiranja</string>
+    <string name="timeline_no_data">Nema podataka</string>
+    <string name="timeline_no_data_descr">Nemamo prikupljene podatke za izabrani dan</string>
+    <string name="start_end_date">Početni — Krajnji datum</string>
+    <string name="set_time_timeline_descr">Izaberite vreme za prikaz</string>
+    <string name="shared_string_start">Početak</string>
+    <string name="shared_string_end">Kraj</string>
+    <string name="saved_messages">Sačuvane poruke</string>
+    <string name="unit_of_speed_system">Jedinica brzine</string>
+    <string name="unit_of_speed_system_descr">Definišite jedinicu brzine.</string>
+    <string name="time_zone">Vremenska zona</string>
+    <string name="time_zone_descr">Izaberite vremensku zonu koja će se prikazati u porukama lokacije.</string>
+    <string name="buffer_time">Vreme isteka bafera</string>
+    <string name="buffer_time_descr">Maksimalno vreme za skladištenje tačaka u bafer</string>
+    <string name="status_widget_title">Status Tragača OsmAnda</string>
+    <string name="shared_string_suggested">Predloženo</string>
+    <string name="back_to_osmand">Povratak na OsmAnd</string>
+    <string name="duration_ago">Pre %1$</string>
+    <string name="last_response_duration">Poslednji odgovor: pre %1$</string>
+    <string name="last_update_from_telegram_duration">Poslednje ažuriranje iz Telegrama: pre %1$</string>
+    <string name="last_response_date">Poslednji odgovor: %1$</string>
+    <string name="last_update_from_telegram_date">Poslednje ažuriranje iz Telegrama: %1$</string>
+    <string name="shared_string_error_short">Greška</string>
+    <string name="shared_string_export">Izvezi</string>
+    <string name="logcat_buffer">Logcat bafer</string>
+    <string name="logcat_buffer_descr">Proverite i podelite detaljne zapise aplikacije</string>
+    <string name="send_report">Pošalji izveštaj</string>
+</resources>
diff --git a/OsmAnd/res/values-b+sr+Latn/phrases.xml b/OsmAnd/res/values-b+sr+Latn/phrases.xml
new file mode 100644
index 0000000000..311b4a1425
--- /dev/null
+++ b/OsmAnd/res/values-b+sr+Latn/phrases.xml
@@ -0,0 +1,3911 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="poi_fuel_type">Vrsta goriva</string>
+    <string name="poi_payment_type">Način plaćanja</string>
+    <string name="poi_payment_fuel_type">Platežne kartice za gorivo</string>
+    <string name="poi_additional_type">Dodatno</string>
+    <string name="poi_internet_access_type">Vrsta pristupa internetu</string>
+    <string name="poi_vending_type">Način prodaje</string>
+    <string name="poi_bicycle_service">Održavanje bicikala</string>
+    <string name="poi_clothes_type">Vrsta</string>
+    <string name="poi_shoes_type">Vrsta</string>
+    <string name="poi_fire_hydrant_type">Vrsta</string>
+    <string name="poi_fire_hydrant_position">Položaj</string>
+    <string name="poi_water_source">Izvor vode</string>
+    <string name="poi_payment_toll_type">Način plaćanja</string>
+    <string name="poi_traffic_signals_sound">Zvuk</string>
+    <string name="poi_highway_crossing_type">Vrsta</string>
+    <string name="poi_service_general">Održavanje</string>
+    <string name="poi_information_contents">Sadržaj</string>
+    <string name="poi_clock_option">Dodatno</string>
+    <string name="poi_scout_camp">Kamp izviđača</string>
+    <string name="poi_resort_type">Tip</string>
+    <string name="poi_piste_difficulty">Težina staze</string>
+    <string name="poi_piste_grooming">Ravnanje staze</string>
+    <string name="poi_theatre_genre">Rod</string>
+    <string name="poi_outdoor_seating">Spoljašnja klupa</string>
+    <string name="poi_fee">Naknada</string>
+    <string name="poi_smoking">Pušenje</string>
+    <string name="poi_delivery">Dostava</string>
+    <string name="poi_drive_in">Drajv-in</string>
+    <string name="poi_takeaway">Za poneti</string>
+    <string name="poi_cocktails">Kokteli</string>
+    <string name="poi_microbrewery">Mikropivara</string>
+    <string name="poi_recycling_type">Tip</string>
+    <string name="poi_recycling_accepted_waste">Dozvoljeni otpad</string>
+    <string name="poi_shelter_type">Tip</string>
+    <string name="poi_fireplace">Kamin</string>
+    <string name="poi_seasonal">Sezonski</string>
+    <string name="poi_water_characteristic">Osobine vode</string>
+    <string name="poi_beach_surface_type">Podloga</string>
+    <string name="poi_nudism">Nudizam</string>
+    <string name="poi_massage_type">Tip masaže</string>
+    <string name="poi_tents">Šatori</string>
+    <string name="poi_washing_machine">Mašina za pranje veša</string>
+    <string name="poi_caravans">Karavani</string>
+    <string name="poi_medical_system">Medicinski sistem</string>
+    <string name="poi_home_visit">Kućna poseta</string>
+    <string name="poi_social_facility_type">Tip</string>
+    <string name="poi_social_facility_for">Ciljna grupa</string>
+    <string name="poi_compressed_air_filter">Vazduh pod pritiskom</string>
+    <string name="poi_vacuum_cleaner_filter">Usisivač</string>
+    <string name="poi_self_service">Samousluga</string>
+    <string name="poi_automated">Automatizovano</string>
+    <string name="poi_parking_type">Vrsta</string>
+    <string name="poi_covered">Prekriven</string>
+    <string name="poi_subway_station_filter">Podzemna stanica</string>
+    <string name="poi_ferry_terminal_cargo">Teret</string>
+    <string name="poi_bicycle_parking_type">Vrsta</string>
+    <string name="poi_aerialway_bicycle">Prevoz biciklom</string>
+    <string name="poi_aerialway_heating">Grejanje</string>
+    <string name="poi_pump">Pumpa</string>
+    <string name="poi_telescope_type">Vrsta</string>
+    <string name="poi_animal_training_type">Vrsta</string>
+    <string name="poi_diplomatic_filter">TipVrsta</string>
+    <string name="poi_city_capital">Glavni grad</string>
+    <string name="poi_healthcare_alternative_types">Specijalizacija</string>
+    <string name="poi_free_flying_characteristics">Osobina</string>
+    <string name="poi_archaeological_site_type">Vrsta</string>
+    <string name="poi_star_rating">Broj zvezdica</string>
+    <string name="poi_religion_type">Veroispovest</string>
+    <string name="poi_information_type">Vrsta</string>
+    <string name="poi_drive_through">Drajv tru</string>
+    <string name="poi_dish">Jelo</string>
+    <string name="poi_payment_transport_type">Tip plaćanja (prevoz)</string>
+    <string name="poi_free_flying_characteristic">Osobina</string>
+    <string name="poi_cafeteria">Kafić</string>
+    <string name="poi_zoo_type">Tip</string>
+    <string name="poi_motorcycle_type">Tip motocikla</string>
+    <string name="poi_animal_shelter_type">Dozvoljene životinje</string>
+    <string name="poi_animal_shelter_purpose">Svrha</string>
+    <string name="poi_boat_rental_type">Iznajmljivanje čamaca</string>
+    <string name="poi_water_purification">Prečišćavanje vode</string>
+    <string name="poi_climbing_style">Stil penjanja</string>
+    <string name="poi_socket">Utičnica</string>
+    <string name="poi_service_car">Auto servis</string>
+    <string name="poi_glacier_type">Tip glečera</string>
+    <string name="poi_transportation">Prevoz</string>
+    <string name="poi_road_obstacle">Prepreka na putu</string>
+    <string name="poi_filling_station">Benzinska stanica</string>
+    <string name="poi_personal_transport">Lični prevoz</string>
+    <string name="poi_public_transport">Javni prevoz</string>
+    <string name="poi_air_transport">Vazdušni prevoz</string>
+    <string name="poi_water_transport">Vodeni prevoz</string>
+    <string name="poi_bicycle_transport">Prevoz biciklom</string>
+    <string name="poi_aerialway_transport">Prevoz vazdušnim putem</string>
+    <string name="poi_hiking_routes">Rute za pešačenje</string>
+    <string name="poi_power">Struja</string>
+    <string name="poi_communication">Komunikacije</string>
+    <string name="poi_trash_disposal">Odlaganje smeća</string>
+    <string name="poi_education">Obrazovanje</string>
+    <string name="poi_administrative">Administracija</string>
+    <string name="poi_healthcare">Zdravstvo</string>
+    <string name="poi_office">Kancelarije</string>
+    <string name="poi_sport">Sport</string>
+    <string name="poi_tourism">Turizam</string>
+    <string name="poi_sightseeing">Razgledanje okoline</string>
+    <string name="poi_internet_access">Pristup internetu</string>
+    <string name="poi_club">Klub</string>
+    <string name="poi_sustenance">Hrana</string>
+    <string name="poi_cafe_and_restaurant">Kafić i restoran</string>
+    <string name="poi_finance">Finansije</string>
+    <string name="poi_natural">Priroda</string>
+    <string name="poi_seamark">Pomorska</string>
+    <string name="poi_military">Vojska</string>
+    <string name="poi_osmwiki">Vikipedija</string>
+    <string name="poi_user_defined_other">Korisnički definisano</string>
+    <string name="poi_bakery">Pekara</string>
+    <string name="poi_alcohol">Podrum pića</string>
+    <string name="poi_cheese">Prodavnica sira</string>
+    <string name="poi_chocolate">Prodavnica čokolade</string>
+    <string name="poi_coffee">Prodaje kafe</string>
+    <string name="poi_mall">Tržni centar</string>
+    <string name="poi_beverages">Prodavnica pića</string>
+    <string name="poi_butcher">Mesna pijaca</string>
+    <string name="poi_farm">Stočna prodavnica</string>
+    <string name="poi_seafood">Prodavnica morske hrane</string>
+    <string name="poi_confectionery">Konfekcija</string>
+    <string name="poi_supermarket">Supermarket</string>
+    <string name="poi_tea">Prodavnica čaja</string>
+    <string name="poi_pasta">Prodavnica testenina</string>
+    <string name="poi_wine">Vinski podrum</string>
+    <string name="poi_books">Knjižara</string>
+    <string name="poi_bicycle">Prodavnica bickli</string>
+    <string name="poi_anime">Anime prodavnica</string>
+    <string name="poi_antiques">Antikvarnica</string>
+    <string name="poi_art">Prodavnica umetnina</string>
+    <string name="poi_baby_goods">Stvari za bebu</string>
+    <string name="poi_boutique">Modni butik</string>
+    <string name="poi_camera">Fotoaparati i sočiva</string>
+    <string name="poi_carpet">Prodavnica tepiha</string>
+    <string name="poi_chemist">Drogerija</string>
+    <string name="poi_clothes">Prodavnica odeće</string>
+    <string name="poi_clothes_children">Prodavnica odeće za decu</string>
+    <string name="poi_shoes">Prodavnica cipela</string>
+    <string name="poi_candles">Prodavnica sveža</string>
+    <string name="poi_computer">Prodavnica računara</string>
+    <string name="poi_copyshop">Fotokopirnica</string>
+    <string name="poi_curtain">Prodavnica zavesa</string>
+    <string name="poi_fabric">Prodavnica tkanine</string>
+    <string name="poi_doors">Vrata</string>
+    <string name="poi_erotic">Seks šop</string>
+    <string name="poi_fashion">Modna prodavnica</string>
+    <string name="poi_florist">Cvećara</string>
+    <string name="poi_frame">Prodavnica ramova</string>
+    <string name="poi_gift">Prodavnica poklona</string>
+    <string name="poi_hunting">Oprema za lov</string>
+    <string name="poi_jewelry">Juvelir</string>
+    <string name="poi_kiosk">Kiosk</string>
+    <string name="poi_leather">Prodavnica kože</string>
+    <string name="poi_mobile_phone">Prodavnica mobilnih telefona</string>
+    <string name="poi_motorcycle">Prodavnica motocikala</string>
+    <string name="poi_music">Muzička radnja</string>
+    <string name="poi_musical_instrument">Muzički instrumenti</string>
+    <string name="poi_newsagent">Novinarnica</string>
+    <string name="poi_optician">Optometrija</string>
+    <string name="poi_organic">Organski proizvod</string>
+    <string name="poi_paint">Prodavnica boja</string>
+    <string name="poi_pet">Prodavnica kućnih ljubimaca</string>
+    <string name="poi_photo">Foto radnja</string>
+    <string name="poi_second_hand">Prodavnica polovnih stvari</string>
+    <string name="poi_sports">Sportska oprema</string>
+    <string name="poi_ticket">Prodaja karata</string>
+    <string name="poi_tobacco">Prodavnica duvana</string>
+    <string name="poi_toys">Prodavnica igračaka</string>
+    <string name="poi_tyres">Prodavnica guma</string>
+    <string name="poi_vacuum_cleaner">Prodavnica usisivača</string>
+    <string name="poi_video">Video klub</string>
+    <string name="poi_electronics">Prodavnica elektronike</string>
+    <string name="poi_car_parts">Auto delovi</string>
+    <string name="poi_cosmetics">Kozmetika</string>
+    <string name="poi_socket_chademo_output_filter">CHAdeMO izlaz</string>
+    <string name="poi_socket_type2_output_filter">Tip 2 izlaz</string>
+    <string name="poi_socket_type2_combo_output_filter">Tip 2 kombo izlaz</string>
+    <string name="poi_socket_type3_output_filter">Tip 3 izlaz</string>
+    <string name="poi_socket_cee_blue_output_filter">CEE plavi izlaz</string>
+    <string name="poi_socket_schuko_output_filter">Šuko izlaz</string>
+    <string name="poi_palaeontological_site">Paleontološki lokalitet</string>
+    <string name="poi_gas">Prodavnica tečnog gasa</string>
+    <string name="poi_hearing_aids">Slušni aparati</string>
+    <string name="poi_hifi">HiFi prodavnica</string>
+    <string name="poi_interior_decoration">Prodavnica enterijera</string>
+    <string name="poi_scuba_diving_shop">Prodavnica opreme za ronjenje</string>
+    <string name="poi_sewing">Prodavnica osušene robe</string>
+    <string name="poi_watches">Sajdžija</string>
+    <string name="poi_swimming_pool_shop">Prodavnica opreme za bazene</string>
+    <string name="poi_games">Igre</string>
+    <string name="poi_trophy">Trofeji, nagrade</string>
+    <string name="poi_video_games">Video igrice</string>
+    <string name="poi_pyrotechnics">Pirotehnika</string>
+    <string name="poi_weapons">Prodavnica oružja</string>
+    <string name="poi_perfumery">Parfimerija</string>
+    <string name="poi_spices">Prodavnica začina</string>
+    <string name="poi_honey">Prodavnica meda</string>
+    <string name="poi_police">Policija</string>
+    <string name="poi_fire_station">Vatrogasci</string>
+    <string name="poi_fire_hydrant">Hidrant</string>
+    <string name="poi_fire_hose">Vatrogasno crevo</string>
+    <string name="poi_ambulance_station">Ambulanta</string>
+    <string name="poi_ses_station">SES stanica</string>
+    <string name="poi_emergency_access_point">Tačka za okupljanje u slučaju nužde</string>
+    <string name="poi_ford">Zaliv</string>
+    <string name="poi_mountain_pass">Planinski prolaz</string>
+    <string name="poi_gate">Kapija</string>
+    <string name="poi_city_wall">Gradske zidine</string>
+    <string name="poi_lift_gate">Kapija lifta</string>
+    <string name="poi_toll_booth">Telefonska govornica</string>
+    <string name="poi_border_control">Pasoška kontrola</string>
+    <string name="poi_traffic_calming_bump">Ležeći policajac</string>
+    <string name="poi_traffic_calming_cushion">Jastuče (brzinsko)</string>
+    <string name="poi_traffic_calming_chicane">Šikana</string>
+    <string name="poi_traffic_calming_island">Saobraćajno ostrvo</string>
+    <string name="poi_traffic_signals">Stop svetlo</string>
+    <string name="poi_car_repair">Popravka kola</string>
+    <string name="poi_service_tyres">Gume</string>
+    <string name="poi_vehicle_inspection">Pregled vozila</string>
+    <string name="poi_car_wash">Pranje kola</string>
+    <string name="poi_fuel">Benzinska pumpa;Pumpa za plin;Stanica za punjenje</string>
+    <string name="poi_fuel_diesel">Dizel</string>
+    <string name="poi_fuel_gtl_diesel">GTL dizel</string>
+    <string name="poi_fuel_hgv_diesel">HGV dizel</string>
+    <string name="poi_fuel_biodiesel">Biodizel</string>
+    <string name="poi_fuel_lpg">LPG</string>
+    <string name="poi_fuel_octane_80">Oktan 80</string>
+    <string name="poi_fuel_octane_91">Oktan 91</string>
+    <string name="poi_fuel_octane_92">Oktan 92</string>
+    <string name="poi_fuel_octane_95">Oktan 95</string>
+    <string name="poi_fuel_octane_98">Oktan 98</string>
+    <string name="poi_fuel_octane_100">Oktan 100</string>
+    <string name="poi_fuel_1_25">1:25 gorivo</string>
+    <string name="poi_fuel_1_50">1:50 gorivo</string>
+    <string name="poi_fuel_ethanol">Etanol</string>
+    <string name="poi_fuel_methanol">Metanol</string>
+    <string name="poi_fuel_svo">SVO</string>
+    <string name="poi_fuel_e10">E10</string>
+    <string name="poi_fuel_e20">E20</string>
+    <string name="poi_fuel_e85">E85</string>
+    <string name="poi_fuel_biogas">Biogas</string>
+    <string name="poi_fuel_lh2">Tečni vodonik</string>
+    <string name="poi_fuel_electricity">Struja</string>
+    <string name="poi_aeroway_fuel">Benzinska stanica za letelice</string>
+    <string name="poi_waterway_fuel">Benzinska stanica za brodove</string>
+    <string name="poi_compressed_air">Vazduh pod pritiskom</string>
+    <string name="poi_parking">Parking</string>
+    <string name="poi_motorcycle_parking">Parking za motocikle</string>
+    <string name="poi_parking_entrance">Ulaz u parking</string>
+    <string name="poi_garages">Garaže</string>
+    <string name="poi_public_transport_platform">Stanica javnog prevoza</string>
+    <string name="poi_public_transport_platform_bus">Autobuska stanica</string>
+    <string name="poi_public_transport_platform_trolleybus">Stanica trolejbusa</string>
+    <string name="poi_bus_stop">Autobuska stanica</string>
+    <string name="poi_public_transport_platform_tram">Tramvajska stanica</string>
+    <string name="poi_tram_stop">Tramvajska stanica</string>
+    <string name="poi_public_transport_station">Stanica javnog prevoza</string>
+    <string name="poi_bus_station">Autobuska stanica</string>
+    <string name="poi_railway_station">Železnička stanica</string>
+    <string name="poi_subway_entrance">Ulaz u podzemnu</string>
+    <string name="poi_subway_station">Da</string>
+    <string name="poi_taxi">Taksi stanica</string>
+    <string name="poi_aerodrome">Aerodrom</string>
+    <string name="poi_helipad">Heliodrom</string>
+    <string name="poi_runway">Pista</string>
+    <string name="poi_aeroway_terminal">Vazdušni terminal</string>
+    <string name="poi_aeroway_gate">Vazdušni gejt</string>
+    <string name="poi_lighthouse">Svetionik</string>
+    <string name="poi_bicycle_rental">Iznajmljivanje bicikli</string>
+    <string name="poi_bicycle_parking">Parking za bicikle</string>
+    <string name="poi_aerialway_gondola">Gondola</string>
+    <string name="poi_content_crop">Sadržaj: usev</string>
+    <string name="poi_crop_rice">Usev: pirinač</string>
+    <string name="poi_crop_grass">Usev: trava</string>
+    <string name="poi_crop_corn">Usev: kukuruz</string>
+    <string name="poi_crop_cereal">Usev: žitarice</string>
+    <string name="poi_crop_sugarcane">Usev: šećerna trska</string>
+    <string name="poi_crop_wheat">Usev: pšenica</string>
+    <string name="poi_crop_soy">Usev: soja</string>
+    <string name="poi_crop_barley">Usev: ječam</string>
+    <string name="poi_crop_vegetables">Usev: povrće</string>
+    <string name="poi_crop_hop">Usev: hmelj</string>
+    <string name="poi_crop_rape">Usev: repica</string>
+    <string name="poi_crop_beet">Usev: cvekla</string>
+    <string name="poi_crop_lavender">Usev: lavanda</string>
+    <string name="poi_crop_tea">Usev: čaj</string>
+    <string name="poi_crop_coffee">Usev: kafa</string>
+    <string name="poi_crop_poultry">Usev: živina</string>
+    <string name="poi_crop_sunflower">Usev: suncokret</string>
+    <string name="poi_crop_raspberry">Usev: malina</string>
+    <string name="poi_crop_tobacco">Usev: duvan</string>
+    <string name="poi_crop_strawberry">Usev: jagoda</string>
+    <string name="poi_crop_vegetables_flowers">Usev: povrće, cveće</string>
+    <string name="poi_crop_cassava">Usev: tapioka</string>
+    <string name="poi_crop_cranberry">Usev: brusnica</string>
+    <string name="poi_crop_asparagus">Usev: špargla</string>
+    <string name="poi_crop_flowers">Usev: cveće</string>
+    <string name="poi_shower_filter_yes">Da</string>
+    <string name="poi_shower_yes">Tuš: da</string>
+    <string name="poi_shower_no">Tuš: ne</string>
+    <string name="poi_shower_hot">Tuš: vruć</string>
+    <string name="poi_shower_outdoor">Tuš: spolja</string>
+    <string name="poi_shower_cold">Tuš: hladan</string>
+    <string name="poi_shower_indoor">Tuš: unutra</string>
+    <string name="poi_power_supply_yes">Da</string>
+    <string name="poi_site_type_necropolis">Nekropola</string>
+    <string name="poi_generator_output_electricity">Izlazna snaga</string>
+    <string name="poi_generator_output_hot_water">Izlazna snaga tople vode</string>
+    <string name="poi_generator_output_compressed_air">Izlazna snaga vazduha pod pritiskom</string>
+    <string name="poi_fire_extinguisher">Protivpožarni aparat</string>
+    <string name="poi_fuel_cng">CNG</string>
+    <string name="poi_electricity_combined_charging">Stanica za punjenje</string>
+    <string name="poi_vehicle_ramp">Rampa za vozila</string>
+    <string name="poi_ferry_terminal">Trajektni terminus</string>
+    <string name="poi_aerialway_cable_car">Žičara</string>
+    <string name="poi_aerialway_goods">Lift za robu</string>
+    <string name="poi_aerialway_magic_carpet">Uspinjača</string>
+    <string name="poi_tunnel">Tunel</string>
+    <string name="poi_bridge">Most</string>
+    <string name="poi_speed_camera">Radar kamera</string>
+    <string name="poi_junction">Raskrsnica</string>
+    <string name="poi_rest_area">Odmorište</string>
+    <string name="poi_water_well">Bunar sa vodom</string>
+    <string name="poi_water_works">Radovi na vodi</string>
+    <string name="poi_water_tower">Vodeni toranj</string>
+    <string name="poi_lock_gate">Kapija sa zaključavanjem</string>
+    <string name="poi_dam">Brana</string>
+    <string name="poi_watermill">Vodenica</string>
+    <string name="poi_breakwater">Razbijač talasa</string>
+    <string name="poi_power_transformer">Transformator</string>
+    <string name="poi_power_plant">Elektrana</string>
+    <string name="poi_power_generator">Strujni generator</string>
+    <string name="poi_post_office">Pošta</string>
+    <string name="poi_post_box">Poštansko sanduče</string>
+    <string name="poi_telephone">Telefon</string>
+    <string name="poi_communication_tower">Komunikacioni toranj</string>
+    <string name="poi_observation_tower">Osmatračnica</string>
+    <string name="poi_recycling">Reciklaža</string>
+    <string name="poi_recycling_centre">Centar za reciklažu</string>
+    <string name="poi_recycling_container">Kontejner</string>
+    <string name="poi_recycling_glass">Staklo</string>
+    <string name="poi_recycling_paper">Papir</string>
+    <string name="poi_recycling_clothes">Odeća</string>
+    <string name="poi_recycling_cans">Limenke</string>
+    <string name="poi_recycling_glass_bottles">Staklene flaše</string>
+    <string name="poi_recycling_plastic">Plastika</string>
+    <string name="poi_recycling_scrap_metal">Metalni otpaci</string>
+    <string name="poi_recycling_batteries">Baterije</string>
+    <string name="poi_recycling_plastic_bottles">Plastične flaše</string>
+    <string name="poi_recycling_green_waste">Zelenilo</string>
+    <string name="poi_recycling_waste">Otpad (crne kese)</string>
+    <string name="poi_recycling_plastic_packaging">Plastične ambalaže</string>
+    <string name="poi_recycling_newspaper">Novine</string>
+    <string name="poi_recycling_cartons">Karton</string>
+    <string name="poi_recycling_cardboard">Kartonske kutije</string>
+    <string name="poi_recycling_magazines">Časopisi</string>
+    <string name="poi_recycling_paper_packaging">Papirnate ambalaže</string>
+    <string name="poi_recycling_small_appliances">Mali uređaji</string>
+    <string name="poi_recycling_wood">Drvo</string>
+    <string name="poi_recycling_books">Knjige</string>
+    <string name="poi_recycling_shoes">Cipele</string>
+    <string name="poi_recycling_aluminium">Aluminijum</string>
+    <string name="poi_recycling_organic">Organsko</string>
+    <string name="poi_recycling_garden_waste">Baštenski otpad</string>
+    <string name="poi_recycling_low_energy_bulbs">Sijalice male snage</string>
+    <string name="poi_recycling_fluorescent_tubes">Fluorescentne sijalice</string>
+    <string name="poi_recycling_metal">Metal</string>
+    <string name="poi_recycling_electrical_items">Električne stvari</string>
+    <string name="poi_recycling_cooking_oil">Ulje za kuvanje</string>
+    <string name="poi_recycling_engine_oil">Motorno ulje</string>
+    <string name="poi_recycling_plastic_bags">Plastične kese</string>
+    <string name="poi_recycling_hazardous_waste">Opasni otpad</string>
+    <string name="poi_recycling_mobile_phones">Mobilni telefoni</string>
+    <string name="poi_recycling_hydrargyrum">Živa</string>
+    <string name="poi_recycling_computers">Računari</string>
+    <string name="poi_recycling_tyres">Gume</string>
+    <string name="poi_recycling_tv_monitor">TV, monitori</string>
+    <string name="poi_recycling_tetrapak">Tetrapak</string>
+    <string name="poi_recycling_rubble">Krš</string>
+    <string name="poi_recycling_cds">CD-ovi</string>
+    <string name="poi_recycling_waste_oil">Otpadno ulje</string>
+    <string name="poi_recycling_bottles">Flaše</string>
+    <string name="poi_recycling_cork">Pluta</string>
+    <string name="poi_recycling_printer_cartridges">Kertridži iz štampača</string>
+    <string name="poi_recycling_paint">Boja</string>
+    <string name="poi_recycling_styrofoam">Stiroform</string>
+    <string name="poi_recycling_drugs">Lekovi</string>
+    <string name="poi_recycling_compost">Kompost</string>
+    <string name="poi_recycling_christmas_trees">Novogodišnje jelke</string>
+    <string name="poi_recycling_light_bulbs">Sijalice</string>
+    <string name="poi_recycling_polyester">Poliester</string>
+    <string name="poi_recycling_animal_waste">Životinjski otpad</string>
+    <string name="poi_recycling_fridge_and_freezer">Frižideri i zamrzivači</string>
+    <string name="poi_recycling_furniture">Nameštaj</string>
+    <string name="poi_recycling_diapers">Pelene</string>
+    <string name="poi_recycling_car_batteries">Akumulatori</string>
+    <string name="poi_recycling_cars">Automobili</string>
+    <string name="poi_recycling_bicycles">Bicikli</string>
+    <string name="poi_landfill_waste_nuclear">Nuklearni otpad</string>
+    <string name="poi_waste_disposal">Odlaganje smeća</string>
+    <string name="poi_waste_basket">Kanta za smeće</string>
+    <string name="poi_residential">Stambena oblast</string>
+    <string name="poi_industrial">Industrijska oblast</string>
+    <string name="poi_landuse_railway">Železnička oblast</string>
+    <string name="poi_commercial">Trgovinsko zemljište</string>
+    <string name="poi_retail">Zemljište namenjeno za maloprodaju</string>
+    <string name="poi_quarry">Kamenolom</string>
+    <string name="poi_vineyard">Vinograd</string>
+    <string name="poi_orchard">Voćnjak</string>
+    <string name="poi_allotments">Bašte</string>
+    <string name="poi_farmyard">Seosko dvorište</string>
+    <string name="poi_meadow">Livada</string>
+    <string name="poi_basin">Sliv</string>
+    <string name="poi_canal">Kanal</string>
+    <string name="poi_pier">Dok</string>
+    <string name="poi_surveillance">Nadzor</string>
+    <string name="poi_observatory">Opservatorija</string>
+    <string name="poi_astronomical_observatory">Astronomska</string>
+    <string name="poi_tower">Toranj</string>
+    <string name="poi_mast">Jarbol</string>
+    <string name="poi_radar">Radar</string>
+    <string name="poi_crane">Kran</string>
+    <string name="poi_works">Radovi</string>
+    <string name="poi_windmill">Vetrenjača</string>
+    <string name="poi_reservoir">Rezervoar</string>
+    <string name="poi_silo">Silos</string>
+    <string name="poi_college">Koledž</string>
+    <string name="poi_driving_school">Vozačka škola</string>
+    <string name="poi_kindergarten">Vrtić</string>
+    <string name="poi_school">Škola</string>
+    <string name="poi_training">Ustanova za vežbanje</string>
+    <string name="poi_university">Univerzitet</string>
+    <string name="poi_courthouse">Sud</string>
+    <string name="poi_prison">Zatvor</string>
+    <string name="poi_embassy">Ambasada</string>
+    <string name="poi_prosecutor">Tužilac</string>
+    <string name="poi_pension_fund">Penzioni fond</string>
+    <string name="poi_customs">Carina</string>
+    <string name="poi_country">Država</string>
+    <string name="poi_city">Grad</string>
+    <string name="poi_capital">Da</string>
+    <string name="poi_town">Varošica</string>
+    <string name="poi_village">Selo</string>
+    <string name="poi_hamlet">Zaseok</string>
+    <string name="poi_suburb">Predgrađe</string>
+    <string name="poi_locality">Lokalitet</string>
+    <string name="poi_place_farm">Farma</string>
+    <string name="poi_pharmacy">Apoteka</string>
+    <string name="poi_hospital">Bolnica</string>
+    <string name="poi_doctors">Doktori</string>
+    <string name="poi_clinic">Klinika</string>
+    <string name="poi_first_aid">Prva pomoć</string>
+    <string name="poi_dentist">Stomatolog</string>
+    <string name="poi_veterinary">Veterinar</string>
+    <string name="poi_healthcare_alternative">Alternativna medicina</string>
+    <string name="poi_blood_bank">Banka krvi</string>
+    <string name="poi_optometrist">Optometrist</string>
+    <string name="poi_physiotherapist">Fizioterapeut</string>
+    <string name="poi_psychotherapist">Psihoterapeut</string>
+    <string name="poi_healthcare_rehabilitation">Rehabilitacija</string>
+    <string name="poi_healthcare_yes">Medicinska ustanova</string>
+    <string name="poi_paediatrics">Pedijatrija</string>
+    <string name="poi_company">Kompanija</string>
+    <string name="poi_insurance">Osiguranje</string>
+    <string name="poi_estate_agent">Agent za nekretnine</string>
+    <string name="poi_lawyer">Advokat</string>
+    <string name="poi_ngo">NVO</string>
+    <string name="poi_townhall">Gradska većnica</string>
+    <string name="poi_it">IT kancelarija</string>
+    <string name="poi_advertising_agency">Marketinška agencija</string>
+    <string name="poi_educational_institution">Obrazovna ustanova</string>
+    <string name="poi_studio">Studio</string>
+    <string name="poi_political_party">Prostorije stranke</string>
+    <string name="poi_notary">Notar</string>
+    <string name="poi_stadium">Stadion</string>
+    <string name="poi_sports_centre">Sportski centar</string>
+    <string name="poi_golf_course">Golf teren</string>
+    <string name="poi_leisure_track">Sportska staza</string>
+    <string name="poi_running_track">Trkačka staza</string>
+    <string name="poi_bicycle_track">Biciklistička staza</string>
+    <string name="poi_horse_track">Konjska staza</string>
+    <string name="poi_raceway">Trkalište</string>
+    <string name="poi_9pin">Kuglanje sa 9 čunjeva</string>
+    <string name="poi_10pin">Kuglanje sa 10 čunjeva</string>
+    <string name="poi_archery">Streljaštvo</string>
+    <string name="poi_athletics">Atletika</string>
+    <string name="poi_american_football">Američki fudbal</string>
+    <string name="poi_australian_football">Australijski fudbal</string>
+    <string name="poi_baseball">Bejzbol</string>
+    <string name="poi_basketball">Košarka</string>
+    <string name="poi_beachvolleyball">Odbojka na pesku</string>
+    <string name="poi_canadian_football">Kanadski fudbal</string>
+    <string name="poi_chess">Šah</string>
+    <string name="poi_lighting_tower">Gromobran</string>
+    <string name="poi_telephone_exchange">Telefonska centrala</string>
+    <string name="poi_recycling_beverage_cartons">Kartoni od pića</string>
+    <string name="poi_recycling_white_goods">Bela tehnika</string>
+    <string name="poi_recycling_sheet_metal">Lim</string>
+    <string name="poi_recycling_foil">Folija</string>
+    <string name="poi_forest">Ljudski održavana šuma</string>
+    <string name="poi_monitoring_station">Stanica za nadgledanje</string>
+    <string name="poi_construction">Građevina</string>
+    <string name="poi_mineshaft">Šaht</string>
+    <string name="poi_salt_pond">Slana bara</string>
+    <string name="poi_gasometer">Gaosmetar</string>
+    <string name="poi_bunker_silo">Bunker silos</string>
+    <string name="poi_storage_tank">Tank za skladištenje</string>
+    <string name="poi_social_facility">Socijalna ustanova</string>
+    <string name="poi_government">Državna uprava</string>
+    <string name="poi_bailiff">Sudski izvršitelj</string>
+    <string name="poi_migration">Migraciono</string>
+    <string name="poi_tax_inspection">Poreska inspekcija</string>
+    <string name="poi_office_administrative">Administracija</string>
+    <string name="poi_isolated_dwelling">Izolovano mesto stanovanja</string>
+    <string name="poi_quarter">Četvrt</string>
+    <string name="poi_neighbourhood">Komšiluk</string>
+    <string name="poi_nursing_home">Dom za stare</string>
+    <string name="poi_sanatorium">Sanatorijum</string>
+    <string name="poi_audiologist">Audolog</string>
+    <string name="poi_midwife">Babica</string>
+    <string name="poi_bmx">BMX</string>
+    <string name="poi_canoe">Kanu</string>
+    <string name="poi_climbing">Penjanje</string>
+    <string name="poi_cricket">Kriket</string>
+    <string name="poi_croquet">Kroket</string>
+    <string name="poi_cycling">Biciklizam</string>
+    <string name="poi_diving">Ronjenje</string>
+    <string name="poi_scuba_diving">Skuba ronjenje</string>
+    <string name="poi_dog_racing">Trke pasa</string>
+    <string name="poi_field_hockey">Hokej na travi</string>
+    <string name="poi_ice_hockey">Hokej na ledu</string>
+    <string name="poi_golf">Golf</string>
+    <string name="poi_gymnastics">Gimnastika</string>
+    <string name="poi_handball">Rukomet</string>
+    <string name="poi_hockey">Hokej</string>
+    <string name="poi_horse_racing">Trke konja</string>
+    <string name="poi_ice_skating">Skijanje na ledu</string>
+    <string name="poi_korfbal">Korfbol</string>
+    <string name="poi_sport_motor">Moto trke</string>
+    <string name="poi_sport_multi">Više sportova</string>
+    <string name="poi_orienteering">Orijentiring</string>
+    <string name="poi_paragliding">Paraglajding</string>
+    <string name="poi_pelota">Pelote</string>
+    <string name="poi_racquet">Reket</string>
+    <string name="poi_roller_skating">Roleri</string>
+    <string name="poi_rowing">Veslanje</string>
+    <string name="poi_rugby_union">Ragbi unija</string>
+    <string name="poi_rugby_league">Ragbi liga</string>
+    <string name="poi_sailing">Jedrenje</string>
+    <string name="poi_skating">Klizanje</string>
+    <string name="poi_skateboard">Skejtbord</string>
+    <string name="poi_skiing">Skijanje</string>
+    <string name="poi_soccer">Fudbal</string>
+    <string name="poi_surfing">Surfovanje</string>
+    <string name="poi_swimming">Plivanje</string>
+    <string name="poi_table_tennis">Stoni tenis</string>
+    <string name="poi_tennis">Tenis</string>
+    <string name="poi_toboggan">Tobogan</string>
+    <string name="poi_volleyball">Odbojka</string>
+    <string name="poi_museum">Muzej</string>
+    <string name="poi_memorial">Memorijalni spomenik</string>
+    <string name="poi_archaeological_site">Arheološko nalazište</string>
+    <string name="poi_historic_cannon">Istorijski top</string>
+    <string name="poi_castle">Zamak</string>
+    <string name="poi_city_gate">Gradska kapija</string>
+    <string name="poi_fort">Tvrđava</string>
+    <string name="poi_fountain">Fontana</string>
+    <string name="poi_historic_ruins">Istorijske ruševine</string>
+    <string name="poi_wreck">Brodska olupina</string>
+    <string name="poi_historic_ship">Istorijski brod</string>
+    <string name="poi_historic_mine">Istorijska mina</string>
+    <string name="poi_monument">Spomenik</string>
+    <string name="poi_zoo">Zoološki vrt</string>
+    <string name="poi_aquarium">Akvarijum</string>
+    <string name="poi_theme_park">Tematski park</string>
+    <string name="poi_attraction">Turistička atrakcija</string>
+    <string name="poi_tourism_yes">Turistički objekat</string>
+    <string name="poi_attraction_animal">Životinja (atrakcija)</string>
+    <string name="poi_attraction_carousel">Vrteška</string>
+    <string name="poi_attraction_maze">Lavirint</string>
+    <string name="poi_attraction_roller_coaster">Rolerkoster</string>
+    <string name="poi_attraction_slide">Spust</string>
+    <string name="poi_attraction_summer_toboggan">Letnji tobogan</string>
+    <string name="poi_attraction_swing_carousel">Balerina</string>
+    <string name="poi_attraction_train">Voz (atrakcija)</string>
+    <string name="poi_attraction_water_slide">Vodeni spust</string>
+    <string name="poi_lodging">Smeštaj</string>
+    <string name="poi_hotel">Hotel</string>
+    <string name="poi_guest_house">Gostinska kuća</string>
+    <string name="poi_hostel">Hostel</string>
+    <string name="poi_motel">Motel</string>
+    <string name="poi_alpine_hut">Planinska brvnara</string>
+    <string name="poi_apartment">Stan</string>
+    <string name="poi_wilderness_hut">Brvnara u divljini</string>
+    <string name="poi_religion_christian">Hrišćanstvo</string>
+    <string name="poi_religion_jewish">Judaizam</string>
+    <string name="poi_religion_muslim">Islam</string>
+    <string name="poi_religion_sikh">Sikhizam</string>
+    <string name="poi_religion_buddhist">Budizam</string>
+    <string name="poi_religion_hindu">Hinduizam</string>
+    <string name="poi_religion_shinto">Šinto</string>
+    <string name="poi_religion_taoist">Taoizam</string>
+    <string name="poi_religion_voodoo">Vudu</string>
+    <string name="poi_religion_jain">Džainizam</string>
+    <string name="poi_religion_spiritualist">Spiritualizam</string>
+    <string name="poi_religion_bahai">Bahaizam</string>
+    <string name="poi_religion_scientologist">Sajentologija</string>
+    <string name="poi_religion_pagan">Paganizam</string>
+    <string name="poi_religion_zoroastrian">Zoroastrijanizam</string>
+    <string name="poi_denomination_catholic">Katolicizam</string>
+    <string name="poi_denomination_baptist">Baptizam</string>
+    <string name="poi_denomination_roman_catholic">Rimokatolicizam</string>
+    <string name="poi_denomination_orthodox">Pravoslavlje</string>
+    <string name="poi_denomination_sunni">Suni</string>
+    <string name="poi_denomination_protestant">Protestantizam</string>
+    <string name="poi_denomination_methodist">Metodizam</string>
+    <string name="poi_denomination_russian_orthodox">Rusko pravoslavlje</string>
+    <string name="poi_denomination_mormon">Mormonstvo</string>
+    <string name="poi_denomination_jehovahs_witness">Jehovini svedoci</string>
+    <string name="poi_denomination_greek_orthodox">Grčko pravoslavlje</string>
+    <string name="poi_denomination_seventh_day_adventist">Adventisti sedmog dana</string>
+    <string name="poi_denomination_church_of_england">Engleska crkva</string>
+    <string name="poi_denomination_church_of_scotland">Škotska crkva</string>
+    <string name="poi_denomination_salvation_army">Armija spasa</string>
+    <string name="poi_denomination_quaker">Kvaker</string>
+    <string name="poi_denomination_bulgarian_orthodox">Bugarsko pravoslavlje</string>
+    <string name="poi_denomination_adventist">Adventisti</string>
+    <string name="poi_denomination_serbian_orthodox">Srpsko pravoslavlje</string>
+    <string name="poi_denomination_church_of_christ">Crkva Isusa Hrista</string>
+    <string name="poi_denomination_georgian_orthodox">Jermensko pravoslavlje</string>
+    <string name="poi_denomination_romanian_orthodox">Rumunsko pravoslavlje</string>
+    <string name="poi_denomination_mahayana">Mahajana</string>
+    <string name="poi_internet_access_wired">Internet pristup: žični</string>
+    <string name="poi_internet_access_public">Internet pristup: javni</string>
+    <string name="poi_internet_access_yes">Internet pristup: da</string>
+    <string name="poi_internet_access_no">Internet pristup: ne</string>
+    <string name="poi_internet_access_fee_yes">Internet pristup: sa naknadom</string>
+    <string name="poi_internet_access_fee_no">Internet pristup: bez naknade</string>
+    <string name="poi_monastery">Manastir</string>
+    <string name="poi_information">Informacije</string>
+    <string name="poi_clock">Sat</string>
+    <string name="poi_travel_agent">Turistički agent</string>
+    <string name="poi_viewpoint">Vidikovac</string>
+    <string name="poi_picnic_site">Mesto za piknik</string>
+    <string name="poi_picnic_table">Sto za piknik</string>
+    <string name="poi_spring">Izvor</string>
+    <string name="poi_hot_spring">Vrelo</string>
+    <string name="poi_geyser">Gejzir</string>
+    <string name="poi_cemetery">Groblje</string>
+    <string name="poi_tomb">Grobnica</string>
+    <string name="poi_shelter">Sklonište</string>
+    <string name="poi_wine_cellar">Podrum vina</string>
+    <string name="poi_craft_winery">Vinarija</string>
+    <string name="poi_club_astronomy">Astronomski klub</string>
+    <string name="poi_club_computer">Kompjuterski klub</string>
+    <string name="poi_club_motorcycle">Motociklistički klub</string>
+    <string name="poi_club_sport">Sportski klub</string>
+    <string name="poi_club_game">Igrački klub</string>
+    <string name="poi_club_automobile">Auto klub</string>
+    <string name="poi_club_chess">Šahovski klub</string>
+    <string name="poi_club_fishing">Ribolovački klub</string>
+    <string name="poi_club_veterans">Klub ratnih veterana</string>
+    <string name="poi_club_linux">Klub linuksaša</string>
+    <string name="poi_camp_site">Kampiralište</string>
+    <string name="poi_resort">Odmaralište</string>
+    <string name="poi_club_fan">Klub ljubitelja</string>
+    <string name="poi_club_theatre">Pozorišni klub</string>
+    <string name="poi_club_history">Klub istoričara</string>
+    <string name="poi_club_music">Muzički klub</string>
+    <string name="poi_club_ethnic">Etnički klub</string>
+    <string name="poi_club_nature">Klub ljubitelja prirode</string>
+    <string name="poi_club_photography">Klub fotografa</string>
+    <string name="poi_club_hunting">Lovački klub</string>
+    <string name="poi_club_shooting">Streličarski klub</string>
+    <string name="poi_club_tourism">Turistički klub</string>
+    <string name="poi_club_freemasonry">Masonska loža</string>
+    <string name="poi_club_sailing">Klub jedriličara</string>
+    <string name="poi_club_scout">Izviđački klub</string>
+    <string name="poi_piste">Staza</string>
+    <string name="poi_piste_downhill">Staza nizbrdo</string>
+    <string name="poi_piste_nordic">Nordijska staza</string>
+    <string name="poi_piste_hike">Pešačka staza</string>
+    <string name="poi_piste_snow_park">Snežni park</string>
+    <string name="poi_piste_playground">Staza za igranje</string>
+    <string name="poi_piste_ice_skate">Klizalište</string>
+    <string name="poi_ski_rental">Najam skija</string>
+    <string name="poi_library">Biblioteka</string>
+    <string name="poi_cinema">Bioskop</string>
+    <string name="poi_casino">Kazino</string>
+    <string name="poi_social_centre">Socijalni centar</string>
+    <string name="poi_theatre">Pozorište</string>
+    <string name="poi_theatre_genre_circus">Cirkus</string>
+    <string name="poi_gallery">Umetnička galerija</string>
+    <string name="poi_dance_floor">Podijum za igru</string>
+    <string name="poi_nightclub">Noćni klub;Disko klub</string>
+    <string name="poi_stripclub">Striptiz</string>
+    <string name="poi_ski_resort">Ski omdaralište</string>
+    <string name="poi_beach_resort">Morsko odmaralište</string>
+    <string name="poi_dog_park">Park za pse</string>
+    <string name="poi_leisure_fishing">Mesto za pecanje</string>
+    <string name="poi_harbour">Luka</string>
+    <string name="poi_marina">Marina</string>
+    <string name="poi_miniature_golf">Mini golf</string>
+    <string name="poi_playground">Igralište</string>
+    <string name="poi_bench">Klupa</string>
+    <string name="poi_swimming_pool">Bazen za plivanje</string>
+    <string name="poi_water_park">Akva park</string>
+    <string name="poi_park">Park</string>
+    <string name="poi_recreation_ground">Teren za rekreaciju</string>
+    <string name="poi_cafe">Kafić</string>
+    <string name="poi_biergarten">Pivska bašta</string>
+    <string name="poi_restaurant">Restoran</string>
+    <string name="poi_fast_food">Brza hrana</string>
+    <string name="poi_bar">Bar</string>
+    <string name="poi_pub">Pab</string>
+    <string name="poi_drinking_water">Voda za piće</string>
+    <string name="poi_barbecue">Roštilj</string>
+    <string name="poi_craft_basket_maker">Korpar</string>
+    <string name="poi_craft_brewery">Pivnica</string>
+    <string name="poi_craft_boatbuilder">Brodogradioc</string>
+    <string name="poi_craft_carpenter">Ćilimar</string>
+    <string name="poi_craft_clockmaker">Sajdžija</string>
+    <string name="poi_craft_electrician">Električar</string>
+    <string name="poi_craft_gardener">Baštovan</string>
+    <string name="poi_craft_handicraft">Ručni radovi</string>
+    <string name="poi_craft_hvac">Grejanje, ventilacija, klima</string>
+    <string name="poi_craft_insulation">Izolacija</string>
+    <string name="poi_craft_optician">Optičar</string>
+    <string name="poi_craft_painter">Slikar</string>
+    <string name="poi_craft_parquet_layer">Parketar</string>
+    <string name="poi_craft_photographer">Fotograf</string>
+    <string name="poi_craft_plumber">Vodoinstalater</string>
+    <string name="poi_craft_sawmill">Mlinar</string>
+    <string name="poi_craft_sculptor">Skulptor</string>
+    <string name="poi_craft_shoemaker">Obućar</string>
+    <string name="poi_craft_tailor">Krojač</string>
+    <string name="poi_craft_watchmaker">Časovničar</string>
+    <string name="poi_craft_window_construction">Izrada prozora</string>
+    <string name="poi_funeral_directors">Upravnik sahrana</string>
+    <string name="poi_beauty">Salon lepote</string>
+    <string name="poi_beauty_salon_nails">Manikir</string>
+    <string name="poi_hairdresser">Frizer</string>
+    <string name="poi_massage">Salon za masažu</string>
+    <string name="poi_tattoo">Tetovaže</string>
+    <string name="poi_laundry">Pranje veša</string>
+    <string name="poi_car_rental">Iznajmljivanje kola</string>
+    <string name="poi_car_sharing">Deljenje kola</string>
+    <string name="poi_boat_sharing">Deljenje brodova</string>
+    <string name="poi_dock">Dok</string>
+    <string name="poi_shower">Tuš</string>
+    <string name="poi_sauna">Sauna</string>
+    <string name="poi_mortuary">Mrtvačnica</string>
+    <string name="poi_crematorium">Krematorijum</string>
+    <string name="poi_internet_cafe">Internet kafe</string>
+    <string name="poi_bank">Banka</string>
+    <string name="poi_payment_terminal">Terminal za plaćanje</string>
+    <string name="poi_money_lender">Novčane pozajmice</string>
+    <string name="poi_bureau_de_change">Menjačnica</string>
+    <string name="poi_accountant">Računovođa</string>
+    <string name="poi_bitcoin_yes">Bitkoin plaćanje</string>
+    <string name="poi_cave_entrance">Ulaz u pećinu</string>
+    <string name="poi_peak">Planinski vrh</string>
+    <string name="poi_saddle">Sedlo</string>
+    <string name="poi_volcano">Vulkan</string>
+    <string name="poi_crater">Krater</string>
+    <string name="poi_ridge">Greben</string>
+    <string name="poi_glacier">Glečer</string>
+    <string name="poi_sinkhole">Vrtača</string>
+    <string name="poi_waterfall">Vodopad</string>
+    <string name="poi_river">Reka</string>
+    <string name="poi_stream">Potok</string>
+    <string name="poi_rapids">Brzaci</string>
+    <string name="poi_cape">Rt</string>
+    <string name="poi_beach">Plaža</string>
+    <string name="poi_bay">Zaliv</string>
+    <string name="poi_fjord">Fjord</string>
+    <string name="poi_reef">Greben</string>
+    <string name="poi_valley">Dolina</string>
+    <string name="poi_water">Voda</string>
+    <string name="poi_wetland">Tresetište</string>
+    <string name="poi_wood">Drvo</string>
+    <string name="poi_tree">Stablo</string>
+    <string name="poi_nature_reserve">Prirodni rezervat</string>
+    <string name="poi_strait">Moreuz</string>
+    <string name="poi_island">Ostrvo</string>
+    <string name="poi_islet">Hrid</string>
+    <string name="poi_buoy_installation">Instalaciona bova</string>
+    <string name="poi_buoy_isolated_danger">Bova, izolovana opasnost</string>
+    <string name="poi_buoy_lateral">Lateralna bova</string>
+    <string name="poi_buoy_safe_water">Bova sigurnih voda</string>
+    <string name="poi_buoy_special_purpose">Bova specijalne namene</string>
+    <string name="poi_dry_dock">Suvi dok</string>
+    <string name="poi_floating_dock">Plutajući dok</string>
+    <string name="poi_harbour_basin">Lučki bazen</string>
+    <string name="poi_seamark_harbour">Luka</string>
+    <string name="poi_military_landuse">Vojna oblast</string>
+    <string name="poi_military_bunker">Vojno sklonište</string>
+    <string name="poi_military_barracks">Barake</string>
+    <string name="poi_military_danger_area">Opasna zona</string>
+    <string name="poi_military_office">Vojne kancelarije</string>
+    <string name="poi_military_naval_base">Vojna mornarička baza</string>
+    <string name="poi_military_nuclear_explosion_site">Mesto nuklearne eksplozije</string>
+    <string name="poi_wiki_place">Vikipedija</string>
+    <string name="poi_wiki_lang_en">Engleska vikipedija</string>
+    <string name="poi_wiki_lang_ar">Arapska vikipedija</string>
+    <string name="poi_wiki_lang_be">Beloruska vikipedija</string>
+    <string name="poi_wiki_lang_bg">Bugarska vikipedija</string>
+    <string name="poi_wiki_lang_ca">Katalonska vikipedija</string>
+    <string name="poi_wiki_lang_ceb">Kebuanska vikipedija</string>
+    <string name="poi_wiki_lang_cs">Češka vikipedija</string>
+    <string name="poi_wiki_lang_da">Danska vikipedija</string>
+    <string name="poi_wiki_lang_de">Nemačka vikipedija</string>
+    <string name="poi_wiki_lang_el">Grčka vikipedija</string>
+    <string name="poi_wiki_lang_et">Estonska vikipedija</string>
+    <string name="poi_wiki_lang_es">Španska vikipedija</string>
+    <string name="poi_wiki_lang_fi">Finska vikipedija</string>
+    <string name="poi_wiki_lang_fr">Francuska vikipedija</string>
+    <string name="poi_wiki_lang_gl">Galicijska vikipedija</string>
+    <string name="poi_wiki_lang_he">Jevrejska vikipedija</string>
+    <string name="poi_wiki_lang_hi">Hindi vikipedija</string>
+    <string name="poi_wiki_lang_hr">Hrvatska vikipedija</string>
+    <string name="poi_wiki_lang_ht">Haićanska vikipedija</string>
+    <string name="poi_wiki_lang_hu">Mađarska vikipedija</string>
+    <string name="poi_wiki_lang_id">Indonežanska vikipedija</string>
+    <string name="poi_wiki_lang_it">Italijanska vikipedija</string>
+    <string name="poi_wiki_lang_ja">Japanska vikipedija</string>
+    <string name="poi_wiki_lang_ko">Korejska vikipedija</string>
+    <string name="poi_wiki_lang_lt">Litvanska vikipedija</string>
+    <string name="poi_wiki_lang_lv">Latvijska vikipedija</string>
+    <string name="poi_wiki_lang_ms">Majalska vikipedija</string>
+    <string name="poi_wiki_lang_nl">Holandska vikipedija</string>
+    <string name="poi_wiki_lang_nn">Novonorveška vikipedija</string>
+    <string name="poi_wiki_lang_no">Norveška vikipedija</string>
+    <string name="poi_wiki_lang_pl">Poljska vikipedija</string>
+    <string name="poi_wiki_lang_pt">Portugalska vikipedija</string>
+    <string name="poi_wiki_lang_ro">Rumunska vikipedija</string>
+    <string name="poi_wiki_lang_ru">Ruska vikipedija</string>
+    <string name="poi_wiki_lang_sk">Slovačka vikipedija</string>
+    <string name="poi_wiki_lang_sl">Slovenačka vikipedija</string>
+    <string name="poi_wiki_lang_sr">Srpska vikipedija</string>
+    <string name="poi_wiki_lang_sv">Švedska vikipedija</string>
+    <string name="poi_wiki_lang_sw">Svahili vikipedija</string>
+    <string name="poi_wiki_lang_te">Telugu vikipedija</string>
+    <string name="poi_wiki_lang_th">Tai vikipedija</string>
+    <string name="poi_wiki_lang_tr">Turska vikipedija</string>
+    <string name="poi_wiki_lang_uk">Ukrajinska vikipedija</string>
+    <string name="poi_wiki_lang_vi">Vijetnamska vikipedija</string>
+    <string name="poi_wiki_lang_vo">Volapička vikipedija</string>
+    <string name="poi_wiki_lang_zh">Kineska vikipedija</string>
+    <string name="poi_wiki_lang_af">Afrikanska vikipedija</string>
+    <string name="poi_wiki_lang_az">Azerbejdžanska vikipedija</string>
+    <string name="poi_wiki_lang_bn">Bengalska vikipedija</string>
+    <string name="poi_wiki_lang_br">Bretonska vikipedija</string>
+    <string name="poi_wiki_lang_bs">Bošnjačka vikipedija</string>
+    <string name="poi_wiki_lang_cy">Velška vikipedija</string>
+    <string name="poi_wiki_lang_eo">Esperanto vikipedija</string>
+    <string name="poi_wiki_lang_eu">Baskijska vikipedija</string>
+    <string name="poi_wiki_lang_ga">Irska vikipedija</string>
+    <string name="poi_wiki_lang_hy">Armenijska vikipedija</string>
+    <string name="poi_wiki_lang_is">Islandska vikipedija</string>
+    <string name="poi_wiki_lang_ka">Gruzijska vikipedija</string>
+    <string name="poi_wiki_lang_ku">Kurdska vikipedija</string>
+    <string name="poi_wiki_lang_la">Latinska vikipedija</string>
+    <string name="poi_wiki_lang_lb">Luksemburgška vikipedija</string>
+    <string name="poi_wiki_lang_mk">Makedonska vikipedija</string>
+    <string name="poi_wiki_lang_mr">Marati vikipedija</string>
+    <string name="poi_wiki_lang_nv">Navaho vikipedija</string>
+    <string name="poi_wiki_lang_os">Osetska vikipedija</string>
+    <string name="poi_wiki_lang_sc">Sardinijska vikipedija</string>
+    <string name="poi_wiki_lang_sh">Srpko-hrvatska vikipedija</string>
+    <string name="poi_wiki_lang_sq">Albanska vikipedija</string>
+    <string name="poi_wiki_lang_ta">Tamilska vikipedija</string>
+    <string name="poi_wiki_lang_tl">Filipinska vikipedija</string>
+    <string name="poi_wiki_lang_uz">Uzbekistanska vikipedija</string>
+    <string name="poi_wiki_lang_ce">Čečenska vikipedija</string>
+    <string name="poi_wiki_lang_ur">Urdu vikipedija</string>
+    <string name="poi_wiki_lang_oc">Oksitanska vikipedija</string>
+    <string name="poi_wiki_lang_tt">Tatarska vikipedija</string>
+    <string name="poi_wiki_lang_ky">Kirgistanska vikipedija</string>
+    <string name="poi_wiki_lang_pnb">Pandžabi vikipedija</string>
+    <string name="poi_wiki_lang_an">Aragonska vikipedija</string>
+    <string name="poi_wiki_lang_ne">Nepalska vikipedija</string>
+    <string name="poi_wiki_lang_scn">Sicilijanska vikipedija</string>
+    <string name="poi_wiki_lang_bar">Bavarska vikipedija</string>
+    <string name="poi_wiki_lang_mn">Mongolska vikipedija</string>
+    <string name="poi_wiki_lang_nap">Napolitanska vikipedija</string>
+    <string name="poi_block">Blok</string>
+    <string name="poi_cattle_grid">Ograda za stoku</string>
+    <string name="poi_height_restrictor">Ograničavač visine</string>
+    <string name="poi_barrier_entrance">Prolaz u zidu ili ogradi</string>
+    <string name="poi_entrance_main">Glavni ulaz</string>
+    <string name="poi_entrance">Ulaz</string>
+    <string name="poi_entrance_exit">Izlaz</string>
+    <string name="poi_highway_crossing">Prelaz ulice</string>
+    <string name="poi_opening_hours">Vreme rada</string>
+    <string name="poi_description">Opis</string>
+    <string name="poi_phone">Telefon</string>
+    <string name="poi_website">Veb sajt</string>
+    <string name="poi_email">E-pošta</string>
+    <string name="poi_fax">Faks</string>
+    <string name="facebook">Fejsbuk</string>
+    <string name="twitter">Tviter</string>
+    <string name="poi_skype">Skajp</string>
+    <string name="poi_youtube">YouTube</string>
+    <string name="poi_instagram">Instagram</string>
+    <string name="vk">VKontakte</string>
+    <string name="poi_google_plus">Google+</string>
+    <string name="poi_mobile">Mobilni</string>
+    <string name="poi_service_times">Uslužno vreme</string>
+    <string name="poi_maxheight">Maksimalna visina</string>
+    <string name="poi_maxweight">Maksimalna težina</string>
+    <string name="poi_height">Visina</string>
+    <string name="poi_ele">Visina iznad nivoa mora</string>
+    <string name="poi_abandoned">Napušteno</string>
+    <string name="poi_abandoned_poi">Napušteni objekat</string>
+    <string name="poi_disused">Ne koristi se</string>
+    <string name="poi_operator">Operator</string>
+    <string name="poi_brand">Robna marka</string>
+    <string name="poi_fee_yes">Da</string>
+    <string name="poi_fee_no">Ne</string>
+    <string name="poi_drinking_water_yes">Da</string>
+    <string name="poi_drinking_water_no">Ne</string>
+    <string name="poi_supervised_yes">Nadgledano</string>
+    <string name="poi_supervised_no">Nenadgledano</string>
+    <string name="poi_seasonal_yes">Da</string>
+    <string name="poi_seasonal_no">Ne</string>
+    <string name="poi_seasonal_dry_season">Sušna sezona</string>
+    <string name="poi_seasonal_wet_season">Vlažna sezona</string>
+    <string name="poi_seasonal_spring">Proleće</string>
+    <string name="poi_seasonal_summer">Leto</string>
+    <string name="poi_seasonal_autumn">Jesen</string>
+    <string name="poi_seasonal_winter">Zima</string>
+    <string name="poi_crossing_traffic_signals">Sa stop svetlima</string>
+    <string name="poi_crossing_uncontrolled">Nekontrolisan</string>
+    <string name="poi_crossing_unmarked">Neobeležen</string>
+    <string name="poi_start_date">Početni datum</string>
+    <string name="poi_wheelchair_accessibility">Pristup invalidskim kolicima</string>
+    <string name="poi_wheelchair_yes">Da</string>
+    <string name="poi_wheelchair_no">Ne</string>
+    <string name="poi_wheelchair_limited">Ograničen</string>
+    <string name="poi_wholesale">Market prodaja</string>
+    <string name="poi_access_private">Privatni posed</string>
+    <string name="poi_access_no">Bez pristupa</string>
+    <string name="poi_access_destination">Odredišni pristup</string>
+    <string name="poi_access_customers">Pristup za korisnike</string>
+    <string name="poi_access_delivery">Pristup za dostavu</string>
+    <string name="poi_access_agricultural">Pristup za poljoprivredu</string>
+    <string name="poi_content_water">Sadržaj: voda</string>
+    <string name="poi_content_oil">Sadržaj: ulje</string>
+    <string name="poi_content_fuel">Sadržaj: gorivo</string>
+    <string name="poi_content_wine">Sadržaj: vino</string>
+    <string name="poi_content_sewage">Sadržaj: kanalizacija</string>
+    <string name="poi_content_gas">Sadržaj: gas</string>
+    <string name="poi_content_biomass">Sadržaj: biomasa</string>
+    <string name="poi_content_wastewater">Sadržaj: otpadna voda</string>
+    <string name="poi_content_beer">Sadržaj: pivo</string>
+    <string name="poi_content_salt">Sadržaj: so</string>
+    <string name="poi_nudism_yes">Dozvoljen</string>
+    <string name="poi_nudism_no">Zabranjen</string>
+    <string name="poi_nudism_obligatory">Obavezan</string>
+    <string name="poi_nudism_permissive">Ograničen</string>
+    <string name="poi_population">Naseljenost</string>
+    <string name="poi_parking_underground">Podzemni</string>
+    <string name="poi_parking_multi_storey">Na više nivoa</string>
+    <string name="poi_bicycle_parking_informal">Neformalan</string>
+    <string name="poi_leaf_type_broadleaved">Širokolisno</string>
+    <string name="poi_trees_olive">Maslina</string>
+    <string name="poi_trees_apple">Jabuka</string>
+    <string name="poi_trees_oil">Palmino ulje</string>
+    <string name="poi_trees_orange">Narandže</string>
+    <string name="poi_trees_almond">Badem</string>
+    <string name="poi_trees_banana">Banana</string>
+    <string name="poi_trees_hazel">Lešnik</string>
+    <string name="poi_trees_coconut">Kokos</string>
+    <string name="poi_trees_persimmon">Persimon</string>
+    <string name="poi_trees_cherry">Trešnja</string>
+    <string name="poi_trees_walnut">Orah</string>
+    <string name="poi_trees_plum">Šljiva</string>
+    <string name="poi_trees_peach">Breskva</string>
+    <string name="poi_trees_tea">Čaj</string>
+    <string name="poi_trees_coca">Koka</string>
+    <string name="poi_trees_kiwi">Kivi</string>
+    <string name="poi_trees_meadow_orchard">Voćnjak</string>
+    <string name="poi_trees_nectorine">Nektarina</string>
+    <string name="poi_trees_mango">Mango</string>
+    <string name="poi_trees_rubber">Kaučuk</string>
+    <string name="poi_trees_date">Datula</string>
+    <string name="poi_trees_coffea">Drvo kafe</string>
+    <string name="poi_trees_pomegranate">Nar</string>
+    <string name="poi_urban">Urbano</string>
+    <string name="poi_rural">Ruralno</string>
+    <string name="poi_enforcement_traffic_signals">Na snazi: semafor</string>
+    <string name="poi_enforcement_maxspeed">Na snazi: maks. brzina</string>
+    <string name="poi_enforcement_maxheight">Na snazi: maks. visina</string>
+    <string name="poi_enforcement_toll">Na snazi: putarina</string>
+    <string name="poi_animal_shelter">Sklonište za životinje</string>
+    <string name="poi_animal_shelter_dog">Psi</string>
+    <string name="poi_animal_shelter_cat">Mačke</string>
+    <string name="poi_animal_shelter_dog_cat">Psi, mačke</string>
+    <string name="poi_animal_shelter_bird">Ptice</string>
+    <string name="poi_animal_shelter_wildlife">Divlje životinje</string>
+    <string name="poi_animal_shelter_horse">Konj</string>
+    <string name="poi_animal_shelter_mammal">Sisari</string>
+    <string name="poi_animal_shelter_fish">Ribe</string>
+    <string name="poi_seats">Sedišta</string>
+    <string name="poi_backrest_yes">Naslon: da</string>
+    <string name="poi_backrest_no">Naslon: ne</string>
+    <string name="poi_building">Zgrada</string>
+    <string name="poi_generator_source_coal">Izvor energije: ugalj</string>
+    <string name="poi_generator_source_gas">Izvor energije: gas</string>
+    <string name="poi_generator_source_nuclear">Izvor energije: nuklearni</string>
+    <string name="poi_generator_source_solar">Izvor energije: solarni</string>
+    <string name="poi_generator_source_hydro">Izvor energije: hidro</string>
+    <string name="poi_generator_source_wind">Izvor energije: vetar</string>
+    <string name="poi_generator_source_geothermal">Izvor energije: geotermalni</string>
+    <string name="poi_generator_source_oil">Izvor energije: ulje</string>
+    <string name="poi_generator_source_diesel">Izvor energije: dizel</string>
+    <string name="poi_int_name">Međunarodno ime</string>
+    <string name="poi_nat_name">Nacionalno ime</string>
+    <string name="poi_reg_name">Regionalni naziv</string>
+    <string name="poi_loc_name">Lokalni naziv</string>
+    <string name="poi_old_name">Stari naziv</string>
+    <string name="poi_alt_name">Alternativni naziv</string>
+    <string name="poi_pump_manual">Ručno</string>
+    <string name="poi_pump_powered">Na struju</string>
+    <string name="poi_pump_no">Bez pumpe</string>
+    <string name="poi_pump_yes">Da</string>
+    <string name="poi_water_characteristic_mineral">Mineralna</string>
+    <string name="poi_water_characteristic_mud">Blato</string>
+    <string name="poi_water_characteristic_sulfuric">Sumporna</string>
+    <string name="poi_information_map">Karta</string>
+    <string name="poi_information_office">Kancelarija</string>
+    <string name="poi_information_terminal">Terminal</string>
+    <string name="poi_information_hikingmap">Karta planinarenja</string>
+    <string name="poi_information_nature">Priroda</string>
+    <string name="poi_information_history">Istorija</string>
+    <string name="poi_information_sign">Znak</string>
+    <string name="poi_information_audioguide">Audio vodič</string>
+    <string name="poi_information_bicyclemap">Biciklistička karta</string>
+    <string name="poi_information_tactile_model">Taktilni model</string>
+    <string name="poi_information_tactile_map">Taktilna karta</string>
+    <string name="poi_board_type_plants">Biljke</string>
+    <string name="poi_board_type_geology">Geologija</string>
+    <string name="poi_board_type_public_transport">Javni prevoz</string>
+    <string name="poi_board_type_technology">Tehnologija</string>
+    <string name="poi_board_type_astronomy">Astronomija</string>
+    <string name="poi_fireplace_yes">Da</string>
+    <string name="poi_covered_yes">Da</string>
+    <string name="poi_covered_no">Ne</string>
+    <string name="poi_smoking_no">Zabranjeno</string>
+    <string name="poi_smoking_outside">Samo napolju</string>
+    <string name="poi_smoking_yes">Dozvoljeno</string>
+    <string name="poi_smoking_separated">U posebnoj prostoriji</string>
+    <string name="poi_smoking_isolated">U izolovanoj sobi</string>
+    <string name="poi_tactile_paving_yes">Da</string>
+    <string name="poi_traffic_signals_sound_yes">Da</string>
+    <string name="poi_traffic_signals_sound_no">Zvuk : ne</string>
+    <string name="poi_traffic_signals_sound_walk">Samo kada je dozvoljeno hodanje</string>
+    <string name="poi_rescue_station">Stanica za spašavanje</string>
+    <string name="poi_mini_roundabout">Mini kružni tok</string>
+    <string name="poi_railway_crossing">Prelaz pruge</string>
+    <string name="poi_bird_hide">Mesto za posmatranje ptica</string>
+    <string name="poi_horse_riding">Jahanje konja</string>
+    <string name="poi_garden">Bašta</string>
+    <string name="poi_grass">Trava</string>
+    <string name="poi_sand">Pesak</string>
+    <string name="poi_bicycle_parking_stands">Štandovi</string>
+    <string name="poi_bicycle_parking_building">Specijalna zgrada</string>
+    <string name="poi_bicycle_parking_shed">Šupa</string>
+    <string name="poi_leaf_type_mixed">Mešano</string>
+    <string name="poi_species">Vrste</string>
+    <string name="poi_genus">Rod</string>
+    <string name="poi_taxon">Takson</string>
+    <string name="poi_intermittent">Povremeno</string>
+    <string name="poi_information_board">Tabla</string>
+    <string name="poi_information_trail_blaze">Markacija na drvetu</string>
+    <string name="poi_information_route_marker">Marker puta</string>
+    <string name="poi_board_type_notice">Oglasna tabla</string>
+    <string name="poi_fireplace_no">Nema ognjišta</string>
+    <string name="poi_smoking_dedicated">Za pušače</string>
+    <string name="poi_toll_yes">Putarina</string>
+    <string name="poi_toll_no">Bez putarine</string>
+    <string name="poi_dead_wood">Mrtvo drvo</string>
+    <string name="poi_level">Nivo</string>
+    <string name="poi_piste_difficulty_easy">Laka</string>
+    <string name="poi_piste_difficulty_intermediate">Srednja</string>
+    <string name="poi_piste_difficulty_advanced">Napredna</string>
+    <string name="poi_piste_difficulty_novice">Početnička</string>
+    <string name="poi_piste_difficulty_expert">Ekspertska</string>
+    <string name="poi_piste_difficulty_freeride">Slobodna vožnja</string>
+    <string name="poi_piste_grooming_classic">Klasično</string>
+    <string name="poi_piste_grooming_classic_skating">Klasično+klizanje</string>
+    <string name="poi_piste_grooming_scooter">Skuterom</string>
+    <string name="poi_piste_grooming_skating">Klizanje</string>
+    <string name="poi_piste_grooming_no">Ne</string>
+    <string name="poi_piste_grooming_mogul">Mogul</string>
+    <string name="poi_garden_type_residential">Tip bašte: stambena</string>
+    <string name="poi_garden_type_community">Tip bašte: javna</string>
+    <string name="poi_garden_type_private">Tip bašte: privatna</string>
+    <string name="poi_garden_type_botanical">Tip bašte: botanička</string>
+    <string name="poi_garden_style_kitchen">Tip bašte: kuhinjska</string>
+    <string name="poi_garden_style_rosarium">Tip bašte: rozarijum</string>
+    <string name="poi_garden_style_french">Tip bašte: francuski</string>
+    <string name="poi_garden_style_english">Tip bašte: engleski</string>
+    <string name="poi_garden_style_japanese">Tip bašte: japanski</string>
+    <string name="poi_capacity">Kapacitet</string>
+    <string name="poi_capacity_disabled_yes">Da</string>
+    <string name="poi_capacity_disabled_no">Nema posebnih mesta za osobe sa invaliditetom</string>
+    <string name="poi_capacity_disabled">Posebna mesta za osobe sa invaliditetom</string>
+    <string name="poi_capacity_women_yes">Posebna mesta za žene</string>
+    <string name="poi_capacity_women_no">Nema posebnih mesta za žene</string>
+    <string name="poi_capacity_women">Posebna mesta za žene</string>
+    <string name="poi_capacity_pupils">Posebna mesta za učenike</string>
+    <string name="poi_capacity_teachers">Posebna mesta za nastavnike</string>
+    <string name="poi_capacity_parent_yes">Posebna mesta za roditelje</string>
+    <string name="poi_capacity_parent_no">Bez posebnih mesta za roditelje</string>
+    <string name="poi_capacity_parent">Posebna mesta za roditelje</string>
+    <string name="poi_aerialway_capacity">Kapacitet na sat</string>
+    <string name="poi_aerialway_duration">Prosečno vreme putovanja, u minutima</string>
+    <string name="poi_aerialway_bubble_yes">Balon</string>
+    <string name="poi_aerialway_bubble_no">Bez balona</string>
+    <string name="poi_aerialway_heating_yes">Da</string>
+    <string name="poi_aerialway_heating_no">Bez grejanja</string>
+    <string name="poi_aerialway_bicycle_yes">Dozvoljene</string>
+    <string name="poi_aerialway_bicycle_no">Bicikle: nedozvoljene</string>
+    <string name="poi_aerialway_bicycle_summer">Dozvoljene samo leti</string>
+    <string name="poi_aerialway_access_entry">Samo ulaz</string>
+    <string name="poi_aerialway_access_exit">Samo izlaz</string>
+    <string name="poi_aerialway_access_both">Ulaz i izlaz</string>
+    <string name="poi_aerialway_summer_access_entry">Letnji pristup: samo ulaz</string>
+    <string name="poi_aerialway_summer_access_exit">Letnji pristup: samo izlaz</string>
+    <string name="poi_aerialway_summer_access_both">Letnji pristup: ulaz i izlaz</string>
+    <string name="poi_rooms">Sobe</string>
+    <string name="poi_love_hotel">Ljubavni hotel</string>
+    <string name="poi_payment_coins_yes">Kovanice</string>
+    <string name="poi_payment_coins_no">Kovanice se ne prihvataju</string>
+    <string name="poi_payment_coins_0_5">$0.5 kovanice</string>
+    <string name="poi_payment_coins_50c12">50c, 1€ i 2€ kovanice</string>
+    <string name="poi_payment_telephone_cards_yes">Telefonske kartice</string>
+    <string name="poi_payment_telephone_cards_no">Telefonske kartice se ne prihvataju</string>
+    <string name="poi_payment_credit_cards_yes">Kreditne kartice</string>
+    <string name="poi_payment_credit_cards_no">Kreditne kartice se ne prihvataju</string>
+    <string name="poi_payment_notes_yes">Novčanice</string>
+    <string name="poi_payment_notes_no">Novčanice se ne prihvataju</string>
+    <string name="poi_payment_electronic_purses_yes">Elektronske tašne</string>
+    <string name="poi_payment_electronic_purses_no">Elektronske tašne se ne prihvataju</string>
+    <string name="poi_payment_cash_yes">Keš</string>
+    <string name="poi_payment_cash_no">Keš se ne prihvata</string>
+    <string name="poi_payment_debit_cards_yes">Debitne kartice</string>
+    <string name="poi_payment_debit_cards_no">Debitne kartice se ne prihvataju</string>
+    <string name="poi_payment_bitcoin_yes">Bitkoin</string>
+    <string name="poi_payment_bitcoin_no">Bitkoin se ne prihvata</string>
+    <string name="poi_payment_visa_yes">Visa kartice</string>
+    <string name="poi_payment_visa_no">Visa kartice se ne prihvataju</string>
+    <string name="poi_payment_mastercard_yes">MasterCard kartice</string>
+    <string name="poi_payment_mastercard_no">MasterCard kartice se ne prihvataju</string>
+    <string name="poi_payment_maestro_yes">Maestro kartice</string>
+    <string name="poi_payment_maestro_no">Maestro kartice se ne prihvataju</string>
+    <string name="poi_aerialway_occupancy">Kapacitet kabine/klupe/kola</string>
+    <string name="poi_stars_1">1 (turistički)</string>
+    <string name="poi_stars_1s">1S (turistički superior)</string>
+    <string name="poi_stars_2">2 (standard)</string>
+    <string name="poi_stars_2s">2S (standard superior)</string>
+    <string name="poi_stars_3">3 (komfort)</string>
+    <string name="poi_stars_3s">3S (komfort superior)</string>
+    <string name="poi_stars_4">4 (prva klasa)</string>
+    <string name="poi_stars_4s">4S (prva klasa superior)</string>
+    <string name="poi_stars_5">5 (luksuz)</string>
+    <string name="poi_stars_5s">5S (luksuz superior)</string>
+    <string name="poi_payment_account_cards_yes">Kartice naloga</string>
+    <string name="poi_payment_account_cards_no">Kartice naloga se ne prihvataju</string>
+    <string name="poi_payment_american_express_yes">American Express (AMEX) kartice</string>
+    <string name="poi_payment_american_express_no">American Express (AMEX) kartice se ne prihvataju</string>
+    <string name="poi_payment_diners_club_yes">Diners Club kartice</string>
+    <string name="poi_payment_diners_club_no">Diners Club kartice se ne prihvataju</string>
+    <string name="poi_payment_dkv_yes">DKV kartice</string>
+    <string name="poi_payment_dkv_no">DKV kartice se ne prihvataju</string>
+    <string name="poi_payment_uta_yes">UTA kartice</string>
+    <string name="poi_payment_uta_no">UTA kartice se ne prihvataju</string>
+    <string name="poi_payment_efectivo_yes">Efectivo kartice</string>
+    <string name="poi_payment_efectivo_no">Efectivo kartice se ne prihvataju</string>
+    <string name="poi_payment_girocard_no">Girocard kartice se ne prihvataju</string>
+    <string name="poi_payment_discover_card_yes">Discover Card kartice</string>
+    <string name="poi_payment_discover_card_no">Discover Card kartice se ne prihvataju</string>
+    <string name="poi_payment_visa_electron_yes">Visa Electron kartice</string>
+    <string name="poi_payment_visa_electron_no">Visa Electron kartice se ne prihvataju</string>
+    <string name="poi_payment_litecoin_yes">Lajtkoin</string>
+    <string name="poi_payment_litecoin_no">Lajtkoin se ne prihvata</string>
+    <string name="poi_payment_cheque_yes">Čekovi</string>
+    <string name="poi_payment_cheque_no">Čekovi se ne prihvataju</string>
+    <string name="poi_payment_pikepass_yes">PIKEPASS</string>
+    <string name="poi_payment_icsf_no">IC Stored Fare kartice se ne prihvataju</string>
+    <string name="poi_payment_prepaid_ticket_yes">Pripejd tiketi</string>
+    <string name="poi_payment_jcb_yes">JCB kartice</string>
+    <string name="poi_payment_jcb_no">JCB kartice se ne prihvataju</string>
+    <string name="poi_payment_laser_yes">Laser kartice</string>
+    <string name="poi_payment_laser_no">Laser kartice se ne prihvataju</string>
+    <string name="poi_payment_ep_quick_yes">Quick kartice</string>
+    <string name="poi_payment_ep_quick_no">Quick kartice se ne prihvataju</string>
+    <string name="poi_payment_eurowag_yes">Eurowag kartice</string>
+    <string name="poi_payment_eurowag_no">Eurowag kartice se ne prihvataju</string>
+    <string name="poi_payment_e_zpass_yes">E‑ZPass kartice</string>
+    <string name="poi_payment_e_zpass_no">E‑ZPass kartice se ne prihvataju</string>
+    <string name="poi_payment_euroshell_yes">Euroshell kartice</string>
+    <string name="poi_payment_euroshell_no">Euroshell kartice za gorivo se ne prihvataju</string>
+    <string name="poi_payment_kitcard_yes">KITCard kartice</string>
+    <string name="poi_payment_kitcard_no">KITCard kartice se ne prihvataju</string>
+    <string name="poi_payment_westfalen_card_yes">Westfalen kartice</string>
+    <string name="poi_payment_westfalen_card_no">Westfalen kartice se ne prihvataju</string>
+    <string name="poi_payment_v_pay_yes">V PAY kartice</string>
+    <string name="poi_payment_v_pay_no">V PAY kartice se ne prihvataju</string>
+    <string name="poi_payment_dogecoin_yes">Dodžkoin</string>
+    <string name="poi_payment_dogecoin_no">Dogecoin se ne prihvata</string>
+    <string name="poi_payment_cibus_yes">Cibus kartice</string>
+    <string name="poi_payment_cibus_no">Cibus kartice se ne prihvataju</string>
+    <string name="poi_payment_ep_cash_yes">Keš kartice (Geldkarte)</string>
+    <string name="poi_payment_ep_cash_no">Keš kartice (Geldkarte) se ne prihvataju</string>
+    <string name="poi_payment_ep_proton_yes">Proton</string>
+    <string name="poi_payment_ep_proton_no">Proton kartice se ne prihvataju</string>
+    <string name="poi_payment_ep_avant_yes">AvantCard kartice</string>
+    <string name="poi_payment_ep_avant_no">AvantCard kartice se ne prihvataju</string>
+    <string name="poi_payment_ep_mep_yes">MEP kartice</string>
+    <string name="poi_payment_ep_mep_no">MEP kartice se ne prihvataju</string>
+    <string name="poi_payment_ep_minipay_yes">Minipay kartice</string>
+    <string name="poi_payment_ep_minipay_no">Minipay kartice se ne prihvataju</string>
+    <string name="poi_payment_ep_minicash_yes">MiniCash</string>
+    <string name="poi_payment_ep_minicash_no">MiniCash se ne prihvata</string>
+    <string name="poi_payment_ep_moneo_yes">Moneo</string>
+    <string name="poi_payment_ep_moneo_no">Moneo se ne prihvata</string>
+    <string name="poi_payment_ep_monedero4b_yes">Monedero 4B</string>
+    <string name="poi_payment_ep_monedero4b_no">Monedero 4B se ne prihvata</string>
+    <string name="poi_payment_ep_monedero_yes">Monedero</string>
+    <string name="poi_payment_ep_monedero_no">Monedero se ne prihvata</string>
+    <string name="poi_payment_bankaxess_yes">BankAxess</string>
+    <string name="poi_payment_bankaxess_no">BankAxess se ne prihvata</string>
+    <string name="poi_payment_coinkite_yes">Coinkite</string>
+    <string name="poi_payment_coinkite_no">Coinkite se ne prihvata</string>
+    <string name="poi_payment_roadrunner_yes">Roadrunner kartice</string>
+    <string name="poi_payment_roadrunner_no">Roadrunner kartice se ne prihvataju</string>
+    <string name="poi_payment_svg_yes">SVG</string>
+    <string name="poi_payment_svg_no">SVG se ne prihvata</string>
+    <string name="poi_payment_sms_yes">Plaćanje SMS-om</string>
+    <string name="poi_payment_sms_no">Plaćanje SMS-om se ne prihvata</string>
+    <string name="poi_payment_ov_chipkaart_yes">OV-Chipkaart</string>
+    <string name="poi_payment_ov_chipkaart_no">OV-Chipkaart se ne prihvata</string>
+    <string name="poi_payment_oyster_yes">Oyster kartice</string>
+    <string name="poi_payment_oyster_no">Oyster kartice se ne prihvataju</string>
+    <string name="poi_payment_sube_yes">SUBE kartice</string>
+    <string name="poi_payment_sube_no">SUBE kartice se ne prihvataju</string>
+    <string name="poi_payment_via_verde_yes">Via Verde</string>
+    <string name="poi_payment_via_verde_no">Via Verde se ne prihvata</string>
+    <string name="poi_payment_meal_voucher_yes">Vaučeri za jelo</string>
+    <string name="poi_payment_meal_voucher_no">Vaučeri za jelo se ne prihvataju</string>
+    <string name="poi_payment_paypal_yes">Pejpal</string>
+    <string name="poi_payment_paypal_no">Pejpal se ne prihvata</string>
+    <string name="poi_payment_u_key_yes">U-Key</string>
+    <string name="poi_payment_u_key_no">U-Key se ne prihvata</string>
+    <string name="poi_payment_token_yes">Žetoni</string>
+    <string name="poi_payment_token_no">Žetoni se ne prihvataju</string>
+    <string name="poi_payment_gift_card_yes">Poklon vaučeri</string>
+    <string name="poi_payment_gift_card_no">Poklon vaučeri se ne prihvataju</string>
+    <string name="poi_payment_golden_crown_yes">Golden Crown kartice</string>
+    <string name="poi_payment_golden_crown_no">Golden Crown kartice se ne prihvataju</string>
+    <string name="poi_payment_pro100_yes">PRO100 kartice</string>
+    <string name="poi_payment_pro100_no">PRO100 kartice se ne prihvataju</string>
+    <string name="poi_payment_union_card_yes">Union Card kartice</string>
+    <string name="poi_payment_union_card_no">Union Card kartice se ne prihvataju</string>
+    <string name="poi_payment_mtsmoney_yes">MTS-Money</string>
+    <string name="poi_payment_mtsmoney_no">MTS-Money se ne prihvata</string>
+    <string name="poi_payment_yandexmoney_yes">Yandex.Money</string>
+    <string name="poi_payment_yandexmoney_no">Yandex.Money se ne prihvata</string>
+    <string name="poi_description_payment">Opis plaćanja</string>
+    <string name="poi_diet_vegetarian_filter_yes">Vegeterijanska</string>
+    <string name="poi_diet_vegetarian_few">Vegeterijanska (pomalo)</string>
+    <string name="poi_diet_vegetarian_only">Isključivo vegeterijanska</string>
+    <string name="poi_diet_vegetarian_yes">Vegeterijanska</string>
+    <string name="poi_diet_vegetarian_no">Vegeterijanska ishrana: ne</string>
+    <string name="poi_diet_vegan_filter_yes">Veganska</string>
+    <string name="poi_diet_vegan_only">Isključivo veganska</string>
+    <string name="poi_diet_vegan_yes">Veganska</string>
+    <string name="poi_diet_vegan_no">Veganska ishrana: ne</string>
+    <string name="poi_diet_gluten_free_filter_yes">Bezglutenska</string>
+    <string name="poi_diet_gluten_free_only">Isključivo bezglutenska</string>
+    <string name="poi_diet_gluten_free_yes">Bezglutenska</string>
+    <string name="poi_diet_gluten_free_no">Bezglutenska ishrana: ne</string>
+    <string name="poi_diet_kosher_filter_yes">Košer</string>
+    <string name="poi_diet_kosher_only">Isključivo košer</string>
+    <string name="poi_diet_kosher_yes">Košer</string>
+    <string name="poi_diaper_table_count">Oslonac za prepovijanje pelena</string>
+    <string name="poi_diaper_yes">Sto za prepovijanje pelena</string>
+    <string name="poi_diaper_no">Nema stola za prepovijanje pelena</string>
+    <string name="poi_diaper_room">Soba za prepovijanje pelena</string>
+    <string name="poi_maxstay">Ograničeno vreme parkiranja</string>
+    <string name="poi_vending_parking_tickets">Karte za parkiranje</string>
+    <string name="poi_vending_cigarettes">Cigarete</string>
+    <string name="poi_vending_excrement_bags">Kese za izmet ljubimaca</string>
+    <string name="poi_vending_public_transport_tickets">Karte za javni prevoz</string>
+    <string name="poi_vending_drinks">Piće</string>
+    <string name="poi_vending_sweets">Slatkiši</string>
+    <string name="poi_vending_condoms">Kondomi</string>
+    <string name="poi_vending_stamps">Markice</string>
+    <string name="poi_vending_food">Hrana</string>
+    <string name="poi_vending_drinks_food">Piće i hrana</string>
+    <string name="poi_vending_fuel">Gorivo</string>
+    <string name="poi_vending_milk">Mleko</string>
+    <string name="poi_vending_elongated_coin">Izduženi novčići</string>
+    <string name="poi_vending_bread">Hleb</string>
+    <string name="poi_vending_chewing_gums">Žvakaće gume</string>
+    <string name="poi_vending_parking_tickets_public_transport_tickets">Karte za parkiranje; karte za javni prevoz</string>
+    <string name="poi_vending_coffee">Kafe aparat</string>
+    <string name="poi_vending_toll">Automat za putarinu</string>
+    <string name="poi_vending_tickets">Automat za karte</string>
+    <string name="poi_vending_water">Automat za vodu</string>
+    <string name="poi_vending_telephone_vouchers">Telefonski vaučeri</string>
+    <string name="poi_vending_animal_food">Hrana za životinje</string>
+    <string name="poi_vending_public_transport_plans">Mapa javnog prevoza</string>
+    <string name="poi_vending_drinks_sweets">Piće i slatkiši</string>
+    <string name="poi_vending_vouchers">Vaučeri</string>
+    <string name="poi_vending_dvd">DVD-ovi</string>
+    <string name="poi_vending_candles">Sveće</string>
+    <string name="poi_vending_toys">Igračke</string>
+    <string name="poi_vending_ice_cream">Sladoled</string>
+    <string name="poi_vending_sim_cards">SIM kartice</string>
+    <string name="poi_branch">Grana</string>
+    <string name="poi_memorial_war">Ratna spomenica</string>
+    <string name="poi_memorial_plaque">Spomen-ploča</string>
+    <string name="poi_memorial_statue">Statua</string>
+    <string name="poi_memorial_stone">Kamen</string>
+    <string name="poi_memorial_stele">Stela</string>
+    <string name="poi_memorial_bust">Bista</string>
+    <string name="poi_memorial_koshinto">Košinto</string>
+    <string name="poi_memorial_cross">Krstolik</string>
+    <string name="poi_memorial_vehicle">Vozilo</string>
+    <string name="poi_memorial_stolperstein">Kamen spoticanja</string>
+    <string name="poi_memorial_obelisk">Obelisk</string>
+    <string name="poi_memorial_column">Stub</string>
+    <string name="poi_memorial_stupa">Stupa</string>
+    <string name="poi_memorial_prasat">Prasat</string>
+    <string name="poi_memorial_fassade_decoration">Fasadni ukras</string>
+    <string name="poi_inscription">Natpis</string>
+    <string name="poi_historic_quarry">Istorijski kamenolom</string>
+    <string name="poi_resource_aggregate">Mešavina</string>
+    <string name="poi_resource_antimony">Antimon</string>
+    <string name="poi_resource_asbestos">Azbest</string>
+    <string name="poi_resource_barite">Barit</string>
+    <string name="poi_resource_basalt">Bazalt</string>
+    <string name="poi_resource_bauxite">Boksit</string>
+    <string name="poi_resource_beryl">Beril</string>
+    <string name="poi_resource_bismuth">Bizmut</string>
+    <string name="poi_resource_chromite">Hromit</string>
+    <string name="poi_resource_clay">Glina</string>
+    <string name="poi_resource_coal">Ugalj</string>
+    <string name="poi_resource_copper">Bakar</string>
+    <string name="poi_resource_diamond">Dijamant</string>
+    <string name="poi_resource_dolomite">Dolomit</string>
+    <string name="poi_resource_gas">Gas</string>
+    <string name="poi_resource_gold">Zlato</string>
+    <string name="poi_resource_graphite">Grafit</string>
+    <string name="poi_resource_gravel">Šljunak</string>
+    <string name="poi_resource_gypsum">Gips</string>
+    <string name="poi_resource_iron_ore">Ruda gvožđa</string>
+    <string name="poi_resource_lead">Olovo</string>
+    <string name="poi_resource_lignite">Lignit</string>
+    <string name="poi_resource_limestone">Krečnjak</string>
+    <string name="poi_resource_marble">Mermer</string>
+    <string name="poi_resource_mercury">Živa</string>
+    <string name="poi_resource_mica">Tinjci</string>
+    <string name="poi_resource_mineral_oil">Mineralno ulje</string>
+    <string name="poi_resource_nickel">Nikl</string>
+    <string name="poi_resource_oil">Ulje</string>
+    <string name="poi_resource_opal">Opal</string>
+    <string name="poi_resource_peat">Treset</string>
+    <string name="poi_resource_platinum">Platina</string>
+    <string name="poi_resource_radium">Radijum</string>
+    <string name="poi_resource_ruby">Rubin</string>
+    <string name="poi_resource_rutile">Rutil</string>
+    <string name="poi_resource_salt">So</string>
+    <string name="poi_resource_sand">Pesak</string>
+    <string name="poi_resource_sandstone">Peščar</string>
+    <string name="poi_resource_silica">Silicijum</string>
+    <string name="poi_resource_silver">Srebro</string>
+    <string name="poi_resource_slate_iron_ore_copper">Argilošist; ruda gvožđa; bakar</string>
+    <string name="poi_resource_slate">Argilošist</string>
+    <string name="poi_resource_stone">Kamen</string>
+    <string name="poi_resource_tin">Kalaj</string>
+    <string name="poi_resource_tuff">Tuf</string>
+    <string name="poi_resource_uranium">Uranijum</string>
+    <string name="poi_resource_vanadium">Vanadijum</string>
+    <string name="poi_resource_water">Voda</string>
+    <string name="poi_resource_zinc">Cink</string>
+    <string name="poi_resource_zircon">Cirkon</string>
+    <string name="poi_wetland_wet_meadow">Vlažna livada</string>
+    <string name="poi_wetland_bog">Tresava</string>
+    <string name="poi_wetland_swamp">Močvara</string>
+    <string name="poi_wetland_mangrove">Mangrove</string>
+    <string name="poi_wetland_mud">Blato</string>
+    <string name="poi_beach_sand">Pesak</string>
+    <string name="poi_denomination_old_believers">Staroverci</string>
+    <string name="poi_denomination_spiritist">Spiritisti</string>
+    <string name="poi_denomination_armenian_apostolic">Jermenski apostoli</string>
+    <string name="poi_denomination_dutch_reformed">Holandski reformisti</string>
+    <string name="poi_denomination_apostolic">Apostolska crkva</string>
+    <string name="poi_denomination_reform">Reformisti</string>
+    <string name="poi_fuel_avia_type">Vrsta goriva (avia)</string>
+    <string name="poi_tactile_paving">Vođice za slabovide</string>
+    <string name="poi_brushless">Bez četkica</string>
+    <string name="poi_observatory_designation">Odredište</string>
+    <string name="poi_pharmacy_dispensing">Apoteka (na recept)</string>
+    <string name="poi_denomination">Veroispovest</string>
+    <string name="poi_backcountry">Zabit</string>
+    <string name="poi_beauty_salon_service">Usluga</string>
+    <string name="poi_diet">Hrana</string>
+    <string name="poi_health_specialty">Zdravstvene usluge</string>
+    <string name="poi_power_supply">Izvor napajanja</string>
+    <string name="poi_motorcycle_services">Usluge</string>
+    <string name="poi_operational_status">Radno stanje</string>
+    <string name="poi_water_supply_type">Tip dostave vode</string>
+    <string name="poi_water_place_access">Mesto pristupa vodi</string>
+    <string name="poi_checkpoint_type">Tip kontrolnog mesta</string>
+    <string name="poi_shop">Prodavnica</string>
+    <string name="poi_shop_food">Prodavnica potrebština i samousluga</string>
+    <string name="poi_emergency">Hitna pomoć</string>
+    <string name="poi_emergency_infrastructure">Služba hitne pomoći</string>
+    <string name="poi_node_networks">Pešački/biciklistički mrežni čvorovi</string>
+    <string name="poi_traffic_enforcement">Ograničenje saobraćaja</string>
+    <string name="poi_man_made">Napravljeno ručno</string>
+    <string name="poi_transport_construction">Saobraćajna konstrukcija</string>
+    <string name="poi_water_supply">Dostava vode</string>
+    <string name="poi_landuse">Korišćenje zemljišta</string>
+    <string name="poi_accomodation">Smeštaj</string>
+    <string name="poi_entertainment">Zabavno</string>
+    <string name="poi_service">Usluga</string>
+    <string name="poi_craft">Radionica</string>
+    <string name="poi_convenience">Prodavnica potrebština</string>
+    <string name="poi_deli">Prodavnica delikatesa</string>
+    <string name="poi_greengrocer">Prodavnica zelenila</string>
+    <string name="poi_ice_cream">Prostor sa sladoledom</string>
+    <string name="poi_pastry">Prodavnica peciva</string>
+    <string name="poi_dairy">Mlekara</string>
+    <string name="poi_vending_machine">Automat prodaje</string>
+    <string name="poi_bag">Prodavnica torbi</string>
+    <string name="poi_bathroom_furnishing">Nameštaj za kupatilo</string>
+    <string name="poi_bed">Prodavnica kreveta</string>
+    <string name="poi_charity">Prodavnica priloga</string>
+    <string name="poi_dive">Ronilačka oprema</string>
+    <string name="poi_doityourself">Prodavnica za kućno unapređenje</string>
+    <string name="poi_fishing">Oprema za pecanje</string>
+    <string name="poi_free_flying">Prodavnica stvari slobodnog letenja</string>
+    <string name="poi_furniture">Prodavnica nameštaja</string>
+    <string name="poi_garden_centre">Baštenski centar</string>
+    <string name="poi_garden_furniture">Prodavnica baštenskog nameštaja</string>
+    <string name="poi_shop_yes">Opšta prodavnica</string>
+    <string name="poi_glaziery">Staklara</string>
+    <string name="poi_hardware">Gvožđara</string>
+    <string name="poi_herbalist">Prodavnica bilja</string>
+    <string name="poi_houseware">Prodavnica kućnih potrebština</string>
+    <string name="poi_kitchen">Kuhinjski nameštaj</string>
+    <string name="poi_medical_supply">Medicinska dostava</string>
+    <string name="poi_outdoor">Prodavnica spoljnje opreme</string>
+    <string name="poi_radiotechnics">Radiotehnička prodavnica</string>
+    <string name="poi_ship_chandler">Brodska oprema</string>
+    <string name="poi_stationery">Prodavnica kancelarijske opreme</string>
+    <string name="poi_tableware">Prodavnica pribora za jelo</string>
+    <string name="poi_trade">Trgovački terminal</string>
+    <string name="poi_variety_store">Prodavnica mešane robe</string>
+    <string name="poi_window_blind">Prodavnica prozorskih zastora</string>
+    <string name="poi_department_store">Robna kuća</string>
+    <string name="poi_energy">Energetsko odeljenje</string>
+    <string name="poi_car">Prodavnica auta</string>
+    <string name="poi_atv">Prodavnica točkaša</string>
+    <string name="poi_marketplace">Drakstor</string>
+    <string name="poi_model">Umanjeni modeli</string>
+    <string name="poi_shop_craft">Prodavnica zanatskih rekvizita</string>
+    <string name="poi_religion">Religiozna dobra</string>
+    <string name="poi_emergency_phone">Hitan telefon</string>
+    <string name="poi_fire_flapper">Protivpožarna metla</string>
+    <string name="poi_fire_water_pond">Protivpožarni bazen</string>
+    <string name="poi_grit_bin">Sanduk soli</string>
+    <string name="poi_ford_stepping_stones">Pešački kameni most</string>
+    <string name="poi_traffic_calming_hump">Ispupčenje (brzinsko)</string>
+    <string name="poi_traffic_calming_rumble_strip">Traka neravnine</string>
+    <string name="poi_traffic_calming_table">Usporivački prelaz</string>
+    <string name="poi_traffic_calming_choker">Potiskivač</string>
+    <string name="poi_public_transport_stop_position">Stop pozicija javnog prevoza</string>
+    <string name="poi_railway_platform">Peron pruge</string>
+    <string name="poi_halt">Pružni prelaz</string>
+    <string name="poi_railway_buffer_stop">Pružni predzaustavljač</string>
+    <string name="poi_slipway">Brodogradilišna pruga</string>
+    <string name="poi_aerialway_station">Stanica žičare</string>
+    <string name="poi_aerialway_chair_lift">Sedišta žičare</string>
+    <string name="poi_aerialway_t_bar">Sedišta sa t-prečkom</string>
+    <string name="poi_aerialway_j_bar">Sedišta sa j-prečkom</string>
+    <string name="poi_aerialway_platter">Prevozna prečka žičare</string>
+    <string name="poi_aerialway_mixed_lift">Žičara sa gondolama i sedištima</string>
+    <string name="poi_aerialway_drag_lift">Vučna žičara</string>
+    <string name="poi_aerialway_rope_tow">Žičara sa vučnim konopcem</string>
+    <string name="poi_aerialway_pylon">Stub žičare</string>
+    <string name="poi_turning_circle">Kružni kraj puta</string>
+    <string name="poi_motorway_junction">Autoputna raskrsnica</string>
+    <string name="poi_standpipe">Hidrant</string>
+    <string name="poi_boatyard">Brodski suvi dok</string>
+    <string name="poi_wastewater_plant">Fabrika otpadnih voda</string>
+    <string name="poi_waterway_turning_point">Vodeni prelaz</string>
+    <string name="poi_weir">Niska brana</string>
+    <string name="poi_groyne">Sedimentna brana</string>
+    <string name="poi_power_substation">Podstanica</string>
+    <string name="poi_power_cable_distribution_cabinet">Odeljenje kablovskog razvoda</string>
+    <string name="poi_power_tower">Električni toranj</string>
+    <string name="poi_power_pole">Električni stub</string>
+    <string name="poi_bell_tower">Telefonski toranj</string>
+    <string name="poi_cooling_tower">Rashladni toranj</string>
+    <string name="poi_recycling_hardcore">Zidarski šut</string>
+    <string name="poi_recycling_chipboard">Iverica</string>
+    <string name="poi_recycling_plasterboard">Suvi malter</string>
+    <string name="poi_landfill">Deponija</string>
+    <string name="poi_brownfield">Pretgrađevinski teren</string>
+    <string name="poi_greenfield">Novograđevinski teren</string>
+    <string name="poi_adit">Podzemni ulaz</string>
+    <string name="poi_petroleum_well">Izvor nafte</string>
+    <string name="poi_survey_point">Nadzorna tačka</string>
+    <string name="poi_cricket_nets">Kriket mreže</string>
+    <string name="poi_register_office">Kancelarija za građane</string>
+    <string name="poi_place_allotments">Parcelna grupa</string>
+    <string name="poi_baby_hatch">Prihvatilište beba</string>
+    <string name="poi_occupational_therapist">Terapeut profesija</string>
+    <string name="poi_podiatrist">Ortoped donjih ekstremiteta</string>
+    <string name="poi_speech_therapist">Logoped</string>
+    <string name="poi_office_telecommunication">Telekomunikaciona kancelarija</string>
+    <string name="poi_employment_agency">Kancelarija biroa rada</string>
+    <string name="poi_research">Istraživačka kancelarija</string>
+    <string name="poi_newspaper">Novinarska kancelarija</string>
+    <string name="poi_architect">Kancelarija arhitekta</string>
+    <string name="poi_bookmaker">Kladionica</string>
+    <string name="poi_office_religion">Kancelarija za religije</string>
+    <string name="poi_association">Kancelarija udruženja</string>
+    <string name="poi_financial">Finansijska kancelarija</string>
+    <string name="poi_foundation">Osnivačka kancelarija</string>
+    <string name="poi_tax_advisor">Kancelarija poreskog savetnika</string>
+    <string name="poi_ice_rink">Klizalište</string>
+    <string name="poi_pitch">Sportski teren</string>
+    <string name="poi_base">Skakanje</string>
+    <string name="poi_boules">Boćanje</string>
+    <string name="poi_bowls">Kuglanje</string>
+    <string name="poi_equestrian">Konjički</string>
+    <string name="poi_ice_stock">Kuglanje na ledu</string>
+    <string name="poi_paddle_tennis">Mali tenis</string>
+    <string name="poi_shooting">Streljaštvo</string>
+    <string name="poi_artwork">Umetnost</string>
+    <string name="poi_battlefield">Vojni poligon</string>
+    <string name="poi_boundary_stone">Granični kamen</string>
+    <string name="poi_rune_stone">Runski kamen</string>
+    <string name="poi_attraction_amusement_ride">Zabavna vožnja</string>
+    <string name="poi_attraction_big_wheel">Točak ringišpil</string>
+    <string name="poi_chalet">Izdvojena kabina</string>
+    <string name="poi_cabin">Koliba</string>
+    <string name="poi_lean_to">Otvorena koliba</string>
+    <string name="poi_hunting_lodge">Lovačka koliba</string>
+    <string name="poi_place_of_worship">Pokloničko mesto</string>
+    <string name="poi_religion_unitarian_universalist">Unitarni univerzalizam</string>
+    <string name="poi_religion_multifaith">Više-verski</string>
+    <string name="poi_religion_tenrikyo">Tenrikio</string>
+    <string name="poi_denomination_lutheran">Luterizam</string>
+    <string name="poi_denomination_anglican">Anglikanizam</string>
+    <string name="poi_denomination_presbyterian">Prezbiterijanizam</string>
+    <string name="poi_denomination_evangelical">Evangelizam</string>
+    <string name="poi_denomination_pentecostal">Pentakostalizam</string>
+    <string name="poi_denomination_reformed">Reformizam</string>
+    <string name="poi_denomination_new_apostolic">Novo-apostolizam</string>
+    <string name="poi_denomination_episcopal">Episkopalizam</string>
+    <string name="poi_denomination_shia">Šia islam</string>
+    <string name="poi_denomination_united">Unitarizam</string>
+    <string name="poi_denomination_greek_catholic">Grčki katolicizam</string>
+    <string name="poi_denomination_tibetan">Tibetanizam</string>
+    <string name="poi_denomination_united_reformed">Reformisan unitarizam</string>
+    <string name="poi_denomination_iglesia_ni_cristo">Crkva Hristos</string>
+    <string name="poi_denomination_uniting">Ujedinjenje</string>
+    <string name="poi_denomination_mennonite">Menonitizam</string>
+    <string name="poi_denomination_assemblies_of_god">Božji sabori</string>
+    <string name="poi_denomination_nondenominational">Nedenominacijski</string>
+    <string name="poi_denomination_nazarene">Nazarećani</string>
+    <string name="poi_denomination_united_methodist">Unitarni metodisti</string>
+    <string name="poi_denomination_congregational">Kongregacionalizam</string>
+    <string name="poi_denomination_latter_day_saints">Sveci kasnijeg dana</string>
+    <string name="poi_denomination_united_church_of_christ">Ujedinjena Crkva Hristova</string>
+    <string name="poi_denomination_scientist">Naučna religija</string>
+    <string name="poi_denomination_ethiopian_orthodox_tewahedo">Etiopsko Tevahedo pravoslavlje</string>
+    <string name="poi_denomination_unitarian">Unitarci</string>
+    <string name="poi_denomination_coptic_orthodox">Koptsko pravoslavlje</string>
+    <string name="poi_denomination_wesleyan">Veslejani</string>
+    <string name="poi_denomination_shaktism">Šaktizam</string>
+    <string name="poi_denomination_shingon_shu">Šingon Šu</string>
+    <string name="poi_denomination_maronite">Maroniti</string>
+    <string name="poi_internet_access_wlan">Internet pristup: VLAN</string>
+    <string name="poi_internet_access_terminal">Internet pristup: terminal</string>
+    <string name="poi_internet_access_service">Internet pristup: servis</string>
+    <string name="poi_religious">Religiozna oblast</string>
+    <string name="poi_wayside_cross">Krst sputa</string>
+    <string name="poi_wayside_shrine">Hram sputa</string>
+    <string name="poi_caravan_site">Karavan lokacija</string>
+    <string name="poi_grave_yard">Groblje</string>
+    <string name="poi_funicular">Tranvaj usponski</string>
+    <string name="poi_hanami">Hanami</string>
+    <string name="poi_club_art">Umetnički klub</string>
+    <string name="poi_club_board_games">Klub igara za stolom</string>
+    <string name="poi_club_cinema">Kinematografski klub</string>
+    <string name="poi_club_charity">Donatorski klub</string>
+    <string name="poi_piste_skitour">Skijaška staza</string>
+    <string name="poi_piste_sleigh">Staza za kočije</string>
+    <string name="poi_piste_sled">Staza za sanke</string>
+    <string name="poi_arts_centre">Umetnički centar</string>
+    <string name="poi_community_centre">Saborni centar</string>
+    <string name="poi_hunting_stand">Lovačka čeka</string>
+    <string name="poi_village_green">Centar sela</string>
+    <string name="poi_trail_riding_station">Konjička stanica</string>
+    <string name="poi_food_court">Samoposlužna kuhinja</string>
+    <string name="poi_craft_agricultural_engines">Poljoprivredne mašine</string>
+    <string name="poi_craft_beekeeper">Pčelar</string>
+    <string name="poi_craft_blacksmith">Kovač</string>
+    <string name="poi_craft_bookbinder">Štampar</string>
+    <string name="poi_craft_carpet_layer">Postavljač tepiha</string>
+    <string name="poi_craft_caterer">Pripremač jela</string>
+    <string name="poi_craft_dressmaker">Krojač</string>
+    <string name="poi_craft_glaziery">Staklorezač</string>
+    <string name="poi_craft_jeweller">Zlatar</string>
+    <string name="poi_craft_locksmith">Kovač</string>
+    <string name="poi_craft_key_cutter">Ključar</string>
+    <string name="poi_craft_metal_construction">Metalorezac</string>
+    <string name="poi_craft_photographic_laboratory">Foto-tamna soba</string>
+    <string name="poi_craft_plasterer">Moler</string>
+    <string name="poi_craft_pottery">Keramičar</string>
+    <string name="poi_craft_rigger">Konopčar</string>
+    <string name="poi_craft_roofer">Konstruktor krovova</string>
+    <string name="poi_craft_saddler">Sedlar</string>
+    <string name="poi_craft_sailmaker">Jedrar</string>
+    <string name="poi_craft_scaffolder">Konstruktor skela</string>
+    <string name="poi_craft_stand_builder">Konstruktor štandova</string>
+    <string name="poi_craft_stonemason">Kamenorezaz</string>
+    <string name="poi_craft_sun_protection">Konstruktor suncobrana</string>
+    <string name="poi_craft_sweep">Čistač</string>
+    <string name="poi_craft_tiler">Parketar</string>
+    <string name="poi_craft_tinsmith">Kovač posuđa</string>
+    <string name="poi_craft_upholsterer">Tapetar</string>
+    <string name="poi_craft_computer">Tehničar računara</string>
+    <string name="poi_dry_cleaning">Hemijsko čišćenje</string>
+    <string name="poi_cutline">Prosek</string>
+    <string name="poi_toilets">Zahod;Toaleti</string>
+    <string name="poi_brothel">Javna kuća</string>
+    <string name="poi_smoking_area">Pušački deo</string>
+    <string name="poi_pawnbroker">Zalagaoničar</string>
+    <string name="poi_stone">Mesto kamena</string>
+    <string name="poi_anchorage">Sidrište</string>
+    <string name="poi_anchor_berth">Sidrišna bova</string>
+    <string name="poi_beacon">Svetionik</string>
+    <string name="poi_beacon_cardinal">Navigacioni svetionik</string>
+    <string name="poi_beacon_lateral">Lateralni svetionik</string>
+    <string name="poi_beacon_safe_water">Svetionik bezbednih voda</string>
+    <string name="poi_beacon_special_purpose">Svetionik posebne namene</string>
+    <string name="poi_berth">Dok</string>
+    <string name="poi_seamark_building">Nautička zgrada</string>
+    <string name="poi_seamark_bridge">Nautički most</string>
+    <string name="poi_buoy_cardinal">Navigaciona bova</string>
+    <string name="poi_daymark">Dnevna oznaka</string>
+    <string name="poi_distance_mark">Oznaka udanjenosti</string>
+    <string name="poi_seamark_dyke">Nasip</string>
+    <string name="poi_fog_signal">Signal magle</string>
+    <string name="poi_landmark">Oznaka zemlje</string>
+    <string name="poi_seamark_light">Svetlo, nautika</string>
+    <string name="poi_seamark_light_major">Glavno svetlo, nautika</string>
+    <string name="poi_seamark_light_minor">Sporedno svetlo, nautika</string>
+    <string name="poi_seamark_light_float">Plutajuće svetlo, nautika</string>
+    <string name="poi_seamark_light_vessel">Svetlo plovila, nautika</string>
+    <string name="poi_mooring">Usidrenje</string>
+    <string name="poi_lock_basin">Vodena rampa</string>
+    <string name="poi_notice">Obaveštenje, nautički</string>
+    <string name="poi_pile">Sidrišni ankor</string>
+    <string name="poi_radar_transponder">Radarski transponder, nautički</string>
+    <string name="poi_radio_station">Radio stanica, nautički</string>
+    <string name="poi_signal_station_traffic">Signalna stanica, saobraćaj</string>
+    <string name="poi_signal_station_warning">Signalna stanica, upozorenje</string>
+    <string name="poi_small_craft_facility">Prostor za manja plovila</string>
+    <string name="poi_topmark">Oznaka na vrhu, nautički</string>
+    <string name="poi_seamark_rock">Stena, nautički</string>
+    <string name="poi_seamark_wreck">Olupina, nautički</string>
+    <string name="poi_seamark_clearance_height">Prolazna visina</string>
+    <string name="poi_seamark_clearance_height_closed">Prolazna visina (zatvorena)</string>
+    <string name="poi_seamark_clearance_height_open">Prolazna visina (otvorena)</string>
+    <string name="poi_seamark_clearance_width">Prolazna širina</string>
+    <string name="poi_military_airfield">Vojni aerodrom</string>
+    <string name="poi_military_range">Vojno strelište</string>
+    <string name="poi_wiki_lang_new">Nevarska vikipedija</string>
+    <string name="poi_wiki_lang_als">Alzašanska vikipedija</string>
+    <string name="poi_wiki_lang_bpy">Bišnuprijska vikipedija</string>
+    <string name="poi_wiki_lang_fa">Farsanska vikipedija</string>
+    <string name="poi_wiki_lang_fy">Frisk vikipedija</string>
+    <string name="poi_wiki_lang_ml">Malajalamska vikipedija</string>
+    <string name="poi_wiki_lang_nds">Nisko Saksonska vikipedija</string>
+    <string name="poi_wiki_lang_pms">Pidmonteska vikipedija</string>
+    <string name="poi_wiki_lang_war">Varajska vikipedija</string>
+    <string name="poi_wiki_lang_min">Minangkabuska vikipedija</string>
+    <string name="poi_wiki_lang_kk">Kazaška vikipedija</string>
+    <string name="poi_wiki_lang_zhminnan">Južno Minska vikipedija</string>
+    <string name="poi_wiki_lang_mg">Malagasijska vikipedija</string>
+    <string name="poi_wiki_lang_jv">Javanska vikipedija</string>
+    <string name="poi_wiki_lang_zhyue">Kantonska vikipedija</string>
+    <string name="poi_wiki_lang_ast">Astur-Leoneze vikipedija</string>
+    <string name="poi_wiki_lang_tg">Tadžička vikipedija</string>
+    <string name="poi_wiki_lang_ba">Baškirska vikipedija</string>
+    <string name="poi_wiki_lang_sco">Škotska vikipedija</string>
+    <string name="poi_wiki_lang_cv">Čuvaška vikipedija</string>
+    <string name="poi_wiki_lang_lmo">Lombardska vikipedija</string>
+    <string name="poi_wiki_lang_my">Brumanska vikipedija</string>
+    <string name="poi_wiki_lang_yo">Jorubska vikipedija</string>
+    <string name="poi_wiki_lang_gu">Gudžaratska vikipedija</string>
+    <string name="poi_bollard">Saobraćajni stub</string>
+    <string name="poi_cycle_barrier">Biciklistička barijera</string>
+    <string name="poi_motorcycle_barrier">Motociklička barijera</string>
+    <string name="poi_bus_trap">Bus traka</string>
+    <string name="poi_full_height_turnstile">Obrtna vrata pune visine</string>
+    <string name="poi_bump_gate">Bamp prolaz</string>
+    <string name="poi_general_barrier">Opšta barijera</string>
+    <string name="poi_stile">Niska ograda</string>
+    <string name="poi_debris">Rekonstrukcijski šut</string>
+    <string name="poi_jersey_barrier">Ulični blokovi</string>
+    <string name="poi_horse_stile">Konjski prolaz</string>
+    <string name="poi_kissing_gate">Kapija sa rampom</string>
+    <string name="poi_sally_port">Kapija na utvrđenju</string>
+    <string name="poi_swing_gate">Rotaciona kapija</string>
+    <string name="poi_turnstile">Obrtna vrata</string>
+    <string name="poi_kent_carriage_gap">Kapija za kočije</string>
+    <string name="poi_icn_ref">Međunarodni biciklistički mrežni čvor</string>
+    <string name="poi_ncn_ref">Nacionalni biciklistički mrežni čvor</string>
+    <string name="poi_rcn_ref">Regionalni biciklistički mrežni čvor</string>
+    <string name="poi_lcn_ref">Lokalni biciklistički mrežni čvor</string>
+    <string name="poi_iwn_ref">Međunarodni planinarski mrežni čvor</string>
+    <string name="poi_nwn_ref">Nacionalni planinarski mrežni čvor</string>
+    <string name="poi_rwn_ref">Regionalni planinarski mrežni čvor</string>
+    <string name="poi_lwn_ref">Lokalni planinarski mrežni čvor</string>
+    <string name="poi_route_hiking_iwn_poi">Međunarodna planinarska ruta</string>
+    <string name="poi_route_hiking_nwn_poi">Nacionalna planinarska ruta</string>
+    <string name="poi_route_hiking_rwn_poi">Regionalna planinarska ruta</string>
+    <string name="poi_route_hiking_lwn_poi">Lokalna planinarska ruta</string>
+    <string name="poi_route_hiking_ref_poi">Referenca planinarske rute</string>
+    <string name="poi_collection_times">Kolekcioni periodi</string>
+    <string name="poi_access_permissive">Dozvoljen pristup</string>
+    <string name="poi_content_silage">Sadržaj: silosni</string>
+    <string name="poi_content_slurry">Sadržaj: balegna zemlja</string>
+    <string name="poi_content_manure">Sadržaj: balega</string>
+    <string name="poi_content_fodder">Sadržaj: stočna hrana</string>
+    <string name="poi_content_grain">Sadržaj: zob</string>
+    <string name="poi_nudism_customary">Uobičajeno</string>
+    <string name="poi_trade_building_supplies">Građevinska roba</string>
+    <string name="poi_trade_plumbing">Vodovodna roba</string>
+    <string name="poi_trade_wood">Drvena roba</string>
+    <string name="poi_trade_agricultural_supplies">Poljoprivredna roba</string>
+    <string name="poi_trade_tile">Roba pločica</string>
+    <string name="poi_bicycle_parking_anchors">Sidrište za bicikle</string>
+    <string name="poi_bicycle_parking_wall_loops">Juniciklno sidrište</string>
+    <string name="poi_bicycle_parking_rack">Okvirno sidrište</string>
+    <string name="poi_bicycle_parking_bollard">Okasto sidrište</string>
+    <string name="poi_leaf_type_needleleaved">Igličasto</string>
+    <string name="poi_leaf_type_leafless">Bezlisno</string>
+    <string name="poi_enforcement_mindistance">Na snazi: međurastojanje</string>
+    <string name="poi_enforcement_check">Na snazi: kontrola</string>
+    <string name="poi_enforcement_access">Na snazi: pravo pristupa</string>
+    <string name="poi_deadlock">Slepa ulica</string>
+    <string name="poi_water_point">Javna česma</string>
+    <string name="poi_information_guidepost">Putokaz</string>
+    <string name="poi_toll_hgv_yes">HGV putarina</string>
+    <string name="poi_tactile_paving_no">Bez površne obloge</string>
+    <string name="poi_services">Uslužni prostor</string>
+    <string name="poi_railway_level_crossing">Pružni prelaz u nivou</string>
+    <string name="poi_leisure_common">Zajednički prostor odmora</string>
+    <string name="poi_heath">Vres</string>
+    <string name="poi_grassland">Travnata zemlja</string>
+    <string name="poi_scrub">Žbun</string>
+    <string name="poi_farmland">Zemlja farme</string>
+    <string name="poi_logging">Seča drveta</string>
+    <string name="poi_windfall">Opalo voće</string>
+    <string name="poi_passing_place">Prolazno mesto</string>
+    <string name="poi_rtsa_scale">RTSA skala</string>
+    <string name="poi_piste_grooming_backcountry">Ruralni deo</string>
+    <string name="poi_payment_girocard_yes">Girokartica</string>
+    <string name="poi_payment_pikepass_no">PIKEPASS se ne prihvata</string>
+    <string name="poi_payment_pikepass_designated">PIKEPASS (namenjeno)</string>
+    <string name="poi_payment_visa_debit_yes">Viza debitne kartice</string>
+    <string name="poi_payment_visa_debit_no">Viza debitne kartice se ne prihvataju</string>
+    <string name="poi_payment_cryptocurrencies_no">Kriptovalute se ne prihvataju</string>
+    <string name="poi_payment_others_yes">Drugi metodi</string>
+    <string name="poi_payment_others_no">Drugi metodi plaćanja se ne prihvataju</string>
+    <string name="poi_payment_routex_yes">Routex da</string>
+    <string name="poi_payment_routex_no">Routex krtice goriva se ne prihvataju</string>
+    <string name="poi_payment_bancomat_yes">Bancomat da</string>
+    <string name="poi_payment_bancomat_no">Bancomat se ne prihvata</string>
+    <string name="poi_payment_icsf_yes">IC Stored Fare - da</string>
+    <string name="poi_payment_wire_transfer_yes">Vajer transferi</string>
+    <string name="poi_payment_wire_transfer_no">Vajer transferi se ne prihvataju</string>
+    <string name="poi_events_venue">Mesta događaja</string>
+    <string name="poi_diet_kosher_no">Košer ishrana: ne</string>
+    <string name="poi_diet_halal_filter_yes">Halal</string>
+    <string name="poi_diet_halal_only">Halal samo</string>
+    <string name="poi_diet_halal_yes">Halal</string>
+    <string name="poi_diet_halal_no">Halal ishrana: ne</string>
+    <string name="poi_diet_lactose_free_filter_yes">Bez laktoze</string>
+    <string name="poi_diet_lactose_free_only">Bez laktoze samo</string>
+    <string name="poi_diet_lactose_free_yes">Bez laktoze</string>
+    <string name="poi_diet_lactose_free_no">Bez laktoze ishrana: ne</string>
+    <string name="poi_diet_pescetarian_yes">Peskoterijan</string>
+    <string name="poi_drive_in_yes">Da</string>
+    <string name="poi_drive_in_no">Ulazak kolima: ne</string>
+    <string name="poi_drive_through_yes">Da</string>
+    <string name="poi_drive_through_no">Prolazak kroz: ne</string>
+    <string name="poi_brewery_additional">Ime pivare</string>
+    <string name="poi_microbrewery_yes">Da</string>
+    <string name="poi_microbrewery_no">Ne mikropivara</string>
+    <string name="poi_takeaway_filter_yes">Da</string>
+    <string name="poi_takeaway_yes">Za poneti</string>
+    <string name="poi_takeaway_no">Ne za poneti</string>
+    <string name="poi_takeaway_only">Samo za poneti</string>
+    <string name="poi_delivery_filter_yes">Da</string>
+    <string name="poi_delivery_yes">Dostava</string>
+    <string name="poi_delivery_no">Bez dostave</string>
+    <string name="poi_delivery_only">Samo dostava</string>
+    <string name="poi_outdoor_seating_filter_yes">Da</string>
+    <string name="poi_outdoor_seating_yes">Sedenje napolju: da</string>
+    <string name="poi_outdoor_seating_no">Bez sedenja napolju</string>
+    <string name="poi_outdoor_seating_terrace">Sedenje napolju: tarasa</string>
+    <string name="poi_outdoor_seating_sidewalk">Sedenje napolju: trotoar</string>
+    <string name="poi_outdoor_seating_pedestrian_zone">Sedenje napolju: pešačka zona</string>
+    <string name="poi_outdoor_seating_garden">Sedenje napolju: bašta</string>
+    <string name="poi_outdoor_seating_patio">Sedenje napolju: interno dvorište</string>
+    <string name="poi_cocktails_yes">Da</string>
+    <string name="poi_second_hand_yes">Sekond hend roba</string>
+    <string name="poi_second_hand_no">Bez sekond hend robe</string>
+    <string name="poi_second_hand_only">Samo sekond hend roba</string>
+    <string name="poi_service_parts">Delovi</string>
+    <string name="poi_service_dealer">Diler</string>
+    <string name="poi_service_repair">Popravka</string>
+    <string name="poi_service_repair_no">Bez popravke</string>
+    <string name="poi_service_electrical">Popravka električnih vozila</string>
+    <string name="poi_motorcycle_repair">Popravka motora</string>
+    <string name="poi_self_service_yes">Da</string>
+    <string name="poi_self_service_no">Ne</string>
+    <string name="poi_automated_yes">Da</string>
+    <string name="poi_automated_no">Ne automatski</string>
+    <string name="poi_full_service_yes">Puna usluga</string>
+    <string name="poi_brushless_yes">Da</string>
+    <string name="poi_brushless_no">Bez četkica: ne</string>
+    <string name="poi_car_wash_no">Ne</string>
+    <string name="poi_public_bath">Javno kupatilo</string>
+    <string name="poi_male_yes">Muškarci</string>
+    <string name="poi_male_no">Zabranjeno za muškarce</string>
+    <string name="poi_female_yes">Žene</string>
+    <string name="poi_female_no">Zabranjeno za žene</string>
+    <string name="poi_indoor_yes">Unutar</string>
+    <string name="poi_indoor_no">Spolja</string>
+    <string name="poi_toilets_yes">Da</string>
+    <string name="poi_toilets_no">Bez toaleta</string>
+    <string name="poi_toilets_wheelchair_yes">Pristup toaletu za invalidska kolica: da</string>
+    <string name="poi_toilets_wheelchair_no">Pristup toaletu za invalidska kolica: ne</string>
+    <string name="poi_toilets_access_customers">Pristup toaletu: kupci</string>
+    <string name="poi_toilets_access_permissive">Pristup toaletu: dopušten</string>
+    <string name="poi_toilets_access_community">Pristup toaletu: zajednički</string>
+    <string name="poi_toilets_access_public">Pristup toaletu: javni</string>
+    <string name="poi_vending_parcel_pickup_mail_in">Preuzimanje paketa i dopremanje pošte</string>
+    <string name="poi_vending_bicycle_tube">Bicikl ventili</string>
+    <string name="poi_vending_parcel_pickup">Preuzimanje paketa</string>
+    <string name="poi_vending_parcel_mail_in">Poštanska dostava paketa</string>
+    <string name="poi_memorial_blue_plaque">Plavi memorijal</string>
+    <string name="poi_memorial_jizo">Džizo</string>
+    <string name="poi_resource_dimension_stone">Dimenzioni kamen</string>
+    <string name="poi_health_amenity_type_first_aid_kit">Pribor za prvu pomoć</string>
+    <string name="poi_health_amenity_type_scales">Javne vage</string>
+    <string name="poi_car_pooling">Auto zaustavno mesto</string>
+    <string name="poi_wetland_marsh">Otvorena nešumovita močvara</string>
+    <string name="poi_wetland_reedbed">Zatvorena nešumovita močvara</string>
+    <string name="poi_wetland_saltern">Solana</string>
+    <string name="poi_wetland_tidalflat">Plimski deo</string>
+    <string name="poi_wetland_saltmarsh">Plimska močvara</string>
+    <string name="poi_wetland_string_bog">Prugasta močvara</string>
+    <string name="poi_wetland_fen">Močvarna poljana</string>
+    <string name="poi_wetland_palsa_bog">Palsa močvara</string>
+    <string name="poi_beach_shingle">Kameniti nasip</string>
+    <string name="poi_beach_rocky">Kamenita</string>
+    <string name="poi_chimney">Dimnjak</string>
+    <string name="poi_palm">Palma</string>
+    <string name="poi_cypress">Čempres</string>
+    <string name="poi_flagpole">Stub zastave</string>
+    <string name="poi_bench_yes">Da</string>
+    <string name="poi_bench_no">Bez klupe</string>
+    <string name="poi_bin_yes">Sa korpom</string>
+    <string name="poi_bin_no">Bez korpe</string>
+    <string name="poi_shelter_type_public_transport">Javni prevoz</string>
+    <string name="poi_shelter_type_picnic_shelter">Piknik</string>
+    <string name="poi_shelter_type_weather_shelter">Vreme</string>
+    <string name="poi_shelter_type_lean_to">Nadstrešnica</string>
+    <string name="poi_shelter_type_basic_hut">Prosta koliba</string>
+    <string name="poi_shelter_type_building">Zgrada</string>
+    <string name="poi_shelter_type_wildlife_hide">Posmatračka koliba</string>
+    <string name="poi_shelter_type_rock_shelter">Kamenito sklonište</string>
+    <string name="poi_shelter_type_sun_shelter">Sklonište od sunca</string>
+    <string name="poi_shelter_type_field_shelter">Poljsko sklonište</string>
+    <string name="poi_shelter_type_tent">Tip skloništa: šator</string>
+    <string name="poi_shelter_type_abandoned">Tip skloništa: napušteno</string>
+    <string name="poi_internet_access_type_wlan">Vaj-Faj</string>
+    <string name="poi_internet_access_type_terminal">Terminal</string>
+    <string name="poi_internet_access_type_wired">Kablovski</string>
+    <string name="poi_internet_access_type_public">Tip pristupa internetu: javni</string>
+    <string name="poi_internet_access_type_service">Tip pristupa internetu: uslužni</string>
+    <string name="poi_internet_access_type_no">Bez pristupa internetu</string>
+    <string name="poi_internet_access_type_yes">Sa pristupom internetu</string>
+    <string name="poi_maxwidth">Maksimalna širina</string>
+    <string name="poi_iata">IATA kod</string>
+    <string name="poi_icao">ICAO kod</string>
+    <string name="poi_faa">FAA kod</string>
+    <string name="poi_artwork_type_sculpture">Tip dela: skulptura</string>
+    <string name="poi_artwork_type_statue">Tip dela: statua</string>
+    <string name="poi_artwork_type_mural">Tip dela: mural</string>
+    <string name="poi_artwork_type_architecture">Tip dela: arihitektura</string>
+    <string name="poi_artwork_type_painting">Tip dela: slika</string>
+    <string name="poi_artwork_type_stone">Tip dela: kameno</string>
+    <string name="poi_artwork_type_bust">Tip dela: bista</string>
+    <string name="poi_artwork_type_installation">Tip dela: instalacia</string>
+    <string name="poi_artwork_type_mosaic">Tip dela: mozaik</string>
+    <string name="poi_artwork_type_relief">Tip dela: reljef</string>
+    <string name="poi_artwork_type_graffiti">Tip dela: grafiti</string>
+    <string name="poi_artwork_type_stele">Tip dela: spomenik</string>
+    <string name="poi_artwork_type_fountain">Tip dela: fontana</string>
+    <string name="poi_width">Širina</string>
+    <string name="poi_architect_name">Arhitekta</string>
+    <string name="poi_architecture_modern">Arhitektura: moderna</string>
+    <string name="poi_architecture_stalinist_neoclassicism">Arhitektura: staljinistički neoklasicizam</string>
+    <string name="poi_architecture_eclectic">Arhitektura: eklektična</string>
+    <string name="poi_architecture_new_objectivity">Arhitektura: nova objektivnost</string>
+    <string name="poi_architecture_contemporary">Arhitektura: savremena</string>
+    <string name="poi_architecture_constructivism">Arhitektura: konstruktivizam</string>
+    <string name="poi_architecture_umgebinde">Arhitektura: okolna</string>
+    <string name="poi_architecture_timber_frame">Arhitektura: okvirna drvetom</string>
+    <string name="poi_architecture_art_nouveau">Arhitektura: nova umetnost</string>
+    <string name="poi_architecture_neoclassicism">Arhitektura: neoklasicizam</string>
+    <string name="poi_architecture_victorian">Arhitektura: viktorijanska</string>
+    <string name="poi_architecture_brutalism">Arhitektura: brutalizam</string>
+    <string name="poi_architecture_classicism">Arhitektura: klasicizam</string>
+    <string name="poi_architecture_gothic">Arhitektura: gotska</string>
+    <string name="poi_architecture_oldrussian">Arhitektura: staroruska</string>
+    <string name="poi_architecture_baroque">Arhitektura: barokna</string>
+    <string name="poi_architecture_postconstructivism">Arhitektura: postkonstruktivizam</string>
+    <string name="poi_architecture_wilhelminian_style">Arhitektura: vilhelminski stil</string>
+    <string name="poi_architecture_renaissance">Arhitektura: renesansna</string>
+    <string name="poi_architecture_romanesque">Arhitektura: romanska</string>
+    <string name="poi_tunnel_waterway">Vodeni tunel</string>
+    <string name="poi_tunnel_car">Tunel putnički</string>
+    <string name="poi_tunnel_pedestrian">Pešački tunel</string>
+    <string name="poi_tunnel_railway">Tunel železnički</string>
+    <string name="poi_bridge_car">Most putnički</string>
+    <string name="poi_bridge_pedestrian">Most za pešake</string>
+    <string name="poi_bridge_bicycle">Most biciklistički</string>
+    <string name="poi_bridge_railway">Most železnički</string>
+    <string name="poi_bridge_waterway">Most vodenog puta</string>
+    <string name="poi_bridge_structure_beam">Struktura mosta: pravi</string>
+    <string name="poi_bridge_structure_simple_suspension">Struktura mosta: prosta suspenzija</string>
+    <string name="poi_bridge_structure_suspension">Struktura mosta: suspenzija</string>
+    <string name="poi_bridge_structure_arch">Struktura mosta: lučni</string>
+    <string name="poi_bridge_structure_truss">Struktura mosta: vezana</string>
+    <string name="poi_bridge_structure_floating">Struktura mosta: plutajuća</string>
+    <string name="poi_bridge_structure_humpback">Struktura mosta: grbava</string>
+    <string name="poi_bridge_structure_cable_stayed">Struktura mosta: kablo-stojeći</string>
+    <string name="poi_bridge_structure_boardwalk">Struktura mosta: šetačka</string>
+    <string name="poi_bridge_structure_simple_wooden">Struktura mosta: prosto drvena</string>
+    <string name="poi_bridge_structure_viaduct">Struktura mosta: vijadukt</string>
+    <string name="poi_bridge_structure_aqueduct">Struktura mosta: akvadukt</string>
+    <string name="poi_bridge_structure_log">Struktura mosta: brvnasta</string>
+    <string name="poi_bridge_type_movable">Tip mosta: pokretan</string>
+    <string name="poi_bridge_movable_bascule">Tip pokretnog mosta: baskul</string>
+    <string name="poi_bridge_movable_swing">Tip pokretnog mosta: okretni</string>
+    <string name="poi_bridge_movable_lift">Tip pokretnog mosta: vertikalni</string>
+    <string name="poi_bridge_movable_drawbridge">Tip pokretnog mosta: lančani</string>
+    <string name="poi_bridge_movable_submersible">Tip pokretnog mosta: potopljujući</string>
+    <string name="poi_bridge_movable_transporter">Tip pokretnog mosta: transporter</string>
+    <string name="poi_bridge_movable_retractable">Tip pokretnog mosta: uvučeći</string>
+    <string name="poi_lit_yes">Osvetljena: da</string>
+    <string name="poi_lit_no">Osvetljena: ne</string>
+    <string name="poi_surface_unpaved">Površina: nepopločana</string>
+    <string name="poi_surface_paved">Površina: popločana</string>
+    <string name="poi_surface_asphalt">Površina: asfalt</string>
+    <string name="poi_surface_concrete">Površina: betonska</string>
+    <string name="poi_surface_sett">Površina: razređena kaldrma</string>
+    <string name="poi_surface_cobblestone">Površina: okrugla kaldrma</string>
+    <string name="poi_surface_paving_stones">Površina: obrađena kocka</string>
+    <string name="poi_surface_pebblestone">Površina: okrugla rizla</string>
+    <string name="poi_surface_stone">Površina: kamena</string>
+    <string name="poi_surface_metal">Površina: metalna</string>
+    <string name="poi_surface_wood">Površina: drvena</string>
+    <string name="poi_surface_gravel">Površina: rizlana</string>
+    <string name="poi_surface_fine_gravel">Površina: fino rizlana</string>
+    <string name="poi_surface_compacted">Površina: kompaktovana</string>
+    <string name="poi_surface_sand">Površina: pesak</string>
+    <string name="poi_surface_grass">Površina: trava</string>
+    <string name="poi_surface_grass_paver">Površina: šuplja kaldrma</string>
+    <string name="poi_surface_ground">Površina: opšta</string>
+    <string name="poi_surface_dirt">Površina: zemlja</string>
+    <string name="poi_surface_mud">Površina: blato</string>
+    <string name="poi_surface_ice">Površina: led</string>
+    <string name="poi_surface_salt">Površina: so</string>
+    <string name="poi_surface_snow">Površina: sneg</string>
+    <string name="poi_route_bus_ref">Autobus</string>
+    <string name="poi_route_share_taxi_ref">Deljeni taksi</string>
+    <string name="poi_route_trolleybus_ref">Trolejbus</string>
+    <string name="poi_route_tram_ref">Tramvaj</string>
+    <string name="poi_route_train_ref">Voz</string>
+    <string name="poi_route_light_rail_ref">Laka pruga</string>
+    <string name="poi_route_monorail_ref">Monopruga</string>
+    <string name="poi_route_funicular_ref">Uspenska železnica</string>
+    <string name="poi_route_ferry_ref">Trajekt</string>
+    <string name="poi_route_subway_ref">Metro</string>
+    <string name="poi_route_railway_ref">Ruta pruge</string>
+    <string name="poi_historic_yes">Istorijski objekat</string>
+    <string name="poi_surveillance_yes">Nadzor: da</string>
+    <string name="poi_shop_additional_yes">Sa prodavnicom</string>
+    <string name="poi_service_bicycle_retail_yes">Maloprodaja</string>
+    <string name="poi_service_bicycle_retail_no">Maloprodaja bicikla: ne</string>
+    <string name="poi_service_bicycle_repair_yes">Popravka</string>
+    <string name="poi_service_bicycle_repair_no">Popravka bicikla: ne</string>
+    <string name="poi_service_bicycle_rental_yes">Iznajmljivanje</string>
+    <string name="poi_service_bicycle_rental_no">Iznajmljivanje bicikla: ne</string>
+    <string name="poi_service_bicycle_pump_yes">Pumpa</string>
+    <string name="poi_service_bicycle_pump_no">Bicikl pumpa: ne</string>
+    <string name="poi_service_bicycle_diy_yes">Alati za samopopravku</string>
+    <string name="poi_service_bicycle_diy_no">Alati za samopopravku bicikla: ne</string>
+    <string name="poi_service_bicycle_cleaning_yes">Čišćenje</string>
+    <string name="poi_service_bicycle_cleaning_no">Čišćenje bicikla: ne</string>
+    <string name="poi_service_bicycle_chaintool_yes">Alat lanca</string>
+    <string name="poi_service_bicycle_chaintool_no">Alat lanca za bicikl: ne</string>
+    <string name="poi_service_bicycle_second_hand_yes">Maloprodaja polovnih bicikla</string>
+    <string name="poi_service_bicycle_second_hand_no">Maloprodaja polovnih bicikla: ne</string>
+    <string name="poi_service_bicycle_charging_yes">Naplata: da</string>
+    <string name="poi_service_bicycle_charging_no">Naplata: ne</string>
+    <string name="poi_bicycle_repair_station">Stanica za popravku bicikala;Stanica za samo-popravku bicikala</string>
+    <string name="poi_wildlife_hide">Mesto pogleda divljeg sveta</string>
+    <string name="poi_training_language">Trening: jezik</string>
+    <string name="poi_training_music">Trening: muzika</string>
+    <string name="poi_training_dance">Trening: igranje</string>
+    <string name="poi_training_sport">Trening: sport</string>
+    <string name="poi_training_art">Trening: umetnost</string>
+    <string name="poi_training_cooking">Trening: kuvanje</string>
+    <string name="poi_training_computer">Trening: računar</string>
+    <string name="poi_training_yoga">Trening: joga</string>
+    <string name="poi_training_martial_art">Trening: borilačke veštine</string>
+    <string name="poi_training_aviation">Trening: avijacija</string>
+    <string name="poi_training_hairdressing">Trening: šišanje</string>
+    <string name="poi_monument_yes">Monumentalni objekat</string>
+    <string name="poi_industrial_oil">Tip: naftna industrija</string>
+    <string name="poi_industrial_wellsite">Tip: mesto izvora</string>
+    <string name="poi_industrial_factory">Tip: fabrika</string>
+    <string name="poi_industrial_gas">Tip: industrija gasa</string>
+    <string name="poi_industrial_timber">Tip: drvnoprerađivačka</string>
+    <string name="poi_industrial_refinery">Tip: rafinerija</string>
+    <string name="poi_industrial_warehouse">Tip: skladište</string>
+    <string name="poi_industrial_auto_wrecker">Tip: auto otpad</string>
+    <string name="poi_industrial_agriculture">Tip: poljoprivreda</string>
+    <string name="poi_industrial_brewery">Tip: pivara</string>
+    <string name="poi_industrial_brickyard">Tip: ciglana</string>
+    <string name="poi_industrial_intermodal_freight_terminal">Tip: međumodalni teretni terminal</string>
+    <string name="poi_industrial_sawmill">Tip: pilana</string>
+    <string name="poi_industrial_water_purification">Tip: prečišćenje vode</string>
+    <string name="poi_industrial_port">Tip: luka</string>
+    <string name="poi_industrial_depot">Tip: depo</string>
+    <string name="poi_note">Beleška</string>
+    <string name="poi_watering_place">Voda za životinje</string>
+    <string name="poi_animal_boarding">Hotel za životinje</string>
+    <string name="poi_animal_boarding_dog">Tip hotela za životinje: pas</string>
+    <string name="poi_animal_boarding_cat">Tip hotela za životinje: mačka</string>
+    <string name="poi_animal_boarding_dog_cat">Tip hotela za životinje: pas, mačka</string>
+    <string name="poi_animal_boarding_horse">Tip hotela za životinje: konj</string>
+    <string name="poi_historic_aircraft">Istorijski avion</string>
+    <string name="poi_elevator_yes">Sa liftom</string>
+    <string name="poi_elevator_no">Bez lifta</string>
+    <string name="poi_technical_monument">Tehnički spomenik</string>
+    <string name="poi_office_camping">Kamp kancelarija</string>
+    <string name="poi_model_aerodrome">Model aerodroma</string>
+    <string name="poi_guide">Kancelarija vodiča</string>
+    <string name="poi_quango">KANVO</string>
+    <string name="poi_consulting">Savetodavna kancelarija</string>
+    <string name="poi_cooperative">Kooperativna kancelarija</string>
+    <string name="poi_office_forestry">Šumarska kancelarija</string>
+    <string name="poi_logistics">Kancelarija logistike</string>
+    <string name="poi_parish">Parohijska kancelarija</string>
+    <string name="poi_publisher">Izdavačka kancelarija</string>
+    <string name="poi_fuel_91ul">91UL gorivo</string>
+    <string name="poi_fuel_100ll">100LL gorivo</string>
+    <string name="poi_fuel_autogas">Autogas</string>
+    <string name="poi_fuel_jeta1">Avionsko A-1 gorivo</string>
+    <string name="poi_fuel_adblue">Aditiv dizel gasova</string>
+    <string name="poi_fuel_wood">Gorivo: drvo</string>
+    <string name="poi_fuel_charcoal">Gorivo: ćumur</string>
+    <string name="poi_fuel_coal">Gorivo: ugalj</string>
+    <string name="poi_street_lamp">Ulična lampa</string>
+    <string name="poi_escape_lane">Zaustavna traka</string>
+    <string name="poi_surveillance_indoor">Nadzor: unutrašnji</string>
+    <string name="poi_surveillance_outdoor">Nadzor: spoljašnji</string>
+    <string name="poi_surveillance_public">Nadzor: javni</string>
+    <string name="poi_clothes_women">Žene</string>
+    <string name="poi_clothes_underwear">Donji veš</string>
+    <string name="poi_clothes_men">Muškarci</string>
+    <string name="poi_clothes_wedding">Venčanice</string>
+    <string name="poi_clothes_sports">Sportovi</string>
+    <string name="poi_clothes_babies">Bebe</string>
+    <string name="poi_clothes_denim">Teksas</string>
+    <string name="poi_clothes_workwear">Radna odela</string>
+    <string name="poi_clothes_hats">Šeširi</string>
+    <string name="poi_clothes_fur">Krzno</string>
+    <string name="poi_clothes_leather">Koža</string>
+    <string name="poi_clothes_costumes">Kostimi</string>
+    <string name="poi_clothes_traditional">Tradicionalno</string>
+    <string name="poi_clothes_suits">Odela</string>
+    <string name="poi_clothes_maternity">Porodiljska</string>
+    <string name="poi_clothes_vintage">Staromodna</string>
+    <string name="poi_clothes_oversize">Veći brojevi</string>
+    <string name="poi_clothes_schoolwear">Školska</string>
+    <string name="poi_clothes_swimwear">Plivačka</string>
+    <string name="poi_clothes_socks">Čarape</string>
+    <string name="poi_clothes_shirts">Košulje</string>
+    <string name="poi_clothes_dance">Plesačka</string>
+    <string name="poi_clothes_military">Vojna</string>
+    <string name="poi_historic_milestone">Istorijska prekretnica</string>
+    <string name="poi_shoes_children">Dečja</string>
+    <string name="poi_shoes_women">Ženska</string>
+    <string name="poi_shoes_sport">Sportska</string>
+    <string name="poi_shoes_men">Muška</string>
+    <string name="poi_shoes_orthopedic">Ortopedska</string>
+    <string name="poi_historic_manor">Istorijski posed</string>
+    <string name="poi_castle_type_stately">Tip dvorca: izražajan</string>
+    <string name="poi_castle_type_defensive">Tip dvorca: odbranbeni</string>
+    <string name="poi_castle_type_fortress">Tip dvorca: tvrđava</string>
+    <string name="poi_castle_type_palace">Tip dvorca: palata</string>
+    <string name="poi_castle_type_kremlin">Tip dvorca: kremlj</string>
+    <string name="poi_castle_type_defensive_stately">Tip dvorca: odbranbeni, izražajan</string>
+    <string name="poi_castle_type_castrum">Tip dvorca: utvrđenje</string>
+    <string name="poi_castle_type_shiro">Tip dvorca: širo</string>
+    <string name="poi_massage_thai">Tajlandska</string>
+    <string name="poi_massage_sexual">Seksualna</string>
+    <string name="poi_massage_chinese">Kineska</string>
+    <string name="poi_massage_therapeutic">Terapeutska</string>
+    <string name="poi_massage_yes">Usluge masaže</string>
+    <string name="poi_sauna_yes">Usluge saune</string>
+    <string name="poi_solarium_yes">Usluge solarijuma</string>
+    <string name="poi_tents_yes">Dopušteno</string>
+    <string name="poi_tents_no">Šatori nisu dozvoljeni</string>
+    <string name="poi_openfire_yes">Otvorena vatra dozvoljena</string>
+    <string name="poi_openfire_no">Otvorena vatra nedozvoljena</string>
+    <string name="poi_backcountry_yes">Da</string>
+    <string name="poi_backcountry_no">Ne</string>
+    <string name="poi_scout_yes">Da</string>
+    <string name="poi_scout_no">Izviđački kamp: ne</string>
+    <string name="poi_group_only_yes">Grupno samo: da</string>
+    <string name="poi_group_only_no">Grupno samo: ne</string>
+    <string name="poi_washing_machine_yes">Da</string>
+    <string name="poi_washing_machine_no">Veš mašina: ne</string>
+    <string name="poi_caravans_yes">Da</string>
+    <string name="poi_caravans_no">Karavani: ne</string>
+    <string name="poi_impromptu_yes">Improvizovano: da</string>
+    <string name="poi_impromptu_no">Improvizovano: ne</string>
+    <string name="poi_sanitary_dump_station_yes">Sanitarna otpadna stanica: da</string>
+    <string name="poi_sanitary_dump_station_no">Sanitarna otpadna stanica: ne</string>
+    <string name="poi_power_supply_no">Izvor napajanja: ne</string>
+    <string name="poi_power_supply_cee_17_blue">Izvor napajanja (utičnica): CEE 17 plava</string>
+    <string name="poi_power_supply_cee_7_4">Izvor napajanja (utičnica): CEE 7/4</string>
+    <string name="poi_power_supply_cee_7_5">Izvor napajanja (utičnica): CEE 7/5</string>
+    <string name="poi_power_supply_nema_5_15">Izvor napajanja (utičnica): NEMA 5-15</string>
+    <string name="poi_capacity_tents">Maksimalni broj šatora</string>
+    <string name="poi_capacity_caravans">Maksimalni broj karavana</string>
+    <string name="poi_dog_yes">Dozvoljeno za pse</string>
+    <string name="poi_dog_no">Nije dozvoljeno za pse</string>
+    <string name="poi_refugee_yes">Objekti za izbeglice</string>
+    <string name="poi_refugee_no">Izbeglice: ne</string>
+    <string name="poi_social_facility_group_home">Grupno mesto</string>
+    <string name="poi_social_facility_assisted_living">Usluga zbrinjavanja</string>
+    <string name="poi_social_facility_outreach">Nerezidentno zbrinjavanje</string>
+    <string name="poi_social_facility_food_bank">Javna kuhinja</string>
+    <string name="poi_social_facility_shelter">Sklonište</string>
+    <string name="poi_social_facility_ambulatory_care">Ambulantna pomoć</string>
+    <string name="poi_social_facility_workshop">Radionica</string>
+    <string name="poi_social_facility_day_care">Dnevna nega</string>
+    <string name="poi_social_facility_for_senior">Starije osobe</string>
+    <string name="poi_social_facility_for_child">Deca</string>
+    <string name="poi_social_facility_for_orphan">Siročad</string>
+    <string name="poi_social_facility_for_disabled">Osobe sa invaliditetom</string>
+    <string name="poi_social_facility_for_mental_health">Mentalno bolesni pacijenti</string>
+    <string name="poi_social_facility_for_juvenile">Maloletnici</string>
+    <string name="poi_social_facility_for_homeless">Beskućnici</string>
+    <string name="poi_social_facility_for_migrant">Migranti</string>
+    <string name="poi_social_facility_for_underprivileged">Maloprivilegovani</string>
+    <string name="poi_social_facility_for_drug_addicted">Narkozavisnici</string>
+    <string name="poi_social_facility_for_unemployed">Nezaposleni</string>
+    <string name="poi_social_facility_for_diseased">Bolesni</string>
+    <string name="poi_social_facility_for_child_juvenile">Mlađi maloletnici</string>
+    <string name="poi_theatre_genre_philharmonic">Filharmonija</string>
+    <string name="poi_theatre_genre_musical">Muzikal</string>
+    <string name="poi_theatre_genre_drama">Drama</string>
+    <string name="poi_theatre_genre_opera">Opera</string>
+    <string name="poi_theatre_genre_cabaret">Kabare</string>
+    <string name="poi_theatre_genre_puppet">Lutkarstvo</string>
+    <string name="poi_theatre_genre_comedy">Komedija</string>
+    <string name="poi_theatre_genre_chamber_music">Kamerna muzika</string>
+    <string name="poi_theatre_genre_marionette">Marionetski</string>
+    <string name="poi_theatre_genre_ballet">Balet</string>
+    <string name="poi_theatre_genre_shadow_play">Predstava senki</string>
+    <string name="poi_bandstand">Poligonalna bina</string>
+    <string name="poi_kiln">Zatvoreni lonac</string>
+    <string name="poi_product_brick">Proizvod: cigla</string>
+    <string name="poi_product_quicklime">Proizvod: negašen kreč</string>
+    <string name="poi_product_leather">Proizvod: koža</string>
+    <string name="poi_product_lime">Proizvod: kreč</string>
+    <string name="poi_product_beer">Proizvod: pivo</string>
+    <string name="poi_product_charcoal">Proizvod: ćumur</string>
+    <string name="poi_product_meat">Proizvod: meso</string>
+    <string name="poi_wheelchair_description">Opis za korisnike invalidskih kolica</string>
+    <string name="poi_blind_description">Opis za slepe</string>
+    <string name="poi_deaf_description">Opis za gluve</string>
+    <string name="poi_highway_steps">Stepenice</string>
+    <string name="poi_handrail_yes">Rukohvat: da</string>
+    <string name="poi_handrail_no">Rukohvat: ne</string>
+    <string name="poi_ramp_yes">Rampa: da</string>
+    <string name="poi_ramp_no">Rampa: ne</string>
+    <string name="poi_ramp_wheelchair_yes">Rampa za invalidska kolica: da</string>
+    <string name="poi_ramp_wheelchair_no">Rampa za invalidska kolica: ne</string>
+    <string name="poi_ramp_stroller_yes">Rampa (sa stepenicama): da</string>
+    <string name="poi_ramp_stroller_no">Rampa (sa stepenicama): ne</string>
+    <string name="poi_ramp_bicycle_yes">Rampa za bicikle: da</string>
+    <string name="poi_ramp_bicycle_no">Rampa za bicikle: ne</string>
+    <string name="poi_ramp_luggage_yes">Rampa za prtljag: da</string>
+    <string name="poi_ramp_luggage_no">Rampa za prtljag: ne</string>
+    <string name="poi_step_count">Broj stepenika</string>
+    <string name="poi_step_condition_even">Stanje stepenika: isto</string>
+    <string name="poi_step_condition_uneven">Stanje stepenika: različito</string>
+    <string name="poi_step_condition_rough">Stanje stepenika: grubo</string>
+    <string name="poi_cairn">Gomila kamenja</string>
+    <string name="poi_defibrillator">Defibrilator</string>
+    <string name="poi_defibrillator_yes">Defibrilator: da</string>
+    <string name="poi_tomb_war_grave">Tip: ratno groblje</string>
+    <string name="poi_tomb_tumulus">Tip: humka</string>
+    <string name="poi_tomb_rock_cut">Tip: u steni</string>
+    <string name="poi_tomb_hypogeum">Tip: podzemna</string>
+    <string name="poi_tomb_vault">Tip: komora</string>
+    <string name="poi_tomb_columbarium">Tip: kolumbarijum</string>
+    <string name="poi_tomb_mausoleum">Tip: mauzolej</string>
+    <string name="poi_tomb_sarcophagus">Tip: sarkofag</string>
+    <string name="poi_tomb_crypt">Tip: kripta</string>
+    <string name="poi_tomb_pyramid">Tip: piramida</string>
+    <string name="poi_historic_civilization_ancient_roman">Civilizacija: starorimska (753.g. pre.H - 284.g. posl.H)</string>
+    <string name="poi_historic_civilization_nuragic">Civilizacija: nuragska (18. v.pre.H - 2. v.posl.H)</string>
+    <string name="poi_historic_civilization_etruscan">Civilizacija: etrurska (12. v. - 6. v.posl.H)</string>
+    <string name="poi_historic_civilization_prehistoric">Civilizacija: praistorijska</string>
+    <string name="poi_historic_civilization_ancient_greek">Civilizacija: starogrčka</string>
+    <string name="poi_historic_civilization_roman">Civilizacija: rimska</string>
+    <string name="poi_historic_civilization_byzantine">Civilizacija: vizantijska (285.g. posl.H - 1453.g. posl.H)</string>
+    <string name="poi_historic_civilization_imperial_chinese">Civilizacija: imperijalnokineska (221.g. pre.H - 1911.g. posl.H)</string>
+    <string name="poi_historic_civilization_ancient_egyptian">Civilizacija: staroegipadska (do 332.g. pre.H)</string>
+    <string name="poi_historic_civilization_celtic">Civilizacija: keltska</string>
+    <string name="poi_historic_civilization_western_roman">Civilizacija: zapadnorimska (285.g. posl.H - 476.g. posl.H)</string>
+    <string name="poi_historic_civilization_mycenaean">Civilizacija: mikenska</string>
+    <string name="poi_historic_civilization_dacian">Civilizacija: dačanska</string>
+    <string name="poi_historic_civilization_hernici">Civilizacija: hernička</string>
+    <string name="poi_historic_civilization_greek_egyptian">Civilizacija: grčko egipadska (332.g. pre.H - 30.g. pre.H)</string>
+    <string name="poi_historic_civilization_roman_and_byzantine_egyptian">Civilizacija: rimsko i vizantijsko egipadska</string>
+    <string name="poi_historic_civilization_helladic">Civilizacija: eladska</string>
+    <string name="poi_historic_civilization_cycladic">Civilizacija: cikladska</string>
+    <string name="poi_historic_civilization_minoan">Civilizacija: minonska</string>
+    <string name="poi_historic_civilization_tiahuanacota">Civilizacija: tiahunakotska</string>
+    <string name="poi_animal_training">Trening životinja</string>
+    <string name="poi_animal_training_dog">Pas</string>
+    <string name="poi_animal_training_horse">Konj</string>
+    <string name="poi_horse_yes">Dozvoljeno konjima</string>
+    <string name="poi_horse_no">Nedozvoljeno konjima</string>
+    <string name="poi_animal_yes">Dozvoljeno životinjama</string>
+    <string name="poi_animal_no">Nedozvoljeno životinjama</string>
+    <string name="poi_historic_period_nuragic">Istorijski period: nuragski</string>
+    <string name="poi_historic_period_stone_bronze_undetermined">Istorijski period: kameno doba / bronzano doba (neodređeno)</string>
+    <string name="poi_historic_period_bronze_age">Istorijski period: bronzano doba</string>
+    <string name="poi_historic_period_principate">Istorijski period: principat (27.g. pre.H - 284.g. posl.H)</string>
+    <string name="poi_historic_period_classical_greece">Istorijski period: klasično grčki (5.v. - 4.v. pre.H)</string>
+    <string name="poi_historic_period_archaic_greece">Istorijski period: arhaično grčki</string>
+    <string name="poi_historic_period_iron_age">Istorijski period: gvozdeno doba</string>
+    <string name="poi_historic_period_roman_republic">Istorijski period: Rimska republika (508.g. pre.H - 27.g. pre.H)</string>
+    <string name="poi_historic_period_hellenistic_greece">Istorijski period: helensko grčki</string>
+    <string name="poi_historic_period_new_kingdom">Istorijski period: novo carstvo (1550 - 1069 pre.H)</string>
+    <string name="poi_historic_period_middle_kingdom">Istorijski period: srednje carstvo (2055 - 1650 pre.H)</string>
+    <string name="poi_historic_period_predynastic_egypt">Istorijski period: predinastijsko egipadski</string>
+    <string name="poi_historic_period_early_dynastic_period">Istorijski period: rano dinastijski period (3100 - 2686 pre.H)</string>
+    <string name="poi_historic_period_old_kingdom">Istorijski period: staro carstvo (2686 - 2181 pre.H)</string>
+    <string name="poi_historic_period_first_intermediate_period">Istorijski period: prvi međuperiod (2181 - 2055 pre.H)</string>
+    <string name="poi_historic_period_second_intermediate_period">Istorijski period: drugi međuperiod (1650 - 1550 pre.H)</string>
+    <string name="poi_historic_period_third_intermediate_period">Istorijski period: treći međuperiod (1069 - 664 pre.H)</string>
+    <string name="poi_historic_period_first_persian_period">Istorijski period: prvi persijski period</string>
+    <string name="poi_historic_period_late_period">Istorijski period: kasni period (664 - 332 pre.H)</string>
+    <string name="poi_historic_period_second_persian_period">Istorijski period: drugi persijski period</string>
+    <string name="poi_historic_period_alexander_the_great">Istorijski period: Aleksandra Velikog</string>
+    <string name="poi_historic_period_ptolemaic_egypt">Istorijski period: ptolomejsko egipadski (305 pre.H - 30 pre.H)</string>
+    <string name="poi_historic_period_christian_egypt">Istorijski period: hrišćansko egipadski</string>
+    <string name="poi_historic_period_byzantine_egypt">Istorijski period: vizantijsko egipadski (30 pre.H - 641 posl.H)</string>
+    <string name="poi_historic_period_persian_occupation">Istorijski period: persijska okupacija</string>
+    <string name="poi_historic_period_greek_dark_ages">Istorijski period: Grčki Srednji Vek (1100 - 800 pre.H)</string>
+    <string name="poi_historic_period_roman_greece">Istorijski period: Rimsko Grčki (146 pre.H - 330 posl.H)</string>
+    <string name="poi_historic_period_roman_kingdom">Istorijski period: Rimsko carstvo (753.g. pre.H - 509.g. pre.H)</string>
+    <string name="poi_historic_period_dominate">Istorijski period: dominirajući (285.g. posl.H - 476.g. posl.H)</string>
+    <string name="poi_historic_period_villager">Istorijski period: seljački (epoha 1., 2., 1580 pre.H - 133 posl.H)</string>
+    <string name="poi_historic_period_urban">Istorijski period: urbanski (epoha 3., 133 posl.H - 374 posl.H)</string>
+    <string name="poi_historic_period_classical">Istorijski period: klasični (epoha 4., 374 posl.H - 900 posl.H)</string>
+    <string name="poi_historic_period_imperial">Istorijski period: iperijalni (epoha 5., 900 posl.H - 1200 posl.H)</string>
+    <string name="poi_historic_era_paleolithic">Istorijska epoha: paleolitska (2,6 miliona god. - 10000 BP)</string>
+    <string name="poi_historic_era_mesolithic">Istorijska epoha: mezolitska</string>
+    <string name="poi_historic_era_neolithic">Istorijska epoha: neolitska</string>
+    <string name="poi_historic_era_chalcolithic">Istorijska epoha: bakarno doba (4. - 3. milenijum pre.H)</string>
+    <string name="poi_historic_stone">Istorijski kamen</string>
+    <string name="poi_stone_type_conciliation_cross">Tip: krst pomirenja</string>
+    <string name="poi_stone_type_coat_of_arms">Tip: grb</string>
+    <string name="poi_atm">ATM</string>
+    <string name="poi_material_wood">Materijal: drvo</string>
+    <string name="poi_material_metal">Materijal: metal</string>
+    <string name="poi_material_reinforced_concrete">Materijal: ojačani beton</string>
+    <string name="poi_material_concrete">Materijal: beton</string>
+    <string name="poi_material_steel">Materijal: čelik</string>
+    <string name="poi_material_stone">Materijal: kamen</string>
+    <string name="poi_material_masonry">Materijal: zidarski</string>
+    <string name="poi_material_brick">Materijal: cigla</string>
+    <string name="poi_material_plastic">Materijal: plastika</string>
+    <string name="poi_material_sandstone">Materijal: kameni pesak</string>
+    <string name="poi_material_granite_stone">Materijal: granitni kamen</string>
+    <string name="poi_material_metal_wood">Materijal: metal, drvo</string>
+    <string name="poi_material_glass">Materijal: staklo</string>
+    <string name="poi_material_bronze">Materijal: bronza</string>
+    <string name="poi_material_earth">Materijal: zemlja</string>
+    <string name="poi_material_composite">Materijal: kompozit</string>
+    <string name="poi_material_limestone">Materijal: krečnjak</string>
+    <string name="poi_material_marble">Materijal: mermer</string>
+    <string name="poi_material_aluminium">Materijal: aluminijum</string>
+    <string name="poi_site_type_megalith">Megalit</string>
+    <string name="poi_site_type_tumulus">Humka</string>
+    <string name="poi_site_type_fortification">Utvrđenje</string>
+    <string name="poi_site_type_settlement">Naselje</string>
+    <string name="poi_site_type_city">Velegrad</string>
+    <string name="poi_site_type_hut_circle">Krug kućišta</string>
+    <string name="poi_site_type_petroglyph">Petroglif</string>
+    <string name="poi_site_type_earthwork">Zemljana barijera</string>
+    <string name="poi_aerodrome_type_military">Vojni aerodrom</string>
+    <string name="poi_aerodrome_type_military_public">Vojni/civilni</string>
+    <string name="poi_fitness_station">Teretana na otvorenom</string>
+    <string name="poi_health_specialty_biochemistry_yes">Biohemija</string>
+    <string name="poi_fitness_centre">Teretana</string>
+    <string name="poi_fitness">Fitnes</string>
+    <string name="poi_car_wash_yes">Da</string>
+    <string name="poi_cuisine">Tip kuhinje</string>
+    <string name="poi_cuisine_pizza">Pice</string>
+    <string name="poi_cuisine_burger">Pljeskavice</string>
+    <string name="poi_cuisine_coffee">Kafa</string>
+    <string name="poi_cuisine_sandwich">Sendviči</string>
+    <string name="poi_cuisine_kebab">Kebab</string>
+    <string name="poi_cuisine_doner">Doner kebab (šavurma)</string>
+    <string name="poi_cuisine_chicken">Piletina</string>
+    <string name="poi_cuisine_ice_cream">Sladoled</string>
+    <string name="poi_cuisine_sushi">Suši</string>
+    <string name="poi_cuisine_seafood">Plodovi mora</string>
+    <string name="poi_cuisine_barbecue">Roštilj</string>
+    <string name="poi_cuisine_noodle">Nudle</string>
+    <string name="poi_cuisine_donut">Krofne</string>
+    <string name="poi_cuisine_ramen">Ramen</string>
+    <string name="poi_cuisine_crepe">Palačinke</string>
+    <string name="poi_cuisine_breakfast">Doručak</string>
+    <string name="poi_cuisine_steak">Šnicle</string>
+    <string name="poi_cuisine_tapas">Tapas</string>
+    <string name="poi_cuisine_curry">Kari</string>
+    <string name="poi_cuisine_grill">Gril</string>
+    <string name="poi_cuisine_diner">Večera</string>
+    <string name="poi_cuisine_sausage">Kobasice</string>
+    <string name="poi_cuisine_cake">Torte</string>
+    <string name="poi_cuisine_pancake">Američke palačinke</string>
+    <string name="poi_cuisine_pasta">Testenine</string>
+    <string name="poi_cuisine_fast_food">Brza hrana</string>
+    <string name="poi_cuisine_juice">Sokovi</string>
+    <string name="poi_cuisine_tea">Čaj</string>
+    <string name="poi_cuisine_tea_shop">Prodavnica čaja</string>
+    <string name="poi_cuisine_soup">Supe</string>
+    <string name="poi_cuisine_pie">Pite</string>
+    <string name="poi_cuisine_hotdog">Hotdog</string>
+    <string name="poi_cuisine_salad">Salate</string>
+    <string name="poi_cuisine_fried_food">Pržena hrana</string>
+    <string name="poi_cuisine_bistro">Bistro</string>
+    <string name="poi_cuisine_bakery">Pekara</string>
+    <string name="poi_cuisine_couscous">Kuskus</string>
+    <string name="poi_cuisine_fried_chicken">Pržena piletina</string>
+    <string name="poi_cuisine_dessert">Dezerti</string>
+    <string name="poi_cuisine_tacos">Takosi</string>
+    <string name="poi_cuisine_falafel">Falafel</string>
+    <string name="poi_cuisine_smoothie">Smuti</string>
+    <string name="poi_cuisine_souvlaki">Suvlaki</string>
+    <string name="poi_cuisine_yogurt">Jogurt</string>
+    <string name="poi_cuisine_gyros">Giros</string>
+    <string name="poi_cuisine_crepes">Palačinke</string>
+    <string name="poi_cuisine_yakiniku">Jakiniku</string>
+    <string name="poi_cuisine_suki">Suki</string>
+    <string name="poi_cuisine_udon">Udon</string>
+    <string name="poi_cuisine_yakitori">Jakotori</string>
+    <string name="poi_cuisine_meat">Meso</string>
+    <string name="poi_cuisine_wings">Krilca</string>
+    <string name="poi_cuisine_waffle">Vafle</string>
+    <string name="poi_cuisine_chocolate">Čokolada</string>
+    <string name="poi_cuisine_wine">Vino</string>
+    <string name="poi_cuisine_potato">Krompir</string>
+    <string name="poi_cuisine_brunch">Branč</string>
+    <string name="poi_cuisine_pita">Pita</string>
+    <string name="poi_cuisine_fondue">Fandu</string>
+    <string name="poi_cuisine_baguette">Bageti</string>
+    <string name="poi_cuisine_burrito">Buritosi</string>
+    <string name="poi_cuisine_teriyaki">Terijaki</string>
+    <string name="poi_cuisine_shawarma">Šavurma</string>
+    <string name="poi_cuisine_regional">Regionalna</string>
+    <string name="poi_cuisine_italian">Italijanska</string>
+    <string name="poi_cuisine_chinese">Kineska</string>
+    <string name="poi_cuisine_mexican">Meksička</string>
+    <string name="poi_cuisine_japanese">Japanska</string>
+    <string name="poi_cuisine_german">Nemačka</string>
+    <string name="poi_cuisine_indian">Indijska</string>
+    <string name="poi_cuisine_american">Američka</string>
+    <string name="poi_cuisine_asian">Azijska</string>
+    <string name="poi_cuisine_french">Francuska</string>
+    <string name="poi_cuisine_greek">Grčka</string>
+    <string name="poi_cuisine_thai">Tajlandska</string>
+    <string name="poi_cuisine_international">Internacionalna</string>
+    <string name="poi_cuisine_turkish">Turska</string>
+    <string name="poi_cuisine_spanish">Španska</string>
+    <string name="poi_cuisine_vietnamese">Vijetnamska</string>
+    <string name="poi_cuisine_korean">Korejska</string>
+    <string name="poi_cuisine_mediterranean">Mediteranska</string>
+    <string name="poi_cuisine_bavarian">Bavarska</string>
+    <string name="poi_cuisine_lebanese">Libanska</string>
+    <string name="poi_cuisine_russian">Ruska</string>
+    <string name="poi_cuisine_filipino">Filipinska</string>
+    <string name="poi_cuisine_portuguese">Portugalska</string>
+    <string name="poi_cuisine_georgian">Gruzijska</string>
+    <string name="poi_cuisine_polish">Poljska</string>
+    <string name="poi_cuisine_brazilian">Brazilska</string>
+    <string name="poi_cuisine_arab">Arapska</string>
+    <string name="poi_cuisine_danish">Danska</string>
+    <string name="poi_cuisine_indonesian">Indonežanska</string>
+    <string name="poi_cuisine_african">Afrička</string>
+    <string name="poi_cuisine_caribbean">Karipska</string>
+    <string name="poi_cuisine_argentinian">Argentinska</string>
+    <string name="poi_cuisine_balkan">Balkanska</string>
+    <string name="poi_cuisine_peruvian">Peruanska</string>
+    <string name="poi_cuisine_croatian">Hrvatska</string>
+    <string name="poi_cuisine_bolivian">Bolivijska</string>
+    <string name="poi_cuisine_malagasy">Malagaška</string>
+    <string name="poi_cuisine_persian">Persijska</string>
+    <string name="poi_cuisine_moroccan">Marokanska</string>
+    <string name="poi_cuisine_austrian">Austrijska</string>
+    <string name="poi_cuisine_malaysian">Malezijska</string>
+    <string name="poi_cuisine_irish">Irska</string>
+    <string name="poi_cuisine_ethiopian">Etiopijska</string>
+    <string name="poi_cuisine_hungarian">Mađarska</string>
+    <string name="poi_cuisine_lao">Laoska</string>
+    <string name="poi_cuisine_european">Evropska</string>
+    <string name="poi_cuisine_uzbek">Uzbekistanska</string>
+    <string name="poi_cuisine_czech">Češka</string>
+    <string name="poi_cuisine_cuban">Kubanska</string>
+    <string name="poi_cuisine_british">Britanska</string>
+    <string name="poi_cuisine_latin_american">Latinoamerička</string>
+    <string name="poi_cuisine_nepalese">Nepalska</string>
+    <string name="poi_cuisine_mongolian">Mongolska</string>
+    <string name="poi_cuisine_middle_eastern">Bliskoistočna</string>
+    <string name="poi_cuisine_ukrainian">Ukrajinska</string>
+    <string name="poi_cuisine_afghan">Avganistanska</string>
+    <string name="poi_cuisine_belgian">Belgijska</string>
+    <string name="poi_cuisine_basque">Baskijska</string>
+    <string name="poi_cuisine_swiss">Švajcarska</string>
+    <string name="poi_cuisine_swedish">Švedska</string>
+    <string name="poi_cuisine_jamaican">Jamajčanska</string>
+    <string name="poi_cuisine_armenian">Jermenska</string>
+    <string name="poi_cuisine_hawaiian">Havajska</string>
+    <string name="poi_cuisine_english">Engleska</string>
+    <string name="poi_cuisine_pakistani">Pakistanska</string>
+    <string name="poi_cuisine_taiwanese">Tajvanska</string>
+    <string name="poi_cuisine_tex_mex">Teks-meks</string>
+    <string name="poi_cuisine_dutch">Holandska</string>
+    <string name="poi_cuisine_syrian">Sirijska</string>
+    <string name="poi_cuisine_australian">Australijanska</string>
+    <string name="poi_cuisine_cajun">Kadžun</string>
+    <string name="poi_cuisine_egyptian">Egipatska</string>
+    <string name="poi_cuisine_senegalese">Senegalska</string>
+    <string name="poi_cuisine_jewish">Jevrejska</string>
+    <string name="poi_cuisine_bulgarian">Bugarska</string>
+    <string name="poi_cuisine_tibetan">Tibetanska</string>
+    <string name="poi_barometer_yes">Barometar</string>
+    <string name="poi_barometer_no">Barometar: ne</string>
+    <string name="poi_barbecue_grill">Roštilj: da</string>
+    <string name="poi_bulk_purchase">Prodavnica na veliko</string>
+    <string name="poi_books_type">Knjige</string>
+    <string name="poi_park_ride">Park i vožnja</string>
+    <string name="poi_climbing_crag">Da</string>
+    <string name="poi_snowmobile_filter">Pristup vozilima za sneg</string>
+    <string name="poi_water_place_access_community">Komunalni</string>
+    <string name="poi_water_place_access_family">Porodični</string>
+    <string name="poi_water_place_access_multifamilies">Za više porodica</string>
+    <string name="poi_substation_type">Tip</string>
+    <string name="poi_access_bus">Pristup autobusu</string>
+    <string name="poi_access_caravan">Pristup karavanu</string>
+    <string name="poi_access_trailer">Pristup prikolici</string>
+    <string name="poi_access_motorcycle">Pristup motociklima</string>
+    <string name="poi_access_moped">Pristup mopedu</string>
+    <string name="poi_access_hgv">HGV pristup</string>
+    <string name="poi_access_goods">Pristup vozilima za laku robu</string>
+    <string name="poi_access_disabled">Pristup za osobe sa invaliditetom</string>
+    <string name="poi_vehicle_yes">Pristup vozilom: da</string>
+    <string name="poi_vehicle_private">Pristup vozilom: privatni</string>
+    <string name="poi_vehicle_no">Pristup vozilom: ne</string>
+    <string name="poi_vehicle_destination">Pristup vozilom: samo do odredišta</string>
+    <string name="poi_vehicle_permissive">Pristup vozilom: odobren</string>
+    <string name="poi_vehicle_customers">Pristup vozilom: za mušterije</string>
+    <string name="poi_vehicle_military">Pristup vozilom: vojni</string>
+    <string name="poi_vehicle_delivery">Pristup vozilom: dostava</string>
+    <string name="poi_vehicle_forestry">Pristup vozilom: šumski saobraćaj</string>
+    <string name="poi_motorcar_yes">Pristup motornim autom: da</string>
+    <string name="poi_motorcar_private">Pristup motornim autom: privatni</string>
+    <string name="poi_motorcar_no">Pristup motornim autom: ne</string>
+    <string name="poi_motorcar_destination">Pristup motornim autom: samo do odredišta</string>
+    <string name="poi_motorcar_permissive">Pristup motornim autom: odobren</string>
+    <string name="poi_motorcar_customers">Pristup motornim autom: za mušterije</string>
+    <string name="poi_motorcar_forestry">Pristup motornim autom: šumski saobraćaj</string>
+    <string name="poi_motor_vehicle_yes">Pristup motornim vozilom: da</string>
+    <string name="poi_motor_vehicle_private">Pristup motornim vozilom: privatni</string>
+    <string name="poi_motor_vehicle_no">Pristup motornim vozilom: ne</string>
+    <string name="poi_motor_vehicle_destination">Pristup motornim vozilom: samo do odredišta</string>
+    <string name="poi_motor_vehicle_permissive">Pristup motornim vozilom: odobren</string>
+    <string name="poi_motor_vehicle_customers">Pristup motornim vozilom: za mušterije</string>
+    <string name="poi_motor_vehicle_military">Pristup motornim vozilom: vojni</string>
+    <string name="poi_motor_vehicle_delivery">Pristup motornim vozilom: dostava</string>
+    <string name="poi_motor_vehicle_forestry">Pristup motornim vozilom: šumski saobraćaj</string>
+    <string name="poi_motor_vehicle_agricultural">Pristup motornim vozilom: poljoprivredni</string>
+    <string name="poi_hgv_private">HGV pristup: privatni</string>
+    <string name="poi_hgv_no">HGV pristup: ne</string>
+    <string name="poi_hgv_agricultural">HGV pristup: poljoprivredni</string>
+    <string name="poi_hgv_discouraged">HGV pristup: nepreporučen</string>
+    <string name="poi_hgv_unsuitable">HGV pristup: nepogodno</string>
+    <string name="poi_goods_no">Pristup za laka dostavna vozila: ne</string>
+    <string name="poi_motorcycle_private">Pristup za motocikle: privatni</string>
+    <string name="poi_motorcycle_no">Pristup za motocikle: ne</string>
+    <string name="poi_moped_no">Pristup za mopede: ne</string>
+    <string name="poi_bicycle_private">Pristup za bicikle: privatni</string>
+    <string name="poi_bicycle_dismount">Pristup za bicikle: samo uz guranje bicikle</string>
+    <string name="poi_bicycle_destination">Pristup za bicikle: samo do odredišta</string>
+    <string name="poi_bicycle_permissive">Pristup za bicikle: odobren</string>
+    <string name="poi_bicycle_customers">Pristup za bicikle: za mušterije</string>
+    <string name="poi_horse_private">Pristup konjem: privatni</string>
+    <string name="poi_horse_destination">Pristup konjem: samo do odredišta</string>
+    <string name="poi_horse_permissive">Pristup konjem: odobren</string>
+    <string name="poi_horse_forestry">Pristup konjem: šumski</string>
+    <string name="poi_foot_yes">Pristup za pešake: da</string>
+    <string name="poi_foot_private">Pristup za pešake: privatni</string>
+    <string name="poi_foot_no">Pristup za pešake: ne</string>
+    <string name="poi_foot_destination">Pristup za pešake: samo do odredišta</string>
+    <string name="poi_foot_permissive">Pristup za pešake: odobren</string>
+    <string name="poi_foot_customers">Pristup za pešake: za mušterije</string>
+    <string name="poi_caravan_no">Pristup za karavan: ne</string>
+    <string name="poi_trailer_no">Pristup za prikolice: ne</string>
+    <string name="poi_bus_no">Pristup za autobuse: ne</string>
+    <string name="poi_tourist_bus_yes">Pristup za turističke autobuse: da</string>
+    <string name="poi_tourist_bus_designated">Pristup za turističke autobuse: namenjen</string>
+    <string name="poi_tourist_bus_no">Pristup za turističke autobuse: ne</string>
+    <string name="poi_ski_yes">Ski pristup: da</string>
+    <string name="poi_ski_no">Ski pristup: ne</string>
+    <string name="poi_snowmobile_private">Pristup za snoumobil: privatni</string>
+    <string name="poi_snowmobile_no">Pristup za snoumobil: ne</string>
+    <string name="poi_agricultural_yes">Pristup za poljoprivredna vozila: da</string>
+    <string name="poi_agricultural_no">Pristup za poljoprivredna vozila: ne</string>
+    <string name="poi_taxi_yes">Pristup za taksi: da</string>
+    <string name="poi_taxi_designated">Pristup za taksi: namenjen</string>
+    <string name="poi_taxi_no">Pristup za taksi: ne</string>
+    <string name="poi_disabled_no">Pristup za invalide: ne</string>
+    <string name="poi_megalith_type_menhir">Tip megalita: menhir</string>
+    <string name="poi_megalith_type_dolmen">Tip megalita: dolmen</string>
+    <string name="poi_megalith_type_nuraghe">Tip megalita: nuragi</string>
+    <string name="poi_megalith_type_stone_circle">Tip megalita: kameni krugovi</string>
+    <string name="poi_megalith_type_passage_grave">Tip megalita: koridorna grobnica</string>
+    <string name="poi_fortification_type_hill_fort">Tip utvrđenja: gradina</string>
+    <string name="poi_fortification_type_limes">Tip utvrđenja: limes</string>
+    <string name="poi_fortification_type_sconce">Tip utvrđenja: šanac</string>
+    <string name="poi_fortification_type_ring_ditch">Tip utvrđenja: ukopani kružni šanac</string>
+    <string name="poi_pa">Pa (maorska utvrđena naseobina)</string>
+    <string name="poi_historic_farm">Istorijsko imanje</string>
+    <string name="poi_historic_railway_station">Istorijska železnička stanica</string>
+    <string name="poi_historic_threshing_floor">Istorijsko gumno</string>
+    <string name="poi_historic_gallows">Istorijska vešala</string>
+    <string name="poi_historic_railway">Istorijske šine</string>
+    <string name="poi_square">Trg</string>
+    <string name="poi_artist_name">Umetnik</string>
+    <string name="poi_sculptor">Vajar</string>
+    <string name="poi_building_type_church">Tip zgrade: crkva</string>
+    <string name="poi_building_type_chapel">Tip zgrade: kapela</string>
+    <string name="poi_building_type_mosque">Tip zgrade: džamija</string>
+    <string name="poi_building_type_temple">Tip zgrade: hram</string>
+    <string name="poi_building_type_cathedral">Tip zgrade: katedrala</string>
+    <string name="poi_building_type_monastery">Tip zgrade: manastir</string>
+    <string name="poi_building_type_basilica">Tip zgrade: bazilika</string>
+    <string name="poi_building_type_synagogue">Tip zgrade: sinagoga</string>
+    <string name="poi_building_type_shrine">Tip zgrade: svetilište</string>
+    <string name="poi_cross">Krst</string>
+    <string name="poi_summit_cross">Krst na vrhu: da</string>
+    <string name="poi_prison_camp">Bivši zatvorenički logor</string>
+    <string name="poi_concentration_camp">Tip: koncentracioni logor</string>
+    <string name="poi_pow_camp">Tip: zarobljenički logor</string>
+    <string name="poi_labor_camp">Tip: radni logor</string>
+    <string name="poi_concentration_camp_nazism">Tip: nacistički</string>
+    <string name="poi_concentration_camp_gulag">Tip: gulag</string>
+    <string name="poi_temperature">Temperatura</string>
+    <string name="poi_bathing_yes">Kupanje: da</string>
+    <string name="poi_bathing_no">Kupanje: ne</string>
+    <string name="poi_boat_storage">Skladište za brodove</string>
+    <string name="poi_conveying_yes">Pokretno: da</string>
+    <string name="poi_cargo_passengers">Putnici</string>
+    <string name="poi_cargo_vehicle">Vozila</string>
+    <string name="poi_cargo_bicycle">Bicikli</string>
+    <string name="poi_cargo_container">Kontejneri</string>
+    <string name="poi_cargo_hgv">HGV</string>
+    <string name="poi_hackerspace">Hakerski prostor</string>
+    <string name="poi_craft_electronics_repair">Servis za elektroniku</string>
+    <string name="poi_fireworks">Prodavnica vatrometa</string>
+    <string name="poi_aerialway_length">Dužina</string>
+    <string name="poi_health_specialty_general_yes">Opšta praksa</string>
+    <string name="poi_health_specialty_ophthalmology_yes">Oftamologija</string>
+    <string name="poi_health_specialty_gynaecology_yes">Ginekologija</string>
+    <string name="poi_health_specialty_internal_medicine_yes">Interno</string>
+    <string name="poi_health_specialty_orthopaedics_yes">Ortopedija</string>
+    <string name="poi_health_specialty_otolaryngology_yes">Otorinolaringologija</string>
+    <string name="poi_health_specialty_paediatrics_yes">Pedijatrija</string>
+    <string name="poi_health_specialty_paediatrics_no">Medicinska specijalizacija: pedijatrija: ne</string>
+    <string name="poi_health_specialty_dermatology_yes">Dermatologija</string>
+    <string name="poi_health_specialty_urology_yes">Urologija</string>
+    <string name="poi_health_specialty_surgery_yes">Opšta hirurgija</string>
+    <string name="poi_health_specialty_radiology_yes">Radiologija</string>
+    <string name="poi_health_specialty_psychiatry_yes">Psihijatrija</string>
+    <string name="poi_health_specialty_neurology_yes">Neurologija</string>
+    <string name="poi_health_specialty_cardiology_yes">Kardiologija</string>
+    <string name="poi_health_specialty_trauma_yes">Traumatologija</string>
+    <string name="poi_health_specialty_biology_yes">Klinička biologija</string>
+    <string name="poi_health_specialty_osteopathy_yes">Osteopatija</string>
+    <string name="poi_health_specialty_anaesthetics_yes">Anesteziologija</string>
+    <string name="poi_health_specialty_pulmonology_yes">Pulmologija</string>
+    <string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Zubna, oralna i maksilofacijalna hirurgija</string>
+    <string name="poi_health_specialty_maternity_yes">Porodiljsko</string>
+    <string name="poi_health_specialty_emergency_medicine_yes">Urgentna medicina</string>
+    <string name="poi_health_specialty_emergency_medicine_no">Medicinska specijalizacija: urgentna medicina: ne</string>
+    <string name="poi_health_specialty_plastic_surgery_yes">Plastična hirurgija</string>
+    <string name="poi_health_specialty_physiotherapy_yes">Fizioterapija</string>
+    <string name="poi_health_specialty_occupational_yes">Okupaciona terapija</string>
+    <string name="poi_health_specialty_child_psychiatry_yes">Dečija psihijatrija</string>
+    <string name="poi_health_specialty_physiatry_yes">Fizikalna medicina i rehabilitacija</string>
+    <string name="poi_health_specialty_maxillofacial_surgery_yes">Maksilofacijalna hirurgija</string>
+    <string name="poi_health_specialty_diagnostic_radiology_yes">Medicinsko snimanje</string>
+    <string name="poi_health_specialty_gastroenterology_yes">Gastroenterologija</string>
+    <string name="poi_health_specialty_dentistry_yes">Stomatologija</string>
+    <string name="poi_health_specialty_nephrology_yes">Nefrologija (renalne bolesti)</string>
+    <string name="poi_health_specialty_neurosurgery_yes">Neurohirurgija</string>
+    <string name="poi_health_specialty_neuropsychiatry_yes">Neuropsihijatrija</string>
+    <string name="poi_health_specialty_endocrinology_yes">Endokrinologija</string>
+    <string name="poi_health_specialty_nuclear_medicine_yes">Nuklearna medicija</string>
+    <string name="poi_health_specialty_pathology_yes">Patologija</string>
+    <string name="poi_health_specialty_oncology_yes">Onkologija</string>
+    <string name="poi_health_specialty_tropical_medicine_yes">Tropska medicina</string>
+    <string name="poi_health_specialty_tropical_medicine_no">Medicinska specijalizacija: tropska medicina: ne</string>
+    <string name="poi_health_specialty_obstetrics_postnatal_yes">Akušerstvo (postnatalno)</string>
+    <string name="poi_health_specialty_obstetrics_postnatal_no">Medicinska specijalizacija: akušerstvo (postnatalno): ne</string>
+    <string name="poi_health_specialty_obstetrics_antenatal_yes">Akušerstvo (prenatalno)</string>
+    <string name="poi_health_specialty_obstetrics_antenatal_no">Medicinska specijalizacija: akušerstvo (prenatalno): ne</string>
+    <string name="poi_health_specialty_social_paediatrics_yes">Društvena pedijatrija</string>
+    <string name="poi_health_specialty_social_paediatrics_no">Medicinska specijalizacija: društvena pedijatrija: ne</string>
+    <string name="poi_health_specialty_obstetrics_caesarean_section_yes">Akušerstvo (carski rez)</string>
+    <string name="poi_health_specialty_obstetrics_caesarean_section_no">Medicinska specijalizacija: akušerstvo (carski rez): ne</string>
+    <string name="poi_health_specialty_addiction_medicine_yes">Lečenje bolesti zavisnosti</string>
+    <string name="poi_health_specialty_optometry_yes">Optometrija</string>
+    <string name="poi_health_specialty_clinical_pathology_yes">Klinička patologija</string>
+    <string name="poi_health_specialty_speech_therapy_yes">Logoped</string>
+    <string name="poi_health_specialty_manual_therapy_yes">Sportska masaža</string>
+    <string name="poi_health_specialty_sports_medicine_yes">Sportska medicina</string>
+    <string name="poi_health_specialty_acupuncture_yes">Akupunktura</string>
+    <string name="poi_health_specialty_homeopathy_yes">Homeopatija</string>
+    <string name="poi_health_specialty_traditional_chinese_medicine_yes">Tradicionalna kineska medicina</string>
+    <string name="poi_health_specialty_reiki_yes">Reiki</string>
+    <string name="poi_health_specialty_herbalism_yes">Travarstvo</string>
+    <string name="poi_health_specialty_chiropractic_yes">Kiropraktičar</string>
+    <string name="poi_health_specialty_naturopathy_yes">Naturopatija</string>
+    <string name="poi_health_specialty_depth_psychology_yes">Dubinska psihologija</string>
+    <string name="poi_health_specialty_behavior_yes">Bihejvioralna terapija</string>
+    <string name="poi_health_specialty_palliative_medicine_yes">Palijativna medicina</string>
+    <string name="poi_building_type_pyramid">Tip zgrade: piramida</string>
+    <string name="poi_billiards">Bilijar</string>
+    <string name="poi_microwave_oven_yes">Mikrotalasna: da</string>
+    <string name="poi_microwave_oven_no">Mikrotalasna: ne</string>
+    <string name="poi_water_heater_yes">Grejač za vodu: da</string>
+    <string name="poi_water_heater_no">Grejač za vodu: ne</string>
+    <string name="poi_parking_surface">Tip: podloga</string>
+    <string name="poi_parking_garage_boxes">Garaže</string>
+    <string name="poi_parking_carports">Natkrivena</string>
+    <string name="poi_dojo">Dodžo</string>
+    <string name="poi_gaelic_games">Galske igre</string>
+    <string name="poi_running">Trčanje</string>
+    <string name="poi_karting">Karting</string>
+    <string name="poi_badminton">Badmington</string>
+    <string name="poi_judo">Džudo</string>
+    <string name="poi_futsal">Futsal</string>
+    <string name="poi_rc_car">Trkanje kolima na daljinsko upravljanje</string>
+    <string name="poi_squash">Skvoš</string>
+    <string name="poi_lacrosse">Lakros</string>
+    <string name="poi_boxing">Boks</string>
+    <string name="poi_official_name">Zvanično ime</string>
+    <string name="poi_dyke">Dajk</string>
+    <string name="poi_dolphin">Delfin</string>
+    <string name="poi_denotation">Denotacija</string>
+    <string name="poi_rtsa_scale_filter">Kategorija težine</string>
+    <string name="poi_health_specialty_radiotherapy_yes">Radioterapija</string>
+    <string name="reddit">Reddit</string>
+    <string name="poi_historic_tank">Istorijski rezervoar</string>
+    <string name="poi_generator_source_biomass">Izvor energije: biomasa</string>
+    <string name="poi_cash_withdrawal_bank_card">Podizanje novca</string>
+    <string name="poi_bath_type">Tip</string>
+    <string name="poi_bath_open_air">Na otvorenom</string>
+    <string name="poi_agrarian">Poljoprivredna radnja</string>
+    <string name="poi_meadow_agricultural">Tip: poljoprivredno</string>
+    <string name="poi_fire_hydrant_pressure_filter">Pritisak</string>
+    <string name="poi_video_telephone">Video</string>
+    <string name="poi_sms">SMS</string>
+    <string name="poi_volcano_status">Status</string>
+    <string name="poi_volcano_type">Tip</string>
+    <string name="poi_nuclear_explosion_type_cratering_burst">Tip eksplozije: kraterska rasprskavanja (tik ispod površine)</string>
+    <string name="poi_nuclear_explosion_shot_name_en">Kratko ime (engl.)</string>
+    <string name="poi_nuclear_explosion_series">Niz eksplozija</string>
+    <string name="poi_nuclear_explosion_date_utc">Vreme eksplozije (UTC)</string>
+    <string name="poi_nuclear_explosion_type_underwater">Tip eksplozije: podvodna</string>
+    <string name="poi_nuclear_explosion_type_space">Tip eksplozije: svemir (preko 80km nadmorske visine)</string>
+    <string name="poi_nuclear_explosion_type_atmospheric_rocket_or_missile">Tip eksplozije: u atmosferi, raketa ili projektil</string>
+    <string name="poi_nuclear_explosion_type_underground">Tip eksplozije: podzemna</string>
+    <string name="poi_nuclear_explosion_type_atmospheric_water_surface_barge">Tip eksplozije: u atmosferi, vodena podloga, barža</string>
+    <string name="poi_nuclear_explosion_type_atmospheric_atmospheric_surface">Tip eksplozije: u atmosferi, podloga</string>
+    <string name="poi_nuclear_explosion_type_atmospheric_balloon">Tip eksplozije: u atmosferi, balon</string>
+    <string name="poi_nuclear_explosion_type_atmospheric_surface_tower">Tip eksplozije: u atmosferi, podloga, toranj</string>
+    <string name="poi_nuclear_explosion_type_atmospheric_airdrop">Tip eksplozije: u atmosferi, kapljice</string>
+    <string name="poi_nuclear_explosion_type_atmospheric">Tip eksplozije: u atmosferi</string>
+    <string name="poi_nuclear_explosion_type_underground_tunnel">Tip eksplozije: podzemna, tunel</string>
+    <string name="poi_nuclear_explosion_type_underground_shaft">Tip eksplozije: podzemna, jama</string>
+    <string name="poi_nuclear_explosion_site">Eksplozija: mesto</string>
+    <string name="poi_nuclear_explosion_country">Eksplozija: država</string>
+    <string name="poi_protection_object_water">Objekat pod zaštitom: voda</string>
+    <string name="poi_protection_object_habitat">Objekat pod zaštitom: naselje</string>
+    <string name="poi_protection_object_nature">Objekat pod zaštitom: priroda</string>
+    <string name="poi_protection_object_historic">Objekat pod zaštitom: istorijski</string>
+    <string name="poi_protection_title">Naslov zaštite</string>
+    <string name="poi_protected_area">Zaštićena oblast</string>
+    <string name="poi_firepit">Mesto za vatru</string>
+    <string name="poi_construction_yes">U izgradnji</string>
+    <string name="poi_ref">Ref.</string>
+    <string name="poi_tunnel_ref">Ref. tunela</string>
+    <string name="poi_bridge_ref">Ref. mosta</string>
+    <string name="poi_books_academic">Akademske</string>
+    <string name="poi_books_children">Dečije</string>
+    <string name="poi_books_religion">Religijske</string>
+    <string name="poi_books_antiquarian">Antikvarnica</string>
+    <string name="poi_books_comic">Strip</string>
+    <string name="poi_checkpoint_type_notebook">Sveska</string>
+    <string name="poi_public_bookcase_type_shelf">Tip: polica</string>
+    <string name="poi_nuclear_explosion_body_wave_magnitude">Jačina udarnog talasa</string>
+    <string name="poi_nuclear_explosion_ground_zero_altitude">Nulti nivo nadmorske visine</string>
+    <string name="poi_nuclear_explosion_height_of_burst">Visina vatrene lopte</string>
+    <string name="poi_nuclear_explosion_hole">Krater eksplozije</string>
+    <string name="poi_nuclear_explosion_yield">Snaga eksplozije</string>
+    <string name="poi_nuclear_explosion_time_utc">Vreme eksplozije (UTC)</string>
+    <string name="poi_nuclear_explosion_purpose_industrial_application_earth_moving">Svrha eksplozije: industrijska primena, pomeranje zemlje</string>
+    <string name="poi_nuclear_explosion_purpose_industrial_application">Svrha eksplozije: industrijska primjena</string>
+    <string name="poi_nuclear_explosion_purpose_industrial_application_oil_stimulation">Svrha eksplozije: industrijska primena, stimulacija nafte</string>
+    <string name="poi_nuclear_explosion_purpose_industrial_application_seismic_sounding">Svrha eksplozije: industrijska primena, seizmičko ozvučavanje</string>
+    <string name="poi_nuclear_explosion_purpose_industrial_application_cavity_excavation">Svrha eksplozije: industrijska primena, iskopavanje šupljina</string>
+    <string name="poi_nuclear_explosion_purpose_fundamental_science">Svrha eksplozije: fundamentalna nauka</string>
+    <string name="poi_nuclear_explosion_purpose_research_for_peaceful_applications">Svrha eksplozije: istraživanje za mirnodopske primene</string>
+    <string name="poi_nuclear_explosion_purpose_safety_experiment">Svrha eksplozije: bezbednosni eksperiment</string>
+    <string name="poi_nuclear_explosion_purpose_weapons_effects">Svrha eksplozije: efekti oružja</string>
+    <string name="poi_nuclear_explosion_purpose_nuclear_weapons_related">Svrha eksplozije: povezano sa nuklearnim oružijem</string>
+    <string name="poi_bandy">Bendi</string>
+    <string name="poi_fair_trade_only">Samo proizvodi sajamske trgovine</string>
+    <string name="poi_fair_trade_no">Sajamska trgovina: ne</string>
+    <string name="poi_fair_trade_yes">Sajamska trgovina: da</string>
+    <string name="poi_street_cabinet">Ulični orman</string>
+    <string name="poi_atm_no">ATM: ne</string>
+    <string name="poi_atm_yes">ATM: da</string>
+    <string name="poi_inscription_ne">Natpis:NE</string>
+    <string name="poi_inscription_e">Natpis:E</string>
+    <string name="poi_inscription_se">Natpis:SE</string>
+    <string name="poi_inscription_s">Natpis:S</string>
+    <string name="poi_inscription_sw">Natpis:SW</string>
+    <string name="poi_inscription_w">Natpis:W</string>
+    <string name="poi_inscription_nw">Natpis:NW</string>
+    <string name="poi_inscription_n">Natpis:N</string>
+    <string name="poi_forestry_allotment">Pokazivač: šumarsko odeljenje</string>
+    <string name="poi_forestry_compartment">Pokazivač: šumarsko odeljenje</string>
+    <string name="poi_disc_golf">Disk golf</string>
+    <string name="poi_health_specialty_adult_psychiatry_yes">Psihijatrija za odrasle</string>
+    <string name="poi_health_specialty_podology_yes">Podologija</string>
+    <string name="poi_health_specialty_orthodontics_yes">Ortodonija</string>
+    <string name="poi_health_specialty_dermatovenereology_yes">Dermato-venereologija</string>
+    <string name="poi_traffic_signals_arrow">Strelica</string>
+    <string name="poi_traffic_signals_vibration">Vibracija</string>
+    <string name="poi_access_mofa">Mofa pristup</string>
+    <string name="poi_access_motorhome">Pristup motociklima</string>
+    <string name="poi_climbing_crag_filter">Stena penjanja</string>
+    <string name="poi_counselling_type_marriage_no">Savetovanje (bračno): ne</string>
+    <string name="poi_counselling_type_marriage_yes">Savetovanje (bračno): da</string>
+    <string name="poi_counselling_type_immigrant_no">Savetovanje (imigrant): ne</string>
+    <string name="poi_counselling_type_immigrant_yes">Savetovanje (imigrant): da</string>
+    <string name="poi_counselling_type_homeless_no">Savetovanje (beskućno): ne</string>
+    <string name="poi_counselling_type_homeless_yes">Savetovanje (beskućno): da</string>
+    <string name="poi_counselling_type_family_no">Savetovanje (porodično): ne</string>
+    <string name="poi_counselling_type_family_yes">Savetovanje (porodično): da</string>
+    <string name="poi_counselling_type_education_no">Savetovanje (obrazovanje): ne</string>
+    <string name="poi_counselling_type_education_yes">Savetovanje (obrazovanje): da</string>
+    <string name="poi_counselling_type_drugs_no">Savetovanje (oko droga): ne</string>
+    <string name="poi_counselling_type_drugs_yes">Savetovanje (oko droga): da</string>
+    <string name="poi_counselling_type_crisis_no">Savetovanje (krizno): ne</string>
+    <string name="poi_counselling_type_crisis_yes">Savetovanje (krizno): da</string>
+    <string name="poi_counselling_type_couple_no">Savetovanje (za parove): ne</string>
+    <string name="poi_counselling_type_couple_yes">Savetovanje (za parove): da</string>
+    <string name="poi_counselling_type_child_guidance_no">Savetovanje (smernice za dete): ne</string>
+    <string name="poi_counselling_type_child_guidance_yes">Savetovanje (smernice za dete): da</string>
+    <string name="poi_counselling_type_antenatal_no">Savetovanje (prenatalno): ne</string>
+    <string name="poi_counselling_type_antenatal_yes">Savetovanje (prenatalno): da</string>
+    <string name="poi_counselling_type_addiction_no">Savetovanje (zavisnost): ne</string>
+    <string name="poi_counselling_type_addiction_yes">Savetovanje (zavisnost): da</string>
+    <string name="poi_health_person_type_witchdoctor">Uloga zdravstvenog radnika: veštak</string>
+    <string name="poi_health_person_type_technician">Uloga zdravstvenog radnika: tehničar</string>
+    <string name="poi_health_person_type_physician_assitant">Uloga zdravstvenog radnika: pomoćnik lekara</string>
+    <string name="poi_health_person_type_therapist">Uloga zdravstvenog radnika: terapeut</string>
+    <string name="poi_health_person_type_psychologist">Uloga zdravstvenog radnika: psiholog</string>
+    <string name="poi_health_person_type_podologist">Uloga zdravstvenog radnika: podolog</string>
+    <string name="poi_health_person_type_physician">Uloga zdravstvenog radnika: lekar</string>
+    <string name="poi_health_person_type_paramedic">Uloga zdravstvenog radnika: bolničar</string>
+    <string name="poi_health_person_type_nurse">Uloga zdravstvenog radnika: medicinska sestra</string>
+    <string name="poi_health_person_type_midwife">Uloga zdravstvenog radnika: babica</string>
+    <string name="poi_health_person_type_healer">Uloga zdravstvenog radnika: iscelitelj</string>
+    <string name="poi_health_person_type_assistant">Uloga zdravstvenog radnika: asistent</string>
+    <string name="poi_fire_hydrant_type_wall">Zid</string>
+    <string name="poi_fire_hydrant_type_pond">Pond</string>
+    <string name="poi_fire_hydrant_type_dry_barrel">Suvo bure</string>
+    <string name="poi_fire_hydrant_type_pillar">Stub</string>
+    <string name="poi_fire_hydrant_type_underground">Podzemni</string>
+    <string name="poi_suction_point">Tačka usisavanja</string>
+    <string name="poi_health_facility_type_support_group_home">Tip zdravstvene ustanove: dom grupe za podršku</string>
+    <string name="poi_health_facility_type_nursing_home">Tip zdravstvene ustanove: starački dom</string>
+    <string name="poi_health_facility_type_first_aid">Tip zdravstvene ustanove: prva pomoć</string>
+    <string name="poi_health_facility_type_dispensary">Tip zdravstvene ustanove: ambulanta</string>
+    <string name="poi_health_facility_type_department">Tip zdravstvene ustanove: odeljenje</string>
+    <string name="poi_health_facility_type_therapy">Tip zdravstvene ustanove: terapija</string>
+    <string name="poi_health_facility_type_laboratory">Tip zdravstvene ustanove: laboratorija</string>
+    <string name="poi_health_facility_type_counselling_centre">Tip zdravstvene ustanove: savetovalište</string>
+    <string name="poi_health_facility_type_field_hospital">Tip zdravstvene ustanove: terenska bolnica</string>
+    <string name="poi_health_facility_type_office">Medicinska kancelarija</string>
+    <string name="poi_health_service_test_no">Zdravstvena usluga: test: ne</string>
+    <string name="poi_health_service_test_yes">Zdravstvena služba: test: da</string>
+    <string name="poi_health_service_support_no">Zdravstvena služba: podrška: ne</string>
+    <string name="poi_health_service_support_yes">Zdravstvena služba: podrška: da</string>
+    <string name="poi_health_service_prevention_vaccination_no">Zdravstvena služba: vakcinacija: ne</string>
+    <string name="poi_health_service_prevention_vaccination_yes">Zdravstvena služba: vakcinacija: da</string>
+    <string name="poi_health_service_prevention_no">Zdravstvena služba: prevencija: ne</string>
+    <string name="poi_health_service_prevention_yes">Zdravstvena služba: prevencija: da</string>
+    <string name="poi_health_service_child_care_no">Zdravstvena usluga: dečje odeljenje: ne</string>
+    <string name="poi_health_service_child_care_yes">Zdravstvena usluga: dečje odeljenje: da</string>
+    <string name="poi_health_service_examination_no">Zdravstvena služba: pregled: ne</string>
+    <string name="poi_health_service_examination_yes">Zdravstvena služba: pregled: da</string>
+    <string name="poi_health_service_counselling_no">Zdravstvena služba: savetovanje: ne</string>
+    <string name="poi_health_service_counselling_yes">Zdravstvena služba: savetovanje: da</string>
+    <string name="poi_health_service_nursing_no">Zdravstvena služba: porodilište: ne</string>
+    <string name="poi_health_service_nursing_yes">Zdravstvena služba: porodilište: da</string>
+    <string name="poi_medical_system_unani_yes">Unani</string>
+    <string name="poi_medical_system_sidda_yes">Sida</string>
+    <string name="poi_medical_system_tibetan_yes">Tradicionalno Tibetanski</string>
+    <string name="poi_medical_system_mongolian_yes">Tradicionalno mongolski</string>
+    <string name="poi_medical_system_kampo_yes">Kampo</string>
+    <string name="poi_medical_system_ayurveeda_yes">Ajurveda</string>
+    <string name="poi_medical_system_chinese_yes">Tradicionalno Kineski</string>
+    <string name="poi_medical_system_western_yes">Zapadni</string>
+    <string name="poi_sanitary_dump_station">Sanitarna otpadna stanica</string>
+    <string name="poi_tanning_salon">Solarijum</string>
+    <string name="poi_free_flying_guest_guidelines_no">Smernice za goste: ne</string>
+    <string name="poi_free_flying_guest_guidelines_yes">Smernice za goste: da</string>
+    <string name="poi_free_flying_site_orientation_w">Orijentacija mesta slobodnog letenja: Z</string>
+    <string name="poi_free_flying_site_orientation_sw">Orijentacija mesta slobodnog letenja: JZ</string>
+    <string name="poi_free_flying_no_flight_time">Nema vreme leta (slobodno letenje)</string>
+    <string name="poi_free_flying_site_orientation_nw">Orijentacija mesta slobodnog letenja: SZ</string>
+    <string name="poi_free_flying_site_orientation_s">Orijentacija mesta slobodnog letenja: J</string>
+    <string name="poi_free_flying_site_orientation_se">Orijentacija mesta slobodnog letenja: JI</string>
+    <string name="poi_free_flying_site_orientation_e">Orijentacija mesta slobodnog letenja: I</string>
+    <string name="poi_free_flying_site_orientation_ne">Orijentacija mesta slobodnog letenja: SI</string>
+    <string name="poi_free_flying_site_orientation_n">Orijentacija mesta slobodnog letenja: S</string>
+    <string name="poi_free_flying_rigid_no">Slobodno letenje kruto: ne</string>
+    <string name="poi_free_flying_rigid_yes">Kruta</string>
+    <string name="poi_free_flying_hanggliding_no">Zmajarstvo: ne</string>
+    <string name="poi_free_flying_hanggliding_yes">Zmajarstvo</string>
+    <string name="poi_free_flying_paragliding_no">Paraglajding: ne</string>
+    <string name="poi_free_flying_paragliding_yes">Paraglajding</string>
+    <string name="poi_free_flying_official_no">Zvanično: ne</string>
+    <string name="poi_free_flying_official_yes">Zvanično: da</string>
+    <string name="poi_free_flying_site_training">Obuka</string>
+    <string name="poi_free_flying_site_towing">Vuča</string>
+    <string name="poi_free_flying_site_toplanding">Sletanje na vrhu</string>
+    <string name="poi_free_flying_site_landing">Sletanje</string>
+    <string name="poi_free_flying_site_takeoff">Poletanje</string>
+    <string name="poi_button_operated_no">Upravljano dugmetom: ne</string>
+    <string name="poi_button_operated_yes">Upravljano dugmetom: da</string>
+    <string name="poi_water_tap">Slavina za vodu</string>
+    <string name="poi_sport_free_flying">Slobodno letenje (sport)</string>
+    <string name="poi_amenity_vacuum_cleaner">Usisivač</string>
+    <string name="poi_vacuum_cleaner_no">Usisavač: ne</string>
+    <string name="poi_vacuum_cleaner_yes">Da</string>
+    <string name="poi_compressed_air_no">Komprimovani vazduh: ne</string>
+    <string name="poi_compressed_air_yes">Da</string>
+    <string name="poi_plant_nursery">Rasadnik biljaka</string>
+    <string name="poi_addr_housename">Ime kuće</string>
+    <string name="poi_nuclear_explosion_device">Eksplozija: uređaj</string>
+    <string name="poi_nuclear_explosion_warhead">Eksplozija: bojeva glava</string>
+    <string name="poi_nuclear_explosion_crater_diameter">Eksplozija: prečnik kratera</string>
+    <string name="poi_nuclear_explosion_salvo_second_or_later_detonation">Plotun eksplozija: druga ili kasnija detonacija plotun testa</string>
+    <string name="poi_nuclear_explosion_salvo_first_detonation">Plotun eksplozija: prva detonacija plotun testa</string>
+    <string name="poi_shuffleboard">Kuglanje</string>
+    <string name="poi_netball">Mreža</string>
+    <string name="poi_motorcycle_sales_used">Prodaja: polovna</string>
+    <string name="poi_motorcycle_sales_yes_used">Prodaja: da, polovna</string>
+    <string name="poi_motorcycle_sales_no">Prodaja: ne</string>
+    <string name="poi_motorcycle_sales_yes">Prodaja</string>
+    <string name="poi_stands">Štandovi</string>
+    <string name="poi_zoo_reptile">Reptili</string>
+    <string name="poi_zoo_falconry">Sokolarnik</string>
+    <string name="poi_zoo_aviary">Ptičnik</string>
+    <string name="poi_zoo_birds">Ptice</string>
+    <string name="poi_zoo_safari_park">Safari park</string>
+    <string name="poi_zoo_enclosure">Kućište</string>
+    <string name="poi_zoo_wildlife_park">Park divljih životinja</string>
+    <string name="poi_zoo_petting_zoo">Zoološki vrt sa maženjem životinja</string>
+    <string name="poi_life_ring">Životni prsten</string>
+    <string name="poi_language_school">Škola stranih jezika</string>
+    <string name="poi_music_school">Muzička škola</string>
+    <string name="poi_resort_kids_camp">Dečiji kamp</string>
+    <string name="poi_electronics_repair_tv">Popravka elektronike: TV</string>
+    <string name="poi_electronics_repair_phone">Popravka elektronike: telefon</string>
+    <string name="poi_electronics_repair_appliance">Popravka elektronike: aparati</string>
+    <string name="poi_electronics_repair_computer">Popravka elektronike: računari</string>
+    <string name="poi_energy_supplier">Kancelarija snabdevača energije</string>
+    <string name="poi_drink_wine_served">Vino: servirano</string>
+    <string name="poi_drink_wine_retail">Vino: maloprodaja</string>
+    <string name="poi_drink_wine_yes">Vino: da</string>
+    <string name="poi_fast_food_cafeteria">Da</string>
+    <string name="poi_coworking_space">Zajednički radni prostor</string>
+    <string name="poi_railway_yard">Teretna stanica</string>
+    <string name="poi_tower_construction_concealed">Konstrukcija: skrivena</string>
+    <string name="poi_tower_construction_dome">Konstrukcija: kupola</string>
+    <string name="poi_tower_construction_dish">Konstrukcija: tanjir</string>
+    <string name="poi_tower_construction_freestanding">Konstrukcija: samostojeća</string>
+    <string name="poi_tower_construction_lattice">Konstrukcija: rešetka</string>
+    <string name="poi_animal_keeping_type_open_stable">Tip: otvorena štala</string>
+    <string name="poi_cuisine_buschenschank">Bušenšank</string>
+    <string name="poi_operational_status_closed">Zatvoreno</string>
+    <string name="poi_operational_status_open">Otvoreno</string>
+    <string name="poi_visibility_area">Vidljivost: područje</string>
+    <string name="poi_visibility_street">Vidljivost: ulica</string>
+    <string name="poi_visibility_house">Vidljivost: kuća</string>
+    <string name="poi_location_entrance">Lokacija: ulaz</string>
+    <string name="poi_location_wall">Lokacija: zid</string>
+    <string name="poi_location_bridge">Lokacija: most</string>
+    <string name="poi_location_platform">Lokacija: platforma</string>
+    <string name="poi_location_indoor">Lokacija: unutar</string>
+    <string name="poi_location_outdoor">Lokacija: napolju</string>
+    <string name="poi_location_rooftop">Lokacija: vrh krova</string>
+    <string name="poi_location_roof">Lokacija: krov</string>
+    <string name="poi_location_overhead">Lokacija: iznad glave</string>
+    <string name="poi_location_overground">Lokacija: nadzemlje</string>
+    <string name="poi_location_underwater">Lokacija: podvodna</string>
+    <string name="poi_location_underground">Lokacija: podzemna</string>
+    <string name="poi_surface_metal_grid">Metalna mreža</string>
+    <string name="poi_surface_decoturf">Dekotrava</string>
+    <string name="poi_surface_artificial_turf">Veštačka trava</string>
+    <string name="poi_surface_tartan">Tartan</string>
+    <string name="poi_surface_clay">Glina</string>
+    <string name="poi_mountain_area">Planinsko područje</string>
+    <string name="poi_couloir">Kuluar</string>
+    <string name="poi_gorge">Klisura</string>
+    <string name="poi_vhf">VHF kanal</string>
+    <string name="poi_government_legislative">Zakonodavna institucija</string>
+    <string name="poi_government_transportation">Transportna institucija</string>
+    <string name="poi_government_treasury">Blagajna</string>
+    <string name="poi_government_social_services">Socijalne usluge</string>
+    <string name="poi_government_social_security">Socijalno osiguranje</string>
+    <string name="poi_government_public_service">Javni servis</string>
+    <string name="poi_government_ministry">Ministarstvo</string>
+    <string name="poi_government_archive">Arhiva</string>
+    <string name="poi_network">Mreža</string>
+    <string name="poi_boat_canoe_rental_rental_no">Kanu: ne</string>
+    <string name="poi_boat_canoe_rental_rental_yes">Kanu: da</string>
+    <string name="poi_boat_kayak_rental_rental_no">Kajaci: ne</string>
+    <string name="poi_boat_kayak_rental_rental_yes">Kajaci: da</string>
+    <string name="poi_boat_dinghy_rental_rental_no">Gumenjak: ne</string>
+    <string name="poi_boat_dinghy_rental_rental_yes">Gumenjak: da</string>
+    <string name="poi_boat_sailboat_rental_no">Jedrenjaci: ne</string>
+    <string name="poi_boat_sailboat_rental_yes">Jedrenjaci: da</string>
+    <string name="poi_boat_jetski_rental_no">Džetski: ne</string>
+    <string name="poi_boat_jetski_rental_yes">Džetski: da</string>
+    <string name="poi_boat_pedalboat_rental_no">Brodovi na veslanje: ne</string>
+    <string name="poi_boat_pedalboat_rental_yes">Brodovi na veslanje: da</string>
+    <string name="poi_boat_houseboat_rental_no">Kućni brodovi: ne</string>
+    <string name="poi_boat_houseboat_rental_yes">Kućni brodovi: da</string>
+    <string name="poi_boat_motorboat_rental_no">Motorni brodovi: ne</string>
+    <string name="poi_boat_motorboat_rental_yes">Motorni brodovi: da</string>
+    <string name="poi_animal_keeping_type_paddock">Tip: ograđen deo</string>
+    <string name="poi_animal_keeping_sheep">Čuvanje životinja: ovca</string>
+    <string name="poi_animal_keeping_horse">Čuvanje životinja: konj</string>
+    <string name="poi_animal_keeping">Čuvanje životinja</string>
+    <string name="poi_cliff">Litica</string>
+    <string name="poi_photo_studio">Foto studio</string>
+    <string name="poi_nutrition_supplements">Dodaci ishrani</string>
+    <string name="poi_locomotive">Lokomotiva</string>
+    <string name="poi_e_cigarette">Prodavnica elektronskih cigareta</string>
+    <string name="poi_gambling_bingo">Bingo</string>
+    <string name="poi_gambling_betting">Klađenje</string>
+    <string name="poi_gambling_slot_machines">Slot mašine</string>
+    <string name="poi_gambling_pachinko">Pacinko</string>
+    <string name="poi_gambling_lottery">Lutrija</string>
+    <string name="poi_gambling_type">Vrsta</string>
+    <string name="poi_gambling">Mesto kockanja</string>
+    <string name="poi_lottery">Loto srećke</string>
+    <string name="poi_lighting">Oprema za rasvetu</string>
+    <string name="poi_locksmith">Bravarska prodavnica</string>
+    <string name="poi_electrical">Elektro prodavnica</string>
+    <string name="poi_party">Namirnice za zabavu</string>
+    <string name="poi_feeding_place">Mesto za ishranu životinja</string>
+    <string name="poi_cuisine_cantonese">Kantonska</string>
+    <string name="poi_cuisine_pastel">Pastel</string>
+    <string name="poi_cuisine_sub">Sub</string>
+    <string name="poi_cuisine_sagardotegia">Sagardotegia</string>
+    <string name="poi_cuisine_bubble_tea">Čaj sa mehurićima</string>
+    <string name="poi_cuisine_brasserie">Braseri</string>
+    <string name="poi_cuisine_empanada">Empanada</string>
+    <string name="poi_cuisine_snack">Predjelo</string>
+    <string name="poi_cuisine_piadina">Piadina</string>
+    <string name="poi_cuisine_canteen">Kantina</string>
+    <string name="poi_cuisine_savory_pancakes">Slane palačinke</string>
+    <string name="poi_cuisine_frozen_yogurt">Zamrznuti jogurt</string>
+    <string name="poi_cuisine_deli">Delikatesi</string>
+    <string name="poi_cuisine_fine_dining">Fina jela</string>
+    <string name="poi_cuisine_soba">Soba</string>
+    <string name="poi_cuisine_bagel">Bagel</string>
+    <string name="poi_cuisine_heuriger">Heuriger</string>
+    <string name="poi_cuisine_gastropub">Gastropub</string>
+    <string name="poi_cuisine_beef_bowl">Giudon</string>
+    <string name="poi_cuisine_fish_and_chips">Riba i pomfrit</string>
+    <string name="poi_public_bookcase_type_metal_cabinet">Tip: metalni orman</string>
+    <string name="poi_public_bookcase_type_wooden_cabinet">Tip: drveni ormar</string>
+    <string name="poi_public_bookcase_type_reading_box">Tip: kutija za čitanje</string>
+    <string name="poi_public_bookcase_type_phone_box">Tip: telefonska kutija</string>
+    <string name="poi_public_bookcase">Javna polica za knjige</string>
+    <string name="poi_xmas_url">Božić: vebsajt</string>
+    <string name="poi_xmas_location">Božić: lokacija</string>
+    <string name="poi_xmas_opening_hours">Božić: radno vreme</string>
+    <string name="poi_xmas_note">Božić: beleška</string>
+    <string name="poi_xmas_day_date">Božić: period događaja</string>
+    <string name="poi_xmas_tree">Jelka</string>
+    <string name="poi_xmas_shop_christmas_tree">Prodavnica drveća</string>
+    <string name="poi_xmas_shop">Božićna radnja</string>
+    <string name="poi_xmas_pyramid">Božićna piramida</string>
+    <string name="poi_xmas_market">Božićno tržište</string>
+    <string name="poi_xmas_event">Božićni događaj</string>
+    <string name="poi_xmas">Božić</string>
+    <string name="poi_wiki_link">Vikipedija</string>
+    <string name="poi_length">Dužina</string>
+    <string name="poi_toilets_disposal_bucket">Odlaganje toaleta: kantom</string>
+    <string name="poi_toilets_disposal_chemical">Odlaganje toaleta: hemijsko</string>
+    <string name="poi_toilets_disposal_pitlatrine">Odlaganje toaleta: pitlatrine</string>
+    <string name="poi_toilets_disposal_flush">Odlaganje toaleta: ispiranje</string>
+    <string name="poi_water_tank">Rezervoar za vodu</string>
+    <string name="poi_fire_operator">Protivpožarni operator</string>
+    <string name="poi_diplomatic_high_commission">Visoka komisija</string>
+    <string name="poi_diplomatic_ambassadors_residence">Rezidencija ambasadora</string>
+    <string name="poi_diplomatic_delegation">Delegacija</string>
+    <string name="poi_diplomatic_permanent_mission">Stalna misija</string>
+    <string name="poi_diplomatic_honorary_consulate">Počasni konzulat</string>
+    <string name="poi_diplomatic_consulate_general">Generalni konzulat</string>
+    <string name="poi_diplomatic_consulate">Konzulat</string>
+    <string name="poi_traffic_mirror">Saobraćajno ogledalo</string>
+    <string name="poi_organic_only">Jedino</string>
+    <string name="poi_organic_no">Ne</string>
+    <string name="poi_organic_yes">Da</string>
+    <string name="poi_min_age">Minimalna starost</string>
+    <string name="poi_mdf">Glavni distribucioni okvir</string>
+    <string name="poi_aquaculture_mussels">Akvakultura: dagnje</string>
+    <string name="poi_aquaculture_fish">Akvakultura: riba</string>
+    <string name="poi_aquaculture_shrimp">Akvakultura: škampi</string>
+    <string name="poi_aquaculture">Akvakultura</string>
+    <string name="poi_passenger_information_display_no">Prikaz informacija putnicima: ne</string>
+    <string name="poi_passenger_information_display_yes">Prikaz informacija putnicima: da</string>
+    <string name="poi_support_tower">Podrška: kula</string>
+    <string name="poi_support_roof">Podrška: krov</string>
+    <string name="poi_support_suspended">Podrška: noseće</string>
+    <string name="poi_support_ceiling">Podrška: plafon</string>
+    <string name="poi_support_billboard">Podrška: bilbord</string>
+    <string name="poi_support_ground">Podrška: zemlja</string>
+    <string name="poi_support_pedestal">Podrška: postolje</string>
+    <string name="poi_support_tree">Podrška: drvo</string>
+    <string name="poi_support_wall_mounted">Podrška: zid</string>
+    <string name="poi_support_pole">Podrška: stub</string>
+    <string name="poi_date_no">Prikaz datuma: ne</string>
+    <string name="poi_date_yes">Prikaz datuma</string>
+    <string name="poi_hygrometer_no">Higrometar: ne</string>
+    <string name="poi_capacity_beds">Kapacitet (kreveta)</string>
+    <string name="poi_hygrometer_yes">HigrometarHygrometer</string>
+    <string name="poi_thermometer_no">Termometar: ne</string>
+    <string name="poi_thermometer_yes">Termometar</string>
+    <string name="poi_display_sundial_yes">Sunčani sat</string>
+    <string name="poi_display_digital_yes">Digitalni ekran</string>
+    <string name="poi_display_analog_yes">Analogni ekran</string>
+    <string name="poi_pumping_station">Pumpna stanica</string>
+    <string name="poi_display_no">Ekran: ne</string>
+    <string name="poi_display_yes">Ekran: da</string>
+    <string name="poi_generator_output_biogas_yes">Izlaz: biogas</string>
+    <string name="poi_generator_output_biogas">Izlazna snaga biogasa</string>
+    <string name="poi_generator_output_vacuum_yes">Izlaz: vakuum</string>
+    <string name="poi_generator_output_compressed_air_yes">Izlaz: komprimovani vazduh</string>
+    <string name="poi_generator_output_cold_water_yes">Izlaz: hladna voda</string>
+    <string name="poi_generator_output_hot_air_yes">Izlaz: vruć vazduh</string>
+    <string name="poi_generator_output_steam_yes">Izlaz: para</string>
+    <string name="poi_generator_output_hot_water_yes">Izlaz: topla voda</string>
+    <string name="poi_generator_output_electricity_no">Izlaz (struja): ne</string>
+    <string name="poi_generator_output_electricity_yes">Izlaz: struja</string>
+    <string name="poi_voltage">Napon</string>
+    <string name="poi_greenhouse_horticulture">Staklenička hortikultura</string>
+    <string name="poi_observatory_type_gravitational">Gravitaciona</string>
+    <string name="poi_observatory_type_meteorological">Meteorološka</string>
+    <string name="poi_observatory_type_espionage">Upotreba: špijunaža</string>
+    <string name="poi_telescope_usage_research">Upotreba: istraživanje</string>
+    <string name="poi_telescope_usage_espionage">Upotreba: špijunaža</string>
+    <string name="poi_telescope_usage_education">Upotreba: obrazovanje</string>
+    <string name="poi_telescope_spectrum">Spektar</string>
+    <string name="poi_telescope_diameter">Prečnik</string>
+    <string name="poi_telescope_type_gamma">Gama</string>
+    <string name="poi_telescope_type_radio">Radio</string>
+    <string name="poi_telescope_type_optical">Optički</string>
+    <string name="poi_telescope">Teleskop</string>
+    <string name="poi_payment_troika_no">Kartica \"Trojka\" se ne prihvata</string>
+    <string name="poi_payment_troika_yes">Trojka</string>
+    <string name="poi_pump_status_locked">Status pumpe: zaključana</string>
+    <string name="poi_pump_status_broken">Status pumpe: polomljena</string>
+    <string name="poi_pump_status_ok">Status pumpe: u redu</string>
+    <string name="poi_pump_style_historic">Stil pumpe: istorijski</string>
+    <string name="poi_pump_style_modern">Stil pumpe: moderan</string>
+    <string name="poi_pump_type_gravity">Tip pumpe: gravitaciona</string>
+    <string name="poi_pump_type_india_mk_2_3">Tip pumpe: Indija Mk II ili III&gt;</string>
+    <string name="poi_pump_type_beam_pump">Tip pumpe: pumpa snopa</string>
+    <string name="poi_ventilation_shaft">Ventilacioni otvor</string>
+    <string name="poi_valley_balka">Balka</string>
+    <string name="poi_aerodrome_type_private">Privatni</string>
+    <string name="poi_aerodrome_type_public">Javni</string>
+    <string name="poi_aerodrome_type_regional">Regionalni</string>
+    <string name="poi_aerodrome_type_international">Međunarodni</string>
+    <string name="poi_dispensing_no">Isporuka: ne</string>
+    <string name="poi_dispensing_yes">Da</string>
+    <string name="poi_crossing_supervision_camera">Nadzor prelaza: kamera</string>
+    <string name="poi_crossing_supervision_attendant">Nadzor prelaza: polaznik</string>
+    <string name="poi_crossing_supervision_no">Nadzor prelaza: ne</string>
+    <string name="poi_crossing_supervision_yes">Nadzor prelaza</string>
+    <string name="poi_crossing_saltire_no">Prelazni saltir: ne</string>
+    <string name="poi_crossing_saltire_yes">Prelazni saltir</string>
+    <string name="poi_crossing_on_demand_no">Prelaz na zahtev: ne</string>
+    <string name="poi_crossing_on_demand_yes">Prelaz na zahtev</string>
+    <string name="poi_crossing_light_no">Prelazno svetlo: ne</string>
+    <string name="poi_crossing_light_yes">Prelazno svetlo</string>
+    <string name="poi_crossing_bell_no">Prelazno zvono: ne</string>
+    <string name="poi_crossing_bell_yes">Prelazno zvono</string>
+    <string name="poi_crossing_barrier_double_half">Prelazna barijera: duplo polovična</string>
+    <string name="poi_crossing_barrier_half">Prelazna barijera: polovična</string>
+    <string name="poi_crossing_barrier_full">Prelazna barijera: puna</string>
+    <string name="poi_crossing_barrier_yes">Prelazna barijera</string>
+    <string name="poi_crossing_barrier_no">Prelazna barijera: ne</string>
+    <string name="poi_crossing_activation_remote">Aktiviranje prelaza: daljinsko</string>
+    <string name="poi_crossing_activation_local">Aktiviranje prelaza: lokalno</string>
+    <string name="poi_crossing_activation_automatic">Aktiviranje prelaza: automatsko</string>
+    <string name="poi_recreation_center">Rekreacioni centar</string>
+    <string name="poi_summer_camp">Letnji kamp</string>
+    <string name="poi_spoil_heap">Pokvarena gomila</string>
+    <string name="poi_wheelchair_designated">Određeno</string>
+    <string name="poi_salt_no">So: ne</string>
+    <string name="poi_salt_yes">So</string>
+    <string name="poi_depth">Dubina</string>
+    <string name="poi_bicycle_parking_streetpod">Ulično postolje</string>
+    <string name="poi_bicycle_parking_tree">Bicikl drvo</string>
+    <string name="poi_bicycle_parking_lockers">Ormarići</string>
+    <string name="poi_military_checkpoint">Vojni kontrolni punkt</string>
+    <string name="poi_street_cabinet_street_lighting">Tip kabineta: ulična rasveta</string>
+    <string name="poi_street_cabinet_water_management">Tip kabineta: vodovodni</string>
+    <string name="poi_street_cabinet_waste">Tip kabineta: otpadi</string>
+    <string name="poi_street_cabinet_postal_service">Tip kabineta: poštanski</string>
+    <string name="poi_street_cabinet_gas">Tip kabineta: gasni</string>
+    <string name="poi_street_cabinet_cable_tv">Tip kabineta: kablovska televizija</string>
+    <string name="poi_street_cabinet_telecom">Tip kabineta: telekomski</string>
+    <string name="poi_street_cabinet_power">Tip kabineta: energetski</string>
+    <string name="poi_in_service_yes">U upotrebi: da</string>
+    <string name="poi_water_source_stream">Tok</string>
+    <string name="poi_water_source_pond">Pond</string>
+    <string name="poi_water_source_main">Glavni</string>
+    <string name="poi_fire_hydrant_style_wsh">Stil hidranta: wsh</string>
+    <string name="poi_fire_hydrant_position_underground">Podzemni</string>
+    <string name="poi_fire_hydrant_position_street">Ulica</string>
+    <string name="poi_fire_hydrant_position_parking_lot">Parking</string>
+    <string name="poi_fire_hydrant_position_lane">Traka</string>
+    <string name="poi_fire_hydrant_position_green">Zelena</string>
+    <string name="poi_fire_hydrant_position_sidewalk">Trotoar</string>
+    <string name="poi_fire_hydrant_flow_capacity">Kapacitet protoka hidranta</string>
+    <string name="poi_fire_hydrant_count">Broj hidranta</string>
+    <string name="poi_fire_hydrant_pressure">Pritisak hidranta</string>
+    <string name="poi_fire_hydrant_diameter">Prečnik hidranta</string>
+    <string name="poi_office_midwife">Kancelarija babice</string>
+    <string name="poi_office_nursing_service">Usluga nege</string>
+    <string name="poi_office_psychologist">Kancelarija psihologa</string>
+    <string name="poi_office_healer">Kancelarija iscelitelja</string>
+    <string name="poi_office_podologist">Kancelarija podologa</string>
+    <string name="poi_office_therapist">Kancelarija terapeuta</string>
+    <string name="poi_office_physician">Lekarska ordinacija</string>
+    <string name="poi_disease_aids_no">SIDA: ne</string>
+    <string name="poi_disease_aids_yes">SIDA: da</string>
+    <string name="poi_disease_autism_no">Autizam: ne</string>
+    <string name="poi_disease_autism_yes">Autizam: da</string>
+    <string name="poi_disease_ebola_no">Ebola: ne</string>
+    <string name="poi_disease_ebola_yes">Ebola: da</string>
+    <string name="poi_disease_malaria_no">Malarija: ne</string>
+    <string name="poi_disease_malaria_yes">Malarija: da</string>
+    <string name="poi_home_visit_no">Kućna poseta: ne</string>
+    <string name="poi_home_visit_yes">Da</string>
+    <string name="poi_emergency_no">Hitna: ne</string>
+    <string name="poi_emergency_yes">Hitna: da</string>
+    <string name="poi_counselling_no">Savetovanje: ne</string>
+    <string name="poi_counselling_yes">Savetovanje: da</string>
+    <string name="poi_treat_inpatient_only">Bolničke usluge: samo</string>
+    <string name="poi_treat_inpatient_no">Bolničke usluge: ne</string>
+    <string name="poi_treat_inpatient_yes">Bolničke usluge: da</string>
+    <string name="poi_provided_for_boy_no">Predviđeno za dečake: ne</string>
+    <string name="poi_provided_for_boy_yes">Predviđeno za dečake: da</string>
+    <string name="poi_provided_for_man_no">Predviđeno za muškarce: ne</string>
+    <string name="poi_provided_for_man_yes">Predviđeno za muškarce: da</string>
+    <string name="poi_provided_for_girl_no">Predviđeno za devojke: ne</string>
+    <string name="poi_provided_for_girl_yes">Predviđeno za devojke: da</string>
+    <string name="poi_provided_for_senior_no">Predviđeno za starije osobe: ne</string>
+    <string name="poi_provided_for_senior_yes">Predviđeno za starije osobe: da</string>
+    <string name="poi_provided_for_woman_no">Predviđeno za žene: ne</string>
+    <string name="poi_provided_for_woman_yes">Predviđeno za žene: da</string>
+    <string name="poi_provided_for_adult_no">Predviđeno za odrasle: ne</string>
+    <string name="poi_provided_for_adult_yes">Predviđeno za odrasle: da</string>
+    <string name="poi_provided_for_child_no">Predviđeno za decu: ne</string>
+    <string name="poi_provided_for_child_yes">Predviđeno za decu: da</string>
+    <string name="poi_provided_for_toddler_no">Predviđeno za mališane: ne</string>
+    <string name="poi_provided_for_toddler_yes">Predviđeno za mališane: da</string>
+    <string name="poi_provided_for_infant_no">Predviđeno za novorođenčad: ne</string>
+    <string name="poi_provided_for_infant_yes">Predviđeno za novorođenčad: da</string>
+    <string name="poi_counselling_type_violence_no">Savetovanje (nasilje): ne</string>
+    <string name="poi_counselling_type_violence_yes">Savetovanje (nasilje): da</string>
+    <string name="poi_counselling_type_victim_no">Savetovanje (žrtve): ne</string>
+    <string name="poi_counselling_type_victim_yes">Savetovanje (žrtve): da</string>
+    <string name="poi_counselling_type_sexual_abuse_no">Savetovanje (seksualno zlostavljanje): ne</string>
+    <string name="poi_counselling_type_sexual_abuse_yes">Savetovanje (seksualno zlostavljanje): da</string>
+    <string name="poi_counselling_type_sexual_no">Savetovanje (seksualno): ne</string>
+    <string name="poi_counselling_type_sexual_yes">Savetovanje (seksualno): da</string>
+    <string name="poi_counselling_type_rehabilitation_no">Savetovanje (rehabilitacija): ne</string>
+    <string name="poi_counselling_type_rehabilitation_yes">Savetovanje (rehabilitacija): da</string>
+    <string name="poi_counselling_type_nutrition_nfire_hydo">Savetovanje (ishrana): ne</string>
+    <string name="poi_counselling_type_nutrition_yes">Savetovanje (ishrana): da</string>
+    <string name="poi_atoll">Koralna obala</string>
+    <string name="poi_blood_donation">Donacija krvi</string>
+    <string name="poi_laboratory">Medicinska laboratorija</string>
+    <string name="poi_shop_wholesale">Veleprodaja</string>
+    <string name="poi_craft_confectionery">Proizvodnja konditorskih proizvoda</string>
+    <string name="poi_substation_field_gathering">Terensko prikupljanje</string>
+    <string name="poi_substation_inspection_gauge">Uređaj inspekcije</string>
+    <string name="poi_substation_valve_group">Ventilski grupna</string>
+    <string name="poi_substation_valve">Ventilska</string>
+    <string name="poi_substation_measurement">Merna</string>
+    <string name="poi_substation_compression">Kompresiona</string>
+    <string name="poi_substation_compensation">Kompenzaciona</string>
+    <string name="poi_substation_converter">Pretvaračka</string>
+    <string name="poi_substation_traction">Vučna</string>
+    <string name="poi_substation_transition">Prelazna</string>
+    <string name="poi_substation_industrial">Industrijska</string>
+    <string name="poi_substation_minor_distribution">Manja distribuciona</string>
+    <string name="poi_substation_distribution">Distribuciona</string>
+    <string name="poi_substation_transmission">Prenosna</string>
+    <string name="poi_pipeline_substation">Cevovodna podstanica</string>
+    <string name="poi_bulk_purchase_only">Jedino</string>
+    <string name="poi_bulk_purchase_yes">Da</string>
+    <string name="poi_shoe_repair">Popravka obuće</string>
+    <string name="poi_hill">Brdo</string>
+    <string name="poi_license_classes">Licencni časovi</string>
+    <string name="poi_ruins">Ruševine</string>
+    <string name="poi_hazard_minefield">Minsko polje</string>
+    <string name="poi_hazard_flood">Opasnost od poplave</string>
+    <string name="poi_hazard_slippery_road">Klizav put</string>
+    <string name="poi_hazard_avalanche">Opasnost od lavine</string>
+    <string name="poi_hazard_erosion">Opasnost od erozije</string>
+    <string name="poi_hazard_nuclear">Nuklearna opasnost</string>
+    <string name="poi_hazard">Opasnost</string>
+    <string name="poi_payment_contactless_no">Beskontaktno ne prihvata se</string>
+    <string name="poi_payment_contactless_yes">Beskontaktno</string>
+    <string name="poi_outcrop">Izranjajuća stena</string>
+    <string name="poi_appliance">Prodavnica aparata</string>
+    <string name="poi_end_date">Krajnji datum</string>
+    <string name="poi_rock">Stena</string>
+    <string name="poi_course">Kurs</string>
+    <string name="poi_checkpoint_type_electronic">Elektronski</string>
+    <string name="poi_checkpoint_type_needler">Injektor</string>
+    <string name="poi_checkpoint_type_code">Kod</string>
+    <string name="poi_checkpoint_type_stamp">Tačka ureza</string>
+    <string name="poi_checkpoint_hiking">Pešačka kontrolna tačka</string>
+    <string name="poi_glacier_slope">Prosečan nagib</string>
+    <string name="poi_glacier_ele_bottom">Najniža tačka</string>
+    <string name="poi_glacier_ele_top">Najviša tačka</string>
+    <string name="poi_glacier_type_ice_tongue">Ledeni jezik</string>
+    <string name="poi_glacier_type_remnant">Ostatak</string>
+    <string name="poi_glacier_type_shelf">Plato</string>
+    <string name="poi_glacier_type_rock">Stena</string>
+    <string name="poi_glacier_type_icefall">Ledopad</string>
+    <string name="poi_glacier_type_hanging">Viseći</string>
+    <string name="poi_glacier_type_mountain">Planinski</string>
+    <string name="poi_glacier_type_tidewater">Plimski</string>
+    <string name="poi_glacier_type_outlet">Izlazni</string>
+    <string name="poi_glacier_type_valley">Dolina</string>
+    <string name="poi_glacier_type_plateau">Plato</string>
+    <string name="poi_glacier_type_icefield">Ledeno polje</string>
+    <string name="poi_glacier_type_icecap">Ledena kapa</string>
+    <string name="poi_via_ferrata_scale">Težina</string>
+    <string name="poi_cable_number">Broj kabla</string>
+    <string name="poi_via_ferrata">Zaštićena ruta</string>
+    <string name="poi_climbing_adventure">Avantura penjanja</string>
+    <string name="poi_aerialway_zip_line">Zip linija</string>
+    <string name="poi_service_vehicle_tyres_yes">Gume</string>
+    <string name="poi_service_vehicle_insurance_yes">Osiguranje</string>
+    <string name="poi_service_vehicle_motor_yes">Motor</string>
+    <string name="poi_service_vehicle_transmission_repair_yes">Popravka transmisije</string>
+    <string name="poi_service_vehicle_alignment_yes">Reglaža</string>
+    <string name="poi_service_vehicle_muffler_yes">Prigušivač</string>
+    <string name="poi_service_vehicle_truck_repair_yes">Popravka kamiona</string>
+    <string name="poi_service_vehicle_glass_yes">Staklo</string>
+    <string name="poi_service_vehicle_wheels_yes">Točkovi</string>
+    <string name="poi_service_vehicle_electrical_yes">Elektrika</string>
+    <string name="poi_service_vehicle_body_repair_yes">Popravka karoserije</string>
+    <string name="poi_service_vehicle_air_conditioning_yes">Klima uređaj</string>
+    <string name="poi_service_vehicle_batteries_yes">Baterije</string>
+    <string name="poi_service_vehicle_car_parts_yes">Auto delovi</string>
+    <string name="poi_service_vehicle_diagnostics_yes">Dijagnostika</string>
+    <string name="poi_service_vehicle_new_car_sales_yes">Prodaja novih automobila</string>
+    <string name="poi_service_vehicle_brakes_yes">Kočnice</string>
+    <string name="poi_service_vehicle_used_car_sales_yes">Prodaja polovnih automobila</string>
+    <string name="poi_service_vehicle_oil_change_yes">Promena ulja</string>
+    <string name="poi_service_vehicle_car_repair_yes">Auto servis</string>
+    <string name="poi_adult_gaming_centre">Igrački centar za odrasle</string>
+    <string name="poi_amusement_arcade">Zabavna arkadna igra</string>
+    <string name="poi_water_utility">Kancelarija za vodosnabdevanje</string>
+    <string name="poi_outpost">Mesto isporuke prodavnice</string>
+    <string name="poi_whitewater_rapid_name">Ime rečnih brzaka</string>
+    <string name="poi_pottery">Keramika</string>
+    <string name="poi_flooring">Prodavnica podova</string>
+    <string name="poi_socket_schuko_output_low">Nizak</string>
+    <string name="poi_socket_schuko_output_medium">Srednji</string>
+    <string name="poi_socket_schuko_output_high">Visok</string>
+    <string name="poi_socket_cee_blue_output_low">Nizak</string>
+    <string name="poi_socket_cee_blue_output_medium">Srednji</string>
+    <string name="poi_socket_cee_blue_output_high">Visok</string>
+    <string name="poi_socket_type3_output_low">Nizak</string>
+    <string name="poi_socket_type3_output_medium">Srednji</string>
+    <string name="poi_socket_type3_output_high">Visok</string>
+    <string name="poi_socket_type2_combo_output_low">Nizak</string>
+    <string name="poi_socket_type2_combo_output_medium">Srednji</string>
+    <string name="poi_socket_type2_combo_output_high">Visok</string>
+    <string name="poi_socket_type2_output_low">Nizak</string>
+    <string name="poi_socket_type2_output_medium">Srednji</string>
+    <string name="poi_socket_type2_output_high">Visok</string>
+    <string name="poi_socket_chademo_output_low">Nizak</string>
+    <string name="poi_socket_chademo_output_medium">Srednji</string>
+    <string name="poi_socket_chademo_output_high">Visok</string>
+    <string name="poi_socket_as3112_yes">AS / NZS 3112</string>
+    <string name="poi_socket_bs1363_yes">BS 1363</string>
+    <string name="poi_socket_schuko_yes">Šuko</string>
+    <string name="poi_socket_nema_14_50_yes">NEMA 14-30</string>
+    <string name="poi_socket_nema_14_30_yes">NEMA 14-30</string>
+    <string name="poi_socket_nema_5_20_yes">NEMA 5-20</string>
+    <string name="poi_socket_nema_5_15_yes">NEMA 5-15R</string>
+    <string name="poi_socket_tesla_roadster_yes">Tesla Roudster</string>
+    <string name="poi_socket_tesla_supercharger_yes">Tesla Superpunjač</string>
+    <string name="poi_socket_tesla_standard_yes">Tesla standard</string>
+    <string name="poi_socket_chademo_yes">CHAdeMO</string>
+    <string name="poi_socket_type3_yes">Tip 3</string>
+    <string name="poi_socket_type2_combo_yes">Tip 2 kombo</string>
+    <string name="poi_socket_type2_yes">Tip 2</string>
+    <string name="poi_socket_type1_combo_yes">Tip 1 kombo</string>
+    <string name="poi_socket_type1_yes">Tip 1</string>
+    <string name="poi_socket_cee_red_125a_yes">CEE crvena 125A</string>
+    <string name="poi_socket_cee_red_64a_yes">CEE crvena 64A</string>
+    <string name="poi_socket_cee_red_32a_yes">CEE crvena 32A</string>
+    <string name="poi_socket_cee_red_16a_yes">CEE crvena 16A</string>
+    <string name="poi_socket_cee_blue_yes">CEE plava</string>
+    <string name="poi_cannabis">Prodavnica kanabisa</string>
+    <string name="poi_shop_boat">Prodavnica čamaca</string>
+    <string name="poi_shop_fireplace">Prodavnica kamina</string>
+    <string name="poi_frozen_food">Zamrznuta hrana</string>
+    <string name="poi_meadow_pasture">Tip: pašnjak</string>
+    <string name="poi_meadow_perpetual">Tip: trajna</string>
+    <string name="poi_meadow_transitional">Tip: prelazna</string>
+    <string name="poi_diameter_crown">Prečnik krune</string>
+    <string name="poi_circumference">Obim</string>
+    <string name="poi_climbing_routes">Penjačke rute</string>
+    <string name="poi_climbing_summit_log_no">Brvno vrha penjanja: ne</string>
+    <string name="poi_climbing_summit_log_yes">Brvno vrha penjanja: da</string>
+    <string name="poi_climbing_orientation_nw">Orijentacija zida: SZ</string>
+    <string name="poi_climbing_orientation_w">Orijentacija zida: Z</string>
+    <string name="poi_climbing_orientation_sw">Orijentacija zida: JZ</string>
+    <string name="poi_climbing_orientation_s">Orijentacija zida: J</string>
+    <string name="poi_climbing_orientation_se">Orijentacija zida: JI</string>
+    <string name="poi_climbing_orientation_e">Orijentacija zida: I</string>
+    <string name="poi_climbing_orientation_ne">Orijentacija zida: SI</string>
+    <string name="poi_climbing_orientation_n">Orijentacija zida: S</string>
+    <string name="poi_climbing_bolted_no">Fiksna sidra: ne</string>
+    <string name="poi_climbing_bolted_yes">Fiksna sidra: da</string>
+    <string name="poi_climbing_quality_fragile">Kvalitet penjanja: krh</string>
+    <string name="poi_climbing_quality_solid">Kvalitet penjanja: čvrst</string>
+    <string name="poi_climbing_rock_porphyry">Stena za penjanje: porfir</string>
+    <string name="poi_climbing_rock_gneiss">Stena za penjanje: gnais</string>
+    <string name="poi_climbing_rock_quartzite">Stena za penjanje: kvarcit</string>
+    <string name="poi_climbing_rock_sandstone">Stena za penjanje: peščenjak</string>
+    <string name="poi_climbing_rock_granite">Penjanje na kamen: granit</string>
+    <string name="poi_climbing_rock_limestone">Stena za penjanje: krečnjak</string>
+    <string name="poi_climbing_length_max">Maksimalna dužina penjanja</string>
+    <string name="poi_climbing_length_min">Minimalna dužina penjanja</string>
+    <string name="poi_climbing_length">Dužina penjanja</string>
+    <string name="poi_climbing_deepwater_no">Solo u dubljim vodama: ne</string>
+    <string name="poi_climbing_deepwater_yes">Solo u dubljim vodama: da</string>
+    <string name="poi_climbing_mixed_no">Mešovito: ne</string>
+    <string name="poi_climbing_mixed_yes">Mešovito: da</string>
+    <string name="poi_climbing_ice_no">Led: ne</string>
+    <string name="poi_climbing_ice_yes">Led: da</string>
+    <string name="poi_climbing_multipitch_no">Rute na više tačaka: ne</string>
+    <string name="poi_climbing_multipitch_yes">Rute sa više tačaka: da</string>
+    <string name="poi_climbing_trad_no">Tradicionalno: ne</string>
+    <string name="poi_climbing_trad_yes">Tradicionalno: da</string>
+    <string name="poi_climbing_toprope_no">Gornje uže: ne</string>
+    <string name="poi_climbing_toprope_yes">Gornje uže: da</string>
+    <string name="poi_climbing_boulder_no">Balvaniranje: ne</string>
+    <string name="poi_climbing_boulder_yes">Balvaniranje: da</string>
+    <string name="poi_climbing_sport_no">Sport: ne</string>
+    <string name="poi_climbing_sport_yes">Sport: da</string>
+    <string name="poi_ref_post">Poštanski broj</string>
+    <string name="poi_money_transfer">Transfer novca</string>
+    <string name="poi_payment_centre">Centar plaćanja</string>
+    <string name="poi_post_flats">Stan</string>
+    <string name="poi_post_housenumber">Kućni broj</string>
+    <string name="poi_post_street">Ulica</string>
+    <string name="poi_letter_box">Kutija pisma</string>
+    <string name="poi_depot">Depo</string>
+    <string name="poi_charging_station">Stanica punjenje</string>
+    <string name="poi_map_size_region">Veličina mape: regija</string>
+    <string name="poi_map_size_city">Veličina mape: grad</string>
+    <string name="poi_map_size_site">Veličina mape: sajt</string>
+    <string name="poi_map_type_toposcope">Tip mape: toposkopska</string>
+    <string name="poi_map_type_scheme">Tip mape: šema</string>
+    <string name="poi_map_type_street">Vrsta mape: ulična</string>
+    <string name="poi_map_type_topo">Vrsta mape: topo</string>
+    <string name="poi_charging_station_output">Izlaz stanice punjenja</string>
+    <string name="poi_amperage">Amperaža</string>
+    <string name="poi_parking_fee">Cena parkiranja</string>
+    <string name="poi_parking_fee_no">Cena parkiranja: ne</string>
+    <string name="poi_parking_fee_yes">Cena parkiranja: da</string>
+    <string name="poi_truck_no">Kamion: ne</string>
+    <string name="poi_truck_yes">Kamion: da</string>
+    <string name="poi_scooter_no">Skuter: ne</string>
+    <string name="poi_scooter_yes">Skuter: da</string>
+    <string name="poi_bicycle_no">Bicikl: ne</string>
+    <string name="poi_bicycle_yes">Bicikl: da</string>
+    <string name="poi_car_no">Automobil: ne</string>
+    <string name="poi_car_yes">Automobil: da</string>
+    <string name="poi_socket_as3112_output">Utičnica: AS / NZS 3112: izlaz</string>
+    <string name="poi_socket_as3112_current">Utičnica: AS / NZS 3112: struja</string>
+    <string name="poi_socket_as3112">Utičnica: AS / NZS 3112</string>
+    <string name="poi_socket_bs1363_output">Utičnica: BS 1363: izlaz</string>
+    <string name="poi_socket_bs1363_current">Utičnica: BS 1363: struja</string>
+    <string name="poi_socket_bs1363">Utičnica: BS 1363</string>
+    <string name="poi_socket_schuko_output">Utičnica: Šuko: izlaz</string>
+    <string name="poi_socket_schuko_current">Utičnica: Šuko: struja</string>
+    <string name="poi_socket_schuko">Utičnica: Šuko</string>
+    <string name="poi_socket_nema_14_50_output">Utičnica: NEMA 14-50: izlaz</string>
+    <string name="poi_socket_nema_14_50_current">Utičnica: NEMA 14-50: struja</string>
+    <string name="poi_socket_nema_14_50">Utičnica: NEMA 14-50</string>
+    <string name="poi_socket_nema_14_30_output">Utičnica: NEMA 14-30: izlaz</string>
+    <string name="poi_socket_nema_14_30_current">Utičnica: NEMA 14-30: struja</string>
+    <string name="poi_socket_nema_14_30">Utičnica: NEMA 14-30</string>
+    <string name="poi_socket_nema_5_20_output">Utičnica: NEMA 5-20: izlaz</string>
+    <string name="poi_socket_nema_5_20_current">Utičnica: NEMA 5-20: struja</string>
+    <string name="poi_socket_nema_5_20">Utičnica: NEMA 5-20</string>
+    <string name="poi_socket_nema_5_15_output">Utičnica: NEMA 5-15R: izlaz</string>
+    <string name="poi_socket_nema_5_15_current">Utičnica: NEMA 5-15R: struja</string>
+    <string name="poi_socket_nema_5_15">Utičnica: NEMA 5-15R</string>
+    <string name="poi_socket_tesla_roadster_output">Utičnica: Tesla Roudster: izlaz</string>
+    <string name="poi_socket_tesla_roadster_current">Utičnica: Tesla Roudster: struja</string>
+    <string name="poi_socket_tesla_roadster">Utičnica: Tesla Roudster</string>
+    <string name="poi_socket_tesla_supercharger_output">Utičnica: Tesla superpunjač: izlaz</string>
+    <string name="poi_socket_tesla_supercharger_current">Utičnica: Tesla superpunjač: struja</string>
+    <string name="poi_socket_tesla_supercharger">Utičnica: Tesla superpunjač</string>
+    <string name="poi_socket_tesla_standard_output">Utičnica: Tesla standard: izlaz</string>
+    <string name="poi_socket_tesla_standard_current">Utičnica: Tesla standard: struja</string>
+    <string name="poi_socket_tesla_standard">Utičnica: Tesla standard</string>
+    <string name="poi_socket_chademo_output">Utičnica: CHAdeMO: izlaz</string>
+    <string name="poi_socket_chademo_current">Utičnica: CHAdeMO: struja</string>
+    <string name="poi_socket_chademo">Utičnica: CHAdeMO</string>
+    <string name="poi_socket_type3_output">Utičnica: Tip 3: izlaz</string>
+    <string name="poi_socket_type3_current">Utičnica: Tip 3: struja</string>
+    <string name="poi_socket_type3">Utičnica: Tip 3</string>
+    <string name="poi_socket_type2_combo_output">Utičnica: Tip 2 kombo: izlaz</string>
+    <string name="poi_socket_type2_combo_current">Utičnica: Tip 2 kombo: struja</string>
+    <string name="poi_socket_type2_combo">Utičnica: Tip 2 kombo</string>
+    <string name="poi_socket_type2_output">Utičnica: Tip 2: izlaz</string>
+    <string name="poi_socket_type2_current">Utičnica: Tip 2: struja</string>
+    <string name="poi_socket_type2">Utičnica: Tip 2</string>
+    <string name="poi_socket_type1_combo_output">Utičnica: Tip 1 kombo: izlaz</string>
+    <string name="poi_socket_type1_combo_current">Utičnica: Tip 1 kombo: struja</string>
+    <string name="poi_socket_type1_combo">Utičnica: Tip 1 kombo</string>
+    <string name="poi_socket_type1_output">Socket: Tip 1: izlaz</string>
+    <string name="poi_socket_type1_current">Utičnica: Tip 1: struja</string>
+    <string name="poi_socket_type1">Utičnica: Tip 1</string>
+    <string name="poi_socket_cee_red_125a_output">Utičnica: CEE crvena 125A: izlaz</string>
+    <string name="poi_socket_cee_red_125a_current">Utičnica: CEE crvena 125A: struja</string>
+    <string name="poi_socket_cee_red_125a">Utičnica: CEE crvena 125A</string>
+    <string name="poi_socket_cee_red_64a_output">Utičnica: CEE crvena 64A: izlaz</string>
+    <string name="poi_socket_cee_red_64a_current">Utičnica: CEE crvena 64A: struja</string>
+    <string name="poi_socket_cee_red_64a">Utičnica: CEE crvena 64A</string>
+    <string name="poi_socket_cee_red_32a_output">Utičnica: CEE crvena 32A: izlaz</string>
+    <string name="poi_socket_cee_red_32a_current">Utičnica: CEE crvena 32A: struja</string>
+    <string name="poi_socket_cee_red_32a">Utičnica: CEE crvena 32A</string>
+    <string name="poi_socket_cee_red_16a_output">Utičnica: CEE crvena 16A: izlaz</string>
+    <string name="poi_socket_cee_red_16a_current">Utičnica: CEE crvena 16A: struja</string>
+    <string name="poi_socket_cee_red_16a">Utičnica: CEE crvena 16A</string>
+    <string name="poi_socket_cee_blue_output">Utičnica: CEE plava: izlaz</string>
+    <string name="poi_socket_cee_blue_current">Utičnica: CEE plava: struja</string>
+    <string name="poi_socket_cee_blue">Utičnica: CEE plava</string>
+    <string name="poi_water_supply_bottled_water">Flaširana voda</string>
+    <string name="poi_water_supply_water_tank">Rezervoar za vodu</string>
+    <string name="poi_water_supply_water_trucking">Prevoz vode</string>
+    <string name="poi_water_supply_borehole">Bušotina</string>
+    <string name="poi_water_supply_pump">Pumpa</string>
+    <string name="poi_water_supply_running_water">Tekuća voda</string>
+    <string name="poi_water_supply_pipeline">Cevovod</string>
+    <string name="poi_water_supply_water_well">Bunar</string>
+    <string name="poi_water_purification_aquatabs">Akvatablete</string>
+    <string name="poi_water_purification_reverse_osmosis">Obrnuta osmoza</string>
+    <string name="poi_water_purification_chlorine">Hlor</string>
+    <string name="poi_water_purification_none">Nema</string>
+    <string name="poi_water_place_durability_emergency">Trajnost vodenog mesta: hitno</string>
+    <string name="poi_water_place_durability_durable">Trajnost vodenog mesta: izdržljiva</string>
+    <string name="poi_operational_status_needs_maintenance">Potrebno održavanje</string>
+    <string name="poi_operational_status_broken">Prekinuto</string>
+    <string name="poi_operational_status_restricted">Ograničen</string>
+    <string name="poi_location_kiosk">Lokacija: kiosk</string>
+    <string name="poi_boat_rental">Iznajmljivanje čamaca</string>
+    <string name="poi_beds">Kreveti</string>
+    <string name="poi_reservation_members_only">Rezervacija: samo članovi</string>
+    <string name="poi_reservation_no">Rezervacija: ne</string>
+    <string name="poi_reservation_yes">Rezervacija: da</string>
+    <string name="poi_reservation_recommended">Rezervacije: preporučuje se</string>
+    <string name="poi_reservation_required">Rezervacija: obavezna</string>
+    <string name="poi_winter_room_no">Zimska soba: ne</string>
+    <string name="poi_winter_room_yes">Zimska soba: da</string>
+    <string name="poi_direction_all">Pravac: svi</string>
+    <string name="poi_direction_exit">Pravac: izlaz</string>
+    <string name="poi_direction_entrance">Pravac: ulaz</string>
+    <string name="poi_direction_down">Pravac: nadole</string>
+    <string name="poi_direction_up">Pravac: nagore</string>
+    <string name="poi_direction_anticlockwise">Pravac: suprotno od kazaljke na satu</string>
+    <string name="poi_direction_clockwise">Pravac: u smeru kazaljke na satu</string>
+    <string name="poi_direction_backward">Pravac: unazad</string>
+    <string name="poi_direction_forward">Pravac: napred</string>
+    <string name="poi_direction_nnw">Pravac: sever-severozapad</string>
+    <string name="poi_direction_nw">Pravac: severozapad</string>
+    <string name="poi_direction_wnw">Pravac: zapad-severozapad</string>
+    <string name="poi_direction_w">Pravac: zapad</string>
+    <string name="poi_direction_wsw">Pravac: zapad-jugozapad</string>
+    <string name="poi_direction_sw">Pravac: jugozapad</string>
+    <string name="poi_direction_ssw">Pravac: jug-jugozapad</string>
+    <string name="poi_direction_s">Pravac: jug</string>
+    <string name="poi_direction_sse">Pravac: jug-jugoistok</string>
+    <string name="poi_direction_se">Pravac: jugoistok</string>
+    <string name="poi_direction_ese">Pravac: istok-jugoistok</string>
+    <string name="poi_direction_e">Pravac: istok</string>
+    <string name="poi_direction_ene">Pravac: istok-severoistok</string>
+    <string name="poi_direction_ne">Pravac: severoistok</string>
+    <string name="poi_direction_nne">Pravac: sever-severoistok</string>
+    <string name="poi_direction_n">Pravac: sever</string>
+    <string name="poi_spaceport">Svemirska luka</string>
+    <string name="poi_animal_shelter_purpose_release_no">Puštanje: ne</string>
+    <string name="poi_animal_shelter_purpose_release_yes">Puštanje: da</string>
+    <string name="poi_animal_shelter_purpose_adoption_no">Usvajanje: ne</string>
+    <string name="poi_animal_shelter_purpose_adoption_yes">Usvajanje: da</string>
+    <string name="poi_owner">Vlasnik</string>
+    <string name="poi_motorcycle_type_standard">Standardni</string>
+    <string name="poi_motorcycle_type_dualsport">Dualsport</string>
+    <string name="poi_motorcycle_type_offroad">Van puta</string>
+    <string name="poi_motorcycle_type_chopper">Čoper</string>
+    <string name="poi_motorcycle_type_sportbike">Sportski motorcikl</string>
+    <string name="poi_motorcycle_type_scooter">Skuter</string>
+    <string name="poi_motorcycle_clothes_no">Moto odeća: ne</string>
+    <string name="poi_motorcycle_clothes_yes">Moto odeća</string>
+    <string name="poi_motorcycle_tyres_no">Gume: ne</string>
+    <string name="poi_motorcycle_tyres_yes">Gume</string>
+    <string name="poi_motorcycle_parts_no">Delovi: ne</string>
+    <string name="poi_motorcycle_parts_yes">Delovi</string>
+    <string name="poi_motorcycle_repair_no">Popravaka: ne</string>
+    <string name="poi_motorcycle_repair_yes">Popravka</string>
+    <string name="poi_motorcycle_rental_no">Iznajmljivanje: ne</string>
+    <string name="poi_motorcycle_rental_yes">Iznajmljivanje</string>
+    <string name="poi_park_ride_yes">Da</string>
+    <string name="poi_denotation_landmark">Oznaka zemlje</string>
+    <string name="poi_denotation_natural_monument">Prirodni spomenik</string>
+    <string name="poi_childcare">Briga o deci</string>
+    <string name="poi_toll_gantry">Putarina</string>
+    <string name="poi_volcano_type_shield">Štit</string>
+    <string name="poi_volcano_type_stratovolcano">Stratovulkan</string>
+    <string name="poi_volcano_type_scoria">Šljaka</string>
+    <string name="poi_url">URL</string>
+    <string name="poi_parking_space">Parking mesto</string>
+    <string name="poi_grave">Grob</string>
+    <string name="poi_community_gender_mixed">Pol zajednice: mešoviti</string>
+    <string name="poi_community_gender_male">Pol zajednice: muški</string>
+    <string name="poi_community_gender_female">Pol zajednice: ženski</string>
+    <string name="poi_tourist_camp">Turistički kamp</string>
+    <string name="poi_monastery_type_clerks_regular">Tip manastira: regularno službeni</string>
+    <string name="poi_monastery_type_hermitage">Tip manastira: otšelnički</string>
+    <string name="poi_monastery_type_canonry">Tip manastira: kanonski</string>
+    <string name="poi_monastery_type_monastics">Tip manastira: muški</string>
+    <string name="poi_monastery_type_convent">Tip manastira: ženski</string>
+    <string name="poi_bath_open_air_no">Ne</string>
+    <string name="poi_bath_open_air_yes">Da</string>
+    <string name="poi_bath_type_foot_bath">Kupatilo za stopala</string>
+    <string name="poi_bath_type_lake">Jezero</string>
+    <string name="poi_bath_type_river">Reka</string>
+    <string name="poi_bath_type_thermal">Termalno</string>
+    <string name="poi_bath_type_hammam">Tursko kupatilo</string>
+    <string name="poi_bath_type_onsen">Onsen</string>
+    <string name="poi_bath_type_hot_spring">Topli izvor</string>
+    <string name="poi_cash_withdrawal_postbank">Poštanska banka</string>
+    <string name="poi_cash_withdrawal_girocard">Žirokartica</string>
+    <string name="poi_cash_withdrawal_migros_bank">Migros banka</string>
+    <string name="poi_cash_withdrawal_postfinance_card">Postfinansijska kartica</string>
+    <string name="poi_cash_withdrawal_foreign_cards">Podizanje gotovine: strane kartice</string>
+    <string name="poi_cash_withdrawal_purchase_minimum">Podizanje gotovine: minimalna kupovina</string>
+    <string name="poi_cash_withdrawal_fee_no">Naknada za podizanje gotovine: ne</string>
+    <string name="poi_cash_withdrawal_fee_yes">Naknada za podizanje gotovine: da</string>
+    <string name="poi_cash_withdrawal_purchase_required_no">Podizanje gotovine: kupovina nije neophodna</string>
+    <string name="poi_cash_withdrawal_purchase_required_yes">Podizanje gotovine: kupovina neophodna</string>
+    <string name="poi_cash_withdrawal_currency">Valuta za podizanje gotovine</string>
+    <string name="poi_cash_withdrawal_limit">Limit za podizanje gotovine</string>
+    <string name="poi_cash_withdrawal_type_self_checkout">Tip podizanja gotovine: samoplaćanje</string>
+    <string name="poi_cash_withdrawal_type_checkout">Tip podizanja gotovine: kasa</string>
+    <string name="poi_cash_withdrawal_operator">Operator podizanja gotovine</string>
+    <string name="poi_cash_withdrawal">Podizanje gotovine</string>
+    <string name="poi_cash_withdrawal_yes">Podizanje gotovine: da</string>
+    <string name="poi_pet_grooming">Šišanje ljubimaca</string>
+    <string name="poi_charge">Punjenje</string>
+    <string name="poi_craft_cabinet_maker">Stolar ormana</string>
+    <string name="poi_craft_bakery">Pekara</string>
+    <string name="poi_craft_floorer">Parketar</string>
+    <string name="poi_craft_joiner">Stolar</string>
+    <string name="poi_craft_distillery">Destilerija</string>
+    <string name="poi_craft_builder">Zidar</string>
+    <string name="poi_health_food">Zdrava hrana</string>
+    <string name="poi_cellar_entrance">Ulaz u podrum</string>
+    <string name="poi_disabled_designated">Određeno</string>
+    <string name="poi_disabled_yes">Da</string>
+    <string name="poi_goods_designated">Određeno</string>
+    <string name="poi_goods_yes">Da</string>
+    <string name="poi_hgv_delivery">Isporuka</string>
+    <string name="poi_hgv_designated">Određeno</string>
+    <string name="poi_hgv_permissive">Dopušteno</string>
+    <string name="poi_hgv_destination">Odredište</string>
+    <string name="poi_hgv_yes">Da</string>
+    <string name="poi_mofa_designated">Određeno</string>
+    <string name="poi_mofa_yes">Da</string>
+    <string name="poi_moped_designated">Određeno</string>
+    <string name="poi_moped_yes">Da</string>
+    <string name="poi_motorcycle_designated">Određeno</string>
+    <string name="poi_motorcycle_destination">Odredište</string>
+    <string name="poi_motorcycle_permissive">Dopušteno</string>
+    <string name="poi_motorcycle_yes">Da</string>
+    <string name="poi_trailer_designated">Određeno</string>
+    <string name="poi_trailer_yes">Da</string>
+    <string name="poi_motorhome_designated">Određeno</string>
+    <string name="poi_motorhome_yes">Da</string>
+    <string name="poi_caravan_designated">Određeno</string>
+    <string name="poi_caravan_yes">Da</string>
+    <string name="poi_bus_designated">Određeno</string>
+    <string name="poi_bus_yes">Da</string>
+    <string name="poi_snowmobile_permissive">Dopušteno</string>
+    <string name="poi_snowmobile_designated">Određeno</string>
+    <string name="poi_snowmobile_yes">Da</string>
+    <string name="poi_coach_no">Pristup treneru: ne</string>
+    <string name="poi_coach_yes">Pristup autobusu: da</string>
+    <string name="poi_psv_no">VJS pristup: ne</string>
+    <string name="poi_psv_designated">PSV pristup: određen</string>
+    <string name="poi_psv_yes">VJS pristup: da</string>
+    <string name="poi_motorhome_no">Pristup motornim kućama: ne</string>
+    <string name="poi_mofa_no">Mofa pristup: ne</string>
+    <string name="poi_taxi_office">Taksi kancelarija</string>
+    <string name="poi_hookah_lounge">Salon sa nargilom</string>
+    <string name="poi_charcoal_pile">Gomila uglja</string>
+    <string name="poi_changing_table_fee_no">Naknada promene stola: ne</string>
+    <string name="poi_changing_table_fee_yes">Naknada promene stola: da</string>
+    <string name="poi_changing_table_count">Broj promena stola</string>
+    <string name="poi_changing_table_location_unisex_toilet">Lokacija promene stola: uniseks toalet</string>
+    <string name="poi_changing_table_location_female_toilet">Lokacija promene stola: ženski toalet</string>
+    <string name="poi_changing_table_location_male_toilet">Lokacija promene stola: muški toalet</string>
+    <string name="poi_changing_table_location_room">Lokacija promene stola: soba</string>
+    <string name="poi_changing_table_limited">Promena stola: ograničena</string>
+    <string name="poi_changing_table_no">Promena stola: ne</string>
+    <string name="poi_changing_table_yes">Promena stola: da</string>
+    <string name="poi_defibrillator_location">Lokacija</string>
+    <string name="poi_hazard_additional_contamination">Opasnost: kontaminacija</string>
+    <string name="poi_hazard_additional_minefield">Opasnost: minsko polje</string>
+    <string name="poi_hazard_additional_avalanche">Opasnost: lavina</string>
+    <string name="poi_hazard_additional_flood">Opasnost: poplava</string>
+    <string name="poi_hazard_additional_nuclear">Opasnost: nuklearna</string>
+    <string name="poi_hazard_additional_rockfall">Opasnost: odron stena</string>
+    <string name="poi_hazard_additional_erosion">Opasnost: erozija</string>
+    <string name="poi_rescue_box">Spasilačka kutija</string>
+    <string name="poi_change_delete">Izbrisani objekt</string>
+    <string name="poi_flare">Gasna baklja;Gomila baklji</string>
+    <string name="poi_rtsa_scale_3b_asterisk">3B*</string>
+    <string name="poi_rtsa_scale_3b">3B</string>
+    <string name="poi_rtsa_scale_3a_asterisk">3A*</string>
+    <string name="poi_rtsa_scale_3a">3A</string>
+    <string name="poi_rtsa_scale_2b_asterisk">2B*</string>
+    <string name="poi_rtsa_scale_2b">2B</string>
+    <string name="poi_rtsa_scale_2a_asterisk">2A*</string>
+    <string name="poi_rtsa_scale_2a">2A</string>
+    <string name="poi_rtsa_scale_1b_asterisk">1B*</string>
+    <string name="poi_rtsa_scale_1b">1B</string>
+    <string name="poi_rtsa_scale_1a_asterisk">1A*</string>
+    <string name="poi_rtsa_scale_1a">1A</string>
+    <string name="poi_rtsa_scale_nc_asterisk">n/k*</string>
+    <string name="poi_rtsa_scale_nc">n/k</string>
+    <string name="poi_park_ride_ferry">Trajekt</string>
+    <string name="poi_park_ride_tram">Tramvaj</string>
+    <string name="poi_park_ride_hov">VOV</string>
+    <string name="poi_park_ride_metro">Metro</string>
+    <string name="poi_park_ride_bus">Autobus</string>
+    <string name="poi_park_ride_train">Voz</string>
+    <string name="poi_city_block">Gradski blok</string>
+    <string name="poi_borough">Gradić</string>
+    <string name="poi_give_box">Poklon kutija</string>
+    <string name="poi_traffic_signals_arrow_yes">Da</string>
+    <string name="poi_traffic_signals_vibration_yes">Da</string>
+    <string name="poi_traffic_signals_vibration_no">Vibracija: ne</string>
+    <string name="poi_pump_status_missing_beam">Status pumpe: nedostaje snop</string>
+    <string name="poi_osmand_fire_hydrant_pressure_suction">Usisni</string>
+    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Pod pritiskom</string>
+    <string name="poi_water_source_groundwater">Podzemna voda</string>
+    <string name="poi_fire_hydrant_type_pipe">Cev</string>
+    <string name="poi_drinking_water_refill_network">Mreža za ponovno dolivanje pitke vode</string>
+    <string name="poi_drinking_water_refill_no">Dolivanje vode za piće: ne</string>
+    <string name="poi_drinking_water_refill_yes">Da</string>
+    <string name="poi_seamark_obstruction">Opstrukcija</string>
+    <string name="poi_seamark_water_level_below_mwl">Nivo vode: ispod srednjeg nivoa</string>
+    <string name="poi_seamark_water_level_above_mwl">Nivo vode: iznad srednjeg nivoa</string>
+    <string name="poi_seamark_water_level_floating">Nivo vode: plutajući</string>
+    <string name="poi_seamark_water_level_floods">Nivo vode: poplave</string>
+    <string name="poi_seamark_water_level_awash">Nivo vode: na nivou</string>
+    <string name="poi_seamark_water_level_covers">Nivo vode: prekrivači</string>
+    <string name="poi_seamark_water_level_dry">Nivo vode: suv</string>
+    <string name="poi_seamark_water_level_submerged">Nivo vode: potopljen</string>
+    <string name="poi_seamark_water_level_part_submerged">Nivo vode: delimično potopljen</string>
+    <string name="poi_tactile_paving_incorrect">Neispravano</string>
+    <string name="poi_tactile_paving_primitive">Primitivno</string>
+    <string name="poi_tactile_paving_contrasted">Kontrastno</string>
+    <string name="poi_traffic_signals_sound_locate">Dozvoljeno je samo pri hodanju</string>
+    <string name="poi_internet_access_fee_customers">Pristup internetu: kupci</string>
+    <string name="poi_video_no">Ne</string>
+    <string name="poi_video_yes">Da</string>
+    <string name="poi_booth">Tip kabine</string>
+    <string name="poi_covered_booth">Kabina</string>
+    <string name="poi_sms_no">Ne</string>
+    <string name="poi_sms_yes">Da</string>
+    <string name="poi_dive_centre">Ronilački centar</string>
+    <string name="poi_resort_hunting">Lovačka baza</string>
+    <string name="poi_piste_ref">Referentni broj staze</string>
+    <string name="poi_bowling_alley">Centar za kuglanje</string>
+    <string name="poi_shop_security">Prodavnica bezbednosti</string>
+    <string name="poi_mountain_rescue">Planinska spasilačka</string>
+    <string name="poi_paintball">Paintbol</string>
+    <string name="poi_memorial_ghost_bike">Bicikl duh</string>
+    <string name="poi_volcano_number_of_eruptions">Broj erupcija</string>
+    <string name="poi_volcano_status_inactive">Neaktivan</string>
+    <string name="poi_volcano_status_active">Aktivan</string>
+    <string name="poi_volcano_status_dormant">Latentan</string>
+    <string name="poi_volcano_status_extinct">Izumreo</string>
+    <string name="poi_volcano_last_eruption">Poslednja erupcija</string>
+    <string name="poi_volcano_type_mud">Blato</string>
+    <string name="poi_volcano_type_lava_dome">Kupola lave</string>
+    <string name="poi_volcano_type_caldera">Kaldera</string>
+    <string name="poi_volcano_type_maar">Mar</string>
+    <string name="poi_traffic_signals_arrow_no">Strelica: ne</string>
+    <string name="poi_departures_board_no">Tabla odlaska: ne</string>
+    <string name="poi_diplomatic_services_citizen_services_no">Ne</string>
+    <string name="poi_diplomatic_services_citizen_services_yes">Da</string>
+    <string name="poi_diplomatic_services_immigrant_visas_no">Ne</string>
+    <string name="poi_diplomatic_services_immigrant_visas_yes">Da</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_no">Ne</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_yes">Da</string>
+    <string name="poi_liaison_subnational">Podnacionalni</string>
+    <string name="poi_liaison_representative_office">Predstavništvo</string>
+    <string name="poi_liaison_liaison_office">Kancelarija</string>
+    <string name="poi_consulate_honorary_consul">Počasni konzulat</string>
+    <string name="poi_consulate_consulate_general">Generalni konzulat</string>
+    <string name="poi_consulate_consular_office">Konzularna kancelarija</string>
+    <string name="poi_consulate_consular_agency">Konzularna agencija</string>
+    <string name="poi_consulate_yes">Na čelu sa konzulom</string>
+    <string name="poi_embassy_residence">Rezidencija</string>
+    <string name="poi_embassy_nunciature">Nuncijatura</string>
+    <string name="poi_embassy_mission">Misija</string>
+    <string name="poi_embassy_interests_section">Interesni</string>
+    <string name="poi_embassy_high_commission">Visoka komisija</string>
+    <string name="poi_embassy_delegation">Delegacija</string>
+    <string name="poi_embassy_branch_embassy">Podružnica</string>
+    <string name="poi_embassy_yes">Na čelu sa ambasadorom</string>
+    <string name="poi_diplomatic_liaison">Posrednik</string>
+    <string name="poi_diplomatic_embassy">Ambasada</string>
+    <string name="poi_radar_tower">Radarski toranj</string>
+    <string name="poi_parking_layby">Parking</string>
+    <string name="poi_parking_sheds">Parking</string>
+    <string name="poi_parking_rooftop">Tavan</string>
+    <string name="poi_gpx_point">GPKS tačka</string>
+    <string name="poi_fuel_lng">LNG</string>
+    <string name="poi_nuts">Prodavnica oraha</string>
+    <string name="poi_beehive">Košnica</string>
+    <string name="poi_departures_board_timetable">Raspored</string>
+    <string name="poi_departures_board_realtime">Stvarno vreme</string>
+    <string name="poi_departures_board_delay">Kašnjenje</string>
+    <string name="poi_departures_board_yes">Da</string>
+    <string name="poi_elevator">Lift</string>
+    <string name="poi_recycling_small_electrical_appliances">Mali električni uređaji</string>
+    <string name="poi_diplomatic_services_citizen_services_filter">Usluge za građane</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Imigrantske vize</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Neimigrantske vize</string>
+    <string name="poi_liaison_filter">Posrednik</string>
+    <string name="poi_consulate_filter">Konzulat</string>
+    <string name="poi_embassy_filter">Ambasada</string>
+    <string name="poi_departures_board">Tabla</string>
+    <string name="poi_drinking_water_refill">Dolivanje vode za piće</string>
+    <string name="poi_lifeguard_base">Baza spasioca</string>
+    <string name="poi_siren">Sirena</string>
+    <string name="poi_nurse">Medicinska sestra</string>
+    <string name="poi_mobile_money_agent">Mobilni agent za novac</string>
+    <string name="poi_water_source_lake">Jezero</string>
+    <string name="poi_water_source_river">Reka</string>
+    <string name="poi_vaccination_covid19">Cepljenje: Kovid 19</string>
+    <string name="poi_health_specialty_vaccination_yes">Cepljenje</string>
+    <string name="poi_club_social">Društveni klub</string>
+    <string name="poi_plateau">Plato</string>
+    <string name="poi_office_diplomatic">Diplomatsko predstavništvo</string>
+    <string name="poi_kickboxing">Kik-boks</string>
+    <string name="poi_fencing">Mačevanje</string>
+    <string name="poi_curling">Kurling</string>
+    <string name="poi_crossfit">Krosfit</string>
+    <string name="poi_cockfighting">Tuča petlova</string>
+    <string name="poi_bullfighting">Borba sa bikovima</string>
+    <string name="poi_bobsleigh">Bob</string>
+    <string name="poi_biathlon">Biatlon</string>
+    <string name="poi_aikido">Aikido</string>
+    <string name="poi_water_ski">Vodeno skijanje</string>
+    <string name="poi_water_polo">Vaterpolo</string>
+    <string name="poi_wrestling">Rvanje</string>
+    <string name="poi_weightlifting">Dizanje tegova</string>
+    <string name="poi_wakeboarding">Vejkbording</string>
+    <string name="poi_ultimate">Ultimat</string>
+    <string name="poi_taekwondo">Taekvondo</string>
+    <string name="poi_table_soccer">Futsal</string>
+    <string name="poi_sumo">Sumo</string>
+    <string name="poi_snooker">Snuker</string>
+    <string name="poi_piste_status_open">Stanje staze: otvorena</string>
+    <string name="poi_patrolled_no">Obilažena: ne</string>
+    <string name="poi_patrolled_yes">Obilažena: da</string>
+    <string name="poi_piste_name">Ime staze</string>
+    <string name="poi_piste_ski_jump">Ski skok</string>
+    <string name="poi_wildlife_crossing_bat_tunnel">Tunel za slepe miševe</string>
+    <string name="poi_wildlife_crossing_bat_bridge">Most za slepe miševe</string>
+    <string name="poi_wildlife_crossing">Prelaz za divljač</string>
+    <string name="poi_swimming_area">Deo za plivanje</string>
+    <string name="poi_lavoir">Pojilo</string>
+    <string name="poi_waste_transfer_station">Stanica za prenos otpada</string>
+    <string name="poi_weightbridge">Kolska vaga</string>
+    <string name="poi_ranger_station">Šumarska stanica</string>
+    <string name="poi_water_source_tube_well">Cevni bunar</string>
+    <string name="poi_water_source_well">Bunar</string>
+    <string name="poi_water_source_powered_pump">Električna pumpa</string>
+    <string name="poi_water_source_water_tank">Tank sa vodom</string>
+    <string name="poi_water_source_tap">Česma</string>
+    <string name="poi_bay_filter">Tip zaliva</string>
+</resources>

From 43564125ce411acb0663252a394194b9e144c757 Mon Sep 17 00:00:00 2001
From: androiddevkotlin <64539346+androiddevkotlin@users.noreply.github.com>
Date: Wed, 21 Apr 2021 13:57:53 +0300
Subject: [PATCH 02/29] "Split interval:" not translated

https://github.com/osmandapp/OsmAnd/issues/11444
---
 .../dialog_list_item_with_compound_button.xml |  3 ++-
 OsmAnd/res/layout/drawer_list_radius_ex.xml   | 17 ++++++-------
 OsmAnd/res/layout/open_bug.xml                | 13 +++++-----
 OsmAnd/res/layout/search_poi_filter.xml       | 13 +++++-----
 OsmAnd/res/layout/split_segments_layout.xml   |  2 +-
 OsmAnd/res/layout/subscription_fragment.xml   |  3 ++-
 OsmAnd/res/layout/switch_select_list_item.xml | 24 +++++++++----------
 OsmAnd/res/layout/test_backup_layout.xml      |  2 +-
 OsmAnd/res/layout/undo_popup.xml              | 13 +++++-----
 .../myplaces/SplitSegmentDialogFragment.java  |  2 ++
 10 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/OsmAnd/res/layout/dialog_list_item_with_compound_button.xml b/OsmAnd/res/layout/dialog_list_item_with_compound_button.xml
index 53ca8d39a7..809d19fabc 100644
--- a/OsmAnd/res/layout/dialog_list_item_with_compound_button.xml
+++ b/OsmAnd/res/layout/dialog_list_item_with_compound_button.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_height="wrap_content"
 	android:layout_width="match_parent"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:orientation="vertical">
 
 	<View
@@ -58,7 +59,7 @@
 			android:layout_gravity="center_vertical|start"
 			android:textColor="?android:textColorPrimary"
 			android:textSize="@dimen/default_list_text_size_large"
-			android:text="Item title"/>
+			tools:text="Item title"/>
 		
 	</LinearLayout>
 
diff --git a/OsmAnd/res/layout/drawer_list_radius_ex.xml b/OsmAnd/res/layout/drawer_list_radius_ex.xml
index 4c84dacfd3..de6fb3fd54 100644
--- a/OsmAnd/res/layout/drawer_list_radius_ex.xml
+++ b/OsmAnd/res/layout/drawer_list_radius_ex.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:paddingLeft="16dp"
-              android:paddingRight="16dp"
-              android:minHeight="50dp"
-              android:layout_marginBottom="5dp"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="horizontal"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:paddingLeft="16dp"
+	android:paddingRight="16dp"
+	android:minHeight="50dp"
+	android:layout_marginBottom="5dp"
 	android:paddingStart="16dp"
 	android:paddingEnd="16dp">
 
@@ -69,7 +70,7 @@
             android:textColor="@color/color_myloc_distance"
             android:layout_gravity="center_vertical"
             android:layout_marginTop="2dp"
-            android:text="Cinema"
+            tools:text="Cinema"
             android:layout_marginRight="16dp"
 	        android:layout_marginEnd="16dp" />
 
diff --git a/OsmAnd/res/layout/open_bug.xml b/OsmAnd/res/layout/open_bug.xml
index 1a69405a48..94c2a40798 100644
--- a/OsmAnd/res/layout/open_bug.xml
+++ b/OsmAnd/res/layout/open_bug.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:orientation="vertical"
-              android:paddingLeft="?dialogPreferredPadding"
-              android:paddingRight="?dialogPreferredPadding"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="vertical"
+	android:paddingLeft="?dialogPreferredPadding"
+	android:paddingRight="?dialogPreferredPadding"
 	android:paddingStart="?dialogPreferredPadding"
 	android:paddingEnd="?dialogPreferredPadding">
 
@@ -32,7 +33,7 @@
         android:id="@+id/user_name_field"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:text="NoName"/>
+        tools:text="NoName"/>
 
 
     <TextView
diff --git a/OsmAnd/res/layout/search_poi_filter.xml b/OsmAnd/res/layout/search_poi_filter.xml
index 1699c4ac10..119c662e93 100644
--- a/OsmAnd/res/layout/search_poi_filter.xml
+++ b/OsmAnd/res/layout/search_poi_filter.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              xmlns:osmand="http://schemas.android.com/apk/res-auto"
-              android:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -51,7 +52,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
                         android:background="@null"
-                        android:text="Filling station"
+                        tools:text="Filling station"
                         android:textColor="@color/color_white"
                         android:textSize="@dimen/default_desc_text_size"/>
 
diff --git a/OsmAnd/res/layout/split_segments_layout.xml b/OsmAnd/res/layout/split_segments_layout.xml
index c4a5d809d9..84f36602fc 100644
--- a/OsmAnd/res/layout/split_segments_layout.xml
+++ b/OsmAnd/res/layout/split_segments_layout.xml
@@ -94,7 +94,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:background="@null"
-                        android:text="Split interval:"
+                        tools:text="Split interval:"
                         android:textColor="?android:attr/textColorPrimary"
                         android:textSize="@dimen/default_desc_text_size"
                         osmand:typeface="@string/font_roboto_medium" />
diff --git a/OsmAnd/res/layout/subscription_fragment.xml b/OsmAnd/res/layout/subscription_fragment.xml
index ad308e6be1..5deb8207c2 100644
--- a/OsmAnd/res/layout/subscription_fragment.xml
+++ b/OsmAnd/res/layout/subscription_fragment.xml
@@ -2,6 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="?attr/spinnerListBackground"
     android:orientation="vertical">
 
@@ -212,7 +213,7 @@
                                     android:paddingLeft="2dp"
                                     android:paddingEnd="0dp"
                                     android:paddingRight="0dp"
-                                    android:text="Ukraine"
+                                    tools:text="Ukraine"
                                     app:drawableEndCompat="@drawable/ic_action_arrow_drop_down"
                                     app:drawableRightCompat="@drawable/ic_action_arrow_drop_down" />
 
diff --git a/OsmAnd/res/layout/switch_select_list_item.xml b/OsmAnd/res/layout/switch_select_list_item.xml
index d362ff05f2..7c76fc5dec 100644
--- a/OsmAnd/res/layout/switch_select_list_item.xml
+++ b/OsmAnd/res/layout/switch_select_list_item.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:osmand="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:minHeight="48dp"
-    android:orientation="horizontal"
-    android:paddingLeft="@dimen/list_content_padding"
-    android:paddingRight="@dimen/list_content_padding"
+<LinearLayout xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:gravity="center_vertical"
+	android:minHeight="48dp"
+	android:orientation="horizontal"
+	android:paddingLeft="@dimen/list_content_padding"
+	android:paddingRight="@dimen/list_content_padding"
 	android:paddingEnd="@dimen/list_content_padding"
 	android:paddingStart="@dimen/list_content_padding">
 
@@ -36,7 +36,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:text="Avoid selected roads"
+            tools:text="Avoid selected roads"
             android:textSize="@dimen/default_list_text_size"/>
 
         <TextView
@@ -44,7 +44,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:text="Select roads you want to avoid during navigation"
+            tools:text="Select roads you want to avoid during navigation"
             android:textSize="@dimen/default_desc_text_size"/>
 
     </LinearLayout>
diff --git a/OsmAnd/res/layout/test_backup_layout.xml b/OsmAnd/res/layout/test_backup_layout.xml
index 216820a9bf..384b549ebb 100644
--- a/OsmAnd/res/layout/test_backup_layout.xml
+++ b/OsmAnd/res/layout/test_backup_layout.xml
@@ -117,7 +117,7 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="@dimen/content_padding"
-				android:text="Actions"
+				tools:text="Actions"
 				android:textColor="?android:textColorPrimary"
 				android:textSize="@dimen/default_list_text_size" />
 
diff --git a/OsmAnd/res/layout/undo_popup.xml b/OsmAnd/res/layout/undo_popup.xml
index 3a4b81702f..c427c95346 100644
--- a/OsmAnd/res/layout/undo_popup.xml
+++ b/OsmAnd/res/layout/undo_popup.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:background="@drawable/popup_bg"
-              android:gravity="center"
-              android:orientation="horizontal">
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:background="@drawable/popup_bg"
+	android:gravity="center"
+	android:orientation="horizontal">
 
     <TextView
         android:id="@+id/text"
@@ -37,6 +38,6 @@
         android:layout_height="wrap_content"
         android:layout_weight="0"
         android:background="?attr/selectableItemBackground"
-        android:text="UNDO"
+        tools:text="UNDO"
         android:textColor="@color/popup_text_color"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java
index c981610015..5ec7077718 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentDialogFragment.java
@@ -287,6 +287,8 @@ public class SplitSegmentDialogFragment extends DialogFragment {
 		}
 		int color = app.getResources().getColor(colorId);
 		title.setTextColor(color);
+		String titleText = getString(R.string.gpx_split_interval);
+		title.setText(getString(R.string.ltr_or_rtl_combine_via_colon, titleText, ""));
 		text.setTextColor(color);
 		img.setImageDrawable(ic.getIcon(R.drawable.ic_action_arrow_drop_down, colorId));
 	}

From b5a27d99b8f28922261c31e2395bc13028d16379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Babos=20G=C3=A1bor?= <gabor.babos@gmail.com>
Date: Wed, 21 Apr 2021 09:10:23 +0000
Subject: [PATCH 03/29] Translated using Weblate (Hungarian)

Currently translated at 99.9% (3720 of 3721 strings)
---
 OsmAnd/res/values-hu/strings.xml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index ced108288e..ec3dea7ece 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -13,8 +13,8 @@
     <string name="shared_string_help">Súgó</string>
     <string name="accessibility_mode">Akadálymentes mód</string>
     <string name="accessibility_mode_descr">Bekapcsolja a fogyatékkal élőknek szóló funkciókat.</string>
-    <string name="shared_string_on">Be</string>
-    <string name="shared_string_off">Kikapcsolás</string>
+    <string name="shared_string_on">Bekapcsolva</string>
+    <string name="shared_string_off">Kikapcsolva</string>
     <string name="accessibility_default">Android rendszerbeállítások szerint</string>
     <string name="backToMenu">Vissza a menübe</string>
     <string name="zoomOut">Kicsinyít</string>
@@ -1318,7 +1318,7 @@
     <string name="shared_string_more">Bővebben…</string>
     <string name="route_descr_destination">Célpont</string>
     <string name="local_index_description">Egy meglévő elem adatainak megtekintéséhez koppintson rá, inaktiváláshoz vagy törléshez nyomja meg hosszan. Jelenlegi adatok az eszközön (%1$s szabad):</string>
-    <string name="speed_limit_exceed">Sebességkorlátozás-tolerancia</string>
+    <string name="speed_limit_exceed">Sebességkorlátozás túllépésének tűréshatára</string>
     <string name="speed_limit_exceed_message">Válassza ki a sebességkorlátozás tűréshatárát, amely fölött hangos figyelmeztetést fog kapni.</string>
     <string name="fav_point_emoticons_message">A Kedvenc hely át lett nevezve erre: %1$s, hogy a hangulatjeleket tartalmazó szöveget fájlba lehessen menteni.</string>
     <string name="print_route">Útvonal nyomtatása</string>
@@ -1470,7 +1470,7 @@
     <string name="shared_string_release">Megjelent</string>
     <string name="days_behind">napos</string>
     <string name="welmode_download_maps">Térképek letöltése</string>
-    <string name="confirm_usage_speed_cameras">Néhány országban (Németország, Franciaország, Olaszország és még néhány) tilos a traffipax figyelmeztetés használata! Az OsmAnd nem vállal felelősséget a szabályok megsértéséért. Koppints az Igen gombra, ha jogosult vagy a funkció használatára.</string>
+    <string name="confirm_usage_speed_cameras">Néhány országban (Németország, Franciaország, Olaszország stb.) tilos traffipax-riasztást használni! Az OsmAnd nem vállal felelősséget a szabályok megsértéséért. Koppintson az Igen gombra, ha jogosult a funkció használatára.</string>
     <string name="welcome_select_region">A jelzőtáblák és szabályok helyes értelmezéséhez jelölje ki a vezetési régiót:</string>
     <string name="welcome_text">Az OsmAnd lehetővé teszi a térképek és a navigáció offline használatát az egész világon.</string>
     <string name="current_route">Jelenlegi útvonal</string>
@@ -3583,7 +3583,7 @@
     <string name="uninstall_speed_cameras">Traffipaxok eltávolítása</string>
     <string name="shared_string_legal">Jogi</string>
     <string name="speed_camera_pois">Traffipax POI-k</string>
-    <string name="speed_cameras_legal_descr">Bizonyos országokban és régiókban a traffipaxra figyelmeztető alkalmazások törvényileg tiltottak.
+    <string name="speed_cameras_legal_descr">Bizonyos országokban és régiókban jogszabály tilgja a traffipaxra figyelmeztető alkalmazások használatát.
 \n
 \nDöntsön az ön országának törvényei alapján.
 \n
@@ -3592,14 +3592,14 @@
 \nVálassza az %2$s lehetőséget, hogy az összes traffipax-szal kapcsolatos adat: riasztások, értesítések, POI-k törlésre kerüljenek az OsmAnd teljes újratelepítéséig.</string>
     <string name="keep_active">Maradjanak</string>
     <string name="shared_string_uninstall">Eltávolít</string>
-    <string name="speed_cameras_alert">Bizonyos országokban a traffipax riasztások törvényileg tiltottak.</string>
+    <string name="speed_cameras_alert">Bizonyos országokban a törvény tiltja a traffipaxriasztást.</string>
     <string name="shared_string_bearing">Tájolás</string>
     <string name="item_deleted">%1$s törölve</string>
     <string name="speed_cameras_restart_descr">A traffipaxadatok végleges törléséhez indítsa újra az alkalmazást.</string>
     <string name="shared_string_uninstall_and_restart">Eltávolítás és Újraindítás</string>
     <string name="routing_attr_length_description">Adja meg az útvonalakon a járművekre vonatkozó hosszkorlátozást.</string>
     <string name="routing_attr_length_name">Hosszkorlátozás</string>
-    <string name="speed_cameras_removed_descr">Az eszköz nem tartalmaz traffipax adatokat.</string>
+    <string name="speed_cameras_removed_descr">Az eszköz nem tartalmaz traffipaxadatokat.</string>
     <string name="replace_all_desc">Az jelenlegi elemek lecserélésre kerülnek a fájlban lévőkre</string>
     <string name="keep_both_desc">Az importált elemek előtaggal lesznek hozzáadva</string>
     <string name="import_duplicates_description">Az OsmAnd már tartalmaz az importálttal megegyező nevű elemeket.
@@ -4044,7 +4044,11 @@
     <string name="lost_data_warning">Minden nem mentett adat törlődni fog.</string>
     <string name="show_start_dialog">Kezdő párbeszéd megjelenítése</string>
     <string name="trip_recording_show_start_dialog_setting">Ha le van tiltva, akkor a felvétel közvetlenül a widget vagy a menüelem megérintése után elindul, kihagyva a megerősítő párbeszédpanelt.</string>
-    <string name="release_4_0_beta">• Az OsmAnd Live frissítések átköltöztek a „Letöltések&gt; Frissítések” helyre
+    <string name="release_4_0_beta">• Új lehetőség: szinvonalak letöltése (méter mellett) lábban
+\n
+\n• Útvonaltervezési környezet: hozzáadott fülek a pontok és grafikonok közötti váltáshoz
+\n
+\n• Az OsmAnd Live frissítések átköltöztek a „Letöltések&gt; Frissítések” helyre
 \n
 \n• A nyomvonalak színezhetők magasság, sebesség vagy lejtés szerint.
 \n
@@ -4078,4 +4082,8 @@
     <string name="announce_when_exceeded">Értesítés túllépéskor</string>
     <string name="user_points">Felhasználói pontok</string>
     <string name="output">Teljesítmény</string>
+    <string name="srtm_download_single_help_message">Kérjük, válassza ki a kívánt mértékegységet. A mértékegység módosításához újra le kell töltenie a fájlt.</string>
+    <string name="srtm_download_list_help_message">Az OsmAnd méterben és lábban adja meg a szintvonalak magasságát. A mértékegység módosításához újra le kell töltenie a fájlt.</string>
+    <string name="shared_string_feet">láb</string>
+    <string name="srtm_unit_format">Szintvonalak mértékegysége</string>
 </resources>
\ No newline at end of file

From d9de7ba4b08d2020aeec30abf6b886d0e77dcd91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Morais?= <lalocas@protonmail.com>
Date: Wed, 21 Apr 2021 10:15:39 +0000
Subject: [PATCH 04/29] Translated using Weblate (Portuguese)

Currently translated at 100.0% (3721 of 3721 strings)
---
 OsmAnd/res/values-pt/strings.xml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index f6e6b35339..9665801ba0 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -678,9 +678,9 @@
     <string name="loading_builds">A carregar compilações OsmAnd…</string>
     <string name="select_build_to_install">Selecionar a compilação OsmAnd a instalar</string>
     <string name="contribution_activity">Instalar versão</string>
-    <string name="navigate_point_format_D">DDD.DDDDD</string>
-    <string name="navigate_point_format_DM">DDD MM.MMM</string>
-    <string name="navigate_point_format_DMS">DDD MM SS.S</string>
+    <string name="navigate_point_format_D">GGG.GGGGG</string>
+    <string name="navigate_point_format_DM">GGG MM.MMM</string>
+    <string name="navigate_point_format_DMS">GGG MM SS.S</string>
     <string name="rendering_attr_noPolygons_description">Tornar transparentes todas as características do terreno no mapa.</string>
     <string name="rendering_attr_noPolygons_name">Polígonos</string>
     <string name="rendering_attr_appMode_name">Modo de visualização</string>
@@ -1021,7 +1021,7 @@
     <string name="av_camera_focus_infinity">Focar infinito</string>
     <string name="av_camera_focus_macro">Focagem macro (close-up)</string>
     <string name="av_camera_focus_continuous">A câmara tenta focar continuadamente</string>
-    <string name="av_photo_play_sound">Reproduzir o som do obturador da câmara</string>
+    <string name="av_photo_play_sound">Reproduzir som ao tirar fotografias</string>
     <string name="av_photo_play_sound_descr">Definir som ou silêncio ao fotografar.</string>
     <string name="driving_region_canada">Canadá</string>
     <string name="about_version">Versão:</string>
@@ -3440,7 +3440,7 @@
     <string name="create_custom_categories_list_promo">Altere a ordenação da lista e oculte categorias. Pode importar ou exportar todas as alterações com perfis.</string>
     <string name="rearrange_categories">Reorganizar categorias</string>
     <string name="osm_authorization_success">Autorização bem sucedida</string>
-    <string name="multimedia_photo_play_sound">Som do obturador da câmara</string>
+    <string name="multimedia_photo_play_sound">Som ao tirar fotografias</string>
     <string name="multimedia_use_system_camera">Usar aplicação do sistema</string>
     <string name="multimedia_rec_split_title">Dividir gravações</string>
     <string name="reset_plugin_to_default">Repor configurações originais da extensão</string>
@@ -3960,13 +3960,17 @@
     <string name="routing_engine_vehicle_type_cycling_electric">Bicicleta elétrica</string>
     <string name="live_update_frequency_hour_variant">As atualizações ao mapa serão verificadas a todas as horas. Próxima %1$s em %2$s.</string>
     <string name="live_update_delete_updates_msg">Tem a certeza que quer eliminar todas as %s atualizações OsmAnd Live\?</string>
-    <string name="release_4_0_beta">• Atualizações OsmAnd Live movidas para \"Descarregamentos &gt; Atualizações\"
+    <string name="release_4_0_beta">• Adicionada opção para descarregar curvas de nível em pés.
+\n
+\n• Planear rota: adicionadas abas para alternar entre pontos ou gráficos.
+\n
+\n• Atualizações OsmAnd Live movidas para \"Descarregamentos &gt; Atualizações\"
 \n
 \n• Os trilhos podem ser agora coloridos conforme a altitude, velocidade e declive.
 \n
-\n• Adicionada opção para alterar a aparência da linha de rota de navegação
+\n• Adicionada opção para alterar a aparência da linha de rota de navegação.
 \n
-\n• Janela de diálogo \"Gravação do trilho\" atualizada
+\n• Janela de diálogo \"Gravação do trilho\" atualizada.
 \n
 \n</string>
     <string name="routing_attr_height_obstacles_description">O roteamento pode evitar subidas íngremes.</string>
@@ -4089,4 +4093,8 @@
     <string name="announce_when_exceeded">Anunciar quando ultrapassado</string>
     <string name="user_points">Pontos do utilizador</string>
     <string name="output">Saída</string>
+    <string name="shared_string_feet">pés</string>
+    <string name="srtm_download_list_help_message">O OsmAnd fornece dados de curvas de nível em metros e pés. Terá de descarregar novamente o ficheiro para alterar o formato.</string>
+    <string name="srtm_unit_format">Formato de unidades de curvas de nível</string>
+    <string name="srtm_download_single_help_message">Selecione o formato necessário. Terá de descarregar novamente o ficheiro para alterar o formato.</string>
 </resources>
\ No newline at end of file

From 0ca18e6d5f6e8cba5904f026e8e79fda2210ea22 Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Tue, 20 Apr 2021 23:45:38 +0000
Subject: [PATCH 05/29] Translated using Weblate (French)

Currently translated at 99.9% (3720 of 3721 strings)
---
 OsmAnd/res/values-fr/strings.xml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index d0249d93b8..466f9571b7 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -3275,7 +3275,7 @@
     <string name="add_new_profile_q">Ajouter le profil \'%1$s\' \?</string>
     <string name="save_heading">Inclure la direction</string>
     <string name="save_heading_descr">Inclure la direction de chaque point lors de l\'enregistrement d\'une trace.</string>
-    <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Afficher le réseau de nœuds de pistes cyclables</string>
+    <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Afficher les itinéraires cyclables du réseau de nœuds</string>
     <string name="rendering_value_walkingRoutesOSMCNodes_name">Nœuds de transport</string>
     <string name="personal_category_name">Personnel</string>
     <string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
@@ -4040,9 +4040,13 @@
     <string name="lost_data_warning">Toutes les données non enregistrées seront perdues.</string>
     <string name="show_start_dialog">Afficher la boîte de dialogue de démarrage</string>
     <string name="trip_recording_show_start_dialog_setting">Si désactivé, l\'enregistrement débutera dès appui sur le gadget ou dans le menu (sans demande de confirmation).</string>
-    <string name="release_4_0_beta">- Les mises à jour d\'OsmAnd Live ont été déplacées vers \"Téléchargements &gt; Mises à jour\"
+    <string name="release_4_0_beta">- Ajout d\'une option pour télécharger les Courbes de niveau en pieds
 \n
-\n - Les traces peuvent maintenant être colorées par altitude, vitesse ou pente.
+\n- Planification d\'itinéraires en paysage : ajout d’onglets pour basculer entre Points et Graphs 
+\n
+\n- Les mises à jour d\'OsmAnd Live ont été déplacées vers \"Téléchargements &gt; Mises à jour\"
+\n
+\n - Les traces peuvent maintenant être colorées par altitude, vitesse ou pente
 \n
 \n - Ajout d\'une option pour modifier l\'apparence de la ligne d\'itinéraire en navigation
 \n
@@ -4075,4 +4079,8 @@
     <string name="exit_number">Numéro de sortie</string>
     <string name="announce_when_exceeded">Annoncer en cas de dépassement</string>
     <string name="output">Sortie</string>
+    <string name="srtm_download_list_help_message">OsmAnd fournit des données sur les courbes de niveau en mètres et en pieds. Vous devrez à nouveau télécharger le fichier pour modifier le format.</string>
+    <string name="srtm_download_single_help_message">Veuillez sélectionner le format souhaité. Vous devrez à nouveau télécharger le fichier pour modifier le format.</string>
+    <string name="srtm_unit_format">Format d\'unité pour les courbes de niveau</string>
+    <string name="shared_string_feet">pieds</string>
 </resources>
\ No newline at end of file

From 8c992bb4a9914f923c45ec21a7d2a5a1d91fbcd6 Mon Sep 17 00:00:00 2001
From: Oliver <websites@posteo.de>
Date: Wed, 21 Apr 2021 05:21:24 +0000
Subject: [PATCH 06/29] Translated using Weblate (German)

Currently translated at 99.9% (3720 of 3721 strings)
---
 OsmAnd/res/values-de/strings.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 4a199996b5..c9c4092d52 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -4057,7 +4057,11 @@
     <string name="customize_route_line">Routenlinie anpassen</string>
     <string name="shared_string_route_line">Routenlinie</string>
     <string name="specify_color_for_map_mode">Legen Sie die Farbe für den Kartenmodus fest: %1$s.</string>
-    <string name="release_4_0_beta">• OsmAnd Live-Updates nach \"Downloads &gt; Updates\" verschoben
+    <string name="release_4_0_beta">• Option zum Herunterladen von Höhenlinien in Fuß zugefügt
+\n
+\n• Routenplanung im Querformat: Registerkarten zum Umschalten zwischen Punkten oder Diagrammen hinzugefügt
+\n
+\n• OsmAnd Live-Updates nach \"Downloads &gt; Updates\" verschoben
 \n
 \n• Tracks können nun nach Höhe, Geschwindigkeit oder Steigung eingefärbt werden.
 \n
@@ -4089,4 +4093,8 @@
     <string name="announce_when_exceeded">Meldung bei Überschreitung</string>
     <string name="user_points">Anwenderpunkte</string>
     <string name="output">Leistung</string>
+    <string name="shared_string_feet">Fuß</string>
+    <string name="srtm_unit_format">Einheit der Höhenlinien</string>
+    <string name="srtm_download_list_help_message">OsmAnd liefert Höhenlinien-Daten in Metern und Fuß. Sie müssen die Datei erneut herunterladen, um das Format zu ändern.</string>
+    <string name="srtm_download_single_help_message">Bitte wählen Sie das gewünschte Format. Sie müssen die Datei erneut herunterladen, um das Format zu ändern.</string>
 </resources>
\ No newline at end of file

From da89e737ec10e7229bdbe0e783ff45407391e9d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguzersen@protonmail.com>
Date: Tue, 20 Apr 2021 22:51:58 +0000
Subject: [PATCH 07/29] Translated using Weblate (Turkish)

Currently translated at 100.0% (3721 of 3721 strings)
---
 OsmAnd/res/values-tr/strings.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index ca24c81192..473ad3ed09 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -4072,7 +4072,11 @@
     <string name="in_grace_period">Ek süre içinde</string>
     <string name="on_hold">Beklemede</string>
     <string name="expired">Süresi doldu</string>
-    <string name="release_4_0_beta">• OsmAnd Live güncellemeleri \"İndirmeler&gt; Güncellemeler\" bölümüne taşındı
+    <string name="release_4_0_beta">• Eş yükselti eğrilerini fit cinsinden indirme seçeneği eklendi
+\n
+\n • Güzergah Planla görünümü: noktalar veya grafikler arasında geçiş yapmak için sekmeler eklendi
+\n
+\n • OsmAnd Live güncellemeleri \"İndirmeler &gt; Güncellemeler\" bölümüne taşındı
 \n
 \n • Yollar artık rakım, hız veya eğime göre renklendirilebilir
 \n
@@ -4087,4 +4091,8 @@
     <string name="user_points">Kullanıcı puanları</string>
     <string name="output">Çıkış</string>
     <string name="map_quick_action_pattern">%1$s → …</string>
+    <string name="shared_string_feet">fit</string>
+    <string name="srtm_unit_format">Eş yükselti eğrileri birimi biçimi</string>
+    <string name="srtm_download_list_help_message">OsmAnd, metre ve fit cinsinden eş yükselti eğrileri verileri sağlar. Biçimi değiştirmek için dosyayı yeniden indirmeniz gerekecek.</string>
+    <string name="srtm_download_single_help_message">Lütfen gerekli biçimi seçin. Biçimi değiştirmek için dosyayı yeniden indirmeniz gerekecek.</string>
 </resources>
\ No newline at end of file

From 81687551e7f16c5d9c443a7632ac39cb18e81a24 Mon Sep 17 00:00:00 2001
From: Athoss <athoss@citromail.hu>
Date: Wed, 21 Apr 2021 11:14:57 +0000
Subject: [PATCH 08/29] Translated using Weblate (Hungarian)

Currently translated at 99.9% (3720 of 3721 strings)
---
 OsmAnd/res/values-hu/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index ec3dea7ece..c7cdd9ca08 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -3583,7 +3583,7 @@
     <string name="uninstall_speed_cameras">Traffipaxok eltávolítása</string>
     <string name="shared_string_legal">Jogi</string>
     <string name="speed_camera_pois">Traffipax POI-k</string>
-    <string name="speed_cameras_legal_descr">Bizonyos országokban és régiókban jogszabály tilgja a traffipaxra figyelmeztető alkalmazások használatát.
+    <string name="speed_cameras_legal_descr">Bizonyos országokban és régiókban jogszabály tiltja a traffipaxra figyelmeztető alkalmazások használatát.
 \n
 \nDöntsön az ön országának törvényei alapján.
 \n

From 6948315605676577194ec9d7e041a72684b16862 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Tue, 20 Apr 2021 23:43:27 +0000
Subject: [PATCH 09/29] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (3721 of 3721 strings)
---
 OsmAnd/res/values-uk/strings.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 4fe37da2e3..cb45c0658b 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -4053,7 +4053,11 @@
     <string name="shared_string_route_line">Лінія маршруту</string>
     <string name="route_line_use_map_style_appearance">Лінія маршруту застосовуватиме %1$s, вказаний у вибраному стилі мапи: %2$s.</string>
     <string name="specify_color_for_map_mode">Вкажіть колір для режиму мапи: %1$s.</string>
-    <string name="release_4_0_beta">• Оновлення OsmAnd Live переміщено до «Завантаження &gt;Оновлення»
+    <string name="release_4_0_beta">• Додана можливість завантаження контурних ліній у футах
+\n
+\n• Ландшафтне планування маршруту: додані вкладки для перемикання між точками або графіками
+\n
+\n• Оновлення OsmAnd Live переміщено до «Завантаження &gt;Оновлення»
 \n
 \n• Тепер треки можуть бути забарвлені за висотою, швидкістю або нахилом.
 \n
@@ -4084,4 +4088,8 @@
     <string name="announce_when_exceeded">Повідомляти про перевищення</string>
     <string name="user_points">Користувацькі точки</string>
     <string name="output">Вивід</string>
+    <string name="srtm_download_list_help_message">OsmAnd надає дані горизонталей в метрах і футах. Щоб змінити формат, потрібно повторно завантажити файл.</string>
+    <string name="srtm_unit_format">Формат одиниць вимірювання горизонталей</string>
+    <string name="shared_string_feet">фути</string>
+    <string name="srtm_download_single_help_message">Виберіть потрібний формат. Щоб змінити формат, потрібно повторно завантажувати файл.</string>
 </resources>
\ No newline at end of file

From b1d1007cb6ad492988e5f557e1661fcc5fc96663 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Wed, 21 Apr 2021 05:52:22 +0000
Subject: [PATCH 10/29] Translated using Weblate (Hebrew)

Currently translated at 99.9% (3719 of 3721 strings)
---
 OsmAnd/res/values-iw/strings.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values-iw/strings.xml b/OsmAnd/res/values-iw/strings.xml
index 8fee045082..6a625e3b66 100644
--- a/OsmAnd/res/values-iw/strings.xml
+++ b/OsmAnd/res/values-iw/strings.xml
@@ -4056,13 +4056,17 @@
     <string name="customize_route_line">להתאים קו מסלול אישית</string>
     <string name="shared_string_route_line">קו מסלול</string>
     <string name="specify_color_for_map_mode">לציין צבע למצב מפה: %1$s.</string>
-    <string name="release_4_0_beta">• העדכונים החיים של OsmAnd הועברו אל „הורדות &gt; עדכונים”
+    <string name="release_4_0_beta">• נוספה אפשרות להוריד קווי מתאר ברגל
 \n
-\n • אפשר לצבוע מסלולים לפי גובה, מהירות או שיפוע.
+\n• תכנון מסלול אופקית: נוספו לשוניות למעבר בין נקודות לתרשימים
 \n
-\n • נוספה אפשרות לשנות את מראה קו מסלול הניווט
+\n• העדכונים החיים של OsmAnd הועברו אל „הורדות &gt; עדכונים”
 \n
-\n • החלונית „הקלטת מסלול” עודכנה
+\n• אפשר לצבוע מסלולים לפי גובה, מהירות או שיפוע.
+\n
+\n• נוספה אפשרות לשנות את מראה קו מסלול הניווט
+\n
+\n• החלונית „הקלטת מסלול” עודכנה
 \n
 \n</string>
     <string name="osmand_live">OsmAnd חי</string>
@@ -4087,4 +4091,8 @@
     <string name="announce_when_exceeded">להכריז בחריגה</string>
     <string name="user_points">נקודות משתמש</string>
     <string name="output">פלט</string>
+    <string name="shared_string_feet">רגל</string>
+    <string name="srtm_unit_format">תצורת יחידת קווי מתאר</string>
+    <string name="srtm_download_list_help_message">OsmAnd מספק נתוני קווי מתאר במטרים וברגל. יהיה עליך להוריד את הקובץ מחדש כדי לשנות את התצורה.</string>
+    <string name="srtm_download_single_help_message">נא לבחור את התצורה הרצויה. יהיה עליך להוריד את הקובץ מחדש כדי לשנות את התצורה.</string>
 </resources>
\ No newline at end of file

From 5f9e9314826fc4bfaee23633d769fa5ed4c78cc3 Mon Sep 17 00:00:00 2001
From: Softmap <skdhd5@gmail.com>
Date: Wed, 21 Apr 2021 01:20:55 +0000
Subject: [PATCH 11/29] Translated using Weblate (Arabic)

Currently translated at 100.0% (3721 of 3721 strings)
---
 OsmAnd/res/values-ar/strings.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index e920c24f05..5f81b828e0 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -4123,7 +4123,11 @@
     <string name="shared_string_route_line">خط المسار</string>
     <string name="route_line_use_map_style_appearance">سيستخدم خط الطريق %1$s المحدد في نمط الخريطة المحدد: %2$s.</string>
     <string name="specify_color_for_map_mode">حدد لونًا لوضع الخريطة: %1$s.</string>
-    <string name="release_4_0_beta">• تم نقل تحديثات OsmAnd Live إلى \"التنزيلات&gt; التحديثات\"
+    <string name="release_4_0_beta">• خيار مضاف لتنزيل خطوط الكنتور بالقدم
+\n
+\n• مخطط الطريق الأفقي: علامات تبويب tabs مضافة للتبديل بين النقاط أو الرسوم البيانية
+\n
+\n• تم نقل تحديثات OsmAnd Live إلى \"التنزيلات&gt; التحديثات\"
 \n
 \n • يمكن تلوين المسارات الآن حسب الارتفاع، السرعة أو المنحدر.
 \n
@@ -4154,4 +4158,8 @@
     <string name="announce_when_exceeded">الإعلان عند التجاوز</string>
     <string name="user_points">نقاط المستخدم</string>
     <string name="output">الإخراج</string>
+    <string name="srtm_unit_format">تنسيق وحدة خطوط الكنتور</string>
+    <string name="srtm_download_list_help_message">OsmAnd يوفر بيانات الخطوط الكنتورية بالأمتار والقدم. ستحتاج إلى إعادة تنزيل الملف لتغيير التنسيق.</string>
+    <string name="srtm_download_single_help_message">الرجاء تحديد التنسيق المطلوب. ستحتاج إلى إعادة تنزيل الملف لتغيير التنسيق.</string>
+    <string name="shared_string_feet">قدم</string>
 </resources>
\ No newline at end of file

From 3ff1d1a39a6e647b9ebf8f86721bbc0831a1be2f Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Tue, 20 Apr 2021 23:36:52 +0000
Subject: [PATCH 12/29] Translated using Weblate (French)

Currently translated at 100.0% (3927 of 3927 strings)
---
 OsmAnd/res/values-fr/phrases.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 0164a38387..d73665cdf6 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -3915,4 +3915,17 @@
     <string name="poi_pilates">Pilates</string>
     <string name="poi_jiu_jitsu">Ju-jitsu</string>
     <string name="poi_karate">Karaté</string>
+    <string name="poi_zurkhaneh_sport">Gymnase Zurkhaneh</string>
+    <string name="poi_cliff_diving">Plongeon du haut d\'une falaise</string>
+    <string name="poi_hoops">Anneaux</string>
+    <string name="poi_club_social">Club social</string>
+    <string name="poi_plateau">Plateau</string>
+    <string name="poi_speedway">Voie express</string>
+    <string name="poi_gladed_yes">Satisfait : oui</string>
+    <string name="poi_camp_pitch">Emplacement de camping</string>
+    <string name="poi_mobile_library">Arrêt pour la bibliothèque mobile</string>
+    <string name="poi_office_diplomatic">Bureau diplomatique</string>
+    <string name="poi_horseshoes">Fers à cheval</string>
+    <string name="poi_cycle_polo">Polo-vélo</string>
+    <string name="poi_bay_filter">Type de baie</string>
 </resources>
\ No newline at end of file

From 83885c373c0247e8a0b5984582128336782be536 Mon Sep 17 00:00:00 2001
From: Verdulo <tomek@disroot.org>
Date: Wed, 21 Apr 2021 11:01:33 +0000
Subject: [PATCH 13/29] Translated using Weblate (Esperanto)

Currently translated at 100.0% (3721 of 3721 strings)
---
 OsmAnd/res/values-eo/strings.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index fa137e6afc..d8d6c27220 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -4054,7 +4054,11 @@
     <string name="customize_route_line">Alĝustigi linion de kurso</string>
     <string name="shared_string_route_line">Linio de kurso</string>
     <string name="route_line_use_map_style_appearance">Por la linio de kurso estos uzata %1$s difinita por la map‑stilo: %2$s.</string>
-    <string name="release_4_0_beta">• ĝisdatigoj OsmAnd Live movitaj al “elŝutoj” → “ĝisdatigoj”
+    <string name="release_4_0_beta">• eblo elŝuti nivelkurbojn en futoj
+\n
+\n• horizontala vido por “plani kurson”: aldonitaj langetoj por baskuli inter punktoj kaj diagramoj
+\n
+\n• ĝisdatigoj OsmAnd Live movitaj al “elŝutoj” → “ĝisdatigoj”
 \n
 \n• eblo kolorigi spurojn laŭ altitudo, rapido aŭ dekliveco
 \n
@@ -4085,4 +4089,8 @@
     <string name="exit_number">Numero de elirejo</string>
     <string name="user_points">Poentoj de uzanto</string>
     <string name="output">Eligo</string>
+    <string name="shared_string_feet">futoj</string>
+    <string name="srtm_unit_format">Unuo por nivelkurboj</string>
+    <string name="srtm_download_list_help_message">OsmAnd liveras nivelkurbojn en metroj kaj en futoj. Ve devos reelŝuti la dosieron por ŝanĝi la formon.</string>
+    <string name="srtm_download_single_help_message">Elektu la deziratan formon. Vi devos reelŝuti la dosieron por ŝanĝi la formon.</string>
 </resources>
\ No newline at end of file

From 0d26b83435c57cd354a3ebf205e3f769aa3c0910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= <sv1@fellsnet.is>
Date: Wed, 21 Apr 2021 09:28:39 +0000
Subject: [PATCH 14/29] Translated using Weblate (Icelandic)

Currently translated at 100.0% (3721 of 3721 strings)
---
 OsmAnd/res/values-is/strings.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
index 8b0b8e87a5..4621b9ab38 100644
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@@ -4052,7 +4052,11 @@
     <string name="rendering_attr_noNatureReserveBoundaries_name">Mörk náttúru</string>
     <string name="trip_recording_logging_interval_info">Millibil skráninga stillir tímabilið milli þess sem OsmAnd biður um staðsetningargögn.</string>
     <string name="trip_recording_show_start_dialog_setting">Ef þetta er óvirkt, mun upptaka hefjast strax eftir að ýtt er á hnappinn eða valmyndarfærsluna og staðfestingarglugga er þá sleppt.</string>
-    <string name="release_4_0_beta">• Uppfærslur OsmAnd Live færðar í \"Sótt gögn &gt; Uppfærslur\"
+    <string name="release_4_0_beta">• Bætt við möguleika á að sækja hæðarlínur í fetum
+\n
+\n• Landslag í leiðaskipulagi: bætt við flipum til að skipta á milli punkta eða grafs
+\n
+\n• Uppfærslur OsmAnd Live færðar í \"Sótt gögn &gt; Uppfærslur\"
 \n
 \n • Ferla er nú hægt að lita eftir hæð, hraða eða halla.
 \n
@@ -4091,4 +4095,8 @@
     <string name="announce_when_exceeded">Tilkynna þegar farið er yfir</string>
     <string name="user_points">Punktar notanda</string>
     <string name="map_quick_action_pattern">%1$s → …</string>
+    <string name="shared_string_feet">fet</string>
+    <string name="srtm_unit_format">Snið eininga hæðarlína</string>
+    <string name="srtm_download_list_help_message">OsmAnd býður upp á hæðalínugögn í metrum og fetum. Þú þarft að sækja skrána aftur til að breyta sniðinu.</string>
+    <string name="srtm_download_single_help_message">Veldu rétt snið eininga. Þú þarft að sækja skrána aftur til að breyta sniðinu.</string>
 </resources>
\ No newline at end of file

From d0d60e9d2e596a93084f33704151dbb4b68e1465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= <sv1@fellsnet.is>
Date: Wed, 21 Apr 2021 09:26:02 +0000
Subject: [PATCH 15/29] Translated using Weblate (Icelandic)

Currently translated at 100.0% (3927 of 3927 strings)
---
 OsmAnd/res/values-is/phrases.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml
index b5b20c54b7..25a7bc3d25 100644
--- a/OsmAnd/res/values-is/phrases.xml
+++ b/OsmAnd/res/values-is/phrases.xml
@@ -3927,4 +3927,5 @@
     <string name="poi_office_diplomatic">Sendiskrifstofa</string>
     <string name="poi_bay_filter">Gerð flóa</string>
     <string name="poi_plateau">Háslétta</string>
+    <string name="poi_club_social">Félagsstarf</string>
 </resources>
\ No newline at end of file

From dd1195b0604dc6d606768f63e361768a922d34fc Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 21 Apr 2021 02:07:44 +0000
Subject: [PATCH 16/29] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (3721 of 3721 strings)
---
 OsmAnd/res/values-zh-rTW/strings.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 358a89a8ec..1db440ac46 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -4047,7 +4047,11 @@
     <string name="shared_string_route_line">路線</string>
     <string name="route_line_use_map_style_appearance">路線將會使用 %1$s 在選定的地圖樣式上指定的：%2$s。</string>
     <string name="specify_color_for_map_mode">指定地圖模式的顏色：%1$s。</string>
-    <string name="release_4_0_beta">• OsmAnd Live 更新移動至「下載 &gt; 更新」
+    <string name="release_4_0_beta">• 新增以英呎為單位下載等高線
+\n
+\n • 規劃路線樣式：新增切換點與圖形的分頁
+\n
+\n • OsmAnd Live 更新移動至「下載 &gt; 更新」
 \n
 \n • 軌跡現在可以使用海拔、速度或坡度來填色
 \n
@@ -4079,4 +4083,8 @@
     <string name="user_points">使用者點</string>
     <string name="output">輸出</string>
     <string name="map_quick_action_pattern">%1$s → …</string>
+    <string name="shared_string_feet">英呎</string>
+    <string name="srtm_unit_format">等高線單位格式</string>
+    <string name="srtm_download_list_help_message">OsmAnd 提供以公尺與英呎為單位的等高線資料。您將必須重新下載檔案以變更格式。</string>
+    <string name="srtm_download_single_help_message">請選取需要格式。您將必須重新下載檔案以變更格式。</string>
 </resources>
\ No newline at end of file

From 5670680d1ea524454e523080a3d51dbc9ae70c0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Babos=20G=C3=A1bor?= <gabor.babos@gmail.com>
Date: Wed, 21 Apr 2021 08:58:37 +0000
Subject: [PATCH 17/29] Translated using Weblate (Hungarian)

Currently translated at 100.0% (271 of 271 strings)

Translation: OsmAnd/Telegram
Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/hu/
---
 OsmAnd-telegram/res/values-hu/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd-telegram/res/values-hu/strings.xml b/OsmAnd-telegram/res/values-hu/strings.xml
index 95d655b5cb..01544a2b89 100644
--- a/OsmAnd-telegram/res/values-hu/strings.xml
+++ b/OsmAnd-telegram/res/values-hu/strings.xml
@@ -109,7 +109,7 @@
     <string name="get_telegram_description_continue">Kérjük, telepítse a Telegramot és hozzon létre egy fiókot.</string>
     <string name="get_telegram_after_creating_account">Utána használhatja ezt az alkalmazást.</string>
     <string name="shared_string_all">Minden</string>
-    <string name="shared_string_off">Kikapcsolás</string>
+    <string name="shared_string_off">Kikapcsolva</string>
     <string name="hours_and_minutes_format">%1$d óra %2$d perc</string>
     <string name="minutes_format">%1$d perc</string>
     <string name="shared_string_install">Telepítés</string>

From cb18d45e43c68ebb67f60761d1020a1786030e58 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Wed, 21 Apr 2021 15:05:31 +0300
Subject: [PATCH 18/29] Revert "Move markerGroups to ItineraryHelper"

This reverts commit a40f802a
---
 .../src/net/osmand/plus/AppInitializer.java   |   2 +-
 .../net/osmand/plus/FavouritesDbHelper.java   |   9 +-
 .../net/osmand/plus/GpxSelectionHelper.java   |   6 +-
 .../EditFavoriteGroupDialogFragment.java      |   6 +-
 .../activities/FavoritesTreeFragment.java     |   2 +-
 .../net/osmand/plus/helpers/IntentHelper.java |   4 +-
 .../plus/itinerary/ItineraryHelper.java       | 296 +------------
 .../editors/WptPtEditorFragment.java          |   4 +-
 .../editors/WptPtEditorFragmentNew.java       |   4 +-
 ...ouritesGroupBottomSheetDialogFragment.java |   2 +-
 ...dTracksGroupBottomSheetDialogFragment.java |   2 +-
 .../plus/mapmarkers/CategoriesSubHeader.java  |   8 +-
 .../CoordinateInputDialogFragment.java        |  10 +-
 .../osmand/plus/mapmarkers/GroupHeader.java   |   8 +-
 .../net/osmand/plus/mapmarkers/MapMarker.java |   5 +-
 .../plus/mapmarkers/MapMarkersDbHelper.java   |  13 +-
 .../MapMarkersGroup.java}                     |  12 +-
 .../plus/mapmarkers/MapMarkersHelper.java     | 393 +++++++++++++++---
 ...ptCategoriesBottomSheetDialogFragment.java |  12 +-
 .../adapters/MapMarkersActiveAdapter.java     |   6 +-
 .../adapters/MapMarkersGroupsAdapter.java     |  35 +-
 .../plus/myplaces/DeletePointsTask.java       |   4 +-
 .../EditTrackGroupDialogFragment.java         |  12 +-
 .../plus/myplaces/TrackPointFragment.java     |  15 +-
 .../backup/HistoryMarkersSettingsItem.java    |   8 +-
 .../backend/backup/MarkersSettingsItem.java   |   8 +-
 .../backend/backup/SettingsHelper.java        |  31 +-
 .../fragments/ExportItemsBottomSheet.java     |   6 +-
 .../fragments/ExportSettingsAdapter.java      |   6 +-
 .../plus/views/layers/FavouritesLayer.java    |   2 +-
 .../osmand/plus/views/layers/GPXLayer.java    |   5 +-
 31 files changed, 459 insertions(+), 477 deletions(-)
 rename OsmAnd/src/net/osmand/plus/{itinerary/ItineraryGroup.java => mapmarkers/MapMarkersGroup.java} (91%)

diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java
index d5afd31937..cfcdc737b2 100644
--- a/OsmAnd/src/net/osmand/plus/AppInitializer.java
+++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java
@@ -687,7 +687,7 @@ public class AppInitializer implements IProgress {
 			// restore backuped favorites to normal file
 			restoreBackupForFavoritesFiles();
 			notifyEvent(InitEvents.RESTORE_BACKUPS);
-			app.itineraryHelper.syncAllGroupsAsync();
+			app.mapMarkersHelper.syncAllGroupsAsync();
 			app.searchUICore.initSearchUICore();
 
 			checkLiveUpdatesAlerts();
diff --git a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
index be36c5197d..ca52169e10 100644
--- a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
+++ b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
@@ -17,7 +17,7 @@ import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.plus.GeocodingLookupService.AddressLookupRequest;
 import net.osmand.plus.mapmarkers.MapMarkersHelper;
-import net.osmand.plus.itinerary.ItineraryGroup;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.api.SQLiteAPI.SQLiteConnection;
 import net.osmand.plus.api.SQLiteAPI.SQLiteCursor;
 import net.osmand.util.Algorithms;
@@ -280,7 +280,7 @@ public class FavouritesDbHelper {
 	}
 
 	private void runSyncWithMarkers(FavoriteGroup favGroup) {
-		ItineraryGroup group = context.getItineraryHelper().getMarkersGroup(favGroup);
+		MapMarkersGroup group = context.getMapMarkersHelper().getMarkersGroup(favGroup);
 		if (group != null) {
 			context.getItineraryHelper().runSynchronization(group);
 		}
@@ -288,7 +288,7 @@ public class FavouritesDbHelper {
 
 	private boolean removeFromMarkers(FavoriteGroup favGroup) {
 		MapMarkersHelper helper = context.getMapMarkersHelper();
-		ItineraryGroup group = context.getItineraryHelper().getMarkersGroup(favGroup);
+		MapMarkersGroup group = helper.getMarkersGroup(favGroup);
 		if (group != null) {
 			helper.removeMarkersGroup(group);
 			return true;
@@ -297,7 +297,8 @@ public class FavouritesDbHelper {
 	}
 
 	private void addToMarkers(FavoriteGroup favGroup) {
-		context.getItineraryHelper().addOrEnableGroup(favGroup);
+		MapMarkersHelper helper = context.getMapMarkersHelper();
+		helper.addOrEnableGroup(favGroup);
 	}
 
 	private File getInternalFile() {
diff --git a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
index 5ec4f28736..77bcb5e0e7 100644
--- a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
+++ b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
@@ -30,7 +30,7 @@ import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetType;
 import net.osmand.plus.helpers.GpxUiHelper.GPXInfo;
 import net.osmand.plus.helpers.SearchHistoryHelper;
 import net.osmand.plus.helpers.enums.MetricsConstants;
-import net.osmand.plus.itinerary.ItineraryGroup;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.routing.GPXRouteParams.GPXRouteParamsBuilder;
 import net.osmand.plus.track.GpxSplitType;
 import net.osmand.util.Algorithms;
@@ -797,7 +797,7 @@ public class GpxSelectionHelper {
 	                                     boolean addToHistory) {
 		GpxDataItem dataItem = app.getGpxDbHelper().getItem(new File(gpx.path));
 		if (canAddToMarkers && show && dataItem != null && dataItem.isShowAsMarkers()) {
-			app.getItineraryHelper().addOrEnableGroup(gpx);
+			app.getMapMarkersHelper().addOrEnableGroup(gpx);
 		}
 		return selectGpxFile(gpx, dataItem, show, notShowNavigationDialog, syncGroup, selectedByUser, addToHistory);
 	}
@@ -824,7 +824,7 @@ public class GpxSelectionHelper {
 	}
 
 	private void syncGpxWithMarkers(GPXFile gpxFile) {
-		ItineraryGroup group = app.getItineraryHelper().getMarkersGroup(gpxFile);
+		MapMarkersGroup group = app.getMapMarkersHelper().getMarkersGroup(gpxFile);
 		if (group != null) {
 			app.getItineraryHelper().runSynchronization(group);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/activities/EditFavoriteGroupDialogFragment.java b/OsmAnd/src/net/osmand/plus/activities/EditFavoriteGroupDialogFragment.java
index e625212ee7..001868e7b4 100644
--- a/OsmAnd/src/net/osmand/plus/activities/EditFavoriteGroupDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/EditFavoriteGroupDialogFragment.java
@@ -28,7 +28,7 @@ import net.osmand.AndroidUtils;
 import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
 import net.osmand.plus.mapmarkers.MapMarkersHelper;
-import net.osmand.plus.itinerary.ItineraryGroup;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
@@ -179,7 +179,7 @@ public class EditFavoriteGroupDialogFragment extends MenuBottomSheetDialogFragme
 
 			final MapMarkersHelper markersHelper = app.getMapMarkersHelper();
 			final FavoriteGroup favGroup = this.group;
-			final ItineraryGroup markersGr = app.getItineraryHelper().getMarkersGroup(this.group);
+			final MapMarkersGroup markersGr = markersHelper.getMarkersGroup(this.group);
 			final boolean synced = markersGr != null;
 
 			BaseBottomSheetItem markersGroupItem = new SimpleBottomSheetItem.Builder()
@@ -192,7 +192,7 @@ public class EditFavoriteGroupDialogFragment extends MenuBottomSheetDialogFragme
 							if (synced) {
 								markersHelper.removeMarkersGroup(markersGr);
 							} else {
-								app.getItineraryHelper().addOrEnableGroup(favGroup);
+								markersHelper.addOrEnableGroup(favGroup);
 							}
 							dismiss();
 							MapActivity.launchMapActivityMoveToTop(getActivity());
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index 98304247a4..a24859fa30 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -526,7 +526,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 			for (Map.Entry<String, Set<FavouritePoint>> entry : favoritesSelected.entrySet()) {
 				FavoriteGroup group = helper.getGroup(entry.getKey());
 				if (group != null && entry.getValue().size() == group.getPoints().size()) {
-					getMyApplication().getItineraryHelper().addOrEnableGroup(group);
+					markersHelper.addOrEnableGroup(group);
 				} else {
 					for (FavouritePoint fp : entry.getValue()) {
 						points.add(new LatLon(fp.getLatitude(), fp.getLongitude()));
diff --git a/OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java b/OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java
index 6fce7b78a6..5d540d5170 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/IntentHelper.java
@@ -18,8 +18,8 @@ import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.PluginsFragment;
 import net.osmand.plus.dashboard.DashboardOnMap.DashboardType;
-import net.osmand.plus.itinerary.ItineraryGroup;
 import net.osmand.plus.mapmarkers.MapMarkersDialogFragment;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.mapsource.EditMapSourceDialogFragment;
 import net.osmand.plus.openplacereviews.OPRConstants;
 import net.osmand.plus.openplacereviews.OprAuthHelper.OprAuthorizationListener;
@@ -219,7 +219,7 @@ public class IntentHelper {
 			if (intent.hasExtra(MapMarkersDialogFragment.OPEN_MAP_MARKERS_GROUPS)) {
 				Bundle openMapMarkersGroupsExtra = intent.getBundleExtra(MapMarkersDialogFragment.OPEN_MAP_MARKERS_GROUPS);
 				if (openMapMarkersGroupsExtra != null) {
-					MapMarkersDialogFragment.showInstance(mapActivity, openMapMarkersGroupsExtra.getString(ItineraryGroup.MARKERS_SYNC_GROUP_ID));
+					MapMarkersDialogFragment.showInstance(mapActivity, openMapMarkersGroupsExtra.getString(MapMarkersGroup.MARKERS_SYNC_GROUP_ID));
 				}
 				mapActivity.setIntent(null);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/itinerary/ItineraryHelper.java b/OsmAnd/src/net/osmand/plus/itinerary/ItineraryHelper.java
index f89d05c1f9..8e3c96a08a 100644
--- a/OsmAnd/src/net/osmand/plus/itinerary/ItineraryHelper.java
+++ b/OsmAnd/src/net/osmand/plus/itinerary/ItineraryHelper.java
@@ -3,44 +3,31 @@ package net.osmand.plus.itinerary;
 import android.os.AsyncTask;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 import net.osmand.GPXUtilities.GPXFile;
 import net.osmand.GPXUtilities.WptPt;
-import net.osmand.IndexConstants;
 import net.osmand.PlatformUtil;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
-import net.osmand.plus.GPXDatabase;
 import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.mapmarkers.MapMarker;
-import net.osmand.plus.mapmarkers.MapMarkersDbHelper;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.mapmarkers.MapMarkersHelper;
 import net.osmand.plus.mapmarkers.MapMarkersHelper.OnGroupSyncedListener;
-import net.osmand.plus.wikivoyage.data.TravelArticle;
-import net.osmand.plus.wikivoyage.data.TravelHelper;
-import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import static net.osmand.plus.mapmarkers.MapMarkersHelper.BY_DATE_ADDED_DESC;
-
 public class ItineraryHelper {
 
 	private static final Log LOG = PlatformUtil.getLog(ItineraryHelper.class);
@@ -48,150 +35,14 @@ public class ItineraryHelper {
 	private OsmandApplication app;
 
 	private MapMarkersHelper markersHelper;
-	private MapMarkersDbHelper markersDbHelper;
 
 	private ExecutorService executorService = Executors.newSingleThreadExecutor();
 
-	private List<ItineraryGroup> itineraryGroups = new ArrayList<>();
 	private Set<OnGroupSyncedListener> syncListeners = new HashSet<>();
 
 	public ItineraryHelper(@NonNull OsmandApplication app) {
 		this.app = app;
 		markersHelper = app.getMapMarkersHelper();
-		markersDbHelper = app.getMapMarkersDbHelper();
-		loadGroups();
-	}
-
-	public List<ItineraryGroup> getItineraryGroups() {
-		return itineraryGroups;
-	}
-
-	public void syncAllGroupsAsync() {
-		for (ItineraryGroup group : itineraryGroups) {
-			if (group.getId() != null && group.getName() != null) {
-				runSynchronization(group);
-			}
-		}
-	}
-
-	public void updateGroupWptCategories(@NonNull ItineraryGroup group, Set<String> wptCategories) {
-		String id = group.getId();
-		if (id != null) {
-			group.setWptCategories(wptCategories);
-			if (wptCategories != null) {
-				markersDbHelper.updateGroupCategories(id, group.getWptCategoriesString());
-			}
-		}
-	}
-
-	public void enableGroup(@NonNull ItineraryGroup gr) {
-		// check if group doesn't exist internally
-		if (!itineraryGroups.contains(gr)) {
-			addGroupInternally(gr);
-		}
-		if (gr.isDisabled()) {
-			updateGroupDisabled(gr, false);
-		}
-		runSynchronization(gr);
-	}
-
-	public void updateGroups() {
-		for (ItineraryGroup group : itineraryGroups) {
-			markersHelper.updateGroup(group);
-		}
-	}
-
-	public void updateGroupDisabled(@NonNull ItineraryGroup group, boolean disabled) {
-		String id = group.getId();
-		if (id != null) {
-			markersDbHelper.updateGroupDisabled(id, disabled);
-			group.setDisabled(disabled);
-		}
-	}
-
-	public List<MapMarker> getMapMarkersFromDefaultGroups(boolean history) {
-		List<MapMarker> mapMarkers = new ArrayList<>();
-		for (ItineraryGroup group : itineraryGroups) {
-			if (group.getType() == ItineraryGroup.ANY_TYPE) {
-				for (MapMarker marker : group.getMarkers()) {
-					if (history && marker.history || !history && !marker.history) {
-						mapMarkers.add(marker);
-					}
-				}
-			}
-		}
-		return mapMarkers;
-	}
-
-	private void loadGroups() {
-		Map<String, ItineraryGroup> groupsMap = markersDbHelper.getAllGroupsMap();
-		List<MapMarker> allMarkers = new ArrayList<>(markersHelper.getMapMarkers());
-		allMarkers.addAll(markersHelper.getMapMarkersHistory());
-
-		Iterator<Entry<String, ItineraryGroup>> iterator = groupsMap.entrySet().iterator();
-		while (iterator.hasNext()) {
-			ItineraryGroup group = iterator.next().getValue();
-			if (group.getType() == ItineraryGroup.GPX_TYPE && !new File(group.getId()).exists()) {
-				markersDbHelper.removeMarkersGroup(group.getId());
-				iterator.remove();
-			}
-		}
-
-		ItineraryGroup noGroup = null;
-
-		for (MapMarker marker : allMarkers) {
-			ItineraryGroup group = groupsMap.get(marker.groupKey);
-			if (group == null) {
-				if (noGroup == null) {
-					noGroup = new ItineraryGroup();
-					noGroup.setCreationDate(Long.MAX_VALUE);
-				}
-				noGroup.getMarkers().add(marker);
-			} else {
-				if (marker.creationDate < group.getCreationDate()) {
-					group.setCreationDate(marker.creationDate);
-				}
-				group.getMarkers().add(marker);
-			}
-		}
-
-		itineraryGroups = new ArrayList<>(groupsMap.values());
-		if (noGroup != null) {
-			markersHelper.sortMarkers(noGroup.getMarkers(), false, BY_DATE_ADDED_DESC);
-			addToGroupsList(noGroup);
-		}
-
-		sortGroups();
-
-		for (ItineraryGroup group : itineraryGroups) {
-			markersHelper.updateGroup(group);
-		}
-	}
-
-	public void addGroupInternally(ItineraryGroup gr) {
-		markersDbHelper.addGroup(gr);
-		markersHelper.addHistoryMarkersToGroup(gr);
-		addToGroupsList(gr);
-	}
-
-	public void updateGpxShowAsMarkers(File file) {
-		GPXDatabase.GpxDataItem dataItem = app.getGpxDbHelper().getItem(file);
-		if (dataItem != null) {
-			app.getGpxDbHelper().updateShowAsMarkers(dataItem, true);
-			dataItem.setShowAsMarkers(true);
-		}
-	}
-
-	public void addToGroupsList(ItineraryGroup group) {
-		List<ItineraryGroup> copyList = new ArrayList<>(itineraryGroups);
-		copyList.add(group);
-		itineraryGroups = copyList;
-	}
-
-	public void removeFromGroupsList(ItineraryGroup group) {
-		List<ItineraryGroup> copyList = new ArrayList<>(itineraryGroups);
-		copyList.remove(group);
-		itineraryGroups = copyList;
 	}
 
 	public void addSyncListener(OnGroupSyncedListener listener) {
@@ -202,7 +53,7 @@ public class ItineraryHelper {
 		syncListeners.remove(listener);
 	}
 
-	public void runSynchronization(final @NonNull ItineraryGroup group) {
+	public void runSynchronization(final @NonNull MapMarkersGroup group) {
 		app.runInUIThread(new Runnable() {
 			@Override
 			public void run() {
@@ -211,146 +62,11 @@ public class ItineraryHelper {
 		});
 	}
 
-	public ItineraryGroup getMarkersGroup(GPXFile gpx) {
-		if (gpx == null || gpx.path == null) {
-			return null;
-		}
-		return getMapMarkerGroupById(getMarkerGroupId(new File(gpx.path)), ItineraryGroup.GPX_TYPE);
-	}
-
-	public ItineraryGroup getMarkersGroup(FavoriteGroup favGroup) {
-		return getMapMarkerGroupById(getMarkerGroupId(favGroup), ItineraryGroup.FAVORITES_TYPE);
-	}
-
-	public ItineraryGroup addOrEnableGpxGroup(@NonNull File file) {
-		updateGpxShowAsMarkers(file);
-		ItineraryGroup gr = getMapMarkerGroupById(getMarkerGroupId(file), ItineraryGroup.GPX_TYPE);
-		if (gr == null) {
-			gr = createGPXMarkerGroup(file);
-			addGroupInternally(gr);
-		}
-		enableGroup(gr);
-		return gr;
-	}
-
-	public ItineraryGroup addOrEnableGroup(@NonNull GPXFile file) {
-		updateGpxShowAsMarkers(new File(file.path));
-		ItineraryGroup gr = getMarkersGroup(file);
-		if (gr == null) {
-			gr = createGPXMarkerGroup(new File(file.path));
-			addGroupInternally(gr);
-		}
-		enableGroup(gr);
-		return gr;
-	}
-
-	public ItineraryGroup addOrEnableGroup(@NonNull FavoriteGroup group) {
-		ItineraryGroup gr = getMarkersGroup(group);
-		if (gr == null) {
-			gr = createFavMarkerGroup(group);
-			addGroupInternally(gr);
-		}
-		enableGroup(gr);
-		return gr;
-	}
-
-	private ItineraryGroup createGPXMarkerGroup(File fl) {
-		return new ItineraryGroup(getMarkerGroupId(fl),
-				Algorithms.getFileNameWithoutExtension(fl.getName()),
-				ItineraryGroup.GPX_TYPE);
-	}
-
-	private ItineraryGroup createFavMarkerGroup(FavoriteGroup favGroup) {
-		return new ItineraryGroup(favGroup.getName(), favGroup.getName(), ItineraryGroup.FAVORITES_TYPE);
-	}
-
-	private String getMarkerGroupId(File gpx) {
-		return gpx.getAbsolutePath();
-	}
-
-	private String getMarkerGroupId(FavoriteGroup group) {
-		return group.getName();
-	}
-
-
-	public void removeMarkerFromGroup(MapMarker marker) {
-		if (marker != null) {
-			ItineraryGroup itineraryGroup = getMapMarkerGroupById(marker.groupKey, marker.getType());
-			if (itineraryGroup != null) {
-				itineraryGroup.getMarkers().remove(marker);
-				markersHelper.updateGroup(itineraryGroup);
-			}
-		}
-	}
-
-	public void sortGroups() {
-		if (itineraryGroups.size() > 0) {
-			Collections.sort(itineraryGroups, new Comparator<ItineraryGroup>() {
-				@Override
-				public int compare(ItineraryGroup group1, ItineraryGroup group2) {
-					long t1 = group1.getCreationDate();
-					long t2 = group2.getCreationDate();
-					return (t1 > t2) ? -1 : ((t1 == t2) ? 0 : 1);
-				}
-			});
-		}
-	}
-
-	@Nullable
-	public ItineraryGroup getMapMarkerGroupById(String id, int type) {
-		for (ItineraryGroup group : itineraryGroups) {
-			if ((id == null && group.getId() == null)
-					|| (group.getId() != null && group.getId().equals(id))) {
-				if (type == ItineraryGroup.ANY_TYPE || type == group.getType()) {
-					return group;
-				}
-			}
-		}
-		return null;
-	}
-
-	@NonNull
-	public List<ItineraryGroup> getGroupsForDisplayedGpx() {
-		List<ItineraryGroup> res = new ArrayList<>();
-		List<SelectedGpxFile> selectedGpxFiles = app.getSelectedGpxHelper().getSelectedGPXFiles();
-		for (SelectedGpxFile selected : selectedGpxFiles) {
-			ItineraryGroup search = getMarkersGroup(selected.getGpxFile());
-			if (search == null && selected.getGpxFile() != null && selected.getGpxFile().path != null) {
-				ItineraryGroup group = createGPXMarkerGroup(new File(selected.getGpxFile().path));
-				group.setDisabled(true);
-				markersHelper.createHeadersInGroup(group);
-				res.add(group);
-			}
-		}
-		return res;
-	}
-
-	@NonNull
-	public List<ItineraryGroup> getGroupsForSavedArticlesTravelBook() {
-		List<ItineraryGroup> res = new ArrayList<>();
-		TravelHelper travelHelper = app.getTravelHelper();
-		if (travelHelper.isAnyTravelBookPresent()) {
-			List<TravelArticle> savedArticles = travelHelper.getBookmarksHelper().getSavedArticles();
-			for (TravelArticle art : savedArticles) {
-				String gpxName = travelHelper.getGPXName(art);
-				File path = app.getAppPath(IndexConstants.GPX_TRAVEL_DIR + gpxName);
-				ItineraryGroup search = getMapMarkerGroupById(getMarkerGroupId(path), ItineraryGroup.GPX_TYPE);
-				if (search == null) {
-					ItineraryGroup group = createGPXMarkerGroup(path);
-					group.setDisabled(true);
-					markersHelper.createHeadersInGroup(group);
-					res.add(group);
-				}
-			}
-		}
-		return res;
-	}
-
 	private class SyncGroupTask extends AsyncTask<Void, Void, Void> {
 
-		private ItineraryGroup group;
+		private MapMarkersGroup group;
 
-		SyncGroupTask(ItineraryGroup group) {
+		SyncGroupTask(MapMarkersGroup group) {
 			this.group = group;
 		}
 
@@ -377,7 +93,7 @@ public class ItineraryHelper {
 		// TODO extract method from Asynctask to Helper directly
 		private void runGroupSynchronization() {
 			List<MapMarker> groupMarkers = new ArrayList<>(group.getMarkers());
-			if (group.getType() == ItineraryGroup.FAVORITES_TYPE) {
+			if (group.getType() == MapMarkersGroup.FAVORITES_TYPE) {
 				FavoriteGroup favGroup = app.getFavorites().getGroup(group.getName());
 				if (favGroup == null) {
 					return;
@@ -391,7 +107,7 @@ public class ItineraryHelper {
 				for (FavouritePoint fp : points) {
 					markersHelper.addNewMarkerIfNeeded(group, groupMarkers, new LatLon(fp.getLatitude(), fp.getLongitude()), fp.getName(), fp, null);
 				}
-			} else if (group.getType() == ItineraryGroup.GPX_TYPE) {
+			} else if (group.getType() == MapMarkersGroup.GPX_TYPE) {
 				GpxSelectionHelper gpxHelper = app.getSelectedGpxHelper();
 				File file = new File(group.getId());
 				if (!file.exists()) {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java
index 713b13a177..e1c1ac3d61 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java
@@ -24,7 +24,7 @@ import net.osmand.plus.activities.SavingTrackHelper;
 import net.osmand.plus.base.PointImageDrawable;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.mapcontextmenu.editors.WptPtEditor.OnDismissListener;
-import net.osmand.plus.itinerary.ItineraryGroup;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.track.SaveGpxAsyncTask;
 import net.osmand.plus.track.SaveGpxAsyncTask.SaveGpxListener;
 import net.osmand.util.Algorithms;
@@ -219,7 +219,7 @@ public class WptPtEditorFragment extends PointEditorFragment {
 	private void syncGpx(GPXFile gpxFile) {
 		OsmandApplication app = getMyApplication();
 		if (app != null) {
-			ItineraryGroup group = app.getItineraryHelper().getMarkersGroup(gpxFile);
+			MapMarkersGroup group = app.getMapMarkersHelper().getMarkersGroup(gpxFile);
 			if (group != null) {
 				app.getItineraryHelper().runSynchronization(group);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragmentNew.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragmentNew.java
index 827151a691..4dea53b0bd 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragmentNew.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragmentNew.java
@@ -27,9 +27,9 @@ import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.SavingTrackHelper;
 import net.osmand.plus.base.PointImageDrawable;
-import net.osmand.plus.itinerary.ItineraryGroup;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.mapcontextmenu.editors.WptPtEditor.OnDismissListener;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.track.SaveGpxAsyncTask;
 import net.osmand.plus.track.SaveGpxAsyncTask.SaveGpxListener;
 import net.osmand.util.Algorithms;
@@ -237,7 +237,7 @@ public class WptPtEditorFragmentNew extends PointEditorFragmentNew {
 	private void syncGpx(GPXFile gpxFile) {
 		OsmandApplication app = getMyApplication();
 		if (app != null) {
-			ItineraryGroup group = app.getItineraryHelper().getMarkersGroup(gpxFile);
+			MapMarkersGroup group = app.getMapMarkersHelper().getMarkersGroup(gpxFile);
 			if (group != null) {
 				app.getItineraryHelper().runSynchronization(group);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/AddFavouritesGroupBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/AddFavouritesGroupBottomSheetDialogFragment.java
index 52f85bf0e7..0e6b31f4f4 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/AddFavouritesGroupBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/AddFavouritesGroupBottomSheetDialogFragment.java
@@ -56,7 +56,7 @@ public class AddFavouritesGroupBottomSheetDialogFragment extends AddGroupBottomS
 		if (!group.isVisible()) {
 			favouritesDbHelper.editFavouriteGroup(group, group.getName(), group.getColor(), true);
 		}
-		getMyApplication().getItineraryHelper().addOrEnableGroup(group);
+		getMyApplication().getMapMarkersHelper().addOrEnableGroup(group);
 		dismiss();
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/AddTracksGroupBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/AddTracksGroupBottomSheetDialogFragment.java
index 32dfd58172..b01548be00 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/AddTracksGroupBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/AddTracksGroupBottomSheetDialogFragment.java
@@ -108,7 +108,7 @@ public class AddTracksGroupBottomSheetDialogFragment extends AddGroupBottomSheet
 					GPXFile res = GPXUtilities.loadGPXFile(gpx);
 					selectionHelper.selectGpxFile(res, true, false, false, false, false);
 				}
-				app.getItineraryHelper().addOrEnableGpxGroup(gpx);
+				app.getMapMarkersHelper().addOrEnableGpxGroup(gpx);
 			}
 		}
 		dismiss();
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CategoriesSubHeader.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CategoriesSubHeader.java
index 52ea71617b..aef2f28afd 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/CategoriesSubHeader.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CategoriesSubHeader.java
@@ -2,15 +2,13 @@ package net.osmand.plus.mapmarkers;
 
 import androidx.annotation.DrawableRes;
 
-import net.osmand.plus.itinerary.ItineraryGroup;
-
 public class CategoriesSubHeader {
 
 	@DrawableRes
 	private int iconRes;
-	private ItineraryGroup group;
+	private MapMarkersGroup group;
 
-	public CategoriesSubHeader(int iconRes, ItineraryGroup group) {
+	public CategoriesSubHeader(int iconRes, MapMarkersGroup group) {
 		this.iconRes = iconRes;
 		this.group = group;
 	}
@@ -20,7 +18,7 @@ public class CategoriesSubHeader {
 		return iconRes;
 	}
 
-	public ItineraryGroup getGroup() {
+	public MapMarkersGroup getGroup() {
 		return group;
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
index 138109f126..31e477fbf1 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
@@ -71,8 +71,6 @@ import net.osmand.plus.Version;
 import net.osmand.plus.activities.SavingTrackHelper;
 import net.osmand.plus.activities.TrackActivity;
 import net.osmand.plus.helpers.AndroidUiHelper;
-import net.osmand.plus.itinerary.ItineraryGroup;
-import net.osmand.plus.itinerary.ItineraryHelper;
 import net.osmand.plus.mapmarkers.CoordinateInputBottomSheetDialogFragment.CoordinateInputFormatChangeListener;
 import net.osmand.plus.mapmarkers.CoordinateInputFormats.DDM;
 import net.osmand.plus.mapmarkers.CoordinateInputFormats.DMS;
@@ -170,10 +168,10 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
 	}
 
 	private void syncGpx(GPXFile gpxFile) {
-		ItineraryHelper helper = getMyApplication().getItineraryHelper();
-		ItineraryGroup group = helper.getMarkersGroup(gpxFile);
+		MapMarkersHelper helper = getMyApplication().getMapMarkersHelper();
+		MapMarkersGroup group = helper.getMarkersGroup(gpxFile);
 		if (group != null) {
-			helper.runSynchronization(group);
+			getMyApplication().getItineraryHelper().runSynchronization(group);
 		}
 	}
 
@@ -1091,7 +1089,7 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
 			public void saveGpx(final String fileName) {
 				new SaveGpxAsyncTask(app, getGpx(),fileName, false).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 				hasUnsavedChanges = false;
-				app.getItineraryHelper().addOrEnableGroup(getGpx());
+				app.getMapMarkersHelper().addOrEnableGroup(getGpx());
 				if (listener != null) {
 					listener.onPointsSaved();
 				}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/GroupHeader.java b/OsmAnd/src/net/osmand/plus/mapmarkers/GroupHeader.java
index c760b08dee..c5c97a1c2e 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/GroupHeader.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/GroupHeader.java
@@ -2,15 +2,13 @@ package net.osmand.plus.mapmarkers;
 
 import androidx.annotation.DrawableRes;
 
-import net.osmand.plus.itinerary.ItineraryGroup;
-
 public class GroupHeader {
 
 	@DrawableRes
 	private int iconRes;
-	private ItineraryGroup group;
+	private MapMarkersGroup group;
 
-	public GroupHeader(int iconRes, ItineraryGroup group) {
+	public GroupHeader(int iconRes, MapMarkersGroup group) {
 		this.iconRes = iconRes;
 		this.group = group;
 	}
@@ -20,7 +18,7 @@ public class GroupHeader {
 		return iconRes;
 	}
 
-	public ItineraryGroup getGroup() {
+	public MapMarkersGroup getGroup() {
 		return group;
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarker.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarker.java
index e1f2c413f1..498c36f93c 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarker.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarker.java
@@ -11,7 +11,6 @@ import net.osmand.data.LatLon;
 import net.osmand.data.LocationPoint;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.R;
-import net.osmand.plus.itinerary.ItineraryGroup;
 import net.osmand.util.Algorithms;
 
 import static net.osmand.data.PointDescription.POINT_TYPE_MAP_MARKER;
@@ -47,8 +46,8 @@ public class MapMarker implements LocationPoint {
 
 	public int getType() {
 		return favouritePoint == null ?
-				(wptPt == null ? ItineraryGroup.ANY_TYPE : ItineraryGroup.GPX_TYPE) :
-				ItineraryGroup.FAVORITES_TYPE;
+				(wptPt == null ? MapMarkersGroup.ANY_TYPE : MapMarkersGroup.GPX_TYPE) :
+				MapMarkersGroup.FAVORITES_TYPE;
 	}
 
 	public PointDescription getPointDescription(Context ctx) {
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDbHelper.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDbHelper.java
index 4fe3debbb5..0b2ba5ab0c 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDbHelper.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDbHelper.java
@@ -8,7 +8,6 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.api.SQLiteAPI.SQLiteConnection;
 import net.osmand.plus.api.SQLiteAPI.SQLiteCursor;
 import net.osmand.plus.helpers.SearchHistoryHelper;
-import net.osmand.plus.itinerary.ItineraryGroup;
 import net.osmand.util.Algorithms;
 
 import java.util.ArrayList;
@@ -162,7 +161,7 @@ public class MapMarkersDbHelper {
 		}
 	}
 
-	public void addGroup(ItineraryGroup group) {
+	public void addGroup(MapMarkersGroup group) {
 		SQLiteConnection db = openConnection(false);
 		if (db != null) {
 			try {
@@ -174,15 +173,15 @@ public class MapMarkersDbHelper {
 		}
 	}
 
-	public Map<String, ItineraryGroup> getAllGroupsMap() {
-		Map<String, ItineraryGroup> res = new LinkedHashMap<>();
+	public Map<String, MapMarkersGroup> getAllGroupsMap() {
+		Map<String, MapMarkersGroup> res = new LinkedHashMap<>();
 		SQLiteConnection db = openConnection(true);
 		if (db != null) {
 			try {
 				SQLiteCursor query = db.rawQuery(GROUPS_TABLE_SELECT, null);
 				if (query != null && query.moveToFirst()) {
 					do {
-						ItineraryGroup group = readGroup(query);
+						MapMarkersGroup group = readGroup(query);
 						res.put(group.getId(), group);
 					} while (query.moveToNext());
 				}
@@ -196,14 +195,14 @@ public class MapMarkersDbHelper {
 		return res;
 	}
 
-	private ItineraryGroup readGroup(SQLiteCursor query) {
+	private MapMarkersGroup readGroup(SQLiteCursor query) {
 		String id = query.getString(0);
 		String name = query.getString(1);
 		int type = query.getInt(2);
 		boolean disabled = query.getInt(3) == 1;
 		String categories = query.getString(4);
 
-		ItineraryGroup res = new ItineraryGroup(id, name, type);
+		MapMarkersGroup res = new MapMarkersGroup(id, name, type);
 		res.setDisabled(disabled);
 		res.setWptCategories(categories == null ? null : Algorithms.decodeStringSet(categories));
 
diff --git a/OsmAnd/src/net/osmand/plus/itinerary/ItineraryGroup.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersGroup.java
similarity index 91%
rename from OsmAnd/src/net/osmand/plus/itinerary/ItineraryGroup.java
rename to OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersGroup.java
index 595315a028..2a97af91c8 100644
--- a/OsmAnd/src/net/osmand/plus/itinerary/ItineraryGroup.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersGroup.java
@@ -1,12 +1,8 @@
-package net.osmand.plus.itinerary;
+package net.osmand.plus.mapmarkers;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import net.osmand.plus.mapmarkers.CategoriesSubHeader;
-import net.osmand.plus.mapmarkers.GroupHeader;
-import net.osmand.plus.mapmarkers.MapMarker;
-import net.osmand.plus.mapmarkers.ShowHideHistoryButton;
 import net.osmand.plus.wikivoyage.data.TravelArticle;
 import net.osmand.util.Algorithms;
 
@@ -14,7 +10,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-public class ItineraryGroup {
+public class MapMarkersGroup {
 
 	public static final int ANY_TYPE = -1;
 	public static final int FAVORITES_TYPE = 0;
@@ -38,11 +34,11 @@ public class ItineraryGroup {
 	private CategoriesSubHeader categoriesSubHeader;
 	private ShowHideHistoryButton showHideHistoryButton;
 
-	public ItineraryGroup() {
+	public MapMarkersGroup() {
 
 	}
 
-	public ItineraryGroup(@NonNull String id, @NonNull String name, int type) {
+	public MapMarkersGroup(@NonNull String id, @NonNull String name, int type) {
 		this.id = id;
 		this.name = name;
 		this.type = type;
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java
index 1f2233b7c0..b8bcddbc5c 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java
@@ -14,12 +14,16 @@ import net.osmand.PlatformUtil;
 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
+import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
+import net.osmand.plus.GPXDatabase;
 import net.osmand.plus.GeocodingLookupService;
 import net.osmand.plus.GeocodingLookupService.AddressLookupRequest;
+import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
-import net.osmand.plus.itinerary.ItineraryGroup;
+import net.osmand.plus.wikivoyage.data.TravelArticle;
+import net.osmand.plus.wikivoyage.data.TravelHelper;
 import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 
@@ -37,6 +41,8 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
 import java.util.TimeZone;
 
 import static net.osmand.GPXUtilities.GPX_TIME_FORMAT;
@@ -63,11 +69,12 @@ public class MapMarkersHelper {
 	public @interface MapMarkersSortByDef {
 	}
 
-	private OsmandApplication app;
+	private OsmandApplication ctx;
 	private MapMarkersDbHelper markersDbHelper;
 
 	private List<MapMarker> mapMarkers = new ArrayList<>();
 	private List<MapMarker> mapMarkersHistory = new ArrayList<>();
+	private List<MapMarkersGroup> mapMarkersGroups = new ArrayList<>();
 
 	private List<MapMarkerChangedListener> listeners = new ArrayList<>();
 
@@ -81,24 +88,29 @@ public class MapMarkersHelper {
 		return mapMarkersHistory;
 	}
 
+	public List<MapMarkersGroup> getMapMarkersGroups() {
+		return mapMarkersGroups;
+	}
+
 	public boolean isStartFromMyLocation() {
-		return app.getSettings().ROUTE_MAP_MARKERS_START_MY_LOC.get();
+		return ctx.getSettings().ROUTE_MAP_MARKERS_START_MY_LOC.get();
 	}
 
 	public void setStartFromMyLocation(boolean startFromMyLocation) {
-		app.getSettings().ROUTE_MAP_MARKERS_START_MY_LOC.set(startFromMyLocation);
+		ctx.getSettings().ROUTE_MAP_MARKERS_START_MY_LOC.set(startFromMyLocation);
 	}
 
 	public MarkersPlanRouteContext getPlanRouteContext() {
 		return planRouteContext;
 	}
 
-	public MapMarkersHelper(OsmandApplication app) {
-		this.app = app;
-		markersDbHelper = app.getMapMarkersDbHelper();
-		planRouteContext = new MarkersPlanRouteContext(app);
+	public MapMarkersHelper(OsmandApplication ctx) {
+		this.ctx = ctx;
+		markersDbHelper = ctx.getMapMarkersDbHelper();
+		planRouteContext = new MarkersPlanRouteContext(ctx);
 		markersDbHelper.removeDisabledGroups();
 		loadMarkers();
+		loadGroups();
 	}
 
 	private void loadMarkers() {
@@ -112,11 +124,63 @@ public class MapMarkersHelper {
 		sortMarkers(markersHistory, true, BY_DATE_ADDED_DESC);
 		addToMapMarkersHistoryList(markersHistory);
 
-		if (!app.isApplicationInitializing()) {
+		if (!ctx.isApplicationInitializing()) {
 			lookupAddressAll();
 		}
 	}
 
+	private void loadGroups() {
+		Map<String, MapMarkersGroup> groupsMap = markersDbHelper.getAllGroupsMap();
+		List<MapMarker> allMarkers = new ArrayList<>(mapMarkers);
+		allMarkers.addAll(mapMarkersHistory);
+
+		Iterator<Map.Entry<String, MapMarkersGroup>> iterator = groupsMap.entrySet().iterator();
+		while (iterator.hasNext()) {
+			MapMarkersGroup group = iterator.next().getValue();
+			if (group.getType() == MapMarkersGroup.GPX_TYPE && !new File(group.getId()).exists()) {
+				markersDbHelper.removeMarkersGroup(group.getId());
+				iterator.remove();
+			}
+		}
+
+		MapMarkersGroup noGroup = null;
+
+		for (MapMarker marker : allMarkers) {
+			MapMarkersGroup group = groupsMap.get(marker.groupKey);
+			if (group == null) {
+				if (noGroup == null) {
+					noGroup = new MapMarkersGroup();
+					noGroup.setCreationDate(Long.MAX_VALUE);
+				}
+				noGroup.getMarkers().add(marker);
+			} else {
+				if (marker.creationDate < group.getCreationDate()) {
+					group.setCreationDate(marker.creationDate);
+				}
+				group.getMarkers().add(marker);
+			}
+		}
+
+		mapMarkersGroups = new ArrayList<>(groupsMap.values());
+		if (noGroup != null) {
+			sortMarkers(noGroup.getMarkers(), false, BY_DATE_ADDED_DESC);
+			addToGroupsList(noGroup);
+		}
+
+		sortGroups();
+
+		for (MapMarkersGroup group : mapMarkersGroups) {
+			updateGroup(group);
+		}
+	}
+
+	public void syncAllGroupsAsync() {
+		for (MapMarkersGroup gr : mapMarkersGroups) {
+			if (gr.getId() != null && gr.getName() != null) {
+				ctx.getItineraryHelper().runSynchronization(gr);
+			}
+		}
+	}
 
 	public void lookupAddressAll() {
 		for (MapMarker mapMarker : mapMarkers) {
@@ -128,7 +192,7 @@ public class MapMarkersHelper {
 	}
 
 	private void lookupAddress(final MapMarker mapMarker) {
-		if (mapMarker != null && mapMarker.getOriginalPointDescription().isSearchingAddress(app)) {
+		if (mapMarker != null && mapMarker.getOriginalPointDescription().isSearchingAddress(ctx)) {
 			cancelPointAddressRequests(mapMarker.point);
 			AddressLookupRequest lookupRequest = new AddressLookupRequest(mapMarker.point,
 					new GeocodingLookupService.OnAddressLookupResult() {
@@ -136,7 +200,7 @@ public class MapMarkersHelper {
 						public void geocodingDone(String address) {
 							PointDescription pointDescription = mapMarker.getOriginalPointDescription();
 							if (Algorithms.isEmpty(address)) {
-								pointDescription.setName(PointDescription.getAddressNotFoundStr(app));
+								pointDescription.setName(PointDescription.getAddressNotFoundStr(ctx));
 							} else {
 								pointDescription.setName(address);
 							}
@@ -144,7 +208,7 @@ public class MapMarkersHelper {
 							refreshMarker(mapMarker);
 						}
 					}, null);
-			app.getGeocodingLookupService().lookupAddress(lookupRequest);
+			ctx.getGeocodingLookupService().lookupAddress(lookupRequest);
 		}
 	}
 
@@ -161,7 +225,7 @@ public class MapMarkersHelper {
 
 	private void cancelPointAddressRequests(LatLon latLon) {
 		if (latLon != null) {
-			app.getGeocodingLookupService().cancel(latLon);
+			ctx.getGeocodingLookupService().cancel(latLon);
 		}
 	}
 
@@ -190,7 +254,7 @@ public class MapMarkersHelper {
 		reorderActiveMarkersIfNeeded();
 	}
 
-	public void sortMarkers(List<MapMarker> markers, final boolean visited, final @MapMarkersSortByDef int sortByMode) {
+	private void sortMarkers(List<MapMarker> markers, final boolean visited, final @MapMarkersSortByDef int sortByMode) {
 		sortMarkers(markers, visited, sortByMode, null);
 	}
 
@@ -222,15 +286,83 @@ public class MapMarkersHelper {
 						return sortByMode == BY_DISTANCE_DESC ? 1 : -1;
 					}
 				} else {
-					String n1 = mapMarker1.getName(app);
-					String n2 = mapMarker2.getName(app);
+					String n1 = mapMarker1.getName(ctx);
+					String n2 = mapMarker2.getName(ctx);
 					return n1.compareToIgnoreCase(n2);
 				}
 			}
 		});
 	}
 
-	public void addHistoryMarkersToGroup(@NonNull ItineraryGroup group) {
+	public MapMarkersGroup getMarkersGroup(GPXFile gpx) {
+		if (gpx == null || gpx.path == null) {
+			return null;
+		}
+		return getMapMarkerGroupById(getMarkerGroupId(new File(gpx.path)), MapMarkersGroup.GPX_TYPE);
+	}
+
+	public MapMarkersGroup getMarkersGroup(FavoriteGroup favGroup) {
+		return getMapMarkerGroupById(getMarkerGroupId(favGroup), MapMarkersGroup.FAVORITES_TYPE);
+	}
+
+	public MapMarkersGroup addOrEnableGpxGroup(@NonNull File file) {
+		updateGpxShowAsMarkers(file);
+		MapMarkersGroup gr = getMapMarkerGroupById(getMarkerGroupId(file), MapMarkersGroup.GPX_TYPE);
+		if (gr == null) {
+			gr = createGPXMarkerGroup(file);
+			addGroupInternally(gr);
+		}
+		enableGroup(gr);
+		return gr;
+	}
+
+	public MapMarkersGroup addOrEnableGroup(@NonNull GPXFile file) {
+		updateGpxShowAsMarkers(new File(file.path));
+		MapMarkersGroup gr = getMarkersGroup(file);
+		if (gr == null) {
+			gr = createGPXMarkerGroup(new File(file.path));
+			addGroupInternally(gr);
+		}
+		enableGroup(gr);
+		return gr;
+	}
+
+	public MapMarkersGroup addOrEnableGroup(@NonNull FavoriteGroup group) {
+		MapMarkersGroup gr = getMarkersGroup(group);
+		if (gr == null) {
+			gr = createFavMarkerGroup(group);
+			addGroupInternally(gr);
+		}
+		enableGroup(gr);
+		return gr;
+	}
+
+	public void enableGroup(@NonNull MapMarkersGroup gr) {
+		// check if group doesn't exist internally
+		if (!mapMarkersGroups.contains(gr)) {
+			addGroupInternally(gr);
+		}
+		if (gr.isDisabled()) {
+			updateGroupDisabled(gr, false);
+		}
+		ctx.getItineraryHelper().runSynchronization(gr);
+	}
+
+	private void addGroupInternally(MapMarkersGroup gr) {
+		markersDbHelper.addGroup(gr);
+		addHistoryMarkersToGroup(gr);
+		addToGroupsList(gr);
+	}
+
+	private void updateGpxShowAsMarkers(File file) {
+		GPXDatabase.GpxDataItem dataItem = ctx.getGpxDbHelper().getItem(file);
+		if (dataItem != null) {
+			ctx.getGpxDbHelper().updateShowAsMarkers(dataItem, true);
+			dataItem.setShowAsMarkers(true);
+		}
+	}
+
+	private void addHistoryMarkersToGroup(@NonNull MapMarkersGroup group) {
 		List<MapMarker> historyMarkers = new ArrayList<>(mapMarkersHistory);
 		for (MapMarker m : historyMarkers) {
 			if (m.groupKey != null && group.getId() != null && m.groupKey.equals(group.getId())) {
@@ -239,15 +371,33 @@ public class MapMarkersHelper {
 		}
 	}
 
-	public void removeMarkersGroup(ItineraryGroup group) {
+	public void removeMarkersGroup(MapMarkersGroup group) {
 		if (group != null) {
 			markersDbHelper.removeMarkersGroup(group.getId());
 			removeGroupActiveMarkers(group, false);
-			app.getItineraryHelper().removeFromGroupsList(group);
+			removeFromGroupsList(group);
 		}
 	}
 
-	public void removeGroupActiveMarkers(ItineraryGroup group, boolean updateGroup) {
+	public void updateGroupDisabled(@NonNull MapMarkersGroup group, boolean disabled) {
+		String id = group.getId();
+		if (id != null) {
+			markersDbHelper.updateGroupDisabled(id, disabled);
+			group.setDisabled(disabled);
+		}
+	}
+
+	public void updateGroupWptCategories(@NonNull MapMarkersGroup group, Set<String> wptCategories) {
+		String id = group.getId();
+		if (id != null) {
+			group.setWptCategories(wptCategories);
+			if (wptCategories != null) {
+				markersDbHelper.updateGroupCategories(id, group.getWptCategoriesString());
+			}
+		}
+	}
+
+	public void removeGroupActiveMarkers(MapMarkersGroup group, boolean updateGroup) {
 		if (group != null) {
 			markersDbHelper.removeActiveMarkersFromGroup(group.getId());
 			removeFromMapMarkersList(group.getActiveMarkers());
@@ -260,21 +410,27 @@ public class MapMarkersHelper {
 		}
 	}
 
-	public void updateGroup(ItineraryGroup itineraryGroup) {
-		if (itineraryGroup.getId() == null || itineraryGroup.getName() == null) {
+	public void updateGroups() {
+		for (MapMarkersGroup group : mapMarkersGroups) {
+			updateGroup(group);
+		}
+	}
+
+	public void updateGroup(MapMarkersGroup mapMarkersGroup) {
+		if (mapMarkersGroup.getId() == null || mapMarkersGroup.getName() == null) {
 			return;
 		}
-		createHeadersInGroup(itineraryGroup);
-		int historyMarkersCount = itineraryGroup.getHistoryMarkers().size();
-		ShowHideHistoryButton showHideHistoryButton = itineraryGroup.getShowHideHistoryButton();
+		createHeadersInGroup(mapMarkersGroup);
+		int historyMarkersCount = mapMarkersGroup.getHistoryMarkers().size();
+		ShowHideHistoryButton showHideHistoryButton = mapMarkersGroup.getShowHideHistoryButton();
 		if (showHideHistoryButton != null) {
 			if (historyMarkersCount == 0) {
-				itineraryGroup.setShowHideHistoryButton(null);
+				mapMarkersGroup.setShowHideHistoryButton(null);
 			}
 		} else if (historyMarkersCount > 0) {
 			showHideHistoryButton = new ShowHideHistoryButton();
 			showHideHistoryButton.showHistory = false;
-			itineraryGroup.setShowHideHistoryButton(showHideHistoryButton);
+			mapMarkersGroup.setShowHideHistoryButton(showHideHistoryButton);
 		}
 	}
 
@@ -286,30 +442,30 @@ public class MapMarkersHelper {
 
 	private void addMarkerToGroup(MapMarker marker) {
 		if (marker != null) {
-			ItineraryGroup itineraryGroup = app.getItineraryHelper().getMapMarkerGroupById(marker.groupKey, marker.getType());
-			if (itineraryGroup != null) {
-				itineraryGroup.getMarkers().add(marker);
-				updateGroup(itineraryGroup);
-				if (itineraryGroup.getName() == null) {
-					sortMarkers(itineraryGroup.getMarkers(), false, BY_DATE_ADDED_DESC);
+			MapMarkersGroup mapMarkersGroup = getMapMarkerGroupById(marker.groupKey, marker.getType());
+			if (mapMarkersGroup != null) {
+				mapMarkersGroup.getMarkers().add(marker);
+				updateGroup(mapMarkersGroup);
+				if (mapMarkersGroup.getName() == null) {
+					sortMarkers(mapMarkersGroup.getMarkers(), false, BY_DATE_ADDED_DESC);
 				}
 			} else {
-				itineraryGroup = new ItineraryGroup(marker.groupKey, marker.groupName, ItineraryGroup.ANY_TYPE);
-				itineraryGroup.setCreationDate(Long.MAX_VALUE);
-				itineraryGroup.getMarkers().add(marker);
-				app.getItineraryHelper().addToGroupsList(itineraryGroup);
-				app.getItineraryHelper().sortGroups();
-				updateGroup(itineraryGroup);
+				mapMarkersGroup = new MapMarkersGroup(marker.groupKey, marker.groupName, MapMarkersGroup.ANY_TYPE);
+				mapMarkersGroup.setCreationDate(Long.MAX_VALUE);
+				mapMarkersGroup.getMarkers().add(marker);
+				addToGroupsList(mapMarkersGroup);
+				sortGroups();
+				updateGroup(mapMarkersGroup);
 			}
 		}
 	}
 
-	public void createHeadersInGroup(@NonNull ItineraryGroup group) {
+	private void createHeadersInGroup(@NonNull MapMarkersGroup group) {
 		int type = group.getType();
 		int headerIconId = 0;
 		int subHeaderIconId = 0;
 		if (type != -1) {
-			headerIconId = type == ItineraryGroup.FAVORITES_TYPE
+			headerIconId = type == MapMarkersGroup.FAVORITES_TYPE
 					? R.drawable.ic_action_favorite : R.drawable.ic_action_polygom_dark;
 			subHeaderIconId = R.drawable.ic_action_filter;
 		}
@@ -320,6 +476,97 @@ public class MapMarkersHelper {
 		group.setCategoriesSubHeader(categoriesSubHeader);
 	}
 
+	private void removeMarkerFromGroup(MapMarker marker) {
+		if (marker != null) {
+			MapMarkersGroup mapMarkersGroup = getMapMarkerGroupById(marker.groupKey, marker.getType());
+			if (mapMarkersGroup != null) {
+				mapMarkersGroup.getMarkers().remove(marker);
+				updateGroup(mapMarkersGroup);
+			}
+		}
+	}
+
+	private void sortGroups() {
+		if (mapMarkersGroups.size() > 0) {
+			Collections.sort(mapMarkersGroups, new Comparator<MapMarkersGroup>() {
+				@Override
+				public int compare(MapMarkersGroup group1, MapMarkersGroup group2) {
+					long t1 = group1.getCreationDate();
+					long t2 = group2.getCreationDate();
+					return (t1 > t2) ? -1 : ((t1 == t2) ? 0 : 1);
+				}
+			});
+		}
+	}
+
+	@Nullable
+	public MapMarkersGroup getMapMarkerGroupById(String id, int type) {
+		for (MapMarkersGroup group : mapMarkersGroups) {
+			if ((id == null && group.getId() == null)
+					|| (group.getId() != null && group.getId().equals(id))) {
+				if (type == MapMarkersGroup.ANY_TYPE || type == group.getType()) {
+					return group;
+				}
+			}
+		}
+		return null;
+	}
+
+	private MapMarkersGroup createGPXMarkerGroup(File fl) {
+		return new MapMarkersGroup(getMarkerGroupId(fl),
+				Algorithms.getFileNameWithoutExtension(fl.getName()),
+				MapMarkersGroup.GPX_TYPE);
+	}
+
+	private MapMarkersGroup createFavMarkerGroup(FavoriteGroup favGroup) {
+		return new MapMarkersGroup(favGroup.getName(), favGroup.getName(), MapMarkersGroup.FAVORITES_TYPE);
+	}
+
+	private String getMarkerGroupId(File gpx) {
+		return gpx.getAbsolutePath();
+	}
+
+	private String getMarkerGroupId(FavoriteGroup group) {
+		return group.getName();
+	}
+
+	@NonNull
+	public List<MapMarkersGroup> getGroupsForDisplayedGpx() {
+		List<MapMarkersGroup> res = new ArrayList<>();
+		List<SelectedGpxFile> selectedGpxFiles = ctx.getSelectedGpxHelper().getSelectedGPXFiles();
+		for (SelectedGpxFile selected : selectedGpxFiles) {
+			MapMarkersGroup search = getMarkersGroup(selected.getGpxFile());
+			if (search == null && selected.getGpxFile() != null && selected.getGpxFile().path != null) {
+				MapMarkersGroup group = createGPXMarkerGroup(new File(selected.getGpxFile().path));
+				group.setDisabled(true);
+				createHeadersInGroup(group);
+				res.add(group);
+			}
+		}
+		return res;
+	}
+
+	@NonNull
+	public List<MapMarkersGroup> getGroupsForSavedArticlesTravelBook() {
+		List<MapMarkersGroup> res = new ArrayList<>();
+		TravelHelper travelHelper = ctx.getTravelHelper();
+		if (travelHelper.isAnyTravelBookPresent()) {
+			List<TravelArticle> savedArticles = travelHelper.getBookmarksHelper().getSavedArticles();
+			for (TravelArticle art : savedArticles) {
+				String gpxName = travelHelper.getGPXName(art);
+				File path = ctx.getAppPath(IndexConstants.GPX_TRAVEL_DIR + gpxName);
+				MapMarkersGroup search = getMapMarkerGroupById(getMarkerGroupId(path), MapMarkersGroup.GPX_TYPE);
+				if (search == null) {
+					MapMarkersGroup group = createGPXMarkerGroup(path);
+					group.setDisabled(true);
+					createHeadersInGroup(group);
+					res.add(group);
+				}
+			}
+		}
+		return res;
+	}
+
 	@Nullable
 	public MapMarker getMapMarker(WptPt wptPt) {
 		for (MapMarker marker : getMarkers()) {
@@ -352,7 +599,7 @@ public class MapMarkersHelper {
 
 	private List<MapMarker> getMarkers() {
 		List<MapMarker> res = new ArrayList<>(mapMarkers);
-		if (app.getSettings().KEEP_PASSED_MARKERS_ON_MAP.get()) {
+		if (ctx.getSettings().KEEP_PASSED_MARKERS_ON_MAP.get()) {
 			res.addAll(mapMarkersHistory);
 		}
 		return res;
@@ -371,7 +618,7 @@ public class MapMarkersHelper {
 		return null;
 	}
 
-	public void addNewMarkerIfNeeded(@NonNull ItineraryGroup group,
+	public void addNewMarkerIfNeeded(@NonNull MapMarkersGroup group,
 									 @NonNull List<MapMarker> groupMarkers,
 									 @NonNull LatLon latLon,
 									 @NonNull String name,
@@ -473,7 +720,7 @@ public class MapMarkersHelper {
 			addToMapMarkersList(markers);
 			reorderActiveMarkersIfNeeded();
 			sortMarkers(mapMarkersHistory, true, BY_DATE_ADDED_DESC);
-			app.getItineraryHelper().updateGroups();
+			updateGroups();
 			refresh();
 		}
 	}
@@ -490,7 +737,7 @@ public class MapMarkersHelper {
 			} else {
 				removeFromMapMarkersList(marker);
 			}
-			app.getItineraryHelper().removeMarkerFromGroup(marker);
+			removeMarkerFromGroup(marker);
 			if (refresh) {
 				refresh();
 			}
@@ -587,7 +834,7 @@ public class MapMarkersHelper {
 		addToMapMarkersHistoryList(mapMarkers);
 		mapMarkers = new ArrayList<>();
 		sortMarkers(mapMarkersHistory, true, BY_DATE_ADDED_DESC);
-		app.getItineraryHelper().updateGroups();
+		updateGroups();
 		refresh();
 	}
 
@@ -608,18 +855,18 @@ public class MapMarkersHelper {
 
 	public void addMapMarkers(@NonNull List<LatLon> points,
 							  @NonNull List<PointDescription> historyNames,
-							  @Nullable ItineraryGroup group) {
+							  @Nullable MapMarkersGroup group) {
 		addMarkers(points, historyNames, group, null, null, null);
 	}
 
 	private void addMarkers(@NonNull List<LatLon> points,
 							@NonNull List<PointDescription> historyNames,
-							@Nullable ItineraryGroup group,
+							@Nullable MapMarkersGroup group,
 							@Nullable List<FavouritePoint> favouritePoints,
 							@Nullable List<WptPt> wptPts,
 							@Nullable List<String> mapObjNames) {
 		if (points.size() > 0) {
-			app.getSettings().SHOW_MAP_MARKERS.set(true);
+			ctx.getSettings().SHOW_MAP_MARKERS.set(true);
 			int colorIndex = -1;
 			List<MapMarker> addedMarkers = new ArrayList<>();
 			for (int i = 0; i < points.size(); i++) {
@@ -635,7 +882,7 @@ public class MapMarkersHelper {
 					pointDescription = historyName;
 				}
 				if (pointDescription.isLocation() && Algorithms.isEmpty(pointDescription.getName())) {
-					pointDescription.setName(PointDescription.getSearchAddressStr(app));
+					pointDescription.setName(PointDescription.getSearchAddressStr(ctx));
 				}
 				if (colorIndex == -1) {
 					if (mapMarkers.size() > 0) {
@@ -649,7 +896,7 @@ public class MapMarkersHelper {
 
 				MapMarker marker = new MapMarker(point, pointDescription, colorIndex, false, 0);
 				if (group != null) {
-					marker.id = group.getId() + marker.getName(app) + MapUtils.createShortLinkString(marker.point.getLatitude(), marker.point.getLongitude(), 15);
+					marker.id = group.getId() + marker.getName(ctx) + MapUtils.createShortLinkString(marker.point.getLatitude(), marker.point.getLongitude(), 15);
 					if (markersDbHelper.getMarker(marker.id) != null) {
 						continue;
 					}
@@ -716,7 +963,7 @@ public class MapMarkersHelper {
 	}
 
 	private void refreshMarker(final MapMarker marker) {
-		app.runInUIThread(new Runnable() {
+		ctx.runInUIThread(new Runnable() {
 			@Override
 			public void run() {
 				for (MapMarkerChangedListener l : listeners) {
@@ -727,7 +974,7 @@ public class MapMarkersHelper {
 	}
 
 	private void refresh() {
-		app.runInUIThread(new Runnable() {
+		ctx.runInUIThread(new Runnable() {
 			@Override
 			public void run() {
 				for (MapMarkerChangedListener l : listeners) {
@@ -737,14 +984,28 @@ public class MapMarkersHelper {
 		});
 	}
 
+	public List<MapMarker> getMapMarkersFromDefaultGroups(boolean history) {
+		List<MapMarker> mapMarkers = new ArrayList<>();
+		for (MapMarkersGroup group : mapMarkersGroups) {
+			if (group.getType() == MapMarkersGroup.ANY_TYPE) {
+				for (MapMarker marker : group.getMarkers()) {
+					if (history && marker.history || !history && !marker.history) {
+						mapMarkers.add(marker);
+					}
+				}
+			}
+		}
+		return mapMarkers;
+	}
+
 	public String saveMarkersToFile(String fileName) {
 		GPXFile gpxFile = generateGpx();
 		String dirName = IndexConstants.GPX_INDEX_DIR + IndexConstants.MAP_MARKERS_INDEX_DIR;
-		File dir = app.getAppPath(dirName);
+		File dir = ctx.getAppPath(dirName);
 		if (!dir.exists()) {
 			dir.mkdirs();
 		}
-		String uniqueFileName = FileUtils.createUniqueFileName(app, fileName, dirName, IndexConstants.GPX_FILE_EXT);
+		String uniqueFileName = FileUtils.createUniqueFileName(ctx, fileName, dirName, IndexConstants.GPX_FILE_EXT);
 		File fout = new File(dir, uniqueFileName + IndexConstants.GPX_FILE_EXT);
 		GPXUtilities.writeGpxFile(fout, gpxFile);
 
@@ -759,13 +1020,13 @@ public class MapMarkersHelper {
 		SimpleDateFormat format = new SimpleDateFormat(GPX_TIME_FORMAT, Locale.US);
 		format.setTimeZone(TimeZone.getTimeZone("UTC"));
 
-		GPXFile gpxFile = new GPXFile(Version.getFullVersion(app));
+		GPXFile gpxFile = new GPXFile(Version.getFullVersion(ctx));
 		for (MapMarker marker : markers) {
 			WptPt wpt = new WptPt();
 			wpt.lat = marker.getLatitude();
 			wpt.lon = marker.getLongitude();
 			wpt.name = marker.getOnlyName();
-			wpt.setColor(ContextCompat.getColor(app, MapMarker.getColorId(marker.colorIndex)));
+			wpt.setColor(ContextCompat.getColor(ctx, MapMarker.getColorId(marker.colorIndex)));
 			if (completeBackup) {
 				if (marker.creationDate != 0) {
 					wpt.getExtensionsToWrite().put(CREATION_DATE, format.format(new Date(marker.creationDate)));
@@ -786,7 +1047,7 @@ public class MapMarkersHelper {
 		List<MapMarker> mapMarkers = new ArrayList<>();
 		for (WptPt point : gpxFile.getPoints()) {
 			LatLon latLon = new LatLon(point.lat, point.lon);
-			int colorIndex = MapMarker.getColorIndex(app, point.getColor());
+			int colorIndex = MapMarker.getColorIndex(ctx, point.getColor());
 			PointDescription name = new PointDescription(PointDescription.POINT_TYPE_LOCATION, point.name);
 
 			MapMarker marker = new MapMarker(latLon, name, colorIndex, false, 0);
@@ -877,6 +1138,22 @@ public class MapMarkersHelper {
 		mapMarkersHistory = copyList;
 	}
 
+	// accessors to markers groups:
+
+	private void addToGroupsList(MapMarkersGroup group) {
+		List<MapMarkersGroup> copyList = new ArrayList<>(mapMarkersGroups);
+		copyList.add(group);
+		mapMarkersGroups = copyList;
+	}
+
+	private void removeFromGroupsList(MapMarkersGroup group) {
+		List<MapMarkersGroup> copyList = new ArrayList<>(mapMarkersGroups);
+		copyList.remove(group);
+		mapMarkersGroups = copyList;
+	}
+
+	// ---------------------------------------------------------------------------------------------
+
 	// classes and interfaces:
 
 	public interface MapMarkerChangedListener {
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java
index 2cabb6f804..1f86a94a1d 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java
@@ -20,8 +20,6 @@ import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.ShortDescriptionItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
-import net.osmand.plus.itinerary.ItineraryGroup;
-import net.osmand.plus.itinerary.ItineraryHelper;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -138,18 +136,18 @@ public class SelectWptCategoriesBottomSheetDialogFragment extends MenuBottomShee
 	private void updateAddOrEnableGroupWptCategories() {
 		OsmandApplication app = getMyApplication();
 		GpxSelectionHelper gpxSelectionHelper = app.getSelectedGpxHelper();
-		ItineraryHelper helper = app.getItineraryHelper();
+		MapMarkersHelper mapMarkersHelper = app.getMapMarkersHelper();
 
 		SelectedGpxFile selectedGpxFile = gpxSelectionHelper.getSelectedFileByPath(gpxFile.path);
 		if (selectedGpxFile == null) {
 			gpxSelectionHelper.selectGpxFile(gpxFile, true, false, false, false, false);
 		}
-		ItineraryGroup group = helper.getMarkersGroup(gpxFile);
+		MapMarkersGroup group = mapMarkersHelper.getMarkersGroup(gpxFile);
 		if (group == null) {
-			group = helper.addOrEnableGroup(gpxFile);
+			group = mapMarkersHelper.addOrEnableGroup(gpxFile);
 		}
-		helper.updateGroupWptCategories(group, selectedCategories);
-		helper.runSynchronization(group);
+		mapMarkersHelper.updateGroupWptCategories(group, selectedCategories);
+		app.getItineraryHelper().runSynchronization(group);
 	}
 
 	private boolean isAllChecked() {
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java
index 4dfe175720..2fa206d08f 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java
@@ -14,7 +14,7 @@ import com.google.android.material.snackbar.Snackbar;
 
 import net.osmand.data.LatLon;
 import net.osmand.plus.mapmarkers.MapMarker;
-import net.osmand.plus.itinerary.ItineraryGroup;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
@@ -214,8 +214,8 @@ public class MapMarkersActiveAdapter extends RecyclerView.Adapter<MapMarkerItemV
 		final int pos = holder.getAdapterPosition();
 		final MapMarker marker = getItem(pos);
 		mapActivity.getMyApplication().getMapMarkersHelper().moveMapMarkerToHistory(marker);
-		ItineraryGroup group = mapActivity.getMyApplication().getItineraryHelper().getMapMarkerGroupById(marker.groupKey,
-				ItineraryGroup.ANY_TYPE);
+		MapMarkersGroup group = mapActivity.getMyApplication().getMapMarkersHelper().getMapMarkerGroupById(marker.groupKey,
+				MapMarkersGroup.ANY_TYPE);
 		if (group != null) {
 			mapActivity.getMyApplication().getMapMarkersHelper().updateGroup(group);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
index e60a1ef746..4992ee88be 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
@@ -21,12 +21,11 @@ import net.osmand.IndexConstants;
 import net.osmand.data.LatLon;
 import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
-import net.osmand.plus.itinerary.ItineraryHelper;
 import net.osmand.plus.mapmarkers.CategoriesSubHeader;
 import net.osmand.plus.mapmarkers.MapMarkersHelper;
 import net.osmand.plus.mapmarkers.GroupHeader;
 import net.osmand.plus.mapmarkers.MapMarker;
-import net.osmand.plus.itinerary.ItineraryGroup;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.mapmarkers.ShowHideHistoryButton;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
@@ -104,13 +103,13 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 
 	private void createDisplayGroups() {
 		items = new ArrayList<>();
-		ItineraryHelper helper = app.getItineraryHelper();
+		MapMarkersHelper helper = app.getMapMarkersHelper();
 		helper.updateGroups();
-		List<ItineraryGroup> groups = new ArrayList<>(helper.getItineraryGroups());
+		List<MapMarkersGroup> groups = new ArrayList<>(helper.getMapMarkersGroups());
 		groups.addAll(helper.getGroupsForDisplayedGpx());
 		groups.addAll(helper.getGroupsForSavedArticlesTravelBook());
 		for (int i = 0; i < groups.size(); i++) {
-			ItineraryGroup group = groups.get(i);
+			MapMarkersGroup group = groups.get(i);
 			if (!group.isVisible()) {
 				continue;
 			}
@@ -177,7 +176,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 					}
 				}
 				if (group.getWptCategories() == null || group.getWptCategories().isEmpty()) {
-					app.getItineraryHelper().updateGroupWptCategories(group, getGpxFile(group.getGpxPath()).getPointsByCategories().keySet());
+					helper.updateGroupWptCategories(group, getGpxFile(group.getGpxPath()).getPointsByCategories().keySet());
 				}
 				populateAdapterWithGroupMarkers(group, getItemCount());
 			}
@@ -196,7 +195,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 		return null;
 	}
 
-	private void populateAdapterWithGroupMarkers(ItineraryGroup group, int position) {
+	private void populateAdapterWithGroupMarkers(MapMarkersGroup group, int position) {
 		if (position != RecyclerView.NO_POSITION) {
 			ShowHideHistoryButton showHideHistoryButton = group.getShowHideHistoryButton();
 			if (!group.isDisabled()) {
@@ -221,7 +220,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 
 	public int getGroupHeaderPosition(String groupId) {
 		int pos = -1;
-		ItineraryGroup group = app.getItineraryHelper().getMapMarkerGroupById(groupId, ItineraryGroup.ANY_TYPE);
+		MapMarkersGroup group = app.getMapMarkersHelper().getMapMarkerGroupById(groupId, MapMarkersGroup.ANY_TYPE); 
 		if (group != null) {
 			pos = items.indexOf(group.getGroupHeader());
 		}
@@ -402,11 +401,11 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 				headerViewHolder.articleDescription.setVisibility(View.GONE);
 			} else if (header instanceof GroupHeader) {
 				final GroupHeader groupHeader = (GroupHeader) header;
-				final ItineraryGroup group = groupHeader.getGroup();
+				final MapMarkersGroup group = groupHeader.getGroup();
 				String groupName = group.getName();
 				if (groupName.isEmpty()) {
 					groupName = app.getString(R.string.shared_string_favorites);
-				} else if (group.getType() == ItineraryGroup.GPX_TYPE) {
+				} else if (group.getType() == MapMarkersGroup.GPX_TYPE) {
 					groupName = groupName.replace(IndexConstants.GPX_FILE_EXT, "").replace("/", " ").replace("_", " ");
 				}
 				if (group.isDisabled()) {
@@ -463,8 +462,8 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 							fragment.setUsedOnMap(false);
 							fragment.show(mapActivity.getSupportFragmentManager(), SelectWptCategoriesBottomSheetDialogFragment.TAG);
 						}
-						app.getItineraryHelper().updateGroupDisabled(group, disabled);
-						if (group.getType() == ItineraryGroup.GPX_TYPE) {
+						mapMarkersHelper.updateGroupDisabled(group, disabled);
+						if (group.getType() == MapMarkersGroup.GPX_TYPE) {
 							group.setVisibleUntilRestart(disabled);
 							String gpxPath = group.getGpxPath();
 							SelectedGpxFile selectedGpxFile = app.getSelectedGpxHelper().getSelectedFileByPath(gpxPath);
@@ -477,7 +476,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 							switchGpxVisibility(gpxFile[0], selectedGpxFile, !disabled);
 						}
 						if(!disabled) {
-							app.getItineraryHelper().enableGroup(group);
+							mapMarkersHelper.enableGroup(group);
 						} else {
 							app.getItineraryHelper().runSynchronization(group);
 						}
@@ -487,10 +486,10 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 									.setAction(R.string.shared_string_undo, new View.OnClickListener() {
 										@Override
 										public void onClick(View view) {
-											if (group.getType() == ItineraryGroup.GPX_TYPE && gpxFile[0] != null) {
+											if (group.getType() == MapMarkersGroup.GPX_TYPE && gpxFile[0] != null) {
 												switchGpxVisibility(gpxFile[0], null, true);
 											}
-											app.getItineraryHelper().enableGroup(group);
+											mapMarkersHelper.enableGroup(group);
 										}
 									});
 							UiUtilities.setupSnackbar(snackbar, night);
@@ -530,7 +529,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 			final Object header = getItem(position);
 			if (header instanceof CategoriesSubHeader) {
 				final CategoriesSubHeader categoriesSubHeader = (CategoriesSubHeader) header;
-				final ItineraryGroup group = categoriesSubHeader.getGroup();
+				final MapMarkersGroup group = categoriesSubHeader.getGroup();
 				View.OnClickListener openChooseCategoriesDialog = new View.OnClickListener() {
 					@Override
 					public void onClick(View view) {
@@ -544,7 +543,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 							fragment.setUsedOnMap(false);
 							fragment.show(mapActivity.getSupportFragmentManager(), SelectWptCategoriesBottomSheetDialogFragment.TAG);
 						} else {
-							mapActivity.getMyApplication().getItineraryHelper().addOrEnableGpxGroup(new File(group.getGpxPath()));
+							mapActivity.getMyApplication().getMapMarkersHelper().addOrEnableGpxGroup(new File(group.getGpxPath()));
 						}
 					}
 				};
@@ -573,7 +572,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 		}
 	}
 
-	private String getGroupWptCategoriesString(ItineraryGroup group) {
+	private String getGroupWptCategoriesString(MapMarkersGroup group) {
 		StringBuilder sb = new StringBuilder();
 		Set<String> categories = group.getWptCategories();
 		if (categories != null && !categories.isEmpty()) {
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/DeletePointsTask.java b/OsmAnd/src/net/osmand/plus/myplaces/DeletePointsTask.java
index c7179f1091..c9d9d4c423 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/DeletePointsTask.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/DeletePointsTask.java
@@ -8,7 +8,7 @@ import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItemType;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.activities.SavingTrackHelper;
-import net.osmand.plus.itinerary.ItineraryGroup;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
@@ -64,7 +64,7 @@ public class DeletePointsTask extends AsyncTask<Void, Void, Void> {
 	}
 
 	private void syncGpx(GPXFile gpxFile) {
-		ItineraryGroup group = app.getItineraryHelper().getMarkersGroup(gpxFile);
+		MapMarkersGroup group = app.getMapMarkersHelper().getMarkersGroup(gpxFile);
 		if (group != null) {
 			app.getItineraryHelper().runSynchronization(group);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/EditTrackGroupDialogFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/EditTrackGroupDialogFragment.java
index 352e7ecc3b..b3ff9b91bd 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/EditTrackGroupDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/EditTrackGroupDialogFragment.java
@@ -49,7 +49,7 @@ import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
 import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.FontCache;
-import net.osmand.plus.itinerary.ItineraryGroup;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.mapmarkers.MapMarkersHelper;
 import net.osmand.plus.measurementtool.OptionsDividerItem;
 import net.osmand.plus.myplaces.DeletePointsTask.OnPointsDeleteListener;
@@ -192,7 +192,7 @@ public class EditTrackGroupDialogFragment extends MenuBottomSheetDialogFragment
 	}
 
 	private BaseBottomSheetItem createCopyToMarkersItem(final GPXFile gpxFile) {
-		ItineraryGroup markersGroup = app.getItineraryHelper().getMarkersGroup(gpxFile);
+		MapMarkersGroup markersGroup = mapMarkersHelper.getMarkersGroup(gpxFile);
 		final boolean synced = markersGroup != null && (Algorithms.isEmpty(markersGroup.getWptCategories())
 				|| markersGroup.getWptCategories().contains(group.getName()));
 
@@ -216,10 +216,10 @@ public class EditTrackGroupDialogFragment extends MenuBottomSheetDialogFragment
 			selectedGpxHelper.selectGpxFile(gpxFile, true, false, false, false, false);
 		}
 		boolean groupCreated = false;
-		ItineraryGroup markersGroup = app.getItineraryHelper().getMarkersGroup(gpxFile);
+		MapMarkersGroup markersGroup = mapMarkersHelper.getMarkersGroup(gpxFile);
 		if (markersGroup == null) {
 			groupCreated = true;
-			markersGroup = app.getItineraryHelper().addOrEnableGroup(gpxFile);
+			markersGroup = mapMarkersHelper.addOrEnableGroup(gpxFile);
 		}
 		Set<String> categories = markersGroup.getWptCategories();
 		Set<String> selectedCategories = new HashSet<>();
@@ -234,7 +234,7 @@ public class EditTrackGroupDialogFragment extends MenuBottomSheetDialogFragment
 		if (Algorithms.isEmpty(selectedCategories)) {
 			mapMarkersHelper.removeMarkersGroup(markersGroup);
 		} else {
-			app.getItineraryHelper().updateGroupWptCategories(markersGroup, selectedCategories);
+			mapMarkersHelper.updateGroupWptCategories(markersGroup, selectedCategories);
 			if (!groupCreated) {
 				app.getItineraryHelper().runSynchronization(markersGroup);
 			}
@@ -524,7 +524,7 @@ public class EditTrackGroupDialogFragment extends MenuBottomSheetDialogFragment
 		}
 
 		private void syncGpx(GPXFile gpxFile) {
-			ItineraryGroup group = app.getItineraryHelper().getMarkersGroup(gpxFile);
+			MapMarkersGroup group = app.getMapMarkersHelper().getMarkersGroup(gpxFile);
 			if (group != null) {
 				app.getItineraryHelper().runSynchronization(group);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index 2641fe986f..59be8cc533 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -63,7 +63,7 @@ import net.osmand.plus.base.OsmandExpandableListFragment;
 import net.osmand.plus.base.PointImageDrawable;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.mapmarkers.CoordinateInputDialogFragment;
-import net.osmand.plus.itinerary.ItineraryGroup;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.mapmarkers.MapMarkersHelper;
 import net.osmand.plus.myplaces.DeletePointsTask.OnPointsDeleteListener;
 import net.osmand.plus.myplaces.TrackBitmapDrawer.TrackBitmapDrawerListener;
@@ -399,7 +399,8 @@ public class TrackPointFragment extends OsmandExpandableListFragment implements
 			createMenuItem(menu, SHARE_ID, R.string.shared_string_share, R.drawable.ic_action_gshare_dark, MenuItem.SHOW_AS_ACTION_NEVER, true);
 			GPXFile gpxFile = getGpx();
 			if (gpxFile != null && gpxFile.path != null) {
-				final boolean synced = app.getItineraryHelper().getMarkersGroup(getGpx()) != null;
+				final MapMarkersHelper markersHelper = app.getMapMarkersHelper();
+				final boolean synced = markersHelper.getMarkersGroup(getGpx()) != null;
 				createMenuItem(menu, SELECT_MAP_MARKERS_ID, synced ? R.string.remove_from_map_markers
 						: R.string.shared_string_add_to_map_markers, R.drawable.ic_action_flag, MenuItem.SHOW_AS_ACTION_NEVER);
 			}
@@ -500,15 +501,15 @@ public class TrackPointFragment extends OsmandExpandableListFragment implements
 			return;
 		}
 		final GPXFile gpxFile = getGpx();
-		ItineraryGroup markersSearch = app.getItineraryHelper().getMarkersGroup(gpxFile);
-		final ItineraryGroup markersGr;
+		MapMarkersGroup markersSearch = markersHelper.getMarkersGroup(gpxFile);
+		final MapMarkersGroup markersGr;
 		final boolean markersRemoved;
 		if (markersSearch != null) {
 			markersGr = markersSearch;
 			markersHelper.removeMarkersGroup(markersGr);
 			markersRemoved = true;
 		} else if (gpxFile != null) {
-			markersGr = app.getItineraryHelper().addOrEnableGroup(gpxFile);
+			markersGr = markersHelper.addOrEnableGroup(gpxFile);
 			markersRemoved = false;
 		} else {
 			markersRemoved = false;
@@ -534,10 +535,10 @@ public class TrackPointFragment extends OsmandExpandableListFragment implements
 							if (trackActivity != null) {
 								if (markersRemoved) {
 									if (gpxFile != null) {
-										app.getItineraryHelper().addOrEnableGroup(gpxFile);
+										markersHelper.addOrEnableGroup(gpxFile);
 									}
 								} else {
-									ItineraryGroup group = app.getItineraryHelper().getMarkersGroup(gpxFile);
+									MapMarkersGroup group = markersHelper.getMarkersGroup(gpxFile);
 									if (group != null) {
 										markersHelper.removeMarkersGroup(group);
 									}
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/backup/HistoryMarkersSettingsItem.java b/OsmAnd/src/net/osmand/plus/settings/backend/backup/HistoryMarkersSettingsItem.java
index 9cbb536177..ba0c3d7dc0 100644
--- a/OsmAnd/src/net/osmand/plus/settings/backend/backup/HistoryMarkersSettingsItem.java
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/backup/HistoryMarkersSettingsItem.java
@@ -12,7 +12,7 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.mapmarkers.MapMarker;
 import net.osmand.plus.mapmarkers.MapMarkersDbHelper;
-import net.osmand.plus.itinerary.ItineraryGroup;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.mapmarkers.MapMarkersHelper;
 import net.osmand.plus.settings.backend.ExportSettingsType;
 import net.osmand.util.Algorithms;
@@ -46,7 +46,7 @@ public class HistoryMarkersSettingsItem extends CollectionSettingsItem<MapMarker
 	protected void init() {
 		super.init();
 		markersHelper = app.getMapMarkersHelper();
-		existingItems = new ArrayList<>(app.getItineraryHelper().getMapMarkersFromDefaultGroups(true));
+		existingItems = new ArrayList<>(markersHelper.getMapMarkersFromDefaultGroups(true));
 	}
 
 	@NonNull
@@ -122,10 +122,10 @@ public class HistoryMarkersSettingsItem extends CollectionSettingsItem<MapMarker
 		}
 	}
 
-	public ItineraryGroup getMarkersGroup() {
+	public MapMarkersGroup getMarkersGroup() {
 		String name = app.getString(R.string.markers_history);
 		String groupId = ExportSettingsType.HISTORY_MARKERS.name();
-		ItineraryGroup markersGroup = new ItineraryGroup(groupId, name, ItineraryGroup.ANY_TYPE);
+		MapMarkersGroup markersGroup = new MapMarkersGroup(groupId, name, MapMarkersGroup.ANY_TYPE);
 		markersGroup.setMarkers(items);
 		return markersGroup;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/backup/MarkersSettingsItem.java b/OsmAnd/src/net/osmand/plus/settings/backend/backup/MarkersSettingsItem.java
index 9dce00354a..daa6b9b485 100644
--- a/OsmAnd/src/net/osmand/plus/settings/backend/backup/MarkersSettingsItem.java
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/backup/MarkersSettingsItem.java
@@ -12,7 +12,7 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.mapmarkers.MapMarker;
 import net.osmand.plus.mapmarkers.MapMarkersDbHelper;
-import net.osmand.plus.itinerary.ItineraryGroup;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.mapmarkers.MapMarkersHelper;
 import net.osmand.plus.settings.backend.ExportSettingsType;
 import net.osmand.util.Algorithms;
@@ -46,7 +46,7 @@ public class MarkersSettingsItem extends CollectionSettingsItem<MapMarker> {
 	protected void init() {
 		super.init();
 		markersHelper = app.getMapMarkersHelper();
-		existingItems = new ArrayList<>(app.getItineraryHelper().getMapMarkersFromDefaultGroups(false));
+		existingItems = new ArrayList<>(markersHelper.getMapMarkersFromDefaultGroups(false));
 	}
 
 	@NonNull
@@ -122,10 +122,10 @@ public class MarkersSettingsItem extends CollectionSettingsItem<MapMarker> {
 		}
 	}
 
-	public ItineraryGroup getMarkersGroup() {
+	public MapMarkersGroup getMarkersGroup() {
 		String name = app.getString(R.string.map_markers);
 		String groupId = ExportSettingsType.ACTIVE_MARKERS.name();
-		ItineraryGroup markersGroup = new ItineraryGroup(groupId, name, ItineraryGroup.ANY_TYPE);
+		MapMarkersGroup markersGroup = new MapMarkersGroup(groupId, name, MapMarkersGroup.ANY_TYPE);
 		markersGroup.setMarkers(items);
 		return markersGroup;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java b/OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java
index 61a429f05f..61cfd43cc1 100644
--- a/OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java
@@ -30,10 +30,11 @@ import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo;
 import net.osmand.plus.helpers.FileNameTranslationHelper;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.helpers.GpxUiHelper.GPXInfo;
+import net.osmand.plus.helpers.LocaleHelper;
 import net.osmand.plus.helpers.SearchHistoryHelper;
 import net.osmand.plus.helpers.SearchHistoryHelper.HistoryEntry;
 import net.osmand.plus.mapmarkers.MapMarker;
-import net.osmand.plus.itinerary.ItineraryGroup;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.onlinerouting.engine.OnlineRoutingEngine;
 import net.osmand.plus.osmedit.OpenstreetmapPoint;
 import net.osmand.plus.osmedit.OsmEditingPlugin;
@@ -605,19 +606,19 @@ public class SettingsHelper {
 				myPlacesItems.put(ExportSettingsType.MULTIMEDIA_NOTES, files);
 			}
 		}
-		List<MapMarker> mapMarkers = app.getItineraryHelper().getMapMarkersFromDefaultGroups(false);
+		List<MapMarker> mapMarkers = app.getMapMarkersHelper().getMapMarkersFromDefaultGroups(false);
 		if (!mapMarkers.isEmpty()) {
 			String name = app.getString(R.string.map_markers);
 			String groupId = ExportSettingsType.ACTIVE_MARKERS.name();
-			ItineraryGroup markersGroup = new ItineraryGroup(groupId, name, ItineraryGroup.ANY_TYPE);
+			MapMarkersGroup markersGroup = new MapMarkersGroup(groupId, name, MapMarkersGroup.ANY_TYPE);
 			markersGroup.setMarkers(mapMarkers);
 			myPlacesItems.put(ExportSettingsType.ACTIVE_MARKERS, Collections.singletonList(markersGroup));
 		}
-		List<MapMarker> markersHistory = app.getItineraryHelper().getMapMarkersFromDefaultGroups(true);
+		List<MapMarker> markersHistory = app.getMapMarkersHelper().getMapMarkersFromDefaultGroups(true);
 		if (!markersHistory.isEmpty()) {
 			String name = app.getString(R.string.shared_string_history);
 			String groupId = ExportSettingsType.HISTORY_MARKERS.name();
-			ItineraryGroup markersGroup = new ItineraryGroup(groupId, name, ItineraryGroup.ANY_TYPE);
+			MapMarkersGroup markersGroup = new MapMarkersGroup(groupId, name, MapMarkersGroup.ANY_TYPE);
 			markersGroup.setMarkers(markersHistory);
 			myPlacesItems.put(ExportSettingsType.HISTORY_MARKERS, Collections.singletonList(markersGroup));
 		}
@@ -720,8 +721,8 @@ public class SettingsHelper {
 		List<FavoriteGroup> favoriteGroups = new ArrayList<>();
 		List<OsmNotesPoint> osmNotesPointList = new ArrayList<>();
 		List<OpenstreetmapPoint> osmEditsPointList = new ArrayList<>();
-		List<ItineraryGroup> markersGroups = new ArrayList<>();
-		List<ItineraryGroup> markersHistoryGroups = new ArrayList<>();
+		List<MapMarkersGroup> markersGroups = new ArrayList<>();
+		List<MapMarkersGroup> markersHistoryGroups = new ArrayList<>();
 		List<HistoryEntry> historyEntries = new ArrayList<>();
 		List<OnlineRoutingEngine> onlineRoutingEngines = new ArrayList<>();
 
@@ -755,12 +756,12 @@ public class SettingsHelper {
 				osmEditsPointList.add((OpenstreetmapPoint) object);
 			} else if (object instanceof FavoriteGroup) {
 				favoriteGroups.add((FavoriteGroup) object);
-			} else if (object instanceof ItineraryGroup) {
-				ItineraryGroup markersGroup = (ItineraryGroup) object;
+			} else if (object instanceof MapMarkersGroup) {
+				MapMarkersGroup markersGroup = (MapMarkersGroup) object;
 				if (ExportSettingsType.ACTIVE_MARKERS.name().equals(markersGroup.getId())) {
-					markersGroups.add((ItineraryGroup) object);
+					markersGroups.add((MapMarkersGroup) object);
 				} else if (ExportSettingsType.HISTORY_MARKERS.name().equals(markersGroup.getId())) {
-					markersHistoryGroups.add((ItineraryGroup) object);
+					markersHistoryGroups.add((MapMarkersGroup) object);
 				}
 			} else if (object instanceof HistoryEntry) {
 				historyEntries.add((HistoryEntry) object);
@@ -812,7 +813,7 @@ public class SettingsHelper {
 		}
 		if (!markersGroups.isEmpty()) {
 			List<MapMarker> mapMarkers = new ArrayList<>();
-			for (ItineraryGroup group : markersGroups) {
+			for (MapMarkersGroup group : markersGroups) {
 				mapMarkers.addAll(group.getMarkers());
 			}
 			MarkersSettingsItem baseItem = getBaseItem(SettingsItemType.ACTIVE_MARKERS, MarkersSettingsItem.class, settingsItems);
@@ -820,7 +821,7 @@ public class SettingsHelper {
 		}
 		if (!markersHistoryGroups.isEmpty()) {
 			List<MapMarker> mapMarkers = new ArrayList<>();
-			for (ItineraryGroup group : markersHistoryGroups) {
+			for (MapMarkersGroup group : markersHistoryGroups) {
 				mapMarkers.addAll(group.getMarkers());
 			}
 			HistoryMarkersSettingsItem baseItem = getBaseItem(SettingsItemType.HISTORY_MARKERS, HistoryMarkersSettingsItem.class, settingsItems);
@@ -910,8 +911,8 @@ public class SettingsHelper {
 		List<OsmNotesPoint> notesPointList = new ArrayList<>();
 		List<OpenstreetmapPoint> editsPointList = new ArrayList<>();
 		List<FavoriteGroup> favoriteGroups = new ArrayList<>();
-		List<ItineraryGroup> markersGroups = new ArrayList<>();
-		List<ItineraryGroup> markersHistoryGroups = new ArrayList<>();
+		List<MapMarkersGroup> markersGroups = new ArrayList<>();
+		List<MapMarkersGroup> markersHistoryGroups = new ArrayList<>();
 		List<HistoryEntry> historyEntries = new ArrayList<>();
 		List<OnlineRoutingEngine> onlineRoutingEngines = new ArrayList<>();
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ExportItemsBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportItemsBottomSheet.java
index 6357eb94bf..c3b74af4fd 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/ExportItemsBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportItemsBottomSheet.java
@@ -41,7 +41,7 @@ import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo;
 import net.osmand.plus.helpers.FileNameTranslationHelper;
 import net.osmand.plus.helpers.GpxUiHelper;
 import net.osmand.plus.helpers.SearchHistoryHelper.HistoryEntry;
-import net.osmand.plus.itinerary.ItineraryGroup;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.onlinerouting.engine.OnlineRoutingEngine;
 import net.osmand.plus.osmedit.OpenstreetmapPoint;
 import net.osmand.plus.osmedit.OsmEditingPlugin;
@@ -377,8 +377,8 @@ public class ExportItemsBottomSheet extends MenuBottomSheetDialogFragment {
 			GlobalSettingsItem globalSettingsItem = (GlobalSettingsItem) object;
 			item.setTitle(globalSettingsItem.getPublicName(app));
 			item.setIcon(uiUtilities.getIcon(R.drawable.ic_action_settings, getItemIconColor(object)));
-		} else if (object instanceof ItineraryGroup) {
-			ItineraryGroup markersGroup = (ItineraryGroup) object;
+		} else if (object instanceof MapMarkersGroup) {
+			MapMarkersGroup markersGroup = (MapMarkersGroup) object;
 			if (ExportSettingsType.ACTIVE_MARKERS.name().equals(markersGroup.getId())) {
 				item.setTitle(getString(R.string.map_markers));
 				item.setIcon(uiUtilities.getIcon(R.drawable.ic_action_flag, getItemIconColor(object)));
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ExportSettingsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportSettingsAdapter.java
index 360f786b77..6b6a85035d 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/ExportSettingsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportSettingsAdapter.java
@@ -18,7 +18,7 @@ import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.helpers.FontCache;
-import net.osmand.plus.itinerary.ItineraryGroup;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.settings.backend.ExportSettingsCategory;
 import net.osmand.plus.settings.backend.ExportSettingsType;
 import net.osmand.plus.settings.backend.backup.FileSettingsItem;
@@ -311,8 +311,8 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
 						itemsSize += ((FileSettingsItem) object).getSize();
 					} else if (object instanceof File) {
 						itemsSize += ((File) object).length();
-					} else if (object instanceof ItineraryGroup) {
-						int selectedMarkers = ((ItineraryGroup) object).getMarkers().size();
+					} else if (object instanceof MapMarkersGroup) {
+						int selectedMarkers = ((MapMarkersGroup) object).getMarkers().size();
 						String itemsDescr = app.getString(R.string.shared_string_items);
 						return app.getString(R.string.ltr_or_rtl_combine_via_colon, itemsDescr, selectedMarkers);
 					}
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/FavouritesLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/FavouritesLayer.java
index 656568b425..04c4ac320a 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/FavouritesLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/FavouritesLayer.java
@@ -106,7 +106,7 @@ public class FavouritesLayer extends OsmandMapLayer implements IContextMenuProvi
 				List<LatLon> smallObjectsLatLon = new ArrayList<>();
 				for (FavoriteGroup group : favouritesDbHelper.getFavoriteGroups()) {
 					List<Pair<FavouritePoint, MapMarker>> fullObjects = new ArrayList<>();
-					boolean synced = view.getApplication().getItineraryHelper().getMarkersGroup(group) != null;
+					boolean synced = mapMarkersHelper.getMarkersGroup(group) != null;
 					for (FavouritePoint favoritePoint : group.getPoints()) {
 						double lat = favoritePoint.getLatitude();
 						double lon = favoritePoint.getLongitude();
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
index db26c11019..99d4d41c81 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
@@ -48,6 +48,7 @@ import net.osmand.plus.itinerary.ItineraryGroup;
 import net.osmand.plus.mapcontextmenu.controllers.SelectedGpxMenuController.SelectedGpxPoint;
 import net.osmand.plus.mapcontextmenu.other.TrackChartPoints;
 import net.osmand.plus.mapmarkers.MapMarker;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.mapmarkers.MapMarkersHelper;
 import net.osmand.plus.render.OsmandRenderer;
 import net.osmand.plus.render.OsmandRenderer.RenderingContext;
@@ -543,7 +544,7 @@ public class GPXLayer extends OsmandMapLayer implements IContextMenuProvider, IM
 			for (SelectedGpxFile g : selectedGPXFiles) {
 				List<Pair<WptPt, MapMarker>> fullObjects = new ArrayList<>();
 				int fileColor = getFileColor(g);
-				boolean synced = view.getApplication().getItineraryHelper().getMarkersGroup(g.getGpxFile()) != null;
+				boolean synced = mapMarkersHelper.getMarkersGroup(g.getGpxFile()) != null;
 				for (WptPt wpt : getListStarPoints(g)) {
 					if (wpt.lat >= latLonBounds.bottom && wpt.lat <= latLonBounds.top
 							&& wpt.lon >= latLonBounds.left && wpt.lon <= latLonBounds.right
@@ -1226,7 +1227,7 @@ public class GPXLayer extends OsmandMapLayer implements IContextMenuProvider, IM
 	}
 
 	private void syncGpx(GPXFile gpxFile) {
-		ItineraryGroup group = view.getApplication().getItineraryHelper().getMarkersGroup(gpxFile);
+		MapMarkersGroup group = view.getApplication().getMapMarkersHelper().getMarkersGroup(gpxFile);
 		if (group != null) {
 			view.getApplication().getItineraryHelper().runSynchronization(group);
 		}

From eefe1a00ac229ee39c10ab3becaa33eeb0e520db Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Wed, 21 Apr 2021 15:07:18 +0300
Subject: [PATCH 19/29] Revert "Create ItineraryHelper"

This reverts commit 7218e7d4
---
 .../src/net/osmand/plus/AppInitializer.java   |   2 -
 .../net/osmand/plus/FavouritesDbHelper.java   |   5 +-
 .../net/osmand/plus/GpxSelectionHelper.java   |   6 +-
 .../net/osmand/plus/OsmandApplication.java    |  10 --
 .../plus/itinerary/ItineraryHelper.java       | 152 ------------------
 .../editors/WptPtEditorFragment.java          |   8 +-
 .../editors/WptPtEditorFragmentNew.java       |   8 +-
 .../CoordinateInputDialogFragment.java        |   2 +-
 .../mapmarkers/MapMarkersDialogFragment.java  |   4 +-
 .../plus/mapmarkers/MapMarkersHelper.java     | 135 ++++++++++++++--
 ...ptCategoriesBottomSheetDialogFragment.java |   2 +-
 .../adapters/MapMarkersGroupsAdapter.java     |   2 +-
 .../plus/myplaces/DeletePointsTask.java       |   6 +-
 .../EditTrackGroupDialogFragment.java         |   7 +-
 .../osmand/plus/views/layers/GPXLayer.java    |   2 +-
 15 files changed, 156 insertions(+), 195 deletions(-)
 delete mode 100644 OsmAnd/src/net/osmand/plus/itinerary/ItineraryHelper.java

diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java
index cfcdc737b2..07bb9084e8 100644
--- a/OsmAnd/src/net/osmand/plus/AppInitializer.java
+++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java
@@ -40,7 +40,6 @@ import net.osmand.plus.helpers.DayNightHelper;
 import net.osmand.plus.helpers.LockHelper;
 import net.osmand.plus.helpers.WaypointHelper;
 import net.osmand.plus.inapp.InAppPurchaseHelperImpl;
-import net.osmand.plus.itinerary.ItineraryHelper;
 import net.osmand.plus.liveupdates.LiveUpdatesHelper;
 import net.osmand.plus.mapmarkers.MapMarkersDbHelper;
 import net.osmand.plus.mapmarkers.MapMarkersHelper;
@@ -473,7 +472,6 @@ public class AppInitializer implements IProgress {
 		app.osmOAuthHelper = startupInit(new OsmOAuthHelper(app), OsmOAuthHelper.class);
 		app.oprAuthHelper = startupInit(new OprAuthHelper(app), OprAuthHelper.class);
 		app.onlineRoutingHelper = startupInit(new OnlineRoutingHelper(app), OnlineRoutingHelper.class);
-		app.itineraryHelper = startupInit(new ItineraryHelper(app), ItineraryHelper.class);
 		app.backupHelper = startupInit(new BackupHelper(app), BackupHelper.class);
 
 		initOpeningHoursParser();
diff --git a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
index ca52169e10..42cf1c0d2e 100644
--- a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
+++ b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
@@ -280,9 +280,10 @@ public class FavouritesDbHelper {
 	}
 
 	private void runSyncWithMarkers(FavoriteGroup favGroup) {
-		MapMarkersGroup group = context.getMapMarkersHelper().getMarkersGroup(favGroup);
+		MapMarkersHelper helper = context.getMapMarkersHelper();
+		MapMarkersGroup group = helper.getMarkersGroup(favGroup);
 		if (group != null) {
-			context.getItineraryHelper().runSynchronization(group);
+			helper.runSynchronization(group);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
index 77bcb5e0e7..0eba1b2b1a 100644
--- a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
+++ b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
@@ -31,6 +31,7 @@ import net.osmand.plus.helpers.GpxUiHelper.GPXInfo;
 import net.osmand.plus.helpers.SearchHistoryHelper;
 import net.osmand.plus.helpers.enums.MetricsConstants;
 import net.osmand.plus.mapmarkers.MapMarkersGroup;
+import net.osmand.plus.mapmarkers.MapMarkersHelper;
 import net.osmand.plus.routing.GPXRouteParams.GPXRouteParamsBuilder;
 import net.osmand.plus.track.GpxSplitType;
 import net.osmand.util.Algorithms;
@@ -824,9 +825,10 @@ public class GpxSelectionHelper {
 	}
 
 	private void syncGpxWithMarkers(GPXFile gpxFile) {
-		MapMarkersGroup group = app.getMapMarkersHelper().getMarkersGroup(gpxFile);
+		MapMarkersHelper mapMarkersHelper = app.getMapMarkersHelper();
+		MapMarkersGroup group = mapMarkersHelper.getMarkersGroup(gpxFile);
 		if (group != null) {
-			app.getItineraryHelper().runSynchronization(group);
+			mapMarkersHelper.runSynchronization(group);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
index ddbbd7087e..e6e6539bcb 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
@@ -67,7 +67,6 @@ import net.osmand.plus.helpers.WaypointHelper;
 import net.osmand.plus.helpers.enums.DrivingRegion;
 import net.osmand.plus.helpers.enums.MetricsConstants;
 import net.osmand.plus.inapp.InAppPurchaseHelper;
-import net.osmand.plus.itinerary.ItineraryHelper;
 import net.osmand.plus.mapmarkers.MapMarkersDbHelper;
 import net.osmand.plus.mapmarkers.MapMarkersHelper;
 import net.osmand.plus.measurementtool.MeasurementEditingContext;
@@ -169,7 +168,6 @@ public class OsmandApplication extends MultiDexApplication {
 	OprAuthHelper oprAuthHelper;
 	MeasurementEditingContext measurementEditingContext;
 	OnlineRoutingHelper onlineRoutingHelper;
-	ItineraryHelper itineraryHelper;
 	BackupHelper backupHelper;
 
 	private Map<String, Builder> customRoutingConfigs = new ConcurrentHashMap<>();
@@ -472,14 +470,6 @@ public class OsmandApplication extends MultiDexApplication {
 		return onlineRoutingHelper;
 	}
 
-	public ItineraryHelper getItineraryHelper() {
-		return itineraryHelper;
-	}
-
-	public BackupHelper getBackupHelper() {
-		return backupHelper;
-	}
-
 	public TransportRoutingHelper getTransportRoutingHelper() {
 		return transportRoutingHelper;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/itinerary/ItineraryHelper.java b/OsmAnd/src/net/osmand/plus/itinerary/ItineraryHelper.java
deleted file mode 100644
index 8e3c96a08a..0000000000
--- a/OsmAnd/src/net/osmand/plus/itinerary/ItineraryHelper.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package net.osmand.plus.itinerary;
-
-import android.os.AsyncTask;
-
-import androidx.annotation.NonNull;
-
-import net.osmand.GPXUtilities.GPXFile;
-import net.osmand.GPXUtilities.WptPt;
-import net.osmand.PlatformUtil;
-import net.osmand.data.FavouritePoint;
-import net.osmand.data.LatLon;
-import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
-import net.osmand.plus.GpxSelectionHelper;
-import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
-import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.mapmarkers.MapMarker;
-import net.osmand.plus.mapmarkers.MapMarkersGroup;
-import net.osmand.plus.mapmarkers.MapMarkersHelper;
-import net.osmand.plus.mapmarkers.MapMarkersHelper.OnGroupSyncedListener;
-
-import org.apache.commons.logging.Log;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class ItineraryHelper {
-
-	private static final Log LOG = PlatformUtil.getLog(ItineraryHelper.class);
-
-	private OsmandApplication app;
-
-	private MapMarkersHelper markersHelper;
-
-	private ExecutorService executorService = Executors.newSingleThreadExecutor();
-
-	private Set<OnGroupSyncedListener> syncListeners = new HashSet<>();
-
-	public ItineraryHelper(@NonNull OsmandApplication app) {
-		this.app = app;
-		markersHelper = app.getMapMarkersHelper();
-	}
-
-	public void addSyncListener(OnGroupSyncedListener listener) {
-		syncListeners.add(listener);
-	}
-
-	public void removeSyncListener(OnGroupSyncedListener listener) {
-		syncListeners.remove(listener);
-	}
-
-	public void runSynchronization(final @NonNull MapMarkersGroup group) {
-		app.runInUIThread(new Runnable() {
-			@Override
-			public void run() {
-				new SyncGroupTask(group).executeOnExecutor(executorService);
-			}
-		});
-	}
-
-	private class SyncGroupTask extends AsyncTask<Void, Void, Void> {
-
-		private MapMarkersGroup group;
-
-		SyncGroupTask(MapMarkersGroup group) {
-			this.group = group;
-		}
-
-		@Override
-		protected void onPreExecute() {
-			if (!syncListeners.isEmpty()) {
-				app.runInUIThread(new Runnable() {
-					@Override
-					public void run() {
-						for (OnGroupSyncedListener listener : syncListeners) {
-							listener.onSyncStarted();
-						}
-					}
-				});
-			}
-		}
-
-		@Override
-		protected Void doInBackground(Void... voids) {
-			runGroupSynchronization();
-			return null;
-		}
-
-		// TODO extract method from Asynctask to Helper directly
-		private void runGroupSynchronization() {
-			List<MapMarker> groupMarkers = new ArrayList<>(group.getMarkers());
-			if (group.getType() == MapMarkersGroup.FAVORITES_TYPE) {
-				FavoriteGroup favGroup = app.getFavorites().getGroup(group.getName());
-				if (favGroup == null) {
-					return;
-				}
-				group.setVisible(favGroup.isVisible());
-				if (!group.isVisible() || group.isDisabled()) {
-					markersHelper.removeGroupActiveMarkers(group, true);
-					return;
-				}
-				List<FavouritePoint> points = new ArrayList<>(favGroup.getPoints());
-				for (FavouritePoint fp : points) {
-					markersHelper.addNewMarkerIfNeeded(group, groupMarkers, new LatLon(fp.getLatitude(), fp.getLongitude()), fp.getName(), fp, null);
-				}
-			} else if (group.getType() == MapMarkersGroup.GPX_TYPE) {
-				GpxSelectionHelper gpxHelper = app.getSelectedGpxHelper();
-				File file = new File(group.getId());
-				if (!file.exists()) {
-					return;
-				}
-
-				String gpxPath = group.getId();
-				SelectedGpxFile selectedGpxFile = gpxHelper.getSelectedFileByPath(gpxPath);
-				GPXFile gpx = selectedGpxFile == null ? null : selectedGpxFile.getGpxFile();
-				group.setVisible(gpx != null || group.isVisibleUntilRestart());
-				if (gpx == null || group.isDisabled()) {
-					markersHelper.removeGroupActiveMarkers(group, true);
-					return;
-				}
-
-				boolean addAll = group.getWptCategories() == null || group.getWptCategories().isEmpty();
-				List<WptPt> gpxPoints = new ArrayList<>(gpx.getPoints());
-				for (WptPt pt : gpxPoints) {
-					if (addAll || group.getWptCategories().contains(pt.category)
-							|| (pt.category == null && group.getWptCategories().contains(""))) {
-						markersHelper.addNewMarkerIfNeeded(group, groupMarkers, new LatLon(pt.lat, pt.lon), pt.name, null, pt);
-					}
-				}
-			}
-			markersHelper.removeOldMarkersIfPresent(groupMarkers);
-		}
-
-		@Override
-		protected void onPostExecute(Void aVoid) {
-			if (!syncListeners.isEmpty()) {
-				app.runInUIThread(new Runnable() {
-					@Override
-					public void run() {
-						for (OnGroupSyncedListener listener : syncListeners) {
-							listener.onSyncDone();
-						}
-					}
-				});
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java
index e1c1ac3d61..2d0654301b 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragment.java
@@ -17,6 +17,8 @@ import net.osmand.GPXUtilities.WptPt;
 import net.osmand.data.LatLon;
 import net.osmand.data.WptLocationPoint;
 import net.osmand.plus.GpxSelectionHelper;
+import net.osmand.plus.mapmarkers.MapMarkersHelper;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
@@ -24,7 +26,6 @@ import net.osmand.plus.activities.SavingTrackHelper;
 import net.osmand.plus.base.PointImageDrawable;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.mapcontextmenu.editors.WptPtEditor.OnDismissListener;
-import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.track.SaveGpxAsyncTask;
 import net.osmand.plus.track.SaveGpxAsyncTask.SaveGpxListener;
 import net.osmand.util.Algorithms;
@@ -219,9 +220,10 @@ public class WptPtEditorFragment extends PointEditorFragment {
 	private void syncGpx(GPXFile gpxFile) {
 		OsmandApplication app = getMyApplication();
 		if (app != null) {
-			MapMarkersGroup group = app.getMapMarkersHelper().getMarkersGroup(gpxFile);
+			MapMarkersHelper helper = app.getMapMarkersHelper();
+			MapMarkersGroup group = helper.getMarkersGroup(gpxFile);
 			if (group != null) {
-				app.getItineraryHelper().runSynchronization(group);
+				helper.runSynchronization(group);
 			}
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragmentNew.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragmentNew.java
index 4dea53b0bd..7ecd61565f 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragmentNew.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragmentNew.java
@@ -20,6 +20,8 @@ import net.osmand.data.FavouritePoint.BackgroundType;
 import net.osmand.data.LatLon;
 import net.osmand.data.WptLocationPoint;
 import net.osmand.plus.GpxSelectionHelper;
+import net.osmand.plus.mapmarkers.MapMarkersHelper;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
@@ -29,7 +31,6 @@ import net.osmand.plus.activities.SavingTrackHelper;
 import net.osmand.plus.base.PointImageDrawable;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.mapcontextmenu.editors.WptPtEditor.OnDismissListener;
-import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.track.SaveGpxAsyncTask;
 import net.osmand.plus.track.SaveGpxAsyncTask.SaveGpxListener;
 import net.osmand.util.Algorithms;
@@ -237,9 +238,10 @@ public class WptPtEditorFragmentNew extends PointEditorFragmentNew {
 	private void syncGpx(GPXFile gpxFile) {
 		OsmandApplication app = getMyApplication();
 		if (app != null) {
-			MapMarkersGroup group = app.getMapMarkersHelper().getMarkersGroup(gpxFile);
+			MapMarkersHelper helper = app.getMapMarkersHelper();
+			MapMarkersGroup group = helper.getMarkersGroup(gpxFile);
 			if (group != null) {
-				app.getItineraryHelper().runSynchronization(group);
+				helper.runSynchronization(group);
 			}
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
index 31e477fbf1..96d6f9a8f4 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
@@ -171,7 +171,7 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
 		MapMarkersHelper helper = getMyApplication().getMapMarkersHelper();
 		MapMarkersGroup group = helper.getMarkersGroup(gpxFile);
 		if (group != null) {
-			getMyApplication().getItineraryHelper().runSynchronization(group);
+			helper.runSynchronization(group);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
index ad453d5fe5..f0b226dd1e 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
@@ -218,13 +218,13 @@ public class MapMarkersDialogFragment extends DialogFragment implements OnGroupS
 	@Override
 	public void onResume() {
 		super.onResume();
-		getMyApplication().getItineraryHelper().addSyncListener(this);
+		getMyApplication().getMapMarkersHelper().addSyncListener(this);
 	}
 
 	@Override
 	public void onPause() {
 		super.onPause();
-		getMyApplication().getItineraryHelper().removeSyncListener(this);
+		getMyApplication().getMapMarkersHelper().removeSyncListener(this);
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java
index b8bcddbc5c..51911e8779 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java
@@ -1,5 +1,7 @@
 package net.osmand.plus.mapmarkers;
 
+import android.os.AsyncTask;
+
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -18,6 +20,7 @@ import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
 import net.osmand.plus.GPXDatabase;
 import net.osmand.plus.GeocodingLookupService;
 import net.osmand.plus.GeocodingLookupService.AddressLookupRequest;
+import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
@@ -38,12 +41,15 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import static net.osmand.GPXUtilities.GPX_TIME_FORMAT;
 import static net.osmand.data.PointDescription.POINT_TYPE_MAP_MARKER;
@@ -72,11 +78,14 @@ public class MapMarkersHelper {
 	private OsmandApplication ctx;
 	private MapMarkersDbHelper markersDbHelper;
 
+	private ExecutorService executorService = Executors.newSingleThreadExecutor();
+
 	private List<MapMarker> mapMarkers = new ArrayList<>();
 	private List<MapMarker> mapMarkersHistory = new ArrayList<>();
 	private List<MapMarkersGroup> mapMarkersGroups = new ArrayList<>();
 
 	private List<MapMarkerChangedListener> listeners = new ArrayList<>();
+	private Set<OnGroupSyncedListener> syncListeners = new HashSet<>();
 
 	private MarkersPlanRouteContext planRouteContext;
 
@@ -177,7 +186,7 @@ public class MapMarkersHelper {
 	public void syncAllGroupsAsync() {
 		for (MapMarkersGroup gr : mapMarkersGroups) {
 			if (gr.getId() != null && gr.getName() != null) {
-				ctx.getItineraryHelper().runSynchronization(gr);
+				runSynchronization(gr);
 			}
 		}
 	}
@@ -294,6 +303,15 @@ public class MapMarkersHelper {
 		});
 	}
 
+	public void runSynchronization(final @NonNull MapMarkersGroup group) {
+		ctx.runInUIThread(new Runnable() {
+			@Override
+			public void run() {
+				new SyncGroupTask(group).executeOnExecutor(executorService);
+			}
+		});
+	}
+
 	public MapMarkersGroup getMarkersGroup(GPXFile gpx) {
 		if (gpx == null || gpx.path == null) {
 			return null;
@@ -345,7 +363,7 @@ public class MapMarkersHelper {
 		if (gr.isDisabled()) {
 			updateGroupDisabled(gr, false);
 		}
-		ctx.getItineraryHelper().runSynchronization(gr);
+		runSynchronization(gr);
 	}
 
 	private void addGroupInternally(MapMarkersGroup gr) {
@@ -397,7 +415,7 @@ public class MapMarkersHelper {
 		}
 	}
 
-	public void removeGroupActiveMarkers(MapMarkersGroup group, boolean updateGroup) {
+	private void removeGroupActiveMarkers(MapMarkersGroup group, boolean updateGroup) {
 		if (group != null) {
 			markersDbHelper.removeActiveMarkersFromGroup(group.getId());
 			removeFromMapMarkersList(group.getActiveMarkers());
@@ -618,12 +636,12 @@ public class MapMarkersHelper {
 		return null;
 	}
 
-	public void addNewMarkerIfNeeded(@NonNull MapMarkersGroup group,
-									 @NonNull List<MapMarker> groupMarkers,
-									 @NonNull LatLon latLon,
-									 @NonNull String name,
-									 @Nullable FavouritePoint favouritePoint,
-									 @Nullable WptPt wptPt) {
+	private void addNewMarkerIfNeeded(@NonNull MapMarkersGroup group,
+									  @NonNull List<MapMarker> groupMarkers,
+									  @NonNull LatLon latLon,
+									  @NonNull String name,
+									  @Nullable FavouritePoint favouritePoint,
+									  @Nullable WptPt wptPt) {
 		boolean exists = false;
 
 		Iterator<MapMarker> iterator = groupMarkers.iterator();
@@ -653,7 +671,7 @@ public class MapMarkersHelper {
 		}
 	}
 
-	public void removeOldMarkersIfPresent(List<MapMarker> markers) {
+	private void removeOldMarkersIfPresent(List<MapMarker> markers) {
 		if (!markers.isEmpty()) {
 			boolean needRefresh = false;
 			for (MapMarker marker : markers) {
@@ -952,6 +970,14 @@ public class MapMarkersHelper {
 		}
 	}
 
+	public void addSyncListener(OnGroupSyncedListener listener) {
+		syncListeners.add(listener);
+	}
+
+	public void removeSyncListener(OnGroupSyncedListener listener) {
+		syncListeners.remove(listener);
+	}
+
 	public void addListener(MapMarkerChangedListener l) {
 		if (!listeners.contains(l)) {
 			listeners.add(l);
@@ -1168,4 +1194,93 @@ public class MapMarkersHelper {
 
 		void onSyncDone();
 	}
+
+	private class SyncGroupTask extends AsyncTask<Void, Void, Void> {
+
+		private MapMarkersGroup group;
+
+		SyncGroupTask(MapMarkersGroup group) {
+			this.group = group;
+		}
+
+		@Override
+		protected void onPreExecute() {
+			if (!syncListeners.isEmpty()) {
+				ctx.runInUIThread(new Runnable() {
+					@Override
+					public void run() {
+						for (OnGroupSyncedListener listener : syncListeners) {
+							listener.onSyncStarted();
+						}
+					}
+				});
+			}
+		}
+
+		@Override
+		protected Void doInBackground(Void... voids) {
+			runGroupSynchronization();
+			return null;
+		}
+
+		// TODO extract method from Asynctask to Helper directly
+		private void runGroupSynchronization() {
+			List<MapMarker> groupMarkers = new ArrayList<>(group.getMarkers());
+			if (group.getType() == MapMarkersGroup.FAVORITES_TYPE) {
+				FavoriteGroup favGroup = ctx.getFavorites().getGroup(group.getName());
+				if (favGroup == null) {
+					return;
+				}
+				group.setVisible(favGroup.isVisible());
+				if (!group.isVisible() || group.isDisabled()) {
+					removeGroupActiveMarkers(group, true);
+					return;
+				}
+				List<FavouritePoint> points = new ArrayList<>(favGroup.getPoints());
+				for (FavouritePoint fp : points) {
+					addNewMarkerIfNeeded(group, groupMarkers, new LatLon(fp.getLatitude(), fp.getLongitude()), fp.getName(), fp, null);
+				}
+			} else if (group.getType() == MapMarkersGroup.GPX_TYPE) {
+				GpxSelectionHelper gpxHelper = ctx.getSelectedGpxHelper();
+				File file = new File(group.getId());
+				if (!file.exists()) {
+					return;
+				}
+
+				String gpxPath = group.getId();
+				SelectedGpxFile selectedGpxFile = gpxHelper.getSelectedFileByPath(gpxPath);
+				GPXFile gpx = selectedGpxFile == null ? null : selectedGpxFile.getGpxFile();
+				group.setVisible(gpx != null || group.isVisibleUntilRestart());
+				if (gpx == null || group.isDisabled()) {
+					removeGroupActiveMarkers(group, true);
+					return;
+				}
+
+				boolean addAll = group.getWptCategories() == null || group.getWptCategories().isEmpty();
+				List<WptPt> gpxPoints = new ArrayList<>(gpx.getPoints());
+				for (WptPt pt : gpxPoints) {
+					if (addAll || group.getWptCategories().contains(pt.category)
+							|| (pt.category == null && group.getWptCategories().contains(""))) {
+						addNewMarkerIfNeeded(group, groupMarkers, new LatLon(pt.lat, pt.lon), pt.name, null, pt);
+					}
+				}
+			}
+
+			removeOldMarkersIfPresent(groupMarkers);
+		}
+
+		@Override
+		protected void onPostExecute(Void aVoid) {
+			if (!syncListeners.isEmpty()) {
+				ctx.runInUIThread(new Runnable() {
+					@Override
+					public void run() {
+						for (OnGroupSyncedListener listener : syncListeners) {
+							listener.onSyncDone();
+						}
+					}
+				});
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java
index 1f86a94a1d..08db4d40fc 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java
@@ -147,7 +147,7 @@ public class SelectWptCategoriesBottomSheetDialogFragment extends MenuBottomShee
 			group = mapMarkersHelper.addOrEnableGroup(gpxFile);
 		}
 		mapMarkersHelper.updateGroupWptCategories(group, selectedCategories);
-		app.getItineraryHelper().runSynchronization(group);
+		mapMarkersHelper.runSynchronization(group);
 	}
 
 	private boolean isAllChecked() {
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
index 4992ee88be..fb74956b16 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
@@ -478,7 +478,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 						if(!disabled) {
 							mapMarkersHelper.enableGroup(group);
 						} else {
-							app.getItineraryHelper().runSynchronization(group);
+							mapMarkersHelper.runSynchronization(group);
 						}
 
 						if (disabled) {
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/DeletePointsTask.java b/OsmAnd/src/net/osmand/plus/myplaces/DeletePointsTask.java
index c9d9d4c423..996d52cfec 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/DeletePointsTask.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/DeletePointsTask.java
@@ -9,6 +9,7 @@ import net.osmand.plus.GpxSelectionHelper.GpxDisplayItemType;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.activities.SavingTrackHelper;
 import net.osmand.plus.mapmarkers.MapMarkersGroup;
+import net.osmand.plus.mapmarkers.MapMarkersHelper;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
@@ -64,9 +65,10 @@ public class DeletePointsTask extends AsyncTask<Void, Void, Void> {
 	}
 
 	private void syncGpx(GPXFile gpxFile) {
-		MapMarkersGroup group = app.getMapMarkersHelper().getMarkersGroup(gpxFile);
+		MapMarkersHelper helper = app.getMapMarkersHelper();
+		MapMarkersGroup group = helper.getMarkersGroup(gpxFile);
 		if (group != null) {
-			app.getItineraryHelper().runSynchronization(group);
+			helper.runSynchronization(group);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/EditTrackGroupDialogFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/EditTrackGroupDialogFragment.java
index b3ff9b91bd..674ee76042 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/EditTrackGroupDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/EditTrackGroupDialogFragment.java
@@ -236,7 +236,7 @@ public class EditTrackGroupDialogFragment extends MenuBottomSheetDialogFragment
 		} else {
 			mapMarkersHelper.updateGroupWptCategories(markersGroup, selectedCategories);
 			if (!groupCreated) {
-				app.getItineraryHelper().runSynchronization(markersGroup);
+				mapMarkersHelper.runSynchronization(markersGroup);
 			}
 		}
 	}
@@ -524,9 +524,10 @@ public class EditTrackGroupDialogFragment extends MenuBottomSheetDialogFragment
 		}
 
 		private void syncGpx(GPXFile gpxFile) {
-			MapMarkersGroup group = app.getMapMarkersHelper().getMarkersGroup(gpxFile);
+			MapMarkersHelper markersHelper = app.getMapMarkersHelper();
+			MapMarkersGroup group = markersHelper.getMarkersGroup(gpxFile);
 			if (group != null) {
-				app.getItineraryHelper().runSynchronization(group);
+				markersHelper.runSynchronization(group);
 			}
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
index 99d4d41c81..b26940ff7b 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
@@ -1229,7 +1229,7 @@ public class GPXLayer extends OsmandMapLayer implements IContextMenuProvider, IM
 	private void syncGpx(GPXFile gpxFile) {
 		MapMarkersGroup group = view.getApplication().getMapMarkersHelper().getMarkersGroup(gpxFile);
 		if (group != null) {
-			view.getApplication().getItineraryHelper().runSynchronization(group);
+			mapMarkersHelper.runSynchronization(group);
 		}
 	}
 

From 7f795a4e439f2ceaa635b6efbfdec3d572d7fec1 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Wed, 21 Apr 2021 15:11:31 +0300
Subject: [PATCH 20/29] Fix compilation

---
 OsmAnd/src/net/osmand/plus/OsmandApplication.java     | 4 ++++
 OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
index e6e6539bcb..cd3fa4b5ad 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
@@ -470,6 +470,10 @@ public class OsmandApplication extends MultiDexApplication {
 		return onlineRoutingHelper;
 	}
 
+	public BackupHelper getBackupHelper() {
+		return backupHelper;
+	}
+
 	public TransportRoutingHelper getTransportRoutingHelper() {
 		return transportRoutingHelper;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
index b26940ff7b..84a1483834 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java
@@ -44,7 +44,6 @@ import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.PointImageDrawable;
-import net.osmand.plus.itinerary.ItineraryGroup;
 import net.osmand.plus.mapcontextmenu.controllers.SelectedGpxMenuController.SelectedGpxPoint;
 import net.osmand.plus.mapcontextmenu.other.TrackChartPoints;
 import net.osmand.plus.mapmarkers.MapMarker;

From c40eb96bd751dd2b4513c512f13804218b289191 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 19 Apr 2021 13:46:14 +0200
Subject: [PATCH 21/29] Remove CategoriesSubHeader

---
 .../plus/mapmarkers/CategoriesSubHeader.java  | 20 -------------------
 .../plus/mapmarkers/MapMarkersGroup.java      |  9 ---------
 .../plus/mapmarkers/MapMarkersHelper.java     |  5 -----
 .../adapters/MapMarkersGroupsAdapter.java     | 17 ++++++++++++++--
 4 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CategoriesSubHeader.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CategoriesSubHeader.java
index aef2f28afd..47353e409f 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/CategoriesSubHeader.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CategoriesSubHeader.java
@@ -2,23 +2,3 @@ package net.osmand.plus.mapmarkers;
 
 import androidx.annotation.DrawableRes;
 
-public class CategoriesSubHeader {
-
-	@DrawableRes
-	private int iconRes;
-	private MapMarkersGroup group;
-
-	public CategoriesSubHeader(int iconRes, MapMarkersGroup group) {
-		this.iconRes = iconRes;
-		this.group = group;
-	}
-
-	@DrawableRes
-	public int getIconRes() {
-		return iconRes;
-	}
-
-	public MapMarkersGroup getGroup() {
-		return group;
-	}
-}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersGroup.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersGroup.java
index 2a97af91c8..35a4585501 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersGroup.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersGroup.java
@@ -31,7 +31,6 @@ public class MapMarkersGroup {
 	private TravelArticle wikivoyageArticle;
 	// TODO should be removed from this class:
 	private GroupHeader header;
-	private CategoriesSubHeader categoriesSubHeader;
 	private ShowHideHistoryButton showHideHistoryButton;
 
 	public MapMarkersGroup() {
@@ -76,10 +75,6 @@ public class MapMarkersGroup {
 		this.header = header;
 	}
 
-	public void setCategoriesSubHeader(CategoriesSubHeader categoriesSubHeader) {
-		this.categoriesSubHeader = categoriesSubHeader;
-	}
-
 	public void setShowHideHistoryButton(ShowHideHistoryButton showHideHistoryButton) {
 		this.showHideHistoryButton = showHideHistoryButton;
 	}
@@ -144,10 +139,6 @@ public class MapMarkersGroup {
 		return header;
 	}
 
-	public CategoriesSubHeader getCategoriesSubHeader() {
-		return categoriesSubHeader;
-	}
-
 	public ShowHideHistoryButton getShowHideHistoryButton() {
 		return showHideHistoryButton;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java
index 51911e8779..729a7f3cfd 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersHelper.java
@@ -481,17 +481,12 @@ public class MapMarkersHelper {
 	private void createHeadersInGroup(@NonNull MapMarkersGroup group) {
 		int type = group.getType();
 		int headerIconId = 0;
-		int subHeaderIconId = 0;
 		if (type != -1) {
 			headerIconId = type == MapMarkersGroup.FAVORITES_TYPE
 					? R.drawable.ic_action_favorite : R.drawable.ic_action_polygom_dark;
-			subHeaderIconId = R.drawable.ic_action_filter;
 		}
 		GroupHeader header = new GroupHeader(headerIconId, group);
-		CategoriesSubHeader categoriesSubHeader = new CategoriesSubHeader(subHeaderIconId, group);
-
 		group.setHeader(header);
-		group.setCategoriesSubHeader(categoriesSubHeader);
 	}
 
 	private void removeMarkerFromGroup(MapMarker marker) {
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
index fb74956b16..5cb3078e8e 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
@@ -21,7 +21,6 @@ import net.osmand.IndexConstants;
 import net.osmand.data.LatLon;
 import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
-import net.osmand.plus.mapmarkers.CategoriesSubHeader;
 import net.osmand.plus.mapmarkers.MapMarkersHelper;
 import net.osmand.plus.mapmarkers.GroupHeader;
 import net.osmand.plus.mapmarkers.MapMarker;
@@ -160,7 +159,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 				items.add(header);
 				if (!group.isDisabled()) {
 					if (group.getWptCategories() != null && !group.getWptCategories().isEmpty()) {
-						CategoriesSubHeader categoriesSubHeader = group.getCategoriesSubHeader();
+						CategoriesSubHeader categoriesSubHeader = new CategoriesSubHeader(group);
 						items.add(categoriesSubHeader);
 					}
 					TravelHelper travelHelper = mapActivity.getMyApplication().getTravelHelper();
@@ -627,6 +626,20 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 		return monthStr;
 	}
 
+	public class CategoriesSubHeader {
+
+		private MapMarkersGroup group;
+
+		public CategoriesSubHeader(MapMarkersGroup group) {
+			this.group = group;
+		}
+
+		public MapMarkersGroup getGroup() {
+			return group;
+		}
+	}
+
+
 	public interface MapMarkersGroupsAdapterListener {
 
 		void onItemClick(View view);

From 560c22927708215fd0522d820b33b2058eb5671a Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 19 Apr 2021 14:45:45 +0200
Subject: [PATCH 22/29] Refactor group markers

---
 .../adapters/MapMarkersGroupsAdapter.java     | 156 +++++++++++-------
 1 file changed, 96 insertions(+), 60 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
index 5cb3078e8e..2f4928e5d5 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
@@ -7,8 +7,10 @@ import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
 
+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
@@ -36,6 +38,7 @@ import net.osmand.plus.mapmarkers.SelectWptCategoriesBottomSheetDialogFragment;
 import net.osmand.plus.wikivoyage.article.WikivoyageArticleDialogFragment;
 import net.osmand.plus.wikivoyage.data.TravelArticle;
 import net.osmand.plus.wikivoyage.data.TravelHelper;
+import net.osmand.util.Algorithms;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
@@ -54,10 +57,6 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 	private static final int SHOW_HIDE_HISTORY_TYPE = 3;
 	private static final int CATEGORIES_TYPE = 4;
 
-	private static final int TODAY_HEADER = 56;
-	private static final int YESTERDAY_HEADER = 57;
-	private static final int LAST_SEVEN_DAYS_HEADER = 58;
-	private static final int THIS_YEAR_HEADER = 59;
 
 	private MapActivity mapActivity;
 	private OsmandApplication app;
@@ -107,50 +106,85 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 		List<MapMarkersGroup> groups = new ArrayList<>(helper.getMapMarkersGroups());
 		groups.addAll(helper.getGroupsForDisplayedGpx());
 		groups.addAll(helper.getGroupsForSavedArticlesTravelBook());
+
+		// evaluate time constants
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+		long currentTimeMillis = System.currentTimeMillis();
+		Calendar currentDateCalendar = Calendar.getInstance();
+		currentDateCalendar.setTimeInMillis(currentTimeMillis);
+		// evaluate today, yesterday, last 7 days
+		String today = dateFormat.format(currentDateCalendar.getTime());
+		currentDateCalendar.add(Calendar.DAY_OF_YEAR, -1);
+		String yesterday = dateFormat.format(currentDateCalendar.getTime());
+		currentDateCalendar.set(Calendar.HOUR_OF_DAY, 0);
+		currentDateCalendar.set(Calendar.MINUTE, 0);
+		currentDateCalendar.add(Calendar.DAY_OF_YEAR, -6);
+		long last7Days = currentDateCalendar.getTimeInMillis();
+		// evaluate this year & last 3 months
+		currentDateCalendar.setTimeInMillis(currentTimeMillis);
+		String thisYear = dateFormat.format(currentDateCalendar.getTime()).substring(0, 5);
+		currentDateCalendar.add(Calendar.MONTH, -1);
+		String monthMinus1 = dateFormat.format(currentDateCalendar.getTime()).substring(0, 8);
+		currentDateCalendar.add(Calendar.MONTH, -1);
+		String monthMinus2 = dateFormat.format(currentDateCalendar.getTime()).substring(0, 8);
+		currentDateCalendar.add(Calendar.MONTH, -1);
+		String monthMinus3 = dateFormat.format(currentDateCalendar.getTime()).substring(0, 8);
+
+
+		Calendar markerCalendar = Calendar.getInstance();
+
 		for (int i = 0; i < groups.size(); i++) {
 			MapMarkersGroup group = groups.get(i);
 			if (!group.isVisible()) {
 				continue;
 			}
 			String markerGroupName = group.getName();
-			if (markerGroupName == null) {
-				int previousDateHeader = -1;
-				int monthsDisplayed = 0;
 
-				Calendar currentDateCalendar = Calendar.getInstance();
-				currentDateCalendar.setTimeInMillis(System.currentTimeMillis());
-				int currentDay = currentDateCalendar.get(Calendar.DAY_OF_YEAR);
-				int currentMonth = currentDateCalendar.get(Calendar.MONTH);
-				int currentYear = currentDateCalendar.get(Calendar.YEAR);
-				Calendar markerCalendar = Calendar.getInstance();
+			if (markerGroupName == null) {
+				int previousGroupDateId = 0;
+				int monthsDisplayed = 0;
 				List<MapMarker> groupMarkers = group.getActiveMarkers();
 				for (int j = 0; j < groupMarkers.size(); j++) {
 					MapMarker marker = groupMarkers.get(j);
-					markerCalendar.setTimeInMillis(marker.creationDate);
-					int markerDay = markerCalendar.get(Calendar.DAY_OF_YEAR);
-					int markerMonth = markerCalendar.get(Calendar.MONTH);
-					int markerYear = markerCalendar.get(Calendar.YEAR);
-					if (markerYear == currentYear) {
-						if (markerDay == currentDay && previousDateHeader != TODAY_HEADER) {
-							items.add(TODAY_HEADER);
-							previousDateHeader = TODAY_HEADER;
-						} else if (markerDay == currentDay - 1 && previousDateHeader != YESTERDAY_HEADER) {
-							items.add(YESTERDAY_HEADER);
-							previousDateHeader = YESTERDAY_HEADER;
-						} else if (currentDay - markerDay >= 2 && currentDay - markerDay <= 8 && previousDateHeader != LAST_SEVEN_DAYS_HEADER) {
-							items.add(LAST_SEVEN_DAYS_HEADER);
-							previousDateHeader = LAST_SEVEN_DAYS_HEADER;
-						} else if (currentDay - markerDay > 8 && monthsDisplayed < 3 && previousDateHeader != markerMonth) {
-							items.add(markerMonth);
-							previousDateHeader = markerMonth;
-							monthsDisplayed += 1;
-						} else if (currentMonth - markerMonth >= 4 && previousDateHeader != markerMonth && previousDateHeader != THIS_YEAR_HEADER) {
-							items.add(THIS_YEAR_HEADER);
-							previousDateHeader = THIS_YEAR_HEADER;
+					String markerDate = dateFormat.format(new Date(marker.creationDate));
+					int currentGroupDateId;
+					MarkerGroupItem currentGroupItem = null ;
+					if (marker.creationDate >= currentTimeMillis || (today.equals(markerDate))) {
+						currentGroupDateId = -1;
+						currentGroupItem = MarkerGroupItem.TODAY_HEADER;
+					} else if (yesterday.equals(markerDate)) {
+						currentGroupDateId = -2;
+						currentGroupItem = MarkerGroupItem.YESTERDAY_HEADER;
+					} else if (marker.creationDate >= last7Days) {
+						currentGroupDateId = -3;
+						currentGroupItem = MarkerGroupItem.LAST_SEVEN_DAYS_HEADER;
+					} else if (markerDate.startsWith(monthMinus1)) {
+						currentGroupDateId = -5;
+					} else if (markerDate.startsWith(monthMinus2)) {
+						currentGroupDateId = -6;
+					} else if (markerDate.startsWith(monthMinus3)) {
+						currentGroupDateId = -7;
+					} else if (markerDate.startsWith(thisYear)) {
+						currentGroupItem = MarkerGroupItem.THIS_YEAR_HEADER;
+						currentGroupDateId = -4;
+					} else {
+						markerCalendar.setTimeInMillis(marker.creationDate);
+						currentGroupDateId = markerCalendar.get(Calendar.YEAR);
+					}
+					if (previousGroupDateId != currentGroupDateId) {
+						if (currentGroupItem != null) {
+							items.add(currentGroupItem);
+						} else if(currentGroupDateId < 0) {
+							SimpleDateFormat monthdateFormat = new SimpleDateFormat("LLLL", Locale.getDefault());
+							String monthStr = monthdateFormat.format(new Date(marker.creationDate));
+							if (monthStr.length() > 1) {
+								monthStr = Algorithms.capitalizeFirstLetter(monthStr);
+							}
+							items.add(new MarkerGroupItem(monthStr));
+						} else {
+							items.add(new MarkerGroupItem(currentGroupDateId + ""));
 						}
-					} else if (previousDateHeader != markerYear) {
-						items.add(markerYear);
-						previousDateHeader = markerYear;
+						previousGroupDateId = currentGroupDateId;
 					}
 					items.add(marker);
 				}
@@ -379,23 +413,10 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 			final MapMarkerHeaderViewHolder headerViewHolder = (MapMarkerHeaderViewHolder) holder;
 			final Object header = getItem(position);
 			String headerString;
-			if (header instanceof Integer) {
+			if (header instanceof MarkerGroupItem) {
 				headerViewHolder.icon.setVisibility(View.GONE);
 				headerViewHolder.iconSpace.setVisibility(View.VISIBLE);
-				Integer dateHeader = (Integer) header;
-				if (dateHeader == TODAY_HEADER) {
-					headerString = app.getString(R.string.today);
-				} else if (dateHeader == YESTERDAY_HEADER) {
-					headerString = app.getString(R.string.yesterday);
-				} else if (dateHeader == LAST_SEVEN_DAYS_HEADER) {
-					headerString = app.getString(R.string.last_seven_days);
-				} else if (dateHeader == THIS_YEAR_HEADER) {
-					headerString = app.getString(R.string.this_year);
-				} else if (dateHeader / 100 == 0) {
-					headerString = getMonth(dateHeader);
-				} else {
-					headerString = String.valueOf(dateHeader);
-				}
+				headerString = ((MarkerGroupItem) header).getName(app);
 				headerViewHolder.disableGroupSwitch.setVisibility(View.GONE);
 				headerViewHolder.articleDescription.setVisibility(View.GONE);
 			} else if (header instanceof GroupHeader) {
@@ -615,15 +636,30 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 		return items.get(position);
 	}
 
-	private String getMonth(int month) {
-		SimpleDateFormat dateFormat = new SimpleDateFormat("LLLL", Locale.getDefault());
-		Date date = new Date();
-		date.setMonth(month);
-		String monthStr = dateFormat.format(date);
-		if (monthStr.length() > 1) {
-			monthStr = Character.toUpperCase(monthStr.charAt(0)) + monthStr.substring(1);
+
+	public static class MarkerGroupItem {
+
+		static final MarkerGroupItem TODAY_HEADER = new MarkerGroupItem(R.string.today);
+		static final MarkerGroupItem YESTERDAY_HEADER = new MarkerGroupItem(R.string.yesterday);
+		static final MarkerGroupItem LAST_SEVEN_DAYS_HEADER = new MarkerGroupItem(R.string.last_seven_days);
+		static final MarkerGroupItem THIS_YEAR_HEADER = new MarkerGroupItem(R.string.this_year);
+		private @StringRes int iname;
+		protected String name;
+
+		public MarkerGroupItem(@StringRes int name) {
+			this.iname = name;
+		}
+
+		public MarkerGroupItem(String name) {
+			this.name = name;
+		}
+
+		public String getName(OsmandApplication app) {
+			if (name == null && iname != 0) {
+				name = app.getString(iname);
+			}
+			return name;
 		}
-		return monthStr;
 	}
 
 	public class CategoriesSubHeader {

From 72ca4055fca9f1b5bb5b3af45e605ba4f7acd3bc Mon Sep 17 00:00:00 2001
From: vshcherb <victor.shcherb@gmail.com>
Date: Thu, 22 Apr 2021 10:04:09 +0200
Subject: [PATCH 23/29] Update OsmandSettings.java

---
 .../src/net/osmand/plus/settings/backend/OsmandSettings.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
index 5b770bafda..b3f23444eb 100644
--- a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
@@ -958,7 +958,7 @@ public class OsmandSettings {
 		DEFAULT_SPEED.setModeDefaultValue(ApplicationMode.BICYCLE, 2.77f);
 		DEFAULT_SPEED.setModeDefaultValue(ApplicationMode.PEDESTRIAN, 1.11f);
 		DEFAULT_SPEED.setModeDefaultValue(ApplicationMode.BOAT, 1.38f);
-		DEFAULT_SPEED.setModeDefaultValue(ApplicationMode.AIRCRAFT, 40f);
+		DEFAULT_SPEED.setModeDefaultValue(ApplicationMode.AIRCRAFT, 200f);
 		DEFAULT_SPEED.setModeDefaultValue(ApplicationMode.SKI, 1.38f);
 	}
 
@@ -2888,4 +2888,4 @@ public class OsmandSettings {
 			setPreference(QUICK_ACTION.getId(), actionState, mode);
 		}
 	}
-}
\ No newline at end of file
+}

From 32dff8b9e202cff936745135df84cc44345f01b2 Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Thu, 22 Apr 2021 13:02:16 +0300
Subject: [PATCH 24/29] Fix #11362 name of underground station

---
 .../controllers/TransportStopController.java  | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController.java
index 2337031400..5a7ac0d665 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/TransportStopController.java
@@ -189,7 +189,24 @@ public class TransportStopController extends MenuController {
 		}
 	}
 
-	private static void sortTransportStops(@NonNull LatLon latLon, List<TransportStop> transportStops) {
+	private static void sortTransportStopsExits(@NonNull LatLon latLon, @NonNull List<TransportStop> transportStops) {
+		for (TransportStop transportStop : transportStops) {
+			for (TransportStopExit exit : transportStop.getExits()) {
+				int distance = (int) MapUtils.getDistance(latLon, exit.getLocation());
+				if (transportStop.distance > distance) {
+					transportStop.distance = distance;
+				}
+			}
+		}
+		Collections.sort(transportStops, new Comparator<TransportStop>() {
+			@Override
+			public int compare(TransportStop s1, TransportStop s2) {
+				return Algorithms.compare(s1.distance, s2.distance);
+			}
+		});
+	}
+
+	private static void sortTransportStops(@NonNull LatLon latLon, @NonNull List<TransportStop> transportStops) {
 		for (TransportStop transportStop : transportStops) {
 			transportStop.distance = (int) MapUtils.getDistance(latLon, transportStop.getLocation());
 		}
@@ -227,6 +244,8 @@ public class TransportStopController extends MenuController {
 
 		if (isSubwayEntrance) {
 			stopAggregated = processTransportStopsForAmenity(transportStops, amenity);
+			sortTransportStopsExits(loc, stopAggregated.getLocalTransportStops());
+			sortTransportStopsExits(loc, stopAggregated.getNearbyTransportStops());
 		} else {
 			stopAggregated = new TransportStopAggregated();
 			stopAggregated.setAmenity(amenity);

From 1ac919b8d32c5b4f3038928b0e0365e4b367e132 Mon Sep 17 00:00:00 2001
From: nazar-kutz <vitaminkuna@gmail.com>
Date: Thu, 22 Apr 2021 14:12:49 +0300
Subject: [PATCH 25/29] RTL: fix Live Updates screen

---
 OsmAnd/res/drawable/rectangle_rounded_left.xml        |  7 +++++++
 OsmAnd/res/drawable/ripple_rectangle_rounded_left.xml | 11 +++++++++++
 OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java    |  3 +++
 .../osmand/plus/liveupdates/LiveUpdatesFragment.java  |  8 ++++----
 .../bottomsheets/BooleanPreferenceBottomSheet.java    |  8 +++++---
 5 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 OsmAnd/res/drawable/rectangle_rounded_left.xml
 create mode 100644 OsmAnd/res/drawable/ripple_rectangle_rounded_left.xml

diff --git a/OsmAnd/res/drawable/rectangle_rounded_left.xml b/OsmAnd/res/drawable/rectangle_rounded_left.xml
new file mode 100644
index 0000000000..56b3235c6c
--- /dev/null
+++ b/OsmAnd/res/drawable/rectangle_rounded_left.xml
@@ -0,0 +1,7 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:bottomLeftRadius="@dimen/list_item_button_padding"
+        android:topLeftRadius="@dimen/list_item_button_padding" />
+    <solid android:color="@color/list_background_color_dark" />
+</shape>
diff --git a/OsmAnd/res/drawable/ripple_rectangle_rounded_left.xml b/OsmAnd/res/drawable/ripple_rectangle_rounded_left.xml
new file mode 100644
index 0000000000..c63df94daf
--- /dev/null
+++ b/OsmAnd/res/drawable/ripple_rectangle_rounded_left.xml
@@ -0,0 +1,11 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/active_buttons_and_links_trans_light">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <corners
+                android:bottomLeftRadius="@dimen/list_item_button_padding"
+                android:topLeftRadius="@dimen/list_item_button_padding" />
+            <solid android:color="@color/active_color_primary_light" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
index 5fdea403d3..8b3fc01882 100644
--- a/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
@@ -445,6 +445,9 @@ public class ContextMenuAdapter {
 				ImageView imageView = (ImageView) convertView.findViewById(R.id.secondary_icon);
 				imageView.setImageDrawable(drawable);
 				imageView.setVisibility(View.VISIBLE);
+				if (secondaryDrawable == R.drawable.ic_action_additional_option) {
+					UiUtilities.rotateImageByLayoutDirection(imageView);
+				}
 			} else {
 				ImageView imageView = (ImageView) convertView.findViewById(R.id.secondary_icon);
 				if (imageView != null) {
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
index c4fa160e08..7bebeda1f2 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
@@ -275,16 +275,14 @@ public class LiveUpdatesFragment extends BaseOsmAndDialogFragment implements OnL
 		TextViewEx toolbarTitle = (TextViewEx) toolbar.findViewById(R.id.toolbar_title);
 		toolbarTitle.setText(R.string.osm_live);
 
-		View closeButton = toolbar.findViewById(R.id.close_button);
+		ImageView closeButton = (ImageView) toolbar.findViewById(R.id.close_button);
+		UiUtilities.rotateImageByLayoutDirection(closeButton);
 		closeButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				dismiss();
 			}
 		});
-		if (closeButton instanceof ImageView) {
-			UiUtilities.rotateImageByLayoutDirection((ImageView) closeButton);
-		}
 
 		FrameLayout iconHelpContainer = toolbar.findViewById(R.id.action_button);
 		int iconColorResId = nightMode ? R.color.active_buttons_and_links_text_dark : R.color.active_buttons_and_links_text_light;
@@ -443,6 +441,8 @@ public class LiveUpdatesFragment extends BaseOsmAndDialogFragment implements OnL
 								 boolean isLastChild, View convertView, ViewGroup parent) {
 			LayoutInflater inflater = UiUtilities.getInflater(app, nightMode);
 			convertView = inflater.inflate(R.layout.list_item_triple_row_icon_and_menu, parent, false);
+			ImageView secondaryIcon = (ImageView) convertView.findViewById(R.id.secondary_icon);
+			UiUtilities.rotateImageByLayoutDirection(secondaryIcon);
 			LiveMapsViewHolder viewHolder = new LiveMapsViewHolder(convertView);
 			convertView.setTag(viewHolder);
 			viewHolder.bindLocalIndexInfo(getChild(groupPosition, childPosition).getFileName());
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java
index 858e32c962..1fd19e00c1 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanPreferenceBottomSheet.java
@@ -134,6 +134,7 @@ public class BooleanPreferenceBottomSheet extends BasePreferenceBottomSheet {
 
 	public static void updateCustomButtonView(OsmandApplication app, ApplicationMode mode, View customView, boolean checked, boolean nightMode) {
 		Context themedCtx = UiUtilities.getThemedContext(app, nightMode);
+		boolean isLayoutRtl = AndroidUtils.isLayoutRtl(themedCtx);
 		LinearLayout buttonView = customView.findViewById(R.id.button_container);
 
 		int bgColor;
@@ -149,10 +150,11 @@ public class BooleanPreferenceBottomSheet extends BasePreferenceBottomSheet {
 					ContextCompat.getColor(app, getActivePrimaryColorId(nightMode)), checked ? 0.3f : 0.5f);
 		}
 
-		int bgResId = R.drawable.rectangle_rounded_right;
+		int bgResId = isLayoutRtl ? R.drawable.rectangle_rounded_left : R.drawable.rectangle_rounded_right;
 		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
-			int selectableResId = R.drawable.ripple_rectangle_rounded_right;
-
+			int selectableResId = isLayoutRtl ?
+					R.drawable.ripple_rectangle_rounded_left :
+					R.drawable.ripple_rectangle_rounded_right;
 			Drawable bgDrawable = app.getUIUtilities().getPaintedIcon(bgResId, bgColor);
 			Drawable selectable = app.getUIUtilities().getPaintedIcon(selectableResId, selectedColor);
 			Drawable[] layers = {bgDrawable, selectable};

From 42604ac3b619d83c02c6bcf63241e02b4a9217af Mon Sep 17 00:00:00 2001
From: nazar-kutz <vitaminkuna@gmail.com>
Date: Thu, 22 Apr 2021 15:02:10 +0300
Subject: [PATCH 26/29] RTL: fix slider on Announcement Time dialog

---
 .../seekbar_progress_announcement_time.xml    | 15 ----
 .../seekbar_thumb_announcement_time.xml       | 13 ---
 .../seekbar_tickmark_announcement_time.xml    |  8 --
 .../layout/bottom_sheet_announcement_time.xml | 14 +--
 .../AnnouncementTimeBottomSheet.java          | 86 ++++++-------------
 5 files changed, 30 insertions(+), 106 deletions(-)
 delete mode 100644 OsmAnd/res/drawable/seekbar_progress_announcement_time.xml
 delete mode 100644 OsmAnd/res/drawable/seekbar_thumb_announcement_time.xml
 delete mode 100644 OsmAnd/res/drawable/seekbar_tickmark_announcement_time.xml

diff --git a/OsmAnd/res/drawable/seekbar_progress_announcement_time.xml b/OsmAnd/res/drawable/seekbar_progress_announcement_time.xml
deleted file mode 100644
index 794539923e..0000000000
--- a/OsmAnd/res/drawable/seekbar_progress_announcement_time.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@+id/background">
-		<shape android:shape="rectangle">
-			<solid android:color="#4d007eb3" />
-			<corners android:radius="30dp" />
-		</shape>
-	</item>
-	<item android:id="@+id/progress">
-		<shape android:shape="rectangle">
-			<solid android:color="@color/color_white" />
-			<corners android:radius="30dp" />
-		</shape>
-	</item>
-</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/seekbar_thumb_announcement_time.xml b/OsmAnd/res/drawable/seekbar_thumb_announcement_time.xml
deleted file mode 100644
index a126aee222..0000000000
--- a/OsmAnd/res/drawable/seekbar_thumb_announcement_time.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-	<item android:id="@+id/thump">
-		<shape android:shape="oval">
-			<size
-				android:width="12dp"
-				android:height="12dp" />
-			<solid android:color="@color/profile_icon_color_blue_light" />
-		</shape>
-	</item>
-</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/seekbar_tickmark_announcement_time.xml b/OsmAnd/res/drawable/seekbar_tickmark_announcement_time.xml
deleted file mode 100644
index d6662da81f..0000000000
--- a/OsmAnd/res/drawable/seekbar_tickmark_announcement_time.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <size
-        android:width="2dp"
-        android:height="2dp" />
-    <solid android:color="#17181A" />
-</shape>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/bottom_sheet_announcement_time.xml b/OsmAnd/res/layout/bottom_sheet_announcement_time.xml
index 246ffe3476..308ad0278a 100644
--- a/OsmAnd/res/layout/bottom_sheet_announcement_time.xml
+++ b/OsmAnd/res/layout/bottom_sheet_announcement_time.xml
@@ -62,18 +62,12 @@
 		osmand:typeface="@string/font_roboto_medium"
 		tools:text="Normal" />
 
-	<SeekBar
-		android:id="@+id/seek_bar_arrival"
-		style="@style/Widget.AppCompat.SeekBar.Discrete"
+	<com.google.android.material.slider.Slider
+		android:id="@+id/arrival_slider"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginTop="@dimen/pages_item_margin"
-		android:maxHeight="2dp"
-		android:paddingTop="11dp"
-		android:paddingBottom="11dp"
-		osmand:tickMark="@drawable/seekbar_tickmark_announcement_time"
-		tools:max="3"
-		tools:progress="1" />
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding" />
 
 	<View
 		android:id="@+id/divider"
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/AnnouncementTimeBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/AnnouncementTimeBottomSheet.java
index bbec0c6211..c697213c30 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/AnnouncementTimeBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/AnnouncementTimeBottomSheet.java
@@ -1,26 +1,24 @@
 package net.osmand.plus.settings.bottomsheets;
 
-import android.graphics.drawable.ClipDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.GradientDrawable;
-import android.graphics.drawable.LayerDrawable;
 import android.os.Bundle;
-import android.view.Gravity;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.ImageView;
-import android.widget.SeekBar;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
+import com.google.android.material.slider.Slider;
+import com.google.android.material.slider.Slider.OnChangeListener;
+
 import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
+import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem.Builder;
 import net.osmand.plus.helpers.AndroidUiHelper;
 import net.osmand.plus.routing.data.AnnounceTimeDistances;
 import net.osmand.plus.settings.backend.ApplicationMode;
@@ -33,8 +31,7 @@ import org.apache.commons.logging.Log;
 import static net.osmand.plus.settings.bottomsheets.SingleSelectPreferenceBottomSheet.SELECTED_ENTRY_INDEX_KEY;
 
 
-public class AnnouncementTimeBottomSheet extends BasePreferenceBottomSheet
-		implements SeekBar.OnSeekBarChangeListener {
+public class AnnouncementTimeBottomSheet extends BasePreferenceBottomSheet {
 
 	public static final String TAG = AnnouncementTimeBottomSheet.class.getSimpleName();
 	private static final Log LOG = PlatformUtil.getLog(AnnouncementTimeBottomSheet.class);
@@ -46,7 +43,7 @@ public class AnnouncementTimeBottomSheet extends BasePreferenceBottomSheet
 	private int selectedEntryIndex = -1;
 
 	private TextViewEx tvSeekBarLabel;
-	private SeekBar seekBarArrival;
+	private Slider slider;
 	private ImageView ivArrow;
 	private TextViewEx tvIntervalsDescr;
 
@@ -110,22 +107,6 @@ public class AnnouncementTimeBottomSheet extends BasePreferenceBottomSheet
 		dismiss();
 	}
 
-	@Override
-	public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-		if (progress != selectedEntryIndex) {
-			selectedEntryIndex = progress;
-			updateViews();
-		}
-	}
-
-	@Override
-	public void onStartTrackingTouch(SeekBar seekBar) {
-	}
-
-	@Override
-	public void onStopTrackingTouch(SeekBar seekBar) {
-	}
-
 	private ListPreferenceEx getListPreference() {
 		return (ListPreferenceEx) getPreference();
 	}
@@ -135,30 +116,40 @@ public class AnnouncementTimeBottomSheet extends BasePreferenceBottomSheet
 				.inflate(R.layout.bottom_sheet_announcement_time, null);
 
 		tvSeekBarLabel = rootView.findViewById(R.id.tv_seek_bar_label);
-		seekBarArrival = rootView.findViewById(R.id.seek_bar_arrival);
+		slider = rootView.findViewById(R.id.arrival_slider);
 		ivArrow = rootView.findViewById(R.id.iv_arrow);
 		tvIntervalsDescr = rootView.findViewById(R.id.tv_interval_descr);
+		int appModeColor = getAppMode().getProfileColor(nightMode);
 
-		setProfileColorToSeekBar();
-		seekBarArrival.setOnSeekBarChangeListener(this);
-		seekBarArrival.setProgress(selectedEntryIndex);
-		seekBarArrival.setMax(listPreference.getEntries().length - 1);
-		rootView.findViewById(R.id.description_container).setOnClickListener(new View.OnClickListener() {
+		slider.setValue(selectedEntryIndex);
+		slider.setValueFrom(0);
+		slider.setValueTo(listPreference.getEntries().length - 1);
+		slider.setStepSize(1);
+		slider.addOnChangeListener(new OnChangeListener() {
+			@Override
+			public void onValueChange(@NonNull Slider slider, float value, boolean fromUser) {
+				int intValue = (int) value;
+				if (intValue != selectedEntryIndex) {
+					selectedEntryIndex = intValue;
+					updateViews();
+				}
+			}
+		});
+		UiUtilities.setupSlider(slider, nightMode, appModeColor, true);
+		rootView.findViewById(R.id.description_container).setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				toggleDescriptionVisibility();
 			}
 		});
 
-		return new BaseBottomSheetItem.Builder()
+		return new Builder()
 				.setCustomView(rootView)
 				.create();
 	}
 
 	private void updateViews() {
-		seekBarArrival.setProgress(selectedEntryIndex);
 		tvSeekBarLabel.setText(listPreference.getEntries()[selectedEntryIndex]);
-
 		float value = (float) listPreference.getEntryValues()[selectedEntryIndex];
 		announceTimeDistances.setArrivalDistances(value);
 		tvIntervalsDescr.setText(announceTimeDistances.getIntervalsDescription(app));
@@ -170,31 +161,6 @@ public class AnnouncementTimeBottomSheet extends BasePreferenceBottomSheet
 		AndroidUiHelper.updateVisibility(tvIntervalsDescr, !collapsed);
 	}
 
-	private void setProfileColorToSeekBar() {
-		int color = getAppMode().getProfileColor(nightMode);
-
-		LayerDrawable seekBarProgressLayer =
-				(LayerDrawable) ContextCompat.getDrawable(app, R.drawable.seekbar_progress_announcement_time);
-
-		GradientDrawable background = (GradientDrawable) seekBarProgressLayer.findDrawableByLayerId(R.id.background);
-		background.setColor(color);
-		background.setAlpha(70);
-
-		GradientDrawable progress = (GradientDrawable) seekBarProgressLayer.findDrawableByLayerId(R.id.progress);
-		progress.setColor(color);
-		Drawable clippedProgress = new ClipDrawable(progress, Gravity.CENTER_VERTICAL | Gravity.START, 1);
-
-		seekBarArrival.setProgressDrawable(new LayerDrawable(new Drawable[] {
-				background, clippedProgress
-		}));
-
-		LayerDrawable seekBarThumpLayer =
-				(LayerDrawable) ContextCompat.getDrawable(app, R.drawable.seekbar_thumb_announcement_time);
-		GradientDrawable thump = (GradientDrawable) seekBarThumpLayer.findDrawableByLayerId(R.id.thump);
-		thump.setColor(color);
-		seekBarArrival.setThumb(thump);
-	}
-
 	public static void showInstance(@NonNull FragmentManager fm, String prefKey, Fragment target,
 									@Nullable ApplicationMode appMode, boolean usedOnMap) {
 		try {

From 603f32df6340ded72789aa0841a076b1e582c6c5 Mon Sep 17 00:00:00 2001
From: max-klaus <alex.morozov.osm@gmail.com>
Date: Thu, 22 Apr 2021 16:54:12 +0300
Subject: [PATCH 27/29] Fix test backup screen

---
 OsmAnd/src/net/osmand/plus/backup/BackupHelper.java      | 9 ++++-----
 .../net/osmand/plus/development/TestBackupActivity.java  | 5 -----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/backup/BackupHelper.java b/OsmAnd/src/net/osmand/plus/backup/BackupHelper.java
index be81017d42..326315b7d1 100644
--- a/OsmAnd/src/net/osmand/plus/backup/BackupHelper.java
+++ b/OsmAnd/src/net/osmand/plus/backup/BackupHelper.java
@@ -131,10 +131,6 @@ public class BackupHelper {
 		return token.matches("[0-9]+");
 	}
 
-	public boolean hasOsmLiveUpdates() {
-		return InAppPurchaseHelper.isSubscribedToLiveUpdates(app);
-	}
-
 	@Nullable
 	public String getOrderId() {
 		InAppPurchaseHelper purchaseHelper = app.getInAppPurchaseHelper();
@@ -167,7 +163,10 @@ public class BackupHelper {
 	public void registerUser(@NonNull String email, @Nullable final OnRegisterUserListener listener) {
 		Map<String, String> params = new HashMap<>();
 		params.put("email", email);
-		params.put("orderid", getOrderId());
+		String orderId = getOrderId();
+		if (!Algorithms.isEmpty(orderId)) {
+			params.put("orderid", orderId);
+		}
 		params.put("deviceid", app.getUserAndroidId());
 		AndroidNetworkUtils.sendRequestAsync(app, USER_REGISTER_URL, params, "Register user", true, true, new OnRequestResultListener() {
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/development/TestBackupActivity.java b/OsmAnd/src/net/osmand/plus/development/TestBackupActivity.java
index a5d0daddf5..3b38b1469b 100644
--- a/OsmAnd/src/net/osmand/plus/development/TestBackupActivity.java
+++ b/OsmAnd/src/net/osmand/plus/development/TestBackupActivity.java
@@ -89,11 +89,6 @@ public class TestBackupActivity extends OsmandActionBarActivity {
 			}
 		});
 
-		if (!backupHelper.hasOsmLiveUpdates()) {
-			findViewById(R.id.main_view).setVisibility(View.GONE);
-			return;
-		}
-
 		buttonRegister = findViewById(R.id.btn_register);
 		UiUtilities.setupDialogButton(nightMode, buttonRegister, DialogButtonType.PRIMARY, "Register");
 		buttonVerify = findViewById(R.id.btn_verify);

From e2d659e859b0719af9e0325a773eefcd312b1061 Mon Sep 17 00:00:00 2001
From: nazar-kutz <vitaminkuna@gmail.com>
Date: Thu, 22 Apr 2021 18:43:37 +0300
Subject: [PATCH 28/29] Fix #11423 Wikipedia labels on the map shown on few
 languages

---
 .../osmand/plus/views/layers/POIMapLayer.java | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/views/layers/POIMapLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/POIMapLayer.java
index 1adeed7671..49e5d49a56 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/POIMapLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/POIMapLayer.java
@@ -357,19 +357,7 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
 	@Override
 	public PointDescription getObjectName(Object o) {
 		if (o instanceof Amenity) {
-			Amenity amenity = (Amenity) o;
-			String preferredLang = app.getSettings().MAP_PREFERRED_LOCALE.get();
-			boolean transliterateNames = app.getSettings().MAP_TRANSLITERATE_NAMES.get();
-
-			if (amenity.getType().isWiki()) {
-				if (Algorithms.isEmpty(preferredLang)) {
-					preferredLang = app.getLanguage();
-				}
-				preferredLang = OsmandPlugin.onGetMapObjectsLocale(amenity, preferredLang);
-			}
-
-			return new PointDescription(PointDescription.POINT_TYPE_POI,
-					amenity.getName(preferredLang, transliterateNames));
+			return new PointDescription(PointDescription.POINT_TYPE_POI, getAmenityName((Amenity) o));
 		}
 		return null;
 	}
@@ -431,8 +419,20 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
 
 	@Override
 	public String getText(Amenity o) {
-		return o.getName(view.getSettings().MAP_PREFERRED_LOCALE.get(),
-				view.getSettings().MAP_TRANSLITERATE_NAMES.get());
+		return getAmenityName(o);
+	}
+
+	private String getAmenityName(Amenity amenity) {
+		String locale = app.getSettings().MAP_PREFERRED_LOCALE.get();
+
+		if (amenity.getType().isWiki()) {
+			if (Algorithms.isEmpty(locale)) {
+				locale = app.getLanguage();
+			}
+			locale = OsmandPlugin.onGetMapObjectsLocale(amenity, locale);
+		}
+
+		return amenity.getName(locale, app.getSettings().MAP_TRANSLITERATE_NAMES.get());
 	}
 
 	@Override

From 974ad80734acbfdd4f10ab97060ad671a3b09ef5 Mon Sep 17 00:00:00 2001
From: max-klaus <alex.morozov.osm@gmail.com>
Date: Thu, 22 Apr 2021 20:35:27 +0300
Subject: [PATCH 29/29] Fix backup sync and progress

---
 .../src/net/osmand/AndroidNetworkUtils.java   | 45 +++++++++++++++++--
 .../net/osmand/plus/backup/BackupHelper.java  | 22 +++++----
 .../net/osmand/plus/backup/BackupTask.java    | 17 ++++---
 .../plus/development/TestBackupActivity.java  |  6 +++
 4 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/OsmAnd/src/net/osmand/AndroidNetworkUtils.java b/OsmAnd/src/net/osmand/AndroidNetworkUtils.java
index b25fb1b2d4..f25d08565b 100644
--- a/OsmAnd/src/net/osmand/AndroidNetworkUtils.java
+++ b/OsmAnd/src/net/osmand/AndroidNetworkUtils.java
@@ -38,6 +38,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.concurrent.Executor;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
@@ -92,6 +93,13 @@ public class AndroidNetworkUtils {
 	public static void sendRequestsAsync(@Nullable final OsmandApplication ctx,
 										 @NonNull final List<Request> requests,
 										 @Nullable final OnSendRequestsListener listener) {
+		sendRequestsAsync(ctx, requests, listener, AsyncTask.THREAD_POOL_EXECUTOR);
+	}
+
+	public static void sendRequestsAsync(@Nullable final OsmandApplication ctx,
+										 @NonNull final List<Request> requests,
+										 @Nullable final OnSendRequestsListener listener,
+										 final Executor executor) {
 
 		new AsyncTask<Void, RequestResponse, List<RequestResponse>>() {
 
@@ -127,7 +135,7 @@ public class AndroidNetworkUtils {
 				}
 			}
 
-		}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
+		}.executeOnExecutor(executor, (Void) null);
 	}
 
 	public static void sendRequestAsync(final OsmandApplication ctx,
@@ -137,7 +145,18 @@ public class AndroidNetworkUtils {
 										final boolean toastAllowed,
 										final boolean post,
 										final OnRequestResultListener listener) {
+		sendRequestAsync(ctx, url, parameters, userOperation, toastAllowed, post, listener,
+				AsyncTask.THREAD_POOL_EXECUTOR);
+	}
 
+	public static void sendRequestAsync(final OsmandApplication ctx,
+										final String url,
+										final Map<String, String> parameters,
+										final String userOperation,
+										final boolean toastAllowed,
+										final boolean post,
+										final OnRequestResultListener listener,
+										final Executor executor) {
 		new AsyncTask<Void, Void, String>() {
 
 			@Override
@@ -156,7 +175,7 @@ public class AndroidNetworkUtils {
 				}
 			}
 
-		}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
+		}.executeOnExecutor(executor, (Void) null);
 	}
 
 	public static void downloadFileAsync(final String url,
@@ -183,6 +202,14 @@ public class AndroidNetworkUtils {
 										  final @NonNull List<File> files,
 										  final @NonNull Map<String, String> parameters,
 										  final @Nullable OnFilesDownloadCallback callback) {
+		downloadFilesAsync(url, files, parameters, callback, AsyncTask.THREAD_POOL_EXECUTOR);
+	}
+
+	public static void downloadFilesAsync(final @NonNull String url,
+										  final @NonNull List<File> files,
+										  final @NonNull Map<String, String> parameters,
+										  final @Nullable OnFilesDownloadCallback callback,
+										  final Executor executor) {
 
 		new AsyncTask<Void, Object, Map<File, String>>() {
 
@@ -247,7 +274,7 @@ public class AndroidNetworkUtils {
 				}
 			}
 
-		}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
+		}.executeOnExecutor(executor, (Void) null);
 	}
 
 	public static String sendRequest(@Nullable OsmandApplication ctx, @NonNull String url,
@@ -503,6 +530,16 @@ public class AndroidNetworkUtils {
 										final @NonNull Map<String, String> parameters,
 										final @Nullable Map<String, String> headers,
 										final OnFilesUploadCallback callback) {
+		uploadFilesAsync(url, files, gzip, parameters, headers, callback, AsyncTask.THREAD_POOL_EXECUTOR);
+	}
+
+	public static void uploadFilesAsync(final @NonNull String url,
+										final @NonNull List<File> files,
+										final boolean gzip,
+										final @NonNull Map<String, String> parameters,
+										final @Nullable Map<String, String> headers,
+										final OnFilesUploadCallback callback,
+										final Executor executor) {
 
 		new AsyncTask<Void, Object, Map<File, String>>() {
 
@@ -557,7 +594,7 @@ public class AndroidNetworkUtils {
 				}
 			}
 
-		}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
+		}.executeOnExecutor(executor, (Void) null);
 	}
 
 	private static void showToast(OsmandApplication ctx, String message) {
diff --git a/OsmAnd/src/net/osmand/plus/backup/BackupHelper.java b/OsmAnd/src/net/osmand/plus/backup/BackupHelper.java
index 326315b7d1..87423ec582 100644
--- a/OsmAnd/src/net/osmand/plus/backup/BackupHelper.java
+++ b/OsmAnd/src/net/osmand/plus/backup/BackupHelper.java
@@ -37,6 +37,9 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 public class BackupHelper {
 
@@ -45,6 +48,9 @@ public class BackupHelper {
 	private final FavouritesDbHelper favouritesHelper;
 	private final GpxDbHelper gpxHelper;
 
+	private static final ThreadPoolExecutor EXECUTOR = new ThreadPoolExecutor(1, 1, 0L,
+			TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
+
 	private static final String SERVER_URL = "https://osmand.net";
 
 	private static final String USER_REGISTER_URL = SERVER_URL + "/userdata/user-register";
@@ -196,7 +202,7 @@ public class BackupHelper {
 					listener.onRegisterUser(status, message);
 				}
 			}
-		});
+		}, EXECUTOR);
 	}
 
 	public void registerDevice(String token, @Nullable final OnRegisterDeviceListener listener) {
@@ -238,7 +244,7 @@ public class BackupHelper {
 					listener.onRegisterDevice(status, message);
 				}
 			}
-		});
+		}, EXECUTOR);
 	}
 
 	public void uploadFiles(@NonNull List<GpxFileInfo> gpxFiles, @Nullable final OnUploadFilesListener listener) throws UserNotRegisteredException {
@@ -294,7 +300,7 @@ public class BackupHelper {
 					listener.onFilesUploadDone(errors);
 				}
 			}
-		});
+		}, EXECUTOR);
 	}
 
 	public void deleteFiles(@NonNull List<UserFile> userFiles, @Nullable final OnDeleteFilesListener listener) throws UserNotRegisteredException {
@@ -349,7 +355,7 @@ public class BackupHelper {
 					listener.onFilesDeleteDone(errors);
 				}
 			}
-		});
+		}, EXECUTOR);
 	}
 
 	public void downloadFileList(@Nullable final OnDownloadFileListListener listener) throws UserNotRegisteredException {
@@ -391,7 +397,7 @@ public class BackupHelper {
 					listener.onDownloadFileList(status, message, userFiles);
 				}
 			}
-		});
+		}, EXECUTOR);
 	}
 
 	public void downloadFiles(@NonNull final Map<File, UserFile> filesMap, @Nullable final OnDownloadFileListener listener) throws UserNotRegisteredException {
@@ -432,7 +438,7 @@ public class BackupHelper {
 							listener.onFilesDownloadDone(errors);
 						}
 					}
-				});
+				}, EXECUTOR);
 	}
 
 	@SuppressLint("StaticFieldLeak")
@@ -514,7 +520,7 @@ public class BackupHelper {
 				}
 			}
 		};
-		task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+		task.executeOnExecutor(EXECUTOR);
 	}
 
 	@SuppressLint("StaticFieldLeak")
@@ -575,6 +581,6 @@ public class BackupHelper {
 				}
 			}
 		};
-		task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+		task.executeOnExecutor(EXECUTOR);
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/backup/BackupTask.java b/OsmAnd/src/net/osmand/plus/backup/BackupTask.java
index a2fc299463..27a698f73d 100644
--- a/OsmAnd/src/net/osmand/plus/backup/BackupTask.java
+++ b/OsmAnd/src/net/osmand/plus/backup/BackupTask.java
@@ -11,7 +11,6 @@ import net.osmand.AndroidUtils;
 import net.osmand.GPXUtilities;
 import net.osmand.GPXUtilities.GPXFile;
 import net.osmand.plus.GPXDatabase.GpxDataItem;
-import net.osmand.plus.GpxDbHelper;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.ProgressImplementation;
 import net.osmand.plus.backup.BackupHelper.BackupInfo;
@@ -113,7 +112,7 @@ public class BackupTask {
 			tasks.push(backupTasks[i]);
 		}
 		this.runningTasks = tasks;
-		onTasksInit();
+		onBackupTasksInit();
 	}
 
 	private void initRestoreTasks() {
@@ -123,7 +122,7 @@ public class BackupTask {
 			tasks.push(restoreTasks[i]);
 		}
 		this.runningTasks = tasks;
-		onTasksInit();
+		onRestoreTasksInit();
 	}
 
 	private void initData() {
@@ -275,14 +274,22 @@ public class BackupTask {
 		}
 	}
 
-	private void onTasksInit() {
+	private void onBackupTasksInit() {
 		Context ctx = contextRef.get();
-		if (ctx instanceof Activity && AndroidUtils.isActivityNotDestroyed((Activity) ctx) && progress != null) {
+		if (ctx instanceof Activity && AndroidUtils.isActivityNotDestroyed((Activity) ctx)) {
 			progress = ProgressImplementation.createProgressDialog(ctx,
 					"Backup data", "Initializing...", ProgressDialog.STYLE_HORIZONTAL);
 		}
 	}
 
+	private void onRestoreTasksInit() {
+		Context ctx = contextRef.get();
+		if (ctx instanceof Activity && AndroidUtils.isActivityNotDestroyed((Activity) ctx)) {
+			progress = ProgressImplementation.createProgressDialog(ctx,
+					"Restore data", "Initializing...", ProgressDialog.STYLE_HORIZONTAL);
+		}
+	}
+
 	private void onTaskProgressUpdate(Object... objects) {
 		Context ctx = contextRef.get();
 		if (ctx instanceof Activity && AndroidUtils.isActivityNotDestroyed((Activity) ctx) && progress != null) {
diff --git a/OsmAnd/src/net/osmand/plus/development/TestBackupActivity.java b/OsmAnd/src/net/osmand/plus/development/TestBackupActivity.java
index 3b38b1469b..8f78c63151 100644
--- a/OsmAnd/src/net/osmand/plus/development/TestBackupActivity.java
+++ b/OsmAnd/src/net/osmand/plus/development/TestBackupActivity.java
@@ -186,6 +186,7 @@ public class TestBackupActivity extends OsmandActionBarActivity {
 			@Override
 			public void onClick(View v) {
 				if (backupInfo != null) {
+					buttonBackup.setEnabled(false);
 					BackupTask task = new BackupTask(backupInfo, TestBackupActivity.this, new OnBackupListener() {
 						@Override
 						public void onBackupDone(@Nullable Map<File, String> uploadErrors, @Nullable Map<File, String> downloadErrors,
@@ -203,6 +204,7 @@ public class TestBackupActivity extends OsmandActionBarActivity {
 								a.infoView.setText(description);
 								a.infoView.requestFocus();
 								a.prepareBackup();
+								a.buttonBackup.setEnabled(true);
 							}
 						}
 					});
@@ -214,6 +216,7 @@ public class TestBackupActivity extends OsmandActionBarActivity {
 			@Override
 			public void onClick(View v) {
 				if (backupInfo != null) {
+					buttonRestore.setEnabled(false);
 					BackupTask task = new BackupTask(backupInfo, TestBackupActivity.this, new OnBackupListener() {
 						@Override
 						public void onBackupDone(@Nullable Map<File, String> uploadErrors, @Nullable Map<File, String> downloadErrors,
@@ -231,6 +234,7 @@ public class TestBackupActivity extends OsmandActionBarActivity {
 								a.infoView.setText(description);
 								a.infoView.requestFocus();
 								a.prepareBackup();
+								a.buttonRestore.setEnabled(true);
 							}
 						}
 					});
@@ -309,6 +313,7 @@ public class TestBackupActivity extends OsmandActionBarActivity {
 
 	private void prepareBackup() {
 		final WeakReference<TestBackupActivity> activityRef = new WeakReference<>(this);
+		buttonRefresh.setEnabled(false);
 		PrepareBackupTask prepareBackupTask = new PrepareBackupTask(this, new OnPrepareBackupListener() {
 			@Override
 			public void onBackupPrepared(@Nullable BackupInfo backupInfo, @Nullable String error) {
@@ -329,6 +334,7 @@ public class TestBackupActivity extends OsmandActionBarActivity {
 					}
 					a.infoView.setText(description);
 					a.infoView.requestFocus();
+					a.buttonRefresh.setEnabled(true);
 				}
 			}
 		});