diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml
index 51081874d9..cf09ba7992 100644
--- a/OsmAnd/build.xml
+++ b/OsmAnd/build.xml
@@ -196,7 +196,7 @@
 				<replaceregexp file="res/values/no_translate.xml" match='"app_name"&gt;(.*)&lt;' replace='"app_name"&gt;${app.name}&lt;' byline="true" />
 				<replaceregexp file="res/layout/search_address.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"' 
 					replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" />
-				<replaceregexp file="res/layout/navigate_point.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"' 
+				<replaceregexp file="res/layout/search_point.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"' 
 					replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" />
 			</then>
 			</if>
diff --git a/OsmAnd/res/layout/navigate_point.xml b/OsmAnd/res/layout/search_point.xml
similarity index 99%
rename from OsmAnd/res/layout/navigate_point.xml
rename to OsmAnd/res/layout/search_point.xml
index 74098994ca..a08924fa6b 100644
--- a/OsmAnd/res/layout/navigate_point.xml
+++ b/OsmAnd/res/layout/search_point.xml
@@ -152,4 +152,4 @@
 
         </net.osmand.view.ExpandableLinearLayout>
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/OsmAnd/res/values-bg/phrases.xml b/OsmAnd/res/values-bg/phrases.xml
index f74731dc81..0eb9ef9c7d 100644
--- a/OsmAnd/res/values-bg/phrases.xml
+++ b/OsmAnd/res/values-bg/phrases.xml
@@ -170,4 +170,34 @@
 	<string name="poi_fuel_methanol">Метанол</string>
 	<string name="poi_fuel_e10">E10</string>
 	<string name="poi_fuel_e20">E20</string>
+	<string name="poi_fuel_lh2">Течен водород</string>
+	<string name="poi_fuel_electricity">Електричество</string>
+	<string name="poi_charging_station">Зарядна станция</string>
+	<string name="poi_compressed_air">Сгъстен въздух</string>
+	<string name="poi_parking">Паркинг</string>
+	<string name="poi_motorcycle_parking">Паркинг за мотоциклети</string>
+	<string name="poi_garages">Гаражи</string>
+
+	<string name="poi_public_transport_platform">Спирка на обществения транспорт</string>
+	<string name="poi_public_transport_platform_bus">Автобусна спирка</string>
+	<string name="poi_public_transport_platform_trolleybus">Спирка на тролейбус</string>
+	<string name="poi_bus_stop">Автобусна спирка</string>
+	<string name="poi_public_transport_platform_tram">Трамвайна спирка</string>
+	<string name="poi_tram_stop">Трамвайна спирка</string>
+	<string name="poi_bus_station">Автогара</string>
+	<string name="poi_railway_station">Жп-гара</string>
+	<string name="poi_railway_platform">Перон</string>
+	<string name="poi_halt">Железопътна спирка</string>
+	<string name="poi_subway_station">Метростанция</string>
+	<string name="poi_taxi">Таксиметрова стоянка</string>
+
+	<string name="poi_aerodrome">Летище</string>
+	<string name="poi_helipad">Хеликоптерна площадка</string>
+	<string name="poi_runway">Писта</string>
+	<string name="poi_slipway">Хелинг</string>
+	<string name="poi_ferry_terminal">Фериботен терминал</string>
+	<string name="poi_lighthouse">Фар</string>
+
+	<string name="poi_bicycle_rental">Велосипеди под наем</string>
+	<string name="poi_aerialway_cable_car">Кабинков лифт</string>
 	</resources>
diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml
index 1700f0cf1a..03d7ce92e5 100644
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@@ -1845,7 +1845,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="current_route">Текущ маршрут</string>
     <string name="mark_to_delete">Изберете за изтриване</string>
 	<string name="osmo_grop_name_length_alert">Името на групата трябва да бъде най-малко от 3 символа!</string>
-	<string name="local_osm_changes_upload_all_confirm">Ще да качите %1$ d промени към OSM. Сигурни ли сте?</string>
+	<string name="local_osm_changes_upload_all_confirm">Ще да качите %1$d промени към OSM. Сигурни ли сте?</string>
     <string name="confirmation_to_clear_history">Искате ли да изчистите хронологията?</string>
     <string name="delay_to_start_navigation">Стартиране на навигацията след…</string>
     <string name="shared_string_go">Старт</string>
@@ -1909,7 +1909,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="online_map">Онлайн карта</string>
 	<string name="roads_only">Само пътища</string>
     <string name="rendering_attr_pisteRoutes_name">Ски писти</string>
-	<string name="free">"Свободни %1$ s "</string>
+	<string name="free">"Свободни %1$s "</string>
 	<string name="device_memory">Памет на устройството</string>
     <string name="parking_place">Паркинг място</string>
     <string name="remove_the_tag">ПРЕМАХНИ ЕТИКЕТА</string>
@@ -1964,7 +1964,7 @@ OsmAnd е с отворен код и активно да се развива. 
 	<string name="coordinates">Координати</string>
 	<string name="anonymous_user_hint">"Анонимен потребител не може  да:\n-създава групи;\n-синхронизира групи и устройства със сървъра;\n-управлява групи и устройства в частен режим."</string>
     <string name="anonymous_user">Анонимен потребител</string>
-    <string name="logged_as">Влезли сте като %1$ s</string>
+    <string name="logged_as">Влезли сте като %1$s</string>
 	<string name="print_route">Печат на маршрут</string>
     <string name="enable_proxy_title">Разреши HTTP прокси</string>
 	<string name="enable_proxy_descr">Конфигуриране на HTTP прокси за всички мрежови заявки</string>
@@ -1996,7 +1996,7 @@ OsmAnd е с отворен код и активно да се развива. 
     <string name="gpx_selection_route_points">%1$s
 \nТочки %2$s</string>
     <string name="speed_limit_exceed_message">Изберете толеранса на ограничението на скоростта, над което ще получите гласово предупреждение.</string>
-	<string name="fav_point_emoticons_message">Името на точката е променено на %1$ s с цел правилното записване на низ с емотикони във файл.</string>
+	<string name="fav_point_emoticons_message">Името на точката е променено на %1$s с цел правилното записване на низ с емотикони във файл.</string>
     <string name="osmo_gpx_track_downloaded">OsMo следата %1$s е изтеглена.</string>
     <string name="no_index_file_to_download">Списъкът за сваляне не е намерен, моля проверете Вашата интернет връзка.</string>
     <string name="gpx_selection_points">%1$s
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index 0c0d7818e0..09701b0f1b 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -834,4 +834,6 @@
 	<string name="poi_wiki_lang_vo">Wiki en volapük</string>
 	<string name="poi_wiki_lang_zh">Wiki en xinès</string>
 
-</resources>
+<string name="poi_camera">Càmeres i òptiques</string>
+	<string name="poi_religious">Zona religiosa</string>
+	</resources>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index f47f561fd1..a3db8c56c5 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -1728,7 +1728,7 @@
     <string name="pause_navigation">Suspèn la navegació</string>
 	<string name="rendering_attr_alpineHiking_name">Escala senderista SAC (Club Alpí Suís)</string>
     <string name="rendering_attr_alpineHiking_description">Es dibuixen els camins segons l\'escala SAC (Club Alpí Suís)</string>
-    <string name="rendering_attr_hikingRoutesOSMC_name">Sobreposar simbologia senderista</string>
+    <string name="rendering_attr_hikingRoutesOSMC_name">Superposa la simbologia de senderisme</string>
     <string name="rendering_attr_hikingRoutesOSMC_description">Es dibuixen els camins segons les traces OSMC (símbols de colors)</string>
     
 	<string name="osmo_invite">Convida…</string>
