diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index f8aa1d78cd..7b2668cd0f 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -1894,7 +1894,7 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
     <string name="wake_on_voice_never">Mai</string>
     <string name="advanced_settings">Avançat</string>
 	<string name="osmo_use_https_descr">Utilitzeu una connexió segura amb el servidor</string>
-    <string name="osmo_use_https">Utilitzeu https</string>
+    <string name="osmo_use_https">Utilitzeu HTTPS</string>
 	<string name="home_button">Inici</string>
     <string name="search_for">Cerca per</string>
 	<string name="show_map">MOSTRA EL MAPA</string>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 4ec1105bd0..fad3a61be8 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="switch_to_raster_map_to_see">Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Spravovat mapové soubory), nebo se přepněte na online mapy.</string>
   <string name="tip_recent_changes_0_7_2_t">"Změny ve verzi 0.7.2 :
 \n\t- Native rendering pro všechna zařízení
@@ -1771,7 +1771,7 @@ s často kladenými otázkami.</string>
 	<string name="lock_screen_request_explanation">%1$s potřebuje tato oprávnění pro vypnutí obrazovky při režimu šetření energie.</string>
     <string name="wake_on_voice_never">Nikdy</string>
     <string name="advanced_settings">Pokročilé</string>
-	<string name="home_button">Domov</string>
+	<string name="home_button">Domovská obrazovka</string>
     <string name="show_map">ZOBRAZIT MAPU</string>
 	<string name="osmo_use_https_descr">Použít zabezpečené spojení se serverem</string>
     <string name="osmo_use_https">Použít HTTPS</string>
@@ -1779,4 +1779,9 @@ s často kladenými otázkami.</string>
 	<string name="search_for">Hledat</string>
 	<string name="show_all">ZOBRAZIT VŠE</string>
 	<string name="coordinates">Souřadnice</string>
-	</resources>
+	<string name="dismiss">Zavřít</string>
+    <string name="everything_up_to_date">Vše je aktuální</string>
+    <string name="use_opengl_render">Použít OpenGL</string>
+    <string name="use_opengl_render_descr">Použít hardwarově akcelerované renderování pomocí OpenGL (nemusí fungovat na všech zařízeních)</string>
+    <string name="error_avoid_specific_road">Nebyla nalezena nejbližší silnice</string>
+    </resources>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index af5a6d2fef..ac49115c68 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -636,4 +636,7 @@
 	<string name="poi_astronomical_observatory">Astronomisk observatorium</string>
 	<string name="poi_hot_spring">Varm kilde</string>
 	<string name="poi_geyser">Gejser</string>
+	<string name="poi_place_allotments">Kolonihaver</string>
+	<string name="poi_place_farm">Gård</string>
+
 	</resources>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index cc1ca78ffb..394ae1d9e8 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1843,7 +1843,7 @@
     <string name="wake_on_voice_never">Aldrig</string>
     <string name="advanced_settings">Avanceret</string>
 	<string name="osmo_use_https_descr">Brug sikker forbindelse med server</string>
-    <string name="osmo_use_https">Brug https</string>
+    <string name="osmo_use_https">Brug HTTPS</string>
 	<string name="home_button">Start</string>
     <string name="search_for">Søg efter</string>
 	<string name="show_map">VIS KORT</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 6f7cf174ed..cc102ff759 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -2022,4 +2022,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
 	<string name="show_all">ALLES ANZEIGEN</string>
 	<string name="coordinates">Koordinaten</string>
 	<string name="search_for">Suche nach</string>
+    <string name="everything_up_to_date">Alle Dateien sind auf dem neuesten Stand.</string>
+    <string name="use_opengl_render">OpenGL-Rendering aktivieren</string>
+    <string name="use_opengl_render_descr">Nutze Hardware-beschleunigtes OpenGL-Rendering (ggf. nicht auf allen Geräten verfügbar)</string>
     </resources>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 37c78bb5b8..ba309e2e62 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -1888,4 +1888,5 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
     <string name="use_opengl_render_descr">Usar renderizado opengl acelerado por hardware (podría no funcionar en algunos dispositivos)</string>
     <string name="error_avoid_specific_road">No se ha encontrado la carretera más cercana</string>
     <string name="everything_up_to_date">Todo actualizado</string>
