diff --git a/OsmAnd/res/layout/map_marker_item_new.xml b/OsmAnd/res/layout/map_marker_item_new.xml
new file mode 100644
index 0000000000..f3531437eb
--- /dev/null
+++ b/OsmAnd/res/layout/map_marker_item_new.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="56dp"
+    android:descendantFocusability="blocksDescendants">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/bg_color">
+
+        <android.support.v7.widget.AppCompatImageView
+            android:id="@+id/marker_reorder_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:padding="16dp"
+            android:tint="?attr/secondary_icon_color"
+            tools:src="@drawable/ic_action_reorder"/>
+
+        <android.support.v7.widget.AppCompatImageView
+            android:id="@+id/marker_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_toEndOf="@id/marker_reorder_icon"
+            android:layout_toRightOf="@id/marker_reorder_icon"
+            tools:src="@drawable/ic_action_flag_dark"/>
+
+        <ImageButton
+            android:id="@+id/marker_options_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginBottom="16dp"
+            android:layout_marginLeft="14dp"
+            android:layout_marginRight="14dp"
+            android:layout_marginTop="16dp"
+            android:background="?attr/selectableItemBackground"
+            android:focusableInTouchMode="true"
+            tools:src="@drawable/ic_overflow_menu_white"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@+id/marker_icon"
+            android:layout_toLeftOf="@id/marker_options_button"
+            android:layout_toRightOf="@+id/marker_icon"
+            android:layout_toStartOf="@id/marker_options_button"
+            android:orientation="vertical">
+
+            <android.support.v7.widget.AppCompatTextView
+                android:id="@+id/measure_point_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="?android:textColorPrimary"
+                android:textSize="@dimen/default_desc_text_size"
+                tools:text="Van Gogh Museum"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <ImageView
+                    android:id="@+id/direction_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:src="@drawable/ic_direction_arrow"/>
+
+                <android.support.v7.widget.AppCompatTextView
+                    android:id="@+id/marker_distance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:maxLines="1"
+                    android:textColor="@color/marker_blue"
+                    android:textSize="@dimen/default_sub_text_size"
+                    tools:text="213 m"/>
+
+                <android.support.v7.widget.AppCompatTextView
+                    android:id="@+id/point_icon_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="•"
+                    android:textColor="?android:textColorSecondary"
+                    android:textSize="@dimen/default_sub_text_size"/>
+
+                <android.support.v7.widget.AppCompatTextView
+                    android:id="@+id/marker_description"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginRight="4dp"
+                    android:maxLines="1"
+                    android:textColor="?android:textColorSecondary"
+                    android:textSize="@dimen/default_sub_text_size"
+                    tools:text="Amsterdam Weekend"/>
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <View
+            android:id="@+id/points_divider"
+            android:layout_width="wrap_content"
+            android:layout_height="1dp"
+            android:layout_alignParentBottom="true"
+            android:layout_toEndOf="@+id/marker_reorder_icon"
+            android:layout_toRightOf="@+id/marker_reorder_icon"
+            android:background="?attr/dashboard_divider"/>
+    </RelativeLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ar/phrases.xml b/OsmAnd/res/values-ar/phrases.xml
index baddae6296..617466d3ef 100644
--- a/OsmAnd/res/values-ar/phrases.xml
+++ b/OsmAnd/res/values-ar/phrases.xml
@@ -1564,4 +1564,22 @@
 	<string name="poi_animal_shelter_purpose">الغرض</string>
 
 <string name="poi_direction_entrance">الوجهة: مدخل</string>
+	<string name="poi_boat_rental_type">قوارب مستأجرة</string>
+
+<string name="poi_petroleum_well">بئر نفط</string>
+	<string name="poi_cricket_nets">شبكات الكريكيت</string>
+	<string name="poi_college">كلية</string>
+	<string name="poi_social_facility">مرفق اجتماعي</string>
+	<string name="poi_quarter">ربع</string>
+	<string name="poi_locality">موضع</string>
+	<string name="poi_nursing_home">دار تمريض</string>
+	<string name="poi_audiologist">اختصاصي السمع</string>
+	<string name="poi_occupational_therapist">أخصائي العلاج الوظيفي</string>
+	<string name="poi_optometrist">طبيب العيون</string>
+	<string name="poi_bookmaker">ناشر</string>
+	<string name="poi_golf_course">ملعب غولف</string>
+	<string name="poi_ice_rink">حلبة تزلج</string>
+	<string name="poi_running_track">مسار جري</string>
+	<string name="poi_raceway">مضمار سباق</string>
+	<string name="poi_archery">الرماية</string>
 	</resources>
diff --git a/OsmAnd/res/values-b+hsb/phrases.xml b/OsmAnd/res/values-b+hsb/phrases.xml
index eb8f0a4cfd..201511ccae 100644
--- a/OsmAnd/res/values-b+hsb/phrases.xml
+++ b/OsmAnd/res/values-b+hsb/phrases.xml
@@ -128,11 +128,11 @@
 	<string name="poi_tyres">Wobručowy wobchod</string>
 	<string name="poi_vacuum_cleaner">Prochsrěbaki</string>
 	<string name="poi_variety_store">Tuni wobchod</string>
-	<string name="poi_payment_type">Wašnje zapłaćenja</string>
-	<string name="poi_additional_type">Přidatne</string>
-	<string name="poi_internet_access_type">Wašnje přistupa do interneta</string>
+	<string name="poi_payment_type">wašnje zapłaćenja</string>
+	<string name="poi_additional_type">přidatne</string>
+	<string name="poi_internet_access_type">wašnje přistupa do interneta</string>
 	<string name="poi_bicycle_service">Kolesowarski serwis</string>
-	<string name="poi_payment_toll_type">Wašnje zapłaćenja</string>
+	<string name="poi_payment_toll_type">wašnje zapłaćenja</string>
 	<string name="poi_traffic_signals_sound">Zwuk</string>
 	<string name="poi_subway_station_filter">Zastanišćo metra</string>
 	<string name="poi_pump">Klumpa</string>
@@ -264,89 +264,89 @@
 	<string name="poi_sports_centre">sportowy centrum</string>
 	<string name="poi_golf_course">golfownišćo</string>
 	<string name="poi_cuisine_crepes">Crepes</string>
-	<string name="poi_cuisine_meat">Mjaso</string>
-	<string name="poi_cuisine_waffle">Wafle</string>
-	<string name="poi_cuisine_chocolate">Šokolada</string>
-	<string name="poi_cuisine_wine">Wino</string>
-	<string name="poi_cuisine_potato">Běrny</string>
-	<string name="poi_cuisine_brunch">Snobjed</string>
-	<string name="poi_cuisine_baguette">Bagety</string>
-	<string name="poi_cuisine_burrito">Burrito</string>
-	<string name="poi_cuisine_shawarma">Šawarma</string>
+	<string name="poi_cuisine_meat">mjaso</string>
+	<string name="poi_cuisine_waffle">wafle</string>
+	<string name="poi_cuisine_chocolate">šokolada</string>
+	<string name="poi_cuisine_wine">wino</string>
+	<string name="poi_cuisine_potato">běrny/neple</string>
+	<string name="poi_cuisine_brunch">snobjed</string>
+	<string name="poi_cuisine_baguette">bagety</string>
+	<string name="poi_cuisine_burrito">burrito</string>
+	<string name="poi_cuisine_shawarma">šawarma</string>
 
-	<string name="poi_cuisine_regional">regionalnje</string>
-	<string name="poi_cuisine_italian">italsce</string>
-	<string name="poi_cuisine_chinese">chinsce</string>
-	<string name="poi_cuisine_mexican">mexisce</string>
-	<string name="poi_cuisine_japanese">japansce</string>
-	<string name="poi_cuisine_german">němsce</string>
-	<string name="poi_cuisine_indian">indisce</string>
-	<string name="poi_cuisine_american">amerisce</string>
-	<string name="poi_cuisine_asian">azisce</string>
-	<string name="poi_cuisine_french">francosce</string>
-	<string name="poi_cuisine_greek">grjeksce</string>
-	<string name="poi_cuisine_thai">thai</string>
-	<string name="poi_cuisine_international">mjezynarodnje</string>
-	<string name="poi_cuisine_turkish">turkowsce</string>
-	<string name="poi_cuisine_spanish">španisce</string>
-	<string name="poi_cuisine_vietnamese">vietnamsce</string>
-	<string name="poi_cuisine_korean">korejsce</string>
-	<string name="poi_cuisine_bavarian">baworsce</string>
-	<string name="poi_cuisine_lebanese">libanonsce</string>
-	<string name="poi_cuisine_russian">rusce</string>
-	<string name="poi_cuisine_filipino">filipinsce</string>
-	<string name="poi_cuisine_portuguese">portugalsce</string>
-	<string name="poi_cuisine_georgian">georgisce</string>
-	<string name="poi_cuisine_polish">pólsce</string>
-	<string name="poi_cuisine_brazilian">brazilsce</string>
-	<string name="poi_cuisine_arab">arabsce</string>
-	<string name="poi_cuisine_danish">dansce</string>
-	<string name="poi_cuisine_indonesian">indonesce</string>
-	<string name="poi_cuisine_african">afrisce</string>
-	<string name="poi_cuisine_caribbean">karibisce</string>
-	<string name="poi_cuisine_argentinian">argentinsce</string>
-	<string name="poi_cuisine_balkan">balkansce</string>
-	<string name="poi_cuisine_peruvian">perusce</string>
-	<string name="poi_cuisine_croatian">chorwatsce</string>
-	<string name="poi_cuisine_bolivian">boliwisce</string>
-	<string name="poi_cuisine_persian">persisce</string>
-	<string name="poi_cuisine_moroccan">marokkosce</string>
-	<string name="poi_cuisine_austrian">awstrisce</string>
-	<string name="poi_cuisine_malaysian">malajzisce</string>
-	<string name="poi_cuisine_irish">irsce</string>
-	<string name="poi_cuisine_ethiopian">etiopisce</string>
-	<string name="poi_cuisine_hungarian">madźarsce</string>
-	<string name="poi_cuisine_lao">laotisce</string>
-	<string name="poi_cuisine_european">europsce</string>
-	<string name="poi_cuisine_uzbek">uzbeksce</string>
-	<string name="poi_cuisine_czech">čěsce</string>
-	<string name="poi_cuisine_cuban">kubasce</string>
-	<string name="poi_cuisine_british">britisce</string>
-	<string name="poi_cuisine_latin_american">łaćonskoamerisce</string>
-	<string name="poi_cuisine_nepalese">nepalsce</string>
-	<string name="poi_cuisine_mongolian">mongolsce</string>
-	<string name="poi_cuisine_ukrainian">ukrainsce</string>
-	<string name="poi_cuisine_afghan">afghanisce</string>
-	<string name="poi_cuisine_belgian">belgisce</string>
-	<string name="poi_cuisine_basque">baskisce</string>
-	<string name="poi_cuisine_swiss">šwicarsce</string>
-	<string name="poi_cuisine_cantonese">kantonesce</string>
-	<string name="poi_cuisine_swedish">šwedsce</string>
-	<string name="poi_cuisine_jamaican">jamaikasce</string>
-	<string name="poi_cuisine_armenian">armensce</string>
-	<string name="poi_cuisine_hawaiian">hawaiisce</string>
-	<string name="poi_cuisine_english">jendźelsce</string>
-	<string name="poi_cuisine_pakistani">pakistansce</string>
-	<string name="poi_cuisine_taiwanese">taiwansce</string>
+	<string name="poi_cuisine_regional">regionalna</string>
+	<string name="poi_cuisine_italian">italska</string>
+	<string name="poi_cuisine_chinese">chinska</string>
+	<string name="poi_cuisine_mexican">mexiska</string>
+	<string name="poi_cuisine_japanese">japanska</string>
+	<string name="poi_cuisine_german">němska</string>
+	<string name="poi_cuisine_indian">indiska</string>
+	<string name="poi_cuisine_american">ameriska</string>
+	<string name="poi_cuisine_asian">aziska</string>
+	<string name="poi_cuisine_french">francoska</string>
+	<string name="poi_cuisine_greek">grjekska</string>
+	<string name="poi_cuisine_thai">thaiska</string>
+	<string name="poi_cuisine_international">mjezynarodna</string>
+	<string name="poi_cuisine_turkish">turkowska</string>
+	<string name="poi_cuisine_spanish">španiska</string>
+	<string name="poi_cuisine_vietnamese">vietnamska</string>
+	<string name="poi_cuisine_korean">korejska</string>
+	<string name="poi_cuisine_bavarian">baworska</string>
+	<string name="poi_cuisine_lebanese">libanonska</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">georgiska</string>
+	<string name="poi_cuisine_polish">pólska</string>
+	<string name="poi_cuisine_brazilian">brazilska</string>
+	<string name="poi_cuisine_arab">arabska</string>
+	<string name="poi_cuisine_danish">danska</string>
+	<string name="poi_cuisine_indonesian">indoneska</string>
+	<string name="poi_cuisine_african">afriska</string>
+	<string name="poi_cuisine_caribbean">karibiska</string>
+	<string name="poi_cuisine_argentinian">argentinska</string>
+	<string name="poi_cuisine_balkan">balkanska</string>
+	<string name="poi_cuisine_peruvian">peruska</string>
+	<string name="poi_cuisine_croatian">chorwatska</string>
+	<string name="poi_cuisine_bolivian">boliwiska</string>
+	<string name="poi_cuisine_persian">persiska</string>
+	<string name="poi_cuisine_moroccan">marokkoska</string>
+	<string name="poi_cuisine_austrian">awstriska</string>
+	<string name="poi_cuisine_malaysian">malajziska</string>
+	<string name="poi_cuisine_irish">irska</string>
+	<string name="poi_cuisine_ethiopian">etiopiska</string>
+	<string name="poi_cuisine_hungarian">madźarska</string>
+	<string name="poi_cuisine_lao">laotiska</string>
+	<string name="poi_cuisine_european">europska</string>
+	<string name="poi_cuisine_uzbek">uzbekska</string>
+	<string name="poi_cuisine_czech">čěska</string>
+	<string name="poi_cuisine_cuban">kubaska</string>
+	<string name="poi_cuisine_british">britiska</string>
+	<string name="poi_cuisine_latin_american">łaćonskoameriska</string>
+	<string name="poi_cuisine_nepalese">nepalska</string>
+	<string name="poi_cuisine_mongolian">mongolska</string>
+	<string name="poi_cuisine_ukrainian">ukrainska</string>
+	<string name="poi_cuisine_afghan">afghaniska</string>
+	<string name="poi_cuisine_belgian">belgiska</string>
+	<string name="poi_cuisine_basque">baskiska</string>
+	<string name="poi_cuisine_swiss">šwicarska</string>
+	<string name="poi_cuisine_cantonese">kantoneska</string>
+	<string name="poi_cuisine_swedish">šwedska</string>
+	<string name="poi_cuisine_jamaican">jamaiska</string>
+	<string name="poi_cuisine_armenian">armenska</string>
+	<string name="poi_cuisine_hawaiian">hawaiiska</string>
+	<string name="poi_cuisine_english">jendźelska</string>
+	<string name="poi_cuisine_pakistani">pakistanska</string>
+	<string name="poi_cuisine_taiwanese">taiwanska</string>
 	<string name="poi_cuisine_tex_mex">Tex-mex</string>