diff --git a/OsmAnd/res/values-cs/phrases.xml b/OsmAnd/res/values-cs/phrases.xml
index 68f77cc5ec..456f7dc78f 100644
--- a/OsmAnd/res/values-cs/phrases.xml
+++ b/OsmAnd/res/values-cs/phrases.xml
@@ -788,4 +788,48 @@
 	<string name="poi_hunting_lodge">Lovecká chata</string>
 
 	<string name="poi_hanami">Hanami</string>
-	</resources>
+	<string name="poi_camera">Foto a optika</string>
+	<string name="poi_wiki_place">Wikipedie</string>
+	<string name="poi_wiki_lang_en">Anglická wiki</string>
+	<string name="poi_wiki_lang_ar">Arabská wiki</string>
+	<string name="poi_wiki_lang_be">Běloruská wiki</string>
+	<string name="poi_wiki_lang_bg">Bulharská wiki</string>
+	<string name="poi_wiki_lang_ca">Katalánská wiki</string>
+	<string name="poi_wiki_lang_cs">Česká wiki</string>
+	<string name="poi_wiki_lang_da">Dánská wiki</string>
+	<string name="poi_wiki_lang_de">Německá wiki</string>
+	<string name="poi_wiki_lang_el">Řecká wiki</string>
+	<string name="poi_wiki_lang_et">Estonská wiki</string>
+	<string name="poi_wiki_lang_es">Španělská wiki</string>
+	<string name="poi_wiki_lang_fi">Finská wiki</string>
+	<string name="poi_wiki_lang_fr">Francouzská wiki</string>
+	<string name="poi_wiki_lang_he">Hebrejská wiki</string>
+	<string name="poi_wiki_lang_hi">Hindská wiki</string>
+	<string name="poi_wiki_lang_hr">Chorvatská wiki</string>
+	<string name="poi_wiki_lang_ht"/>
+	<string name="poi_wiki_lang_hu">Maďarská wiki</string>
+	<string name="poi_wiki_lang_id">Indonéská wiki</string>
+	<string name="poi_wiki_lang_it">Italská wiki</string>
+	<string name="poi_wiki_lang_ja">Japonská wiki</string>
+	<string name="poi_wiki_lang_ko">Korejská wiki</string>
+	<string name="poi_wiki_lang_lt">Litevská wiki</string>
+	<string name="poi_wiki_lang_lv">Lotyšská wiki</string>
+	<string name="poi_wiki_lang_ms">Malajská wiki</string>
+	<string name="poi_wiki_lang_nl">Holandská wiki</string>
+	<string name="poi_wiki_lang_no">Norská wiki</string>
+	<string name="poi_wiki_lang_pl">Polská wiki</string>
+	<string name="poi_wiki_lang_pt">Portugalská wiki</string>
+	<string name="poi_wiki_lang_ro">Rumunská wiki</string>
+	<string name="poi_wiki_lang_ru">Ruská wiki</string>
+	<string name="poi_wiki_lang_sk">Slovenská wiki</string>
+	<string name="poi_wiki_lang_sl">Slovinská wiki</string>
+	<string name="poi_wiki_lang_sr">Srbská wiki</string>
+	<string name="poi_wiki_lang_sv">Švédská wiki</string>
+	<string name="poi_wiki_lang_sw">Svahilská wiki</string>
+	<string name="poi_wiki_lang_th">Thajská wiki</string>
+	<string name="poi_wiki_lang_tr">Turecká wiki</string>
+	<string name="poi_wiki_lang_uk">Ukrajinská wiki</string>
+	<string name="poi_wiki_lang_vi">Vietnamská wiki</string>
+	<string name="poi_wiki_lang_zh">Čínská wiki</string>
+
+</resources>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 15b695cf36..b0f614fc4b 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -1952,7 +1952,7 @@ s často kladenými otázkami.</string>
 <string name="osmo_share_my_location">Sdílet moji polohu</string>
     <string name="shared_string_logoff">Odhlásit</string>
     <string name="shared_string_import2osmand">Importovat do OsmAnd</string>
-    <string name="read_full_article">Přečíst celý článek</string>
+    <string name="read_full_article">Přečíst celý článek (online)</string>
     <string name="download_wikipedia_item">Wikipedie</string>
     <string name="local_indexes_cat_wiki">Wikipedie</string>
     <string name="shared_string_show_details">Zobrazit detaily</string>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 125f7ecc7f..d09537e62d 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -846,4 +846,5 @@
 	<string name="poi_wiki_lang_zh">Kinesisk wiki</string>
 
 <string name="poi_camera">Kameraer og objektiver</string>
+	<string name="poi_religious">Religiøst område</string>
 	</resources>
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 4b754878b9..ae51c41505 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -23,7 +23,7 @@
 	<string name="poi_craft_agricultural_engines">Landmaschinen</string>
 	<string name="poi_aerodrome">Flughafen</string>
 	<string name="poi_alcohol">Spirituosenladen</string>
-	<string name="poi_alpine_hut">Berghütte</string>
+	<string name="poi_alpine_hut">Schutzhütte</string>
 	<string name="poi_ambulance_station">Rettungswache</string>
 	<string name="poi_anime">Anime-Shop</string>
 	<string name="poi_antiques">Antiquitätenhändler</string>
@@ -59,7 +59,7 @@
 	<string name="poi_beachvolleyball">Beachvolleyball</string>
 	<string name="poi_beauty">Schönheitssalon</string>
 	<string name="poi_beauty_salon_nails">Nagelstudio</string>
-	<string name="poi_bed">Badezimmereinrichtung</string>
+	<string name="poi_bed">Schlafzimmereinrichtung</string>
 	<string name="poi_bedding">Bettwarengeschäft</string>
 	<string name="poi_craft_beekeeper">Bienenzüchter</string>
 	<string name="poi_beverages">Getränkegeschäft</string>
@@ -80,7 +80,7 @@
 	<string name="poi_border_control">Grenzkontrolle</string>
 	<string name="poi_boules">Bäcker</string>
 	<string name="poi_boundary_stone">Grenzstein</string>
-	<string name="poi_boutique">Boutique</string>
+	<string name="poi_boutique">Modehaus</string>
 	<string name="poi_bowls">Schüsseln</string>
 	<string name="poi_craft_brewery">Brauerei</string>
 	<string name="poi_bridge">Brücke</string>
@@ -101,7 +101,7 @@
 	<string name="poi_caravan_site">Campingplatz</string>
 	<string name="poi_craft_carpenter">Tischler</string>
 	<string name="poi_craft_carpet_layer">Teppichleger</string>
-	<string name="poi_carpet">Teppiche</string>
+	<string name="poi_carpet">Teppichgeschäft</string>
 	<string name="poi_casino">Casino</string>
 	<string name="poi_castle">Burg</string>
 	<string name="poi_craft_caterer">Partyservice</string>
@@ -152,7 +152,7 @@
 	<string name="poi_company">Firma</string>
 	<string name="poi_compressed_air">Druckluft</string>
 	<string name="poi_craft_computer">Computer</string>
-	<string name="poi_computer">Computer-Geschäft</string>
+	<string name="poi_computer">Computergeschäft</string>
 	<string name="poi_confectionery">Süßwaren</string>
 	<string name="poi_construction">Anlage</string>
 	<string name="poi_convenience">Lebensmittelgeschäft</string>
@@ -174,7 +174,7 @@
 	<string name="poi_deli">Delikatessen</string>
 	<string name="poi_dentist">Zahnarzt</string>
 	<string name="poi_department_store">Kaufhaus</string>
-	<string name="poi_dive">Tauchgerät</string>
+	<string name="poi_dive">Tauchausrüstung</string>
 	<string name="poi_diving">Tauschen</string>
 	<string name="poi_doctors">Arzt</string>
 	<string name="poi_dog_park">Hundepark</string>
@@ -212,7 +212,7 @@
 	<string name="poi_ford">Furt</string>
 	<string name="poi_fort">Festung</string>
 	<string name="poi_fountain">Brunnen</string>