+    <string name="dismiss">Descartar</string>
     </resources>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index f76837b919..1f6e19a234 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2036,4 +2036,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="error_avoid_specific_road">Non è stata trovata una strada nelle vicinanze</string>
     <string name="use_opengl_render">Utilizzare il rendering opengl</string>
     <string name="use_opengl_render_descr">Utilizzare il rendering opengl accelerato via hardware (potrebbe non funzionare in alcuni dispositivi)</string>
+    <string name="everything_up_to_date">Tutto aggiornato</string>
+    <string name="dismiss">Abbandona</string>
     </resources>
diff --git a/OsmAnd/res/values-ko/phrases.xml b/OsmAnd/res/values-ko/phrases.xml
index 9e057124b7..6b7e5c94df 100644
--- a/OsmAnd/res/values-ko/phrases.xml
+++ b/OsmAnd/res/values-ko/phrases.xml
@@ -10,4 +10,87 @@
 	<string name="poi_deli">델리</string>
 	<string name="poi_shop_farm">농장 가게</string>
 	<string name="poi_greengrocer">Greengrocery</string>
+	<string name="poi_seafood">해산물 가게</string>
+	<string name="poi_confectionery">과자</string>
+	<string name="poi_ice_cream">아이스크림 응접실</string>
+	<string name="poi_supermarket">슈퍼마켓</string>
+	<string name="poi_shop_tea">홍차 가게</string>
+	<string name="poi_dairy">낙농장 상점</string>
+	<string name="poi_vending_machine">자동 판매기</string>
+
+	<string name="poi_bookshop">서점</string>
+	<string name="poi_bicycle_shop">자전거 가게</string>
+	<string name="poi_anime_shop">애니메이션 상점</string>
+	<string name="poi_antiques_shop">골동품 가게</string>
+	<string name="poi_art_shop">아트 숍</string>
+	<string name="poi_baby_goods">아기 상품</string>
+	<string name="poi_bag_shop">가방 가게</string>
+	<string name="poi_bathroom_furnishing_shop">욕실 가구</string>
+	<string name="poi_bed_shop">침대 룸 가구</string>
+	<string name="poi_boutique">패션 부티크</string>
+	<string name="poi_carpet_shop">카펫 가게</string>
+	<string name="poi_chemist_shop">약국</string>
+	<string name="poi_clothes_shop">의류 매장</string>
+	<string name="poi_children_clothes_shop">어린이 의류</string>
+	<string name="poi_shoes">신발 가게</string>
+	<string name="poi_computer_shop">컴퓨터 가게</string>
+	<string name="poi_copyshop">복사 가게</string>
+	<string name="poi_curtain_shop">커튼 가게</string>
+	<string name="poi_fabric_shop">휘장 상점</string>
+	<string name="poi_bedding_shop">침구 가게</string>
+	<string name="poi_dive_shop">다이빙 장비</string>
+	<string name="poi_doityourself_shop">주택 개선 가게</string>
+	<string name="poi_erotic_shop">에로틱 가게</string>
+	<string name="poi_fishing_shop">낚시 도구</string>
+	<string name="poi_florist">꽃 가게</string>
+	<string name="poi_frame_shop">그림 프레임 가게</string>
+	<string name="poi_furniture_shop">가구점</string>
+	<string name="poi_garden_centre">정원 센터</string>
+	<string name="poi_gas_shop">LPG 주유소</string>
+	<string name="poi_general_shop">일반 상점</string>
+	<string name="poi_gift_shop">선물 가게</string>
+	<string name="poi_glaziery_shop">Glaziery</string>
+	<string name="poi_hardware_shop">하드웨어 스토어</string>
+	<string name="poi_hearing_aids_shop">청력 도움</string>
+	<string name="poi_herbalist">허브 상점</string>
+	<string name="poi_hifi_shop">고음질 스토어</string>
+	<string name="poi_houseware_shop">가정용품 공급 상점</string>
+	<string name="poi_hunting_shop">사냥 장비</string>
+	<string name="poi_interior_decoration_shop">실내 장식 가게</string>
+	<string name="poi_jewelry_shop">보석 상점</string>
+	<string name="poi_kiosk">키오스크</string>
+	<string name="poi_kitchen_shop">주방용품</string>
+	<string name="poi_mobile_phone_shop">휴대 전화 가게</string>
+	<string name="poi_motorcycle_shop">오토바이 가게</string>
+	<string name="poi_musical_instrument_shop">악기</string>
+	<string name="poi_newsagent_shop">통신사</string>
+	<string name="poi_optician_shop">검안</string>
+	<string name="poi_organic_shop">유기농 식품</string>
+	<string name="poi_outdoor_shop">아웃도어 가게</string>
+	<string name="poi_paint_shop">페인트 샵</string>
+	<string name="poi_pet_shop">애완 동물 가게</string>
+	<string name="poi_radiotechnics_shop">전파상</string>
+	<string name="poi_second_hand">두 번째 가게</string>
+	<string name="poi_ship_chandler">배 잡화상</string>
+	<string name="poi_sports_shop">스포츠 용품</string>
+	<string name="poi_stationery_shop">문구용품 가게</string>
+	<string name="poi_tableware_shop">식기 상점</string>
+	<string name="poi_ticket_shop">티켓 판매소</string>
+	<string name="poi_tobacco_shop">담배 상점</string>
+	<string name="poi_toys_shop">장난감 가게</string>
+	<string name="poi_trade_shop">무역소</string>
+	<string name="poi_vacuum_cleaner_shop">진공 청소기 가게</string>
+	<string name="poi_variety_store">잡화점</string>
+	<string name="poi_video_shop">비디오 가게</string>
+	<string name="poi_window_blind_shop">창문 블라인드 가게</string>
+	<string name="poi_department_store">백화점</string>
+	<string name="poi_electronics_shop">전자 제품 매장</string>
+	<string name="poi_car_shop">자동차 판매소</string>
+	<string name="poi_car_parts_shop">자동차 부품</string>
+	<string name="poi_atv_shop">쿼드 가게</string>
+	<string name="poi_cosmetics_shop">화장품</string>
+	<string name="poi_marketplace">마켓 플레이스</string>
+	<string name="poi_sewing_shop">건조 용품 가게</string>
+
+	<string name="poi_police">경찰</string>
 	</resources>
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index 6dfb86e823..1b97a6ec32 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -2092,4 +2092,6 @@
 	<string name="error_avoid_specific_road">가장 가까운 도로를 찾을 수 없습니다</string>
     <string name="use_opengl_render">Opengl 렌더링 사용</string>
     <string name="use_opengl_render_descr">하드웨어로 가속된 opengl 렌더링 사용 (일부 장치에는 작동 하지 않을 수 있습니다)</string>