-	<string name="poi_cuisine_dutch">nižozemsce</string>
-	<string name="poi_cuisine_syrian">syrisce</string>
-	<string name="poi_cuisine_australian">awstralsce</string>
-	<string name="poi_cuisine_egyptian">egyptowsce</string>
-	<string name="poi_cuisine_senegalese">senegalsce</string>
-	<string name="poi_cuisine_jewish">židowsce</string>
-	<string name="poi_cuisine_bulgarian">bołharsce</string>
-	<string name="poi_cuisine_tibetan">tibetsce</string>
+	<string name="poi_cuisine_dutch">nižozemska</string>
+	<string name="poi_cuisine_syrian">syriska</string>
+	<string name="poi_cuisine_australian">awstralska</string>
+	<string name="poi_cuisine_egyptian">egyptowska</string>
+	<string name="poi_cuisine_senegalese">senegalska</string>
+	<string name="poi_cuisine_jewish">židowska</string>
+	<string name="poi_cuisine_bulgarian">bołharska</string>
+	<string name="poi_cuisine_tibetan">tibetska</string>
 
 	<string name="poi_gambling_lottery">loterija</string>
 	<string name="poi_gambling_slot_machines">hrajne awtomaty</string>
@@ -428,4 +428,1058 @@
 	<string name="poi_boat_canoe_rental_rental_yes">Kanu: haj</string>
 	<string name="poi_boat_canoe_rental_rental_no">Kanu: ně</string>
 