-	<string name="poi_frame">Bilderrahmen-Geschäft</string>
+	<string name="poi_frame">Bilderrahmengeschäft</string>
 	<string name="poi_fuel">Tankstelle</string>
 	<string name="poi_funeral_directors">Bestatter</string>
 	<string name="poi_funicular">Seilbahn</string>
@@ -613,7 +613,7 @@
 	<string name="poi_aquarium">Aquarium</string>
 	<string name="poi_team_handball">Handball</string>
   <string name="poi_shop">Geschäft</string>
-		<string name="poi_shop_food">Lebensmittel</string>
+		<string name="poi_shop_food">Lebensmittelgeschäft</string>
 	<string name="poi_emergency">Notfall</string>
 	<string name="poi_road_obstacle">Straßemhindernis</string>
 		<string name="poi_filling_station">Tankstelle</string>
@@ -698,7 +698,7 @@
 	<string name="poi_field_hockey">Feldhockey</string>
 	<string name="poi_sailing">Segeln</string>
 	<string name="poi_apartment">Apartment</string>
-	<string name="poi_internet_access_wlan">Internetzugang: Wlan</string>
+	<string name="poi_internet_access_wlan">Internetzugang: WLAN</string>
 	<string name="poi_internet_access_wired">Internetzugang: Kabel</string>
 	<string name="poi_internet_access_public">Internetzugang: öffentlich</string>
 	<string name="poi_picnic_table">Picknicktisch</string>
@@ -731,4 +731,19 @@
 	<string name="poi_piste_hike">Wandern</string>
 	<string name="poi_piste_ice_skate">Eislaufen</string>
 	<string name="poi_payment_terminal">Bezahl-Terminal</string>
+	<string name="poi_transport_construction">Transportkonstruktion</string>
+		<string name="poi_natural">Natürlich</string>
+	<string name="poi_camera">Kameras und Objektive</string>
+	<string name="poi_charity">Karitativer Gebrauchtwarenladen</string>
+	<string name="poi_cabin">Hütte</string>
+	<string name="poi_lean_to">Unterstand</string>
+	<string name="poi_wilderness_hut">Wildnishütte</string>
+	<string name="poi_wiki_lang_zh">Chinesisches Wiki</string>
+
+<string name="poi_wiki_lang_tr">Türkisches Wiki</string>
+	<string name="poi_wiki_lang_uk">Ukrainisches Wiki</string>
+	<string name="poi_wiki_lang_vi">Vietnamesisches Wiki</string>
+	<string name="poi_internet_access_terminal">Internetzugang: Terminal</string>
+	<string name="poi_internet_access_service">Internetzugang: Dienst</string>
+
 	</resources>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index f07710e959..6935d8c8f2 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -2102,7 +2102,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
 	<string name="shared_string_ellipsis">…</string>
 	<string name="shared_string_selected">Ausgewählt</string>
 	<string name="shared_string_selected_lowercase">ausgewählt</string>
-	<string name="shared_string_open">Öffnen</string>
+	<string name="shared_string_open">Offen</string>
 
 	<string name="rendering_attr_hideHouseNumbers_name">Hausnummern verbergen</string>
 	<string name="application_dir_change_warning3">Soll OsmAnd auch die Datendateien an den neuen Ort kopieren?</string>
@@ -2189,4 +2189,24 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="archive_wikipedia_data">Es sind veraltete inkompatible Wikipedia-Daten vorhanden. Sollen diese gesichert werden?</string>
     <string name="download_wikipedia_files">Sollen zusätzliche Wikipedia-Daten heruntergeladen werden (%1$s MB) ?</string>
     <string name="osm_edit_context_menu_delete">OSM-Bearbeitungen löschen</string>
+    <string name="light_theme">Hell</string>
+    <string name="dark_theme">Dunkel</string>
+    <string name="lang_pms">Piemontesisch</string>
+    <string name="lang_bn">Bengalisch</string>
+    <string name="lang_tl">Tagalog</string>
+    <string name="lang_sh">Serbokroatisch</string>
+    <string name="lang_az">Aserbaidschan</string>
+    <string name="lang_br">Bretonisch</string>
+    <string name="lang_sq">Albanisch</string>
+    <string name="lang_is">Isländisch</string>
+    <string name="lang_ga">Irisch</string>
+    <string name="lang_la">Lateinisch</string>
+    <string name="lang_ku">Kurdisch</string>
+    <string name="lang_ta">Tamil</string>
+    <string name="lang_ml">Malayalam</string>
+    <string name="lang_lb">Luxemburgisch</string>
+    <string name="lang_os">Ossetisch</string>
+    <string name="lang_eo">Esperanto</string>
+    <string name="lang_nb">Norwegische Buchsprache</string>
+    <string name="lang_nn">Norwegisch (Neunorwegisch)</string>
     </resources>
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index e94b700d3d..6327c72982 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -769,7 +769,7 @@
 	<string name="poi_small_craft_facility">Instalaciones para pequeñas embarcaciones</string>
 	<string name="poi_topmark">Tope náutico</string>
 	<string name="poi_seamark_rock">Roca náutica</string>
-	<string name="poi_seamark_wreck">Naufragio</string>
+	<string name="poi_seamark_wreck">Restos náuticos</string>
 
 	<string name="poi_military_landuse">Zona militar</string>
 	<string name="poi_military_airfield">Aeródromo militar</string>
@@ -825,7 +825,9 @@
 
 <string name="poi_wiki_lang_lv">Wikipedia letona</string>
 	<string name="poi_wiki_lang_nn">Wikipedia Noruega (Nynorsk)</string>
-	<string name="poi_wiki_lang_sw">Wikipedia Swahili</string>
+	<string name="poi_wiki_lang_sw">Wikipedia Suajili</string>
 	<string name="poi_wiki_lang_te">Wikipedia Télugu</string>
 	<string name="poi_wiki_lang_vo">Wikipedia Volapük</string>
+	<string name="poi_camera">Cámaras y lentes</string>
+	<string name="poi_religious">Área religiosa</string>
 	</resources>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index a9350948b2..73dba68129 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -444,7 +444,7 @@
 	<string name="routing_attr_avoid_motorway_description">Evite usar las autopistas</string>
 	<string name="routing_attr_weight_name">Límite de peso</string>
 	<string name="routing_attr_weight_description">Indica el peso del vehículo permitido en rutas</string>
-    <string name="lang_sw">Swahili</string>
+    <string name="lang_sw">Suajili</string>
     <string name="lang_mr">Marathi</string>
 	<string name="osmand_srtm_short_description_80_chars">Complemento OsmAnd para curvas de nivel sin conexión</string>
 	<string name="srtm_plugin_name">Curvas de nivel</string>
@@ -778,7 +778,7 @@
     <string name="accessibility_options">Opciones de accesibilidad</string>
     <string name="select_address_activity">Elija la dirección</string>
     <string name="favourites_list_activity">Elige favorito</string>
-    <string name="local_openstreetmap_act_title">Modificaciones OSM</string>
+    <string name="local_openstreetmap_act_title">Cambios OSM</string>
 	<string name="tip_recent_changes_1_2_t">"Arreglos en 1.2.1:\n\t* Corregido Geo Intent (Foursquare, c: geo)\n\t* Corregido el temblor de pantalla durante la navegación\n\t* Otras pequeñas correcciones\nCambios en 1.2:\n\t* Corrección de errores (enrutamiento afinado, búsqueda, grabación de AV, los mensajes de voz, algunas mejoras de visualización)\n\t* Configuración de superposición del sombreado más sencillo (requiere complemento de Curvas de nivel)\n\t* Ahora acepta enlaces de ubicación de maps.google.com\n\t* Nuevo control (Información GPS)\n\t* Filtro de Kalman para brújula\n\t* Soporte para reloj Pebble\n\t* Añadido soporte multiventana para nuevos dispositivos Samsung "</string>
     <string name="layer_hillshade">Capa de sombreado</string>
     <string name="map_widget_gps_info">Información GPS</string>