+    <string name="dismiss">해제</string>
+    <string name="everything_up_to_date">최신 자료</string>
     </resources>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 559733bad1..c7d696f7af 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -1853,4 +1853,5 @@
 	<string name="error_avoid_specific_road">Nerastas trumpiausias kelias</string>
     <string name="use_opengl_render">Naudoti OpenGL vaizdavimą</string>
     <string name="use_opengl_render_descr">Naudoti aparatinį OpenGL vaizdavimą (gali neveikti kai kurioje įrangoje)</string>
+    <string name="everything_up_to_date">Viskas atnaujinta</string>
     </resources>
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index 063ff4ed82..b758af1ceb 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -39,4 +39,16 @@
 	<string name="poi_bedding_shop">Sklep z pościelą</string>
 	<string name="poi_dive_shop">Sprzęt do nurkowania</string>
 	<string name="poi_copyshop">Punkt ksero i drukowania</string>
+	<string name="poi_doityourself_shop">Sklep dla majsterkowiczów</string>
+	<string name="poi_erotic_shop">Sklep erotyczny</string>
+	<string name="poi_fishing_shop">Sklep wędkarski</string>
+	<string name="poi_florist">Kwiaciarnia</string>
+	<string name="poi_frame_shop">Sklep z ramami do obrazów</string>
+	<string name="poi_furniture_shop">Sklep meblowy</string>
+	<string name="poi_garden_centre">Centrum ogrodnicze</string>
+	<string name="poi_gas_shop">Magazyn gazu płynnego</string>
+	<string name="poi_general_shop">Magazyn</string>
+	<string name="poi_gift_shop">Sklep pamiątkarski</string>
+	<string name="poi_glaziery_shop">Szklarz</string>
+	<string name="poi_hardware_shop">Sklep z narzędziami</string>
 	</resources>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index c355ad4a9e..d51794925e 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="tip_recent_changes_0_6_9_t">"Zmiany w 0.6.9: \n\t- poprawiono renderowanie map offline \n\t- szybkie renderowanie natywne (wersja eksperymentalna - może nie działać na niektórych urządzeniach) \n\t- poprawki w interfejsie \n\t- dodano wyświetlanie informacji o wysokości (altitude) \n\t- nowe tłumaczenia (polskie, wietnamskie) \n\t- inne, mniejsze poprawki "</string>
   
   <string name="use_transparent_map_theme">Przezroczysty styl</string>