-</resources>
+<string name="poi_fuel_type">typ</string>
+	<string name="poi_fuel_avia_type">typ</string>
+	<string name="poi_clothes_type">typ</string>
+	<string name="poi_shoes_type">typ</string>
+	<string name="poi_fire_hydrant_type">typ</string>
+	<string name="poi_highway_crossing_type">typ</string>
+	<string name="poi_parking_type">typ</string>
+	<string name="poi_bicycle_parking_type">typ</string>
+	<string name="poi_telescope_type">typ</string>
+	<string name="poi_animal_training_type">typ</string>
+	<string name="poi_embassy_type">typ</string>
+	<string name="poi_archaeological_site_type">typ</string>
+	<string name="poi_information_type">typ</string>
+	<string name="poi_resort_type">typ</string>
+	<string name="poi_recycling_type">typ</string>
+	<string name="poi_shelter_type">typ</string>
+	<string name="poi_massage_type">typ masaže</string>
+	<string name="poi_payment_transport_type">wašnje płaćenja (transport)</string>
+	<string name="poi_social_facility_type">typ</string>
+	<string name="poi_zoo_type">typ</string>
+	<string name="poi_motorcycle_type">typ motorskeho</string>
+	<string name="poi_recycling_tv_monitor">telewizory, monitory</string>
+	<string name="poi_recycling_tetrapak">tetrapak</string>
+	<string name="poi_recycling_rubble">wotsypki</string>
+	<string name="poi_recycling_sheet_metal">blach</string>
+	<string name="poi_recycling_chipboard">třěskowe platy</string>
+	<string name="poi_volleyball">wolejbul</string>
+
+	<string name="poi_museum">muzej</string>
+	<string name="poi_memorial">wopomnišćo</string>
+	<string name="poi_archaeological_site">archeologiske namakanišćo</string>
+	<string name="poi_battlefield">bitwišćo</string>
+	<string name="poi_boundary_stone">měznik</string>
+	<string name="poi_historic_cannon">historiska kanona</string>
+	<string name="poi_castle">hród</string>
+	<string name="poi_city_gate">měšćanske wrota</string>
+	<string name="poi_fort">twjerdźizna</string>
+	<string name="poi_fountain">studnja</string>
+	<string name="poi_historic_ruins">historiska rozwalina</string>
+	<string name="poi_rune_stone">runowy kamjeń</string>
+	<string name="poi_wreck">rozbita łódź</string>
+	<string name="poi_historic_ship">historiska łódź</string>
+	<string name="poi_historic_mine">historiske podkopki</string>
+	<string name="poi_monument">pomnik</string>
+	<string name="poi_zoo">coo</string>
+	<string name="poi_aquarium">akwarij</string>
+	<string name="poi_theme_park">temowy park</string>
+
+	<string name="poi_attraction">turistiska atrakcija</string>
+<string name="poi_tourism_yes">turistiski objekt</string>
+	<string name="poi_attraction_big_wheel">hoberske koło</string>
+	<string name="poi_attraction_carousel">karusel</string>
+	<string name="poi_attraction_maze">błudnišćo</string>
+	<string name="poi_attraction_roller_coaster">seklowa čara</string>
+	<string name="poi_attraction_slide">suwadło</string>
+	<string name="poi_attraction_water_slide">wodowe suwadło</string>
+
+	<string name="poi_lodging">nóclěh</string>
+	<string name="poi_hotel">hotel</string>
+	<string name="poi_guest_house">hosćenc</string>
+	<string name="poi_hostel">hostel</string>
+	<string name="poi_motel">motel</string>
+	<string name="poi_alpine_hut">chata</string>
+	<string name="poi_apartment">apartment</string>
+	<string name="poi_cabin">drjewjana chata</string>
+	<string name="poi_hunting_lodge">hońtwjerska chata</string>
+
+	<string name="poi_place_of_worship">Boži dom</string>
+	<string name="poi_religion_christian">křesćanstwo</string>
+	<string name="poi_religion_jewish">židowstwo</string>
+	<string name="poi_religion_muslim">islam</string>
+	<string name="poi_religion_sikh">sikhizm</string>
+	<string name="poi_religion_buddhist">buddhizm</string>
+	<string name="poi_religion_hindu">hinduizm</string>
+	<string name="poi_religion_shinto">shinto</string>
+	<string name="poi_religion_taoist">taoizm</string>
+	<string name="poi_religion_voodoo">voodoo</string>
+	<string name="poi_religion_unitarian_universalist">unitariski uniwersalizm</string>
+	<string name="poi_religion_multifaith">wjacore wěry</string>
+	<string name="poi_religion_jain">jainizm</string>
+	<string name="poi_religion_spiritualist">spiritualizm</string>
+	<string name="poi_religion_bahai">bahaiizm</string>
+	<string name="poi_religion_scientologist">scientologizm</string>
+	<string name="poi_religion_pagan">paganizm</string>
+	<string name="poi_religion_tenrikyo">tenrikyo</string>
+	<string name="poi_religion_zoroastrian">zoroastrizm</string>
+
+	<string name="poi_denomination_catholic">katolska</string>
+	<string name="poi_denomination_baptist">baptistiska</string>
+	<string name="poi_denomination_roman_catholic">romsko-katolska</string>
+	<string name="poi_denomination_orthodox">prawosławna</string>
+	<string name="poi_denomination_lutheran">lutherska</string>
+	<string name="poi_denomination_sunni">sunitiska</string>
+	<string name="poi_denomination_protestant">protestantska</string>
+	<string name="poi_denomination_methodist">metodistiska</string>
+	<string name="poi_denomination_anglican">anglikanska</string>
+	<string name="poi_denomination_presbyterian">presbyteriska</string>
+	<string name="poi_denomination_evangelical">ewangelikalna</string>
+	<string name="poi_denomination_russian_orthodox">rusko-prawosławna</string>
+	<string name="poi_denomination_pentecostal">swjatkowniska</string>
+	<string name="poi_denomination_mormon">mormonska</string>
+	<string name="poi_denomination_jehovahs_witness">swědki Jehovy</string>
+	<string name="poi_denomination_greek_orthodox">grjeksko-prawosławna</string>
+	<string name="poi_denomination_reformed">reformowana</string>
+	<string name="poi_denomination_seventh_day_adventist">adwentisća sedmeho dnja</string>
+	<string name="poi_denomination_new_apostolic">nowo-japoštołska</string>
+	<string name="poi_denomination_church_of_england">cyrkej Jendźelskeje</string>
+	<string name="poi_denomination_episcopal">episkopalna</string>
+	<string name="poi_denomination_shia">šiitiska</string>
+	<string name="poi_denomination_united">uniěrowana</string>
+	<string name="poi_denomination_greek_catholic">grjeksko-katolska</string>
+	<string name="poi_denomination_tibetan">tibetska</string>
+	<string name="poi_denomination_united_reformed">uniěrowano-reformowana</string>
+	<string name="poi_denomination_church_of_scotland">cyrkej Šotiskeje</string>
+	<string name="poi_denomination_salvation_army">hajlsarmeja</string>
+	<string name="poi_denomination_iglesia_ni_cristo">Iglesia ni cristo</string>
+	<string name="poi_denomination_mennonite">menonitiska</string>
+	<string name="poi_denomination_bulgarian_orthodox">bołharsko-prawosławna</string>
+	<string name="poi_denomination_adventist">adwentistiska</string>
+	<string name="poi_denomination_old_believers">starowěriwi</string>
+	<string name="poi_denomination_serbian_orthodox">serbisko-prawosławna</string>
+	<string name="poi_denomination_spiritist">spiritistiska</string>
+	<string name="poi_denomination_armenian_apostolic">armensko-japoštołska</string>
+	<string name="poi_denomination_dutch_reformed">nižozemsko-reformowana</string>
+	<string name="poi_denomination_apostolic">japoštołska</string>
+	<string name="poi_denomination_georgian_orthodox">georgisko-prawosławna</string>
+	<string name="poi_denomination_romanian_orthodox">rumunsko-prawosławna</string>
+	<string name="poi_denomination_coptic_orthodox">koptisko-prawosławna</string>
+	<string name="poi_denomination_maronite">maronitiska</string>
+	<string name="poi_internet_access_wlan">přistup do interneta: WLAN</string>
+	<string name="poi_internet_access_terminal">přistup do interneta: ličak</string>
+	<string name="poi_internet_access_wired">přistup do interneta: přez kabl</string>
+	<string name="poi_internet_access_public">přistup do interneta: zjawny</string>
+	<string name="poi_internet_access_yes">přistup do interneta: haj</string>
+	<string name="poi_internet_access_no">přistup do interneta: ně</string>
+	<string name="poi_internet_access_fee_yes">přistup do interneta: płaći</string>
+	<string name="poi_internet_access_fee_no">přistup do interneta: darmotny</string>
+
+	<string name="poi_monastery">klóšter</string>
+<string name="poi_religious">nabožinski areal</string>
+	<string name="poi_wayside_cross">swjaty křiž</string>
+	<string name="poi_wayside_shrine">modlerski stołp</string>
+	<string name="poi_information">informacija</string>
+	<string name="poi_clock">časnik</string>
+	<string name="poi_travel_agent">jězbny běrow</string>
+	<string name="poi_viewpoint">wuhladnišćo</string>
+	<string name="poi_camp_site">campingownišćo</string>
+	<string name="poi_caravan_site">karawanišćo</string>
+	<string name="poi_picnic_site">piknikownišćo</string>
+	<string name="poi_picnic_table">piknikowe blido</string>
+	<string name="poi_spring">žórło</string>
+	<string name="poi_hot_spring">horce žórło</string>
+	<string name="poi_geyser">geiser</string>
+	<string name="poi_cemetery">pohrjebnišćo</string>
+	<string name="poi_grave_yard">pohrjebnišćo</string>
+	<string name="poi_tomb">row</string>
+	<string name="poi_shelter">podstup</string>
+	<string name="poi_funicular">powjaznica</string>
+	<string name="poi_resort">resort</string>
+	<string name="poi_wine_cellar">winowa pinca</string>
+	<string name="poi_craft_winery">pincarnja</string>
+
+	<string name="poi_club_astronomy">astronomiske towarstwo</string>
+	<string name="poi_club_computer">kompjuterowe towarstwo</string>
+	<string name="poi_club_sport">sportowe towarstwo</string>
+	<string name="poi_club_automobile">awtomobilowe towarstwo</string>
+	<string name="poi_club_chess">šachowe towarstwo</string>
+	<string name="poi_club_cinema">kinowe towarstwo</string>
+	<string name="poi_club_fan">fanowe towarstwo</string>
+	<string name="poi_club_fishing">wudźerske towarstwo</string>
+	<string name="poi_club_veterans">weteranowe towarstwo</string>
+	<string name="poi_club_linux">linuxowe towarstwo</string>
+	<string name="poi_club_theatre">dźiwadłowe towarstwo</string>
+	<string name="poi_club_history">stawizniske towarstwo</string>
+	<string name="poi_club_music">hudźbne towarstwo</string>
+	<string name="poi_club_ethnic">etniske towarstwo</string>
+	<string name="poi_club_nature">přirodne towarstwo</string>
+	<string name="poi_club_photography">fotowe towarstwo</string>
+	<string name="poi_club_hunting">hońtwjerske towarstwo</string>
+	<string name="poi_club_shooting">třělerske towarstwo</string>
+	<string name="poi_club_tourism">turistiske towarstwo</string>
+	<string name="poi_club_freemasonry">swobodnomurjernja</string>
+	<string name="poi_club_sailing">płachtowe towarstwo</string>
+	<string name="poi_club_scout">skawtske towarstwo</string>
+
+	<string name="poi_piste">pista</string>
+	<string name="poi_piste_nordic">nordiska pista</string>
+	<string name="poi_piste_sleigh">sankowa pista</string>
+	<string name="poi_piste_sled">sanjowa pista</string>
+	<string name="poi_piste_snow_park">sněhowy park</string>
+	<string name="poi_piste_ice_skate">smykanišćo</string>
+	<string name="poi_ski_rental">wupožčenje sněhakow</string>
+
+	<string name="poi_library">knihownja</string>
+	<string name="poi_cinema">kino</string>
+	<string name="poi_casino">kasino</string>
+	<string name="poi_community_centre">wobydlerski centrum</string>
+	<string name="poi_social_centre">socialny centrum</string>
+	<string name="poi_theatre">dźiwadło</string>
+	<string name="poi_theatre_genre_circus">cirkus</string>
+	<string name="poi_gallery">wuměłstwowa galerija</string>
+	<string name="poi_garden_type_residential">typ zahrody: priwatna</string>
+	<string name="poi_garden_type_community">typ zahrody: zhromadna</string>
+	<string name="poi_garden_type_private">typ zahrody: priwatna</string>
+	<string name="poi_garden_type_botanical">typ zahrody: botaniska</string>
+
+	<string name="poi_capacity">kapacita</string>
+	<string name="poi_aerialway_capacity">kapacita na hodźinu</string>
+	<string name="poi_payment_bitcoin_yes">Bitcoin</string>
+	<string name="poi_payment_bitcoin_no">Bitcoin so njeakceptuje</string>
+	<string name="poi_payment_visa_yes">Visa</string>
+	<string name="poi_payment_visa_no">Visa-karty so njeakceptuja</string>
+	<string name="poi_payment_mastercard_yes">MasterCard</string>
+	<string name="poi_payment_mastercard_no">MasterCard so njeakceptuje</string>
+	<string name="poi_payment_maestro_yes">Maestro-karty</string>
+	<string name="poi_payment_maestro_no">Maestro-karty so njeakceptuja</string>
+	<string name="poi_payment_american_express_yes">American Express (AMEX)</string>
+	<string name="poi_payment_american_express_no">American Express (AMEX) so njeakceptuje</string>
+	<string name="poi_payment_diners_club_yes">Diners Club</string>
+	<string name="poi_payment_diners_club_no">Diners Club so njeakceptuje</string>
+	<string name="poi_payment_via_verde_yes">Via Verde</string>
+	<string name="poi_payment_via_verde_no">Via Verde so njeakceptuje</string>
+	<string name="poi_payment_paypal_yes">PayPal</string>
+	<string name="poi_payment_paypal_no">PayPal so njeakceptuje</string>
+	<string name="poi_payment_u_key_yes">U-Key</string>
+	<string name="poi_payment_u_key_no">"U-Key  so njeakceptuje"</string>
+	<string name="poi_payment_golden_crown_yes">Golden Crown</string>
+	<string name="poi_payment_golden_crown_no">Golden Crown so njeakceptuje</string>
+	<string name="poi_payment_union_card_yes">Union Card</string>
+	<string name="poi_payment_union_card_no">Union Card so njeakceptuje</string>
+	<string name="poi_payment_yandexmoney_yes">Yandex.Money</string>
+	<string name="poi_payment_yandexmoney_no">Yandex.Money so njeakceptuje</string>
+	<string name="poi_diet_halal_filter_yes">halal</string>
+	<string name="poi_diet_halal_only">jenož halal</string>
+	<string name="poi_diet_halal_yes">halal</string>
+	<string name="poi_diet_halal_no">halal: ně</string>
+	<string name="poi_drive_in_yes">haj</string>
+	<string name="poi_drive_through_yes">haj</string>
+	<string name="poi_microbrewery_yes">mała piwarnja</string>
+	<string name="poi_microbrewery_no">žana mała piwarnja</string>
+
+	<string name="poi_takeaway_filter_yes">haj</string>
+	<string name="poi_takeaway_yes">k sobuwzaću</string>
+	<string name="poi_takeaway_no">nic k sobuwzaću</string>
+	<string name="poi_takeaway_only">jenož k sobuwzaću</string>
+
+	<string name="poi_delivery_filter_yes">haj</string>
+	<string name="poi_delivery_yes">dodawanje</string>
+	<string name="poi_delivery_no">žane dodawanje</string>
+	<string name="poi_delivery_only">jenož dodawanje</string>
+
+	<string name="poi_outdoor_seating_filter_yes">haj</string>
+	<string name="poi_outdoor_seating_yes">wonka sedźeć: haj</string>
+	<string name="poi_outdoor_seating_no">wonka sedźeć: ně</string>
+	<string name="poi_outdoor_seating_terrace">wonka sedźeć: terasa</string>
+	<string name="poi_outdoor_seating_sidewalk">wonka sedźeć: na chódniku</string>
+	<string name="poi_outdoor_seating_garden">wonka sedźeć: w zahrodźe</string>
+	<string name="poi_cocktails_yes">haj</string>
+
+	<string name="poi_service_repair">reparatura</string>
+	<string name="poi_service_repair_no">žana reparatura</string>
+	<string name="poi_motorcycle_repair">reparatura motorskich</string>
+	<string name="poi_self_service_yes">haj</string>
+	<string name="poi_self_service_no">žane samoposłužowanje</string>
+	<string name="poi_automated_yes">haj</string>
+	<string name="poi_brushless_yes">haj</string>
+	<string name="poi_public_bath">zjawne kupjele</string>
+
+	<string name="poi_male_yes">mužojo</string>
+	<string name="poi_male_no">zakazane za mužow</string>
+	<string name="poi_female_yes">žony</string>
+	<string name="poi_female_no">zakazane za žony</string>
+	<string name="poi_indoor_yes">nutřka</string>
+	<string name="poi_indoor_no">wonka</string>
+	<string name="poi_toilets_yes">haj</string>
+	<string name="poi_toilets_no">bjez nuznikow</string>
+	<string name="poi_toilets_wheelchair_yes">přistup k nuznikam za jězbne stoły: haj</string>
+	<string name="poi_toilets_wheelchair_no">přistup k nuznikam za jězbne stoły: ně</string>
+	<string name="poi_toilets_access_customers">přistup k nuznikam: kupcy</string>
+	<string name="poi_toilets_access_public">přistup k nuznikam: zjawny</string>
+
+	<string name="poi_diaper_yes">pjeluškowanske blido</string>
+	<string name="poi_diaper_no">žane pjeluškowanske blido</string>
+	<string name="poi_vending_cigarettes">cigarety</string>
+	<string name="poi_vending_public_transport_tickets">"jězdźenki za zjawny wobchad "</string>
+	<string name="poi_vending_drinks">napoje</string>
+	<string name="poi_vending_sweets">słódkosće</string>
+	<string name="poi_vending_condoms">kondomy</string>
+	<string name="poi_vending_stamps">listowe znamki</string>
+	<string name="poi_vending_food">jědźe</string>
+	<string name="poi_vending_drinks_food">napoje a jědźe</string>
+	<string name="poi_vending_milk">mloko</string>
+	<string name="poi_vending_bread">chlěb</string>
+	<string name="poi_vending_chewing_gums">žwjenkački</string>
+	<string name="poi_vending_coffee">kofej</string>
+	<string name="poi_vending_drinks_sweets">napoje a słódkosće</string>
+	<string name="poi_vending_dvd">DVDki</string>
+	<string name="poi_vending_candles">swěčki</string>
+	<string name="poi_vending_toys">hrajki</string>
+	<string name="poi_vending_ice_cream">lód</string>
+	<string name="poi_vending_sim_cards">SIM-karty</string>
+
+	<string name="poi_memorial_war">wojerski pomnik</string>
+	<string name="poi_memorial_plaque">wopomnjenska tafla</string>
+	<string name="poi_memorial_statue">postawa</string>
+	<string name="poi_memorial_stone">kamjeń</string>
+	<string name="poi_memorial_stele">stela</string>
+	<string name="poi_memorial_bust">połpostawa</string>
+	<string name="poi_memorial_stolperstein">kopolak-plesternak</string>
+	<string name="poi_memorial_obelisk">obelisk</string>
+	<string name="poi_memorial_column">stołp</string>
+	<string name="poi_inscription">napismo</string>
+	<string name="poi_historic_quarry">historiska skała</string>
+
+	<string name="poi_resource_asbestos">asbest</string>
+	<string name="poi_resource_basalt">stołpowc</string>
+	<string name="poi_resource_bauxite">bawksit</string>
+	<string name="poi_resource_clay">běła hlina</string>
+	<string name="poi_resource_coal">wuhlo</string>
+	<string name="poi_resource_copper">kopor</string>
+	<string name="poi_resource_diamond">diamanty</string>
+	<string name="poi_resource_gas">płun</string>
+	<string name="poi_resource_gold">złoto</string>
+	<string name="poi_resource_graphite">grafit</string>
+	<string name="poi_resource_lead">wołoj</string>
+	<string name="poi_resource_limestone">wapno</string>
+	<string name="poi_resource_marble">marmor</string>
+	<string name="poi_resource_mercury">žiwe slěbro</string>
+	<string name="poi_shelter_type_tent">typ podstupa: stan</string>
+	<string name="poi_shelter_type_abandoned">typ podstupa: wopušćeny</string>
+
+	<string name="poi_internet_access_type_public">typ přistupa do interneta: zjawny</string>
+	<string name="poi_internet_access_type_service">typ přistupa do interneta: serwis</string>
+	<string name="poi_artwork_type_sculpture">typ twórby: skulptura</string>
+	<string name="poi_artwork_type_statue">typ twórby: postawa</string>
+	<string name="poi_artwork_type_mural">typ twórby: nasćěnowa mólba</string>
+	<string name="poi_artwork_type_architecture">typ twórby: architektura</string>
+	<string name="poi_artwork_type_painting">typ twórby: mólba</string>
+	<string name="poi_artwork_type_stone">typ twórby: kamjeń</string>
+	<string name="poi_artwork_type_bust">typ twórby: połpostawa</string>
+	<string name="poi_artwork_type_installation">typ twórby: instalacija</string>
+	<string name="poi_artwork_type_mosaic">typ twórby: mozaik</string>
+	<string name="poi_artwork_type_relief">typ twórby: relief</string>
+	<string name="poi_artwork_type_graffiti">typ twórby: grafiti</string>
+	<string name="poi_artwork_type_stele">typ twórby: stela</string>
+	<string name="poi_artwork_type_fountain">typ twórby: studnja</string>
+
+	<string name="poi_bridge_type_movable">typ mosta: pohibliwy</string>
+	<string name="poi_bridge_movable_drawbridge">typ pohibliweho mosta: ćahawy móst</string>
+	<string name="poi_industrial_oil">typ: wolijowa industrija</string>
+	<string name="poi_industrial_factory">typ: fabrika</string>
+	<string name="poi_industrial_gas">typ: płunowa industrija</string>
+	<string name="poi_industrial_timber">typ: drjewo</string>
+	<string name="poi_industrial_refinery">typ: rafinerija</string>
+	<string name="poi_industrial_warehouse">typ: skład</string>
+	<string name="poi_industrial_auto_wrecker">typ: šrotnišćo</string>
+	<string name="poi_industrial_agriculture">typ: ratarstwo</string>
+	<string name="poi_industrial_brewery">typ: piwarnja</string>
+	<string name="poi_industrial_brickyard">typ: cyhelnica</string>
+	<string name="poi_industrial_sawmill">typ: piła</string>
+	<string name="poi_industrial_water_purification">typ: wodowa čisćernja</string>
+	<string name="poi_industrial_port">typ: přistaw</string>
+	<string name="poi_industrial_depot">typ: depot</string>
+
+	<string name="poi_castle_type_stately">typ hrodu: statny</string>
+	<string name="poi_castle_type_defensive">typ hrodu: zakitowanski</string>
+	<string name="poi_castle_type_fortress">typ hrodu: twjerdźizna</string>
+	<string name="poi_castle_type_palace">typ hrodu: palast</string>
+	<string name="poi_castle_type_kremlin">typ hrodu: krjeml</string>
+	<string name="poi_castle_type_defensive_stately">typ hrodu: zakitowanski, statny</string>
+	<string name="poi_castle_type_castrum">typ hrodu: romski</string>
+	<string name="poi_tomb_war_grave">typ: wojerski row</string>
+	<string name="poi_tomb_tumulus">typ: mohila</string>
+	<string name="poi_tomb_vault">typ: rownišćo</string>
+	<string name="poi_tomb_mausoleum">typ: mawsolej</string>
+	<string name="poi_tomb_sarcophagus">typ: sarkofag</string>
+	<string name="poi_tomb_crypt">typ: krypta</string>
+	<string name="poi_tomb_pyramid">typ: pyramida</string>
+
+	<string name="poi_historic_stone">historiski kamjeń</string>
+	<string name="poi_stone_type_conciliation_cross">typ: pokutny křiž</string>
+	<string name="poi_stone_type_coat_of_arms">typ: wopon</string>
+
+	<string name="poi_material_wood">maćizna: drjewo</string>
+	<string name="poi_material_metal">maćizna: kow</string>
+	<string name="poi_material_concrete">maćizna: beton</string>
+	<string name="poi_material_steel">maćizna: wocl</string>
+	<string name="poi_material_stone">maćizna: kamjeń</string>
+	<string name="poi_material_masonry">maćizna: murizna</string>
+	<string name="poi_material_brick">maćizna: cyhel</string>
+	<string name="poi_material_plastic">maćizna: plasta</string>
+	<string name="poi_material_sandstone">maćizna: pěskowc</string>
+	<string name="poi_material_granite_stone">maćizna: zornowc</string>
+	<string name="poi_material_metal_wood">maćizna: kow;drjewo</string>
+	<string name="poi_material_glass">maćizna: škleńca</string>
+	<string name="poi_material_bronze">maćizna: bronza</string>
+	<string name="poi_material_earth">maćizna: zemja</string>
+	<string name="poi_material_limestone">maćizna: wapno</string>
+	<string name="poi_material_marble">maćizna: marmor</string>
+	<string name="poi_material_aluminium">maćizna: aluminij</string>
+
+	<string name="poi_site_type_megalith">megalit</string>
+	<string name="poi_site_type_fortification">wobtwjerdźenje</string>
+	<string name="poi_site_type_settlement">sydlišćo</string>
+	<string name="poi_site_type_city">město</string>
+	<string name="poi_site_type_hut_circle">kruh chěžkow</string>
+	<string name="poi_site_type_necropolis">nekropola</string>
+	<string name="poi_megalith_type_menhir">typ megalita: menhir</string>
+	<string name="poi_megalith_type_stone_circle">typ megalita: skalny wobkruh</string>
+	<string name="poi_fortification_type_hill_fort">typ wobtwjerdźenja: nahórska twjerdźizna</string>
+	<string name="poi_fortification_type_limes">typ wobtwjerdźenja: limes</string>
+	<string name="poi_historic_farm">historiska farma</string>
+	<string name="poi_historic_railway_station">historiske dwórnišćo</string>
+
+	<string name="poi_historic_gallows">historiska šibjeńca</string>
+	<string name="poi_historic_railway">historiska železnica</string>
+
+	<string name="poi_square">naměsto</string>
+	<string name="poi_artist_name">wuměłc</string>
+	<string name="poi_sculptor">rězbar</string>
+
+	<string name="poi_building_type_church">typ twarjenja: cyrkej</string>
+	<string name="poi_building_type_chapel">typ twarjenja: kapałka</string>
+	<string name="poi_building_type_mosque">typ twarjenja: mošeja</string>
+	<string name="poi_building_type_temple">typ twarjenja: swjatnica</string>
+	<string name="poi_building_type_cathedral">typ twarjenja: katedrala</string>
+	<string name="poi_building_type_monastery">typ twarjenja: klóšter</string>
+	<string name="poi_building_type_basilica">typ twarjenja: bazilika</string>
+	<string name="poi_building_type_synagogue">typ twarjenja: synagoga</string>
+	<string name="poi_building_type_shrine">typ twarjenja: swjatnišćo</string>
+
+	<string name="poi_cross">křiž</string>
+	<string name="poi_summit_cross">wjerškowy křiž: haj</string>
+
+	<string name="poi_prison_camp">něhdyše lěhwo za jatych</string>
+	<string name="poi_concentration_camp">typ: koncentraciske lěhwo</string>
+	<string name="poi_pow_camp">typ: lěhwo za jatych wojakow</string>
+	<string name="poi_labor_camp">typ: dźěłanske lěhwo</string>
+	<string name="poi_concentration_camp_nazism">typ: nacistiski</string>
+	<string name="poi_concentration_camp_gulag">typ: gulag</string>
+
+	<string name="poi_temperature">temperatura</string>
+	<string name="poi_bathing_yes">kupanje: haj</string>
+	<string name="poi_bathing_no">kupanje: ně</string>
+
+	<string name="poi_boat_storage">składnišćo čołmikow</string>
+
+	<string name="poi_cargo_bicycle">kolesa</string>
+	<string name="poi_cargo_container">kontejnery</string>
+	<string name="poi_aerialway_length">dołhota</string>
+
+	<string name="poi_building_type_pyramid">typ twarjenja: pyramida</string>
+
+	<string name="poi_nuclear_explosion_type_underwater">typ rozbuchnjenja: pod wodu</string>
+	<string name="poi_capacity_beds">kapacita (łoža)</string>
+
+	<string name="poi_fire_hydrant_flow_capacity">kapacita hydranta</string>
+	<string name="poi_gambling_type">typ</string>
+	<string name="poi_animal_keeping_type_paddock">typ: kopl</string>
+	<string name="poi_animal_keeping_type_open_stable">typ: wotewrjena hródź</string>
+
+	<string name="poi_nightclub">nócny klub</string>
+	<string name="poi_stripclub">stripowy klub</string>
+	<string name="poi_playground">hrajkanišco</string>
+	<string name="poi_bench">ławka</string>
+	<string name="poi_park">park</string>
+	<string name="poi_cafe">kofejownja</string>
+	<string name="poi_biergarten">piwowa zahrodka</string>
+	<string name="poi_restaurant">hosćenc</string>
+	<string name="poi_bar">bara</string>
+	<string name="poi_pub">korčma</string>
+	<string name="poi_craft_beekeeper">pčołar</string>
+	<string name="poi_craft_blacksmith">kowar</string>
+	<string name="poi_craft_brewery">piwarnja</string>
+	<string name="poi_craft_carpenter">blidar</string>
+	<string name="poi_craft_electrician">elektrikar</string>
+	<string name="poi_craft_gardener">zahrodnik</string>
+	<string name="poi_craft_optician">optikar</string>
+	<string name="poi_craft_painter">moler</string>
+	<string name="poi_craft_watchmaker">časnikar</string>
+	<string name="poi_shower">duša</string>
+	<string name="poi_sauna">sawna</string>
+	<string name="poi_brothel">bordel</string>
+	<string name="poi_crematorium">krematorij</string>
+	<string name="poi_bank">banka</string>
+	<string name="poi_peak">wjeršk</string>
+	<string name="poi_saddle">sedło</string>
+	<string name="poi_volcano">wulkan</string>
+	<string name="poi_glacier">lodowc</string>
+	<string name="poi_waterfall">wodopad</string>
+	<string name="poi_river">rěka</string>
+	<string name="poi_stream">rěčka</string>
+	<string name="poi_beach">přibrjóh</string>
+	<string name="poi_bay">zaliw</string>
+	<string name="poi_fjord">fjord</string>
+	<string name="poi_valley">doł</string>
+	<string name="poi_water">woda</string>
+	<string name="poi_tree">štom</string>
+	<string name="poi_military_bunker">wojerski bunker</string>
+	<string name="poi_military_barracks">kasarna</string>
+	<string name="poi_wiki_place">Wikipedija</string>
+	<string name="poi_wiki_lang_en">jendźelska Wikipedija</string>
+	<string name="poi_wiki_lang_be">běłoruska Wikipedija</string>
+	<string name="poi_wiki_lang_cs">čěska Wikipedija</string>
+	<string name="poi_wiki_lang_de">němska Wikipedija</string>
+	<string name="poi_entrance_main">hłowny zachod</string>
+	<string name="poi_entrance">zachod</string>
+	<string name="poi_entrance_exit">wuchod</string>
+
+	<string name="poi_route_hiking_iwn_poi">mjezynarodna pućowanska šćežka</string>
+	<string name="poi_route_hiking_nwn_poi">nacionalna pućowanska šćežka</string>
+	<string name="poi_route_hiking_rwn_poi">regionalna pućowanska šćežka</string>
+	<string name="poi_route_hiking_lwn_poi">lokalna pućowanska šćežka</string>
+	<string name="poi_opening_hours">wotewrjenske časy</string>
+	<string name="poi_description">wopis</string>
+	<string name="poi_phone">telefon</string>
+	<string name="poi_website">webstrona</string>
+	<string name="poi_email">mejlka</string>
+	<string name="poi_fax">faks</string>
+	<string name="facebook">Facebook</string>
+	<string name="twitter">Twitter</string>
+	<string name="poi_skype">Skype</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_height">wysokosć nad mórskej hładźinu</string>
+	<string name="poi_ele">wysokosć nad mórskej hładźinu</string>
+	<string name="poi_abandoned">wopušćene</string>
+	<string name="poi_abandoned_poi">wopušćeny objekt</string>
+	<string name="poi_operator">wobhospodar</string>
+	<string name="poi_fee_yes">haj</string>
+	<string name="poi_fee_no">ně</string>
+	<string name="poi_drinking_water_yes">haj</string>
+	<string name="poi_drinking_water_no">ně</string>
+	<string name="poi_seasonal_yes">haj</string>
+	<string name="poi_seasonal_no">ně</string>
+	<string name="poi_seasonal_spring">w nalěću</string>
+	<string name="poi_seasonal_summer">w lěću</string>
+	<string name="poi_seasonal_autumn">w nazymje</string>
+	<string name="poi_seasonal_winter">w zymje</string>
+	<string name="poi_crossing_traffic_signals">z amplu</string>
+	<string name="poi_crossing_uncontrolled">njekontrolowany</string>
+	<string name="poi_crossing_unmarked">njemarkěrowany</string>
+	<string name="poi_wheelchair_accessibility">přistupnosć za jězbne stoły</string>
+	<string name="poi_wheelchair_yes">haj</string>
+	<string name="poi_wheelchair_no">ně</string>
+	<string name="poi_wheelchair_limited">wobmjezowana</string>
+	<string name="poi_access_private">priwatny přistup</string>
+	<string name="poi_access_no">žadyn přistup</string>
+	<string name="poi_content_water">wobsah: woda</string>
+	<string name="poi_content_oil">wobsah: wolij</string>
+	<string name="poi_content_fuel">wobsah: nafta</string>
+	<string name="poi_content_wine">wobsah: wino</string>
+	<string name="poi_content_gas">wobsah: płun</string>
+	<string name="poi_content_beer">wobsah: piwo</string>
+	<string name="poi_content_salt">wobsah: sól</string>
+	<string name="poi_nudism_yes">dowolene</string>
+	<string name="poi_nudism_no">zakazane</string>
+	<string name="poi_population">wobydlerstwo</string>
+	<string name="poi_trees_olive">wolijowc</string>
+	<string name="poi_trees_apple">jabłučina</string>
+	<string name="poi_trees_orange">oranža</string>
+	<string name="poi_trees_banana">banana</string>
+	<string name="poi_trees_hazel">lěšćina</string>
+	<string name="poi_trees_cherry">wišnina</string>
+	<string name="poi_trees_walnut">włóski worjech</string>
+	<string name="poi_trees_plum">slowka</string>
+	<string name="poi_trees_peach">brěšk</string>
+	<string name="poi_trees_tea">čaj</string>
+	<string name="poi_trees_coca">koka</string>
+	<string name="poi_trees_kiwi">kiwi</string>
+	<string name="poi_trees_nectorine">nektarina</string>
+	<string name="poi_trees_mango">mango</string>
+	<string name="poi_trees_coffea">kofej</string>
+	<string name="poi_animal_shelter_dog">psy</string>
+	<string name="poi_animal_shelter_cat">kóčki</string>
+	<string name="poi_animal_shelter_dog_cat">psy, kóčki</string>
+	<string name="poi_animal_shelter_bird">ptaki</string>
+	<string name="poi_animal_shelter_horse">konje</string>
+	<string name="poi_animal_shelter_mammal">cycaki</string>
+	<string name="poi_animal_shelter_fish">ryby</string>
+
+	<string name="poi_seats">sydła</string>
+	<string name="poi_building">twarjenje</string>
+	<string name="poi_generator_source_coal">žórło energije: wuhlo</string>
+	<string name="poi_generator_source_gas">žórło energije: płun</string>
+	<string name="poi_generator_source_nuclear">žórło energije: nuklearne</string>
+	<string name="poi_generator_source_solar">žórło energije: solarne</string>
+	<string name="poi_generator_source_hydro">žórło energije: woda</string>
+	<string name="poi_generator_source_wind">žórło energije: wětřik</string>
+	<string name="poi_generator_source_geothermal">žórło energije: geotermija</string>
+	<string name="poi_generator_source_oil">žórło energije: wolij</string>
+	<string name="poi_generator_source_diesel">žórło energije: diesel</string>
+
+	<string name="poi_int_name">mjezynarodne mjeno</string>
+	<string name="poi_nat_name">nacionalne mjeno</string>
+	<string name="poi_reg_name">regionalne mjeno</string>
+	<string name="poi_loc_name">lokalne mjeno</string>
+	<string name="poi_old_name">stare mjeno</string>
+	<string name="poi_alt_name">alternatiwne mjeno</string>
+
+	<string name="poi_information_map">karta</string>
+	<string name="poi_information_hikingmap">pućowanska karta</string>
+	<string name="poi_information_nature">přiroda</string>
+	<string name="poi_information_history">stawizny</string>
+	<string name="poi_information_bicyclemap">kolesowarska karta</string>
+	<string name="poi_board_type_geology">geologija</string>
+	<string name="poi_board_type_public_transport">zjawny wobchad</string>
+	<string name="poi_board_type_technology">technologija</string>
+	<string name="poi_board_type_astronomy">astronomija</string>
+
+	<string name="poi_fireplace_yes">haj</string>
+	<string name="poi_fireplace_no">žane wohnišćo</string>
+
+	<string name="poi_covered_yes">haj</string>
+	<string name="poi_smoking_no">zakazane</string>
+	<string name="poi_smoking_outside">jenož wonka</string>
+	<string name="poi_smoking_yes">dowolene</string>
+	<string name="poi_smoking_separated">w separatnej stwě</string>
+	<string name="poi_smoking_isolated">w separatnej stwě</string>
+	<string name="poi_smoking_dedicated">za kurjerjow</string>
+
+	<string name="poi_toll_yes">mawt</string>
+	<string name="poi_toll_no">žadyn mawt</string>
+	<string name="poi_tactile_paving_yes">haj</string>
+	<string name="poi_traffic_signals_sound_yes">haj</string>
+	<string name="poi_traffic_signals_sound_no">ně</string>
+	<string name="poi_railway_crossing">železniski přechod</string>
+	<string name="poi_garden">zahroda</string>
+
+	<string name="poi_heath">hola</string>
+	<string name="poi_sand">pěsk</string>
+
+	<string name="poi_piste_grooming_no">ně</string>
+	<string name="poi_garden_style_french">typ zahrody: francoska</string>
+	<string name="poi_garden_style_english">typ zahrody: jendźelska</string>
+	<string name="poi_garden_style_japanese">typ zahrody: japanska</string>
+
+	<string name="poi_capacity_disabled_yes">haj</string>
+	<string name="poi_capacity_disabled_no">žane wosebite městna za zbrašenych</string>
+	<string name="poi_capacity_disabled">wosebite městna za zbrašenych</string>
+	<string name="poi_capacity_women_yes">wosebite městna za žony</string>
+	<string name="poi_capacity_women_no">žane wosebite městna za žony</string>
+	<string name="poi_capacity_women">wosebite městna za žony</string>
+	<string name="poi_capacity_pupils">wosebite městna za studentow</string>
+	<string name="poi_capacity_teachers">wosebite městna za wučerjow</string>
+	<string name="poi_capacity_parent_yes">wosebite městna za staršich</string>
+	<string name="poi_capacity_parent_no">žane wosebite městna za staršich</string>
+	<string name="poi_capacity_parent">wosebite městna za staršich</string>
+
+	<string name="poi_aerialway_heating_yes">haj</string>
+	<string name="poi_aerialway_heating_no">žane tepjenje</string>
+	<string name="poi_aerialway_bicycle_yes">dowolene</string>
+	<string name="poi_aerialway_bicycle_no">koleso: zakazane</string>
+	<string name="poi_aerialway_bicycle_summer">jenož w lěću dowolene</string>
+	<string name="poi_aerialway_access_entry">jenož zachod</string>
+	<string name="poi_aerialway_access_exit">jenož wuchod</string>
+	<string name="poi_aerialway_access_both">zachod a wuchod</string>
+	<string name="poi_rooms">stwy</string>
+
+	<string name="poi_love_hotel">lubosćinski hotel</string>
+
+	<string name="poi_payment_coins_yes">pjenježki</string>
+	<string name="poi_payment_coins_no">pjenježki so njeakceptuja</string>
+	<string name="poi_payment_telephone_cards_yes">telefonowe karty</string>
+	<string name="poi_payment_telephone_cards_no">telefonowe karty so njeakceptuja</string>
+	<string name="poi_payment_credit_cards_yes">kreditne karty</string>
+	<string name="poi_payment_credit_cards_no">kreditne karty so njeakceptuja</string>
+	<string name="poi_payment_notes_yes">bankowki</string>
+	<string name="poi_payment_notes_no">bankowki so njeakceptuja</string>
+	<string name="poi_payment_cash_yes">hotowe pjenjezy</string>
+	<string name="poi_payment_cash_no">hotowe pjenjezy so njeakceptuja</string>
+	<string name="poi_payment_dkv_yes">DKV</string>
+	<string name="poi_payment_dkv_no">DKV so njeakceptuje</string>
+	<string name="poi_payment_efectivo_yes">Efectivo</string>
+	<string name="poi_payment_efectivo_no">Efectivo so njeakceptuje</string>
+	<string name="poi_payment_girocard_yes">Girocard</string>
+	<string name="poi_payment_girocard_no">Girocard so njeakceptuje</string>
+	<string name="poi_payment_discover_card_yes">Discover Card</string>
+	<string name="poi_payment_discover_card_no">Discover Card so njeakceptuje</string>
+	<string name="poi_payment_visa_electron_yes">Visa Electron</string>
+	<string name="poi_payment_visa_electron_no">Visa Electron so njeakceptuje</string>
+	<string name="poi_payment_litecoin_yes">Litecoin</string>
+	<string name="poi_payment_litecoin_no">Litecoin so njeakceptuje</string>
+	<string name="poi_payment_cheque_yes">šek</string>
+	<string name="poi_payment_cheque_no">"šeki  so njeakceptuja"</string>
+	<string name="poi_resource_iron_ore">železowa ruda</string>
+	<string name="poi_resource_lignite">lignit</string>
+	<string name="poi_resource_nickel">nikl</string>
+	<string name="poi_resource_oil">wolij</string>
+	<string name="poi_resource_opal">opal</string>
+	<string name="poi_resource_platinum">platin</string>
+	<string name="poi_resource_salt">sól</string>
+	<string name="poi_resource_sand">pěsk</string>
+	<string name="poi_resource_sandstone">pěskowc</string>
+	<string name="poi_resource_silver">slěbro</string>
+	<string name="poi_resource_stone">kamjeń</string>
+	<string name="poi_resource_tin">cyn</string>
+	<string name="poi_resource_uranium">uran</string>
+	<string name="poi_resource_water">woda</string>
+	<string name="poi_resource_zinc">cynk</string>
+	<string name="poi_wetland_wet_meadow">łučina</string>
+	<string name="poi_wetland_bog">bahno</string>
+	<string name="poi_wetland_marsh">marša</string>
+	<string name="poi_wetland_reedbed">sćina</string>
+	<string name="poi_wetland_swamp">tonidło</string>
+	<string name="poi_wetland_tidalflat">wat</string>
+	<string name="poi_wetland_saltmarsh">słona marša</string>
+	<string name="poi_wetland_mangrove">mangrowy</string>
+	<string name="poi_beach_sand">pěsk</string>
+	<string name="poi_beach_shingle">drjebizna</string>
+	<string name="poi_chimney">wuheń</string>
+	<string name="poi_palm">palma</string>
+	<string name="poi_cypress">cypresa</string>
+	<string name="poi_flagpole">chorhojowy sćežor</string>
+
+	<string name="poi_bench_yes">haj</string>
+	<string name="poi_bench_no">bjez ławki</string>
+	<string name="poi_bin_yes">ze smjećnikom</string>
+	<string name="poi_bin_no">bjez smjećnika</string>
+
+	<string name="poi_shelter_type_public_transport">zjawny wobchad</string>
+	<string name="poi_shelter_type_picnic_shelter">piknik</string>
+	<string name="poi_shelter_type_weather_shelter">wjedro</string>
+	<string name="poi_shelter_type_building">twarjenje</string>
+	<string name="poi_internet_access_type_wlan">WLAN</string>
+	<string name="poi_internet_access_type_wired">z kablom</string>
+	<string name="poi_internet_access_type_no">žadyn přistup do interneta</string>
+	<string name="poi_internet_access_type_yes">přistup do interneta</string>
+
+	<string name="poi_width">šěrokosć</string>
+
+	<string name="poi_architect_name">architekt</string>
+
+	<string name="poi_architecture_modern">architektura: moderna</string>
+	<string name="poi_architecture_stalinist_neoclassicism">architektura: stalinistiski neoklasicizm</string>
+	<string name="poi_architecture_constructivism">architektura: konstruktiwizm</string>
+	<string name="poi_architecture_umgebinde">architektura: chěža ze stołom</string>
+	<string name="poi_architecture_timber_frame">architektura: tykowana</string>
+	<string name="poi_architecture_neoclassicism">architektura: neoklasicizm</string>
+	<string name="poi_architecture_brutalism">architektura: brutalizm</string>
+	<string name="poi_architecture_classicism">architektura: klasicizm</string>
+	<string name="poi_architecture_gothic">architektura: gotika</string>
+	<string name="poi_architecture_oldrussian">architektura: staroruska</string>
+	<string name="poi_architecture_baroque">architektura: barokna</string>
+	<string name="poi_tunnel_waterway">wodowy tunl</string>
+	<string name="poi_tunnel_car">dróžny tunl</string>
+	<string name="poi_tunnel_pedestrian">tunl za pěškow</string>
+	<string name="poi_tunnel_railway">železniski tunl</string>
+	<string name="poi_bridge_car">dróžny móst</string>
+	<string name="poi_bridge_pedestrian">móst za pěškow</string>
+	<string name="poi_bridge_bicycle">kolesowarski móst</string>
+	<string name="poi_bridge_railway">železniski móst</string>
+	<string name="poi_bridge_waterway">wodowy móst</string>
+	<string name="poi_bridge_structure_arch">struktura mosta: wobłuk</string>
+	<string name="poi_bridge_structure_viaduct">struktura mosta: wiadukt</string>
+	<string name="poi_surface_unpaved">powjerch: njewobtwjerdźeny</string>
+	<string name="poi_surface_paved">powjerch: wobtwjerdźeny</string>
+	<string name="poi_surface_asphalt">powjerch: asfalt</string>
+	<string name="poi_surface_concrete">powjerch: beton</string>
+	<string name="poi_surface_sett">powjerch: plesternaki</string>
+	<string name="poi_surface_cobblestone">powjerch: horbaty plester</string>
+	<string name="poi_surface_pebblestone">powjerch: křemjeń</string>
+	<string name="poi_surface_stone">powjerch: kamjeń</string>
+	<string name="poi_surface_metal">powjerch: šoter</string>
+	<string name="poi_surface_wood">powjerch: drjewo</string>
+	<string name="poi_surface_gravel">powjerch: šćerk</string>
+	<string name="poi_surface_fine_gravel">powjerch: šćerk</string>
+	<string name="poi_surface_sand">powjerch: pěsk</string>
+	<string name="poi_surface_grass">powjerch: trawa</string>
+	<string name="poi_surface_dirt">powjerch: proch</string>
+	<string name="poi_surface_ice">powjerch: lód</string>
+	<string name="poi_surface_salt">powjerch: sól</string>
+	<string name="poi_surface_snow">powjerch: sněh</string>
+
+	<string name="poi_route_bus_ref">bus</string>
+	<string name="poi_route_trolleybus_ref">trolejbus</string>
+	<string name="poi_route_tram_ref">tramwajka</string>
+	<string name="poi_route_train_ref">ćah</string>
+	<string name="poi_route_funicular_ref">powjaznica</string>
+	<string name="poi_route_ferry_ref">přewoz</string>
+
+	<string name="poi_historic_yes">historiski objekt</string>
+	<string name="poi_service_bicycle_repair_yes">reparatura</string>
+	<string name="poi_service_bicycle_repair_no">reparatura kolesow: ně</string>
+	<string name="poi_service_bicycle_rental_yes">wupožčenje</string>
+	<string name="poi_service_bicycle_rental_no">wupožčenje kolesow: ně</string>
+	<string name="poi_elevator_yes">z liftom</string>
+	<string name="poi_elevator_no">bjez lifta</string>
+
+	<string name="poi_technical_monument">techniski pomnik</string>
+
+	<string name="poi_parish">fara</string>
+	<string name="poi_fuel_autogas">awtopłun</string>
+	<string name="poi_street_lamp">latarnja</string>
+
+	<string name="poi_crop_rice">płód: rajs</string>
+	<string name="poi_crop_grass">płód: trawa</string>
+	<string name="poi_crop_corn">płód: kukurica</string>
+	<string name="poi_crop_sugarcane">płód: cokorina</string>
+	<string name="poi_crop_wheat">płód: pšeńca</string>
+	<string name="poi_crop_soy">płód: soja</string>
+	<string name="poi_crop_barley">płód: ječmjeń</string>
+	<string name="poi_crop_vegetables">płód: zeleniny</string>
+	<string name="poi_crop_hop">płód: chmjel</string>
+	<string name="poi_crop_rape">płód: rěpik</string>
+	<string name="poi_crop_beet">płód: rěpa</string>
+	<string name="poi_crop_lavender">płód: lawendl</string>
+	<string name="poi_crop_tea">płód: čaj</string>
+	<string name="poi_crop_coffee">płód: kofej</string>
+	<string name="poi_crop_sunflower">płód: słónčna róža</string>
+	<string name="poi_crop_raspberry">płód: maleny</string>
+	<string name="poi_crop_tobacco">płód: tobak</string>
+	<string name="poi_crop_strawberry">płód: truskalcy</string>
+	<string name="poi_crop_vegetables_flowers">płód: zeleniny, kwětki</string>
+	<string name="poi_crop_asparagus">płód: hromak</string>
+	<string name="poi_crop_flowers">płód: kwětki</string>
+
+	<string name="poi_surveillance_indoor">dohladowanje: nutřka</string>
+	<string name="poi_surveillance_outdoor">dohladowanje: wonka</string>
+	<string name="poi_surveillance_public">dohladowanje: zjawne</string>
+
+	<string name="poi_clothes_women">žony</string>
+	<string name="poi_clothes_underwear">spódne drasty</string>
+	<string name="poi_clothes_men">mužojo</string>
+	<string name="poi_clothes_wedding">kwasne šaty</string>
+	<string name="poi_clothes_sports">sport</string>
+	<string name="poi_clothes_hats">kłobuki</string>
+	<string name="poi_clothes_fur">kožuch</string>
+	<string name="poi_clothes_leather">koža</string>
+	<string name="poi_clothes_costumes">kostimy</string>
+	<string name="poi_clothes_traditional">tradicionelne</string>
+	<string name="poi_clothes_suits">wobleki</string>
+	<string name="poi_clothes_maternity">za maćerje</string>
+	<string name="poi_clothes_schoolwear">za šulu</string>
+	<string name="poi_clothes_swimwear">płuwanske drasty</string>
+	<string name="poi_clothes_socks">nohajcy</string>
+	<string name="poi_clothes_shirts">košle</string>
+	<string name="poi_clothes_military">wojerske</string>
+
+	<string name="poi_historic_milestone">milnik</string>
+
+	<string name="poi_shoes_children">dźěćace</string>
+	<string name="poi_shoes_women">žónske</string>
+	<string name="poi_shoes_sport">sportowe</string>
+	<string name="poi_shoes_men">muske</string>
+	<string name="poi_shoes_orthopedic">ortopediske</string>
+
+	<string name="poi_massage_thai">thaiska</string>
+	<string name="poi_massage_sexual">seksualna</string>
+	<string name="poi_massage_chinese">chinska</string>
+	<string name="poi_massage_therapeutic">terapeutiska</string>
+
+	<string name="poi_sauna_yes">sawna</string>
+	<string name="poi_tents_yes">dowolene</string>
+	<string name="poi_tents_no">stany njejsu dowolene</string>
+	<string name="poi_openfire_yes">woheń dowoleny</string>
+	<string name="poi_openfire_no">woheń njeje dowoleny</string>
+	<string name="poi_backcountry_yes">haj</string>
+	<string name="poi_backcountry_no">ně</string>
+	<string name="poi_scout_yes">haj</string>
+	<string name="poi_washing_machine_yes">haj</string>
+	<string name="poi_washing_machine_no">płokawa: ně</string>
+	<string name="poi_shower_filter_yes">haj</string>
+	<string name="poi_shower_yes">duša: haj</string>
+	<string name="poi_shower_no">duša: ně</string>
+	<string name="poi_shower_hot">duša: horca</string>
+	<string name="poi_shower_outdoor">duša: wonka</string>
+	<string name="poi_shower_cold">duša: zymna</string>
+	<string name="poi_shower_indoor">duša: nutřka</string>
+	<string name="poi_caravans_yes">haj</string>
+	<string name="poi_caravans_no">karawany: ně</string>
+	<string name="poi_power_supply_yes">haj</string>
+	<string name="poi_capacity_tents">kapacita (stany)</string>
+	<string name="poi_capacity_caravans">kapacita (karawany)</string>
+	<string name="poi_dog_yes">psy dowolene</string>
+	<string name="poi_dog_no">psy njejsu dowolene</string>
+
+	<string name="poi_social_facility_workshop">dźěłarnička</string>
+	<string name="poi_social_facility_for_child">dźěći</string>
+	<string name="poi_social_facility_for_orphan">syroty</string>
+	<string name="poi_social_facility_for_disabled">zbrašeni</string>
+	<string name="poi_social_facility_for_juvenile">młodostni</string>
+	<string name="poi_social_facility_for_homeless">bjezdomni</string>
+	<string name="poi_social_facility_for_migrant">migranća</string>
+	<string name="poi_social_facility_for_drug_addicted">wot drogow wotwisni</string>
+	<string name="poi_social_facility_for_unemployed">bjezdźěłni</string>
+	<string name="poi_theatre_genre_drama">drama</string>
+	<string name="poi_theatre_genre_opera">opera</string>
+	<string name="poi_theatre_genre_cabaret">kabaret</string>
+	<string name="poi_theatre_genre_ballet">balet</string>
+	<string name="poi_product_brick">produkt: cyhele</string>
+	<string name="poi_product_leather">produkt: koža</string>
+	<string name="poi_product_lime">produkt: wapno</string>
+	<string name="poi_product_beer">produkt: piwo</string>
+	<string name="poi_product_charcoal">produkt: wuhlo</string>
+	<string name="poi_product_meat">produkt: mjaso</string>
+
+	<string name="poi_wheelchair_description">wopis za wužiwarjow jězbnych stołow</string>
+	<string name="poi_blind_description">wopis za slepych</string>
+	<string name="poi_deaf_description">wopis za hłuchich</string>
+
+	<string name="poi_highway_steps">schody</string>
+	<string name="poi_handrail_yes">wobłoženje: haj</string>
+	<string name="poi_handrail_no">wobłoženje: ně</string>
+	<string name="poi_ramp_yes">rampa: haj</string>
+	<string name="poi_ramp_no">rampa: ně</string>
+	<string name="poi_ramp_wheelchair_yes">rampa za ježbne stoły: haj</string>
+	<string name="poi_ramp_wheelchair_no">rampa za ježbne stoły: ně</string>
+	<string name="poi_ramp_bicycle_yes">rampa za kolesa: haj</string>
+	<string name="poi_ramp_bicycle_no">rampa za kolesa: ně</string>
+	<string name="poi_ramp_luggage_yes">rampa za wačoki: haj</string>
+	<string name="poi_ramp_luggage_no">rampa za wačoki: ně</string>
+	<string name="poi_step_count">ličba schodźenkow</string>
+	<string name="poi_historic_civilization_celtic">ciwilizacija: keltiska</string>
+	<string name="poi_historic_civilization_western_roman">ciwilizacija: zapadoromska</string>
+	<string name="poi_animal_training_dog">pos</string>
+	<string name="poi_animal_training_horse">kóń</string>
+
+	<string name="poi_horse_yes">konje dowolene</string>
+	<string name="poi_horse_no">konje njejsu dowolene</string>
+	<string name="poi_animal_yes">zwěrjata dowolene</string>
+	<string name="poi_animal_no">zwěrjata njejsu dowolene</string>
+
+	<string name="poi_historic_period_bronze_age">historiska perioda: bronzowa doba</string>
+	<string name="poi_historic_period_iron_age">historiska perioda: železowa doba</string>
+	<string name="poi_historic_period_roman_republic">historiska perioda: romska republika</string>
+	<string name="poi_historic_period_alexander_the_great">historiska perioda: Aleksander Wulki</string>
+	<string name="poi_historic_period_christian_egypt">historiska perioda: křesćanska Egyptowska</string>
+	<string name="poi_health_specialty_dermatology_yes">dermatologija</string>
+	<string name="poi_health_specialty_urology_yes">urologija</string>
+	<string name="poi_health_specialty_radiology_yes">radiologija</string>
+	<string name="poi_health_specialty_psychiatry_yes">psychiatrija</string>
+	<string name="poi_health_specialty_neurology_yes">neurologija</string>
+	<string name="poi_health_specialty_cardiology_yes">kardiologija</string>
+	<string name="poi_health_specialty_physiotherapy_yes">fyzioterapija</string>
+	<string name="poi_health_specialty_tropical_medicine_yes">tropiska medicina</string>
+	<string name="poi_health_specialty_speech_therapy_yes">logopedija</string>
+	<string name="poi_health_specialty_homeopathy_yes">homeopatija</string>
+	<string name="poi_microwave_oven_yes">mikrožołma: haj</string>
+	<string name="poi_microwave_oven_no">mikrožołma: ně</string>
+	<string name="poi_badminton">badminton</string>
+	<string name="poi_judo">judo</string>
+	<string name="poi_futsal">futsal</string>
+	<string name="poi_boxing">pjasćowanje</string>
+
+	<string name="poi_inscription_n">napismo:S</string>
+	<string name="poi_inscription_nw">napismo:SZ</string>
+	<string name="poi_inscription_w">napismo:Z</string>
+	<string name="poi_inscription_sw">napismo:JZ</string>
+	<string name="poi_inscription_s">napismo:J</string>
+	<string name="poi_inscription_se">napismo:JW</string>
+	<string name="poi_inscription_e">napismo:W</string>
+	<string name="poi_inscription_ne">napismo:SW</string>
+
+	<string name="poi_construction_yes">pod konstrukciju</string>
+	<string name="poi_additional_atm_yes">bankomat: haj</string>
+	<string name="poi_atm_no">bankomat: ně</string>
+
+	<string name="poi_protected_area">škitane pasmo</string>
+	<string name="poi_addr_housename">mjeno domu</string>
+
+
+	<string name="poi_compressed_air_yes">haj</string>
+	<string name="poi_car_wash_yes">haj</string>
+
+	<string name="poi_vacuum_cleaner_yes">haj</string>
+	<string name="poi_home_visit_yes">haj</string>
+	<string name="poi_disease_malaria_yes">malarija: haj</string>
+	<string name="poi_disease_malaria_no">malarija: ně</string>
+	<string name="poi_disease_ebola_yes">ebola: haj</string>
+	<string name="poi_disease_ebola_no">ebola: ně</string>
+	<string name="poi_disease_autism_yes">awtizm: haj</string>
+	<string name="poi_disease_autism_no">awtizm: ně</string>
+	<string name="poi_disease_aids_yes">AIDS: haj</string>
+	<string name="poi_disease_aids_no">AIDS: ně</string>
+
+	<string name="poi_fire_hydrant_position_sidewalk">chódnik</string>
+	<string name="poi_fire_hydrant_position_street">na dróze</string>
+	<string name="poi_military_checkpoint">wojerski kontrolowy dypk</string>
+
+	<string name="poi_depth">hłubokosć</string>
+
+	<string name="poi_summer_camp">lěćny camp</string>
+	<string name="poi_dispensing_yes">haj</string>
+	<string name="poi_aerodrome_type_international">mjezynarodne</string>
+	<string name="poi_aerodrome_type_regional">regionalne</string>
+	<string name="poi_aerodrome_type_public">zjawne</string>
+	<string name="poi_aerodrome_type_military">wojerske</string>
+	<string name="poi_aerodrome_type_military_public">wojerske/zjawne</string>
+	<string name="poi_aerodrome_type_private">priwatne</string>
+
+	<string name="poi_telescope">teleskop</string>
+	<string name="poi_voltage">napjeće</string>
+	<string name="poi_display_sundial_yes">słónčny časnik</string>
+
+	<string name="poi_barometer_yes">barometer</string>
+	<string name="poi_barometer_no">barometer: ně</string>
+	<string name="poi_thermometer_yes">termometer</string>
+	<string name="poi_thermometer_no">termometer: ně</string>
+	<string name="poi_min_age">minimalna staroba</string>
+
+	<string name="poi_organic_yes">haj</string>
+	<string name="poi_organic_no">ně</string>
+	<string name="poi_organic_only">jenož</string>
+
+	<string name="poi_diplomatic_consulate">konsulat</string>
+	<string name="poi_diplomatic_consulate_general">generalny konsulat</string>
+	<string name="poi_diplomatic_honorary_consulate">honorarny konsulat</string>
+	<string name="poi_water_tank">wodowy tank</string>
+
+	<string name="poi_length">dołhota</string>
+
+	<string name="poi_wiki_link">Wikipedija</string>
+
+	<string name="poi_xmas">hody</string>
+	<string name="poi_xmas_event">hodowne zarjadowanje</string>
+	<string name="poi_xmas_market">hodowne wiki</string>
+	<string name="poi_xmas_pyramid">hodowna pyramida</string>
+	<string name="poi_xmas_shop">hodowny wobchod</string>
+	<string name="poi_xmas_tree">hodowny štom</string>
+	<string name="poi_cuisine">Kuchnja</string>
+	<string name="poi_cuisine_pizza">pizza</string>
+	<string name="poi_cuisine_coffee">kofej</string>
+	<string name="poi_cuisine_sandwich">sandwich</string>
+	<string name="poi_cuisine_kebab">kebab</string>
+	<string name="poi_cuisine_chicken">kokoš</string>
+	<string name="poi_cuisine_ice_cream">lód</string>
+	<string name="poi_cuisine_sushi">sushi</string>
+	<string name="poi_cuisine_seafood">mórske płody</string>
+	<string name="poi_cuisine_noodle">nudle</string>
+	<string name="poi_cuisine_donut">donut</string>
+	<string name="poi_cuisine_breakfast">snědań</string>
+	<string name="poi_cuisine_steak">steak</string>
+	<string name="poi_cuisine_curry">curry</string>
+	<string name="poi_cuisine_sausage">kołbasy</string>
+	<string name="poi_cuisine_cake">tykanc</string>
+	<string name="poi_cuisine_pancake">plincy</string>
+	<string name="poi_cuisine_juice">brěčka</string>
+	<string name="poi_cuisine_tea">čaj</string>
+	<string name="poi_cuisine_soup">poliwka</string>
+	<string name="poi_cuisine_pie">tykanc</string>
+	<string name="poi_cuisine_hotdog">hotdog</string>
+	<string name="poi_cuisine_salad">solotej</string>
+	<string name="poi_cuisine_bistro">bistro</string>
+	<string name="poi_cuisine_couscous">kuskus</string>
+	<string name="poi_cuisine_falafel">falafel</string>
+	<string name="poi_cuisine_yogurt">jogurt</string>
+	<string name="poi_cuisine_gyros">gyros</string>
+	<string name="poi_cuisine_pita">pita</string>
+	<string name="poi_cuisine_mediterranean">srjedźozemska</string>
+	<string name="poi_cuisine_malagasy">madagaskarska</string>
+	<string name="poi_cuisine_middle_eastern">bliskowuchodna</string>
+	</resources>
diff --git a/OsmAnd/res/values-b+hsb/strings.xml b/OsmAnd/res/values-b+hsb/strings.xml
index 69837ca5db..8b36eb5935 100644
--- a/OsmAnd/res/values-b+hsb/strings.xml
+++ b/OsmAnd/res/values-b+hsb/strings.xml
@@ -1083,4 +1083,13 @@
     <string name="empty_state_favourites">Fawority dodać</string>
     <string name="import_track">Čaru importować</string>
     <string name="move_point">Dypk přesunyć</string>