@@ -1861,7 +1861,7 @@
 	<string name="search_address_street_option">Intersección de calle</string>
 	<string name="search_tabs_location">Ubicación</string>
 	<string name="context_menu_item_update_map">Actualizar mapa</string>
-	<string name="context_menu_item_open_bug">Abrir fallo OSM</string>
+	<string name="context_menu_item_open_bug">Crear nota de OSM</string>
 	<string name="context_menu_item_create_poi">Crear PDI</string>
 	<string name="add_favorite_dialog_top_text">Ingrese nombre de favorito</string>
 	<string name="add_favorite_dialog_default_favourite_name">Favorito</string>
@@ -1952,7 +1952,7 @@
     <string name="download_wikipedia_files">¿Descargar datos adicionales de Wikipedia (%1$s MB)?</string>
     <string name="lang_vo">Volapuque</string>
     <string name="lang_th">Tailandés</string>
-    <string name="lang_ms">Malasio</string>
+    <string name="lang_ms">Malayo</string>
     <string name="lang_ht">Haitiano</string>
     <string name="lang_gl">Gallego</string>
     <string name="lang_et">Estonio</string>
@@ -1977,8 +1977,8 @@
     <string name="lang_ta">Tamil</string>
     <string name="lang_eo">Esperanto</string>
     <string name="lang_tl">Tagalo</string>
-    <string name="lang_az">Azerbaiyán</string>
-    <string name="lang_bpy">Bishnupriya Manipuri</string>
+    <string name="lang_az">Azerbaiyano</string>
+    <string name="lang_bpy">Bishnupriya</string>
     <string name="lang_ml">Malayalam</string>
     <string name="lang_lb">Luxemburgués</string>
     <string name="lang_os">Osetio</string>
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index 347cc5982e..1c949f7e05 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -750,8 +750,8 @@
 	<string name="poi_signal_station_traffic">Estación de señales de tráfico</string>
 	<string name="poi_signal_station_warning">Estación de señales de advertencia</string>
 	<string name="poi_small_craft_facility">Instalaciones para pequeñas embarcaciones</string>
-	<string name="poi_topmark">Tope náutico</string>
-	<string name="poi_seamark_rock">Roca náutica</string>
+	<string name="poi_topmark">Marca de tope</string>
+	<string name="poi_seamark_rock">Bajo</string>
 	<string name="poi_seamark_wreck">Pecio</string>
 
 	<string name="poi_military_landuse">Zona militar</string>
@@ -783,4 +783,51 @@
 	<string name="poi_hanami">Hanami</string>
 	<string name="poi_trail_riding_station">Estación de pista de equitación</string>
 
+	<string name="poi_camera">Cámaras y lentes</string>
+	<string name="poi_wiki_place">Wikipedia</string>
+	<string name="poi_wiki_lang_en">Wiki en inglés</string>
+	<string name="poi_wiki_lang_ar">Wiki en árabe</string>
+	<string name="poi_wiki_lang_be">Wiki en bielorruso</string>
+	<string name="poi_wiki_lang_bg">Wiki en búlgaro</string>
+	<string name="poi_wiki_lang_ca">Wiki en catalán</string>
+	<string name="poi_wiki_lang_cs">Wiki en checo</string>
+	<string name="poi_wiki_lang_da">Wiki en danés</string>
+	<string name="poi_wiki_lang_de">Wiki en alemán</string>
+	<string name="poi_wiki_lang_el">Wiki en griego</string>
+	<string name="poi_wiki_lang_et">Wiki en estonio</string>
+	<string name="poi_wiki_lang_es">Wiki en español</string>
+	<string name="poi_wiki_lang_fi">Wiki en finés</string>
+	<string name="poi_wiki_lang_fr">Wiki en francés</string>
+	<string name="poi_wiki_lang_gl">Wiki en gallego</string>
+	<string name="poi_wiki_lang_he">Wiki en hebreo</string>
+	<string name="poi_wiki_lang_hi">Wiki en hindi</string>
+	<string name="poi_wiki_lang_hr">Wiki en croata</string>
+	<string name="poi_wiki_lang_ht">Wiki en haitiano</string>
+	<string name="poi_wiki_lang_hu">Wiki en húngaro</string>
+	<string name="poi_wiki_lang_id">Wiki en indonesio</string>
+	<string name="poi_wiki_lang_zh">Wiki en chino</string>
+
+<string name="poi_wiki_lang_ceb">Wiki en cebuano</string>
+	<string name="poi_wiki_lang_it">Wiki en italiano</string>
+	<string name="poi_wiki_lang_ja">Wiki en japonés</string>
+	<string name="poi_wiki_lang_ko">Wiki en coreano</string>
+	<string name="poi_wiki_lang_lt">Wiki en lituano</string>
+	<string name="poi_wiki_lang_lv">Wiki en letón</string>
+	<string name="poi_wiki_lang_ms">Wiki en malayo</string>
+	<string name="poi_wiki_lang_nl">Wiki en holandés</string>
+	<string name="poi_wiki_lang_no">Wiki en noruego</string>
+	<string name="poi_wiki_lang_pl">Wiki en polaco</string>
+	<string name="poi_wiki_lang_pt">Wiki en portugués</string>
+	<string name="poi_wiki_lang_ro">Wiki en rumano</string>
+	<string name="poi_wiki_lang_ru">Wiki en ruso</string>
+	<string name="poi_wiki_lang_sk">Wiki en eslovaco</string>
+	<string name="poi_wiki_lang_sl">Wiki en esloveno</string>
+	<string name="poi_wiki_lang_sr">Wiki en serbio</string>
+	<string name="poi_wiki_lang_sv">Wiki en sueco</string>
+	<string name="poi_wiki_lang_sw">Wiki en suajili</string>
+	<string name="poi_wiki_lang_th">Wiki en tailandés</string>
+	<string name="poi_wiki_lang_tr">Wiki en turco</string>
+	<string name="poi_wiki_lang_uk">Wiki en ucranio</string>
+	<string name="poi_wiki_lang_vi">Wiki en vietnamita</string>
+	<string name="poi_religious">Área religiosa</string>
 	</resources>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 290a2e722a..aa7f95c083 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -1911,7 +1911,7 @@
     <string name="voices">Mensajes de voz</string>
 	<string name="dash_download_msg_none">¿Quiere descargar los mapas fuera de línea?</string>
     <string name="rendering_attr_roadStyle_name">Estilo de carretera</string>
-    <string name="rendering_value_default_name">Predeterminado</string>
+    <string name="rendering_value_default_name">Predefinido</string>
     <string name="rendering_value_orange_name">Anaranjado</string>
     <string name="routing_attr_no_new_routing_name">Sin reglas de navegación v1.9</string>
     <string name="routing_attr_no_new_routing_description">No utilizar reglas de navegación introducidas en v.1.9</string>
@@ -2086,4 +2086,31 @@
     <string name="gps_network_not_enabled">El servicio de ubicación no está activado. ¿Quiere activarlo?</string>
     <string name="disable_recording_once_app_killed">Evita el registro autónomo</string>
     <string name="disable_recording_once_app_killed_descrp">Se pausará el registro GPX cuando se cierre la aplicación (a través de aplicaciones recientes). (Las indicación del modo reposo de OsmAnd desaparecerá de la barra de notificaciones de Android.)</string>