@@ -1955,4 +1955,9 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
 	<string name="show_map">POKAŻ MAPĘ</string>
 	<string name="show_all">POKAŻ WSZYSTKIE</string>
 	<string name="coordinates">Współrzędne</string>
-	</resources>
+	<string name="dismiss">Odwołać</string>
+    <string name="everything_up_to_date">Wszystko jest aktualne</string>
+    <string name="use_opengl_render">Użyj renderowania OpenGL</string>
+    <string name="use_opengl_render_descr">Użyj renderowania z akceleracją OpenGL (może nie działać na niektórych urządzeniach)</string>
+    <string name="error_avoid_specific_road">Najbliższa droga nie została znaleziona</string>
+    </resources>
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index 9653243fde..f0ec033371 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -389,7 +389,7 @@
 	<string name="poi_travel_agent">Турагенство</string>
 	<string name="poi_viewpoint">Место с хорошим видом</string>
 	<string name="poi_camp_site">Место для лагеря</string>
-	<string name="poi_caravan_site"/>
+	<string name="poi_caravan_site">Место для ночлега</string>
 	<string name="poi_picnic_site">Место для пикника</string>
 	<string name="poi_spring">Родник</string>
 	<string name="poi_cemetery">Кладбище</string>
@@ -620,4 +620,7 @@
 	<string name="poi_hot_spring">Горячий источник</string>
 	<string name="poi_geyser">Гейзер</string>
 	<string name="poi_leisure_track">Спортивная дорожка</string>
+	<string name="poi_place_farm">Ферма</string>
+
+	<string name="poi_place_allotments">Садоводческое товарищество</string>
 	</resources>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 49916aa384..eae9cc95d8 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1821,4 +1821,8 @@
 	<string name="home_button">Дом</string>
     <string name="search_for">Поиск</string>
 	<string name="everything_up_to_date">Всё обновлено</string>
-    </resources>
+    <string name="use_opengl_render">Использовать OpenGL для рендеринга</string>
+    <string name="use_opengl_render_descr">Использовать аппаратное ускорение OpenGL для рендеринга (может не работать на некоторых устройствах)</string>
+    <string name="show_map">ПОКАЗАТЬ КАРТУ</string>
+	<string name="show_all">ПОКАЗАТЬ ВСЁ</string>
+	</resources>
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index 6b139a21a0..4cdb53eaff 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -323,4 +323,82 @@
 	<string name="poi_cemetery">Campusantu</string>
 	<string name="poi_grave_yard">Campusantu</string>
 	<string name="poi_funicular">Funiculare</string>