+    <string name="show_something_on_map">%1$s na karće pokazać</string>
+    <string name="text_size_descr">Postaj wulkosć teksta na karće.</string>
+    <string name="local_index_items_uploaded">%1$d wot %2$d objektow wuspěšnje nahraty.</string>
+    <string name="local_index_mi_upload_gpx">Na OSM pósłać</string>
+    <string name="show_more_map_detail">wjace detailow na karće pokazać</string>
+    <string name="show_more_map_detail_descr">někotre kartowe detaile (n. př. puće) hižo w nišich zoom-runinach pokazać</string>
+    <string name="favourites_delete_multiple_succesful">Faworitowe dypki wuspěšnje wotstronjene.</string>
+    <string name="favorite_delete_multiple">Chceš %1$d faworit(ow) a %2$d skupin faworitow wotstronić. Sy sej wěsty/a?</string>
+    <string name="basemap_missing">Zakładna karta swěta (pokrywajo cyły swět na niskich zoom-runinach) pobrachuje. Prošu wobstaraj sej World_basemap_x.obf za globalny přehlad.</string>
     </resources>
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index 3e2c3e01ce..a9356de1fc 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -2806,4 +2806,6 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
     <string name="import_track_desc">Fajl %1$s nie zmiaščaje kropki šliachu, impartavać jak slied?</string>
     <string name="move_point">Pieramiascić kropku</string>
     <string name="add_segment_to_the_track">Dadać u GPX-slied</string>