-	</resources>
+	<string name="light_theme">Luminoso</string>
+    <string name="dark_theme">Oscuro</string>
+    <string name="lang_pms">Piamontés</string>
+    <string name="lang_bn">Bengalí</string>
+    <string name="lang_tl">Tagalo</string>
+    <string name="lang_sh">Serbocroata</string>
+    <string name="lang_az">Azerí</string>
+    <string name="lang_br">Bretón</string>
+    <string name="lang_sq">Albanés</string>
+    <string name="lang_is">Islandés</string>
+    <string name="lang_nv">Navajo</string>
+    <string name="lang_ga">Irlandés</string>
+    <string name="lang_la">Latín</string>
+    <string name="lang_ku">Kurdo</string>
+    <string name="lang_ta">Tamil</string>
+    <string name="lang_lb">Luxemburgués</string>
+    <string name="lang_eo">Esperanto</string>
+    <string name="lang_es_ar">Español (Argentina)</string>
+    <string name="lang_th">Tailandés</string>
+    <string name="lang_nn">Noruego (Nynorsk)</string>
+    <string name="lang_ms">Malayo</string>
+    <string name="lang_ht">Haitiano</string>
+    <string name="lang_gl">Gallego</string>
+    <string name="lang_et">Estonio</string>
+    <string name="lang_ceb">Cebuano</string>
+    <string name="archive_wikipedia_data">Tienes datos descargados de Wikipedia que son antiguos e incompatibles. ¿Deseas archivarlos?</string>
+    <string name="download_wikipedia_files">¿Deseas descargar datos adicionales de la Wikipedia (%1$s MB)?</string>
+    </resources>
diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 43d8d55fbb..c0ede583c3 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -819,4 +819,5 @@
 	<string name="poi_wiki_lang_te">Wiki télougou</string>
 	<string name="poi_wiki_lang_th">Wiki thaïlandais</string>
 	<string name="poi_camera">Appareils photos et lentilles</string>
+	<string name="poi_religious">Zone religieuse</string>
 	</resources>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 8291604431..15986a3d38 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1777,7 +1777,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="text_size_descr">Imposta la dimensione del testo sulla mappa.</string>
     <string name="text_size">Dimensione del testo</string>
     <string name="fav_point_dublicate">Duplicato del nome del punto preferito</string>
-    <string name="fav_point_dublicate_message">Il nome indicato per i preferiti esiste già, per evitare duplicati il nome del vostro punto preferito è stato modificato in %1$s.</string>
+    <string name="fav_point_dublicate_message">Il nome indicato per i preferiti esiste già, per evitare duplicati il nome è stato modificato in %1$s.</string>
     
     
     <string name="print_route">Stampa percorso</string>
@@ -1910,10 +1910,10 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	
 	
 	<string name="days_behind">giorni fa</string>
-	<string name="track_segments">Segmenti di traccia</string>
+	<string name="track_segments">Segmenti di tracciato</string>
 	<string name="track_points">Punti della traccia</string>
 	<string name="route_points">Punti del percorso</string>
-	<string name="shared_string_release">Rilasciato</string>
+	<string name="shared_string_release">Rilasciata</string>
 	<string name="shared_string_ellipsis">…</string>
 	<string name="shared_string_ok">OK</string>
 	<string name="shared_string_cancel">Annulla</string>
@@ -2062,7 +2062,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="osm_edit_context_menu_delete">Cancella le modifiche OSM</string>
     <string name="archive_wikipedia_data">Ci sono dati Wikipedia scaricati desueti e incompatibili. Vuoi archiviarli?</string>
     <string name="download_wikipedia_files">Vuoi scaricare dati Wikipedia aggiuntivi (%1$s MB) ?</string>
-    <string name="gps_network_not_enabled">Il servizio di localizazione non è attivo. Vuoi avviarlo?</string>
+    <string name="gps_network_not_enabled">Il servizio di localizzazione non è attivo. Vuoi avviarlo?</string>
     <string name="disable_recording_once_app_killed">Previeni il login remoto</string>
     <string name="disable_recording_once_app_killed_descrp">"Metterà in pausa la registrazione GPX quando l\'app viene terminata (attraverso le app recenti). (L\'indicatore della modalità OsmAnd quiescente  scomparirà dalla barra delle notifiche Android.)"</string>
     <string name="shared_string_import2osmand">Importa in OsmAnd</string>
@@ -2078,4 +2078,28 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="lang_th">Thailandese</string>
     <string name="lang_te">Telugu</string>
     <string name="lang_nn">Norwegian (Nynorsk)</string>
+    <string name="light_theme">Luce</string>
+    <string name="dark_theme">Scuro</string>
+    <string name="lang_pms">Piemontese</string>
+    <string name="lang_bn">Bengalese</string>
+    <string name="lang_tl">Tagalog</string>
+    <string name="lang_sh">Serbo-Croato</string>
+    <string name="lang_az">Azero</string>
+    <string name="lang_br">Bretone</string>
+    <string name="lang_sq">Albanese</string>
+    <string name="lang_is">Islandese</string>
+    <string name="lang_bpy">Bishnupriya</string>
+    <string name="lang_nv">Navajo</string>
+    <string name="lang_ga">Irlandese</string>
+    <string name="lang_la">Latino</string>
+    <string name="lang_ku">Curdo</string>
+    <string name="lang_ta">Tamil</string>
+    <string name="lang_ml">Malayalam</string>
+    <string name="lang_lb">Lussemburghese</string>
+    <string name="lang_os">Osseto</string>
+    <string name="lang_eo">Esperanto</string>
+    <string name="lang_ms">Malese</string>
+    <string name="lang_gl">Gallego</string>
+    <string name="lang_et">Estone</string>
+    <string name="lang_ceb">Cebuano</string>
     </resources>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index ceb07e173b..8c373b448a 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -2037,7 +2037,7 @@
     <string name="local_indexes_cat_wiki">Vikipedija</string>
     <string name="shared_string_show_details">Rodyti detales</string>
     <string name="osm_edit_context_menu_delete">Ištrinti OSM taisymus</string>
-    <string name="local_recordings_delete_all_confirm">Ketinate ištrinti %1$ d pastabas. Ar tikrai to norite?</string>
+    <string name="local_recordings_delete_all_confirm">Ketinate ištrinti %1$d pastabas. Ar tikrai to norite?</string>
 	<string name="download_wikipedia_maps">Vikipedija</string>
     <string name="disable_recording_once_app_killed_descrp">Bus pristabdytas GPX įrašymas, jei programa bus išjungta (per Pastarosios programos). (OsmAnd Miego režimo piktograma dings iš Android pranešimų juostos.)</string>
 	<string name="download_wikipedia_files">Ar norite atsisiųsti papildomų Wikipedia duomenų (%1$s MB)?</string>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index e292a4cbfc..bb515bfa1a 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -1348,4 +1348,33 @@
     <string name="osm_edit_context_menu_delete">Slett OSM-redigering</string>
     <string name="rendering_value_disabled_name">Deaktivert</string>
     <string name="osmo_share_my_location">Del min posisjon</string>
+    <string name="lang_pms">Piemontesisk</string>
+    <string name="lang_bn">Bengali</string>
+    <string name="lang_tl">Tagalog</string>
+    <string name="lang_sh">Serbokroatisk</string>
+    <string name="lang_az">Aserbajdsjansk</string>
+    <string name="lang_br">Bretonsk</string>
+    <string name="lang_sq">Albansk</string>
+    <string name="lang_is">Islandsk</string>
+    <string name="lang_nv">Navajo</string>
+    <string name="lang_ga">Irsk</string>
+    <string name="lang_la">Latin</string>
+    <string name="lang_ku">Kurdisk</string>
+    <string name="lang_ta">Tamilsk</string>
+    <string name="lang_ml">Malayalam</string>
+    <string name="lang_lb">Luxembourgsk</string>
+    <string name="lang_os">Ossetisk</string>
+    <string name="lang_eo">Esperanto</string>
+    <string name="lang_es_ar">Argentinsk spansk</string>
+    <string name="lang_nb">Norsk (bokmål)</string>
+    <string name="lang_vo">Volapük</string>
+    <string name="lang_th">Thai</string>
+    <string name="lang_te">Telugu</string>
+    <string name="lang_nn">Norsk (nynorsk)</string>
+    <string name="lang_ms">Malayisk</string>
+    <string name="lang_ht">Haitisk</string>
+    <string name="lang_gl">Galisisk</string>
+    <string name="lang_et">Estisk</string>
+    <string name="light_theme">Lyst</string>
+    <string name="dark_theme">Mørkt</string>
     </resources>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 44f450b5fd..6b15b15ebc 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -1839,12 +1839,12 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="lang_he">Hebreeuws</string>
     <string name="forward">Vooruit</string>
     <string name="home">Thuis</string>