+	<string name="poi_military_naval_base">Base militare navale</string>
+	<string name="poi_military_barracks">Caserma</string>
+	<string name="poi_charging_station">Istatzione de carrigamentu</string>
+	<string name="poi_vehicle_ramp">Rampa pro veìculos</string>
+	<string name="poi_compressed_air">Àera cumpressa</string>
+	<string name="poi_bicycle_rental">Nolu bitziclètas</string>
+	<string name="poi_standpipe">Funtanedda</string>
+	<string name="poi_recycling">Ìsula ecològica</string>
+	<string name="poi_landfill">Muntonàrgiu</string>
+	<string name="poi_waste_disposal">Logu de regorta de s\'arga</string>
+	<string name="poi_waste_basket">Corbuledda pro s\'arga</string>
+
+	<string name="poi_pier">Pontinu</string>
+	<string name="poi_surveillance">Videobardiamentu</string>
+	<string name="poi_observatory">Osservatòriu</string>
+	<string name="poi_mineshaft">Galleria verticale</string>
+	<string name="poi_social_facility">Istrutura pro servìtzios sotziales</string>
+	<string name="poi_place_farm">Fatoria</string>
+
+	<string name="poi_audiologist">Tècnicu audiometrista</string>
+	<string name="poi_research_office">Tzentru de chirca e isvilupu</string>
+	<string name="poi_club_art">Tzìrculu artìsticu</string>
+	<string name="poi_club_astronomy">Tzìrculu astròfilos</string>
+	<string name="poi_club_computer">Tzìrculu informàticu</string>
+	<string name="poi_club_board_games">Tzìrculu giogos da mesa</string>
+	<string name="poi_club_motorcycle">Tzìrculu mototziclìsticu</string>
+	<string name="poi_club_sport">Tzìrculu isportivu</string>
+	<string name="poi_club_game">Tzìrculu pro giogos</string>
+	<string name="poi_club_automobile">Tzìrculu automobilìsticu</string>
+	<string name="poi_club_chess">Tzìrculu iscachìsticu</string>
+	<string name="poi_club_cinema">Tzìrculu cinèfilos</string>
+	<string name="poi_club_fan">Tzìrculu de ammiradores</string>
+	<string name="poi_club_fishing">Tzìrculu de pisca</string>
+	<string name="poi_club_veterans">Tzìrculu de veteranos</string>
+	<string name="poi_club_linux">Tzìrculu de Linux</string>
+	<string name="poi_club_theatre">Tzìrculu teatrale</string>
+	<string name="poi_club_history">Tzìrculu de istòria</string>
+	<string name="poi_club_music">Tzìrculu musicale</string>
+	<string name="poi_club_photography">Tzìrculu fotogràficu</string>
+	<string name="poi_club_hunting">Tzìrculu de cassa</string>
+	<string name="poi_club_tourism">Tzìrculu turìsticu</string>
+	<string name="poi_library">Libreria</string>
+	<string name="poi_arts_centre">Tzentru artìsticu</string>
+	<string name="poi_cinema">Tzìnema</string>
+	<string name="poi_casino">Casinò</string>
+	<string name="poi_community_centre">Tzentru sotziale istitutzionale</string>
+	<string name="poi_social_centre">Tzentru sotziale</string>
+	<string name="poi_theatre">Teatru</string>
+	<string name="poi_circus">Circu</string>
+	<string name="poi_dance_floor">Discoteca</string>
+	<string name="poi_nightclub">Nightclub</string>
+	<string name="poi_marina">Marina (portu minore)</string>
+	<string name="poi_swimming_pool">Piscina</string>
+	<string name="poi_park">Parcu</string>
+
+	<string name="poi_cafe">Tzilleri</string>
+	<string name="poi_restaurant">Ristorante</string>
+	<string name="poi_bar">Tzilleri</string>
+	<string name="poi_pub">Pub</string>
+	<string name="poi_drinking_water">Abba potàbile</string>
+	<string name="poi_blacksmith">Mastru de ferru</string>
+	<string name="poi_brewery">Birrifìtziu</string>
+	<string name="poi_clockmaker">Relogiàrju</string>
+	<string name="poi_dressmaker">Draperi</string>
+	<string name="poi_electrician">Elettricista</string>
+	<string name="poi_gardener">Giardineri</string>
+	<string name="poi_glaziery_craft">Bidraju</string>
+	<string name="poi_handicraft">Artisanu</string>
+	<string name="poi_hvac">Caentamentu, bentuladura e conditzionamentu</string>
+	<string name="poi_insulation_craft">Isulamentu tèrmicu de sos edifìtzios</string>
+	<string name="poi_jeweller">Butegheri de prendas</string>
+	<string name="poi_optician">Òticu</string>
+	<string name="poi_painter">Pintore</string>
+	<string name="poi_photographer">Fotògrafu</string>
+	<string name="poi_photographic_laboratory">Laboratòriu fotogràficu</string>
+	<string name="poi_plasterer">Istucadore</string>
+	<string name="poi_plumber">Idràulicu</string>
+	<string name="poi_pottery_craft">Brocarju</string>
 	</resources>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index f3436c02b6..f4a6704091 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -1780,7 +1780,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="lock_screen_request_explanation">%1$s tenet bisòngiu de custa autorizatzione pro istudare s\'ischermu pro sa funtzionalidade de rispàrmiu energèticu.</string>
     <string name="advanced_settings">Avantzadas</string>
 	<string name="osmo_use_https_descr">Imprea una cunnessione segura cun su server</string>
-    <string name="osmo_use_https">Imprea https</string>
+    <string name="osmo_use_https">Imprea HTTPS</string>
 	<string name="home_button">Domo</string>
     <string name="search_for">Chirca pro</string>
 	<string name="show_map">AMMUSTRA SA MAPA</string>
@@ -1789,6 +1789,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="map_update">Mapas</string>
 	<string name="error_avoid_specific_road">No est istada agatada peruna istrada a curtzu</string>
     <string name="everything_up_to_date">Totu agiornadu</string>