-</resources>
+<string name="keep_showing_on_map">Praciahvać pakazvać na mapie</string>
+    <string name="exit_without_saving">Vyjsci biez zachavannia?</string>
+    </resources>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 7d12ad8864..6c8a5fe3aa 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2855,4 +2855,6 @@
     <string name="import_track_desc">Файл %1$s не змяшчае кропкі шляху, імпартаваць як след?</string>
     <string name="move_point">Перамясціць кропку</string>
     <string name="add_segment_to_the_track">Дадаць у GPX-след</string>
-</resources>
+<string name="keep_showing_on_map">Працягваць паказваць на мапе</string>
+    <string name="exit_without_saving">Выйсці без захавання?</string>
+    </resources>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index a758c2fa89..81183dfe6a 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -2608,4 +2608,6 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="import_track_desc">El fitxer %1$s no conté fites, voleu importar-lo com una traça?</string>
     <string name="move_point">Mou punt</string>
     <string name="add_segment_to_the_track">Afegeix a una traça GPX</string>
-</resources>
+<string name="keep_showing_on_map">Continua mostrant al mapa</string>
+    <string name="exit_without_saving">Voleu sortir sense desar?</string>
+    </resources>
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index d1512e5753..38f7804706 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -1682,7 +1682,7 @@ Kaj la loko kaj tempo estas montrataj en la OsmAnd-a stirpanelo, kaj sur la fene
     <string name="search_offline_geo_error">Ne povis interpreti \'%s\'</string>
     <string name="search_osm_offline">Serĉi geo-lokon</string>
     <string name="preferred_locale_descr">Elekti lingvon de fasado (bonvolu restarti OsmAnd post ŝanĝo)</string>