-    <string name="live_monitoring_m_descr">Stuur tracking naar een webservice als een GPX-track wordt gemaakt</string>
+    <string name="live_monitoring_m_descr">Stuur tracking-data naar een webservice als een GPX-track wordt gemaakt</string>
 	<string name="live_monitoring_m">Online tracking (GPX vereist)</string>
     <string name="live_monitoring_start">Start online tracking</string>
 	<string name="live_monitoring_stop">Stop online tracking</string>
-	<string name="gpx_monitoring_start">Start GPX opname</string>
-	<string name="gpx_monitoring_stop">Stop GPX opname</string>
+	<string name="gpx_monitoring_start">Start GPX-opname</string>
+	<string name="gpx_monitoring_stop">Stop GPX-opname</string>
     <string name="gpx_start_new_segment">Start nieuw segment</string>
     <string name="keep_navigation_service">Houden</string>
 	<string name="stop_navigation_service">Onderbreek</string>
@@ -1901,7 +1901,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="save_track_interval_globally">Interval tussen geregistreerde punten</string>
 	<string name="rendering_attr_publicTransportMode_name">Bus-, trolleybus- en pendelbuslijnen</string>
 	<string name="confirm_every_run">Altijd vragen</string>
-	<string name="save_global_track_interval_descr">Selecteer de loggings-interval voor de standaard track opname (te starten via de GPX opname widget in het scherm)</string>
+	<string name="save_global_track_interval_descr">Selecteer de loggings-interval voor de standaard track opname (te starten via de GPX opname widget op het kaartscherm)</string>
 	<string name="save_global_track_interval">Standaard loggings-interval</string>
 	<string name="traffic_warning_speed_limit">Maximum snelheid</string>
     <string name="traffic_warning_border_control">Grenscontrole</string>
@@ -1913,7 +1913,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="local_index_description">Tik om details te bekijken; houd ingedrukt om uit te schakelen of te verwijderen. Huidige gegevens op het toestel (%1$s beschikbaar):</string>
 	<string name="text_size_descr">De grootte van tekst op de kaart instellen.</string>
     <string name="text_size">Tekstgrootte</string>
-    <string name="fav_point_dublicate_message">Favoriet bestaat al: de naam is veranderd in %1$s</string>
+    <string name="fav_point_dublicate_message">Favoriet bestaat al: de naam is veranderd in %1$s.</string>
     <string name="fav_point_dublicate">Favoriet met deze naam bestaat al</string>
     
     
@@ -2196,4 +2196,27 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="local_indexes_cat_wiki">Wikipedia</string>
     <string name="shared_string_show_details">Toon details</string>
     <string name="local_recordings_delete_all_confirm">Je staat op het punt %1$d notities te verwijderen. Weet je dat zeker?</string>
-	</resources>
+	<string name="light_theme">Licht</string>
+    <string name="dark_theme">Donker</string>
+    <string name="lang_tl">Tagalog</string>
+    <string name="lang_sh">Servo-Kroatisch</string>
+    <string name="lang_az">Azerbeidzjaans</string>
+    <string name="lang_br">Bretons</string>
+    <string name="lang_sq">Albanees</string>
+    <string name="lang_is">IJslands</string>
+    <string name="lang_nv">Navajo</string>
+    <string name="lang_ga">Iers</string>
+    <string name="lang_la">Latijn</string>
+    <string name="lang_ku">Koerdisch</string>
+    <string name="lang_ta">Tamil</string>
+    <string name="lang_lb">Luxemburgs</string>
+    <string name="lang_eo">Esperanto</string>
+    <string name="lang_es_ar">Spaans (Argentinië)</string>
+    <string name="lang_th">Thais</string>
+    <string name="archive_wikipedia_data">Er zijn al (verouderde en incompatibele) Wikipedia-gegevens gedownload. Wilt u deze bewaren?</string>
+    <string name="download_wikipedia_files">Wilt u Wikipedia-artikelen downloaden (%1$s MB) ?</string>
+    <string name="disable_recording_once_app_killed">Voorkom loggen als app wordt gesloten</string>
+    <string name="disable_recording_once_app_killed_descrp">Stopt het opnemen van een GPX-spoort als de app wordt gesloten in de applicatielijst. (De OsmAnd achtergrondindicatie verdwijnt dan ook.)</string>
+    <string name="shared_string_import2osmand">Importeren in OsmAnd</string>
+    <string name="download_wikipedia_maps">Wikipedia</string>
+    </resources>
diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml
index ee33b3ccfd..88271a1cd5 100644
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@@ -829,4 +829,5 @@
 
 <string name="poi_wiki_lang_lv">Letão wiki</string>
 	<string name="poi_camera">Câmeras e lentes</string>
+	<string name="poi_religious">Área religiosa</string>
 	</resources>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 368af05ceb..f163764b9b 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -60,7 +60,7 @@
 	<string name="your_edits">Suas edições</string>
     <string name="waypoint_visit_after">Passar depois</string>
     <string name="waypoint_visit_before">Passar antes</string>
-    <string name="simulate_your_location">Simular sua posição</string>
+    <string name="simulate_your_location">Simular rota</string>
     <string name="drawer">Lista simples</string>
     <string name="short_location_on_map">Lat %1$s\n Lon %2$s</string>
     <string name="tips_and_tricks_descr">Respostas às perguntas frequentes, mudanças recentes e outras</string>
@@ -238,7 +238,7 @@
 	<string name="rendering_attr_subwayMode_name">Rotas de metrô</string>
     <string name="lock_screen_request_explanation">%1$s precisa dessa permissão para desligar a tela para economizar energia.</string>
     <string name="wake_on_voice">Ligar tela</string>
-    <string name="wake_on_voice_descr">Ligar tela do aparelho (se estiver desligado) quando se aproxima da manobra</string>
+    <string name="wake_on_voice_descr">Ligar tela do aparelho (se estiver desligada) quando se aproxima da manobra</string>
     <string name="impassable_road">Evitar estradas…</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Rotas de trem</string>
     <string name="rendering_attr_tramRoutes_name">Rotas de bonde</string>
@@ -264,7 +264,7 @@
     <string name="logged_as">Conectado como %1$s</string>
 	<string name="speed_limit_exceed">Tolerância do limite de velocidade</string>
 	<string name="speed_limit_exceed_message">Selecione a margem de tolerância de limite de velocidade, acima do qual você receberá um aviso de voz.</string>
-	<string name="fav_point_emoticons_message">O nome do favorito foi modificado para %1$ s para facilitar a salvar corretamente a seqüência de caracteres com emoticons para um arquivo.</string>
+	<string name="fav_point_emoticons_message">O nome do favorito foi modificado para %1$s para facilitar a salvar corretamente a seqüência de caracteres com emoticons para um arquivo.</string>
     <string name="speak_title">Anunciar…</string>
 	<string name="show_pedestrian_warnings">Faixas de pedestre</string>
     <string name="routing_attr_no_new_routing_description">Não use as regras de roteamento introduzidas na v1.9</string>
@@ -333,13 +333,13 @@
     <string name="monitoring_settings_descr">Configurar como gravar suas viagens</string>
     <string name="gpx_option_calculate_first_last_segment">Calcular rota para o primeiro e último segmento</string>
     <string name="use_displayed_track_for_navigation">Você quer usar o trajeto apresentado para a navegação?</string>