-    <string name="use_opengl_render">Impreare sa renderizatzione opengl</string>
-    <string name="use_opengl_render_descr">Impreare sa renderizatzione opengl tràmite hardware (diat pòdere non funtzionare in carchi dispositivu)</string>
+    <string name="use_opengl_render">Imprea sa renderizatzione OpengL</string>
+    <string name="use_opengl_render_descr">Imprea sa renderizatzione OpengL tràmite hardware (diat pòdere non funtzionare in carchi dispositivu)</string>
+    <string name="dismiss">Abbandona</string>
     </resources>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 62876b4844..723e07545f 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -1998,4 +1998,8 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 	<string name="coordinates">Súradnice</string>
 	<string name="map_update">Mapy</string>
 	<string name="error_avoid_specific_road">Nenašla sa najbližšia cesta</string>
+    <string name="dismiss">Odmietnuť</string>
+    <string name="everything_up_to_date">Všetko je aktuálne</string>
+    <string name="use_opengl_render">Použiť vykresľovanie OpenGL</string>
+    <string name="use_opengl_render_descr">Použiť hardvérovo urýchľované vykresľovanie pomocou OpenGL (nemusí na niektorých zariadeniach fungovať)</string>
     </resources>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 4afc766b17..e5b2d51ae8 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -1842,4 +1842,5 @@
     <string name="everything_up_to_date">一切都為最新的</string>
     <string name="use_opengl_render">使用 OpenGL 繪製</string>
     <string name="use_opengl_render_descr">使用硬體加速 OpenGL 繪製（可能在某些裝置無法工作）</string>
+    <string name="dismiss">排除</string>
     </resources>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 9e2515cf48..7380f717ef 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -256,6 +256,8 @@
 	<string name="poi_suburb">Suburb</string>
 	<string name="poi_neighbourhood">Neighbourhood</string>
 	<string name="poi_locality">Locality</string>
+	<string name="poi_place_allotments">Allotments</string>
+	<string name="poi_place_farm">Farm</string>
 
 	<string name="poi_pharmacy">Pharmacy</string>
 	<string name="poi_hospital">Hospital</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 1e8f2a868d..b73b5bb5eb 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -11,12 +11,12 @@
     -->
     <string name="dismiss">Dismiss</string>
     <string name="everything_up_to_date">Everything up to date</string>
-    <string name="use_opengl_render">Use opengl rendering</string>
-    <string name="use_opengl_render_descr">Use hardware accelerated opengl rendering (may not work on some device)</string>
+    <string name="use_opengl_render">Use OpenGL rendering</string>
+    <string name="use_opengl_render_descr">Use hardware accelerated OpenGL rendering (may not work on some devices)</string>
     <string name="error_avoid_specific_road">Nearest road was not found</string>
     <string name="home_button">Home</string>
     <string name="osmo_use_https_descr">Use secure connection with server</string>
-    <string name="osmo_use_https">Use https</string>
+    <string name="osmo_use_https">Use HTTPS</string>
 	<string name="advanced_settings">Advanced</string>
 	<string name="map_update">Maps</string>
 	<string name="search_for">Search for</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
index 6bf415c43a..dfb570e6f9 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java
@@ -3,13 +3,11 @@ package net.osmand.plus.activities;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
-import java.text.MessageFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Random;
 
-import android.support.v4.app.FragmentManager;
 import net.osmand.access.AccessibleAlertBuilder;
 import net.osmand.plus.OsmAndAppCustomization;
 import net.osmand.plus.OsmAndLocationProvider;
@@ -17,28 +15,28 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.base.BasicProgressAsyncTask;
-import net.osmand.plus.dashboard.*;
+import net.osmand.plus.dashboard.DashErrorFragment;
+import net.osmand.plus.dashboard.DashFavoritesFragment;
+import net.osmand.plus.dashboard.DashMapFragment;
+import net.osmand.plus.dashboard.DashPluginsFragment;
+import net.osmand.plus.dashboard.DashSearchFragment;
+import net.osmand.plus.dashboard.DashUpdatesFragment;
 import net.osmand.plus.download.BaseDownloadActivity;
 import net.osmand.plus.download.DownloadActivity;
 import net.osmand.plus.download.IndexItem;
 import net.osmand.plus.render.MapRenderRepositories;
-import net.osmand.plus.sherpafy.SherpafyLoadingFragment;
 import net.osmand.plus.sherpafy.TourViewActivity;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
 import android.app.Dialog;