-    <string name="unit_of_length">Long-unuo</string>
+    <string name="unit_of_length">Long-unuoj</string>
     <string name="unit_of_length_descr">Ŝanĝi unuon de longo</string>
     <string name="si_mi_feet">Mejloj/futoj</string>
     <string name="si_mi_yard">Mejloj/jardoj</string>
@@ -2769,4 +2769,6 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="import_track_desc">Dosiero %1$s ne enhavas navigadpunktojn, ĉe enporti ĝin kiel spuron?</string>
     <string name="move_point">Movi punkton</string>
     <string name="add_segment_to_the_track">Aldoni al GPX-spuro</string>
-</resources>
+<string name="keep_showing_on_map">Daŭre montri sur mapo</string>
+    <string name="exit_without_saving">Ĉu eliri sen konservi?</string>
+    </resources>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 54a1045fc6..e5a64185a6 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2733,4 +2733,6 @@ Proporciona un código completo</string>
     <string name="import_track_desc">El archivo «%1$s» no contiene puntos de referencia, ¿Quieres importarlo como una traza?</string>
     <string name="move_point">Mover punto</string>
     <string name="add_segment_to_the_track">Añadir a una traza GPX</string>
-</resources>
+<string name="keep_showing_on_map">Mantener en el mapa</string>
+    <string name="exit_without_saving">Salir sin guardar?</string>
+    </resources>
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index 77cc186d1a..0661b8b066 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -2734,4 +2734,6 @@ Proporciona un código completo</string>
     <string name="import_track_desc">El archivo «%1$s» no contiene puntos de referencia, ¿Quieres importarlo como una traza?</string>
     <string name="move_point">Mover punto</string>
     <string name="add_segment_to_the_track">Añadir a una traza GPX</string>