-    <string name="routing_attr_prefer_motorway_name">Autoestradas</string>
+    <string name="routing_attr_prefer_motorway_name">Preferir Autoestradas</string>
 	<string name="routing_attr_prefer_motorway_description">Preferir autoestradas na rota</string>
 	<string name="routing_attr_short_way_name">Rota mais curta</string>
 	<string name="routing_attr_short_way_description">Usar o caminho mais curto</string>
-	<string name="routing_attr_avoid_toll_name">Pedágios</string>
+	<string name="routing_attr_avoid_toll_name">Evitar pedágios</string>
 	<string name="routing_attr_avoid_toll_description">Evitar estradas com pedágio</string>
-	<string name="routing_attr_avoid_unpaved_name">Vias não pavimentadas</string>
+	<string name="routing_attr_avoid_unpaved_name">Evitar vias não-pavimentadas</string>
 	<string name="routing_attr_avoid_unpaved_description">Evitar estradas não pavimentadas</string>
 	<string name="routing_attr_avoid_ferries_description">Evitar as balsas</string>
 	<string name="routing_attr_weight_name">Peso máximo</string>
@@ -362,7 +362,7 @@
     <string name="distance">Distância</string>
     <string name="index_tours">Excursões</string>
     <string name="shared_string_all">Todos</string>
-    <string name="waypoints">Pontos de parada</string>
+    <string name="waypoints">Marcos do trajeto</string>
     <string name="targets">Destinos</string>
     <string name="announce_gpx_waypoints">Marcos de trajeto GPX</string>
     <string name="download_additional_maps">Baixar mapas que faltam %1$s (%2$d MB)?</string>
@@ -591,8 +591,8 @@
     <string name="route_descr_select_destination">Selecionar destino</string>
     <string name="route_preferences">Preferências de rota</string>
     <string name="route_info">Informações da rota</string>
-    <string name="routing_attr_avoid_ferries_name">Balsas</string>
-	<string name="routing_attr_avoid_motorway_name">Autoestradas</string>
+    <string name="routing_attr_avoid_ferries_name">Evitar balsas</string>
+	<string name="routing_attr_avoid_motorway_name">Evitar autoestradas</string>
 	<string name="routing_attr_avoid_motorway_description">Evitar autoestradas</string>
 	<string name="android_19_location_disabled">Desde a versão Android 4.4 (KitKat) você não pode baixar e atualizar os mapas para o diretório de armazenamento anterior (%s). Você quer mudar para o local de armazenamento permitido e copiar todos os arquivos do OsmAnd para lá?\n\n Nota 1: Seus arquivos antigos permanecerão intactos (mas podem ser excluídos manualmente).
 \n Nota 2: No novo local de armazenamento não será possível compartilhar arquivos entre OsmAnd e OsmAnd+.</string>
@@ -685,7 +685,7 @@
 	<string name="osmand_long_description_1000_chars">" OsmAnd (Direções de Navegação Automatizada para OSM)\nOsmAnd é um aplicativo de navegação de código aberto com acesso a uma ampla variedade de dados globais do OpenStreetMap (OSM). Todos os dados de mapas (mapas vetoriais ou quadrículas) podem ser armazenados na memória do aparelho para uso off-line. OsmAnd também oferece funcionalidade de roteamento online e offline, incluindo orientação por voz curva a curva.\n\nAlgumas das principais características:\n - Completa funcionalidade offline (armazenar mapas vetoriais ou quadrículas no armazenamento do aparelho)\n - Mapas vetoriais offline compactos para todo o mundo disponível\n - Baixar mapas de país ou região diretamente do app\n - Sobreposição de várias camadas do mapa, como trajetos GPX ou navegação, pontos de interesse, favoritos, linhas de contorno, paradas de transporte público, mapas adicionais com transparência personalizável - Pesquisa off-line de endereços e lugares (POIs)\n - Roteamento off-line para distâncias curtas (experimental)\n - Modos para carro, bicicleta e pedestres com: mudança automatizada de visão dia/noite; opcional zoom dependente da velocidade; alinhamento de mapa de acordo com a bússola ou a direção do movimento; opcional orientação de faixas, exibição de limite de velocidade, gravação e vozes TTS\n\nLimitações nesta versão gratuita do OsmAnd:\n - número limitado de transferências de mapas\n - sem acesso off-line a POIs da Wikipédia\n\nOsmAnd é ativamente desenvolvido e nosso projeto e seus progressos se baseiam em contribuir economicamente para financiar o desenvolvimento e testar novas funcionalidades. Por favor, considere comprar OsmAnd+, financiar específicos recursos novos ou fazer uma doação geral em osmand.net. "</string>
 	<string name="day_night_info_description">Nascer do Sol: %1$s ↵\nPôr do Sol: %2$s</string>
 	<string name="avoid_unpaved">Vias não-pavimentadas</string>
-	<string name="avoid_in_routing_descr">Evitar vias com pedágio, não pavimentadas, balsas</string>
+	<string name="avoid_in_routing_descr">Evitar vias com pedágio, não-pavimentadas, balsas</string>
 	<string name="bg_service_sleep_mode_off">Ativar\n modo segundo plano</string>
 	<string name="show_cameras">Radares</string>
 	<string name="show_traffic_warnings">Alertas de trânsito</string>
@@ -802,7 +802,7 @@
     <string name="download_select_map_types">Outros mapas</string>
     <string name="download_roads_only_item">Apenas estradas</string>
     <string name="download_regular_maps">Mapas normais</string>
-    <string name="download_roads_only_maps">Apenas estradas no mapa</string>
+    <string name="download_roads_only_maps">Apenas mapa de estradas</string>
     <string name="rendering_attr_alpineHiking_description">Renderizar caminhos de acordo com a escala de SAC</string>
     <string name="rendering_attr_hikingRoutesOSMC_name">Sobreposição de símbolo de montanhismo</string>
     <string name="rendering_attr_hikingRoutesOSMC_description">Renderizar caminhos de acordo com traços OSMC</string>
@@ -863,7 +863,7 @@
 	<string name="bg_service_screen_unlock">Desbloquear tela</string>
 	<string name="bg_service_screen_lock_toast">A tela está bloqueada</string>
 	<string name="bg_service_interval">Definir intervalo para ativar:</string>
-	<string name="avoid_toll_roads">Evitar pedágios</string>
+	<string name="avoid_toll_roads">Pedágios</string>
 	<string name="continue_follow_previous_route_auto">A navegação anterior não foi concluída, quer continuá-la? (%1$s segundos)</string>
 	<string name="route_updated_loc_found">Rota será recalculada quando a posição for encontrada</string>
 	<string name="osmand_parking_hours">Horas</string>
@@ -880,7 +880,7 @@
     <string name="index_srtm_ele">Curvas de nível</string>
     <string name="download_srtm_maps">Curvas de nível</string>
     <string name="rendering_attr_alpineHiking_name">Escala de montanhismo (SAC)</string>
-    <string name="rendering_attr_showRoadMaps_name">Apenas estradas no mapa</string>
+    <string name="rendering_attr_showRoadMaps_name">Apenas mapa de estradas</string>
     <string name="safe_mode_description">Executar o aplicativo em modo seguro (usando código de Android, mais lento, em vez de código nativo).</string>
     <string name="zxing_barcode_scanner_not_found">Aplicativo Barcode Scanner da ZXing não está instalado. Pesquisar na loja de apps?</string>
 	<string name="shared_location">Posição compartilhada</string>
@@ -1251,7 +1251,7 @@
 	<string name="search_position_undefined">Indefinido</string>
 	<string name="search_position_current_location">Posição atual…</string>
 	<string name="search_position_map_view">Centro atual do mapa</string>