-import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.graphics.drawable.ColorDrawable;
-import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.text.SpannableString;
@@ -58,6 +56,7 @@ import com.actionbarsherlock.view.MenuItem;
 /**
  */
 public class DashboardActivity extends BaseDownloadActivity {
+	private static final String LATEST_CHANGES_URL = "changes-1.9.html";
 	public static final boolean TIPS_AND_TRICKS = false;
 	public static final int APP_EXIT_CODE = 4;
 	public static final String APP_EXIT_KEY = "APP_EXIT_KEY";
@@ -261,15 +260,15 @@ public class DashboardActivity extends BaseDownloadActivity {
 					pref.edit().putInt(TIPS_SHOW, ++i).commit();
 				}
 				if (i == 1 || i == 5 || appVersionChanged) {
-					if(TIPS_AND_TRICKS) {
-					TipsAndTricksActivity tipsActivity = new TipsAndTricksActivity(this);
-					Dialog dlg = tipsActivity.getDialogToShowTips(!appVersionChanged, false);
-					dlg.show();
+					if (TIPS_AND_TRICKS) {
+						TipsAndTricksActivity tipsActivity = new TipsAndTricksActivity(this);
+						Dialog dlg = tipsActivity.getDialogToShowTips(!appVersionChanged, false);
+						dlg.show();
 					} else {
-						if(appVersionChanged) {
+						if (appVersionChanged) {
 							final Intent helpIntent = new Intent(activity, HelpActivity.class);
 							helpIntent.putExtra(HelpActivity.TITLE, Version.getAppVersion(getMyApplication()));
-							helpIntent.putExtra(HelpActivity.URL, "changes-1.9.html");
+							helpIntent.putExtra(HelpActivity.URL, LATEST_CHANGES_URL);
 							activity.startActivity(helpIntent);
 						}
 					}
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 759ace7432..87988648ff 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -348,12 +348,8 @@ public class MapActivityActions implements DialogProvider {
 						standardId == R.string.context_menu_item_destination_point) {
 					boolean dest = standardId == R.string.context_menu_item_destination_point;
 					String selected = mapActivity.getMapLayers().getContextMenuLayer().getSelectedObjectName();
-					String target = null;
-					if(dest && selected != null){
-						target = selected.replaceAll(getString(R.string.context_menu_item_destination_point), "");
-					}
-					targets.navigateToPoint(new LatLon(latitude, longitude), true, 
-							dest ? -1 : targets.getIntermediatePoints().size(), dest? target : selected);
+					targets.navigateToPoint(new LatLon(latitude, longitude), true,
+							dest ? -1 : targets.getIntermediatePoints().size(), dest? "" : selected);
 					if(targets.getIntermediatePoints().size() > 0) {
 						openIntermediatePointsDialog();
 					}
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
index 527e496273..7617753f3d 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
@@ -155,74 +155,6 @@ public class MapActivityLayers {
 		app.getAppCustomization().createLayers(mapView, activity);
 	}
 
-	public void createLayers(GLSurfaceView glSurfaceView){
-		//TODO implement adding layers
-		OsmandApplication app = (OsmandApplication) getApplication();
-		RoutingHelper routingHelper = app.getRoutingHelper();
-		// first create to make accessible
-		mapTextLayer = new MapTextLayer();
-		// 5.95 all labels
-//		mapView.addLayer(mapTextLayer, 5.95f);
-		// mapView.addLayer(underlayLayer, -0.5f);
-		mapTileLayer = new MapTileLayer(true);
-//		mapView.addLayer(mapTileLayer, 0.0f);
-//		mapView.setMainLayer(mapTileLayer);
-
-		// 0.5 layer
-		mapVectorLayer = new MapVectorLayer(mapTileLayer, true);
-//		mapView.addLayer(mapVectorLayer, 0.5f);
-
-		downloadedRegionsLayer = new DownloadedRegionsLayer();
-//		mapView.addLayer(downloadedRegionsLayer, 0.5f);
-
-		// 0.9 gpx layer
-		gpxLayer = new GPXLayer();
-//		mapView.addLayer(gpxLayer, 0.9f);
-
-		// 1. route layer
-		routeLayer = new RouteLayer(routingHelper);
-//		mapView.addLayer(routeLayer, 1);
-
-		// 2. osm bugs layer
-		// 3. poi layer
-		poiMapLayer = new POIMapLayer(activity);
-		// 4. favorites layer
-		favoritesLayer = new FavoritesLayer();
-		// 5. transport layer
-		transportStopsLayer = new TransportStopsLayer();
-		// 5.5 transport info layer
-		transportInfoLayer = new TransportInfoLayer(TransportRouteHelper.getInstance());
-//		mapView.addLayer(transportInfoLayer, 5.5f);
-		// 5.95 all text labels
-		// 6. point location layer
-		locationLayer = new PointLocationLayer(activity.getMapViewTrackingUtilities());
-//		mapView.addLayer(locationLayer, 6);
-		// 7. point navigation layer
-		navigationLayer = new PointNavigationLayer(activity);
-//		mapView.addLayer(navigationLayer, 7);
-		// 8. context menu layer
-		contextMenuLayer = new ContextMenuLayer(activity);
-//		mapView.addLayer(contextMenuLayer, 8);
-		// 9. map info layer
-		mapInfoLayer = new MapInfoLayer(activity, routeLayer);
-//		mapView.addLayer(mapInfoLayer, 9);
-		// 11. route info layer
-		mapControlsLayer = new MapControlsLayer(activity);
-//		mapView.addLayer(mapControlsLayer, 11);
-
-		app.getSettings().MAP_TRANSPARENCY.addListener(new StateChangedListener<Integer>() {
-			@Override
-			public void stateChanged(Integer change) {
-				mapTileLayer.setAlpha(change);
-				mapVectorLayer.setAlpha(change);
-//				mapView.refreshMap();
-			}
-		});
-
-//		OsmandPlugin.createLayers(mapView, activity);
-//		app.getAppCustomization().createLayers(mapView, activity);
-	}
-
 	
 	public void updateLayers(OsmandMapTileView mapView){
 		OsmandSettings settings = getApplication().getSettings();
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java
index 0dccdf5719..83c761cb17 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java
@@ -81,7 +81,7 @@ public class DashMapFragment extends DashBaseFragment  implements IMapDownloader
 		osmandMapTileView = surf.getMapView();
 		osmandMapTileView.getView().setVisibility(View.VISIBLE);
 		osmandMapTileView.removeAllLayers();
-		MapVectorLayer mapVectorLayer = new MapVectorLayer(null);
+		MapVectorLayer mapVectorLayer = new MapVectorLayer(null, true);
 		MapTextLayer mapTextLayer = new MapTextLayer();
 		mapTextLayer.setAlwaysVisible(true);
 		// 5.95 all labels
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
index 3c77b04d38..41adfbfd1c 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
@@ -325,8 +325,10 @@ public class ConfigureMapMenu {
 	private void createCustomRenderingProperties(final ContextMenuAdapter adapter , final MapActivity activity,
 			List<RenderingRuleProperty> customRules ){
 		final OsmandMapTileView view = activity.getMapView();
-		final OsmandApplication app = view.getApplication();
 		for (final RenderingRuleProperty p : customRules) {
+			if (p.getAttrName().equals("appMode")){
+				continue;
+			}
 			String propertyName = SettingsActivity.getStringPropertyName(view.getContext(), p.getAttrName(),
 					p.getName());
 			// test old descr as title
diff --git a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
index 0271fd28e1..fd6f05b5b0 100644
--- a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
+++ b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
@@ -77,7 +77,7 @@ public class VoiceRouter {
     public interface VoiceMessageListener {
     	void onVoiceMessage();
     }
-    private ConcurrentHashMap<VoiceMessageListener, Void> voiceMessageListeners;
+    private ConcurrentHashMap<VoiceMessageListener, Integer> voiceMessageListeners;
     
 	public VoiceRouter(RoutingHelper router, final OsmandSettings settings, CommandPlayer player) {
 		this.router = router;
@@ -85,7 +85,7 @@ public class VoiceRouter {
         this.settings = settings;
 
 		empty = new Struct("");
-		voiceMessageListeners = new ConcurrentHashMap<VoiceRouter.VoiceMessageListener, Void>();
+		voiceMessageListeners = new ConcurrentHashMap<VoiceRouter.VoiceMessageListener, Integer>();
 	}
 	
 	public void setPlayer(CommandPlayer player) {
@@ -842,7 +842,7 @@ public class VoiceRouter {
 	}
 
 	public void addVoiceMessageListener(VoiceMessageListener voiceMessageListener) {
-		voiceMessageListeners.put(voiceMessageListener, null);
+		voiceMessageListeners.put(voiceMessageListener, 0);
 	}
 	
 	public void removeVoiceMessageListener(VoiceMessageListener voiceMessageListener) {