-</resources>
+<string name="keep_showing_on_map">Mantener en el mapa</string>
+    <string name="exit_without_saving">Salir sin guardar?</string>
+    </resources>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index 03daef3a62..f0f2011120 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -2763,4 +2763,12 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="waypoint_one">1. bide-puntua</string>
     <string name="route_point_one">1. ibilbide-puntua</string>
 <string name="measurement_tool_altitude">Garaiera: %1$s</string>
+    <string name="line">Linea</string>
+    <string name="save_as_route_point">Gorde ibilbideko puntuak gisa</string>
+    <string name="save_as_line">Gorde linea gisa</string>
+    <string name="route_point">Ibilbideko puntua</string>
+    <string name="edit_line">Editatu linea</string>
+    <string name="add_point_before">Gehitu puntua aurretik</string>
+    <string name="add_point_after">Gehitu puntua atzetik</string>
+    <string name="shared_string_options">Aukerak</string>
     </resources>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 8c77292e74..659c13eb67 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -1143,10 +1143,10 @@ OsmAnd jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej
     <string name="gpx_saved_sucessfully">Zapisano plik GPX do {0}</string>
     <string name="osmand_distance_planning_plugin_description">Dodaje widżet za pomocą, którego można tworzyć ślady klikając na mapie. Dostarcza również możliwość użycia lub modyfikowania istniejących już plików GPX, co przydaje się do planowania wycieczek lub mierzenia odległości pomiędzy punktami. Wynik może zostać zapisany jako plik GPX i użyty ponownie.</string>
     <string name="osmand_distance_planning_plugin_name">Kalkulator odległości i narzędzie planowania</string>