-	<string name="select_search_position">Origem:</string>
+	<string name="select_search_position">Próximo a:</string>
 	<string name="route_successfully_saved_at">Rota salva como \'%1$s\'.</string>
 	<string name="filename_input">"Nome do arquivo: "</string>
 	<string name="file_with_name_already_exist">Já existe um arquivo com o mesmo nome.</string>
@@ -1584,7 +1584,7 @@
 	<string name="mark_point">Destino</string>
 	<string name="app_settings">Configurações do aplicativo</string>
 	<string name="search_address">Pesquisar endereço</string>
-	<string name="choose_building">Escolher edifício</string>
+	<string name="choose_building">Escolher número</string>
 	<string name="choose_street">Escolher rua</string>
 	<string name="choose_city">Escolher cidade</string>
 	<string name="ChooseCountry">Escolher país</string>
@@ -1604,9 +1604,9 @@
 	<string name="searchpoi_activity">Escolher POI</string>
 	<string name="search_POI_level_btn">Encontrar mais</string>
 	<string name="incremental_search_street">Pesquisar rua incrementalmente</string>
-	<string name="incremental_search_building">Pesquisar edifícios incrementalmente</string>
+	<string name="incremental_search_building">Pesquisar número incrementalmente</string>
 	<string name="choose_available_region">Escolher região da lista</string>
-	<string name="choose_intersected_street">Escolher a rua transversal</string>
+	<string name="choose_intersected_street">Escolher rua transversal</string>
 	<string name="Closest_Amenities">Lugares próximos</string>
 	<string name="app_mode_car">Carro</string>
 	<string name="app_mode_bicycle">Bicicleta</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 38d03ccc91..b71cfe6112 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1688,7 +1688,7 @@
     <string name="arrival_distance_factor_at_last">На последних метрах</string>
     <string name="osmo_group_information_desc">" - Все созданные группы являются открытыми! Если вы хотите сохранить анонимность, подключите устройства непосредственно через ID трекера.\n - Приватные группы ограничены 8 человеками.\n - Если в группе не будет активным хотя бы 1 человек в течении 2-х недель группа будет удалена.\n - Вы можете ограничить вход в группу, только по приглашениям, но для управления группой вы должны войти в консоль администратора.\n - Если вам нужно создать группу, но с другими условиями, пожалуйста, свяжитесь со службой поддержки http://osmo.mobi</string>
     <string name="rendering_attr_alpineHiking_name">Пеший горный туризм по шкале (SAC)</string>
-    <string name="rendering_attr_hikingRoutesOSMC_name">Наложение символов пешего туризма</string>
+    <string name="rendering_attr_hikingRoutesOSMC_name">Визуализация пути согласно трассам OSMC</string>
     <string name="rendering_attr_coloredBuildings_name">Цветовая маркировка зданий по типу</string>
     <string name="rendering_attr_publicTransportMode_name">Маршруты автобусов, троллейбусов и маршруток</string>
     
diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml
index 1189d0c54e..a10d7429ce 100644
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@@ -821,4 +821,5 @@
 	<string name="poi_wiki_lang_vo">Wikipedia volapüksky</string>
 	<string name="poi_wiki_lang_zh">Wikipedia čínsky</string>
 
-</resources>
+<string name="poi_camera">Fotoaparáty a šošovky</string>
+	</resources>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 14d02916bf..bb85520b84 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -1122,7 +1122,7 @@
     <string name="recording_context_menu_play">Prehrať</string>
     <string name="recording_description">Záznam %1$s %2$s %3$s</string>
     <string name="recording_default_name">Nahrávka</string>
-    <string name="map_widget_av_notes">Zvukové poznámky</string>
+    <string name="map_widget_av_notes">Mediálne poznámky</string>
     <string name="osmand_srtm_short_description_80_chars">OsmAnd modul pre offline vrstevnice</string>
     <string name="osmand_srtm_long_description_1000_chars">"Tento modul poskytuje vrstevnice a tieňované reliéfy, ktoré môžu byť zobrazené na OsmAnd offline mapách. Táto funkcia je vhodná pre atlétov, turistov, chodcov a všetkých, ktorých zaujíma reliéf terénu.\n\nGlobálne údaje (medzi 70 stupňami severne a 70 stupňami južne) sú založené na meraní SRTM (Shuttle Radar Topography Mission) a ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), zobrazovacieho nástroja na palube Terra, vlajkového satelitu NASA Earth Observing System. ASTER je kooperatívne úsilie medzi NASA, Japonským ministerstvom hospodárstva, obchodu a priemyslu (METI) a Japonských vesmírnych systémov (J-spacesystems). "</string>
     
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index bfc87f4875..eeb3a6094e 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1437,7 +1437,7 @@
     <string name="osmo_enable_tracker">Skicka mina positioner</string>
     <string name="osmo_control">OsMo snabbåtkomst</string>
     <string name="osmo_mode_restart">Starta om OsMo-session</string>
-    <string name="osmo_settings_debug">Avbuggningsinformation</string>
+    <string name="osmo_settings_debug">Felsökningsinformation</string>
     <string name="color_red">röd</string>
 	<string name="color_pink">skär</string>
 	<string name="color_orange">brandgul</string>
diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml
index 7af0b6f1e5..0ca629fb89 100644
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@@ -828,4 +828,6 @@
 	<string name="poi_wiki_lang_vo">沃拉普克語維基</string>
 	<string name="poi_wiki_lang_zh">中文維基</string>
 
-</resources>
+<string name="poi_camera">相機和鏡頭</string>
+	<string name="poi_religious">宗教區域</string>
+	</resources>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index e7967eb793..9a07be13a0 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -992,7 +992,7 @@
     <string name="download_using_mobile_internet">WiFi 現在並未連線。您想要使用目前的網路連線下載嗎？</string>
     <string name="street_name">街道</string>
 	<string name="hno">門牌號碼</string>
-    <string name="monitoring_settings">錄製旅程</string>
+    <string name="monitoring_settings">旅程錄製</string>
     <string name="monitoring_settings_descr">組態如何錄製您的旅程</string>
     
     
@@ -1712,7 +1712,7 @@
     <string name="shared_string_all">全部</string>
     <string name="index_tours">旅遊</string>
     <string name="record_plugin_description">"這個外掛元件在地圖螢幕上，以手動點觸 GPX 記錄小工具，以啟動去錄製和儲存您軌跡的功能，或是自動記錄您所有的導航路線到 GPX 檔案。\n\n錄製的軌跡可以與您的朋友共享或用作為 OSM 的貢獻。運動選手可以使用錄製的軌跡，監看他們的訓練。一些基本的軌跡分析，可以直接在 OsmAnd 進行，如一圈的時間、平均速度等，而軌跡當然也可於事後在專門的第三方分析工具解析。 "</string>
-    <string name="record_plugin_name">錄製旅程</string>
+    <string name="record_plugin_name">旅程錄製</string>
     <string name="int_hour">小時</string>
     <string name="duration">持續時間</string>
     <string name="distance">距離</string>
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index b5741e2394..f0439d2522 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -527,6 +527,7 @@
 
 	<string name="poi_monastery">Monastery</string>
 	<string name="poi_historic_monastery">Historic monastery</string>
+	<string name="poi_religious">Religious area</string>
 	<string name="poi_wayside_cross">Wayside cross</string>
 	<string name="poi_wayside_shrine">Wayside shrine</string>
 	<string name="poi_information">Tourist information</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
index a8dc08be81..52e7db95ea 100644
--- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
@@ -59,7 +59,7 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi
 	private OsmandApplication app;
 
 	public View onCreateView(android.view.LayoutInflater inflater, android.view.ViewGroup container, Bundle savedInstanceState) {
-		view = inflater.inflate(R.layout.navigate_point, container, false);
+		view = inflater.inflate(R.layout.search_point, container, false);
 		setHasOptionsMenu(true);
 
 		location = null;