-    <string name="use_distance_measurement_help">* Naciśnij, aby zaznaczyć punkt.
-\n * Naciśnij i przytrzymaj mapę, aby usunąć poprzedni punkt.
-\n * Naciśnij i przytrzymaj punkt, aby przejrzeć i dołączyć opis.
-\n * Kliknij na widgecie obliczania odległości, aby zobaczyć więcej czynności.</string>
+    <string name="use_distance_measurement_help">* Naciśnij, aby zaznaczyć punkt. 
+\n * Naciśnij i przytrzymaj mapę, aby usunąć poprzedni punkt. 
+\n * Naciśnij i przytrzymaj punkt, aby przejrzeć i dołączyć opis. 
+\n * Kliknij na widżecie obliczania odległości, aby zobaczyć więcej czynności.</string>
     <string name="shared_string_do_not_show_again">Nie pokazuj ponownie</string>
     <string name="distance_measurement_start_editing">Rozpocznij edycję</string>
     <string name="distance_measurement_finish_editing">Zakończ edycję</string>
@@ -1359,7 +1359,7 @@ OsmAnd jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej
     <string name="index_item_nation_addresses">Adresy krajowe</string>
     <string name="index_item_world_basemap">Podstawowa mapa świata</string>
     <string name="index_item_world_ski">Światowa mapa tras narciarskich</string>
-    <string name="interrupt_music_descr">Wstrzymuje odtwarzanie każdej muzyki podczas komunikatów (nie tylko ją przycisza)</string>
+    <string name="interrupt_music_descr">Całkowicie wstrzymuje odtwarzanie muzyki podczas komunikatów (nie tylko ją przycisza)</string>
     <string name="interrupt_music">Przerywanie muzyki</string>
     <string name="always_center_position_on_map">Zawsze wyśrodkowane położenie</string>
     <string name="voice_pref_title">Głos</string>
@@ -2459,7 +2459,7 @@ Długość %2$s</string>
 \n 
 \n i więcej…</string>
     <string name="trip_rec_notification_settings">Rejestrowanie śladu (brak danych)</string>
-    <string name="trip_rec_notification_settings_desc">Wyświetla komunikat umożliwiający rozpoczęcie rejestrowania śladu po naciśnięciu przycisku</string>
+    <string name="trip_rec_notification_settings_desc">Wyświetl powiadomienie systemowe z opcję rozpoczęcia rejestrowania śladu</string>
     <string name="shared_string_notifications">Powiadomienia</string>
     <string name="osmo_share_location">Udostępnij</string>
     <string name="osmo_pause_location">Wstrzymaj</string>
@@ -2820,4 +2820,15 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="edit_line">Zmodyfikuj linię</string>
     <string name="add_point_before">Dodaj punkt wcześniej</string>
     <string name="add_point_after">Dodaj punkt dalej</string>
-    </resources>
+    <string name="measurement_tool_snap_to_road_descr">OsmAnd doda dalsze punkty w zależności od rodzaju nawigacji.</string>
+    <string name="add_route_points">Dodaj punkty trasy</string>
+    <string name="add_line">Dodaj linię</string>
+    <string name="empty_state_my_tracks">Dodaj i nagraj ślady</string>
+    <string name="empty_state_my_tracks_desc">Zarejestruj lub zaimportuj ślady do wyświetlenia</string>
+    <string name="empty_state_favourites">Dodaj do ulubionych</string>
+    <string name="empty_state_favourites_desc">Dodaj ulubione punkty na mapę lub zaimportuj je z pamięci</string>
+    <string name="import_track">Importuj ślad</string>
+    <string name="import_track_desc">Plik %1$s nie zawiera punktów trasy, czy zaimportować go jako ślad?</string>
+    <string name="move_point">Przesuń punkt</string>
+    <string name="add_segment_to_the_track">Dodaj do śladu GPX</string>
+</resources>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 02458b700b..a41c06c215 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -2756,4 +2756,6 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="import_track_desc">Su documentu %1$s non cuntenit puntos de coladòrgiu, importare comente rasta?</string>
     <string name="move_point">Move puntu</string>
     <string name="add_segment_to_the_track">Annanghe a una rasta GPX</string>
-</resources>
+<string name="keep_showing_on_map">Sighi a l\'ammustrare in sa mapa</string>
+    <string name="exit_without_saving">Essire chene sarvare?</string>
+    </resources>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index c4b524b131..6bb9fe9bb4 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -2837,4 +2837,5 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="import_track_desc">Datoteka %1$s ne vključuje nobene vmesne točke. Ali želite pot uvoziti kot sled?</string>
     <string name="move_point">Premakni točko</string>
     <string name="add_segment_to_the_track">Dodaj na sled GPX</string>
-</resources>
+<string name="empty_state_favourites_desc">Dodaj priljubljene na zemljevid ali pa jih uvozi iz datoteke</string>
+    </resources>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 41495d7e0c..3fb03a242c 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2839,4 +2839,6 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
     <string name="import_track_desc">%1$s 檔案不包含航點，要將其匯入軌跡嗎？</string>
     <string name="move_point">移動標點</string>
     <string name="add_segment_to_the_track">增加到 GPX 軌跡</string>
-</resources>
+<string name="keep_showing_on_map">在地圖上維持著顯示</string>
+    <string name="exit_without_saving">離開而不儲存嗎？</string>
+    </resources>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 2cda80c018..36b7f92c5b 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -112,7 +112,8 @@ public class MeasurementToolFragment extends Fragment {
 
 	private enum SaveType {
 		ROUTE_POINT,
-		LINE
+		LINE,
+		SNAP_TO_ROAD
 	}
 
 	private void setEditingCtx(MeasurementEditingContext editingCtx) {
@@ -459,12 +460,12 @@ public class MeasurementToolFragment extends Fragment {
 	@Override
 	public void onDestroyView() {
 		super.onDestroyView();
+		cancelModes();
 		exitMeasurementMode();
 		adapter.setAdapterListener(null);
 		if (pointsListOpened) {
 			hidePointsList();
 		}
-		closeModes();
 		MeasurementToolLayer layer = getMeasurementLayer();
 		if (layer != null) {
 			layer.setOnSingleTapListener(null);
@@ -837,7 +838,7 @@ public class MeasurementToolFragment extends Fragment {
 			int position = editingCtx.getSelectedPointPosition();
 			editingCtx.getCommandManager().execute(new MovePointCommand(measurementLayer, oldPoint, newPoint, position));
 			editingCtx.addPoint(newPoint);
-			measurementLayer.exitMovePointMode(false);
+			exitMovePointMode(false);
 			doAddOrMovePointCommonStuff();
 			measurementLayer.refreshMap();
 		}
@@ -845,22 +846,28 @@ public class MeasurementToolFragment extends Fragment {
 
 	private void cancelMovePointMode() {
 		switchMovePointMode(false);
-		MeasurementToolLayer measurementToolLayer = getMeasurementLayer();
-		if (measurementToolLayer != null) {
-			measurementToolLayer.exitMovePointMode(true);
-			measurementToolLayer.refreshMap();
+		exitMovePointMode(true);
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			mapActivity.refreshMap();
 		}
 	}
 
-	private void closeModes() {
-		if (editingCtx.getOriginalPointToMove() != null) {
-			switchMovePointMode(false);
-		} else if (editingCtx.getSelectedPointPosition() != -1) {
-			switchAddPointBeforeAfterMode(false);
+	void exitMovePointMode(boolean saveOriginalPoint) {
+		if (saveOriginalPoint) {
+			WptPt pt = editingCtx.getOriginalPointToMove();
+			editingCtx.addPoint(pt);
 		}
-		MeasurementToolLayer layer = getMeasurementLayer();
-		if (layer != null && editingCtx.getOriginalPointToMove() != null) {
-			layer.exitMovePointMode(true);
+		editingCtx.setOriginalPointToMove(null);
+		editingCtx.setSelectedPointPosition(-1);
+		editingCtx.splitSegments(editingCtx.getBeforePoints().size() + editingCtx.getAfterPoints().size());
+	}
+
+	private void cancelModes() {
+		if (editingCtx.getOriginalPointToMove() != null) {
+			cancelMovePointMode();
+		} else if (editingCtx.getSelectedPointPosition() != -1) {
+			cancelAddPointBeforeOrAfterMode();
 		}
 	}
 
@@ -1074,7 +1081,7 @@ public class MeasurementToolFragment extends Fragment {
 			final SwitchCompat showOnMapToggle = (SwitchCompat) view.findViewById(R.id.toggle_show_on_map);
 			showOnMapToggle.setChecked(true);
 
-			final String suggestedName = new SimpleDateFormat("yyyy-M-dd_HH-mm_EEE", Locale.US).format(new Date());
+			final String suggestedName = new SimpleDateFormat("yyyy-MM-dd_HH-mm_EEE", Locale.US).format(new Date());
 			String displayedName = suggestedName;
 			File fout = new File(dir, suggestedName + GPX_SUFFIX);
 			int ind = 1;
@@ -1156,7 +1163,7 @@ public class MeasurementToolFragment extends Fragment {
 
 			@Override
 			protected void onPreExecute() {
-				closeModes();
+				cancelModes();
 				MapActivity activity = getMapActivity();
 				if (activity != null) {
 					progressDialog = new ProgressDialog(activity);
@@ -1184,6 +1191,19 @@ public class MeasurementToolFragment extends Fragment {
 							Route rt = new Route();
 							gpx.routes.add(rt);
 							rt.points.addAll(points);
+						} else if (saveType == SaveType.SNAP_TO_ROAD) {
+							TrkSegment segmentToSave = new TrkSegment();
+							TrkSegment before = editingCtx.getBeforeTrkSegmentLine();
+							TrkSegment after = editingCtx.getAfterTrkSegmentLine();
+							segmentToSave.points.addAll(before.points);
+							segmentToSave.points.addAll(after.points);
+							Track track = new Track();
+							track.segments.add(segmentToSave);
+							gpx.tracks.add(track);
+
+							Route rt = new Route();
+							rt.points.addAll(points);
+							gpx.routes.add(rt);
 						}
 					}
 					if (activity != null) {
@@ -1390,7 +1410,7 @@ public class MeasurementToolFragment extends Fragment {
 				builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
-						final String name = new SimpleDateFormat("yyyy-M-dd_HH-mm_EEE", Locale.US).format(new Date());
+						final String name = new SimpleDateFormat("yyyy-MM-dd_HH-mm_EEE", Locale.US).format(new Date());
 						String fileName = name + GPX_SUFFIX;
 						File fout = new File(dir, fileName);
 						int ind = 1;
@@ -1398,7 +1418,13 @@ public class MeasurementToolFragment extends Fragment {
 							fileName = name + "_" + (++ind) + GPX_SUFFIX;
 							fout = new File(dir, fileName);
 						}
-						saveNewGpx(dir, fileName, showOnMapToggle.isChecked(), SaveType.LINE, true);
+						SaveType saveType;
+						if (editingCtx.isInSnapToRoadMode()) {
+							saveType = SaveType.SNAP_TO_ROAD;
+						} else {
+							saveType = SaveType.LINE;
+						}
+						saveNewGpx(dir, fileName, showOnMapToggle.isChecked(), saveType, true);
 					}
 				});
 			} else {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
index 0a4d16f38c..4eda865c08 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
@@ -300,16 +300,6 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
 		}
 	}
 
-	void exitMovePointMode(boolean saveOriginalPoint) {
-		if (saveOriginalPoint) {
-			WptPt pt = editingCtx.getOriginalPointToMove();
-			editingCtx.addPoint(pt);
-		}
-		editingCtx.setOriginalPointToMove(null);
-		editingCtx.setSelectedPointPosition(-1);
-		editingCtx.splitSegments(editingCtx.getBeforePoints().size() + editingCtx.getAfterPoints().size());
-	}
-
 	private void drawCenterIcon(Canvas canvas, RotatedTileBox tb, QuadPoint center, boolean nightMode) {
 		canvas.rotate(-tb.getRotate(), center.x, center.y);
 		if (nightMode) {