Merge pull request #2253 from osmandapp/r2.2samsung

R2.2samsung
Update AndroidManifest.xml
2016-02-19 12:38:20 +02:00 · 2016-02-19 12:36:48 +02:00 · 2016-02-19 12:36:10 +02:00 · 2016-02-19 12:35:16 +02:00 · 2016-02-17 16:49:46 +02:00 · 2016-02-11 15:09:37 +02:00
102 changed files with 3120 additions and 826 deletions
--- a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
+++ b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
@ -68,7 +68,7 @@ public class BinaryInspector {
 			in.inspector(new String[]{
 //				"-vpoi",
 				"-vmap","-vmapobjects", // "-vmapcoordinates", 
-//				"-vrouting",
+				"-vrouting",
 //				"-vaddress", "-vcities",//"-vstreetgroups", 
 //				"-vstreets", "-vbuildings", "-vintersections", 
 //				"-zoom=15",
--- a/OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java
+++ b/OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java
@ -1950,7 +1950,7 @@ public class BinaryMapIndexReader {

 	
 	private static boolean testMapSearch = false;
-	private static boolean testAddressSearch = true;
+	private static boolean testAddressSearch = false;
 	private static boolean testPoiSearch = true;
 	private static boolean testPoiSearchOnPath = false;
 	private static boolean testTransportSearch = false;
@ -1965,7 +1965,7 @@ public class BinaryMapIndexReader {
 	}
 	
 	public static void main(String[] args) throws IOException {
-		File fl = new File("/Users/victorshcherb/osmand/osm-gen/map.obf");
+		File fl = new File("/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf");
 		RandomAccessFile raf = new RandomAccessFile(fl, "r");
 		
 		BinaryMapIndexReader reader = new BinaryMapIndexReader(raf, fl);
@ -2109,7 +2109,7 @@ public class BinaryMapIndexReader {

 	private static void testPoiSearchByName(BinaryMapIndexReader reader) throws IOException {
 		println("Searching by name...");
-		SearchRequest<Amenity> req = buildSearchPoiRequest(0, 0, "кие",  
+		SearchRequest<Amenity> req = buildSearchPoiRequest(0, 0, "aBS",  
 				0, Integer.MAX_VALUE, 0, Integer.MAX_VALUE, null);
 		reader.searchPoiByName(req);
 		for (Amenity a : req.getSearchResults()) {
--- a/OsmAnd-java/src/net/osmand/binary/BinaryMapPoiReaderAdapter.java
+++ b/OsmAnd-java/src/net/osmand/binary/BinaryMapPoiReaderAdapter.java
@ -9,9 +9,9 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;

 import net.osmand.Collator;
@ -26,9 +26,7 @@ import net.osmand.data.Amenity.AmenityRoutePoint;
 import net.osmand.data.LatLon;
 import net.osmand.osm.MapPoiTypes;
 import net.osmand.osm.PoiCategory;
-import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
-import net.sf.junidecode.Junidecode;

 import org.apache.commons.logging.Log;

@ -553,6 +551,13 @@ public class BinaryMapPoiReaderAdapter {
 								break;
 							}
 						}
+						Map<String, String> lt = am.getAdditionalInfo();
+						for (Entry<String, String> e : lt.entrySet()) {
+							matches = matcher.matches(e.getValue());
+							if (matches) {
+								break;
+							}
+						}
 					}
 					if(matches) {
 						req.publish(am);
--- a/OsmAnd-java/src/net/osmand/data/MapObject.java
+++ b/OsmAnd-java/src/net/osmand/data/MapObject.java
@ -1,13 +1,11 @@
 package net.osmand.data;


-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	android:installLocation="auto" 
-	android:versionName="@string/app_version" 
+	android:versionName="@string/app_version"
 	android:versionCode="231"
 	package="net.osmand.plus">

@ -36,6 +36,7 @@
 	<uses-feature android:name="android.hardware.sensor.accelerometer" android:required="false" />
 	<uses-feature android:name="android.hardware.sensor.gyroscope" android:required="false" />
 	<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+	<uses-feature android:name="com.sec.feature.spen_usp" android:required="true"/>


 	<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@ -43,7 +43,7 @@ android {

 		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
 		//versionName already assigned in code
-		//versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
+		versionName System.getenv("APK_VERSION") ? System.getenv("APK_VERSION").toString(): versionName
 	}

 	lintOptions {
@ -184,6 +184,24 @@ task updateNoTranslate(type: Copy) {
 	into 'res/values/'
 }

+task validateTranslate {
+	println "Validating translations"
+
+	file("res").eachFileRecurse groovy.io.FileType.FILES, {
+		if (it.name == "strings.xml" || it.name == "phrases.xml") {
+			it.eachLine { line ->
+				if (line.contains("\$ s") || line.contains("\$ d") || line.contains("\$ f") ||
+						line.contains(" \$s") || line.contains(" \$d") || line.contains(" \$f") ||
+						line.contains("1\$ ") || line.contains("2\$ ") || line.contains("3\$ ") ||
+						(line.contains("% \$") || line.contains("% 1") ||
+								line.contains("% 2") || line.contains("% 3"))) {
+					throw new GradleException("Incorrect translation " + it.getAbsolutePath() + " " + line);
+				}
+			}
+		}
+	}
+}
+
 task collectVoiceAssets(type: Sync) {
 	from "../../resources/voice"
 	into "assets/voice"
@ -214,7 +232,7 @@ task collectHelpContentsAssets(type: Copy) {
 		include "technical-articles.html"
 		include "map-legend.html"
 	}
-	from("../../help/website/feature_articles"){
+	from("../../help/website/feature_articles") {
 		include "*.html"
 	}

@ -265,7 +283,8 @@ collectExternalResources.dependsOn collectVoiceAssets,
 		collectRegionsInfoResources,
 		collectMiscResources,
 		copyStyleIcons,
-		updateNoTranslate
+		updateNoTranslate,
+		validateTranslate
 // tasks.whenTaskAdded { task ->
 //	if (task.name.startsWith("generate") && task.name.endsWith("Resources")) {
 //		task.dependsOn collectExternalResources
--- a/OsmAnd/res/layout-land/point_editor_fragment.xml
+++ b/OsmAnd/res/layout-land/point_editor_fragment.xml
@ -30,6 +30,14 @@
                android:background="@android:color/transparent"
                android:src="@drawable/ic_action_delete_dark"/>

+            <ImageButton
+                android:id="@+id/ok_button"
+                android:layout_width="?attr/actionBarSize"
+                android:layout_height="match_parent"
+                android:layout_gravity="right"
+                android:background="@android:color/transparent"
+                android:src="@drawable/ic_action_done"/>
+
            <Button
                android:id="@+id/save_button"
                android:layout_width="wrap_content"
@ -134,6 +142,7 @@
                                android:layout_marginLeft="8dp"
                                android:textColor="?android:textColorPrimary"
                                android:textColorHint="?android:textColorSecondary"
+                                android:imeOptions="actionDone"
                                android:inputType="text"/>


--- a/OsmAnd/res/layout/point_editor_fragment.xml
+++ b/OsmAnd/res/layout/point_editor_fragment.xml
@ -137,6 +137,7 @@
                        android:textColor="?android:textColorPrimary"
                        android:textColorHint="?android:textColorSecondary"
                        android:text="Name"
+                        android:imeOptions="actionDone"
                        android:inputType="text"/>


--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@ -108,7 +108,7 @@
 	<string name="poi_emergency_access_point">Таблічка з кодам для службы выратаваньня</string>

 	<string name="poi_ford">Брод</string>
-	<string name="poi_mountain_pass_yes">Перавал</string>
+	<string name="poi_mountain_pass">Перавал</string>
 	<string name="poi_gate">Вароты</string>
 	<string name="poi_city_wall">Гарадзкая сьцяна</string>
 	<string name="poi_lift_gate">Шлагбаўм</string>
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="auto_zoom_none">Без аўтаматычнага маштабаваньня</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="auto_zoom_none">Без аўтаматычнага маштабаваньня</string>
    <string name="auto_zoom_close">Буйней</string>
    <string name="auto_zoom_far">Для сярэдняга маштаба</string>
    <string name="auto_zoom_farthest">Драбней</string>
@ -65,7 +66,7 @@
    
    <string name="search_street_in_neighborhood_cities">Пошук вуліцы ў суседніх гарадах</string>
    <string name="intermediate_items_sort_return">Прамежкавыя пункты шляху адсартаваныя аптымальным чынам ад бягучага становішча да месца прызначэньня.</string>
-    <string name="intermediate_items_sort_by_distance">Упарадкаваць па адлегласьці</string>
+    <string name="intermediate_items_sort_by_distance">Упарадкаваць ад дзьвярэй да дзьвярэй</string>
    <string name="local_osm_changes_backup_successful">Файл зьмен OSM пасьпяхова створаны ў %1$s</string>
    <string name="local_osm_changes_backup_failed">Збой рэзервовага капіяваньня файлу зьмен OSM</string>
    <string name="local_osm_changes_backup">Рэзервовае капіяваньне файлу зьмен OSM</string>
@ -1790,7 +1791,7 @@
    <string name="rendering_value_disabled_name">Адключана</string>
    <string name="rendering_value_walkingRoutesOSMC_name">Афарбоўка згодна OSMC</string>
    <string name="rendering_value_walkingRoutesScopeOSMC_name">Афарбоўка згодна з праглядам маршруту</string>
-    <string name="osm_edit_context_menu_delete">Выдаліць праўкі OSM</string>    
+    <string name="osm_edit_context_menu_delete">Выдаліць праўку OSM</string>    
    <string name="read_full_article">Чытаць артыкул цалкам (анлайн)</string>
    
    <string name="local_indexes_cat_wiki">Вікіпэдыя</string>
@ -1956,7 +1957,7 @@
    <string name="favorite_category_add_new_title">Дадаць новую катэгорыю</string>
    <string name="favorite_category_dublicate_message">Катэгорыя з пазначанай назвай ужо існуе. Калі ласка, падайце іншую назву.</string>
    <string name="confirm_download_roadmaps">Вы ўпэўненыя, што хочаце сьцягнуць мапу аўтадарог, нават калі ў вас ёсць поўная мапа?</string>
-    <string name="value_downloaded_from_max">%1$.1f з %2$.1f Мб</string>
+    <string name="value_downloaded_of_max">%1$.1f з %2$.1f Мб</string>
    <string name="file_size_in_mb">%.1f Мб</string>
    <string name="update_all">Абнавіць усе (%1$s МБ)</string>
    <string name="free_downloads_used">Выкарыстана бясплатных загрузак</string>
@ -2011,4 +2012,39 @@
    <string name="save_poi_without_poi_type_message">Вы сапраўды хочаце захаваць POI бяз тыпу?</string>
    <string name="share_osm_edits_subject">Рэдагаваньні OSM апублікаваныя праз OsmAnd</string>
    <string name="shared_string_location">Месцазнаходжаньне</string>
-    </resources>
+    <string name="copied_to_clipboard">Скапіявана ў буфер абмену</string>
+    <string name="osm_save_offline">Захаваць лякальна</string>
+    <string name="osm_edit_modified_poi">OSM POI адрэдагавана</string>
+    <string name="osm_edit_deleted_poi">OSM POI выдаленая</string>
+    <string name="context_menu_item_open_note">Дадаць нататку OSM</string>
+    <string name="osm_edit_reopened_note">Нататка OSM адкрыта зноў</string>
+    <string name="osm_edit_commented_note">Да нататкі OSM дададзены камэнтар</string>
+    <string name="osm_edit_removed_note">Нататка OSM выдаленая</string>
+	<string name="osm_edit_created_note">Нататка OSM створана</string>
+	<string name="osn_bug_name">Нататка OSM</string>
+	<string name="osn_add_dialog_title">Стварыць нататку</string>
+	<string name="osn_comment_dialog_title">Дадаць камэнтар</string>
+	<string name="osn_reopen_dialog_title">Паўторна адкрыць нататку</string>
+	<string name="osn_close_dialog_title">Закрыць нататку</string>
+	<string name="osn_add_dialog_success">Нататка пасьпяхова створана</string>
+	<string name="osn_add_dialog_error">Памылка: нататка не была створана</string>
+	<string name="osn_close_dialog_success">Нататка была пасьпяхова зачынена</string>
+	<string name="osn_close_dialog_error">Памылка: нататка ня была зачынена</string>
+	<string name="shared_string_commit">Адаслаць</string>
+	
+    <string name="rendering_attr_roadStyle_description">Стыль адлюстраваньня дарог</string>
+    <string name="poi_context_menu_modify_osm_change">Рэдагаваць POI</string>
+    <string name="rendering_attr_currentTrackWidth_description">Шырыня сьледу GPX</string>
+    <string name="rendering_attr_currentTrackColor_description">Колер сьледу GPX</string>
+    <string name="poi_dialog_reopen">Пераадкрыць</string>
+	<string name="use_drawer_btn">Выкарыстоўваць мэню</string>
+    <string name="access_from_map_description">Кнопка Мэню паказвае панэль кіраваньня, а не мэню</string>
+    <string name="access_from_map">Доступ з мапы</string>
+    <string name="context_menu_item_delete_waypoint">Выдаліць шляхавую кропку GPX?</string>
+    <string name="context_menu_item_edit_waypoint">Правіць кропку шляху GPX</string>
+    <string name="routing_attr_avoid_stairs_name">Пазьбягаць лесьвіц</string>
+	<string name="routing_attr_avoid_stairs_description">Пазьбягаць лесьвіц</string>
+	<string name="routing_attr_avoid_borders_name">Пазьбягаць перасячэньня мяжы</string>
+	<string name="use_dashboard_btn">Выкарыстоўваць панэль кіраваньня</string>
+    <string name="dashboard_or_drawer_title">Панэль кіраваньня ці мэню</string>
+    </resources>
--- a/OsmAnd/res/values-bg/phrases.xml
+++ b/OsmAnd/res/values-bg/phrases.xml
@ -125,7 +125,7 @@
 	<string name="poi_fire_hose">Пожарен шланг</string>
 	<string name="poi_ambulance_station">Спешна медицинска помощ</string>
 	<string name="poi_ford">Брод</string>
-	<string name="poi_mountain_pass_yes">Планински проход</string>
+	<string name="poi_mountain_pass">Планински проход</string>
 	<string name="poi_gate">Порта</string>
 	<string name="poi_city_wall">Градска стена</string>
 	<string name="poi_lift_gate">Вдигаща се врата</string>
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@ -12,9 +12,9 @@
    <string name="route_from">От:</string>
    
 	
-    <string name="speak_speed_limit">Обявяване на ограничения за скоростта</string>
-    <string name="speak_cameras">Обявяване на камери за скорост</string>
-	<string name="speak_traffic_warnings">Обявяване на предупреждения за трафика</string>
+    <string name="speak_speed_limit">Ограничения на скоростта</string>
+    <string name="speak_cameras">Камери за скорост</string>
+	<string name="speak_traffic_warnings">Предупреждения за трафика</string>
 	
 	
 	<string name="app_mode_default">Разглеждане на картата</string>
@ -150,7 +150,7 @@
    <string name="shared_string_control_start">Старт</string>
    <string name="map_widget_av_notes">Аудио/видео бележки</string>
    <string name="osmand_srtm_short_description_80_chars">Добавка на OsmAnd за офлайн контурни линии</string>
-    <string name="osmand_srtm_long_description_1000_chars">Тази добавка изчертава контурни линии в офлайн картите на OsmAnd. Глобалната карта (между 70 градуса северна ширина и 70 градуса южна ширина) се базира на измервания от SRTM (Shuttle Radar Topography Mission) и ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), устройство за изображения на борда на Terra, най-добрият спътник на програмата на NASA Earth Observing System. ASTER е съвместен проект на NASA, Японското правителсто и японската компания Japan Space Systems (J-spacesystems).</string>
+    <string name="osmand_srtm_long_description_1000_chars">"Тази добавка изчертава линии на релефа върху основните карти на OsmAnd. Това е особено полезно за туристи и хора интересуващи се от релефа на местността.\n\nГлобалната карта (между 70 градуса северна ширина и 70 градуса южна ширина) се базира на измервания от SRTM (Shuttle Radar Topography Mission) и ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), устройство за изображения на борда на Terra, най-добрият спътник на програмата на NASA Earth Observing System. ASTER е съвместен проект на NASA, Японското правителсто и японската компания Japan Space Systems (J-spacesystems). "</string>
    <string name="map_widget_distancemeasurement">Измерване на дистанции</string>
    <string name="audionotes_location_not_defined">Няма определена позиция за тази бележка. Използвайте контекстното меню за да изберете място и да направите бележка</string>
    
@ -159,7 +159,7 @@
    <string name="audionotes_plugin_name">Аудио/видео бележки</string>
    <string name="index_srtm_parts">части</string>
    <string name="index_srtm_ele">Контури</string>
-    <string name="srtm_plugin_description">"Тази добавка осигурява показване на релефни контури върху офлайн картите на OsmAnd. Тази функционалност е много оценявана от спортисти, туристи, всички които се интересуват от ландшафта. 
+    <string name="srtm_plugin_description">"Тази добавка осигурява показване на релефни контури върху офлайн картите на OsmAnd. Тази функционалност е много оценявана от спортисти, туристи, всички които се интересуват от ландшафта.
 \n\nГлобалните данни (между 70 градуса северна ширина и 70 градуса южна ширина) се основават на измервания от SRTM  и ASTER - радари намиращи се на борда на Terra - сателит на НАСА за наблюдение на НАСА. ASTER е съвместен проект между НАСА и Япония. "</string>
    <string name="srtm_plugin_name">Контурни линии</string>
    <string name="download_select_map_types">Други карти</string>
@ -576,8 +576,8 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="online_map_settings_descr">Настройване на източниците за онлайн карти</string>
 	
 	
-	<string name="osmand_rastermaps_plugin_description">"С този плъгин можете да получите достъп до много типове онлайн (растерни) карти, от предварително създадени Openstreetmap растерни изображения (като Mapnik) до сателитни снимки и слоеве със специално предназначение като карти за времето, карти на климата, геоложки карти, географски терен и др.
-\n\nНякои от тези карти може да бъде използвана като основна (базова) карта на екрана на OsmAnd или като подложка на друга базова карта (като на OsmAnd стандартната офлайн карта). За да се направи всяка подложка по-видима, някои елементи на OsmAnd картата могат лесно да бъдат скрити чрез менюто \"Настройки на  картата\".
+	<string name="osmand_rastermaps_plugin_description">"С този плъгин можете да получите достъп до много типове онлайн (или растерни) карти, достъп до предварително създадени Openstreetmap растерни изображения (като Mapnik), до сателитни снимки и до слоеве със специално предназначение, като карти за времето, карти на климата, геоложки карти, географски терен и др.
+\n\nНякои от тези карти могат да бъдат използвани като основна (базова) карта на екрана на OsmAnd или като подложка на друга базова карта (като на OsmAnd стандартната офлайн карта). За да се направи всяка подложка по-видима, някои елементи на OsmAnd картата могат лесно да бъдат скрити чрез менюто \"Настройки на  картата\".
 \n\nРастерните карти могат да бъдат получени директно чрез онлайн източници, или могат да бъдат подготвени за офлайн употреба (и ръчно копирани в папката за данни OsmAnd) под формата на sqlite база данни от друго приложение. "</string>
 	
 	<string name="osmand_accessibility_description">Настройки на специалните функции за достъпност. Настройване скоростта на гласовите напътствия и допълнителни настройки за хора със специални потребности.</string>
@ -1346,9 +1346,9 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="av_camera_focus_continuous">Камерата се опитва да фокусира</string>
 	<string name="av_photo_play_sound">Мелодия при снимане</string>
 	<string name="av_photo_play_sound_descr">Възпроизвеждане на звук или мелодия при снимане</string>
-<string name="announce_gpx_waypoints">Обявяване на точките от GPX файла</string>
+<string name="announce_gpx_waypoints">GPX точки</string>
    <string name="speak_title">Обявяване…</string>
-	<string name="speak_street_names">Обявяване на имена на улици (синтезиран глас)</string>
+	<string name="speak_street_names">Имена на улици (синтезиран глас)</string>
        
    
    <string name="use_kalman_filter_compass">Използване на филтър на Kalman</string>
@ -1436,7 +1436,7 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="routing_attr_prefer_motorway_description">Магистрали</string>
 	<string name="routing_attr_short_way_name">Кратък маршрут</string>
 	<string name="routing_attr_short_way_description">Използване на кратък маршрут</string>
-	<string name="routing_attr_avoid_toll_name">Избягване на платени пътища</string>
+	<string name="routing_attr_avoid_toll_name">Избягване на пътни такси</string>
 	<string name="routing_attr_avoid_toll_description">Избягване на платени пътища</string>
 	<string name="routing_attr_avoid_unpaved_name">Избягване на черни пътища</string>
 	<string name="routing_attr_avoid_unpaved_description">Избягване на черни (неасфалтирани) пътища</string>
@ -1458,8 +1458,8 @@ OsmAnd е с отворен код и активно да се развива.
    <string name="waypoints">Точки</string>
    <string name="targets">Дестинации</string>
    <string name="way_alarms">Предупреждения</string>
-    <string name="speak_favorites">Обявяване на запазените места, които са наблизо</string>
-    <string name="speak_poi">Обявяване на близките POI</string>
+    <string name="speak_favorites">Записани места</string>
+    <string name="speak_poi">POI наблизо</string>
    <string name="download_additional_maps">Сваляне на липсващите карти %1$s (%2$d MB)?</string>
    <string name="shared_string_more">Още…</string>
    <string name="rendering_value_browse_map_name">Карта</string>  
@ -1479,9 +1479,9 @@ OsmAnd е с отворен код и активно да се развива.
    <string name="lang_sw">Суахили</string>
    <string name="lang_he">Иврит</string>
    <string name="forward">Напред</string>
-    <string name="home">У дома</string>
+    <string name="home">Табло за управление</string>
    <string name="gpx_monitoring_start">Старт на записа в GPX</string>
-	<string name="gpx_monitoring_stop">Край на записа GPX</string>
+	<string name="gpx_monitoring_stop">Край на GPX записа</string>
    <string name="gpx_start_new_segment">Започни нов сегмент</string>
    <string name="rendering_attr_hideBuildings_name">Скрий сградите</string>
    <string name="rendering_attr_hideNonVehicleHighways_name">Скрий пътищата, които не са за автомобили</string>
@ -1491,7 +1491,7 @@ OsmAnd е с отворен код и активно да се развива.
    <string name="rendering_attr_moreDetailed_name">С повече детайли</string>
    <string name="rendering_attr_lessDetailed_name">С по-малко детайли</string>
    <string name="confirm_every_run">Винаги питай</string>
-	<string name="enable_sleep_mode">Разрешаване на GPS спящ режим</string>
+	<string name="enable_sleep_mode">Поставяне на GPS във фонов режим</string>
 	<string name="sleep_mode_stop_dialog">Прекъсване на фоновия режим GPS?</string>
 	<string name="save_track_to_gpx_globally">Записване на следата в GPX файл</string>
 	<string name="save_track_interval_globally">Интервал за запис</string>
@ -1501,7 +1501,7 @@ OsmAnd е с отворен код и активно да се развива.
    <string name="live_monitoring_m">Онлайн следа (изисква се GPX)</string>
    <string name="shared_string_my_places">Моите места</string>
    
-    <string name="live_monitoring_m_descr">Изпращане на следата онлайн до определен уеб адрес, при условие, че записът в GPX е включен.</string>
+    <string name="live_monitoring_m_descr">Изпращане на изминатия път по Интернет, при условие, че записът в GPX е включен.</string>
 	<string name="live_monitoring_start">Старт на онлайн следата</string>
 	<string name="live_monitoring_stop">Стоп на онлайн следата</string>
 	<string name="rendering_attr_hideAccess_name">Скриване на ограниченията за достъп</string>
@ -1622,7 +1622,7 @@ OsmAnd е с отворен код и активно да се развива.
    <string name="rendering_attr_roadStyle_name">Оцветяване на пътищата</string>
    <string name="rendering_value_germanRoadAtlas_name">Германски стил</string>
    <string name="rendering_value_americanRoadAtlas_name">Американски стил</string>
-    <string name="rendering_value_orange_name">В жълто и оранжево</string>
+    <string name="rendering_value_orange_name">Оранжево</string>
    <string name="color_orange">оранжево</string>
 	
    <string name="rendering_attr_transportStops_name">Гари и спирки</string>
@ -1720,7 +1720,7 @@ OsmAnd е с отворен код и активно да се развива.
    <string name="gpx_info_subtracks">"Части: %1$s "</string>
 	<string name="gpx_selection_track">%1$s
 \nСледа %2$s</string>
-    <string name="gpx_file_is_empty">GPX следата е празна</string>
+    <string name="gpx_file_is_empty">Празен GPX файл</string>
    <string name="osmo_connect_to_device_tracker_id">Tracker id</string>
    <string name="osmo_plugin_name">OsMo (OsMo наблюдение)</string>
 	<string name="get_plugin">Вземи</string>
@ -1732,7 +1732,7 @@ OsmAnd е с отворен код и активно да се развива.
    <string name="world_ski_missing">Трябва да изтеглите специалната карта за скиори за правилното изобразяване на ски писти и други подробности</string>
    <string name="nautical_maps_missing">За правилното изобразяване на морските навигационни ориентири трябва да изтеглите специална карта за тях</string>
 	<string name="edit_group">Редактиране на група</string>
-    <string name="speak_pedestrian">Обявяване на пешеходни пътеки</string>
+    <string name="speak_pedestrian">Пешеходни пътеки</string>
    <string name="rendering_value__name">По подразбиране</string>
    <string name="rendering_value_default_name">По подразбиране</string>
    <string name="rendering_value_highContrastRoads_name">Контрастни пътища</string>
@ -1856,7 +1856,7 @@ OsmAnd е с отворен код и активно да се развива.
    <string name="shared_string_show_details">Покажи подробни данни</string>
    <string name="gps_network_not_enabled">Услугата за местоположение не е разрешена. Искате ли да я включите?</string>
    <string name="disable_recording_once_app_killed">Предотвратяване на самостоятелно записване</string>
-    <string name="disable_recording_once_app_killed_descrp">Спира на пауза записа на GPX, когато приложението е затворено. (Индикаторът за OsmAnd Sleep режим изчезва зоната за уведомяване на Андроид.)</string>
+    <string name="disable_recording_once_app_killed_descrp">Спира на пауза записа на GPX, когато приложението е затворено (от последни приложения). (Иконата на OsmAnd изчезва от лентата за уведомяване на Андроид.)</string>
 	<string name="shared_string_import2osmand">Импортиране към OsmAnd</string>
    <string name="read_full_article">Прочетете пълната статия (онлайн)</string>
    <string name="local_recordings_delete_all_confirm">Възнамерявате да изтриете %1$d бележки. Сигурни ли сте?</string>
@ -1867,26 +1867,26 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="keep_informing_descr">Повтаряне на гласовите напътствия през определено време</string>
    <string name="keep_informing_never">Само ръчно (докосване на стрелката)</string>
    <string name="index_name_netherlands">Европа - Холандия</string>
-	<string name="light_theme">Светла</string>
-    <string name="dark_theme">Тъмна</string>
-    <string name="lang_pms">пиемонтски</string>
-    <string name="lang_bn">бенгалски</string>
-    <string name="lang_tl">тагалог (филипински)</string>
-    <string name="lang_sh">сърбо-хърватски</string>
-    <string name="lang_az">азерски</string>
-    <string name="lang_br">бретонски</string>
-    <string name="lang_sq">албански</string>
-    <string name="lang_is">исландски</string>
-    <string name="lang_bpy">Bishnupriya</string>
-    <string name="lang_nv">навахо</string>
-    <string name="lang_ga">ирландски</string>
-    <string name="lang_la">латински</string>
-    <string name="lang_ku">кюрдски</string>
-    <string name="lang_ta">тамилски</string>
+	<string name="light_theme">Светла тема</string>
+    <string name="dark_theme">Тъмна тема</string>
+    <string name="lang_pms">Пиемонтски</string>
+    <string name="lang_bn">Бенгалски</string>
+    <string name="lang_tl">Тагалог (филипински)</string>
+    <string name="lang_sh">Сърбо-хърватски</string>
+    <string name="lang_az">Азерски</string>
+    <string name="lang_br">Бретонски</string>
+    <string name="lang_sq">Албански</string>
+    <string name="lang_is">Исландски</string>
+    <string name="lang_bpy">Бишнуприя-манипури</string>
+    <string name="lang_nv">Навахо</string>
+    <string name="lang_ga">Ирландски</string>
+    <string name="lang_la">Латински</string>
+    <string name="lang_ku">Кюрдски</string>
+    <string name="lang_ta">Тамилски</string>
    <string name="lang_ml">Малаялам</string>
-    <string name="lang_lb">люксембургски</string>
-    <string name="lang_eo">есперанто</string>
-    <string name="lang_et">естонски</string>
+    <string name="lang_lb">Люксембургски</string>
+    <string name="lang_eo">Есперанто</string>
+    <string name="lang_et">Естонски</string>
    <string name="lang_os">Осетински</string>
    <string name="lang_es_ar">Аржентински испански</string>
    <string name="lang_nb">Норвежки (Букмол)</string>
@ -2028,4 +2028,132 @@ OsmAnd е с отворен код и активно да се развива.
    <string name="osm_edit_modified_poi">Модифицирани OSM POI</string>
    <string name="osm_edit_deleted_poi">Изтрити OSM POI</string>
    <string name="context_menu_item_open_note">Отвори OSM бележка</string>
+    <string name="please_specify_poi_type_only_from_list">"Моля, задайте правилния тип POI или пропуснете. "</string>
+    <string name="access_from_map_description">Бутонът \'Меню\' стартира таблото за управление</string>
+    <string name="access_from_map">Достъп от картата</string>
+    <string name="show_on_start_description">Ако е изключено се стартира с екрана на картата</string>
+    <string name="osm_edit_reopened_note">Отворена отново бележка на OSM</string>
+    <string name="osm_edit_commented_note">Бележка на OSM с коментар</string>
+    <string name="osm_edit_removed_note">Изтрита бележка на OSM</string>
+	<string name="osm_edit_created_note">Създадена бележка на OSM</string>
+	<string name="osn_bug_name">Бележка на OSM</string>
+	<string name="osn_add_dialog_title">Създайте Бележка</string>
+	<string name="osn_comment_dialog_title">Добавяне на коментар</string>
+	<string name="osn_reopen_dialog_title">Отворете наново</string>
+	<string name="osn_close_dialog_title">Затворете бележката</string>
+	<string name="osn_add_dialog_success">Бележката беше успешно създадена</string>
+	<string name="osn_add_dialog_error">Възникна грешка: Бележката не беше създадена</string>
+	<string name="osn_close_dialog_success">Бележката беше успешно затворена</string>
+	<string name="osn_close_dialog_error">Възникна грешка: Бележката не беше затворена успешно</string>
+	<string name="shared_string_commit">Запиши</string>
+	
+    <string name="context_menu_item_delete_waypoint">Изтриване на GPX точка?</string>
+    <string name="context_menu_item_edit_waypoint">Редактиране на GPX точка</string>
+    <string name="shared_string_location">Местоположение</string>
+    <string name="simulate_your_location_stop_descr">Спиране на симулацията на място</string>
+    <string name="simulate_your_location_descr">Симулира с помощта на изчисления маршрут или записана GPX следа</string>
+    <string name="address_unknown">Адресът още не е известен</string>
+    <string name="av_locations_descr">GPX файл с бележки</string>
+    <string name="av_locations">Места</string>
+    <string name="routing_attr_avoid_shuttle_train_name">Избягване на трансферен влак</string>
+	<string name="routing_attr_avoid_shuttle_train_description">Избягване на трансферен влак</string>
+    <string name="traffic_warning_hazard">Опасност</string>
+    <string name="rendering_value_boldOutline_name">Получер контур</string>
+    <string name="download_live_updates">Актуализации на живо</string>
+	<string name="rendering_value_default13_name">По подразбиране (13)</string>
+	<string name="rendering_value_defaultTranslucentCyan_name">По подразбиране (полупрозрачно синьо)</string>
+    <string name="rendering_attr_currentTrackColor_description">GPX цвят</string>
+    <string name="rendering_attr_currentTrackWidth_description">GPX ширина</string>
+    <string name="rendering_value_red_name">Червено</string>
+    <string name="rendering_value_translucent_red_name">Полупрозрачно червено</string>
+    <string name="rendering_value_translucent_orange_name">Полупрозрачно оранжево</string>
+    <string name="rendering_value_yellow_name">Жълто</string>
+    <string name="rendering_value_translucent_yellow_name">Полупрозрачно жълто</string>
+    <string name="rendering_value_lightgreen_name">Светло-зелено</string>
+    <string name="rendering_value_translucent_lightgreen_name">Полупрозрачно светло-зелено</string>
+    <string name="rendering_value_green_name">Зелено</string>
+    <string name="rendering_value_translucent_green_name">Полупрозрачно зелено</string>
+    <string name="rendering_value_lightblue_name">Свелто-синьо</string>
+    <string name="rendering_value_translucent_lightblue_name">Полупрозрачно свелто-синьо</string>
+    <string name="rendering_value_blue_name">Синьо</string>
+    <string name="rendering_value_translucent_blue_name">Полупрозрачно светло-синьо</string>
+    <string name="rendering_value_purple_name">Лилаво</string>
+    <string name="rendering_value_translucent_purple_name">Полупрозрачно лилаво</string>
+    <string name="lang_te">Телугу</string>
+    <string name="lang_new">Непал Бхаса</string>
+    <string name="lang_gl">Галски</string>
+    <string name="rendering_attr_roadStyle_description">Оцветяване на пътищата</string>
+    <string name="osmo_tracker_id">Личен ID на трекера</string>
+    <string name="misc_pref_title">Разни</string>
+    <string name="localization_pref_title">Локализация</string>
+    <string name="index_item_nation_addresses">адреси в цялата страна</string>
+	<string name="index_item_world_altitude_correction">Корекция на надморската височина</string>
+	<string name="index_item_world_seamarks">Морски карти</string>
+	<string name="index_item_world_bitcoin_payments">Плащане с bitcoin</string>
+	<string name="index_item_world_basemap">Световна карта</string>
+    <string name="index_item_world_ski">Световната ски карта</string>
+    <string name="lang_vi">Виетнамски</string>
+	<string name="lang_cy">Уелски</string>
+	<string name="index_name_canada">Северна Америка - Канада</string>
+    <string name="index_name_italy">Европа - Италия</string>
+    <string name="index_name_gb">Европа - Великобритания</string>
+    <string name="routing_attr_avoid_stairs_name">Избягване на стълби</string>
+	<string name="routing_attr_avoid_stairs_description">Избягване на стълби</string>
+	<string name="routing_attr_avoid_borders_name">Избягване на КПП</string>
+	<string name="routing_attr_avoid_borders_description">Избягване пресичането на граници и преминаването в друга държава</string>
+	<string name="dashboard_or_drawer_title">Табло за управление или меню</string>
+    <string name="use_dashboard_btn">Използване на таблото</string>
+    <string name="use_drawer_btn">Използване на менюто</string>
+    <string name="save_poi_without_poi_type_message">Наистина ли ще запазите POI без да укажете типа му?</string>
+    <string name="feedback">Обратна връзка</string>
+    <string name="versions_item">Версии</string>
+    <string name="techical_articles_item">Технически статии</string>
+    <string name="instalation_troubleshooting_item">Инсталиране и отстраняване на неизправности</string>
+    <string name="search_on_the_map_item">Търсене по картата</string>
+    <string name="map_viewing_item">Преглед на картата</string>
+    <string name="faq_item_description">Често задавани въпроси</string>
+    <string name="faq_item">ЧЗВ</string>
+    <string name="planning_trip_item">Планиране на пътуване</string>
+    <string name="navigation_item_description">Настройка на навигация</string>
+    <string name="first_usage_item_description">Как да изтеглите картите, задаване на основните настройки</string>
+    <string name="first_usage_item">Първо ползване</string>
+    <string name="plugins_menu_group">Добавки</string>
+    <string name="other_menu_group">Друго</string>
+    <string name="help_us_to_improve_menu_group">Помогнете ни да подобрим OsmAnd</string>
+    <string name="features_menu_group">Функции</string>
+    <string name="osmo_session_id_share">URL сесия за проследяване на устройството (%1$s)</string>
+    <string name="osmo_auto_send_locations">Автоматично стартиране на трекер сесия</string>
+    <string name="later">По-късно</string>
+    <string name="begin_with_osmand_menu_group">Първи стъпки с OsmAnd</string>
+    <string name="new_version">Нова версия</string>
+    <string name="enter_country_name">Въведете име на държава</string>
+    <string name="application_dir_description">Изберете къде искате да запазите файловете с карти.</string>
+    
+    <string name="update_all">Актуализиране на всички (%1$s МБ)</string>
+    <string name="free_downloads_used">Използвани безплатни сваляния</string>
+    <string name="file_size_in_mb">%.1f МБ</string>
+    <string name="value_downloaded_of_max">%1$.1f от %2$.1f МБ</string>
+    <string name="confirm_download_roadmaps">Сигурни ли сте, че искате да изтеглите карта само с пътища, въпреки че вече имате стандартната карта?</string>
+    <string name="downloads">Изтегляния</string>
+    <string name="get_full_version">Пълна версия</string>
+    <string name="activate_srtm_plugin">Моля, активирайте добавката SRTM</string>
+    <string name="activate_seamarks_plugin">Моля, активирайте добавката за морски карти</string>
+    <string name="buy">Купи</string>
+    <string name="downloading_number_of_files">Изтегляне - %1$d файла</string>
+    <string name="roads">Пътища</string>
+    <string name="downloads_left_template">Остават %1$s изтегляния</string>
+	<string name="are_you_sure">Сигурни ли сте?</string>
+	<string name="count_of_lines">Брой редове</string>
+	<string name="show_gpx">Покажи GPX</string>
+	<string name="saved_at_time">Успешно записано в: %1$s</string>
+	<string name="please_specify_poi_type">Задайте тип на POI.</string>
+	<string name="recent_places">Последни места</string>
+	<string name="osmo_conn_successfull">"Установена връзка: %1$s "</string>
+    <string name="osmo_io_error">"Проблем с връзката към OsMo: "</string>
+    <string name="osmo_settings_uuid">Уникално ID на устройство</string>
+    <string name="use_points_as_intermediates">Изчисляване на маршрут между точки</string>
+    <string name="osmo_mode_restart">Рестартиране на OsMo сесия</string>
+    <string name="osmo_mode_on">Спиране на OsMo сесия</string>
+    <string name="osmo_mode_off">Стартиране на OsMo сесия</string>
+    <string name="route_descr_destination">Крайна цел</string>
    </resources>
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@ -63,7 +63,7 @@
 	<string name="poi_fire_extinguisher">Extintor</string>
 	<string name="poi_fire_hose">Mànega d\'incendis</string>
 	<string name="poi_ambulance_station">Parc d\'ambulàncies</string>
-	<string name="poi_mountain_pass_yes">Coll</string>
+	<string name="poi_mountain_pass">Coll</string>
 	<string name="poi_city_wall">Muralla</string>
 	<string name="poi_vehicle_inspection">Inspecció de vehicles</string>
 	<string name="poi_military_nuclear_explosion_site">Lloc d\'explosió nuclear</string>
@ -1263,7 +1263,7 @@
 	<string name="poi_pump_manual">Bomba manual</string>
 	<string name="poi_pump_powered">Bomba motoritzada</string>
 	<string name="poi_pump_no">Sense bomba</string>
-	<string name="poi_pump">Bomba</string>
+	<string name="poi_pump_yes">Bomba</string>

 	<string name="poi_water_characteristic_mineral">Característica de l\'aigua: mineral</string>
 	<string name="poi_water_characteristic_mud">Característica de l\'aigua: argilosa</string>
@ -1934,4 +1934,69 @@

 	<string name="poi_surveillance_indoor">Vigilància: interior</string>
 	<string name="poi_surveillance_outdoor">Vigilància: exterior</string>
+	<string name="poi_clothes_hats">Barrets</string>
+	<string name="poi_clothes_sports">Roba esportiva</string>
+	<string name="poi_clothes_babies">Roba de nadons</string>
+	<string name="poi_clothes_denim">Roba texana</string>
+	<string name="poi_clothes_workwear">Roba de treball</string>
+	<string name="poi_clothes_fur">Pelleteria</string>
+	<string name="poi_clothes_leather">Roba de cuir</string>
+	<string name="poi_clothes_traditional">Roba tradicional</string>
+	<string name="poi_shoes_women">Sabates de dona</string>
+	<string name="poi_castle_type_stately">Tipus de castell: residencial</string>
+	<string name="poi_castle_type_defensive">Tipus de castell: defensiu</string>
+	<string name="poi_castle_type_fortress">Tipus de castell: fortalesa</string>
+	<string name="poi_castle_type_palace">Tipus de castell: palau</string>
+	<string name="poi_castle_type_kremlin">Tipus de castell: fortificació russa</string>
+	<string name="poi_castle_type_defensive_stately">Tipus de castell: residencial, defensiu</string>
+	<string name="poi_castle_type_castrum">Tipus de castell: romà</string>
+	<string name="poi_castle_type_shiro">Tipus de castell: japonès</string>
+
+	<string name="poi_massage_thai">Massatge: tailandès</string>
+	<string name="poi_massage_sexual">Massatge: sexual</string>
+	<string name="poi_massage_chinese">Massatge: xinès</string>
+	<string name="poi_massage_yes">Serveis de massatge</string>
+	<string name="poi_massage_therapeutic">Massatge: terapèutic</string>
+
+	<string name="poi_sauna_yes">Serveis de sauna</string>
+	<string name="poi_solarium_yes">Serveis de solàrium</string>
+
+	<string name="poi_tents_yes">Es permet l\'acampada</string>
+	<string name="poi_tents_no">No es permet l\'acampada</string>
+	<string name="poi_scout_yes">Camp escolta: sí</string>
+	<string name="poi_scout_no">Camp escolta: no</string>
+	<string name="poi_group_only_yes">Només per grups: sí</string>
+	<string name="poi_group_only_no">Només per grups: no</string>
+	<string name="poi_washing_machine_yes">Rentadora: sí</string>
+	<string name="poi_washing_machine_no">Rentadora: no</string>
+	<string name="poi_shower_yes">Dutxa: sí</string>
+	<string name="poi_shower_no">Dutxa: no</string>
+	<string name="poi_shower_hot">Dutxa: aigua calenta</string>
+	<string name="poi_shower_outdoor">Dutxa: exterior</string>
+	<string name="poi_shower_cold">Dutxa: aigua freda</string>
+	<string name="poi_shower_indoor">Dutxa: coberta</string>
+	<string name="poi_caravans_yes">Caravanes: sí</string>
+	<string name="poi_caravans_no">Caravanes: no</string>
+	<string name="poi_impromptu_yes">Acampada lliure: sí</string>
+	<string name="poi_impromptu_no">Acampada lliure: no</string>
+	<string name="poi_sanitary_dump_station_yes">Estació de buidatge sanitari: sí</string>
+	<string name="poi_sanitary_dump_station_no">Estació de buidatge sanitari: no</string>
+	<string name="poi_sanitary_dump_station_customers">Estació de buidatge sanitari: només clients</string>
+	<string name="poi_power_supply_yes">Subministrament elèctric: sí</string>
+	<string name="poi_power_supply_no">Subministrament elèctric: no</string>
+	<string name="poi_power_supply_cee_17_blue">Subministrament elèctric (endoll): CEE 17 blau</string>
+	<string name="poi_power_supply_cee_7_4">Subministrament elèctric (endoll): CEE 7/4</string>
+	<string name="poi_power_supply_cee_7_5">Subministrament elèctric (endoll): CEE 7/5</string>
+	<string name="poi_power_supply_nema_5_15">Subministrament elèctric (endoll): NEMA 5-15</string>
+
+	<string name="poi_capacity_tents">Capacitat de tendes</string>
+	<string name="poi_capacity_caravans">Capacitat de caravanes</string>
+	<string name="poi_dog_yes">Es permeten els gossos</string>
+	<string name="poi_dog_no">No es permeten els gossos</string>
+
+	<string name="poi_clothes_military">Roba militar</string>
+
+	<string name="poi_historic_period_old_kingdom">Període històric: antic regnat (2686-2181 aC)</string>
+	<string name="poi_historic_period_first_intermediate_period">Període històric: primer període intermedi (2181-2055 aC)</string>
+	<string name="poi_historic_period_second_intermediate_period">Període històric: segon període intermedi (1650 – 1550 aC)</string>
 	</resources>
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@ -549,7 +549,7 @@
    <string name="poi_filter_food_shop">Alimentació</string>
    <string name="use_osmand_routing_service">Navegacio d\'OsmAnd&gt;20Km</string>
    <string name="osmand_net_previously_installed">Ja hi ha una versió prèvia d\'OsmAnd instal·lada. Totes les dades locals es mantindran en la nova aplicació excepte els punts preferits, que s\'han d\'exportar des la versió vella i després importar-los a la nova.</string>
-    <string name="install_selected_build">Vols instal·lar OsmAnd - {0} de {1} {2} MB ?</string>
+    <string name="install_selected_build">Voleu instal·lar OsmAnd - {0} de {1} {2} MB ?</string>
    <string name="gps_status_app_not_found">L\'aplicació GPS status no està instal·lada. Voleu cercar-la al Market?</string>
    <string name="filter_existing_indexes">Filtre baixat</string>
    <string name="continuous_rendering">Dibuixat continu</string>
@ -1513,7 +1513,7 @@
    <string name="notes">Notes</string>
    <string name="online_map">Mapa en línia</string>
    <string name="roads_only">Només carreteres</string>
-    <string name="days_behind">dies de retard</string>
+    <string name="days_behind">dies desfasat</string>
    <string name="track_segments">Segments de traça</string>
    <string name="track_points">Punts de traça</string>
    <string name="plugin_touringview_name">Vista turística del mapa</string>
@ -1749,7 +1749,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
    <string name="si_min_km">Minuts per quilòmetre</string>
    <string name="si_min_m">Minuts per milla</string>
    <string name="si_nm_h">Millesmarines per hora (nusos)</string>
-    <string name="nm_h">mmh</string>
+    <string name="nm_h">nusos</string>
    <string name="min_mile">min/m</string>
    <string name="min_km">min/km</string>
    <string name="m_s">m/s</string>
@ -1770,12 +1770,12 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
    <string name="favorite_category_dublicate_message">El nom de categoria especificat ja existeix. Definiu un altre nom.</string>
    <string name="favorite_category_name">Nom de categoria</string>
    <string name="favorite_category_add_new_title">Afegeix una nova categoria</string>
-    <string name="confirm_download_roadmaps">N\'esteu segur de baixar un mapa de carreteres quan teniu disponible un mapa complet?</string>
-    <string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
+    <string name="confirm_download_roadmaps">N\'esteu segur de baixar el mapa amb només carreteres, quan ja teniu el mapa normal (complet)?</string>
+    <string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="update_all">Actualitzeu tot (%1$s MB)</string>
    <string name="free_downloads_used">Baixades gratuïtes realitzades</string>
-    <string name="free_downloads_used_description">Podeu veure quantes baixades gratuïtes heu fet</string>
+    <string name="free_downloads_used_description">Mostra les baixades gratuïtes que ja heu fet</string>
    <string name="simulate_initial_startup_descr">Configura el senyalitzador de primera engegada de l\'aplicació, mantenint la resta de paràmetres sense canvis</string>
    <string name="simulate_initial_startup">Simula l\'engegada inicial de l\'aplicació</string>
    <string name="share_geo">geo:</string>
@ -1861,4 +1861,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
    <string name="use_dashboard_btn">Utilitza el tauler</string>
    <string name="use_drawer_btn">Utilitza el menú</string>
    <string name="please_specify_poi_type_only_from_list">"Especifiqueu el tipus de PDI adient o deixeu-ho buit. "</string>
-    </resources>
+    <string name="routing_attr_avoid_stairs_name">Evita les escales</string>
+	<string name="routing_attr_avoid_stairs_description">Evita les escales</string>
+	<string name="routing_attr_avoid_borders_name">Evita els pasos fronterers</string>
+	</resources>
--- a/OsmAnd/res/values-cs/phrases.xml
+++ b/OsmAnd/res/values-cs/phrases.xml
@ -41,7 +41,7 @@
 	<string name="poi_fire_extinguisher">Hasicí přístroj</string>
 	<string name="poi_ambulance_station">Ambulance</string>
 	<string name="poi_ford">Brod</string>
-	<string name="poi_mountain_pass_yes">Horské sedlo</string>
+	<string name="poi_mountain_pass">Horské sedlo</string>
 	<string name="poi_gate">Brána</string>
 	<string name="poi_toll_booth">Mýtné</string>
 	<string name="poi_border_control">Hraniční kontrola</string>
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@ -104,7 +104,7 @@
        <string name="poi_emergency_access_point">Nødstilfælde punkt</string>

        <string name="poi_ford">Vadested</string>
-        <string name="poi_mountain_pass_yes">Bjergpas</string>
+        <string name="poi_mountain_pass">Bjergpas</string>
        <string name="poi_gate">Port</string>
        <string name="poi_city_wall">Bymur</string>
        <string name="poi_lift_gate">Vippebom</string>
@ -1368,7 +1368,7 @@

 <string name="poi_rtsa_scale">RTSA skala</string>

-<string name="poi_pump">Pumpe</string>
+<string name="poi_pump_yes">Pumpe</string>

 	<string name="poi_piste_difficulty_easy">Pistesværhedsgrad: let</string>
 	<string name="poi_piste_difficulty_intermediate">Pistesværhedsgrad: medium</string>
@ -1840,7 +1840,7 @@
 	<string name="poi_internet_access_type_wired">Internet adgangstype: kablet</string>
 	<string name="poi_internet_access_type_public">Internetadgang: offentlig</string>
 	<string name="poi_internet_access_type_service">Internetadgang: tjeneste</string>
-	<string name="poi_internet_access_type_no">Internetadgang: ingen</string>
+	<string name="poi_internet_access_type_no">Ingen internetadgang</string>

 <string name="poi_maxwidth">Max. bredde</string>
 	<string name="poi_iata">IATA kode</string>
@ -2048,8 +2048,8 @@
 	<string name="poi_jersey_barrier">Jersey barriere</string>
 	<string name="poi_fuel_91ul">91UL brændstof</string>
 	<string name="poi_fuel_100ll">100LL brændstof</string>
-	<string name="poi_autogas">Autogas</string>
-	<string name="poi_jeta1">Jet A-1 brændstof</string>
+	<string name="poi_fuel_autogas">Autogas</string>
+	<string name="poi_fuel_jeta1">Jet A-1 brændstof</string>
 	<string name="poi_fuel_adblue">AdBlue brændstof</string>

 	<string name="poi_fuel_wood">Brændstof: træ</string>
@ -2513,4 +2513,8 @@

 <string name="poi_fireworks">Fyrværkeri butik</string>

-</resources>
+<string name="poi_aerialway_length">Længde</string>
+
+<string name="poi_internet_access_type_yes">Med internetadgang</string>
+
+	</resources>
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@ -704,7 +704,7 @@
    <string name="application_dir">Datalagringsmappe</string>
    <string name="build_installed">Version {0} korrekt installeret ({1}).</string>
    <string name="downloading_build">Henter version…</string>
-    <string name="install_selected_build">"Installer OsmAnd:  {0} - af {1} på {2} MB ?"</string>
+    <string name="install_selected_build">"Installer OsmAnd:  {0} - {1} - {2} MB ?"</string>
    <string name="loading_builds_failed">Hentning af versionslisten for OsmAnd mislykkedes</string>
    <string name="loading_builds">Indlæser OsmAnd versioner…</string>
    <string name="select_build_to_install">Vælg en OsmAnd version til installation</string>
@ -2011,10 +2011,10 @@
    <string name="favorite_category_name">Kategorinavn</string>
    <string name="favorite_category_add_new_title">Tilføj ny kategori</string>
    <string name="confirm_download_roadmaps">Hent kort kun med veje, selv om et komplet standardkort allerede er hentet?</string>
-    <string name="value_downloaded_from_max">%1$.1f af %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f af %2$.1f MB</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="update_all">Opdater alle (%1$s MB)</string>
-    <string name="free_downloads_used_description">Indstil hvormange gratis filhentninger der er brugt</string>
+    <string name="free_downloads_used_description">Viser de anvendte gratis filhentninger</string>
    <string name="free_downloads_used">Gratis filhentninger brugt</string>

    <string name="share_geo">geo:</string>
@ -2027,7 +2027,7 @@
    <string name="application_dir_description">Vælg hvor kortfilerne skal gemmes.</string>
    <string name="show_on_start_description">\'Fra\' starter direkte på kortet</string>
    <string name="map_downloaded">Kort hentet</string>
-    <string name="map_downloaded_descr">Kort over %1$ s er hentet. Gå tilbage til kortet for at begynde at bruge det.</string>
+    <string name="map_downloaded_descr">Kort over %1$s er hentet. Gå tilbage til kortet for at begynde at bruge det.</string>
    <string name="go_to_map">Gå til kortet</string>
    <string name="shared_string_qr_code">QR kode</string>
    <string name="enter_country_name">Indtast landenavn</string>
@ -2110,4 +2110,7 @@
    <string name="access_from_map_description">Menuknappen viser betjeningspanel, ikke menuen</string>
    <string name="access_from_map">Adgang fra kort</string>
    <string name="please_specify_poi_type_only_from_list">"Angiv korrekt IP type eller spring over. "</string>
-    </resources>
+    <string name="routing_attr_avoid_stairs_name">Undgå trapper</string>
+	<string name="routing_attr_avoid_stairs_description">Undgå trapper</string>
+	<string name="routing_attr_avoid_borders_name">Undgå grænseovergang</string>
+	</resources>
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@ -198,7 +198,7 @@
 	<string name="poi_fast_food">Fast Food</string>
 	<string name="poi_ferry_terminal">Fährhafen</string>
 	<string name="poi_fire_extinguisher">Feuerlöscher</string>
-	<string name="poi_fire_flapper">Feuerklatsche</string>
+	<string name="poi_fire_flapper">Feuerklappe</string>
 	<string name="poi_fire_hose">Löschschlauch</string>
 	<string name="poi_fire_hydrant">Hydrant</string>
 	<string name="poi_fire_station">Feuerwehr</string>
@ -319,7 +319,7 @@
 	<string name="poi_motorcycle_parking">Motorradparkplatz</string>
 	<string name="poi_motorcycle">Motorradgeschäft</string>
 	<string name="poi_motorway_junction">Autobahnkreuz</string>
-	<string name="poi_mountain_pass_yes">Passstraße</string>
+	<string name="poi_mountain_pass">Passstraße</string>
 	<string name="poi_sport_multi">Multi-Sport</string>
 	<string name="poi_museum">Museum</string>
 	<string name="poi_musical_instrument">Musikgeschäft</string>
@ -358,7 +358,7 @@
 	<string name="poi_craft_photographer">Fotograf</string>
 	<string name="poi_craft_photographic_laboratory">Fotolabor</string>
 	<string name="poi_physiotherapist">Physiotherapeut</string>
-	<string name="poi_picnic_site">Picknick</string>
+	<string name="poi_picnic_site">Picknickplatz</string>
 	<string name="poi_pier">Pier</string>
 	<string name="poi_pitch">Sportplatz</string>
 	<string name="poi_place_allotments">Kleingartensiedlung</string>
@ -371,7 +371,7 @@
 	<string name="poi_religion_muslim">Muslimische Kultstätte</string>
 	<string name="poi_religion_shinto">Shintoistische Kultstätte</string>
 	<string name="poi_religion_sikh">Sikh Kultstätte</string>
-	<string name="poi_religion_taoist">Taoistische Kultstätte</string>
+	<string name="poi_religion_taoist">Taoismus</string>
 	<string name="poi_craft_plasterer">Stuckateur</string>
 	<string name="poi_playground">Spielplatz</string>
 	<string name="poi_craft_plumber">Installateur</string>
@ -433,7 +433,7 @@
 	<string name="poi_seafood">Meeresfrüchte</string>
 	<string name="poi_anchor_berth">Ankerplatz</string>
 	<string name="poi_anchorage">Ankerplatz</string>
-	<string name="poi_beacon">Leuchtturm</string>
+	<string name="poi_beacon">Leuchtfeuer</string>
 	<string name="poi_beacon_cardinal">Hauptleuchtturm</string>
 	<string name="poi_beacon_lateral">Nebenleuchtturm</string>
 	<string name="poi_beacon_safe_water">Sicheres Gewässer-Leuchtturm</string>
@ -532,7 +532,7 @@
 	<string name="poi_ticket">Ticket-Shop</string>
 	<string name="poi_craft_tiler">Dachdecker</string>
 	<string name="poi_craft_tinsmith">Klempner</string>
-	<string name="poi_tobacco">Trafik</string>
+	<string name="poi_tobacco">Tabakwarengeschäft</string>
 	<string name="poi_toboggan">Rodelschlitten</string>
 	<string name="poi_toilets">Toilette</string>
 	<string name="poi_toll_booth">Mautstelle</string>
@ -637,7 +637,7 @@
 	<string name="poi_sustenance">Gastronomie</string>
 	<string name="poi_cafe_and_restaurant">Cafe und Restaurant</string>
 	<string name="poi_transportation">Transport</string>
-		<string name="poi_personal_transport">Individualverkehr</string>
+		<string name="poi_personal_transport">Personentransport</string>
 		<string name="poi_air_transport">Lufttransport</string>
 		<string name="poi_water_transport">Wassertransport</string>
 		<string name="poi_bicycle_transport">Fahrradtransport</string>
@ -647,7 +647,7 @@
 	<string name="poi_osmwiki">Wikipedia</string>
 	<string name="poi_user_defined_other">Benutzerdefiniert</string>
 	
-	<string name="poi_aerialway_transport">Luftseilbahntransport</string>
+	<string name="poi_aerialway_transport">Seilbahntransport</string>
 	<string name="poi_wine">Weinhandlung</string>

 	<string name="poi_medical_supply">Medizinische Versorgung</string>
@ -671,7 +671,7 @@
 	<string name="poi_fuel_e10">E10</string>
 	<string name="poi_fuel_e20">E20</string>
 	<string name="poi_fuel_e85">E85</string>
-	<string name="poi_fuel_biogas">E85</string>
+	<string name="poi_fuel_biogas">Biogas</string>
 	<string name="poi_fuel_lh2">Flüssigwasserstoff</string>
 	<string name="poi_fuel_electricity">Strom</string>
 	<string name="poi_public_transport_stop_position">ÖPNV-Halteposition</string>
@ -732,7 +732,7 @@
 	<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_natural">Natur</string>
 	<string name="poi_camera">Kameras und Objektive</string>
 	<string name="poi_charity">Sozialkaufhaus</string>
 	<string name="poi_cabin">Hütte</string>
@ -865,20 +865,20 @@
 	<string name="poi_full_height_turnstile">Personendrehkreuz</string>
 	<string name="poi_bump_gate">Schwingtor</string>
 	<string name="poi_general_barrier">Barriere</string>
-	<string name="poi_height_restrictor">Höhenbegrenzung</string>
+	<string name="poi_height_restrictor">Höhendurchfahrtbegrenzung</string>
 	<string name="poi_sally_port">Ausfalltor</string>
 	<string name="poi_turnstile">Drehkreuz</string>
 	<string name="poi_kent_carriage_gap">Kutschendurchlass</string>
 	<string name="poi_highway_crossing">Kreuzung</string>

-	<string name="poi_icn_ref">Internationales Fahrradknotenpunktnetzwerk</string>
-	<string name="poi_ncn_ref">Nationale Radroute</string>
-	<string name="poi_rcn_ref">Regionales Fahrradknotenpunktnetzwerk</string>
-	<string name="poi_lcn_ref">Lokales Fahrradknotenpunktnetzwerk</string>
-	<string name="poi_iwn_ref">Internationales Wanderknotenpunktnetzwerk</string>
-	<string name="poi_nwn_ref">Nationale Wanderroute</string>
-	<string name="poi_rwn_ref">Regionales Wanderknotenpunktnetzwerk</string>
-	<string name="poi_lwn_ref">Lokales Wanderknotenpunktnetzwerk</string>
+	<string name="poi_icn_ref">Knotenpunkt Internationales Fahrradnetzwerk</string>
+	<string name="poi_ncn_ref">Knotenpunkt Nationale Radroute</string>
+	<string name="poi_rcn_ref">Knotenpunkt Regionales Fahrradnetzwerk</string>
+	<string name="poi_lcn_ref">Knotenpunkt Lokales Fahrradnetzwerk</string>
+	<string name="poi_iwn_ref">Knotenpunkt Internationales Wandernetzwerk</string>
+	<string name="poi_nwn_ref">Knotenpunkt Nationale Wanderroute</string>
+	<string name="poi_rwn_ref">Knotenpunkt Regionales Wandernetzwerk</string>
+	<string name="poi_lwn_ref">Knotenpunkt Lokales Wandernetzwerk</string>

 	<string name="poi_route_hiking_iwn_poi">Internationaler Wanderweg</string>
 	<string name="poi_route_hiking_nwn_poi">Nationaler Wanderweg</string>
@ -893,8 +893,8 @@
 	<string name="poi_enforcement_maxspeed">Geschwindigkeitskontrolle</string>
 	<string name="poi_enforcement_maxheight">Höhenkontrolle</string>
 	<string name="poi_enforcement_mindistance">Abstandskontrolle</string>
-	<string name="poi_enforcement_check">Durchführung:Kontrolle</string>
-	<string name="poi_enforcement_access">Kontrolle Berechtigung</string>
+	<string name="poi_enforcement_check">Kontrollpunkt</string>
+	<string name="poi_enforcement_access">Berechtigungskontrolle</string>
 	<string name="poi_enforcement_toll">Mautkontrolle</string>

 <string name="poi_free_flying">Freeflying Zubehörgeschäft</string>
@ -936,7 +936,7 @@
 	<string name="poi_recycling_computers">Computer</string>
 	<string name="poi_recycling_tyres">Reifen</string>
 	<string name="poi_recycling_tv_monitor">TV und Monitore</string>
-	<string name="poi_recycling_bottles">Pfandflaschen</string>
+	<string name="poi_recycling_bottles">Flaschen</string>
 	<string name="poi_recycling_cork">Korken</string>
 	<string name="poi_recycling_printer_cartridges">Druckerpatronen</string>
 	<string name="poi_recycling_paint">Farben</string>
@ -991,7 +991,7 @@
 	<string name="poi_seasonal_no">Nicht saisonal</string>
 	<string name="poi_seasonal_dry_season">Trockenzeit</string>
 	<string name="poi_seasonal_wet_season">Regenzeit</string>
-	<string name="poi_recycling_container">Behälter</string>
+	<string name="poi_recycling_container">Container</string>
 	<string name="poi_seasonal_spring">Frühling</string>
 	<string name="poi_seasonal_summer">Sommer</string>
 	<string name="poi_seasonal_autumn">Herbst</string>
@ -1029,4 +1029,750 @@
 	<string name="poi_financial">Finanzverwaltung</string>
 	<string name="poi_highway_steps">Treppe</string>
 	<string name="poi_historic_milestone">Meilenstein</string>
+	<string name="poi_doors">Türen</string>
+	<string name="poi_traffic_calming_island">Verkehrsinsel</string>
+	<string name="poi_cooling_tower">Kühlturm</string>
+	<string name="poi_lighting_tower">Leuchtturm</string>
+	<string name="poi_recycling_small_appliances">kleine Geräte</string>
+	<string name="poi_landfill_waste_nuclear">Atommüll</string>
+	<string name="poi_bunker_silo">Silo</string>
+	<string name="poi_paediatrics">Pädiatrie</string>
+
+	<string name="poi_tourism_yes">Tourismus</string>
+	<string name="poi_religion_voodoo">Voodoo Kultstätte</string>
+	<string name="poi_denomination_catholic">katholisch</string>
+	<string name="poi_denomination_baptist">baptistisch</string>
+	<string name="poi_denomination_roman_catholic">Römisch-Katholisch</string>
+	<string name="poi_denomination_orthodox">Orthodox</string>
+	<string name="poi_denomination_lutheran">Lutherrisch</string>
+	<string name="poi_denomination_protestant">Protestantisch</string>
+	<string name="poi_denomination_methodist">Methodistisch</string>
+	<string name="poi_denomination_russian_orthodox">Russisch-Orthodox</string>
+	<string name="poi_denomination_greek_orthodox">Griechisch-Orthodox</string>
+	<string name="poi_denomination_reformed">Reformiert</string>
+	<string name="poi_denomination_seventh_day_adventist">Siebenten-Tags-Adventisten</string>
+	<string name="poi_denomination_new_apostolic">Neuapostolisch</string>
+	<string name="poi_internet_access_yes">Internetzugang: Ja</string>
+	<string name="poi_internet_access_no">Internetzugang: Nein</string>
+
+	<string name="poi_debris">Trümmer</string>
+	<string name="poi_height">Höhe</string>
+	<string name="poi_ele">Höhe über dem Meer</string>
+	<string name="poi_start_date">Anfangsdatum</string>
+	<string name="poi_wheelchair">Rollstuhl</string>
+	<string name="poi_wheelchair_no">Rollstuhlzugang: nicht möglich</string>
+	<string name="poi_wheelchair_limited">Rollstuhlzugang: eingeschränkt möglich</string>
+	<string name="poi_wholesale">Großhandel</string>
+
+	<string name="poi_content_silage">Inhalt: Silage</string>
+	<string name="poi_content_water">Inhalt: Wasser</string>
+	<string name="poi_content_slurry">Inhalt: Gülle</string>
+	<string name="poi_content_oil">Inhalt: Öl</string>
+	<string name="poi_content_fuel">Inhalt: Kraftstoff</string>
+	<string name="poi_content_manure">Inhalt: Dung</string>
+	<string name="poi_content_wine">Inhalt: Wein</string>
+	<string name="poi_content_sewage">Inhalt: Abwasser</string>
+	<string name="poi_content_gas">Inhalt: Gas</string>
+	<string name="poi_content_biomass">Inhalt: Biomasse</string>
+	<string name="poi_content_wastewater">Inhalt: Abwasser</string>
+	<string name="poi_content_crop">Inhalt: Ernte</string>
+	<string name="poi_content_fodder">Inhalt: Futter</string>
+	<string name="poi_content_beer">Inhalt: Bier</string>
+	<string name="poi_content_salt">Inhalt: Salz</string>
+	<string name="poi_content_grain">Inhalt: Getreide</string>
+
+	<string name="poi_nudism_yes">Freikörperkultur: erlaubt</string>
+	<string name="poi_nudism_no">Freikörperkultur: verboten</string>
+	<string name="poi_nudism_obligatory">Freikörperkultur: obligatorisch</string>
+	<string name="poi_nudism_customary">Freikörperkultur: Gewohnheits</string>
+	<string name="poi_nudism_permissive">Freikörperkultur: freizügig</string>
+
+	<string name="poi_trade_building_supplies">Baubedarf</string>
+	<string name="poi_trade_plumbing">Klempnerbedarf</string>
+	<string name="poi_trade_wood">Holzhandel</string>
+	<string name="poi_trade_agricultural_supplies">Agrarbedarf</string>
+	<string name="poi_trade_tile">Fliesenbedarf</string>
+
+	<string name="poi_population">Einwohnerzahl</string>
+	<string name="poi_parking_underground">Tiefgarage</string>
+	<string name="poi_parking_multi_storey">Parkhaus</string>
+
+	<string name="poi_bicycle_parking_anchors">Anker</string>
+	<string name="poi_leaf_type_broadleaved">Laub</string>
+	<string name="poi_leaf_type_leafless">Blattlos</string>
+	<string name="poi_species">Spezies</string>
+	<string name="poi_genus">Gattung</string>
+	<string name="poi_trees_olive">Olivenbaum</string>
+	<string name="poi_trees_apple">Apfelbaum</string>
+	<string name="poi_trees_oil">Palmölbaum</string>
+	<string name="poi_trees_orange">Orange</string>
+	<string name="poi_trees_almond">Mandel</string>
+	<string name="poi_trees_banana">Banane</string>
+	<string name="poi_trees_hazel">Haselnuss</string>
+	<string name="poi_trees_coconut">Kokusnuss</string>
+	<string name="poi_trees_cherry">Kirsche</string>
+	<string name="poi_trees_walnut">Walnuss</string>
+	<string name="poi_trees_plum">Pflaume</string>
+	<string name="poi_trees_peach">Pfirsich</string>
+	<string name="poi_trees_tea">Tee</string>
+	<string name="poi_trees_coca">Koka</string>
+	<string name="poi_trees_kiwi">Kiwi</string>
+	<string name="poi_trees_meadow_orchard">Streuobstwiese</string>
+	<string name="poi_trees_nectorine">Nektarine</string>
+	<string name="poi_trees_mango">Mango</string>
+	<string name="poi_trees_rubber">Gummi</string>
+	<string name="poi_trees_date">Dattel</string>
+	<string name="poi_trees_coffea">Kaffee</string>
+	<string name="poi_trees_pomegranate">Granatapfel</string>
+
+	<string name="poi_rural">ländlich</string>
+
+	<string name="poi_animal_shelter">Tierheim</string>
+	<string name="poi_seats">Sitze</string>
+	<string name="poi_backrest_yes">Rückenlehne: Ja</string>
+	<string name="poi_backrest_no">Rückenlehne: Nein</string>
+
+	<string name="poi_intermittent">wechselnd</string>
+
+	<string name="poi_deadlock">toter Punkt</string>
+
+	<string name="poi_aerialway_length">Länge</string>
+
+<string name="poi_craft_electronics">Elektriker</string>
+	<string name="poi_aerialway_pylon">Seilbahnpfeiler</string>
+
+	<string name="poi_memorial_war">Kriegsdenkmal</string>
+	<string name="poi_memorial_statue">Statue</string>
+	<string name="poi_memorial_stone">Stein</string>
+	<string name="poi_resource_aggregate">Generator</string>
+	<string name="poi_resource_dolomite">Dolomit</string>
+	<string name="poi_resource_gas">Gas</string>
+	<string name="poi_resource_gold">Gold</string>
+	<string name="poi_resource_graphite">Grafit</string>
+	<string name="poi_resource_mineral_oil">Mineralöl</string>
+	<string name="poi_resource_oil">Erdöl</string>
+	<string name="poi_resource_salt">Salz</string>
+	<string name="poi_resource_sand">Sand</string>
+	<string name="poi_resource_sandstone">Sandstein</string>
+	<string name="poi_resource_silica">Silizium</string>
+	<string name="poi_resource_silver">Silber</string>
+	<string name="poi_resource_stone">Stein</string>
+	<string name="poi_resource_water">Wasser</string>
+	<string name="poi_wetland_swamp">Sumpf</string>
+	<string name="poi_beach_sand">Sandstrand</string>
+	<string name="poi_beach_rocky">Felsstrand</string>
+
+	<string name="poi_cypress">Zypresse</string>
+	<string name="poi_bench_yes">mit Sitzbank</string>
+	<string name="poi_bench_no">Ohne Sitzbank</string>
+	<string name="poi_waste_basket_yes">mit Abfalleimer</string>
+	<string name="poi_waste_basket_no">ohne Abfalleimer</string>
+
+	<string name="poi_internet_access_type_wlan">Internetzugang: WLAN</string>
+	<string name="poi_internet_access_type_terminal">Internetzugang: Arbeitsplatz</string>
+	<string name="poi_internet_access_type_wired">Internetzugang: kabelgebunden</string>
+	<string name="poi_internet_access_type_public">Internetzugang: offen</string>
+	<string name="poi_internet_access_type_service">Internetzugang: Service</string>
+	<string name="poi_internet_access_type_no">Kein Internetzugang</string>
+	<string name="poi_internet_access_type_yes">Mit Internetzugang</string>
+
+	<string name="poi_maxwidth">Maximalbreite</string>
+	<string name="poi_iata">IATA Code</string>
+	<string name="poi_icao">ICAO Code</string>
+	<string name="poi_faa">FAA Code</string>
+	
+	<string name="poi_width">Weite</string>
+
+	<string name="poi_architect_name">Architekt</string>
+
+	<string name="poi_architecture_modern">Architektur: modern</string>
+	<string name="poi_tunnel_car">Strassentunnel</string>
+	<string name="poi_tunnel_pedestrian">Fußgängertunnel</string>
+	<string name="poi_tunnel_railway">Eisenbahntunnel</string>
+	<string name="poi_bridge_car">Straßenbrücke</string>
+	<string name="poi_bridge_pedestrian">Fußgängerbrücke</string>
+	<string name="poi_bridge_bicycle">Fahrradbrücke</string>
+	<string name="poi_bridge_railway">Eisenbahnbrücke</string>
+	<string name="poi_note">Notiz</string>
+	<string name="poi_historic_aircraft">Historisches Flugzeug</string>
+
+	<string name="poi_elevator_yes">Mit Aufzug</string>
+	<string name="poi_elevator_no">Ohne Aufzug</string>
+
+	<string name="poi_fuel_91ul">91UL Kraftstoff</string>
+	<string name="poi_fuel_100ll">100LL Kraftstoff</string>
+	<string name="poi_fuel_autogas">Autogas</string>
+	<string name="poi_fuel_jeta1">Flugzeug A-1 Kraftstoff</string>
+	<string name="poi_fuel_adblue">AdBlue Kraftstoff</string>
+
+	<string name="poi_fuel_wood">Kraftstoff: Holz</string>
+	<string name="poi_street_lamp">Strassenlaterne</string>
+
+	<string name="poi_clothes_women">Frauenkleidung</string>
+	<string name="poi_clothes_underwear">Unterwäsche</string>
+	<string name="poi_clothes_men">Herrenkleidung</string>
+	<string name="poi_clothes_wedding">Hochzeitskleidung</string>
+	<string name="poi_clothes_sports">Sportkleidung</string>
+	<string name="poi_clothes_babies">Kinderkleidung</string>
+	<string name="poi_clothes_workwear">Arbeitskleidung</string>
+	<string name="poi_clothes_hats">Hüte</string>
+	<string name="poi_clothes_leather">Leder</string>
+	<string name="poi_clothes_costumes">Kostüme</string>
+	<string name="poi_clothes_traditional">Traditionelle Kleidung</string>
+	<string name="poi_clothes_suits">Anzüge</string>
+	<string name="poi_clothes_oversize">Übergrößen</string>
+	<string name="poi_clothes_schoolwear">Schulkleidung</string>
+	<string name="poi_clothes_swimwear">Schwimmkleidung</string>
+	<string name="poi_clothes_socks">Socken</string>
+	<string name="poi_clothes_dance">Tanzkleidung</string>
+	<string name="poi_clothes_military">Militärkleidung</string>
+
+	<string name="poi_shoes_children">Kinderschuhe</string>
+	<string name="poi_shoes_women">Frauenschuhe</string>
+	<string name="poi_shoes_sport">Sportschuhe</string>
+	<string name="poi_shoes_men">Männerschuhe</string>
+	<string name="poi_shoes_orthopedic">Orthopädische Schuhe</string>
+
+	<string name="poi_openfire_yes">Offenes Feuer erlaubt</string>
+	<string name="poi_openfire_no">Offenes Feuer verboten</string>
+	<string name="poi_washing_machine_yes">Waschmaschine: Ja</string>
+	<string name="poi_washing_machine_no">Waschmaschine: Nein</string>
+	<string name="poi_shower_yes">Dusche: Ja</string>
+	<string name="poi_shower_no">Dusche: Nein</string>
+	<string name="poi_shower_hot">Dusche: warm</string>
+	<string name="poi_shower_outdoor">Dusche: draussen</string>
+	<string name="poi_shower_cold">Dusche: kalt</string>
+	<string name="poi_shower_indoor">Dusche: drinnen</string>
+	<string name="poi_caravans_yes">Wohnwagen: Ja</string>
+	<string name="poi_caravans_no">Wohnwagen: Nein</string>
+	<string name="poi_power_supply_yes">Stromanschluss: Ja</string>
+	<string name="poi_power_supply_no">Stromanschluss: Nein</string>
+	<string name="poi_power_supply_cee_17_blue">Stromanschluss: CEE 17 blau</string>
+	<string name="poi_power_supply_cee_7_4">Stromanschluss: CEE 7/4</string>
+	<string name="poi_power_supply_cee_7_5">Stromanschluss: CEE 7/5</string>
+	<string name="poi_power_supply_nema_5_15">Stromanschluss: NEMA 5-15</string>
+
+	<string name="poi_capacity_tents">Maximale Zeltplätze</string>
+	<string name="poi_capacity_caravans">Maximum Wohnwagen</string>
+	<string name="poi_dog_yes">Hunde erlaubt</string>
+	<string name="poi_dog_no">Hunde nicht erlaubt</string>
+
+	<string name="poi_refugee_no">Flüchtlinge: Nein</string>
+
+	<string name="poi_social_facility_day_care">Sozialeinrichtung: Tagespflege</string>
+
+	<string name="poi_social_facility_for_senior">Zielgruppe: Senioren</string>
+	<string name="poi_social_facility_for_child">Zielgruppe: Kinder</string>
+	<string name="poi_social_facility_for_disabled">Zielgruppe: Behinderte</string>
+	<string name="poi_social_facility_for_mental_health">Zielgruppe: mental beeinträchtigte Menschen</string>
+	<string name="poi_social_facility_for_homeless">Zielgruppe: Obdachlose</string>
+	<string name="poi_social_facility_for_migrant">Zielgruppe: Migranten</string>
+	<string name="poi_social_facility_for_unemployed">Zielgruppe: Arbeitslose</string>
+	<string name="poi_theatre_genre_musical">Genre: Musik</string>
+	<string name="poi_theatre_genre_drama">Genre: Drama</string>
+	<string name="poi_theatre_genre_opera">Genre: Oper</string>
+	<string name="poi_theatre_genre_cabaret">Genre: Kabarett</string>
+	<string name="poi_theatre_genre_comedy">Genre: Comedy</string>
+	<string name="poi_theatre_genre_marionette">Genre: Puppenspiel</string>
+	<string name="poi_theatre_genre_ballet">Genre: Ballet</string>
+	<string name="poi_theatre_genre_shadow_play">Genre: Schattenspiel</string>
+
+	<string name="poi_product_leather">Produkt: Leder</string>
+	<string name="poi_product_beer">Produkt: Bier</string>
+	<string name="poi_product_meat">Produkt: Fleisch</string>
+
+	<string name="poi_wheelchair_description">Beschreibung für Rollstuhlnutzer</string>
+	<string name="poi_blind_description">Beschreibung für Blinde</string>
+	<string name="poi_handrail_yes">Handgelender: Ja</string>
+	<string name="poi_handrail_no">Handgelender: Nein</string>
+	<string name="poi_ramp_yes">Rampe: Ja</string>
+	<string name="poi_ramp_no">Rampe: Nein</string>
+	<string name="poi_ramp_wheelchair_yes">Rampe für Rollstuhl: Ja</string>
+	<string name="poi_ramp_wheelchair_no">Rampe für Rollstuhl: Nein</string>
+	<string name="poi_ramp_bicycle_yes">Rampe für Fahrräder: Ja</string>
+	<string name="poi_ramp_bicycle_no">Rampe für Fahrräder: Nein</string>
+	<string name="poi_step_count">Anzahl Stufen</string>
+	<string name="poi_defibrillator">Defibrillator</string>
+	<string name="poi_defibrillator_yes">Defibrillator: Ja</string>
+
+	<string name="poi_horse_yes">Pferde erlaubt</string>
+	<string name="poi_horse_no">Pferde nicht erlaubt</string>
+	<string name="poi_animal_yes">Tiere erlaubt</string>
+	<string name="poi_animal_no">Tiere nicht erlaubt</string>
+
+	<string name="poi_historic_stone">Historischer Stein</string>
+	<string name="poi_material_wood">Martial: Holz</string>
+	<string name="poi_material_metal">Material: Metall</string>
+	<string name="poi_material_steel">Material: Stahl</string>
+	<string name="poi_material_stone">Material: Stein</string>
+	<string name="poi_material_plastic">Martial: Plastik</string>
+	<string name="poi_material_sandstone">Material: Sandstein</string>
+	<string name="poi_material_granite_stone">Material: Granit</string>
+	<string name="poi_material_metal_wood">Material: Metal; Holz</string>
+	<string name="poi_material_glass">Material: Glas</string>
+	<string name="poi_material_bronze">Material: Bronze</string>
+	<string name="poi_material_earth">Material: Erde</string>
+	<string name="poi_material_aluminium">Material: Aluminium</string>
+
+	<string name="poi_historic_railway_station">Historische Eisenbahnstation</string>
+
+	<string name="poi_club_sailing">Segelclub</string>
+	<string name="poi_historic_railway">Historische Eisenbahn</string>
+
+	<string name="poi_artist_name">Künstler</string>
+	<string name="poi_building_type_church">Gebäudeart: Kirche</string>
+	<string name="poi_building_type_chapel">Gebäudeart: Kapelle</string>
+	<string name="poi_building_type_mosque">Gebäudeart: Moschee</string>
+	<string name="poi_building_type_temple">Gebäudeart: Tempel</string>
+	<string name="poi_building_type_cathedral">Gebäudeart: Kathedrale</string>
+	<string name="poi_building_type_basilica">Gebäudeart: Basilika</string>
+	<string name="poi_building_type_synagogue">Gebäudeart: Synagoge</string>
+	<string name="poi_building_type_shrine">Gebäudeart: Schrein</string>
+
+	<string name="poi_cross">Kreuz</string>
+	<string name="poi_temperature">Temperatur</string>
+	<string name="poi_wiki_lang_ga">Irisches Wiki</string>
+	<string name="poi_wiki_lang_is">Isländisches Wiki</string>
+	<string name="poi_wiki_lang_ka">Georgisches Wiki</string>
+	<string name="poi_wiki_lang_ku">Kurdisches Wiki</string>
+	<string name="poi_wiki_lang_la">Lateinisches Wiki</string>
+	<string name="poi_wiki_lang_lb">Luxemburgisches Wiki</string>
+	<string name="poi_wiki_lang_mk">Mazedonisches Wiki</string>
+	<string name="poi_wiki_lang_sq">Albanisches Wiki</string>
+	<string name="poi_wiki_lang_tl">Philippinisches Wiki</string>
+
+	<string name="poi_religion_spiritualist">Spiritalismus</string>
+	<string name="poi_denomination_evangelical">Evangelikal</string>
+	<string name="poi_denomination_mormon">Mormonen</string>
+	<string name="poi_denomination_jehovahs_witness">Jehovas Zeugen</string>
+	<string name="poi_denomination_greek_catholic">Griechisch-katholisch</string>
+	<string name="poi_denomination_bulgarian_orthodox">Bulgarisch-orthodox</string>
+	<string name="poi_denomination_adventist">Adventisten</string>
+	<string name="poi_denomination_serbian_orthodox">Serbisch-orthodox</string>
+	<string name="poi_denomination_apostolic">Apostolisch</string>
+	<string name="poi_denomination_reform">Reformierte</string>
+	<string name="poi_denomination_georgian_orthodox">Georgisch-orthodox</string>
+	<string name="poi_denomination_coptic_orthodox">Kopitsch-orthodox</string>
+	<string name="poi_bicycle_parking_stands">Fahrradständer</string>
+	<string name="poi_bicycle_parking_wall_loops">Fahrrad Wandhalter</string>
+	<string name="poi_leaf_type_mixed">Gemischt</string>
+	<string name="poi_trees_persimmon">Persimmon</string>
+	<string name="poi_generator_source_coal">Energiequelle: Kohle</string>
+	<string name="poi_generator_source_gas">Energiequelle: Gas</string>
+	<string name="poi_generator_source_nuclear">Energiequelle: nuklear</string>
+	<string name="poi_generator_source_solar">Energiequelle: solar</string>
+	<string name="poi_generator_source_hydro">Energiequelle: hydro</string>
+	<string name="poi_generator_source_wind">Energiequelle: Wind</string>
+	<string name="poi_generator_source_geothermal">Energiequelle: Geothermie</string>
+	<string name="poi_generator_source_oil">Energiequelle: Öl</string>
+	<string name="poi_generator_source_diesel">Energiequelle: Diesel</string>
+
+	<string name="poi_int_name">Internationale Bezeichnung</string>
+	<string name="poi_nat_name">Nationale Bezeichnung</string>
+	<string name="poi_reg_name">Regionale Bezeichnung</string>
+	<string name="poi_loc_name">Lokale Bezeichnung</string>
+	<string name="poi_old_name">Alte Bezeichnung</string>
+	<string name="poi_alt_name">Alternative Bezeichnung</string>
+
+	<string name="poi_pump_manual">Handpumpe</string>
+	<string name="poi_pump_no">Keine Pumpe</string>
+	<string name="poi_pump_yes">Pumpe</string>
+
+	<string name="poi_information_board">Informationstafel</string>
+	<string name="poi_information_map">Karte</string>
+	<string name="poi_information_office">Informationsbüro</string>
+	<string name="poi_information_route_marker">Streckenmarkierung</string>
+	<string name="poi_information_hikingmap">Wanderkarte</string>
+	<string name="poi_information_nature">Informationspunkt: Natur</string>
+	<string name="poi_information_wildlife">Informationspunkt: Wildleben</string>
+	<string name="poi_information_history">Informationspunkt: Historie</string>
+	<string name="poi_information_sign">Schild</string>
+	<string name="poi_information_audioguide">Audioerklärung</string>
+	<string name="poi_information_bicyclemap">Fahrradkarte</string>
+	<string name="poi_board_type_plants">Informationspunkt: Pflanzen</string>
+	<string name="poi_board_type_geology">Informationspunkt: geologisch</string>
+	<string name="poi_board_type_public_transport">Informationspunkt: öffentlicher Nahverkehr</string>
+	<string name="poi_board_type_technology">Informationspunkt: Technik</string>
+	<string name="poi_board_type_astronomy">Informationspunkt: Astronomie</string>
+
+	<string name="poi_commercial">Gewerbegebiet</string>
+	<string name="poi_fireplace_yes">Feuerstelle</string>
+	<string name="poi_fireplace_no">Keine Feuerstelle</string>
+
+	<string name="poi_covered_yes">überdacht</string>
+	<string name="poi_covered_no">offen</string>
+
+	<string name="poi_smoking_no">Rauchen verboten</string>
+	<string name="poi_smoking_outside">Rauchen nur draussen erlaubt</string>
+	<string name="poi_smoking_yes">Rauchen erlaubt</string>
+	<string name="poi_smoking_separated">Rauchen im Raucherzimmer</string>
+	<string name="poi_traffic_signals_sound_yes">mit Ton</string>
+	<string name="poi_traffic_signals_sound_no">ohne Ton</string>
+	<string name="poi_rescue_station">Rettungsstation</string>
+
+	<string name="poi_mini_roundabout">Mini-Kreisverkehr</string>
+	<string name="poi_railway_crossing">Bahnübergang</string>
+	<string name="poi_bird_hide">Vögelbeobachtungspunkt</string>
+	<string name="poi_garden">Garten</string>
+
+	<string name="poi_heath">Heide</string>
+	<string name="poi_grass">Grass</string>
+	<string name="poi_grassland">Grasland</string>
+	<string name="poi_scrub">Gestrüpp</string>
+	<string name="poi_logging">Holzfällen</string>
+	<string name="poi_sand">Sand</string>
+
+	<string name="poi_windfall">Fallobst</string>
+	<string name="poi_dead_wood">Todwald</string>
+
+	<string name="poi_level">Ebene</string>
+	<string name="poi_rtsa_scale">RTSA Skala</string>
+
+	<string name="poi_piste_difficulty_easy">Pistengrad: leicht</string>
+	<string name="poi_piste_difficulty_advanced">Pistengrad: Fortgeschrittene</string>
+	<string name="poi_piste_difficulty_expert">Pistengrad: Experte</string>
+	<string name="poi_power_pole">Strommast</string>
+
+	<string name="poi_power_tower">Strommast</string>
+	<string name="poi_ford_stepping_stones">Trittsteinbrücke</string>
+	<string name="poi_greenfield">Bauland</string>
+	<string name="poi_religion_jain">Jainismus</string>
+	<string name="poi_board_type_notice">schwarzes Brett</string>
+	<string name="poi_garden_style_english">Gartenstil: Englisch</string>
+	<string name="poi_garden_style_japanese">Gartenstil: Japanisch</string>
+
+	<string name="poi_capacity">Kapazität</string>
+	<string name="poi_capacity_disabled_yes">reservierte Plätze für Behinderte</string>
+	<string name="poi_capacity_disabled_no">keine reservierten Plätze für Behinderte</string>
+	<string name="poi_capacity_disabled">reservierte Plätze Behinderte</string>
+	<string name="poi_capacity_women_yes">reservierte Plätze für Frauen</string>
+	<string name="poi_capacity_women_no">keine reservierten Plätze für Frauen</string>
+	<string name="poi_capacity_women">reservierte Plätze für Frauen</string>
+	<string name="poi_capacity_pupils">reservierte Plätze für Studenten</string>
+	<string name="poi_capacity_teachers">reservierte Plätze für Lehrer</string>
+	<string name="poi_capacity_parent_yes">reservierte Plätze für Eltern</string>
+	<string name="poi_capacity_parent_no">keine reservierten Plätze für Eltern</string>
+	<string name="poi_capacity_parent">reservierte Plätze für Eltern</string>
+
+	<string name="poi_aerialway_occupancy">"Campingplatz-, Stuhl-,  Autokapazität"</string>
+	<string name="poi_aerialway_capacity">Kapazität pro Stunde</string>
+	<string name="poi_aerialway_duration">durchschnittliche Fahrzeit, Minuten</string>
+	<string name="poi_aerialway_bubble_yes">Blase</string>
+	<string name="poi_aerialway_bubble_no">Keine Blase</string>
+	<string name="poi_aerialway_heating_yes">Heizung</string>
+	<string name="poi_aerialway_heating_no">keine Heizung</string>
+	<string name="poi_aerialway_bicycle_yes">Fahrrad: erlaubt</string>
+	<string name="poi_aerialway_bicycle_no">Fahrrad: nicht erlaubt</string>
+	<string name="poi_aerialway_bicycle_summer">Fahrrad: nur im Sommer erlaubt</string>
+	<string name="poi_aerialway_access_entry">nur Eingang</string>
+	<string name="poi_aerialway_access_exit">nur Ausgang</string>
+	<string name="poi_aerialway_access_both">Eingang und Ausgang</string>
+	<string name="poi_aerialway_summer_access_entry">Sommereingang</string>
+	<string name="poi_aerialway_summer_access_exit">Sommerausgang</string>
+	<string name="poi_aerialway_summer_access_both">Sommerein- und ausgang</string>
+
+	<string name="poi_stars_1">Sterne: 1 (Tourist)</string>
+	<string name="poi_stars_1s">Sterne: 1S (gehobener Tourist)</string>
+	<string name="poi_stars_2">Sterne: 2 (Standard)</string>
+	<string name="poi_stars_2s">Sterne: 2S (gehobener Standard)</string>
+	<string name="poi_stars_3">Sterne: 3 (Komfort)</string>
+	<string name="poi_stars_3s">Sterne: 3S (gehobener Komfort)</string>
+	<string name="poi_stars_4">Sterne: 4 (Erste Klasse)</string>
+	<string name="poi_stars_4s">Steren: 4S (gehobene Erste Klasse)</string>
+	<string name="poi_stars_5">Sterne: 5 (De Luxe)</string>
+	<string name="poi_stars_5s">Sterne: 5S (gehobenes De Luxe)</string>
+	<string name="poi_stars_6">Sterne: 6</string>
+	<string name="poi_stars_7">Sterne: 7</string>
+	<string name="poi_rooms">Zimmer</string>
+
+	<string name="poi_payment_coins_yes">Münzen akzeptiert</string>
+	<string name="poi_payment_coins_no">Münzen nicht akzeptiert</string>
+	<string name="poi_payment_coins_0.5">$0.5 Münzen akzeptiert</string>
+	<string name="poi_payment_coins_50c12">50ct, 1€ und 2€ Münzen akzeptiert</string>
+	<string name="poi_payment_telephone_cards_yes">Telefonkarten akzeptiert</string>
+	<string name="poi_payment_telephone_cards_no">Telefonkarten nicht akzeptiert</string>
+	<string name="poi_payment_credit_cards_yes">Kreditkarten akzeptiert</string>
+	<string name="poi_payment_credit_cards_no">Kreditkarten nicht akzeptiert</string>
+	<string name="poi_payment_notes_yes">Banknoten akzeptiert</string>
+	<string name="poi_payment_notes_no">Banknoten nicht akzeptiert</string>
+	<string name="poi_payment_cash_yes">Bargeld akzeptiert</string>
+	<string name="poi_payment_cash_no">Bargeld nicht akzeptiert</string>
+	<string name="poi_payment_debit_cards_yes">Debit Karte akzeptiert</string>
+	<string name="poi_payment_debit_cards_no">Debit Karte nicht akzeptiert</string>
+	<string name="poi_payment_bitcoin_yes">Bitcoin akzeptiert</string>
+	<string name="poi_payment_bitcoin_no">Bitcoin nicht akzeptiert</string>
+	<string name="poi_payment_visa_yes">Visa Karte akzeptiert</string>
+	<string name="poi_payment_visa_no">Visa Karte nicht akzeptiert</string>
+	<string name="poi_payment_mastercard_yes">Mastercard akzeptiert</string>
+	<string name="poi_payment_mastercard_no">Mastercard nicht akzeptiert</string>
+	<string name="poi_payment_none">Kostenlos</string>
+	<string name="poi_payment_maestro_yes">Maestro Karte akzeptiert</string>
+	<string name="poi_payment_maestro_no">Maestro Karte nicht akzeptiert</string>
+	<string name="poi_payment_american_express_yes">American Express (AMEX) Karte akzeptiert</string>
+	<string name="poi_payment_american_express_no">American Express (AMEX) Karte nicht akzeptiert</string>
+	<string name="poi_payment_diners_club_yes">Diners Club Karte akzeptiert</string>
+	<string name="poi_payment_diners_club_no">Diners Club Karte nicht akzeptiert</string>
+	<string name="poi_payment_dkv_yes">DKV akzeptiert</string>
+	<string name="poi_payment_dkv_no">DKV nicht akzeptiert</string>
+	<string name="poi_drive_in_yes">Autoschalter: Ja</string>
+	<string name="poi_drive_in_no">Autoschalter: Nein</string>
+	<string name="poi_drive_through_yes">Durchfahrt: Ja</string>
+	<string name="poi_drive_through_no">Durchfahrt: Nein</string>
+
+	<string name="poi_brewery_additional">Brauereiname</string>
+	<string name="poi_microbrewery_yes">Minibrauereien</string>
+	<string name="poi_microbrewery_no">Keine Minibrauereien</string>
+
+	<string name="poi_takeaway_yes">zum Mitnehmen</string>
+	<string name="poi_takeaway_no">Nicht zum Mitnehmen</string>
+	<string name="poi_takeaway_only">nur zum Mitnehmen</string>
+
+	<string name="poi_delivery_yes">Lieferservice</string>
+	<string name="poi_delivery_no">Kein Lieferservice</string>
+	<string name="poi_delivery_only">Nur Lieferung</string>
+
+	<string name="poi_cocktails_yes">Cocktails</string>
+
+	<string name="poi_service_dealer">Händler</string>
+	<string name="poi_service_repair">Reparatur</string>
+	<string name="poi_service_repair_no">Keine Reparatur</string>
+	<string name="poi_automated_yes">Automatisiert</string>
+	<string name="poi_automated_no">Nicht automatisiert</string>
+	<string name="poi_brushless_no">Bürstenlos: Nein</string>
+	<string name="poi_car_wash_no">Autowäsche: Nein</string>
+
+	<string name="poi_male_yes">Männlich</string>
+	<string name="poi_male_no">Für Männer verboten</string>
+	<string name="poi_female_yes">Weiblich</string>
+	<string name="poi_female_no">Für Frauen verboten</string>
+	<string name="poi_toilets_yes">Mit Toiletten</string>
+	<string name="poi_toilets_no">Keine Toiletten</string>
+	<string name="poi_religion_bahai">Bahaitum</string>
+	<string name="poi_religion_pagan">Heidentum</string>
+	<string name="poi_religion_tenrikyo">Tenrikyō</string>
+	<string name="poi_religion_zoroastrian">Zoroastrismus</string>
+
+	<string name="poi_denomination_sunni">sunnitische</string>
+	<string name="poi_denomination_anglican">anglikanisch</string>
+	<string name="poi_denomination_presbyterian">presbyterianisch</string>
+	<string name="poi_denomination_pentecostal">Pfingstler</string>
+	<string name="poi_denomination_church_of_england">Kirche von England</string>
+	<string name="poi_denomination_episcopal">Episkopalkirche</string>
+	<string name="poi_denomination_shia">Schia</string>
+	<string name="poi_denomination_united">Vereinigten</string>
+	<string name="poi_denomination_tibetan">tibetanisch</string>
+	<string name="poi_denomination_united_reformed">vereinigt reformiert</string>
+	<string name="poi_denomination_church_of_scotland">Kirche von Schottland</string>
+	<string name="poi_denomination_salvation_army">Heilsarmee</string>
+	<string name="poi_denomination_iglesia_ni_cristo">Iglesia ni Cristo</string>
+	<string name="poi_denomination_mennonite">Mennoniten</string>
+	<string name="poi_denomination_quaker">Quaker</string>
+	<string name="poi_denomination_assemblies_of_god">Assemblies of god</string>
+	<string name="poi_denomination_nondenominational">bekenntnisfrei</string>
+	<string name="poi_denomination_nazarene">Nazaräer</string>
+	<string name="poi_denomination_united_methodist">vereinigte Methodisten</string>
+	<string name="poi_denomination_old_believers">Altgläubige</string>
+	<string name="poi_denomination_spiritist">Spiritist</string>
+	<string name="poi_denomination_armenian_apostolic">Armenische-apostolisch</string>
+	<string name="poi_denomination_dutch_reformed">niederländisch-reformiert</string>
+	<string name="poi_denomination_latter_day_saints">Heiligen der Letzten Tage</string>
+	<string name="poi_denomination_church_of_christ">Kirche Christi</string>
+	<string name="poi_denomination_united_church_of_christ">Vereinigte Kirche Christi</string>
+	<string name="poi_denomination_scientist">Wissenschaftler</string>
+	<string name="poi_denomination_romanian_orthodox">Rumänisch-orthodox</string>
+	<string name="poi_stone_type_coat_of_arms">Typ: Wappen</string>
+
+	<string name="poi_material_reinforced_concrete">Material: Stahlbeton</string>
+	<string name="poi_material_concrete">Material: Beton</string>
+	<string name="poi_material_masonry">Material: Mauerwerk</string>
+	<string name="poi_material_brick">Martial: Ziegel</string>
+	<string name="poi_material_composite">Material: zusammengesetzte</string>
+	<string name="poi_material_limestone">Material: Kalkstein</string>
+	<string name="poi_material_marble">Material: Marmor</string>
+	<string name="poi_site_type_megalith">Typ: Magalith</string>
+	<string name="poi_site_type_tumulus">Typ: Grabhügel</string>
+	<string name="poi_site_type_fortification">Typ: Befestigung</string>
+	<string name="poi_site_type_settlement">Typ: Siedlung</string>
+	<string name="poi_site_type_city">Typ: Stadt</string>
+	<string name="poi_site_type_necropolis">Typ: Nekropole</string>
+	<string name="poi_site_type_earthwork">Typ: Erdarbeiten</string>
+	<string name="poi_megalith_type_menhir">Megalith-Typ: Menhir</string>
+	<string name="poi_megalith_type_dolmen">Megalith-Typ: Dolmen</string>
+	<string name="poi_fortification_type_hill_fort">Befestigungstyp: Höhenburg</string>
+	<string name="poi_fortification_type_limes">Befestigungstyp: Limes</string>
+	<string name="poi_fortification_type_sconce">Befestigungstyp: Leuchter</string>
+	<string name="poi_fortification_type_ring_ditch">Befestigungstyp: Ringgraben</string>
+
+	<string name="poi_pa">Pa (befestigte Siedlung der Maori)</string>
+
+	<string name="poi_historic_farm">Historischer Bauernhof</string>
+	<string name="poi_club_freemasonry">Freimaurerloge</string>
+	<string name="poi_club_scout">Scout-Club</string>
+
+	<string name="poi_historic_threshing_floor">Historische Tenne</string>
+	<string name="poi_historic_gallows">Historischer Galgen</string>
+	<string name="poi_square">Quadrat</string>
+	<string name="poi_sculptor">Bildhauer</string>
+
+	<string name="poi_building_type_monastery">Gebäudeart: Kloster</string>
+	<string name="poi_prison_camp">Ehemaliges Kriegsgefangenenlager</string>
+	<string name="poi_concentration_camp">Typ: Konzentrationslager</string>
+	<string name="poi_pow_camp">Typ: Kriegsgefangenenlager</string>
+	<string name="poi_labor_camp">Typ: Arbeitslager</string>
+	<string name="poi_concentration_camp_nazism">Typ: Nazi</string>
+	<string name="poi_concentration_camp_gulag">Typ: Gulag</string>
+
+	<string name="poi_bathing_yes">Baden: Ja</string>
+	<string name="poi_bathing_no">Baden: Nein</string>
+
+	<string name="poi_boat_storage">Bootslager</string>
+
+	<string name="poi_bridge_ref">Brücken ref</string>
+	<string name="poi_tunnel_ref">Tunnel ref</string>
+
+	<string name="poi_ref">Ref</string>
+
+	<string name="poi_cargo_passengers">Fracht: Passagiere</string>
+	<string name="poi_cargo_vehicle">Fracht: Fahrzeuge</string>
+	<string name="poi_cargo_bicycle">Fracht: Fahrräder</string>
+	<string name="poi_cargo_container">Fracht: Container</string>
+	<string name="poi_cargo_hgv">Fracht: LKW</string>
+
+	<string name="poi_fitness_station">Fitness Station</string>
+
+	<string name="poi_hackerspace">Hackerspace</string>
+
+	<string name="poi_wiki_lang_als">elsässisches Wiki</string>
+	<string name="poi_wiki_lang_bs">Bosnisches Wiki</string>
+	<string name="poi_wiki_lang_fy">Friesisches Wiki</string>
+	<string name="poi_wiki_lang_hy">Armenisches Wiki</string>
+	<string name="poi_wiki_lang_nds">Niedersächsisches Wiki</string>
+	<string name="poi_wiki_lang_os">Ossetisches Wiki</string>
+	<string name="poi_wiki_lang_pms">Piemontesisches Wiki</string>
+	<string name="poi_wiki_lang_sc">Sardisches Wiki</string>
+	<string name="poi_wiki_lang_sh">Serbokroatisches Wiki</string>
+	<string name="poi_wiki_lang_ta">Tamilisches Wiki</string>
+	<string name="poi_wiki_lang_kk">Kasachisches Wiki</string>
+	<string name="poi_wiki_lang_uz">Usbekische Wiki</string>
+	<string name="poi_wiki_lang_ce">Tschetschenisches Wiki</string>
+	<string name="poi_wiki_lang_ur">Urduisches Wiki</string>
+	<string name="poi_wiki_lang_oc">Okzitanisch Wiki</string>
+	<string name="poi_wiki_lang_jv">Javanisches Wiki</string>
+	<string name="poi_wiki_lang_zhyue">Kantonesisches Wiki</string>
+	<string name="poi_wiki_lang_ast">Astur-leonisches Wiki</string>
+	<string name="poi_wiki_lang_lmo">Lombardisches Wiki</string>
+	<string name="poi_wiki_lang_ne">Nepalisches Wiki</string>
+	<string name="poi_wiki_lang_scn">sizilianisches Wiki</string>
+	<string name="poi_wiki_lang_bar">Bayrisches Wiki</string>
+	<string name="poi_wiki_lang_mn">Mongolisches Wiki</string>
+	<string name="poi_wiki_lang_nap">Neapolitanisches Wiki</string>
+
+	<string name="poi_fireworks">Feuerwerksladen</string>
+
+	<string name="poi_denomination_shaktism">Shaktismus</string>
+	<string name="poi_denomination_maronite">Maroniten</string>
+	<string name="poi_bicycle_parking_rack">Gestell</string>
+	<string name="poi_bicycle_parking_building">Spezialgebäude</string>
+	<string name="poi_bicycle_parking_shed">Schuppen</string>
+	<string name="poi_bicycle_parking_bollard">Poller</string>
+	<string name="poi_bicycle_parking_informal">Informell</string>
+
+	<string name="poi_taxon">Taxon</string>
+
+	<string name="poi_urban">Städtisch</string>
+	<string name="poi_pump_powered">Angetriebene Pumpe</string>
+	<string name="poi_water_characteristic_mineral">Wassercharakteristik: mineralisch</string>
+	<string name="poi_water_characteristic_mud">Wassercharakteristik: schlammig</string>
+	<string name="poi_water_characteristic_sulfuric">Wassercharakteristik: schwefelig</string>
+
+	<string name="poi_water_point">Wasseranschluss</string>
+
+	<string name="poi_payment_electronic_purses_no">Elektrische Zahlungsmittel nicht akzeptiert</string>
+	<string name="poi_resource_ruby">Rubin</string>
+	<string name="poi_resource_rutile">Rutil</string>
+	<string name="poi_resource_slate_iron_ore_copper">Schiefer; Eisenerz; Kupfer</string>
+	<string name="poi_resource_slate">Schiefer</string>
+	<string name="poi_resource_tin">Zinn</string>
+	<string name="poi_resource_tuff">Tuff</string>
+	<string name="poi_resource_uranium">Uran</string>
+	<string name="poi_resource_vanadium">Vanadium</string>
+	<string name="poi_resource_zinc">Zink</string>
+	<string name="poi_resource_zircon">Zirkon</string>
+
+	<string name="poi_wetland_wet_meadow">Feuchtwiese</string>
+	<string name="poi_wetland_bog">Moor</string>
+	<string name="poi_wetland_marsh">Sumpf</string>
+	<string name="poi_wetland_reedbed">Schilf</string>
+	<string name="poi_recycling_hardcore">(Bau)Schutt</string>
+	<string name="poi_brownfield">Bauland</string>
+	<string name="poi_religion_unitarian_universalist">Unitarischer Universalismus</string>
+	<string name="poi_religion_multifaith">Mehrfachgläubig</string>
+	<string name="poi_religion_scientologist">Scientology</string>
+	<string name="poi_denomination_uniting">Vereinigung</string>
+	<string name="poi_denomination_congregational">Congregational</string>
+	<string name="poi_denomination_ethiopian_orthodox_tewahedo">Äthiopisch-orthodoxe tewahedo-Kirche</string>
+	<string name="poi_denomination_unitarian">Unitarisch</string>
+	<string name="poi_denomination_wesleyan">Wesleyan</string>
+	<string name="poi_denomination_shingon_shu">Schule des wahren Wortes</string>
+	<string name="poi_denomination_mahayana">Mahayana</string>
+
+	<string name="poi_jersey_barrier">Jersey Barriere</string>
+	<string name="poi_leaf_type_needleleaved">Nadelwald</string>
+	<string name="poi_cuisine">Küche</string>
+
+	<string name="poi_information_guidepost">Wegweiser</string>
+	<string name="poi_information_trail_blaze">Wegmarkierung</string>
+	<string name="poi_information_terminal">Informationsterminal</string>
+	<string name="poi_information_tactile_model">Tastbares Modell</string>
+	<string name="poi_information_tactile_map">Tastbare Karte</string>
+	<string name="poi_retail">Einzelhandelgebiet</string>
+
+	<string name="poi_smoking_isolated">Rauchen nur in einem separaten Raum erlaubt</string>
+	<string name="poi_smoking_dedicated">Nur für Raucher</string>
+
+	<string name="poi_toll_yes">Maut</string>
+	<string name="poi_toll_no">keine Maut</string>
+	<string name="poi_toll_hgv_yes">LKW Maut</string>
+	<string name="poi_tactile_paving_yes">Mit Blindenleitsystem</string>
+	<string name="poi_tactile_paving_no">Ohne Blindenleitsystem</string>
+	<string name="poi_traffic_signals_sound_walk">Ton signalisiert sicheres weitergehen</string>
+
+	<string name="poi_services">Raststätte</string>
+	<string name="poi_railway_level_crossing">Bahnübergang</string>
+	<string name="poi_horse_riding">Reiten</string>
+	<string name="poi_leisure_common">allgemeiner Freizeitbereich</string>
+	<string name="poi_farmland">Ackerland</string>
+	<string name="poi_passing_place">Ausweichstelle</string>
+	<string name="poi_piste_difficulty_intermediate">Pistenschwierigkeitsgrad: mittel</string>
+	<string name="poi_piste_difficulty_novice">Pistenschwierigkeitsgrad: Anfänger</string>
+	<string name="poi_piste_difficulty_freeride">Pistenschwierigkeit: Freeride</string>
+	<string name="poi_piste_grooming_classic">Pistenbeschaffenheit: klassische</string>
+	<string name="poi_piste_grooming_classic_skating">Pistenbeschaffenheit: klassisch und skating</string>
+	<string name="poi_piste_grooming_backcountry">Pistenbeschaffenheit: backcountry</string>
+	<string name="poi_piste_grooming_scooter">Pistenbeschaffenheit: Roller</string>
+	<string name="poi_piste_grooming_skating">Pistenbeschaffenheit: skating</string>
+	<string name="poi_piste_grooming_no">Pistenbeschaffenheit: nein</string>
+	<string name="poi_piste_grooming_mogul">Pistenbeschaffenheit: Mogul</string>
+
+	<string name="poi_garden_type_residential">Garten-Typ: Wohngebiet</string>
+	<string name="poi_garden_type_community">Garten-Typ: Gemeinschaft</string>
+	<string name="poi_garden_type_private">Garten-Typ: privat</string>
+	<string name="poi_garden_type_botanical">Garten-Typ: botanisch</string>
+
+	<string name="poi_garden_style_kitchen">Garten-Typ: Küche</string>
+	<string name="poi_garden_style_rosarium">Garten-Typ: Rosengarten</string>
+	<string name="poi_garden_style_french">Garten-Typ: französisch</string>
+	<string name="poi_love_hotel">Liebeshotel</string>
+
+	<string name="poi_payment_electronic_purses_yes">Elektronische Geldbörsen akzeptiert</string>
+	<string name="poi_payment_uta_yes">UTA Karten akzeptiert</string>
+	<string name="poi_payment_uta_no">UTA Karten nicht akzeptiert</string>
+	<string name="poi_payment_efectivo_yes">Nachnahme akzeptiert</string>
+	<string name="poi_payment_efectivo_no">Nachnahme nicht akzeptiert</string>
+	<string name="poi_payment_girocard_yes">Girokarte akzeptiert</string>
+	<string name="poi_payment_girocard_no">Girokarte nicht akzeptiert</string>
+	<string name="poi_payment_discover_card_yes">Discover Karte akzeptiert</string>
+	<string name="poi_payment_discover_card_no">Discover Karte nicht akzeptiert</string>
+	<string name="poi_brushless_yes">Bürstenlos</string>
+	<string name="poi_parish">Gemeindebüro</string>
 	</resources>
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
 	<string name="regions">Regionen</string>
 	<string name="region_maps">Regionsweite Karten</string>
@ -80,7 +80,7 @@
 	<string name="context_menu_item_destination_point">Als Ziel wählen</string>
 	<string name="layer_hillshade">Relief Overlay</string>
 	
-	<string name="download_hillshade_maps">Relief-Overlays</string>
+	<string name="download_hillshade_maps">Reliefkarte</string>
 	
 	<string name="rendering_attr_noAdminboundaries_name">Grenzen ausblenden</string>
 	<string name="rendering_attr_noAdminboundaries_description">Unterdrückt die Anzeige regionaler Grenzverläufe</string>
@ -1006,7 +1006,7 @@
 	<string name="select_animate_speedup">Geschwindigkeit für Routen-Simulation wählen</string>
 	<string name="osmand_parking_hours">Stunde(n)</string>
 	<string name="osmand_parking_minutes">Minuten</string>
-	<string name="osmand_parking_position_description_add_time">Das Auto wurde hier geparkt:</string>
+	<string name="osmand_parking_position_description_add_time">Das Auto wurde geparkt um</string>
 	<string name="route_updated_loc_found">Route wird neu berechnet sobald Standort ermittelt</string>
 	<string name="continue_follow_previous_route_auto">Vorherige Navigation wurde nicht beendet. Der Route weiter folgen? (%1$s Sekunden)</string>

@ -1956,6 +1956,9 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
    <string name="shared_string_wikipedia">Wikipedia</string>
    <string name="local_indexes_cat_wiki">Wikipedia</string>
    <string name="shared_string_show_details">Details anzeigen</string>
+    <string name="routing_attr_avoid_stairs_name">Treppen vermeiden</string>
+    <string name="routing_attr_avoid_stairs_description">Treppen vermeiden</string>
+    <string name="routing_attr_avoid_borders_name">Grenzübertritt vermeiden</string>
    <string name="routing_attr_avoid_borders_description">Überqueren einer Staatsgrenze vermeiden</string>
 	<string name="routing_attr_height_description">Höhe des Fahrzeugs für Streckenberechnung angeben</string>
    <string name="download_wikipedia_maps">Wikipedia</string>
@ -2139,8 +2142,8 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
    <string name="contact_us">Kontakt</string>
    <string name="map_legend">Kartenlegende</string>
    <string name="access_from_map_description">Menü-Knopf zeigt Dashboard, nicht Menü</string>
-    <string name="show_on_start_description">\"Aus\" startet direkt die Kartenansicht.</string>
-    <string name="copied_to_clipboard">in die Zwischenablage kopiert</string>
+    <string name="show_on_start_description">\"Aus\" startet direkt die Kartenansicht</string>
+    <string name="copied_to_clipboard">In die Zwischenablage kopiert</string>
    <string name="release_2_2">" • Neue Kontext-bezogene Benutzeroberfläche bei Auswahl von Orten auf der Karte und anderen Ansichten\n\n • Kartenansicht wird nun direkt gestartet, außer bei Auswahl von \'Zeige Dashboard bei App-Start\'\n\n • Auswahl der anzuzeigenden Elemente im Dashboard möglich\n\n • Dashboard kann umgangen werden, falls menü-basierte App-Steuerung gewünscht ist\n\n • Zum Herunterladen von Kartendateien können nun Regionen direkt durch Tippen auf der Weltkarte ausgewählt werden\n\n • Die POI-Suche ermöglicht nun speziellere Abfragen\n\n • Verbesserungen beim Editieren von POI- und OSM-Objekten\n\n • Oberfläche und Struktur zum Herunterladen der Karten wurden überarbeitet\n\n und mehr ... "</string>
    <string name="osm_save_offline">offline speichern</string>
    <string name="osm_edit_modified_poi">geänderter OSM-POI</string>
@ -2161,7 +2164,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
 	<string name="osn_close_dialog_error">Fehler aufgetreten: Notiz wurde nicht geschlossen</string>
 	<string name="context_menu_item_delete_waypoint">GPX-Wegpunkt löschen?</string>
    <string name="context_menu_item_edit_waypoint">GPX-Wegpunkt bearbeiten</string>
-    <string name="lang_fy">Friesisch</string>
+    <string name="lang_fy">Westfriesisch</string>
    <string name="lang_als">Albanisch (Tosk)</string>
    <string name="poi_dialog_reopen">Wieder öffnen</string>
 	<string name="tab_title_basic">Basis</string>
@ -2176,7 +2179,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
    <string name="activate_srtm_plugin">Bitte das SRTM-Plugin aktivieren</string>
    <string name="get_full_version">Vollversion</string>
    <string name="confirm_download_roadmaps">Soll wirklich die reine Straßenkarte heruntergeladen werden, obwohl bereits die vollständige Standardkarte vorhanden ist?</string>
-    <string name="value_downloaded_from_max">%1$.1f von %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f von %2$.1f MB</string>
    <string name="update_all">Alles aktualisieren (%1$s MB)</string>
    <string name="free_downloads_used">Verbrauchte freie Downloads</string>
    <string name="enter_country_name">Name des Landes eingeben</string>
@ -2190,4 +2193,14 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
    <string name="favorite_category_add_new">neu erstellen</string>
    <string name="next_proceed">Weiter</string>
 	<string name="file_size_in_mb">%.1f MB</string>
+    <string name="please_specify_poi_type_only_from_list">"Bitte eine gültige POI-Art auswählen oder überspringen. "</string>
+    <string name="share_osm_edits_subject">OSM Bearbeitung mit OsmAnd geteilt</string>
+    <string name="av_locations_descr">GPX Datei mit Audio/Video-Daten</string>
+    <string name="free_downloads_used_description">Anzeige der genutzten freien Downloads</string>
+
+    <string name="shared_string_location">Position</string>
+    <string name="hillshade_layer_disabled">Relief deaktiviert</string>
+    <string name="shared_string_commit">Freigeben</string>
+	
+    <string name="av_locations">Positionen</string>
    </resources>
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@ -97,7 +97,7 @@
 	<string name="poi_hearing_aids">Audífonos</string>
 	<string name="poi_herbalist">Herboristería</string>
 	<string name="poi_hifi">Equipos de audio</string>
-	<string name="poi_houseware">Artículos del hogar</string>
+	<string name="poi_houseware">Bazar del hogar</string>
 	<string name="poi_hunting">Equipo de caza</string>
 	<string name="poi_interior_decoration">Decoración de interiores</string>
 	<string name="poi_jewelry">Joyería</string>
@ -151,7 +151,7 @@
 	<string name="poi_emergency_access_point">Punto de acceso de emergencia</string>

 	<string name="poi_ford">Vado</string>
-	<string name="poi_mountain_pass_yes">Paso de montaña</string>
+	<string name="poi_mountain_pass">Paso de montaña</string>
 	<string name="poi_gate">Portón</string>
 	<string name="poi_city_wall">Muralla de la ciudad</string>
 	<string name="poi_lift_gate">Barrera levadiza</string>
@ -780,54 +780,54 @@
 	<string name="poi_military_naval_base">Base naval militar</string>
 	<string name="poi_military_nuclear_explosion_site">Sitio de explosión nuclear</string>
 <string name="poi_wiki_place">Wikipedia</string>
-	<string name="poi_wiki_lang_en">Wikipedia inglesa</string>
-	<string name="poi_wiki_lang_ar">Wikipedia árabe</string>
-	<string name="poi_wiki_lang_be">Wikipedia bielorrusa</string>
-	<string name="poi_wiki_lang_bg">Wikipedia búlgara</string>
-	<string name="poi_wiki_lang_ca">Wikipedia catalán</string>
-	<string name="poi_wiki_lang_ceb">Wikipedia cebuana</string>
-	<string name="poi_wiki_lang_cs">Wikipedia checa</string>
-	<string name="poi_wiki_lang_da">Wikipedia danés</string>
-	<string name="poi_wiki_lang_de">Wikipedia alemán</string>
-	<string name="poi_wiki_lang_el">Wikipedia griega</string>
-	<string name="poi_wiki_lang_et">Wikipedia estoniana</string>
-	<string name="poi_wiki_lang_es">Wikipedia español</string>
-	<string name="poi_wiki_lang_fi">Wikipedia finlandesa</string>
-	<string name="poi_wiki_lang_fr">Wikipedia francesa</string>
-	<string name="poi_wiki_lang_gl">Wikipedia gallega</string>
-	<string name="poi_wiki_lang_he">Wikipedia hebrea</string>
-	<string name="poi_wiki_lang_hi">Wikipedia hindú</string>
-	<string name="poi_wiki_lang_hr">Wikipedia croata</string>
-	<string name="poi_wiki_lang_ht">Wikipedia haitiana</string>
-	<string name="poi_wiki_lang_hu">Wikipedia húngara</string>
-	<string name="poi_wiki_lang_id">Wikipedia indonesa</string>
-	<string name="poi_wiki_lang_it">Wikipedia italiana</string>
-	<string name="poi_wiki_lang_ja">Wikipedia japonesa</string>
-	<string name="poi_wiki_lang_ko">Wikipedia coreana</string>
-	<string name="poi_wiki_lang_lt">Wikipedia lituana</string>
-	<string name="poi_wiki_lang_ms">Wikipedia malaya</string>
-	<string name="poi_wiki_lang_new">Wikipedia newar</string>
-	<string name="poi_wiki_lang_nl">Wikipedia holandesa</string>
-	<string name="poi_wiki_lang_no">Wikipedia noruega</string>
-	<string name="poi_wiki_lang_pl">Wikipedia polaca</string>
-	<string name="poi_wiki_lang_pt">Wikipedia portuguesa</string>
-	<string name="poi_wiki_lang_ro">Wikipedia rumana</string>
-	<string name="poi_wiki_lang_ru">Wikipedia rusa</string>
-	<string name="poi_wiki_lang_sk">Wikipedia eslovaca</string>
-	<string name="poi_wiki_lang_sl">Wikipedia eslovena</string>
-	<string name="poi_wiki_lang_sr">Wikipedia serbia</string>
-	<string name="poi_wiki_lang_sv">Wikipedia suiza</string>
-	<string name="poi_wiki_lang_tr">Wikipedia turca</string>
-	<string name="poi_wiki_lang_th">Wikipedia tailandesa</string>
-	<string name="poi_wiki_lang_uk">Wikipedia ucraniana</string>
-	<string name="poi_wiki_lang_vi">Wikipedia vietnamita</string>
-	<string name="poi_wiki_lang_zh">Wikipedia china</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_ceb">Wiki en cebuano</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 estoniano</string>
+	<string name="poi_wiki_lang_es">Wiki en español</string>
+	<string name="poi_wiki_lang_fi">Wiki en finlandé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 hindú</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_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_ms">Wiki en malayo</string>
+	<string name="poi_wiki_lang_new">Wiki en newar</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 suizo</string>
+	<string name="poi_wiki_lang_tr">Wiki en turco</string>
+	<string name="poi_wiki_lang_th">Wiki en tailandés</string>
+	<string name="poi_wiki_lang_uk">Wiki en ucraniano</string>
+	<string name="poi_wiki_lang_vi">Wiki en vietnamita</string>
+	<string name="poi_wiki_lang_zh">Wiki en chino</string>

-<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 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_wiki_lang_lv">Wiki en letón</string>
+	<string name="poi_wiki_lang_nn">Wiki en Noruego (Nynorsk)</string>
+	<string name="poi_wiki_lang_sw">Wiki en Suajili</string>
+	<string name="poi_wiki_lang_te">Wiki en Télugu</string>
+	<string name="poi_wiki_lang_vo">Wiki en Volapük</string>
 	<string name="poi_camera">Cámaras y lentes</string>
 	<string name="poi_religious">Área religiosa</string>
 	<string name="poi_bollard">Bolardo</string>
@ -1293,7 +1293,7 @@
 	<string name="poi_fireplace_no">Sin chimenea</string>

 	<string name="poi_covered_yes">Cubierto</string>
-	<string name="poi_covered_no">Sin cobertura</string>
+	<string name="poi_covered_no">Descubierto</string>

 	<string name="poi_smoking_no">No fumar</string>
 	<string name="poi_smoking_outside">Permitido fumar afuera</string>
@ -1347,7 +1347,7 @@
 	<string name="poi_windfall">Fruto caído</string>
 	<string name="poi_rtsa_scale">Escala RTSA</string>

-<string name="poi_pump">Bomba</string>
+<string name="poi_pump_yes">Bomba</string>

 	<string name="poi_piste_difficulty_easy">Dificultad de la pista: Fácil</string>
 	<string name="poi_piste_difficulty_intermediate">Dificultad de la pista: Intermedia</string>
@ -2025,8 +2025,8 @@
 	<string name="poi_wetland_palsa_bog">Palsa (humedal)</string>
 	<string name="poi_fuel_91ul">91UL (sin plomo, para aviones)</string>
 	<string name="poi_fuel_100ll">100LL (con plomo, para aviones)</string>
-	<string name="poi_autogas">Autogas (Etanol libre de plomo)</string>
-	<string name="poi_jeta1">Jet A-1 (diésel)</string>
+	<string name="poi_fuel_autogas">Autogas (Etanol libre de plomo)</string>
+	<string name="poi_fuel_jeta1">Jet A-1 (diésel)</string>
 	<string name="poi_fuel_adblue">AdBlue</string>

 	<string name="poi_fuel_wood">Combustible: Madera</string>
@ -2400,7 +2400,7 @@
 	<string name="poi_bathing_no">Prohibido bañarse</string>

 <string name="poi_traffic_calming_island">Mediana (tráfico)</string>
-	<string name="poi_boat_storage">Almacén de botes (marina)</string>
+	<string name="poi_boat_storage">Guardería náutica</string>


 <string name="poi_conveying_yes">Transportadora: Si</string>
@ -2420,70 +2420,74 @@

 	<string name="poi_hackerspace">Encuentro de hackers</string>

-<string name="poi_wiki_lang_af">Wiki Afrikáans</string>
-	<string name="poi_wiki_lang_als">Wiki alsaciana</string>
-	<string name="poi_wiki_lang_az">Wiki azerí</string>
-	<string name="poi_wiki_lang_bn">Wiki bengalí</string>
-	<string name="poi_wiki_lang_bpy">Wiki bishnupriya</string>
-	<string name="poi_wiki_lang_br">Wiki bretona</string>
-	<string name="poi_wiki_lang_bs">Wiki bosnia</string>
-	<string name="poi_wiki_lang_cy">Wiki galés</string>
-	<string name="poi_wiki_lang_eo">Wiki esperanto</string>
-	<string name="poi_wiki_lang_eu">Wiki vasca</string>
-	<string name="poi_wiki_lang_fa">Wiki persa</string>
-	<string name="poi_wiki_lang_fy">Wiki frisona</string>
-	<string name="poi_wiki_lang_ga">Wiki irlandesa</string>
-	<string name="poi_wiki_lang_hy">Wiki armenia</string>
-	<string name="poi_wiki_lang_is">Wiki islandesa</string>
-	<string name="poi_wiki_lang_ka">Wiki georgiana</string>
-	<string name="poi_wiki_lang_ku">Wiki kurda</string>
-	<string name="poi_wiki_lang_la">Wiki latina</string>
-	<string name="poi_wiki_lang_lb">Wiki luxemburguesa</string>
-	<string name="poi_wiki_lang_mk">Wiki macedonia</string>
-	<string name="poi_wiki_lang_ml">Wiki malabari</string>
-	<string name="poi_wiki_lang_mr">Wiki maratí</string>
-	<string name="poi_wiki_lang_nds">Wiki baja sajona</string>
-	<string name="poi_wiki_lang_nv">Wiki navaja</string>
-	<string name="poi_wiki_lang_os">Wiki osetiana</string>
-	<string name="poi_wiki_lang_pms">Wiki piamontesa</string>
-	<string name="poi_wiki_lang_sc">Wiki sarda</string>
-	<string name="poi_wiki_lang_sh">Wiki serbio-croata</string>
-	<string name="poi_wiki_lang_sq">Wiki albana</string>
-	<string name="poi_wiki_lang_ta">Wiki tamilesa</string>
-	<string name="poi_wiki_lang_tl">Wiki filipina</string>
+<string name="poi_wiki_lang_af">Wiki en Afrikáans</string>
+	<string name="poi_wiki_lang_als">Wiki en alsaciano</string>
+	<string name="poi_wiki_lang_az">Wiki en azerí</string>
+	<string name="poi_wiki_lang_bn">Wiki en bengalí</string>
+	<string name="poi_wiki_lang_bpy">Wiki en bishnupriya</string>
+	<string name="poi_wiki_lang_br">Wiki en bretón</string>
+	<string name="poi_wiki_lang_bs">Wiki en bosnio</string>
+	<string name="poi_wiki_lang_cy">Wiki en galés</string>
+	<string name="poi_wiki_lang_eo">Wiki en esperanto</string>
+	<string name="poi_wiki_lang_eu">Wiki en vasco</string>
+	<string name="poi_wiki_lang_fa">Wiki en persa</string>
+	<string name="poi_wiki_lang_fy">Wiki en frisón</string>
+	<string name="poi_wiki_lang_ga">Wiki en irlandés</string>
+	<string name="poi_wiki_lang_hy">Wiki en armenio</string>
+	<string name="poi_wiki_lang_is">Wiki en islandés</string>
+	<string name="poi_wiki_lang_ka">Wiki en georgiano</string>
+	<string name="poi_wiki_lang_ku">Wiki en kurdo</string>
+	<string name="poi_wiki_lang_la">Wiki en latín</string>
+	<string name="poi_wiki_lang_lb">Wiki en luxemburgués</string>
+	<string name="poi_wiki_lang_mk">Wiki en macedonio</string>
+	<string name="poi_wiki_lang_ml">Wiki en malabari</string>
+	<string name="poi_wiki_lang_mr">Wiki en maratí</string>
+	<string name="poi_wiki_lang_nds">Wiki en bajo sajón</string>
+	<string name="poi_wiki_lang_nv">Wiki en navajo</string>
+	<string name="poi_wiki_lang_os">Wiki en osetiano</string>
+	<string name="poi_wiki_lang_pms">Wiki en piamontés</string>
+	<string name="poi_wiki_lang_sc">Wiki en sardo</string>
+	<string name="poi_wiki_lang_sh">Wiki en serbio-croata</string>
+	<string name="poi_wiki_lang_sq">Wiki en albanés</string>
+	<string name="poi_wiki_lang_ta">Wiki en tamilés</string>
+	<string name="poi_wiki_lang_tl">Wiki en filipino</string>

-	<string name="poi_wiki_lang_war">Wiki samareña</string>
-	<string name="poi_wiki_lang_min">Wiki minangkabau</string>
-	<string name="poi_wiki_lang_kk">Wiki kazaja</string>
-	<string name="poi_wiki_lang_uz">Wiki uzbeka</string>
-	<string name="poi_wiki_lang_ce">Wiki chechena</string>
-	<string name="poi_wiki_lang_ur">Wiki urdu</string>
-	<string name="poi_wiki_lang_oc">Wiki occitana</string>
-	<string name="poi_wiki_lang_zhminnan">Wiki Min del sur</string>
-	<string name="poi_wiki_lang_mg">Wiki malagache</string>
-	<string name="poi_wiki_lang_tt">Wiki tártara</string>
-	<string name="poi_wiki_lang_jv">Wiki javanesa</string>
-	<string name="poi_wiki_lang_ky">Wiki kirguistán</string>
-	<string name="poi_wiki_lang_zhyue">Wiki cantonesa</string>
-	<string name="poi_wiki_lang_ast">Wiki Astur-Leonesa</string>
-	<string name="poi_wiki_lang_tg">Wiki tajik</string>
-	<string name="poi_wiki_lang_ba">Wiki baskir</string>
-	<string name="poi_wiki_lang_sco">Wiki escocesa</string>
-	<string name="poi_wiki_lang_pnb">Wiki punyabí</string>
-	<string name="poi_wiki_lang_cv">Wiki Chuvasia</string>
-	<string name="poi_wiki_lang_lmo">Wiki lombard</string>
-	<string name="poi_wiki_lang_my">Wiki birmana</string>
-	<string name="poi_wiki_lang_yo">Wiki yoruba</string>
-	<string name="poi_wiki_lang_an">Wiki aragonesa</string>
-	<string name="poi_wiki_lang_ne">Wiki nepalí</string>
-	<string name="poi_wiki_lang_gu">Wiki guyaratí</string>
-	<string name="poi_wiki_lang_scn">Wiki siciliana</string>
-	<string name="poi_wiki_lang_bar">Wiki bávara</string>
-	<string name="poi_wiki_lang_mn">Wiki mongol</string>
-	<string name="poi_wiki_lang_nap">Wiki napolitana</string>
+	<string name="poi_wiki_lang_war">Wiki en samareño</string>
+	<string name="poi_wiki_lang_min">Wiki en minangkabau</string>
+	<string name="poi_wiki_lang_kk">Wiki en kazajo</string>
+	<string name="poi_wiki_lang_uz">Wiki en uzbeko</string>
+	<string name="poi_wiki_lang_ce">Wiki en checheno</string>
+	<string name="poi_wiki_lang_ur">Wiki en urdu</string>
+	<string name="poi_wiki_lang_oc">Wiki en occitano</string>
+	<string name="poi_wiki_lang_zhminnan">Wiki en Min del sur</string>
+	<string name="poi_wiki_lang_mg">Wiki en malagache</string>
+	<string name="poi_wiki_lang_tt">Wiki en tártaro</string>
+	<string name="poi_wiki_lang_jv">Wiki en javanés</string>
+	<string name="poi_wiki_lang_ky">Wiki en kirguistanés</string>
+	<string name="poi_wiki_lang_zhyue">Wiki en cantonés</string>
+	<string name="poi_wiki_lang_ast">Wiki en Astur-Leonesa</string>
+	<string name="poi_wiki_lang_tg">Wiki en tajik</string>
+	<string name="poi_wiki_lang_ba">Wiki en baskir</string>
+	<string name="poi_wiki_lang_sco">Wiki en escocés</string>
+	<string name="poi_wiki_lang_pnb">Wiki en punyabí</string>
+	<string name="poi_wiki_lang_cv">Wiki en chuvasio</string>
+	<string name="poi_wiki_lang_lmo">Wiki en lombard</string>
+	<string name="poi_wiki_lang_my">Wiki en birmano</string>
+	<string name="poi_wiki_lang_yo">Wiki en yoruba</string>
+	<string name="poi_wiki_lang_an">Wiki en aragonés</string>
+	<string name="poi_wiki_lang_ne">Wiki en nepalí</string>
+	<string name="poi_wiki_lang_gu">Wiki en guyaratí</string>
+	<string name="poi_wiki_lang_scn">Wiki en siciliano</string>
+	<string name="poi_wiki_lang_bar">Wiki en bávaro</string>
+	<string name="poi_wiki_lang_mn">Wiki en mongól</string>
+	<string name="poi_wiki_lang_nap">Wiki en napolitano</string>

 	<string name="poi_craft_electronics">Reparación de electrodomésticos</string>

 <string name="poi_fireworks">Artificios pirotécnicos</string>

-</resources>
+<string name="poi_aerialway_length">Longitud</string>
+
+<string name="poi_internet_access_type_yes">Con acceso a Internet</string>
+
+	</resources>
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@ -19,7 +19,7 @@
    <string name="shared_string_manage">Gestionar</string>
    <string name="shared_string_edit">Editar</string>
    <string name="shared_string_search">Buscar</string>
-    <string name="shared_string_show_description">Mostrar descripción</string>
+    <string name="shared_string_show_description">Mostrar información</string>
    <string name="shared_string_message">Mensaje</string>
    <string name="agps_data_last_downloaded">Últimos datos A-GPS descargados: %1$s</string>
    <string name="confirm_usage_speed_cameras">En muchos países (Alemania, Francia, Italia y otros) el uso de avisos de radares no está permitido por la ley. OsmAnd no asume ninguna responsabilidad si usted viola la ley. Haga clic en si, sólo si es elegible para utilizar esta función.</string>
@ -51,7 +51,7 @@
    <string name="your_edits">Sus ediciones</string>
    <string name="waypoint_visit_after">Visitar luego</string>
    <string name="waypoint_visit_before">Visitar antes</string>
-    <string name="simulate_your_location">Simule su ubicación</string>
+    <string name="simulate_your_location">Simular su ubicación</string>
    <string name="short_location_on_map">Lat %1$s\nLon %2$s</string>
    <string name="tips_and_tricks_descr">Preguntas frecuentes, cambios recientes y otros</string>
    <string name="routing_settings_2">Ajustes de navegación</string>
@ -1858,7 +1858,7 @@
    <string name="are_you_sure">¿Está seguro?</string>
    <string name="unsaved_changes_will_be_lost">Se perderán los cambios no guardados. ¿Continuar?</string>
    <string name="simulate_your_location_stop_descr">Parar simulación de ubicación</string>
-    <string name="simulate_your_location_descr">Simular usando una ruta calculada o una grabación GPX</string>
+    <string name="simulate_your_location_descr">Simular ubicación, usando una ruta calculada o una grabación GPX</string>
    <string name="downloads_left_template">Quedan %1$s descargas</string>
    <string name="shared_string_trip_recording">Grabación de viaje</string>
    <string name="shared_string_navigation">Navegación</string>
@ -1899,12 +1899,12 @@
    <string name="favorite_category_dublicate_message">El nombre de categoría, ya existe. Defina otro nombre.</string>
    <string name="favorite_category_name">Nombre de categoría</string>
    <string name="favorite_category_add_new_title">Añadir nueva categoría</string>
-    <string name="confirm_download_roadmaps">¿Desea descargar el mapa vial, aunque tenga el mapa completo?</string>
-    <string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
+    <string name="confirm_download_roadmaps">¿Desea descargar el mapa vial, aunque ya tenga el mapa estándar (completo)?</string>
+    <string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="update_all">Actualizar todo (%1$s MB)</string>
    <string name="free_downloads_used">Descargas gratis usadas</string>
-    <string name="free_downloads_used_description">Configure cuántas descargas gratis usará</string>
+    <string name="free_downloads_used_description">Muestra las descargas gratis utilizadas</string>
    <string name="simulate_initial_startup_descr">Muestra la pantalla del primer arranque y mantiene los demás ajustes sin cambios</string>
    <string name="simulate_initial_startup">Simular el arranque inicial</string>
    <string name="share_geo">geo:</string>
@ -1988,4 +1988,7 @@
    <string name="access_from_map_description">El botón del menú, muestra el panel de control, en lugar del menú</string>
    <string name="access_from_map">Acceso desde el mapa</string>
    <string name="please_specify_poi_type_only_from_list">"Especifique el tipo de PDI correcto u omítelo. "</string>
-    </resources>
+    <string name="routing_attr_avoid_stairs_name">Evitar escaleras</string>
+	<string name="routing_attr_avoid_stairs_description">Evitar pasar por escaleras</string>
+	<string name="routing_attr_avoid_borders_name">Evitar cruces fronterizos</string>
+	</resources>
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@ -4,7 +4,7 @@
 	<string name="poi_emergency">Emergencia</string>
 	<string name="poi_transportation">Transporte</string>
 		<string name="poi_road_obstacle">Obstáculo de carretera</string>
-		<string name="poi_filling_station">Estación de servicio</string>
+		<string name="poi_filling_station">Gasolineras</string>
 		<string name="poi_personal_transport">Transporte personal</string>
 		<string name="poi_public_transport">Transporte público</string>
 		<string name="poi_air_transport">Transporte aéreo</string>
@ -108,7 +108,7 @@
 	<string name="poi_ses_station">Defensa Civil (SES)</string>
 	<string name="poi_emergency_access_point">Punto de acceso de emergencia</string>

-	<string name="poi_mountain_pass_yes">Paso de montaña</string>
+	<string name="poi_mountain_pass">Paso de montaña</string>
 	<string name="poi_gate">Portón</string>
 	<string name="poi_city_wall">Muralla de la ciudad</string>
 	<string name="poi_lift_gate">Barrera levadiza</string>
@ -785,50 +785,50 @@

 	<string name="poi_camera">Cámaras y lentes</string>
 	<string name="poi_wiki_place">Wikipedia</string>
-	<string name="poi_wiki_lang_en">Wikipedia inglesa</string>
-	<string name="poi_wiki_lang_ar">Wikipedia árabe</string>
-	<string name="poi_wiki_lang_be">Wikipedia bielorrusa</string>
-	<string name="poi_wiki_lang_bg">Wikipedia búlgara</string>
-	<string name="poi_wiki_lang_ca">Wikipedia catalán</string>
-	<string name="poi_wiki_lang_cs">Wikipedia checa</string>
-	<string name="poi_wiki_lang_da">Wikipedia danés</string>
-	<string name="poi_wiki_lang_de">Wikipedia alemán</string>
-	<string name="poi_wiki_lang_el">Wikipedia griega</string>
-	<string name="poi_wiki_lang_et">Wikipedia estoniana</string>
-	<string name="poi_wiki_lang_es">Wikipedia español</string>
-	<string name="poi_wiki_lang_fi">Wikipedia finlandesa</string>
-	<string name="poi_wiki_lang_fr">Wikipedia francesa</string>
-	<string name="poi_wiki_lang_gl">Wikipedia gallega</string>
-	<string name="poi_wiki_lang_he">Wikipedia hebrea</string>
-	<string name="poi_wiki_lang_hi">Wikipedia hindú</string>
-	<string name="poi_wiki_lang_hr">Wikipedia croata</string>
-	<string name="poi_wiki_lang_ht">Wikipedia haitiana</string>
-	<string name="poi_wiki_lang_hu">Wikipedia húngara</string>
-	<string name="poi_wiki_lang_id">Wikipedia indonesa</string>
-	<string name="poi_wiki_lang_zh">Wikipedia china</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 estoniano</string>
+	<string name="poi_wiki_lang_es">Wiki en español</string>
+	<string name="poi_wiki_lang_fi">Wiki en finlandé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 hindú</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">Wikipedia cebuana</string>
-	<string name="poi_wiki_lang_it">Wikipedia italiana</string>
-	<string name="poi_wiki_lang_ja">Wikipedia japonesa</string>
-	<string name="poi_wiki_lang_ko">Wikipedia coreana</string>
-	<string name="poi_wiki_lang_lt">Wikipedia lituana</string>
-	<string name="poi_wiki_lang_lv">Wikipedia letona</string>
-	<string name="poi_wiki_lang_ms">Wikipedia malaya</string>
-	<string name="poi_wiki_lang_nl">Wikipedia holandesa</string>
-	<string name="poi_wiki_lang_no">Wikipedia noruega</string>
-	<string name="poi_wiki_lang_pl">Wikipedia polaca</string>
-	<string name="poi_wiki_lang_pt">Wikipedia portuguesa</string>
-	<string name="poi_wiki_lang_ro">Wikipedia rumana</string>
-	<string name="poi_wiki_lang_ru">Wikipedia rusa</string>
-	<string name="poi_wiki_lang_sk">Wikipedia eslovaca</string>
-	<string name="poi_wiki_lang_sl">Wikipedia eslovena</string>
-	<string name="poi_wiki_lang_sr">Wikipedia serbia</string>
-	<string name="poi_wiki_lang_sv">Wikipedia suiza</string>
-	<string name="poi_wiki_lang_sw">Wikipedia Suajili</string>
-	<string name="poi_wiki_lang_th">Wikipedia tailandesa</string>
-	<string name="poi_wiki_lang_tr">Wikipedia turca</string>
-	<string name="poi_wiki_lang_uk">Wikipedia ucraniana</string>
-	<string name="poi_wiki_lang_vi">Wikipedia vietnamita</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 suizo</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 ucraniano</string>
+	<string name="poi_wiki_lang_vi">Wiki en vietnamita</string>
 	<string name="poi_religious">Área religiosa</string>
 	<string name="poi_cheese">Quesería</string>
 	<string name="poi_chocolate">Chocolatería</string>
@ -854,9 +854,9 @@
 	<string name="poi_pyrotechnics">Pirotecnia</string>
 	<string name="poi_weapons">Armería</string>

-	<string name="poi_wiki_lang_new">Wikipedia newar</string>
-	<string name="poi_wiki_lang_te">Wikipedia Télugu</string>
-	<string name="poi_wiki_lang_vo">Wikipedia Volapük</string>
+	<string name="poi_wiki_lang_new">Wiki en newar</string>
+	<string name="poi_wiki_lang_te">Wiki en Télugu</string>
+	<string name="poi_wiki_lang_vo">Wiki en Volapük</string>
 	<string name="poi_bollard">Bolardo</string>
 	<string name="poi_cycle_barrier">Barrera para bicicletas</string>
 	<string name="poi_motorcycle_barrier">Barrera para motocicletas</string>
@ -877,7 +877,7 @@

 	<string name="poi_highway_crossing">Cruce peatonal</string>

-<string name="poi_wiki_lang_nn">Wikipedia Noruega (Nynorsk)</string>
+<string name="poi_wiki_lang_nn">Wiki en Noruego (Nynorsk)</string>
 	<string name="poi_horse_stile">Portilla equina</string>
 	<string name="poi_breakwater">Rompeolas</string>
 	<string name="poi_groyne">Rompeolas</string>
@ -1299,7 +1299,7 @@
 	<string name="poi_fireplace_no">Sin chimenea</string>

 	<string name="poi_covered_yes">Cubierto</string>
-	<string name="poi_covered_no">No cubierto</string>
+	<string name="poi_covered_no">Descubierto</string>

 	<string name="poi_smoking_no">No fumar</string>
 	<string name="poi_smoking_outside">Sólo permitido fumar afuera</string>
@ -1351,7 +1351,7 @@
 	<string name="poi_windfall">Fruto caído</string>
 	<string name="poi_rtsa_scale">Escala RTSA</string>

-<string name="poi_pump">Bomba</string>
+<string name="poi_pump_yes">Bomba</string>

 	<string name="poi_piste_difficulty_easy">Dificultad de la pista: Fácil</string>
 	<string name="poi_piste_difficulty_intermediate">Dificultad de la pista: Intermedia</string>
@ -1934,7 +1934,7 @@
 	<string name="poi_surface_salt">Superficie: Sal</string>
 	<string name="poi_surface_snow">Superficie: Nieve</string>

-	<string name="poi_route_bus_ref">Colectivo</string>
+	<string name="poi_route_bus_ref">Autobús</string>
 	<string name="poi_route_share_taxi_ref">Taxi compartido</string>
 	<string name="poi_route_trolleybus_ref">Trolebús</string>
 	<string name="poi_route_tram_ref">Tranvía</string>
@ -2030,8 +2030,8 @@

 	<string name="poi_fuel_91ul">91UL (sin plomo, para aviones)</string>
 	<string name="poi_fuel_100ll">100LL (con plomo, para aviones)</string>
-	<string name="poi_autogas">Autogas (Etanol libre de plomo)</string>
-	<string name="poi_jeta1">Jet A-1 (diésel)</string>
+	<string name="poi_fuel_autogas">Autogas (Etanol libre de plomo)</string>
+	<string name="poi_fuel_jeta1">Jet A-1 (diésel)</string>
 	<string name="poi_fuel_adblue">AdBlue</string>

 	<string name="poi_fuel_wood">Combustible: Madera</string>
@ -2404,7 +2404,7 @@
 	<string name="poi_bathing_no">Prohibido bañarse</string>

 <string name="poi_traffic_calming_island">Mediana (tráfico)</string>
-	<string name="poi_boat_storage">Almacén de botes</string>
+	<string name="poi_boat_storage">Guardería náutica</string>


 <string name="poi_conveying_yes">Transportadora: Sí</string>
@ -2424,70 +2424,74 @@

 	<string name="poi_hackerspace">Encuentro de hackers</string>

-<string name="poi_wiki_lang_af">Wiki Afrikáans</string>
-	<string name="poi_wiki_lang_als">Wiki alsaciana</string>
-	<string name="poi_wiki_lang_az">Wiki azerí</string>
-	<string name="poi_wiki_lang_bn">Wiki bengalí</string>
-	<string name="poi_wiki_lang_bpy">Wiki bishnupriya</string>
-	<string name="poi_wiki_lang_br">Wiki bretona</string>
-	<string name="poi_wiki_lang_bs">Wiki bosnia</string>
-	<string name="poi_wiki_lang_cy">Wiki galés</string>
-	<string name="poi_wiki_lang_eo">Wiki esperanto</string>
-	<string name="poi_wiki_lang_eu">Wiki vasca</string>
-	<string name="poi_wiki_lang_fa">Wiki persa</string>
-	<string name="poi_wiki_lang_fy">Wiki frisona</string>
-	<string name="poi_wiki_lang_ga">Wiki irlandesa</string>
-	<string name="poi_wiki_lang_hy">Wiki armenia</string>
-	<string name="poi_wiki_lang_is">Wiki islandesa</string>
-	<string name="poi_wiki_lang_ka">Wiki georgiana</string>
-	<string name="poi_wiki_lang_ku">Wiki kurda</string>
-	<string name="poi_wiki_lang_la">Wiki latina</string>
-	<string name="poi_wiki_lang_lb">Wiki luxemburguesa</string>
-	<string name="poi_wiki_lang_mk">Wiki macedonia</string>
-	<string name="poi_wiki_lang_nv">Wiki navaja</string>
-	<string name="poi_wiki_lang_os">Wiki osetiana</string>
-	<string name="poi_wiki_lang_tl">Wiki filipina</string>
+<string name="poi_wiki_lang_af">Wiki en Afrikáans</string>
+	<string name="poi_wiki_lang_als">Wiki en alsaciano</string>
+	<string name="poi_wiki_lang_az">Wiki en azerí</string>
+	<string name="poi_wiki_lang_bn">Wiki en bengalí</string>
+	<string name="poi_wiki_lang_bpy">Wiki en bishnupriya</string>
+	<string name="poi_wiki_lang_br">Wiki en bretón</string>
+	<string name="poi_wiki_lang_bs">Wiki en bosnio</string>
+	<string name="poi_wiki_lang_cy">Wiki en galés</string>
+	<string name="poi_wiki_lang_eo">Wiki en esperanto</string>
+	<string name="poi_wiki_lang_eu">Wiki en vasco</string>
+	<string name="poi_wiki_lang_fa">Wiki en persa</string>
+	<string name="poi_wiki_lang_fy">Wiki en frisón</string>
+	<string name="poi_wiki_lang_ga">Wiki en irlandés</string>
+	<string name="poi_wiki_lang_hy">Wiki en armenio</string>
+	<string name="poi_wiki_lang_is">Wiki en islandés</string>
+	<string name="poi_wiki_lang_ka">Wiki en georgiano</string>
+	<string name="poi_wiki_lang_ku">Wiki en kurdo</string>
+	<string name="poi_wiki_lang_la">Wiki en latín</string>
+	<string name="poi_wiki_lang_lb">Wiki en luxemburgués</string>
+	<string name="poi_wiki_lang_mk">Wiki en macedonio</string>
+	<string name="poi_wiki_lang_nv">Wiki en navajo</string>
+	<string name="poi_wiki_lang_os">Wiki en osetiano</string>
+	<string name="poi_wiki_lang_tl">Wiki en filipino</string>

-<string name="poi_wiki_lang_ta">Wiki tamilesa</string>
-	<string name="poi_wiki_lang_sq">Wiki albana</string>
-	<string name="poi_wiki_lang_sh">Wiki serbio-croata</string>
-	<string name="poi_wiki_lang_sc">Wiki sarda</string>
-	<string name="poi_wiki_lang_pms">Wiki piamontesa</string>
-	<string name="poi_wiki_lang_nds">Wiki baja sajona</string>
-	<string name="poi_wiki_lang_mr">Wiki maratí</string>
-	<string name="poi_wiki_lang_ml">Wiki malabari</string>
-	<string name="poi_wiki_lang_ast">Wiki Astur-Leonesa</string>
-	<string name="poi_wiki_lang_an">Wiki aragonesa</string>
-	<string name="poi_wiki_lang_ne">Wiki nepalí</string>
-	<string name="poi_wiki_lang_war">Wiki samareña</string>
-	<string name="poi_wiki_lang_min">Wiki minangkabau</string>
-	<string name="poi_wiki_lang_kk">Wiki kazaja</string>
-	<string name="poi_wiki_lang_uz">Wiki uzbeka</string>
-	<string name="poi_wiki_lang_ce">Wiki chechena</string>
-	<string name="poi_wiki_lang_ur">Wiki urdu</string>
-	<string name="poi_wiki_lang_oc">Wiki occitana</string>
-	<string name="poi_wiki_lang_mg">Wiki malagache</string>
-	<string name="poi_wiki_lang_tt">Wiki tártara</string>
-	<string name="poi_wiki_lang_jv">Wiki javanesa</string>
-	<string name="poi_wiki_lang_ky">Wiki kirguistán</string>
-	<string name="poi_wiki_lang_zhyue">Wiki cantonesa</string>
-	<string name="poi_wiki_lang_tg">Wiki tajik</string>
-	<string name="poi_wiki_lang_scn">Wiki siciliana</string>
-	<string name="poi_wiki_lang_bar">Wiki bávara</string>
-	<string name="poi_wiki_lang_mn">Wiki mongol</string>
-	<string name="poi_wiki_lang_nap">Wiki napolitana</string>
+<string name="poi_wiki_lang_ta">Wiki en tamilés</string>
+	<string name="poi_wiki_lang_sq">Wiki en albanés</string>
+	<string name="poi_wiki_lang_sh">Wiki en serbio-croata</string>
+	<string name="poi_wiki_lang_sc">Wiki en sardo</string>
+	<string name="poi_wiki_lang_pms">Wiki en piamontés</string>
+	<string name="poi_wiki_lang_nds">Wiki en bajo sajón</string>
+	<string name="poi_wiki_lang_mr">Wiki en maratí</string>
+	<string name="poi_wiki_lang_ml">Wiki en malabari</string>
+	<string name="poi_wiki_lang_ast">Wiki en Astur-Leonesa</string>
+	<string name="poi_wiki_lang_an">Wiki en aragonés</string>
+	<string name="poi_wiki_lang_ne">Wiki en nepalí</string>
+	<string name="poi_wiki_lang_war">Wiki en samareño</string>
+	<string name="poi_wiki_lang_min">Wiki en minangkabau</string>
+	<string name="poi_wiki_lang_kk">Wiki en kazajo</string>
+	<string name="poi_wiki_lang_uz">Wiki en uzbeko</string>
+	<string name="poi_wiki_lang_ce">Wiki en checheno</string>
+	<string name="poi_wiki_lang_ur">Wiki en urdu</string>
+	<string name="poi_wiki_lang_oc">Wiki en occitano</string>
+	<string name="poi_wiki_lang_mg">Wiki en malagache</string>
+	<string name="poi_wiki_lang_tt">Wiki en tártaro</string>
+	<string name="poi_wiki_lang_jv">Wiki en javanés</string>
+	<string name="poi_wiki_lang_ky">Wiki en kirguistanés</string>
+	<string name="poi_wiki_lang_zhyue">Wiki en cantonés</string>
+	<string name="poi_wiki_lang_tg">Wiki en tajik</string>
+	<string name="poi_wiki_lang_scn">Wiki en siciliano</string>
+	<string name="poi_wiki_lang_bar">Wiki en bávaro</string>
+	<string name="poi_wiki_lang_mn">Wiki en mongol</string>
+	<string name="poi_wiki_lang_nap">Wiki en napolitano</string>

-	<string name="poi_craft_electronics">Reparación de electrodomésticos</string>
+	<string name="poi_craft_electronics">Reparación de electrónicos</string>

-<string name="poi_wiki_lang_sco">Wiki escocesa</string>
-	<string name="poi_wiki_lang_pnb">Wiki punyabí</string>
-	<string name="poi_wiki_lang_cv">Wiki Chuvasia</string>
-	<string name="poi_wiki_lang_my">Wiki birmana</string>
-	<string name="poi_wiki_lang_yo">Wiki yoruba</string>
-	<string name="poi_wiki_lang_gu">Wiki guyaratí</string>
-	<string name="poi_wiki_lang_zhminnan">Wiki Min del sur</string>
-	<string name="poi_wiki_lang_ba">Wiki baskir</string>
-	<string name="poi_wiki_lang_lmo">Wiki lombard</string>
+<string name="poi_wiki_lang_sco">Wiki en escocés</string>
+	<string name="poi_wiki_lang_pnb">Wiki en punyabí</string>
+	<string name="poi_wiki_lang_cv">Wiki en chuvasio</string>
+	<string name="poi_wiki_lang_my">Wiki en birmano</string>
+	<string name="poi_wiki_lang_yo">Wiki en yoruba</string>
+	<string name="poi_wiki_lang_gu">Wiki en guyaratí</string>
+	<string name="poi_wiki_lang_zhminnan">Wiki en Min del sur</string>
+	<string name="poi_wiki_lang_ba">Wiki en baskir</string>
+	<string name="poi_wiki_lang_lmo">Wiki en lombard</string>
 	<string name="poi_fireworks">Artificios pirotécnicos</string>

-</resources>
+<string name="poi_aerialway_length">Longitud</string>
+
+<string name="poi_internet_access_type_yes">Con acceso a Internet</string>
+
+	</resources>
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@ -34,7 +34,7 @@
    <string name="show_current_gpx_title">Mostrar traza actual</string>
    <string name="free_version_message">Esta versión libre de OsmAnd está limitada a %1$s descargas y no soporta artículos de Wikipedia sin conexión.</string>
    <string name="free_version_title">Versión libre</string>
-    <string name="poi_context_menu_showdescription">Mostrar descripción</string>
+    <string name="poi_context_menu_showdescription">Ver información del PDI</string>
    <string name="index_name_north_america">Norteamérica</string>
    <string name="index_name_us">Norteamérica - Estados Unidos</string>
    <string name="index_name_central_america">Centroamérica</string>
@ -1183,8 +1183,8 @@
    <string name="auto_zoom_far">Para mediano alcance</string>
    <string name="auto_zoom_farthest">Para largo alcance</string>
    <string name="animate_routing_route_not_calculated">Primero calcule la ruta</string>
-    <string name="animate_routing_route">"Simular utilizando la ruta calculada "</string>
-    <string name="animate_routing_gpx">Simula utilizando traza GPX</string>
+    <string name="animate_routing_route">"Simular, utilizando la ruta calculada "</string>
+    <string name="animate_routing_gpx">Simular utilizando traza GPX</string>
    <string name="app_mode_hiking">Senderismo</string>
    <string name="app_mode_motorcycle">Moto</string>
    <string name="app_mode_boat">Barco</string>
@ -1222,7 +1222,7 @@
    <string name="routing_attr_weight_name">Límite de peso</string>
    <string name="routing_attr_weight_description">Especifique el peso del vehículo permitido en rutas</string>
    <string name="android_19_location_disabled">Desde la versión Android 4.4 (KitKat) no puede descargar ni actualizar los mapas en la carpeta de almacenamiento anterior (%s). ¿Quiere cambiar a la ubicación de almacenamiento permitida y copiar todos los archivos de OsmAnd allí?
-\n Nota 1: Tus archivos antiguos permanecerán intactos (pero pueden ser borrados manualmente).
+\n Nota 1: Sus archivos antiguos permanecerán intactos (pero pueden ser borrados manualmente).
 \n Nota 2: En la nueva ubicación de almacenamiento no será posible compartir archivos entre OsmAnd y OsmAnd+.</string>
    <string name="use_displayed_track_for_navigation">¿Quiere utilizar la traza mostrada para la navegación?</string>
    <string name="keep_and_add_destination_point">Añadir como punto de destino</string>
@ -1250,7 +1250,7 @@
    <string name="lang_ka">Georgiano</string>
    <string name="lang_de">Alemán</string>
    <string name="lang_el">Griego</string>
-    <string name="lang_iw">Hebreo</string>
+    <string name="lang_iw">Hebreo (antiguo)</string>
    <string name="lang_hi">Hindi</string>
    <string name="lang_hu">Húngaro</string>
    <string name="lang_id">Indonesio</string>
@ -1368,7 +1368,7 @@
    <string name="osmo_follow">Seguir</string>
    <string name="osmo_sign_in">Ingresar</string>
    <string name="osmo_create_groups_confirm">Con el fin de crear grupos es necesario ser usuario registrado de OsMo.</string>
-    <string name="osmo_credentials_not_valid">Tus credenciales OsMo no son válidas.</string>
+    <string name="osmo_credentials_not_valid">Sus credenciales OsMo no son válidas.</string>
    <string name="osmo_regenerate_login_ids_confirm">¿Está seguro de regenerar los identificadores personales? Todos los dispositivos conectados a usted no podrán seguirle nunca más.</string>
    <string name="osmo_regenerate_login_ids">Regenerar identificación del usuario</string>
    <string name="osmo_cancel_moving_target">Cancelar el objetivo móvil</string>
@ -1507,8 +1507,8 @@
    <string name="duration">Duración</string>
    <string name="distance">Distancia</string>
    <string name="record_plugin_name">Grabación de viaje</string>
-    <string name="record_plugin_description">"Este complemento activa la funcionalidad para grabar y guardar sus trazas manualmente tocando el control de registro GPX en la pantalla del mapa, o automáticamente registrando todas tus rutas navegadas en un archivo GPX.
-\n\nLas trazas grabadas pueden ser compartidas con tus amigos o ser usadas para contribuir a OSM. Los atletas pueden utilizar las trazas grabadas para seguir sus entrenamientos. Algunos análisis básicos de trazas se pueden realizar directamente en OsmAnd, como tiempos por vuelta, velocidad media, etc., y por supuesto las trazas pueden analizarse posteriormente con herramientas de análisis de terceros. "</string>
+    <string name="record_plugin_description">"Este complemento activa la funcionalidad para grabar y guardar sus trazas manualmente tocando el control de registro GPX en la pantalla del mapa, o automáticamente registrando todas sus rutas navegadas en un archivo GPX.
+\n\nLas trazas grabadas pueden ser compartidas con sus amigos o ser usadas para contribuir a OSM. Los atletas pueden utilizar las trazas grabadas para seguir sus entrenamientos. Algunos análisis básicos de trazas se pueden realizar directamente en OsmAnd, como tiempos por vuelta, velocidad media, etc., y por supuesto las trazas pueden analizarse posteriormente con herramientas de análisis de terceros. "</string>
    <string name="rendering_attr_publicTransportMode_name">Rutas de autobús, trolebús y lanzadera</string>
    <string name="save_track_to_gpx_globally">Registrar traza en archivo GPX</string>
    <string name="save_track_interval_globally">Intervalo de registro</string>
@ -1667,10 +1667,10 @@
    <string name="osmand_parking_minute">min</string>
    <string name="osmand_parking_time_left">restante</string>
    <string name="parking_place_limited">Tiempo de aparcamiento limitado a</string>
-    <string name="your_edits">Tus ediciones</string>
+    <string name="your_edits">Sus ediciones</string>
    <string name="waypoint_visit_after">Visitar después</string>
    <string name="waypoint_visit_before">Visitar antes</string>
-    <string name="simulate_your_location">Simule su ubicación</string>
+    <string name="simulate_your_location">Simular su ubicación</string>
    <string name="drawer">Lista plana</string>
    <string name="short_location_on_map">Lat %1$s\nLon %2$s</string>
    <string name="tips_and_tricks_descr">Preguntas frecuentes, cambios recientes y otros</string>
@ -1706,7 +1706,7 @@
    <string name="agps_data_last_downloaded">Últimos datos A-GPS descargados: %1$s</string>
    <string name="shared_string_do_not_use">No utilizar</string>
    <string name="shared_string_address">Dirección</string>
-    <string name="shared_string_show_description">Mostrar descripción</string>
+    <string name="shared_string_show_description">Mostrar información</string>
    <string name="shared_string_open">Abierto</string>
    <string name="rendering_attr_OSMMapperAssistant_name">Asistente mapeador OSM</string>
    <string name="shared_string_manage">Gestionar</string>
@ -1856,7 +1856,7 @@
    <string name="are_you_sure">¿Está seguro?</string>
    <string name="unsaved_changes_will_be_lost">Se perderán los cambios no guardados. ¿Continuar?</string>
    <string name="simulate_your_location_stop_descr">Parar simulación de posición</string>
-    <string name="simulate_your_location_descr">Simular utilizando una ruta calculada o una grabación GPX</string>
+    <string name="simulate_your_location_descr">Simule su ubicación, utilizando una ruta calculada o una grabación GPX</string>
    <string name="downloads_left_template">Quedan %1$s descargas</string>
    <string name="default_speed_system_descr">Define el sistema de medición de velocidad</string>
    <string name="default_speed_system">Medición de la velocidad</string>
@ -1897,12 +1897,12 @@
    <string name="favorite_category_dublicate_message">El nombre de categoría, ya existe. Defina otro nombre.</string>
    <string name="favorite_category_name">Nombre de categoría</string>
    <string name="favorite_category_add_new_title">Añadir nueva categoría</string>
-    <string name="confirm_download_roadmaps">¿Desea descargar el mapa vial, aunque tenga el mapa completo?</string>
-    <string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
+    <string name="confirm_download_roadmaps">¿Desea descargar el mapa de sólo carreteras, aunque ya tenga el mapa estándar (completo)?</string>
+    <string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="update_all">Actualizar todo (%1$s MB)</string>
    <string name="free_downloads_used">Descargas gratis usadas</string>
-    <string name="free_downloads_used_description">Puedes configurar cuántas descargas gratis ha usado</string>
+    <string name="free_downloads_used_description">Muestra las descargas libres utilizadas</string>
    <string name="simulate_initial_startup_descr">Muestra la pantalla del primer arranque y mantiene los demás ajustes sin cambios</string>
    <string name="simulate_initial_startup">Simular arranque inicial</string>
    <string name="share_geo">geo:</string>
@ -1987,4 +1987,7 @@
    <string name="access_from_map_description">El botón del menú, muestra el panel de control, en lugar del menú</string>
    <string name="access_from_map">Acceso desde el mapa</string>
    <string name="please_specify_poi_type_only_from_list">"Especifique el tipo de PDI correcto u omítelo. "</string>
-    </resources>
+    <string name="routing_attr_avoid_stairs_name">Evitar escaleras</string>
+	<string name="routing_attr_avoid_stairs_description">Evitar pasar por escaleras</string>
+	<string name="routing_attr_avoid_borders_name">Evitar cruces fronterizos</string>
+	</resources>
--- a/OsmAnd/res/values-fa/phrases.xml
+++ b/OsmAnd/res/values-fa/phrases.xml
@ -108,7 +108,7 @@
 <string name="poi_emergency_access_point">نقطه دسترسی اضطراری</string>

 <string name="poi_ford">فورد</string>
-<string name="poi_mountain_pass_yes">ایستگاه کوهستانی</string>
+<string name="poi_mountain_pass">ایستگاه کوهستانی</string>
 <string name="poi_gate">دروازه</string>
 <string name="poi_city_wall">دیوار شهرستان</string>
 <string name="poi_lift_gate">دروازه آسانسور</string>
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@ -474,7 +474,7 @@
 	<string name="poi_tableware">Boutique de vaisselle</string>
 	<string name="poi_ticket">Guichet</string>
 	<string name="poi_vacuum_cleaner">Boutique de gadgets</string>
-	<string name="poi_mountain_pass_yes">Col</string>
+	<string name="poi_mountain_pass">Col</string>
 	<string name="poi_garages">Garages</string>

 	<string name="poi_aerialway_rope_tow">Télécorde</string>
@ -1147,7 +1147,7 @@

 	<string name="poi_pump_manual">Pompe manuelle</string>
 	<string name="poi_pump_no">Sans pompe</string>
-	<string name="poi_pump">Pompe</string>
+	<string name="poi_pump_yes">Pompe</string>

 	<string name="poi_pump_powered">Pompe automatique</string>
 	<string name="poi_water_point">Point d\'eau</string>
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@ -290,7 +290,7 @@
    <string name="osmand_net_previously_installed">Vous avez la version antérieure d\'OsmAnd d\'installée. Les données hors-ligne ne sont utilisées que par la nouvelle application. Les favoris doivent être exportés de l\'ancienne application et réimportés.</string>
    <string name="build_installed">Version {0} installée avec succès ({1}).</string>
    <string name="downloading_build">Téléchargement de l\'application…</string>
-    <string name="install_selected_build">Voulez-vous vraiment installer OsmAnd - {0} sur {1} {2} MB ?</string>
+    <string name="install_selected_build">Souhaitez-vous réellement installer OsmAnd - {0} sur {1} {2} MB ?</string>
    <string name="loading_builds_failed">Le chargement des versions disponibles a échoué.</string>
    <string name="loading_builds">Chargement des versions disponibles…</string>
    <string name="select_build_to_install">Sélectionnez la version d\'OsmAnd à installer</string>
@ -2028,11 +2028,11 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
    <string name="favorite_category_add_new_title">Ajouter une catégorie</string>
    <string name="favorite_category_dublicate_message">Cette catégorie existe déjà. Merci d\'indiquer un autre nom.</string>
    <string name="confirm_download_roadmaps">Êtes-vous certain de vouloir télécharger la carte des routes alors que vous disposez déjà d\'une carte complète ?</string>
-    <string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="update_all">Tout mettre à jour (%1$s MB)</string>
    <string name="free_downloads_used">Téléchargements gratuits effectués</string>
-    <string name="free_downloads_used_description">Visualiser le nombre de téléchargements gratuits déjà effectués</string>
+    <string name="free_downloads_used_description">Affiche le nombre de téléchargements gratuits déjà effectués</string>


    <string name="share_geo">geo :</string>
@ -2120,8 +2120,12 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
    <string name="copied_to_clipboard">Copié dans le presse-papier</string>
    <string name="use_dashboard_btn">Utiliser le tableau de bord</string>
    <string name="use_drawer_btn">Utiliser le menu</string>
-    <string name="dashboard_or_drawer_title"></string>
-    <string name="dashboard_or_drawer_description">Définissez comment démarrer l\'application : avec la carte ou avec le tableau de bord ? Ce paramètre peut être modifié par la suite.</string>
-    <string name="access_from_map_description">Afficher le bouton d\'accès au tableau de bord sur la carte</string>
+    <string name="dashboard_or_drawer_title">Lancement du Tableau de bord ou du Menu</string>
+    <string name="dashboard_or_drawer_description">Nouvelle option permettant de définir le comportement du bouton Menu : lancement du Tableau de bord ou du Menu statique ? Ce paramètre peut être modifié par la suite dans les préférences.</string>
+    <string name="access_from_map_description">Le bouton Menu lance le tableau de bord (plutôt que le Menu)</string>
    <string name="access_from_map">Accès depuis la carte</string>
-    </resources>
+    <string name="please_specify_poi_type_only_from_list">"Merci d\'indiquer un type pour ce PI ou d\'ignorer. "</string>
+    <string name="routing_attr_avoid_stairs_name">Éviter les escaliers</string>
+	<string name="routing_attr_avoid_borders_name">Éviter le franchissement de frontières</string>
+	<string name="routing_attr_avoid_stairs_description">Éviter les escaliers</string>
+	</resources>
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@ -59,7 +59,7 @@
 	<string name="poi_fire_hose">Mangueira</string>
 	<string name="poi_ambulance_station">Parque de ambulancias</string>
 	<string name="poi_ford">Vao</string>
-	<string name="poi_mountain_pass_yes">Porto de montaña</string>
+	<string name="poi_mountain_pass">Porto de montaña</string>
 	<string name="poi_city_wall">Muralla</string>
 	<string name="poi_border_control">Control fronteirizo</string>
 	<string name="poi_traffic_calming_bump">Lomba</string>
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@ -1905,7 +1905,7 @@
    <string name="get_full_version">Versión completa</string>
    <string name="downloads">Descargas</string>
    <string name="confirm_download_roadmaps">Confirma que desexa descargar un mapa de estradas, aínda que ten o mapa completo?</string>
-    <string name="value_downloaded_from_max">%1$.1f de %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="update_all">Actualizar todo (%1$s MB)</string>
    <string name="free_downloads_used">Descargas gratuítas empregadas</string>
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@ -44,7 +44,7 @@
 	<string name="poi_fire_hydrant">Tűzcsap</string>
 	<string name="poi_ambulance_station">Mentőállomás</string>
 	<string name="poi_ford">Gázló</string>
-	<string name="poi_mountain_pass_yes">Hágó</string>
+	<string name="poi_mountain_pass">Hágó</string>
 	<string name="poi_gate">Kapu</string>
 	<string name="poi_city_wall">Városfal</string>
 	<string name="poi_lift_gate">Sorompó</string>
@ -1142,7 +1142,7 @@
 	<string name="poi_pump_manual">Kézipumpa</string>
 	<string name="poi_pump_powered">Szivattyú</string>
 	<string name="poi_pump_no">Pumpa nélkül</string>
-	<string name="poi_pump">Pumpa</string>
+	<string name="poi_pump_yes">Pumpa</string>

 	<string name="poi_water_characteristic_mineral">Víz jelleg: ásványvíz</string>
 	<string name="poi_water_characteristic_mud">Víz jelleg: iszapos</string>
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@ -363,7 +363,7 @@

    <string name="build_installed">OsmAnd verzió {0} sikeresen telepítve ({1}).</string>
    <string name="downloading_build">Összeállítás letöltése…</string>
-    <string name="install_selected_build">Telepíted az OsmAnd alkalmazást - {0} innen: {1} {2} MB?</string>
+    <string name="install_selected_build">Telepíted az OsmAnd „{0}” változatát? Készült: {1}, {2} MB</string>
    <string name="loading_builds_failed">Az OsmAnd verziók listájának letöltése nem sikerült</string>
    <string name="loading_builds">OsmAnd összeállítások töltése…</string>
    <string name="select_build_to_install">Válassz egy OsmAnd buildet</string>
@ -1944,7 +1944,7 @@
    <string name="favorite_category_name">Kategórianév</string>
    <string name="favorite_category_add_new_title">Új kategória létrehozása</string>
    <string name="confirm_download_roadmaps">Biztosan letöltesz csak utakat tartalmazó térképet, annak ellenére, hogy már van teljes térképed?</string>
-    <string name="value_downloaded_from_max">%1$.1f / %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f / %2$.1f MB</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="update_all">Összes frissítése (%1$s MB)</string>
    <string name="free_downloads_used">Elhasznált ingyenes letöltés</string>
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@ -46,7 +46,7 @@
 	<string name="poi_garden_centre">Articoli per Giardinaggio</string>
 	<string name="poi_gas">Negozio gas</string>
 	<string name="poi_ford">Guado</string>
-	<string name="poi_mountain_pass_yes">Passo montano</string>
+	<string name="poi_mountain_pass">Passo montano</string>
 	<string name="poi_gate">Ponte</string>
 	<string name="poi_city_wall">Mura cittadine</string>
 	<string name="poi_lift_gate">Ponte levatoio</string>
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
--- a/OsmAnd/res/values-ja/phrases.xml
+++ b/OsmAnd/res/values-ja/phrases.xml
@ -167,7 +167,7 @@
 	<string name="poi_emergency_access_point">森林内番地札(Emergency access point)</string>

 	<string name="poi_ford">道路上水没地点(Ford)</string>
-	<string name="poi_mountain_pass_yes">峠(Mountain pass)</string>
+	<string name="poi_mountain_pass">峠(Mountain pass)</string>
 	<string name="poi_gate">門(Gate)</string>
 	<string name="poi_city_wall">市壁・城壁(City wall)</string>
 	<string name="poi_lift_gate">遮断機(Lift gate)</string>
@ -566,14 +566,14 @@
 	<string name="poi_club_tourism">旅行同好会(Tourism club)</string>
 	<string name="poi_club_charity">慈善団体・ボランティア団体(Charity club)</string>

-	<string name="poi_piste_downhill">ダウンヒル(Downhill)</string>
-	<string name="poi_piste_nordic">ノルディック・クロスカントリー(Nordic)</string>
-	<string name="poi_piste_skitour">登山スキー(Skitour)</string>
-	<string name="poi_piste_hike">ハイキング(Hike)</string>
-	<string name="poi_piste_sleigh">中型～大型ソリ(Sleigh)</string>
-	<string name="poi_piste_sled">小型ソリ(Sled)</string>
+	<string name="poi_piste_downhill">ダウンヒルゲレンデ(Downhill piste)</string>
+	<string name="poi_piste_nordic">ノルディック・クロスカントリーゲレンデ(Nordic piste)</string>
+	<string name="poi_piste_skitour">登山スキーゲレンデ(Skitour piste)</string>
+	<string name="poi_piste_hike">ハイキングゲレンデ(Hike piste)</string>
+	<string name="poi_piste_sleigh">中型～大型ソリゲレンデ(Sleigh piste)</string>
+	<string name="poi_piste_sled">小型ソリゲレンデ(Sled piste)</string>
 	<string name="poi_piste_snow_park">スノーパーク・雪中公園(Snow park)</string>
-	<string name="poi_piste_playground">雪遊び場・キッズゲレンデ(Playground)</string>
+	<string name="poi_piste_playground">雪遊び場・キッズゲレンデ(Playground piste)</string>
 	<string name="poi_piste_ice_skate">アイススケート(Ice skate)</string>

 	<string name="poi_arts_centre">アート公演・制作所(Arts centre)</string>
@ -968,4 +968,71 @@
 	<string name="poi_denomination_spiritist">心霊主義(Spiritist)</string>
 	<string name="poi_denomination_armenian_apostolic">アルメニア教会(Armenian apostolic)</string>
 	<string name="poi_denomination_dutch_reformed">オランダ改革派(Dutch reformed)</string>
+	<string name="poi_traffic_calming_island">交通島・歩行者安全地帯(Traffic island)</string>
+	<string name="poi_denomination_apostolic">ペンテコステ派(Apostolic)</string>
+	<string name="poi_denomination_latter_day_saints">モルモン教会／末日聖徒イエス・キリスト教会(Latter day saints)</string>
+	<string name="poi_denomination_church_of_christ">キリストの教会-無楽器派(Church of christ)</string>
+	<string name="poi_denomination_united_church_of_christ">キリスト連合教会(United church of christ)</string>
+	<string name="poi_denomination_georgian_orthodox">グルジア正教会(Georgian orthodox)</string>
+	<string name="poi_denomination_romanian_orthodox">ルーマニア正教会(Romanian orthodox)</string>
+	<string name="poi_denomination_ethiopian_orthodox_tewahedo">エチオピア正教会(Ethiopian orthodox tewahedo)</string>
+	<string name="poi_denomination_unitarian">ユニテリアン主義(Unitarian)</string>
+	<string name="poi_denomination_coptic_orthodox">コプト正教会(Coptic orthodox)</string>
+	<string name="poi_denomination_shaktism">シャクティズム(Shaktism)</string>
+	<string name="poi_denomination_shingon_shu">真言宗(Shingon shu)</string>
+	<string name="poi_denomination_maronite">マロン教会(Maronite)</string>
+	<string name="poi_denomination_mahayana">大乗仏教(Mahayana)</string>
+
+	<string name="poi_internet_access_yes">インターネット有り・種別不明(Internet access: yes)</string>
+	<string name="poi_internet_access_no">インターネットなし(Internet access: no)</string>
+
+	<string name="poi_religious">宗教関係エリア(Religious area)</string>
+	<string name="poi_cutline">森林の切れ目(Cutline)</string>
+	<string name="poi_shower">シャワー(Shower)</string>
+	<string name="poi_tree">樹木(Tree)</string>
+	<string name="poi_military_office">軍事事務所(Military office)</string>
+	<string name="poi_wiki_place">ウィキペディア(Wikipedia)</string>
+	<string name="poi_wiki_lang_en">英語 wiki(English wiki)</string>
+	<string name="poi_wiki_lang_ar">アラビア語 wiki(Arabic wiki)</string>
+	<string name="poi_wiki_lang_be">ベラルーシ語 wiki(Belarusian wiki)</string>
+	<string name="poi_wiki_lang_bg">ブルガリア語 wiki(Bulgarian wiki)</string>
+	<string name="poi_wiki_lang_ca">カタロニア語 wiki(Catalan wiki)</string>
+	<string name="poi_wiki_lang_ceb">セブアノ語 wiki(Cebuano wiki)</string>
+	<string name="poi_wiki_lang_cs">チェコ語 wiki(Czech wiki)</string>
+	<string name="poi_wiki_lang_da">デンマーク語 wiki(Danish wiki)</string>
+	<string name="poi_wiki_lang_de">ドイツ語 wiki(German wiki)</string>
+	<string name="poi_wiki_lang_el">ギリシャ語 wiki(Greek wiki)</string>
+	<string name="poi_wiki_lang_et">エストニア語 wiki(Estonian wiki)</string>
+	<string name="poi_wiki_lang_es">スペイン wiki(Spanish wiki)</string>
+	<string name="poi_wiki_lang_fi">フィンランド語 wiki(Finnish wiki)</string>
+	<string name="poi_wiki_lang_fr">フランス語 wiki(French wiki)</string>
+	<string name="poi_wiki_lang_gl">ガリシア語 wiki(Galician wiki)</string>
+	<string name="poi_wiki_lang_he">ヘブライ語 wiki(Hebrew wiki)</string>
+	<string name="poi_wiki_lang_hi">ヒンディー語 wiki(Hindi wiki)</string>
+	<string name="poi_wiki_lang_hr">クロアチア語 wiki(Croatian wiki)</string>
+	<string name="poi_wiki_lang_ht">ハイチ語 wiki(Haitian wiki)</string>
+	<string name="poi_wiki_lang_hu">ハンガリー語 wiki(Hungarian wiki)</string>
+	<string name="poi_wiki_lang_id">インドネシア語 wiki(Indonesian wiki)</string>
+	<string name="poi_wiki_lang_it">イタリア語 wiki(Italian wiki)</string>
+	<string name="poi_wiki_lang_ja">日本語 wiki(Japanese wiki)</string>
+	<string name="poi_wiki_lang_ko">韓国語 wiki(Korean wiki)</string>
+	<string name="poi_wiki_lang_lt">リトアニア語 wiki(Lithuanian wiki)</string>
+	<string name="poi_wiki_lang_lv">ラトビア語 wiki(Latvian wiki)</string>
+	<string name="poi_wiki_lang_ms">マレー語 wiki(Malay wiki)</string>
+	<string name="poi_wiki_lang_new">ネワール語 wiki(Newar wiki)</string>
+	<string name="poi_wiki_lang_nl">オランダ語 wiki(Dutch wiki)</string>
+	<string name="poi_wiki_lang_nn">ノルウェー語 (ニーノシク) wiki(Norwegian Nynorsk wiki)</string>
+	<string name="poi_wiki_lang_no">ノルウェー語 wiki(Norwegian wiki)</string>
+	<string name="poi_wiki_lang_pl">ポーランド語 wiki(Polish wiki)</string>
+	<string name="poi_wiki_lang_pt">ポルトガル語 wiki(Portuguese wiki)</string>
+	<string name="poi_wiki_lang_ro">ルーマニア語 wiki(Romanian wiki)</string>
+	<string name="poi_wiki_lang_ru">ロシア語 wiki(Russian wiki)</string>
+	<string name="poi_wiki_lang_sk">スロバキア語 wiki(Slovak wiki)</string>
+	<string name="poi_wiki_lang_sl">スロベニア語 wiki(Slovene wiki)</string>
+	<string name="poi_wiki_lang_sr">セルビア語 wiki(Serbian wiki)</string>
+	<string name="poi_denomination_wesleyan">ウェズリアン(Wesleyan)</string>
+	<string name="poi_wiki_lang_sv">スウェーデン語 wiki(Swedish wiki)</string>
+	<string name="poi_wiki_lang_sw">スワヒリ語 wiki(Swahili wiki)</string>
+	<string name="poi_wiki_lang_te">テルグ語 wiki(Telugu wiki)</string>
+	<string name="poi_wiki_lang_th">タイ語 wiki(Thai wiki)</string>
 	</resources>
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
--- a/OsmAnd/res/values-ko/phrases.xml
+++ b/OsmAnd/res/values-ko/phrases.xml
@ -102,7 +102,7 @@
 	<string name="poi_emergency_access_point">긴급 액세스 포인트</string>

 	<string name="poi_ford">포드</string>
-	<string name="poi_mountain_pass_yes">마운틴 패스</string>
+	<string name="poi_mountain_pass">마운틴 패스</string>
 	<string name="poi_gate">게이트</string>
 	<string name="poi_city_wall">도시 벽</string>
 	<string name="poi_lift_gate">리프트 게이트</string>
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@ -1825,7 +1825,7 @@
    <string name="rendering_attr_transportStops_name">대중교통 정류소</string>
    <string name="voices">음성 안내</string>
 	<string name="dash_download_msg_none">오프라인 지도를 다운로드 하시겠습니까?</string>
-    <string name="dash_download_msg">%1 $s 지도 다운로드됨</string>
+    <string name="dash_download_msg">%1$s 지도 다운로드됨</string>
    <string name="dash_download_new_one">새로운 지도 다운로드</string>
    <string name="dash_download_manage">관리</string>
    <string name="rendering_attr_roadStyle_name">도로 스타일</string>
@ -2200,7 +2200,7 @@
    <string name="favourites_context_menu_add">즐겨찾기 추가</string>
 	<string name="are_you_sure">확실한가요?</string>
 	<string name="unsaved_changes_will_be_lost">저장되지 않은 변경 내용이 손실 됩니다. 계속 하시겠습니까?</string>
-	<string name="downloads_left_template">%1$ 다운로드 남았습니다</string>
+	<string name="downloads_left_template">%1$s 다운로드 남았습니다</string>
 	<string name="roads">경로</string>
    <string name="downloading_number_of_files">다운로드중-%1$d 파일</string>
    <string name="show_free_version_banner">무료 버전 배너를 표시</string>
@ -2213,5 +2213,5 @@
    <string name="downloads">다운로드</string>
    <string name="confirm_download_roadmaps">모든 지도를 가지고 있더러도 지도를 다운로드 하시겠습니까?</string>
    <string name="file_size_in_mb">%.1f MB</string>
-<string name="value_downloaded_from_max">%2$.1f MB 에서 %1$.1f</string>
+<string name="value_downloaded_of_max">%2$.1f MB 에서 %1$.1f</string>
    </resources>
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@ -448,7 +448,7 @@
    <string name="osmand_net_previously_installed">Šiuo metu yra įdiegta senesnė OsmAnd versija. Visi parsiųsti ir išsaugoti duomenys bus palaikomi ir naujos versijos. Išsaugotas vietas iš senosios versijos reikia eksportuoti, o įdiegus naują - importuoti pačiam naudotojui.</string>
    <string name="build_installed">Versija {0} sėkmingai įdiegta ({1}).</string>
    <string name="downloading_build">Parsisiunčiama versija…</string>
-    <string name="install_selected_build">Ar norite įdiegti OsmAnd - {0} iš {1} {2} MB ?</string>
+    <string name="install_selected_build">Ar norite įdiegti OsmAnd - {0} iš {1} {2} MB?</string>
    <string name="loading_builds_failed">Nepavyko parsisiųsti OsmAnd versijų sąrašo</string>
    <string name="loading_builds">Įkeliamos OsmAnd versijos…</string>
    <string name="select_build_to_install">Įdiegimui pasirinkite vieną iš OsmAnd versijų</string>
@ -1934,7 +1934,7 @@
    <string name="favorite_category_add_new_title">Pridėti naują kategoriją</string>
    <string name="get_full_version">Visa versija</string>
    <string name="downloads">Atsisiuntimai</string>
-    <string name="value_downloaded_from_max">%1$.1f iš %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f iš %2$.1f MB</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="update_all">Atnaujinti viską (%1$s MB)</string>
    <string name="srtm_plugin_disabled">Kontūro linijos išjungtos</string>
@ -1945,7 +1945,7 @@
    <string name="application_dir_description">Pasirinkite vietą, kurioje norėsite išsaugoti žemėlapius.</string>
    <string name="shared_string_qr_code">QR kodas</string>
    <string name="share_menu_location">Pasidalinti esama vietove</string>
-    <string name="confirm_download_roadmaps">Ar tikrai norite atsisiųsti kelių žemėlapį, nors jau turite visą?</string>
+    <string name="confirm_download_roadmaps">Ar tikrai norite atsisiųsti tik kelių žemėlapį, nors jau turite visą?</string>
    <string name="free_downloads_used">Išnaudota nemokamų atsisiuntimų</string>
    <string name="free_downloads_used_description">Jūs galite nustatyti, kiek nemokamų atsisiuntimų išnaudojote</string>

@ -2013,4 +2013,6 @@
 	<string name="shared_string_location">Vietovė</string>
    <string name="rendering_attr_roadStyle_description">Kelių vaizdavimo stilius</string>
    <string name="save_poi_without_poi_type_message">Ar tikrai norite išsaugoti LV nenurodydami jos tipo?</string>
+    <string name="osm_save_offline">Išsaugoti įrenginyje</string>
+    <string name="lang_nds">Vokiečių žemaičių</string>
    </resources>
--- a/OsmAnd/res/values-nb/phrases.xml
+++ b/OsmAnd/res/values-nb/phrases.xml
@ -212,4 +212,33 @@

 <string name="poi_temperature">Temperatur</string>
 	<string name="poi_bathing_yes">Bading: ja</string>
+	<string name="poi_aerialway_length">Lengde</string>
+
+<string name="poi_seasonal_spring">Vår</string>
+	<string name="poi_seasonal_summer">Sommer</string>
+	<string name="poi_seasonal_autumn">Høst</string>
+	<string name="poi_seasonal_winter">Vinter</string>
+	<string name="poi_start_date">Startdato</string>
+	<string name="poi_wheelchair">Rullestol</string>
+	<string name="poi_wheelchair_no">Rullestol: ikke tillatt</string>
+	<string name="poi_wheelchair_limited">Rullestol: begrenset</string>
+	<string name="poi_building_type_shrine">Bygningstype: helligdom</string>
+
+	<string name="poi_building_type_church">Bygningstype: kirke</string>
+	<string name="poi_building_type_chapel">Bygningstype: kapell</string>
+	<string name="poi_building_type_mosque">Bygningstype: moské</string>
+	<string name="poi_building_type_temple">Bygningstype: tempel</string>
+	<string name="poi_building_type_cathedral">Bygningstype: katedral</string>
+	<string name="poi_building_type_monastery">Bygningstype: kloster</string>
+	<string name="poi_building_type_basilica">Bygningstype: basilika</string>
+	<string name="poi_building_type_synagogue">Bygningstype: synagoge</string>
+	<string name="poi_megalith_type_stone_circle">Megalittype: steinsirkel</string>
+	<string name="poi_megalith_type_dolmen">Megalittype: dysse</string>
+	<string name="poi_megalith_type_nuraghe">Megalittype: nurage</string>
+	<string name="poi_megalith_type_passage_grave">Megalittype: ganggrav</string>
+	<string name="poi_megalith_type_menhir">Megalittype: bautastein</string>
+	<string name="poi_site_type_petroglyph">Type: helleristning</string>
+	<string name="poi_site_type_city">Type: by</string>
+	<string name="poi_site_type_settlement">Type: bosetting</string>
+	<string name="poi_site_type_megalith">Type: megalitt</string>
 	</resources>
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
    <string name="rendering_attr_roadColors_description">Velg fargeskjema for veier:</string>
    <string name="rendering_attr_roadColors_name">Veifargeskjema</string>
    <string name="map_widget_show_destination_arrow">Vis retning til målet</string>
@ -533,7 +534,7 @@
    <string name="search_address_building">Bygning</string>
    <string name="search_address_building_option">Bygning</string>
    <string name="search_address_street_option">Kryssende gate</string>
-    <string name="search_tabs_location">Sted</string>
+    <string name="search_tabs_location">Posisjon</string>

    <string name="context_menu_item_update_map">Oppdater kart</string>
    
@ -820,7 +821,7 @@
    <string name="distance_measurement_clear_route">Slett alle punkter</string>
    <string name="use_kalman_filter_compass_descr">Reduserer støy i kompassavlesninger, men legger til treghet</string>
    <string name="use_kalman_filter_compass">Bruk Kalmanfilter</string>
-    <string name="other_location">Annen</string>
+    <string name="other_location">Andre</string>
    <string name="available_downloads_left">Er tilgjengelig %1$d filer til nedlasting</string>
    <string name="install_paid">Fullversjon</string>
    <string name="clear_destination">Slett reisemål</string>
@ -1400,7 +1401,7 @@
    <string name="map_downloaded_descr">Kart over %1$s har blitt lastet ned. Gå tilbake til kartet for å begynne å bruke det.</string>
    <string name="go_to_map">Gå til kartet</string>
    <string name="downloads">Nedlastinger</string>
-    <string name="value_downloaded_from_max">%1$.1f av %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f av %2$.1f MB</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="update_all">Oppdater alle (%1$s MB)</string>
    <string name="free_downloads_used">Gratis nedlastinger brukt</string>
@ -1410,7 +1411,7 @@
    <string name="shared_string_qr_code">QR-kode</string>
    <string name="basemap_was_selected_to_download">Basiskart er nødvendig for at programmet skal fungere riktig og ble valgt for å laste ned.</string>
    <string name="get_full_version">Fullversjon</string>
-    <string name="confirm_download_roadmaps">Er du sikker på at du vil laste ned veikart, selv om du har fullstendig kart?</string>
+    <string name="confirm_download_roadmaps">Er du sikker på at du vil laste ned et rent veikart, selv om du allerede har det fullstendige standardkartet?</string>
    <string name="later">Senere</string>
    <string name="activate_srtm_plugin">Aktiver programtillegg SRTM</string>
    <string name="opening_at">Åpner</string>
@ -1433,10 +1434,45 @@
    
    <string name="versions_item">Versjoner</string>
    <string name="contact_us">Kontakt oss</string>
-    <string name="planning_trip_item">Planlegge en tur</string>
+    <string name="planning_trip_item">Turplanlegging</string>
 <string name="read_more">Les mer</string>
    <string name="rendering_attr_hideProposed_name">Skjul foreslåtte objekter</string>
    <string name="techical_articles_item">Tekniske artikler</string>
    <string name="feedback">Tilbakemelding</string>
    <string name="map_legend">Kartforklaring</string>
-    </resources>
+    <string name="please_specify_poi_type_only_from_list">"Spesifiser korrekt interessepunkttype eller hopp over. "</string>
+    <string name="access_from_map_description">Menyknapp viser dashbord, ikke meny</string>
+    <string name="access_from_map">Tilgang fra kart</string>
+    <string name="show_on_start">Vis ved start</string>
+    <string name="copied_to_clipboard">Kopiert til utklippstavle</string>
+    <string name="context_menu_item_delete_waypoint">Slette GPX-rutepunkt?</string>
+    <string name="context_menu_item_edit_waypoint">Rediger GPX-rutepunkt</string>
+    <string name="lang_nds">Lavtysk</string>
+    <string name="lang_mk">Makedonsk</string>
+    <string name="lang_fy">Frisisk</string>
+    <string name="lang_als">Albansk (Toskisk)</string>
+    <string name="use_dashboard_btn">Bruk dashbord</string>
+    <string name="use_drawer_btn">Bruk meny</string>
+    <string name="dashboard_or_drawer_title">Dashbord eller menystyring</string>
+    <string name="show_on_start_description">\'Av\' starter direkte med kartskjermen</string>
+    <string name="tab_title_basic">Grunnleggende</string>
+	<string name="tab_title_advanced">Avansert</string>
+	<string name="shared_string_location">Posisjon</string>
+    <string name="default_speed_system_descr">Bestem system for hastighetsmåling</string>
+    <string name="default_speed_system">Hastighetsmåling</string>
+    <string name="si_kmh">Kilometer i timen</string>
+    <string name="si_m_s">Meter per sekund</string>
+    <string name="si_min_km">Minutter per kilometer</string>
+    <string name="av_locations">Posisjoner</string>
+    <string name="plugin_settings">Programtillegg</string>
+	<string name="rendering_value_boldOutline_name">Tykke omriss</string>
+    <string name="rendering_attr_roadStyle_description">Veistil</string>
+    <string name="routing_attr_avoid_borders_name">Unngå grensepassering</string>
+	<string name="routing_attr_height_name">Høydegrense</string>
+	<string name="routing_attr_height_description">Spesifiser kjøretøyhøyde som tillates på ruter</string>
+    <string name="rendering_attr_alpineHiking_name">Alpin vandringsskala (SAC)</string>
+    <string name="voices">Talemeldinger</string>
+	<string name="downloads_left_template">%1$s nedlastinger igjen</string>
+	<string name="other_menu_group">Annet</string>
+    <string name="instalation_troubleshooting_item">Installering og problemløsing</string>
+    </resources>
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@ -108,7 +108,7 @@
 	<string name="poi_emergency_access_point">Nood-toegangspunt</string>

 	<string name="poi_ford">Doorwaadbare plaats</string>
-	<string name="poi_mountain_pass_yes">Bergpas</string>
+	<string name="poi_mountain_pass">Bergpas</string>
 	<string name="poi_gate">Poort</string>
 	<string name="poi_city_wall">Stadsmuur</string>
 	<string name="poi_lift_gate">Liftpoort</string>
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@ -2162,11 +2162,11 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
    <string name="later">Later</string>
    <string name="downloads">Downloads</string>
    <string name="confirm_download_roadmaps">U heeft de volledige kaart al. Wilt u echt de kaart met alleen wegen downloaden?</string>
-    <string name="value_downloaded_from_max">%1$.1f van %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f van %2$.1f MB</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="update_all">Alles updaten (%1$s MB)</string>
    <string name="free_downloads_used">Gebruikte gratis downloads</string>
-    <string name="free_downloads_used_description">Bekijk hoeveel gratis downloads er zijn gebruikt</string>
+    <string name="free_downloads_used_description">Bekijk hoeveel gratis downloads er al gebruikt zijn</string>

    <string name="application_dir_description">Kies waar kaartbestanden bewaard worden.</string>
    <string name="show_on_start_description">\'Uit\' toont direct de kaart</string>
@ -2241,4 +2241,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
    <string name="access_from_map">Toegang vanaf kaart</string>
    <string name="use_dashboard_btn">Gebruik dashboard</string>
    <string name="use_drawer_btn">Gebruik menu</string>
-    </resources>
+    <string name="routing_attr_avoid_stairs_name">Vermijd trappen</string>
+	<string name="routing_attr_avoid_stairs_description">Vermijd trappen</string>
+	<string name="routing_attr_avoid_borders_name">Vermijd grensovergangen</string>
+	</resources>
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@ -103,7 +103,7 @@
 	<string name="poi_grit_bin">Piasek gaśniczy</string>
 	<string name="poi_ambulance_station">Stacja karetek</string>
 	<string name="poi_ses_station">Powiadamianie kryzysowe</string>
-	<string name="poi_mountain_pass_yes">Przejście górskie</string>
+	<string name="poi_mountain_pass">Przejście górskie</string>
 	<string name="poi_ford">Bród</string>
 	<string name="poi_gate">Bramka</string>
 	<string name="poi_city_wall">Mur miejski</string>
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@ -159,7 +159,7 @@
 	<string name="poi_emergency_access_point">Ponto de resgate emergencial</string>

 	<string name="poi_ford">Vau</string>
-	<string name="poi_mountain_pass_yes">Passo de montanha</string>
+	<string name="poi_mountain_pass">Passo de montanha</string>
 	<string name="poi_gate">Portão</string>
 	<string name="poi_city_wall">Muralha</string>
 	<string name="poi_lift_gate">Cancela elevatória</string>
@ -507,7 +507,7 @@
 	<string name="poi_hotel">Hotel</string>
 	<string name="poi_guest_house">Guesthouse</string>
 	<string name="poi_hostel">Hostel</string>
-	<string name="poi_motel">Motel</string>
+	<string name="poi_motel">Hotel de estrada</string>
 	<string name="poi_alpine_hut">Abrigo de montanha</string>
 	<string name="poi_chalet">Chalé</string>
 	<string name="poi_apartment">Apartamento</string>
@ -1051,7 +1051,7 @@
 	<string name="poi_google_plus">Google+</string>
 	<string name="poi_perfumery">Perfumaria</string>

-	<string name="poi_building">Número</string>
+	<string name="poi_building">Edifício</string>

 <string name="poi_military_office">Área militar</string>
 	<string name="poi_office_religion">Área religiosa</string>
@ -1351,7 +1351,7 @@

 	<string name="poi_wheelchair_no">Cadeira de rodas: não permitido</string>
 	<string name="poi_wheelchair_limited">Cadeira de rodas: limitado</string>
-	<string name="poi_pump">Bomba</string>
+	<string name="poi_pump_yes">Bomba</string>

 	<string name="poi_debris">Escombros</string>
 	<string name="poi_jersey_barrier">Barreira de Nova Jersey</string>
@ -1368,4 +1368,260 @@
 	<string name="poi_piste_grooming_classic">Pista de preparação: clássica</string>
 	<string name="poi_piste_grooming_classic_skating">Pista de preparação: clássica+patinagem</string>
 	<string name="poi_piste_grooming_backcountry">Pista de preparação: interior</string>
+	<string name="poi_route_train_ref">Trem</string>
+	<string name="poi_garden_type_residential">Jardim residencial</string>
+	<string name="poi_garden_type_community">Jardim comunitário</string>
+	<string name="poi_garden_type_private">Jardim privado</string>
+	<string name="poi_garden_type_botanical">Jardim botânico</string>
+
+	<string name="poi_garden_style_kitchen">Jardim horta</string>
+	<string name="poi_garden_style_rosarium">Jardim de rosas</string>
+	<string name="poi_garden_style_french">Jardim francês</string>
+	<string name="poi_garden_style_english">Jardim inglês</string>
+	<string name="poi_garden_style_japanese">Jardim japonês</string>
+
+	<string name="poi_capacity">Capacidade</string>
+	<string name="poi_capacity_disabled_yes">Lugares reservados para pessoas com deficiência</string>
+	<string name="poi_capacity_disabled_no">Não há lugares reservados para pessoas com deficiência</string>
+	<string name="poi_capacity_disabled">Lugares reservados para pessoas com deficiência</string>
+	<string name="poi_capacity_women_yes">Lugares reservados para mulheres</string>
+	<string name="poi_capacity_women_no">Não há lugares reservados para mulheres</string>
+	<string name="poi_capacity_women">Lugares reservados para mulheres</string>
+	<string name="poi_capacity_pupils">Lugares reservados para estudantes</string>
+	<string name="poi_capacity_teachers">Lugares reservados para professores</string>
+	<string name="poi_capacity_parent_yes">Lugares reservados para pais</string>
+	<string name="poi_capacity_parent_no">Não há lugares reservados para pais</string>
+	<string name="poi_capacity_parent">Lugares reservados para pais</string>
+
+	<string name="poi_aerialway_occupancy">Capacidade de cabine/cadeira/carro</string>
+	<string name="poi_aerialway_capacity">Capacidade por hora</string>
+	<string name="poi_aerialway_duration">Tempo de viagem médio, minutos</string>
+	<string name="poi_aerialway_heating_yes">Calefação</string>
+	<string name="poi_aerialway_heating_no">Sem calefação</string>
+	<string name="poi_aerialway_bicycle_yes">Bicicleta: permitido</string>
+	<string name="poi_aerialway_bicycle_no">Bicicleta: proibido</string>
+	<string name="poi_aerialway_bicycle_summer">Bicicleta: permitido somente no verão</string>
+	<string name="poi_aerialway_access_entry">Apenas entrada</string>
+	<string name="poi_aerialway_access_exit">Apenas saída</string>
+	<string name="poi_aerialway_access_both">Entrada e saída</string>
+	<string name="poi_aerialway_summer_access_entry">Acesso de verão: apenas entrada</string>
+	<string name="poi_aerialway_summer_access_exit">Acesso de verão: apenas saída</string>
+	<string name="poi_aerialway_summer_access_both">Acesso de verão: entrada e saída</string>
+
+	<string name="poi_stars_1">Estrelas: 1 (Turista)</string>
+	<string name="poi_stars_1s">Estrelas: 1S (Turista Superior)</string>
+	<string name="poi_stars_2">Estrelas: 2 (Standard)</string>
+	<string name="poi_stars_2s">Estrelas: 2S (Superior Standard)</string>
+	<string name="poi_stars_3">Estrelas: 3 (Conforto)</string>
+	<string name="poi_stars_3s">Estrelas: 3S (Conforto Superior)</string>
+	<string name="poi_stars_4">Estrelas: 4 (Primeira Classe)</string>
+	<string name="poi_stars_4s">Estrelas: 4S (Primeira Classe Superior)</string>
+	<string name="poi_stars_5">Estrelas: 5 (Luxo)</string>
+	<string name="poi_stars_5s">Estrelas: 5S (Luxo Superior)</string>
+	<string name="poi_stars_6">Estrelas: 6</string>
+	<string name="poi_stars_7">Estrelas: 7</string>
+	<string name="poi_rooms">Quartos</string>
+
+	<string name="poi_love_hotel">Motel</string>
+
+	<string name="poi_payment_coins_yes">Aceita moedas</string>
+	<string name="poi_payment_coins_no">Não aceita moedas</string>
+	<string name="poi_payment_coins_0.5">Aceita moedas de $0,5</string>
+	<string name="poi_payment_coins_50c12">Aceita moedas de 50c, $1 e $2</string>
+	<string name="poi_payment_telephone_cards_yes">Aceita cartão telefônico</string>
+	<string name="poi_payment_telephone_cards_no">Não aceita cartão telefônico</string>
+	<string name="poi_payment_credit_cards_yes">Aceita cartão de crédito</string>
+	<string name="poi_payment_credit_cards_no">Não aceita cartão de crédito</string>
+	<string name="poi_payment_notes_yes">Aceita nota promissória</string>
+	<string name="poi_payment_notes_no">Não aceita nota promissória</string>
+	<string name="poi_traffic_calming_island">Ilha de trânsito</string>
+	<string name="poi_bicycle_parking_anchors">Âncora</string>
+	<string name="poi_windfall">Windfall</string>
+	<string name="poi_payment_electronic_purses_yes">Aceita carteira eletrônica</string>
+	<string name="poi_payment_electronic_purses_no">Não aceita carteira eletrônica</string>
+	<string name="poi_payment_cash_yes">Aceita dinheiro</string>
+	<string name="poi_payment_cash_no">Não aceita dinheiro</string>
+	<string name="poi_payment_debit_cards_yes">Aceita cartão de débito</string>
+	<string name="poi_payment_debit_cards_no">Não aceita cartão de débito</string>
+	<string name="poi_payment_bitcoin_yes">Aceita Bitcoin</string>
+	<string name="poi_payment_bitcoin_no">Não aceita Bitcoin</string>
+	<string name="poi_payment_visa_yes">Aceita cartão Visa</string>
+	<string name="poi_payment_visa_no">Não aceita cartão Visa</string>
+	<string name="poi_payment_mastercard_yes">Aceita cartão MasterCard</string>
+	<string name="poi_payment_mastercard_no">Não aceita cartão MasterCard</string>
+	<string name="poi_payment_none">Grátis</string>
+	<string name="poi_payment_account_cards_yes">Aceita cartão de crédito</string>
+	<string name="poi_payment_account_cards_no">Não aceita cartão de crédito</string>
+	<string name="poi_payment_maestro_yes">Aceita cartão Maestro</string>
+	<string name="poi_payment_maestro_no">Não aceita cartão Maestro</string>
+	<string name="poi_payment_american_express_yes">Aceita cartão American Express (AMEX)</string>
+	<string name="poi_payment_american_express_no">Não aceita cartão American Express (AMEX)</string>
+	<string name="poi_payment_diners_club_yes">Aceita cartão Diners Club</string>
+	<string name="poi_payment_diners_club_no">Não aceita cartão Diners Club</string>
+	<string name="poi_payment_dkv_yes">Aceita DKV</string>
+	<string name="poi_payment_dkv_no">Não aceita DKV</string>
+	<string name="poi_payment_uta_yes">Aceita cartão UTA</string>
+	<string name="poi_payment_uta_no">Não aceita cartão UTA</string>
+	<string name="poi_payment_efectivo_yes">Aceita efetivo</string>
+	<string name="poi_payment_efectivo_no">Não aceita efetivo</string>
+	<string name="poi_payment_girocard_yes">Aceita Girocard</string>
+	<string name="poi_payment_girocard_no">Não aceita Girocard</string>
+	<string name="poi_payment_discover_card_yes">Aceita Discover Card</string>
+	<string name="poi_payment_discover_card_no">Não aceita Discover Card</string>
+	<string name="poi_payment_visa_electron_yes">Aceita Visa Electron</string>
+	<string name="poi_payment_visa_electron_no">Não aceita Visa Electron</string>
+	<string name="poi_payment_litecoin_yes">Aceita Litecoin</string>
+	<string name="poi_payment_litecoin_no">Não aceita Litecoin</string>
+	<string name="poi_payment_cheque_yes">Aceita cheque</string>
+	<string name="poi_payment_cheque_no">Não aceita cheque</string>
+	<string name="poi_payment_pikepass_yes">Aceita PIKEPASS</string>
+	<string name="poi_payment_pikepass_no">Não aceita PIKEPASS</string>
+	<string name="poi_payment_pikepass_designated">Aceita PIKEPASS (designated)</string>
+	<string name="poi_payment_visa_debit_yes">Aceita cartão Visa Débito</string>
+	<string name="poi_payment_visa_debit_no">Não aceita cartão Visa Débito</string>
+	<string name="poi_payment_cryptocurrencies_no">Não aceita criptomoedas</string>
+	<string name="poi_payment_others_yes">Aceita outras formas de pagamento</string>
+	<string name="poi_payment_others_no">Não aceita outras formas de pagamento</string>
+	<string name="poi_payment_routex_yes">Aceita cartão de combustível Routex</string>
+	<string name="poi_payment_routex_no">Não aceita cartão de combustível Routex</string>
+	<string name="poi_payment_bancomat_yes">Aceita Bancomat</string>
+	<string name="poi_payment_bancomat_no">Não aceita Bancomat</string>
+	<string name="poi_payment_icsf_yes">Aceita cartão IC Stored Fare</string>
+	<string name="poi_payment_icsf_no">Não aceita cartão IC Stored Fare</string>
+	<string name="poi_payment_prepaid_ticket_yes">Aceita bilhetes pré-pagos</string>
+	<string name="poi_payment_jcb_yes">Aceita cartão JCB</string>
+	<string name="poi_payment_jcb_no">Não aceita cartão JCB</string>
+	<string name="poi_payment_laser_yes">Aceita cartão Laser</string>
+	<string name="poi_payment_laser_no">Não aceita cartão Laser</string>
+	<string name="poi_payment_ep_quick_yes">Aceita cartão Quick</string>
+	<string name="poi_payment_ep_quick_no">Não aceita cartão Quick</string>
+	<string name="poi_payment_eurowag_yes">Aceita cartão Eurowag</string>
+	<string name="poi_payment_eurowag_no">Não aceita cartão Eurowag</string>
+	<string name="poi_payment_e_zpass_yes">Aceita E-ZPass</string>
+	<string name="poi_payment_e_zpass_no">Não aceita E-ZPass</string>
+	<string name="poi_payment_euroshell_yes">Aceita cartão de combustível Euroshell</string>
+	<string name="poi_payment_euroshell_no">Não aceita cartão de combustível Euroshell</string>
+	<string name="poi_payment_kitcard_yes">Aceita KITCard</string>
+	<string name="poi_payment_kitcard_no">Não aceita KITCard</string>
+	<string name="poi_payment_westfalen_card_yes">Aceita cartão Westfalen</string>
+	<string name="poi_payment_westfalen_card_no">Não aceita cartão Westfalen</string>
+	<string name="poi_payment_v_pay_yes">Aceita cartão V PAY</string>
+	<string name="poi_payment_v_pay_no">Não aceita cartão V PAY</string>
+	<string name="poi_payment_dogecoin_yes">Aceita Dogecoin</string>
+	<string name="poi_payment_dogecoin_no">Não aceita Dogecoin</string>
+	<string name="poi_payment_cibus_yes">Aceita cartão Cibus</string>
+	<string name="poi_payment_cibus_no">Não aceita cartão Cibus</string>
+	<string name="poi_payment_wire_transfer_yes">Aceita transferência eletrônica</string>
+	<string name="poi_payment_wire_transfer_no">Não aceita transferência eletrônica</string>
+	<string name="poi_payment_ep_cash_yes">Aceita cartão de dinheiro (Geldkarte)</string>
+	<string name="poi_payment_ep_cash_no">Não aceita cartão de dinheiro (Geldkarte)</string>
+	<string name="poi_payment_ep_proton_yes">Aceita cartão Proton</string>
+	<string name="poi_payment_ep_proton_no">Não aceita cartão Proton</string>
+	<string name="poi_payment_ep_avant_yes">Aceita AvantCard</string>
+	<string name="poi_payment_ep_avant_no">Não aceita cartão AvantCard</string>
+	<string name="poi_payment_ep_mep_yes">Aceita MEP</string>
+	<string name="poi_payment_ep_mep_no">Não aceita MEP</string>
+	<string name="poi_payment_ep_minipay_yes">Aceita Minipay</string>
+	<string name="poi_payment_ep_minipay_no">Não aceita Minipay</string>
+	<string name="poi_payment_ep_minicash_yes">Aceita MiniCash</string>
+	<string name="poi_payment_ep_minicash_no">Não aceita MiniCash</string>
+	<string name="poi_payment_ep_moneo_yes">Aceita Moneo</string>
+	<string name="poi_payment_ep_moneo_no">Não aceita Moneo</string>
+	<string name="poi_payment_ep_monedero4b_yes">Aceita Monedero 4B</string>
+	<string name="poi_payment_ep_monedero4b_no">Não aceita Monedero 4B</string>
+	<string name="poi_payment_ep_monedero_yes">Aceita Monedero</string>
+	<string name="poi_payment_ep_monedero_no">Não aceita Monedero</string>
+	<string name="poi_payment_bankaxess_yes">Aceita BankAxess</string>
+	<string name="poi_payment_bankaxess_no">Não aceita BankAxess</string>
+	<string name="poi_payment_coinkite_yes">Aceita Coinkite</string>
+	<string name="poi_payment_coinkite_no">Não aceita Coinkite</string>
+	<string name="poi_payment_roadrunner_yes">Aceita cartão Roadrunner</string>
+	<string name="poi_payment_roadrunner_no">Não aceita cartão Roadrunner</string>
+	<string name="poi_payment_svg_yes">Aceita SVG</string>
+	<string name="poi_payment_svg_no">Não aceita SVG</string>
+	<string name="poi_payment_sms_yes">Aceita pagamento por SMS</string>
+	<string name="poi_payment_sms_no">Não aceita pagamento por SMS</string>
+	<string name="poi_payment_ov_chipkaart_yes">Aceita OV-Chipkaart</string>
+	<string name="poi_payment_ov_chipkaart_no">Não aceita OV-Chipkaart</string>
+	<string name="poi_payment_oyster_yes">Aceita cartão Oyster</string>
+	<string name="poi_payment_oyster_no">Não aceita cartão Oyster</string>
+	<string name="poi_payment_paypal_yes">Aceita PayPal</string>
+	<string name="poi_payment_paypal_no">Não aceita PayPal</string>
+	<string name="poi_payment_gift_card_yes">Aceita cartões de presente</string>
+	<string name="poi_payment_gift_card_no">Não aceita cartão presente</string>
+	<string name="poi_description_payment">Detalhes de pagamento</string>
+
+	<string name="poi_internet_access_fee_yes">Acesso à Internet pago</string>
+	<string name="poi_internet_access_fee_no">Acesso à Internet grátis</string>
+
+	<string name="poi_events_venue">Salão de eventos</string>
+
+	<string name="poi_diet_vegetarian_only">Apenas dieta vegetariana</string>
+	<string name="poi_diet_vegetarian_yes">Dieta vegetariana</string>
+	<string name="poi_diet_vegetarian_no">Dieta vegetariana: não</string>
+	<string name="poi_diet_vegetarian_few">Dieta vegetariana: alguns</string>
+	<string name="poi_diet_vegan_only">Apenas dieta vegana</string>
+	<string name="poi_diet_vegan_yes">Dieta vegana</string>
+	<string name="poi_diet_vegan_no">Dieta vegana: não</string>
+	<string name="poi_diet_gluten_free_only">Apenas dieta livre de glúten</string>
+	<string name="poi_diet_gluten_free_yes">Dieta livre de glúten</string>
+	<string name="poi_payment_sube_yes">Aceita cartão SUBE</string>
+	<string name="poi_payment_sube_no">Não aceita cartão SUBE</string>
+	<string name="poi_payment_via_verde_yes">Aceita Via Verde</string>
+	<string name="poi_payment_via_verde_no">Não aceita Via Verde</string>
+	<string name="poi_payment_meal_voucher_yes">Aceita vale refeição</string>
+	<string name="poi_payment_meal_voucher_no">Não aceita vale refeição</string>
+	<string name="poi_payment_u_key_yes">Aceita U-Key</string>
+	<string name="poi_payment_u_key_no">Não aceita U-Key</string>
+	<string name="poi_payment_token_yes">Aceita Token</string>
+	<string name="poi_payment_token_no">Não aceita Token</string>
+	<string name="poi_payment_golden_crown_yes">Aceita cartão Golden Crown</string>
+	<string name="poi_payment_golden_crown_no">Não aceita cartão Golden Crown</string>
+	<string name="poi_payment_pro100_yes">Aceita cartão PRO100</string>
+	<string name="poi_payment_pro100_no">Não aceita cartão PRO100</string>
+	<string name="poi_payment_union_card_yes">Não aceita Union Card</string>
+	<string name="poi_payment_union_card_no">Não aceita Union Card</string>
+	<string name="poi_payment_mtsmoney_yes">Aceita MTS-Money</string>
+	<string name="poi_payment_mtsmoney_no">Não aceita cartão MTS-Money</string>
+	<string name="poi_payment_yandexmoney_yes">Aceita Yandex.Money</string>
+	<string name="poi_payment_yandexmoney_no">Não aceita Yandex.Money</string>
+	<string name="poi_diet_gluten_free_no">Dieta livre de glúten: não</string>
+	<string name="poi_diet_kosher_only">Apenas dieta kosher</string>
+	<string name="poi_diet_kosher_yes">Dieta kosher</string>
+	<string name="poi_diet_kosher_no">Dieta kosher: não</string>
+	<string name="poi_diet_halal_only">Apenas dieta halal</string>
+	<string name="poi_diet_halal_yes">Dieta halal</string>
+	<string name="poi_diet_halal_no">Dieta halal: não</string>
+	<string name="poi_diet_lactose_free_only">Apenas dieta livre de lactose</string>
+	<string name="poi_diet_lactose_free_yes">Dieta livre de lactose</string>
+	<string name="poi_diet_lactose_free_no">Dieta livre de lactose: não</string>
+	<string name="poi_diet_pescetarian_yes">Dieta piscitariana</string>
+
+	<string name="poi_drive_in_yes">Drive-in: sim</string>
+	<string name="poi_drive_in_no">Drive-in: não</string>
+	<string name="poi_drive_through_yes">Drive-thru: sim</string>
+	<string name="poi_drive_through_no">Drive-thru: não</string>
+
+	<string name="poi_brewery_additional">Nome da cervejaria</string>
+	<string name="poi_microbrewery_yes">Microcervejaria</string>
+	<string name="poi_microbrewery_no">Sem microcervejaria</string>
+
+	<string name="poi_takeaway_yes">Encomenda</string>
+	<string name="poi_takeaway_no">Sem encomenda</string>
+	<string name="poi_takeaway_only">Apenas encomenda</string>
+
+	<string name="poi_delivery_yes">Entrega</string>
+	<string name="poi_delivery_no">Sem entrega</string>
+	<string name="poi_delivery_only">Apenas entrega</string>
+
+	<string name="poi_outdoor_seating_yes">Lugar ao ar livre</string>
+	<string name="poi_outdoor_seating_no">Sem lugar ao ar livre</string>
+	<string name="poi_outdoor_seating_terrace">Lugar ao ar livre: terraço</string>
+	<string name="poi_outdoor_seating_sidewalk">Lugar ao ar livre: calçada</string>
+	<string name="poi_outdoor_seating_pedestrian_zone">Lugar ao ar livre: calçadão</string>
+	<string name="poi_outdoor_seating_garden">Lugar ao ar livre: jardim</string>
+	<string name="poi_outdoor_seating_patio">Lugar ao ar livre: pátio</string>
+
+	<string name="poi_cocktails_yes">Coquetéis</string>
+
 	</resources>
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="amenity_type_administrative">Administrativo</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="amenity_type_administrative">Administrativo</string>
  <string name="amenity_type_barrier">Barreira</string>
  <string name="amenity_type_education">Educação</string>
  <string name="amenity_type_emergency">Emergência</string>
@ -463,7 +464,7 @@
  <string name="online_map_settings_descr">Configurar fontes de mosaicos ou de mapas on-line</string>
  
  
-  <string name="osmand_rastermaps_plugin_description">"Com este plugin você pode acessar muitos tipos de mapas online (também chamada de quadrícula ou ladrilho), de quadrículas pré-definidas do OpenStreetMap (como Mapnik) para imagens de satélite e camadas especiais como mapas aquáticos, climáticos, geológicos, camadas de sombra de relevo, etc.\n\nQuaisquer desses mapas podem ser usados como mapa principal (base) para ser mostrado no OsmAnd ou como uma sobreposição ou subcamada para outro mapa base (como o mapa offline normal de OsmAnd). A fim de fazer qualquer subcamada do mapa mais visível, certos elementos do mapa vetorial do OsmAnd podem facilmente ser ocultados através do menu \'Configurar mapa\' conforme desejado.
+  <string name="osmand_rastermaps_plugin_description">"Com este plugin, pode ter acesso a muitos tipos de mapas on-line (também chamada de quadrícula ou ladrilho), de quadrículas pré-definidas do OpenStreetMap (como Mapnik) para imagens de satélite e camadas especiais, como mapas aquáticos, climáticos, geológicos, camadas de sombra de relevo, etc.\n\nQuaisquer desses mapas podem ser usados como mapa principal (base) para ser mostrado no OsmAnd, ou como uma sobreposição, ou sub-camada para outro mapa base (como o mapa off-line normal de OsmAnd). Para fazer qualquer sub-camada do mapa mais visível, certos elementos do mapa vetorial do OsmAnd podem facilmente ser ocultados através do menu \'Configurar mapa\'.
 \n\nQuadrículas de mapas podem ser obtidas diretamente através de fontes on-line ou podem ser preparados para uso off-line (e copiadas manualmente para o diretório de dados do OsmAnd) como um banco de dados sqlite, que pode ser produzido por uma variedade de ferramentas de terceiros para preparação de mapas. "</string>
  <string name="osmand_background_plugin_description">This plugin allows tracking or navigation in sleep (screen off) mode by periodically waking up the GPS device.</string>
  <string name="osmand_accessibility_description">Mostrar configurações de características especiais de acessibilidade.</string>
@ -1055,9 +1056,11 @@
    
    <string name="recording_photo_description">Foto %1$s de %2$s</string>
    <string name="av_def_action_picture">Capture uma foto</string>
-    <string name="osmand_srtm_long_description_1000_chars">Esse plugin disponibiliza curvas de nível que podem ser mostradas nos mapas offline do OsmAnd. Os dados globais (entre as latitudes 70° norte e 70° sul) são baseados nas medições do SRTM (Shuttle Radar Topography Mission) e do ASTER (Advanced Spaceborn Thermal Emission and Reflection Radiometer), um instrumento de imagens no Terra, o satélite principal do Sistema de Observação da Terra da NASA. O ASTER é um esforço conjunto da NASA, do Ministério da Economia, Comércio e Indústria do Japão e do Sistema Espacial Japonês (J-spacesystems).</string>
-    <string name="srtm_plugin_description">Facilita o download de curvas de nível e relevo sombreado (Configurações -&gt; Dados offline -&gt; Baixar -&gt; Selecciona o tipo de mapa).</string>
-    <string name="srtm_plugin_name">Plugin de curvas de nível</string>
+    <string name="osmand_srtm_long_description_1000_chars">"Este plugin disponibiliza \'Curvas de Nível\' e \'Sombras de Relevo\', que podem ser aplicadas nos mapas standard do OsmAnd.
+\nEstas funcionalidades podem ser apreciadas por atletas, caminhantes, e qualquer pessoa interessada na informação de relevo de uma paisagem.\n\nOs dados globais (entre as latitudes 70° norte e 70° sul) são baseados nas medições do SRTM (Shuttle Radar Topography Mission) e do ASTER (Advanced Spaceborn Thermal Emission and Reflection Radiometer), um instrumento de imagens no \'Terra\', o satélite principal do Sistema de Observação da Terra da NASA. O ASTER é um esforço conjunto da NASA, do Ministério da Economia, Comércio e Indústria do Japão e do Sistema Espacial Japonês (J-spacesystems). "</string>
+    <string name="srtm_plugin_description">"Este plugin disponibiliza \'Curvas de Nível\' e \'Sombras de Relevo\', que podem ser aplicadas nos mapas standard do OsmAnd.
+\nEstas funcionalidades podem ser apreciadas por atletas, caminhantes, e qualquer pessoa interessada na informação de relevo de uma paisagem.\n\nOs dados globais (entre as latitudes 70° norte e 70° sul) são baseados nas medições do SRTM (Shuttle Radar Topography Mission) e do ASTER (Advanced Spaceborn Thermal Emission and Reflection Radiometer), um instrumento de imagens no \'Terra\', o satélite principal do Sistema de Observação da Terra da NASA. O ASTER é um esforço conjunto da NASA, do Ministério da Economia, Comércio e Indústria do Japão e do Sistema Espacial Japonês (J-spacesystems). "</string>
+    <string name="srtm_plugin_name">Curvas de Nível</string>
    <string name="download_select_map_types">Outros mapas</string>
    <string name="download_srtm_maps">Curvas de nível</string>
    <string name="rendering_attr_noAdminboundaries_name">Ocultar limites</string>
@ -1425,8 +1428,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
    <string name="osmo_settings_descr">Configurar as definições de monitoramento e configuração do canal de monitoração pessoal</string>
    <string name="osmo_settings">OsMo OpenStreetMap Monitorização (beta)</string>
    <string name="osmo_plugin_description">"Este plugin fornece a funcionalidade para OsMo (monitoramento avançado ao vivo), veja mais em http://osmo.mobi.
-\n\nVocê pode rastrear outros dispositivos e ser rastreado. Você espontaneamente pode criar grupos anônimos, compartilhar localização e se comunicar. Vem com várias opções para o controle de sessão ou acompanhamento permanente.
-\n\nGrupos anônimos são criados para um número especificado de dias e limitados a recursos definidos, ou seja, não há nenhum controle remoto e nenhum administrador de grupo. Grupos totalmente funcionais, por outro lado, podem ser criados no site e só usuários cadastrados têm acesso a eles. "</string>
+\n\nVocê pode rastrear todos os dispositivos de um grupo em que participe, em tempo real, e comunicarem entre si. Tem várias opções para o rastreamento de sessão ou permanente.\n\nGrupos anónimos podem ser criados espontaneamente por um número específico de dias, e tem recursos limitados definidos, ou seja, não há controle remoto nem administrador de grupo. Por outro lado, grupos totalmente funcionais podem ser criados no website, aos quais apenas utilizadores registados podem ter acesso. "</string>
    <string name="osmo_plugin_name">OsMO (rastreamento avançado ao vivo)</string>
   	<string name="always_center_position_on_map">Centrar sempre a posição no mapa</string>
    <string name="voice_pref_title">Voz</string>
@ -1600,8 +1602,8 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="save_track_to_gpx_globally_descr">Posição geral de log para um arquivo GPX pode ser ativada ou desativado usando o GPX gravação widget na tela do mapa</string>
 	<string name="save_track_interval_globally">Intervalo de log</string>
 	<string name="rendering_attr_publicTransportMode_name">Rotas de ônibus, trólebus</string>
-	<string name="record_plugin_description">"Este plugin ativa a funcionalidade para gravar e salvar seus trajetos manualmente tocando o widget de gravação GPX na tela do mapa, ou também fazendo automaticamente o registro de todas as suas rotas de navegação para um arquivo GPX.
-\n\nTrajetos gravados podem ser compartilhadas com seus amigos ou serem usados para contribuições ao OSM. Atletas podem usar trajetos gravados para monitorar seus treinamentos. Algumas análises básicas do trajeto podem ser feitas diretamente no OsmAnd, como tempos de volta, velocidade média, etc. E, claro, trajetos também podem ser analisados mais tarde em ferramentas de terceiros. "</string>
+	<string name="record_plugin_description">"Este plugin ativa a funcionalidade para gravar e salvar os seus trajetos manualmente, tocando o widget de gravação GPX na tela do mapa, ou também fazendo automaticamente o registro de todas as suas rotas de navegação para um arquivo GPX.
+\n\nTrajetos gravados podem ser compartilhadas com os seus amigos, ou serem usados para contribuições ao OSM. Atletas podem usar trajetos gravados para controlar os seus treinos. Algumas análises básicas do trajeto podem ser feitas diretamente no OsmAnd, como tempos de volta, velocidade média, etc. E, claro, trajetos também podem ser analisados mais tarde em ferramentas de terceiros. "</string>
    <string name="record_plugin_name">Gravação de viagem</string>
    <string name="int_hour">h</string>
    <string name="duration">Duração</string>
@ -1817,4 +1819,14 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
    <string name="shared_string_navigation">Navegação</string>
    <string name="nm">mn</string>
    <string name="shared_string_update">Atualizar</string>
-    </resources>
+    <string name="please_specify_poi_type_only_from_list">"Escolha o tipo correcto de POI (ou ignore). "</string>
+    <string name="access_from_map_description">O botão de Menu lança o Dashboard, em vez do Menu</string>
+    <string name="access_from_map">Aceder a partir do mapa</string>
+    <string name="show_on_start_description">\'Desligado\' lança directamente para a vista do mapa</string>
+    <string name="show_on_start">Mostrar no arranque</string>
+    <string name="copied_to_clipboard">Copiado para a Área de Transferências</string>
+    <string name="release_2_2">" • Novo interface do utilizador sensível ao contexto, ao tocar locais no mapa, ou em outras telas\n\n• Tela do Mapa é agora lançada diretamente, a menos que \'Mostrar Painel de instrumentos no arranque\' seja selecionado\n\n• Configure quais e de que forma os cartões são exibidos no Painel de instrumentos\n\n• Desactivar o Painel, se preferir um controle baseado em menus\n\n• Para fazer download de mapas, as regiões podem ser seleccionadas directamente, tocando no mapa do mundo\n\n• Busca por \'Pontos de Interesse\' agora oferece suporte a consultas mais específicas\n\n• Melhoria nos \'Pontos de Interesse\' e funcionalidades de edição OSM\n\n• Reformulação de estrutura e de interface para download de mapas de dados 
+\n\ne mais... "</string>
+    <string name="osm_save_offline">Guardar off-line</string>
+    <string name="osm_edit_modified_poi">Ponto de Interesse OSM modificado</string>
+    </resources>
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="background_service_is_enabled_question">Serviciul sleep încă rulează în background. Doriți să-l opriți?</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="background_service_is_enabled_question">Serviciul sleep încă rulează în background. Doriți să-l opriți?</string>
    
 	
    <string name="close_changeset">Închide setul de modificări</string>
@ -1567,4 +1568,11 @@
    <string name="archive_wikipedia_data">Aveți descărcate informații vechi din Wikipedia, incompatibile. Doriți să le arhivați?</string>
    <string name="download_wikipedia_files">Doriți să descărcați informații adiționale din Wikipedia (%1$s MB) ?</string>
    <string name="gps_network_not_enabled">Serviciul de localizare este oprit. Doriți să îl activați?</string>
-    </resources>
+    <string name="access_from_map">Alegeti de pe harta</string>
+    <string name="show_on_start">Arata la pornire</string>
+    <string name="osm_save_offline">Salvati offline</string>
+    <string name="osm_edit_modified_poi">OSM POI modificat</string>
+    <string name="osm_edit_deleted_poi">OSM POI sters</string>
+    <string name="context_menu_item_open_note">Deschideti OSM Notite</string>
+    <string name="osm_edit_reopened_note">OSM Notite redeschis</string>
+    </resources>
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@ -133,7 +133,7 @@

 	<string name="poi_ford">Брод</string>
 	<string name="poi_ford_stepping_stones">Рудиментарный мост из камней</string>
-	<string name="poi_mountain_pass_yes">Перевал</string>
+	<string name="poi_mountain_pass">Перевал</string>
 	<string name="poi_gate">Ворота</string>
 	<string name="poi_city_wall">Городская стена</string>
 	<string name="poi_lift_gate">Шлагбаум</string>
@ -780,8 +780,8 @@
 	<string name="poi_internet_access_terminal">Доступ в Интернет: терминал</string>
 	<string name="poi_internet_access_wired">Доступ в Интернет: проводное подключение</string>
 	<string name="poi_internet_access_public">Доступ в Интернет: общедоступный</string>
-	<string name="poi_internet_access_yes">Доступ в Интернет</string>
-	<string name="poi_internet_access_no">Нет доступа в Интернет</string>
+	<string name="poi_internet_access_yes">Доступ в Интернет: есть</string>
+	<string name="poi_internet_access_no">Доступ в Интернет: отсутствует</string>

 	<string name="poi_farm">Фермерский магазин</string>
 	<string name="poi_personal_transport">Личный транспорт</string>
@ -1044,7 +1044,7 @@
 	<string name="poi_pump_manual">Ручной насос</string>
 	<string name="poi_pump_powered">Автоматический насос</string>
 	<string name="poi_pump_no">Без насоса</string>
-	<string name="poi_pump">Насос</string>
+	<string name="poi_pump_yes">Насос</string>

 	<string name="poi_water_characteristic_mineral">Характеристика воды: минеральная</string>
 	<string name="poi_water_characteristic_mud">Характеристика воды: грязь</string>
@ -1471,7 +1471,7 @@
 	<string name="poi_service_electrical">Ремонт электротранспорта</string>
 	<string name="poi_motorcycle_repair">Ремонт мотоциклов</string>
 	<string name="poi_self_service_yes">Самообслуживание</string>
-	<string name="poi_self_service_no">Самообслуживание: нет</string>
+	<string name="poi_self_service_no">Самообслуживание: отсутствует</string>
 	<string name="poi_automated_yes">Автоматизация</string>
 	<string name="poi_automated_no">Без автоматизации</string>
 	<string name="poi_full_service_yes">Полный комплекс услуг</string>
@ -1655,8 +1655,9 @@

 	<string name="poi_internet_access_type_wlan">Беспроводной интернет</string>
 	<string name="poi_internet_access_type_wired">Интернет через кабель</string>
-	<string name="poi_internet_access_type_public">Общедоступный доступ в интернет</string>
+	<string name="poi_internet_access_type_public">Публичный доступ в интернет</string>
 	<string name="poi_internet_access_type_no">Без доступа в интернет</string>
+	<string name="poi_internet_access_type_yes">C доступом в интернет</string>

 	<string name="poi_maxwidth">Максимальная ширина</string>

@ -1777,21 +1778,21 @@
 	<string name="poi_shop_yes">С магазином</string>

 	<string name="poi_service_bicycle_retail_yes">Продажа велосипедов: да</string>
-	<string name="poi_service_bicycle_retail_no">Продажа велосипедов: нет</string>
+	<string name="poi_service_bicycle_retail_no">Продажа велосипедов: отсутствует</string>
 	<string name="poi_service_bicycle_repair_yes">Ремонт велосипедов: да</string>
-	<string name="poi_service_bicycle_repair_no">Ремонт велосипедов: нет</string>
+	<string name="poi_service_bicycle_repair_no">Ремонт велосипедов: отсутствует</string>
 	<string name="poi_service_bicycle_rental_yes">Прокат велосипедов: да</string>
-	<string name="poi_service_bicycle_rental_no">Прокат велосипедов: нет</string>
+	<string name="poi_service_bicycle_rental_no">Прокат велосипедов: отсутствует</string>
 	<string name="poi_service_bicycle_pump_yes">Подкачка велосипедных шин: да</string>
-	<string name="poi_service_bicycle_pump_no">Подкачка велосипедных шин: нет</string>
+	<string name="poi_service_bicycle_pump_no">Подкачка велосипедных шин: отсутствует</string>
 	<string name="poi_service_bicycle_diy_yes">Инструменты для самостоятельного ремонта велосипеда: да</string>
 	<string name="poi_service_bicycle_diy_no">Инструменты для самостоятельного ремонта велосипеда: нет</string>
 	<string name="poi_service_bicycle_cleaning_yes">Мойка велосипедов: да</string>
-	<string name="poi_service_bicycle_cleaning_no">Мойка велосипедов: нет</string>
+	<string name="poi_service_bicycle_cleaning_no">Мойка велосипедов: отсутствует</string>
 	<string name="poi_service_bicycle_chaintool_yes">Выжимка цепи для велосипедов: да</string>
-	<string name="poi_service_bicycle_chaintool_no">Выжимка цепи для велосипедов: нет</string>
+	<string name="poi_service_bicycle_chaintool_no">Выжимка цепи для велосипедов: отсутствует</string>
 	<string name="poi_service_bicycle_second_hand_yes">Продажа подержанных велосипедов: да</string>
-	<string name="poi_service_bicycle_second_hand_no">Продажа подержанных велосипедов: нет</string>
+	<string name="poi_service_bicycle_second_hand_no">Продажа подержанных велосипедов: отсутствует</string>

 	<string name="poi_wildlife_hide">Укрытие для наблюдения за дикой природой</string>

@ -1862,7 +1863,7 @@
 	<string name="poi_aeroway_fuel">Авиационная заправка</string>
 	<string name="poi_fuel_91ul">Топливо 91UL</string>
 	<string name="poi_fuel_100ll">Топливо 100LL</string>
-	<string name="poi_jeta1">Топливо Jet A-1</string>
+	<string name="poi_fuel_jeta1">Топливо Jet A-1</string>
 	<string name="poi_fuel_adblue">Топливо AdBlue</string>
 	<string name="poi_fuel_wood">Топливо: дрова</string>
 	<string name="poi_fuel_charcoal">Топливо: древесный уголь</string>
@ -2103,9 +2104,9 @@
 	<string name="poi_group_only_yes">Доступно только для групп: да</string>
 	<string name="poi_group_only_no">Доступно только для групп: нет</string>
 	<string name="poi_washing_machine_yes">Стиральная машина: есть</string>
-	<string name="poi_washing_machine_no">Стиральная машина: нет</string>
+	<string name="poi_washing_machine_no">Стиральная машина: отсутствует</string>
 	<string name="poi_shower_yes">Душ: есть</string>
-	<string name="poi_shower_no">Душ: нет</string>
+	<string name="poi_shower_no">Душ: отсутствует</string>
 	<string name="poi_shower_hot">Душ: горячий</string>
 	<string name="poi_shower_outdoor">Душ: снаружи</string>
 	<string name="poi_shower_cold">Душ: холодный</string>
@ -2115,10 +2116,10 @@
 	<string name="poi_impromptu_yes">Импровизированный: да</string>
 	<string name="poi_impromptu_no">Импровизированный: нет</string>
 	<string name="poi_sanitary_dump_station_yes">Ассенизационная сливная станция: есть</string>
-	<string name="poi_sanitary_dump_station_no">Ассенизационная сливная станция: нет</string>
+	<string name="poi_sanitary_dump_station_no">Ассенизационная сливная станция: отсутствует</string>
 	<string name="poi_sanitary_dump_station_customers">Ассенизационная сливная станция: только для посетителей</string>
 	<string name="poi_power_supply_yes">Источник питания: есть</string>
-	<string name="poi_power_supply_no">Источник питания: нет</string>
+	<string name="poi_power_supply_no">Источник питания: отсутствует</string>
 	<string name="poi_power_supply_cee_17_blue">Источник питания (разъём): CEE 17 blue</string>
 	<string name="poi_power_supply_cee_7_4">Источник питания (разъём): CEE 7/4</string>
 	<string name="poi_power_supply_cee_7_5">Источник питания (разъём): CEE 7/5</string>
@ -2183,17 +2184,17 @@

 	<string name="poi_highway_steps">Лестница</string>
 	<string name="poi_handrail_yes">Поручень: есть</string>
-	<string name="poi_handrail_no">Поручень: нет</string>
+	<string name="poi_handrail_no">Поручень: отсутствует</string>
 	<string name="poi_ramp_yes">Скат: есть</string>
-	<string name="poi_ramp_no">Скат: нет</string>
+	<string name="poi_ramp_no">Скат: отсутствует</string>
 	<string name="poi_ramp_wheelchair_yes">Скат для инвалидных колясок: есть</string>
-	<string name="poi_ramp_wheelchair_no">Скат для инвалидных колясок: нет</string>
+	<string name="poi_ramp_wheelchair_no">Скат для инвалидных колясок: отсутствует</string>
 	<string name="poi_ramp_stroller_yes">Скат (двойной): есть</string>
-	<string name="poi_ramp_stroller_no">Скат (двойной): нет</string>
+	<string name="poi_ramp_stroller_no">Скат (двойной): отсутствует</string>
 	<string name="poi_ramp_bicycle_yes">Скат для велосипедов: есть</string>
-	<string name="poi_ramp_bicycle_no">Скат для велосипедов: нет</string>
+	<string name="poi_ramp_bicycle_no">Скат для велосипедов: отсутствует</string>
 	<string name="poi_ramp_luggage_yes">Скат для багажа: есть</string>
-	<string name="poi_ramp_luggage_no">Скат для багажа: нет</string>
+	<string name="poi_ramp_luggage_no">Скат для багажа: отсутствует</string>
 	<string name="poi_step_count">Количество ступеней</string>
 	<string name="poi_step_condition_even">Состояние ступеней: хорошее</string>
 	<string name="poi_step_condition_uneven">Состояние ступеней: среднее</string>
@ -2463,4 +2464,78 @@

 	<string name="poi_craft_electronics">Ремонт электроники</string>
 	<string name="poi_fireworks">Магазин фейерверков</string>
+
+	<string name="poi_aerialway_length">Протяжённость</string>
+
+	<string name="poi_health_specialty_general_yes">Специализация: семейная медицина</string>
+	<string name="poi_health_specialty_ophthalmology_yes">Специализация: офтальмология</string>
+	<string name="poi_health_specialty_gynaecology_yes">Специализация: гинекология</string>
+	<string name="poi_health_specialty_internal_medicine_yes">Специализация: внутренние болезни</string>
+	<string name="poi_health_specialty_orthopaedics_yes">Специализация: ортопедия</string>
+	<string name="poi_health_specialty_otolaryngology_yes">Специализация: отоларингология (ЛОР)</string>
+	<string name="poi_health_specialty_paediatrics_yes">Специализация: педиатрия</string>
+	<string name="poi_health_specialty_paediatrics_no">Специализация: педиатрия: отсутствует</string>
+	<string name="poi_health_specialty_dermatology_yes">Специализация: дерматология</string>
+	<string name="poi_health_specialty_urology_yes">Специализация: урология</string>
+	<string name="poi_health_specialty_surgery_yes">Специализация: общая хирургия</string>
+	<string name="poi_health_specialty_radiology_yes">Специализация: радиология</string>
+	<string name="poi_health_specialty_psychiatry_yes">Специализация: психиатрия</string>
+	<string name="poi_health_specialty_neurology_yes">Специализация: неврология</string>
+	<string name="poi_health_specialty_dermatovenereology_yes">Специализация: дерматовенерология</string>
+	<string name="poi_health_specialty_cardiology_yes">Специализация: кардиология</string>
+	<string name="poi_health_specialty_trauma_yes">Специализация: травматология</string>
+	<string name="poi_health_specialty_biology_yes">Специализация: лабораторная медицина</string>
+	<string name="poi_health_specialty_osteopathy_yes">Специализация: остеопатия</string>
+	<string name="poi_health_specialty_anaesthetics_yes">Специализация: анестезиология и реанимация</string>
+	<string name="poi_health_specialty_pulmonology_yes">Специализация: пульмонология</string>
+	<string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Специализация: челюстно-лицевая, зубная хирургия</string>
+	<string name="poi_health_specialty_maternity_yes">Специализация: материнство</string>
+	<string name="poi_health_specialty_emergency_medicine_yes">Специализация: скорая и неотложная помощь</string>
+	<string name="poi_health_specialty_emergency_medicine_no">Специализация: скорая и неотложная помощь: отсутствует</string>
+	<string name="poi_health_specialty_plastic_surgery_yes">Специализация: пластическая хирургия</string>
+	<string name="poi_health_specialty_orthodontics_yes">Специализация: ортодонтия</string>
+	<string name="poi_health_specialty_physiotherapy_yes">Специализация: физиотерапия (лечебная физическая культура)</string>
+	<string name="poi_health_specialty_biochemistry_yes">Специализация: биохимия</string>
+	<string name="poi_health_specialty_occupational_yes">Специализация: профессиональные болезни</string>
+	<string name="poi_health_specialty_child_psychiatry_yes">Специализация: детская психиатрия</string>
+	<string name="poi_health_specialty_physiatry_yes">Специализация: реабилитация</string>
+	<string name="poi_health_specialty_maxillofacial_surgery_yes">Специализация: челюстно-лицевая хирургия</string>
+	<string name="poi_health_specialty_diagnostic_radiology_yes">Специализация: лучевая диагностика</string>
+	<string name="poi_health_specialty_gastroenterology_yes">Специализация: гастроэнтерология</string>
+	<string name="poi_health_specialty_dentistry_yes">Специализация: стоматология</string>
+	<string name="poi_health_specialty_nephrology_yes">Специализация: нефрология (почечные заболевания)</string>
+	<string name="poi_health_specialty_neurosurgery_yes">Специализация: нейрохирургия</string>
+	<string name="poi_health_specialty_neuropsychiatry_yes">Специализация: нейропсихиатрия</string>
+	<string name="poi_health_specialty_endocrinology_yes">Специализация: эндокринология</string>
+	<string name="poi_health_specialty_nuclear_medicine_yes">Специализация: ядерная медицина</string>
+	<string name="poi_health_specialty_pathology_yes">Специализация: патанатомия</string>
+	<string name="poi_health_specialty_oncology_yes">Специализация: онкология</string>
+	<string name="poi_health_specialty_tropical_medicine_yes">Специализация: тропическая медицина</string>
+	<string name="poi_health_specialty_tropical_medicine_no">Специализация: тропическая медицина: отсутствует</string>
+	<string name="poi_health_specialty_obstetrics_postnatal_yes">Специализация: акушерство (послеродовое)</string>
+	<string name="poi_health_specialty_obstetrics_postnatal_no">Специализация: акушерство (послеродовое): отсутствует</string>
+	<string name="poi_health_specialty_obstetrics_antenatal_yes">Специализация: акушерство (дородовое)</string>
+	<string name="poi_health_specialty_obstetrics_antenatal_no">Специализация: акушерство (дородовое): отсутствует</string>
+	<string name="poi_health_specialty_social_paediatrics_yes">Специализация: социальная педиатрия</string>
+	<string name="poi_health_specialty_social_paediatrics_no">Специализация: социальная педиатрия: отсутствует</string>
+	<string name="poi_health_specialty_obstetrics_caesarean_section_yes">Специализация: акушерство (кесарево сечение)</string>
+	<string name="poi_health_specialty_obstetrics_caesarean_section_no">Специализация: акушерство (кесарево сечение): отсутствует</string>
+	<string name="poi_health_specialty_addiction_medicine_yes">Специализация: наркология</string>
+	<string name="poi_health_specialty_optometry_yes">Специализация: оптометрия</string>
+	<string name="poi_health_specialty_clinical_pathology_yes">Специализация: клиническая патология</string>
+	<string name="poi_health_specialty_speech_therapy_yes">Специализация: логопед</string>
+	<string name="poi_health_specialty_manual_therapy_yes">Специализация: мануальная терапия</string>
+	<string name="poi_health_specialty_sports_medicine_yes">Специализация: спортивная медицина</string>
+	<string name="poi_health_specialty_podology_yes">Специализация: подология</string>
+	<string name="poi_health_specialty_adult_psychiatry_yes">Специализация: психиатрия для взрослых</string>
+	<string name="poi_health_specialty_acupuncture_yes">Специализация: акупунктура</string>
+	<string name="poi_health_specialty_homeopathy_yes">Специализация: гомеопатия</string>
+	<string name="poi_health_specialty_traditional_chinese_medicine_yes">Специализация: традиционная китайская медицина</string>
+	<string name="poi_health_specialty_reiki_yes">Специализация: рейки</string>
+	<string name="poi_health_specialty_herbalism_yes">Специализация: травничество</string>
+	<string name="poi_health_specialty_chiropractic_yes">Специализация: хиропрактика</string>
+	<string name="poi_health_specialty_naturopathy_yes">Специализация: натуропатия</string>
+	<string name="poi_health_specialty_depth_psychology_yes">Специализация: глубинная психология</string>
+	<string name="poi_health_specialty_behavior_yes">Специализация: бихевиоральная (поведенческая) психотерапия</string>
+
 </resources>
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>

+    <string name="shared_string_location">Местоположение</string>
    <string name="poi_context_menu_modify_osm_change">Редактировать POI</string>
    <string name="osm_edit_reopened_note">Заметка OSM открыта снова</string>
    <string name="osm_edit_commented_note">К заметке OSM добавлен комментарий</string>
@ -53,7 +54,7 @@
    <string name="layer_recordings">Слой аудиозаписей</string>
    <string name="recording_can_not_be_played">Запись не может быть воспроизведена</string>
    <string name="recording_context_menu_delete">Удалить запись</string>
-    <string name="recording_context_menu_play">Воспроизвести</string>
+    <string name="recording_context_menu_play">Проиграть</string>
    <string name="recording_description">Запись %1$s %3$s %2$s</string>
    <string name="recording_default_name">Запись</string>
    <string name="map_widget_av_notes">Аудио заметки</string>
@ -220,7 +221,7 @@
    <string name="local_index_items_restored">%1$d из %2$d объектов успешно активированы.</string>
    <string name="local_index_no_items_to_do">Нет объектов, чтобы %1$s</string>
    <string name="local_index_action_do">Вы собираетесь %1$s %2$s объектов. Вы уверены?</string>
-    <string name="local_index_descr_title">Загрузить карты</string>
+    <string name="local_index_descr_title">Управление картами</string>
    <string name="local_index_mi_restore">Активировать</string>
    <string name="local_index_mi_backup">Архивировать</string>
    <string name="local_index_mi_reload">Перечитать с SD-накопителя</string>
@ -360,7 +361,7 @@
    <string name="filter_existing_indexes">Загруженные</string>
    <string name="general_settings_descr">Настройки экрана, локализации, единиц измерения и другие</string>
    <string name="general_settings">Общие</string>
-    <string name="index_settings">Загрузить карты</string>
+    <string name="index_settings">Управление картами</string>
    <string name="osmand_service">Фоновый режим</string>
    <string name="osmand_service_descr">Запустить OsmAnd в фоновом режиме для записи трека и навигации</string>
    <string name="fast_route_mode">Скоростной маршрут</string>
@ -1792,7 +1793,7 @@
    <string name="show_free_version_banner">Показывать баннер бесплатной версии</string>
    <string name="show_free_version_banner_description">Даже если у вас купленная версия вы также можете видеть баннер для бесплатной версии</string>
    <string name="confirm_download_roadmaps">Вы уверены, что хотите скачать карту автодорог, даже если у вас есть полная карта?</string>
-    <string name="value_downloaded_from_max">%1$.1f из %2$.1f Мб</string>
+    <string name="value_downloaded_of_max">%1$.1f из %2$.1f Мб</string>
    <string name="file_size_in_mb">%.1f МБ</string>
    <string name="update_all">Обновить все (%1$s МБ)</string>
    <string name="free_downloads_used">Использовано бесплатных загрузок</string>
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@ -92,7 +92,7 @@
 	<string name="poi_emergency_access_point">Logu de intrada de emergèntzia</string>

 	<string name="poi_ford">Badu</string>
-	<string name="poi_mountain_pass_yes">Coladòrgiu montanu</string>
+	<string name="poi_mountain_pass">Coladòrgiu montanu</string>
 	<string name="poi_gate">Ponte</string>
 	<string name="poi_city_wall">Murallas de sa tzitade</string>
 	<string name="poi_lift_gate">Ponte levatòiu</string>
@ -1296,7 +1296,7 @@
 	<string name="poi_pump_manual">Pompa manuale</string>
 	<string name="poi_pump_powered">Pompa automàtica</string>
 	<string name="poi_pump_no">Chene pompa</string>
-	<string name="poi_pump">Pompa</string>
+	<string name="poi_pump_yes">Pompa</string>

 	<string name="poi_building">Edifìtziu</string>
 	<string name="poi_information_guidepost">Indicadore istradale</string>
@ -1547,7 +1547,7 @@
 	<string name="poi_aerialway_summer_access_exit">Atzessu in s\'istiu: essida ebbia</string>
 	<string name="poi_aerialway_summer_access_both">Atzessu in s\'istiu: intrada e essida</string>

-	<string name="poi_railway_crossing">Coladòrgiu a livellu</string>
+	<string name="poi_railway_crossing">Coladòrgiu pedonale a livellu</string>
 	<string name="poi_historic_yes">Ogetu istòricu</string>
 	<string name="poi_surveillance_yes">Bardiamentu: eja</string>
 	<string name="poi_shop_yes">Cun butega</string>
@ -1608,7 +1608,7 @@
 	<string name="poi_wiki_lang_mk">Wiki in matzèdone</string>
 	<string name="poi_wiki_lang_ml">Wiki in malayam</string>
 	<string name="poi_wiki_lang_mr">Wiki in marathi</string>
-	<string name="poi_wiki_lang_nds">Wiki in bassu-sassone</string>
+	<string name="poi_wiki_lang_nds">Wiki in bassu-sàssone</string>
 	<string name="poi_wiki_lang_nv">Wiki in Navajo</string>
 	<string name="poi_wiki_lang_os">Wiki in ossetiu</string>
 	<string name="poi_wiki_lang_pms">Wiki in piemontesu</string>
@ -1739,4 +1739,120 @@
 	<string name="poi_sally_port">Barriera coberta cun ghenna dòpia</string>
 	<string name="poi_swing_gate">Cantzellu girèvole</string>
 	<string name="poi_kent_carriage_gap">Coladòrgiu pro carros a caddu</string>
+	<string name="poi_commercial">Àrea de ufìtzios cummertziales</string>
+	<string name="poi_retail">Àrea de cummèrtziu</string>
+
+	<string name="poi_rescue_station">Istatzione de sarvamentu</string>
+
+	<string name="poi_mini_roundabout">Mini rutunda</string>
+	<string name="poi_railway_level_crossing">Coladòrgiu a livellu</string>
+	<string name="poi_bird_hide">Logu pro abbaidare pugiones</string>
+	<string name="poi_horse_riding">Ecuitatzione</string>
+	<string name="poi_leisure_common">Logu comune pro su tempus lìberu</string>
+	<string name="poi_passing_place">Logu de coladòrgiu</string>
+	<string name="poi_dead_wood">Linna morta</string>
+
+	<string name="poi_stars_1s">Isteddas: 1S (turista superiore)</string>
+	<string name="poi_stars_2">Isteddas: 2 (istandard)</string>
+	<string name="poi_stars_2s">Isteddas: 2S (istandard superiore)</string>
+	<string name="poi_stars_3">Isteddas: 3 (discansosu)</string>
+	<string name="poi_stars_3s">Isteddas: 3S (discansu superiore)</string>
+	<string name="poi_stars_4">Isteddas: 4 (prima classe)</string>
+	<string name="poi_stars_4s">Isteddas: 4S (prima classe superiore)</string>
+	<string name="poi_stars_5">Isteddas: 5 (lussu)</string>
+	<string name="poi_stars_5s">Isteddas: 5S (lussu superiore)</string>
+	<string name="poi_stars_6">Isteddas: 6</string>
+	<string name="poi_stars_7">Isteddas: 7</string>
+	<string name="poi_rooms">Aposentos</string>
+
+	<string name="poi_love_hotel">Albergu de s’amore</string>
+
+	<string name="poi_payment_coins_yes">Atzetat monedas</string>
+	<string name="poi_payment_coins_no">No atzetat monedas</string>
+	<string name="poi_payment_coins_0.5">Atzetat monedas de $0.5</string>
+	<string name="poi_payment_coins_50c12">Atzetat monedas de 50 cent, 1€ e 2€</string>
+	<string name="poi_payment_telephone_cards_yes">Atzetat cartas telefònicas</string>
+	<string name="poi_payment_telephone_cards_no">No atzetat cartas telefònicas</string>
+	<string name="poi_payment_credit_cards_yes">Atzetat cartas de crèditu</string>
+	<string name="poi_payment_credit_cards_no">No atzetat cartas de crèditu</string>
+	<string name="poi_payment_notes_yes">Atzetat banconotas</string>
+	<string name="poi_payment_notes_no">No atzetat banconotas</string>
+	<string name="poi_payment_bitcoin_yes">Atzetat Bitcoin</string>
+	<string name="poi_payment_bitcoin_no">No atzetat Bitcoin</string>
+	<string name="poi_payment_visa_yes">Atzetat cartas Visa</string>
+	<string name="poi_payment_visa_no">No atzetat cartas Visa</string>
+	<string name="poi_payment_mastercard_yes">Atzetat cartas MasterCard</string>
+	<string name="poi_payment_mastercard_no">No atzetat cartas MasterCard</string>
+	<string name="poi_payment_none">De badas</string>
+	<string name="poi_seats">Banchinas</string>
+	<string name="poi_backrest_yes">Ischinale: eja</string>
+	<string name="poi_backrest_no">Ischinale: nono</string>
+
+	<string name="poi_intermittent">Intermittente</string>
+
+	<string name="poi_deadlock">Puntu mortu (deadlock)</string>
+
+	<string name="poi_information_trail_blaze">Marcadura de sas camineras</string>
+	<string name="poi_piste_grooming_classic">Ammaniamentu pista: clàssicu</string>
+	<string name="poi_piste_grooming_classic_skating">Ammaniamentu pista: clàssicu + patinàgiu</string>
+	<string name="poi_piste_grooming_backcountry">Ammaniamentu pista: fora de pista</string>
+	<string name="poi_piste_grooming_scooter">Ammaniamentu pista: motoreta (scooter)</string>
+	<string name="poi_piste_grooming_skating">Ammaniamentu pista: patinàgiu</string>
+	<string name="poi_piste_grooming_no">Ammaniamentu pista: perunu</string>
+	<string name="poi_piste_grooming_mogul">Ammaniamentu pista: tzumbas/gobbas</string>
+
+	<string name="poi_stars_1">Isteddas: 1 (turista)</string>
+	<string name="poi_payment_cash_yes">Atzetat dinare contante</string>
+	<string name="poi_payment_cash_no">No atzetat dinare contante</string>
+	<string name="poi_payment_debit_cards_yes">Atzetat cartas de dèpidu</string>
+	<string name="poi_payment_debit_cards_no">No atzetat cartas de dèpidu</string>
+	<string name="poi_payment_account_cards_yes">Atzetat cartas de contu</string>
+	<string name="poi_payment_account_cards_no">No atzetat cartas de contu</string>
+	<string name="poi_payment_maestro_yes">Atzetat cartas Maestro</string>
+	<string name="poi_payment_maestro_no">No atzetat cartas Maestro</string>
+	<string name="poi_payment_american_express_yes">Atzetat cartas American Express (AMEX)</string>
+	<string name="poi_payment_american_express_no">No atzetat cartas American Express (AMEX)</string>
+	<string name="poi_payment_diners_club_yes">Atzetat cartas Diners Club</string>
+	<string name="poi_payment_diners_club_no">No atzetat cartas Diners Club</string>
+	<string name="poi_payment_dkv_yes">Atzetat cartas DKV</string>
+	<string name="poi_payment_dkv_no">No atzetat cartas DKV</string>
+	<string name="poi_payment_uta_yes">Atzetat cartas UTA</string>
+	<string name="poi_payment_uta_no">No atzetat cartas UTA</string>
+	<string name="poi_payment_efectivo_yes">Atzetat \"efectivo\"</string>
+	<string name="poi_payment_efectivo_no">No atzetat \"efectivo\"</string>
+	<string name="poi_payment_girocard_yes">Atzetat cartas Girocard</string>
+	<string name="poi_payment_girocard_no">No atzetat cartas Girocard</string>
+	<string name="poi_payment_discover_card_yes">Atzetat cartas Discover Card</string>
+	<string name="poi_payment_discover_card_no">No atzetat cartas Discover Card</string>
+	<string name="poi_payment_visa_electron_yes">Atzetat cartas Visa Electron</string>
+	<string name="poi_payment_visa_electron_no">No atzetat cartas Visa Electron</string>
+	<string name="poi_payment_litecoin_yes">Atzetat Litecoin</string>
+	<string name="poi_payment_litecoin_no">No atzetat Litecoin</string>
+	<string name="poi_payment_cheque_yes">Atzetat assegnos</string>
+	<string name="poi_payment_cheque_no">No atzetat assegnos</string>
+	<string name="poi_payment_pikepass_yes">Atzetat PIKEPASS</string>
+	<string name="poi_payment_pikepass_no">No atzetat PIKEPASS</string>
+	<string name="poi_payment_pikepass_designated">Atzetat PIKEPASS (desinnadu)</string>
+	<string name="poi_payment_visa_debit_yes">Atzetat cartas Visa Debit</string>
+	<string name="poi_payment_visa_debit_no">No atzetat cartas Visa Debit</string>
+	<string name="poi_payment_cryptocurrencies_no">No atzetat criptomonedas</string>
+	<string name="poi_payment_others_yes">Atzetat àteras maneras de pagamentu</string>
+	<string name="poi_payment_others_no">No atzetat àteras maneras de pagamentu</string>
+	<string name="poi_payment_routex_yes">Atzetat cartas Routex pro su combustìbile</string>
+	<string name="poi_payment_routex_no">No atzetat cartas Routex pro su combustìbile</string>
+	<string name="poi_payment_bancomat_yes">Atzetat cartas Bàncomat</string>
+	<string name="poi_payment_bancomat_no">No atzetat cartas Bàncomat</string>
+	<string name="poi_payment_dogecoin_yes">Atzetat Dogecoins</string>
+	<string name="poi_payment_dogecoin_no">No atzetat Dogecoins</string>
+	<string name="poi_payment_paypal_yes">Atzetat PayPal</string>
+	<string name="poi_payment_paypal_no">No atzetat PayPal</string>
+	<string name="poi_payment_yandexmoney_yes">Atzetat Yandex.Money</string>
+	<string name="poi_payment_yandexmoney_no">No atzetat Yandex.Money</string>
+	<string name="poi_description_payment">Informatziones de pagamentu</string>
+
+	<string name="poi_internet_access_fee_yes">Atzessu a ìnternet - a pagamentu</string>
+	<string name="poi_internet_access_fee_no">Atzessu a ìnternet - de badas</string>
+
+	<string name="poi_payment_laser_yes">Atzetat cartas Laser</string>
+	<string name="poi_payment_laser_no">No atzetat cartas Laser</string>
 	</resources>
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@ -44,7 +44,7 @@
    <string name="lang_pt">Portughesu</string>
    <string name="lang_ro">Rumenu</string>
    <string name="lang_ru">Russu</string>
-    <string name="lang_sk">Slovaccu</string>
+    <string name="lang_sk">Islovacu</string>
    <string name="lang_sl">Islovenu</string>
    <string name="lang_es">Ispagnolu/Ispanniolu</string>
    <string name="lang_sv">Isvedesu</string>
@ -979,7 +979,7 @@
    <string name="old_poi_file_should_be_deleted">Su documentu de datos PDI \'%1$s\' est bundajolu e podet èssere burrau.</string>
    <string name="update_poi_file_not_found">Su documentu pro registrare sas modìficas de sos PDI no est istadu ne agatadu nen creadu.</string>
    <string name="map_version_changed_info">In su server bi sunt documentos de mapas non compatìbiles cun sa versione atuale de su programma. Pro los iscarrigare e impreare agiorna s’aplicu a s\'ùritma versione.</string>
-    <string name="shared_string_rename">Torra a numenare</string>
+    <string name="shared_string_rename">Càmbia su nùmene</string>
    <string name="search_position_undefined">Non dessinidu</string>

    <string name="search_position_current_location">Positzione currente…</string>
@ -1931,11 +1931,11 @@
    <string name="favorite_category_name">Nùmene de sa categoria</string>
    <string name="favorite_category_add_new_title">Annanghe una categoria noa</string>
    <string name="confirm_download_roadmaps">Seguru ses de bòlere iscarrigare sa mapa cun petzi sas istradas, fintzas si tenes giai cussa cumprida?</string>
-    <string name="value_downloaded_from_max">%1$.1f dae %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f dae %2$.1f MB</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="update_all">Agiorna totu (%1$s MB)</string>
    <string name="free_downloads_used">Iscarrigamentos gratùitos impreados</string>
-    <string name="free_downloads_used_description">Podes impostare cantos iscarrigamentos gratùitos as impreadu</string>
+    <string name="free_downloads_used_description">Ammustra sos iscarrigamentos de badas impreados</string>
    <string name="simulate_initial_startup_descr">Imposta sa bandera chi indicat sa prima allumingiadura de s\'aplicatzione, mantène totu sas àteras impostaziones comente sunt</string>
    <string name="simulate_initial_startup">Sìmula sa prima allumingiadura de s’aplicatzione</string>
    <string name="share_geo">geo:</string>
@ -2025,4 +2025,7 @@
    <string name="access_from_map">Intra dae sa mapa</string>
    <string name="release_2_2">" • Interfache impitadore noa pro incarcare positziones in sa mapa e in àteros ischermos\n\n • S\'ischermu de sa mapa est como postu come prima cosa a s’allumìngiu de s’aplicatzione, semper chi \'Ammustra pannellu de controllu in s\'allumìngiu\' no siet ischertadu\n\n • Como podes cunfigurare sas impostatziones pro isseberare cales sunt sas ischedas chi diant dèper’èssere ammustradas in su pannellu e comente\n\n • Brinca su pannellu de controllu, si preferis a impreare su menù pro sa gestione de s’aplicatzione\n\n • Pro iscarrigare mapas, sas regiones podent èssere ischertadas deretamente incarchende in sa mapa generale de su mundu\n\n • Sa chirca de PDI como suportat chircas prus dislindadas\n\n • Megioradas sas funtzionalidades de modìficas de PDI e OSM\n\n • Istrutura e s\'interfache de iscarrigamentu datos mapas torrada a fàghere\n\n e àteru... "</string>
    <string name="please_specify_poi_type_only_from_list">"Dislinda sa casta curreta de PDI o brinca custa parte. "</string>
-    </resources>
+    <string name="routing_attr_avoid_stairs_name">Istransi sas iscalas</string>
+	<string name="routing_attr_avoid_stairs_description">Istransi sas iscalas</string>
+	<string name="routing_attr_avoid_borders_name">Istransi sa rugradura de sas fronteras</string>
+	</resources>
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@ -123,7 +123,7 @@
 	<string name="poi_emergency_access_point">Bod príchodu záchrany</string>

 	<string name="poi_ford">Brod</string>
-	<string name="poi_mountain_pass_yes">Horský priesmyk</string>
+	<string name="poi_mountain_pass">Horský priesmyk</string>
 	<string name="poi_gate">Brána</string>
 	<string name="poi_city_wall">Mestské hradby</string>
 	<string name="poi_lift_gate">Závora</string>
@ -1319,7 +1319,7 @@

 	<string name="poi_wheelchair_no">Invalidný vozík: nepovolený</string>
 	<string name="poi_wheelchair_limited">Invalidný vozík: obmedzene</string>
-	<string name="poi_pump">Čerpadlo</string>
+	<string name="poi_pump_yes">Čerpadlo</string>

 	<string name="poi_garden_type_residential">Typ záhrady: v obytnej oblasti</string>
 	<string name="poi_garden_type_community">Typ záhrady: spoločenstvo</string>
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@ -1842,12 +1842,12 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
    <string name="favorite_category_dublicate_message">Zadaný názov kategórie už existuje. Prosím zadajte iný názov.</string>
    <string name="favorite_category_name">Názov kategórie</string>
    <string name="favorite_category_add_new_title">Pridať novú kategóriu</string>
-    <string name="confirm_download_roadmaps">Naozaj chcete stiahnuť mapu ciest, keď už máte plnú mapu?</string>
-    <string name="value_downloaded_from_max">%1$.1f z %2$.1f MB</string>
+    <string name="confirm_download_roadmaps">Naozaj chcete stiahnuť mapu obsahujúcu iba cesty, keď už máte štandardnú (plnú) mapu?</string>
+    <string name="value_downloaded_of_max">%1$.1f z %2$.1f MB</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="update_all">Aktualizovať všetko (%1$s MB)</string>
    <string name="free_downloads_used">Počet použitých voľných stiahnutí</string>
-    <string name="free_downloads_used_description">Môžete nastaviť, koľko voľných stiahnutí ste už použili</string>
+    <string name="free_downloads_used_description">Zobrazuje počet využitých stiahnutí</string>
    <string name="simulate_initial_startup_descr">Nastaví príznak indikujúci prvý štart aplikácie, ostatné nastavenia ponechá nezmenené</string>
    <string name="simulate_initial_startup">Simulovať prvé spustenie aplikácie</string>
    <string name="share_geo">geo:</string>
@ -1934,4 +1934,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
    <string name="use_dashboard_btn">Použiť úvodný panel</string>
    <string name="use_drawer_btn">Použiť menu</string>
    <string name="please_specify_poi_type_only_from_list">"Prosím zadajte správny typ POI alebo ho preskočte. "</string>
-    </resources>
+    <string name="routing_attr_avoid_stairs_name">Vyhnúť sa schodom</string>
+	<string name="routing_attr_avoid_stairs_description">Vyhnúť sa schodom</string>
+	<string name="routing_attr_avoid_borders_name">Vyhnúť sa hraničným priechodom</string>
+	</resources>
--- a/OsmAnd/res/values-sl/phrases.xml
+++ b/OsmAnd/res/values-sl/phrases.xml
@ -69,7 +69,7 @@
 	<string name="poi_fire_hydrant">Hidrant</string>
 	<string name="poi_fire_extinguisher">Gasilni aparat</string>
 	<string name="poi_ambulance_station">Reševalna postaja</string>
-	<string name="poi_mountain_pass_yes">Gorski prelaz</string>
+	<string name="poi_mountain_pass">Gorski prelaz</string>
 	<string name="poi_city_wall">Mestno obzidje</string>
 	<string name="poi_car_wash">Avtopralnica</string>
 	<string name="poi_fuel">Bencinski servis</string>
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@ -767,7 +767,7 @@
    <string name="osmand_net_previously_installed">Nameščena je starejša različica programa OsmAnd. Vsi nepovezani podatki so podprti v novi različici, vendar je treba najprej izvoziti vse priljubljene točke in jih nato ponovno uvoziti v novejšo različico.</string>
    <string name="build_installed">Različica izgradnje {0} je bila uspešno nameščena ({1}).</string>
    <string name="downloading_build">Prejemanje različice …</string>
-    <string name="install_selected_build">Ali želite namestiti program OsmAnd - {0} z {1} {2}MB?</string>
+    <string name="install_selected_build">Ali želite namestiti program OsmAnd - {0} od {1} {2} MB?</string>
    <string name="loading_builds_failed">Pridobivanje seznama različic OsmAnd je spodletelo</string>
    <string name="loading_builds">Nalaganje različic OsmAnd …</string>
    <string name="select_build_to_install">Izbor različice programa OsmAnd za posodobitev</string>
@ -1935,11 +1935,11 @@
    <string name="favorite_category_name">Ime kategorije</string>
    <string name="favorite_category_add_new_title">Dodaj kategorijo</string>
    <string name="confirm_download_roadmaps">Ali ste prepričani, da želite prejeti zemljevid le s podatki cest, čeprav je nameščen že polni zemljevid?</string>
-    <string name="value_downloaded_from_max">%1$.1f od %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f od %2$.1f MB</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="update_all">Posodobi vse (%1$s MB)</string>
    <string name="free_downloads_used">Omejitev brezplačnih prejemov je dosežena.</string>
-    <string name="free_downloads_used_description">Videti je mogoče, koliko brezplačnih prejemov je že bilo izvedenih.</string>
+    <string name="free_downloads_used_description">Prikazuje število izvedenih brezplačnih prejemov</string>
    <string name="osm_edit_created_poi">Ustvarjena točka POI</string>
    
    <string name="shared_string_qr_code">Koda QR</string>
@ -2029,4 +2029,7 @@
    <string name="dashboard_or_drawer_description">Ob meniju je po novem na voljo možnost upravljanja s programom preko prilagodljive nadzorne plošče. Možnost je mogoče spremeniti med nastavitvami.</string>
 <string name="osm_edit_commented_note">Opomba OSM z dodatnimi zapisi</string>
    <string name="release_2_2">" • Prenovljen in posodobljen vmesnik, ki omogoča izbiranje mest na zemljevidu in prek drugih pogledov\n\n • Pogled zemljevida se zažene neposredno, če ni izbrana možnost \"Pokaži nadzorno ploščo ob zagonu programa\"\n\n • Možnost nastavitve prikazanih ikon v nadzorni plošči\n\n • Možnost zamenjave nadzorne plošče z menijem\n\n • Prejemanje zemljevidov je sedaj na voljo z enostavnim klikom na državo ali regijo na svetovnem zemljevidu\n\n • Iskanje točk POI podpira tudi podrobnejše poizvedbe\n\n • Izboljšane možnosti urejanja točk POI in OSM\n\n • Vmesnik za prejem zemljevidov je poenostavljen\n\n in še veliko več ... "</string>
-    </resources>
+    <string name="routing_attr_avoid_stairs_name">Izogni se stopnicam</string>
+	<string name="routing_attr_avoid_stairs_description">Izogni se stopnicam</string>
+	<string name="routing_attr_avoid_borders_name">Izogni se mejnim prehodom</string>
+	</resources>
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@ -561,7 +561,7 @@
    <string name="osmand_net_previously_installed">En tidigare OsmAnd-version är installerad. Alla offline-data kommer att stödjas av den nya appen. Men favoritpunkter bör exporteras från den gamla appen och senare importeras i den nya.</string>
    <string name="build_installed">Bygge {0} installerades korrekt ({1}).</string>
    <string name="downloading_build">Laddar ner kompilering …</string>
-    <string name="install_selected_build">Vill du installera OsmAnd - {0} från {1}{2} MB?</string>
+    <string name="install_selected_build">Vill du installera OsmAnd - {0} av {1}{2} MB?</string>
    <string name="loading_builds_failed">Hämtar en lista över misslyckade OsmAnd-byggen</string>
    <string name="loading_builds">Laddar OsmAnd-kompileringar …</string>
    <string name="select_build_to_install">Välj en OsmAnd-kompilering att installera</string>
@ -1920,10 +1920,10 @@
    <string name="favorite_category_add_new_title">Lägg till en ny kategori</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="confirm_download_roadmaps">Är du säker på att du vill hämta kartan med enbart vägar trots att du redan har den fullständiga kartan?</string>
-    <string name="value_downloaded_from_max">%1$.1f av %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f av %2$.1f MB</string>
    <string name="update_all">Uppdatera alla (%1$s MB)</string>
    <string name="free_downloads_used">Gratis nedladdningar hämtade</string>
-    <string name="free_downloads_used_description">Du kan ange hur många gratis nedladdningar som du har gjort</string>
+    <string name="free_downloads_used_description">Visar antalet gratisnedladdningar du gjort</string>
    <string name="downloading_number_of_files">Hämtar - %1$d fil(er)</string>

    <string name="share_geo">geo:</string>
@ -2009,4 +2009,13 @@
 	<string name="shared_string_commit">Skicka in</string>
 	
    <string name="please_specify_poi_type_only_from_list">"Ange rätt POI-typ eller hoppa över det. "</string>
-    </resources>
+    <string name="rendering_attr_roadStyle_description">Vägtyp</string>
+    <string name="osm_edit_reopened_note">Öppnat OSM-anteckning igen</string>
+    <string name="routing_attr_avoid_stairs_name">Undvik trappor</string>
+	<string name="routing_attr_avoid_stairs_description">Undvik trappor</string>
+	<string name="routing_attr_avoid_borders_name">Undvik gränsövergång</string>
+	<string name="simulate_initial_startup">Simulera första appstarten</string>
+    <string name="action_create">Åtgärd skapa</string>
+	<string name="action_modify">Åtgärd ändra</string>
+	<string name="action_delete">Åtgärd ta bort</string>
+	</resources>
--- a/OsmAnd/res/values-tr/phrases.xml
+++ b/OsmAnd/res/values-tr/phrases.xml
@ -179,7 +179,7 @@
 	<string name="poi_emergency_access_point">Acil erişim noktası</string>

 	<string name="poi_ford">Geçit</string>
-	<string name="poi_mountain_pass_yes">Dağ geçidi</string>
+	<string name="poi_mountain_pass">Dağ geçidi</string>
 	<string name="poi_gate">Kapı</string>
 	<string name="poi_city_wall">Şehir duvarı</string>
 	<string name="poi_lift_gate">Asansör kapısı</string>
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@ -106,7 +106,7 @@
 	<string name="poi_emergency_access_point">Місце отримання невідкладної допомоги</string>

 	<string name="poi_ford">Брід</string>
-	<string name="poi_mountain_pass_yes">Перевал</string>
+	<string name="poi_mountain_pass">Перевал</string>
 	<string name="poi_gate">Ворота</string>
 	<string name="poi_city_wall">Міська стіна</string>
 	<string name="poi_lift_gate">Шлагбаум</string>
@ -236,7 +236,7 @@
 	<string name="poi_free_flying">Магазин для стрибків з парашутом</string>
 	<string name="poi_furnace">Магазин обігрівачів</string>
 	<string name="poi_garden_furniture">Магазин садових меблів</string>
-	<string name="poi_fuel_biogas">Біопаливо(Е85)</string>
+	<string name="poi_fuel_biogas">Біогаз</string>
 	<string name="poi_halt">Зупинка поїздів</string>
 	<string name="poi_subway_entrance">Вхід в метро</string>
 	<string name="poi_subway_station">Станція метро</string>
@ -269,4 +269,9 @@

 <string name="poi_energy">Енергетичний магазин</string>
 	<string name="poi_fuel_1_50">Паливо 1:50</string>
+	<string name="poi_doors">Двері</string>
+	<string name="poi_perfumery">Парфумерія</string>
+
+	<string name="poi_lighthouse">Маяк</string>
+
 	</resources>
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@ -152,7 +152,7 @@
 	<string name="poi_emergency_access_point">森林緊急利用點</string>

 	<string name="poi_ford">低窪路段</string>
-	<string name="poi_mountain_pass_yes">隘口</string>
+	<string name="poi_mountain_pass">隘口</string>
 	<string name="poi_gate">門</string>
 	<string name="poi_city_wall">城牆</string>
 	<string name="poi_lift_gate">電動柵欄</string>
@ -1347,7 +1347,7 @@

 <string name="poi_rtsa_scale">RTSA 的難度</string>

-<string name="poi_pump">泵浦</string>
+<string name="poi_pump_yes">泵浦</string>

 	<string name="poi_piste_difficulty_easy">滑雪道難度：容易</string>
 	<string name="poi_piste_difficulty_intermediate">滑雪道難度：中等</string>
@ -1376,7 +1376,7 @@

 <string name="poi_capacity">容量</string>
 	<string name="poi_capacity_disabled_yes">身障人士專用場所</string>
-	<string name="poi_capacity_disabled_no">無身障人士專用場所</string>
+	<string name="poi_capacity_disabled_no">非身障人士專用場所</string>
 	<string name="poi_capacity_disabled">身障人士專用場所</string>
 	<string name="poi_capacity_women_yes">婦女專用場所</string>
 	<string name="poi_capacity_women_no">無婦女專用場所</string>
@ -1610,9 +1610,9 @@
 	<string name="poi_microbrewery_yes">自釀酒廠</string>
 	<string name="poi_microbrewery_no">無自釀酒廠</string>

-	<string name="poi_takeaway_yes">腳架</string>
-	<string name="poi_takeaway_no">無腳架</string>
-	<string name="poi_takeaway_only">只有腳架</string>
+	<string name="poi_takeaway_yes">外帶</string>
+	<string name="poi_takeaway_no">無外帶</string>
+	<string name="poi_takeaway_only">只有外帶</string>

 	<string name="poi_delivery_yes">外送</string>
 	<string name="poi_delivery_no">沒外送</string>
@ -1826,7 +1826,7 @@
 	<string name="poi_internet_access_type_wired">網際網路存取類型：有線網路</string>
 	<string name="poi_internet_access_type_public">網際網路存取類型：公共網路</string>
 	<string name="poi_internet_access_type_service">網際網路存取類型：網路服務</string>
-	<string name="poi_internet_access_type_no">網際網路存取類型：無</string>
+	<string name="poi_internet_access_type_no">無網際網路存取</string>

 	<string name="poi_maxwidth">最大寬度</string>
 	<string name="poi_iata">IATA 編碼</string>
@ -2026,8 +2026,8 @@

 	<string name="poi_fuel_91ul">91UL 燃料</string>
 	<string name="poi_fuel_100ll">100LL 燃料</string>
-	<string name="poi_autogas">液化石油氣</string>
-	<string name="poi_jeta1">Jet A-1 燃料</string>
+	<string name="poi_fuel_autogas">液化石油氣</string>
+	<string name="poi_fuel_jeta1">Jet A-1 燃料</string>
 	<string name="poi_fuel_adblue">AdBlue 燃料</string>

 	<string name="poi_fuel_wood">燃料：木材</string>
@ -2184,4 +2184,114 @@
 	<string name="poi_social_facility_for_diseased">目標社群：病患者</string>
 	<string name="poi_social_facility_for_child_juvenile">目標社群：兒童；青少年</string>

+	<string name="poi_internet_access_type_yes">有網際網路存取</string>
+
+	<string name="poi_theatre_genre_philharmonic">文藝類型：愛樂團體</string>
+	<string name="poi_theatre_genre_musical">文藝類型：音樂</string>
+	<string name="poi_theatre_genre_drama">文藝類型：戲劇</string>
+	<string name="poi_theatre_genre_opera">文藝類型：歌劇</string>
+	<string name="poi_theatre_genre_cabaret">文藝類型：歌舞</string>
+	<string name="poi_theatre_genre_puppet">文藝類型：木偶</string>
+	<string name="poi_theatre_genre_comedy">文藝類型：喜劇</string>
+	<string name="poi_theatre_genre_chamber_music">文藝類型：室內樂</string>
+	<string name="poi_theatre_genre_marionette">文藝類型：線木偶</string>
+	<string name="poi_theatre_genre_ballet">文藝類型：芭蕾舞</string>
+	<string name="poi_theatre_genre_shadow_play">文藝類型：皮影戲</string>
+
+	<string name="poi_bandstand">演奏台</string>
+	<string name="poi_kiln">窯</string>
+	<string name="poi_product_brick">產品：磚</string>
+	<string name="poi_product_quicklime">產品：生石灰</string>
+	<string name="poi_product_leather">產品：皮革</string>
+	<string name="poi_product_lime">產品：石灰</string>
+	<string name="poi_product_beer">產品：啤酒</string>
+	<string name="poi_product_charcoal">產品：木炭</string>
+	<string name="poi_product_meat">產品：肉品</string>
+
+	<string name="poi_wheelchair_description">輪椅使用者說明</string>
+	<string name="poi_blind_description">爲盲人的說明</string>
+	<string name="poi_deaf_description">爲聾人的說明</string>
+
+	<string name="poi_highway_steps">樓梯</string>
+	<string name="poi_handrail_yes">扶手：有</string>
+	<string name="poi_handrail_no">扶手：無</string>
+	<string name="poi_ramp_yes">斜坡道：有</string>
+	<string name="poi_ramp_no">斜坡道：無</string>
+	<string name="poi_ramp_wheelchair_yes">供輪椅的斜坡道：有</string>
+	<string name="poi_ramp_wheelchair_no">供輪椅的斜坡道：無</string>
+	<string name="poi_ramp_stroller_yes">斜坡道(折疊式)：有</string>
+	<string name="poi_ramp_stroller_no">斜坡道(折疊式)：無</string>
+	<string name="poi_ramp_bicycle_yes">供自行車的斜坡道：有</string>
+	<string name="poi_ramp_bicycle_no">供自行車的斜坡道：無</string>
+	<string name="poi_ramp_luggage_yes">供行李的斜坡道：有</string>
+	<string name="poi_ramp_luggage_no">供行李的斜坡道：無</string>
+	<string name="poi_step_count">步行計數</string>
+	<string name="poi_step_condition_even">步行條件：平坦</string>
+	<string name="poi_step_condition_uneven">步行條件：不平坦</string>
+	<string name="poi_step_condition_rough">步行條件：高低不平</string>
+
+	<string name="poi_cairn">錐形石堆</string>
+
+	<string name="poi_memorial_fassade_decoration">立面裝飾</string>
+	<string name="poi_defibrillator">電擊器</string>
+	<string name="poi_defibrillator_yes">電擊器：有</string>
+
+	<string name="poi_tomb_tumulus">類型：古墳</string>
+	<string name="poi_tomb_war_grave">類型：戰爭墳墓</string>
+	<string name="poi_tomb_rock_cut">類型：岩石切割</string>
+	<string name="poi_tomb_hypogeum">類型：地下墓室</string>
+	<string name="poi_tomb_vault">類型：墓穴</string>
+	<string name="poi_tomb_columbarium">類型：靈骨塔</string>
+	<string name="poi_tomb_mausoleum">類型：陵墓</string>
+	<string name="poi_tomb_sarcophagus">類型：石棺</string>
+	<string name="poi_tomb_crypt">類型：地穴</string>
+	<string name="poi_tomb_pyramid">類型：金字塔</string>
+
+	<string name="poi_historic_civilization_ancient_roman">文明：古羅馬 (西元前 753 年 - 西元 284 年)</string>
+	<string name="poi_historic_civilization_nuragic">文明：nuragic (西元前18世紀 – 西元前2世紀)</string>
+	<string name="poi_historic_civilization_etruscan">文明：伊特魯里亞 (西元前12世紀 - 西元前6世紀)</string>
+	<string name="poi_historic_civilization_prehistoric">文明：史前的</string>
+	<string name="poi_historic_civilization_ancient_greek">文明：古希臘</string>
+	<string name="poi_historic_civilization_roman">文明：羅馬</string>
+	<string name="poi_historic_civilization_byzantine">文明：拜占庭 (西元285年 - 西元1453 年)</string>
+	<string name="poi_historic_civilization_imperial_chinese">文明：中國皇朝 (西元前221年 - 西元1911年)</string>
+	<string name="poi_historic_civilization_ancient_egyptian">文明：古埃及 (到西元前332年爲止)</string>
+	<string name="poi_historic_civilization_celtic">文明：凱爾特</string>
+	<string name="poi_historic_civilization_western_roman">文明：西方羅馬 (西元285年 – 西元476年)</string>
+	<string name="poi_historic_civilization_mycenaean">文明：美錫尼</string>
+	<string name="poi_historic_civilization_dacian">文明：達基亞</string>
+	<string name="poi_historic_civilization_hernici">文明：hernici</string>
+	<string name="poi_historic_civilization_greek_egyptian">文明：希臘埃及 (西元前332年 – 西元前30年)</string>
+	<string name="poi_historic_civilization_roman_and_byzantine_egyptian">文明：羅馬和拜占庭、埃及</string>
+	<string name="poi_historic_civilization_helladic">文明：希臘青銅期</string>
+	<string name="poi_historic_civilization_cycladic">文明：基克拉澤斯</string>
+	<string name="poi_historic_civilization_minoan">文明：米諾</string>
+	<string name="poi_historic_civilization_tiahuanacota">文明：蒂亞瓦納科</string>
+
+	<string name="poi_animal_training">動物訓練</string>
+	<string name="poi_animal_training_dog">訓狗</string>
+	<string name="poi_animal_training_horse">訓馬</string>
+
+	<string name="poi_horse_yes">准許馬進出</string>
+	<string name="poi_horse_no">不准許馬進出</string>
+	<string name="poi_animal_yes">准許動物進出</string>
+	<string name="poi_animal_no">不准許動物進出</string>
+
+	<string name="poi_stone_type_conciliation_cross">類型：和解十字架</string>
+	<string name="poi_stone_type_coat_of_arms">類型：紋章</string>
+
+	<string name="poi_material_wood">原材料：木頭</string>
+	<string name="poi_material_metal">原材料：金屬</string>
+	<string name="poi_material_reinforced_concrete">原材料：鋼筋混凝土</string>
+	<string name="poi_material_concrete">原材料：混凝土</string>
+	<string name="poi_material_steel">原材料：鋼鐵</string>
+	<string name="poi_material_stone">原材料：石頭</string>
+	<string name="poi_material_masonry">原材料：磚石</string>
+	<string name="poi_material_brick">原材料：磚</string>
+	<string name="poi_material_plastic">原材料：塑膠</string>
+	<string name="poi_material_sandstone">原材料：砂岩</string>
+	<string name="poi_material_granite_stone">原材料：花崗石</string>
+	<string name="poi_material_metal_wood">原材料：金屬、木頭</string>
+	<string name="poi_material_glass">原材料：玻璃</string>
+	<string name="poi_material_bronze">原材料：青銅</string>
 	</resources>
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@ -537,7 +537,7 @@
    <string name="osmand_net_previously_installed">有前一版的 OsmAnd 存在，所有的離線資料將被新版引用。但我的最愛內的標點須以舊版程式匯出後再用新版程式匯入。</string>
    <string name="build_installed">編譯 {0} 成功安裝({1})。</string>
    <string name="downloading_build">正在下載編譯…</string>
-    <string name="install_selected_build">您要安裝 OsmAnd - {0} 由{1} {2} MB ?</string>
+    <string name="install_selected_build">您要安裝 OsmAnd - {0} 的 {1} {2} MB ?</string>
    <string name="loading_builds_failed">檢索 OsmAnd 編譯列表失敗</string>
    <string name="loading_builds">正在載入 OsmAnd 編譯…</string>
    <string name="select_build_to_install">選擇 OsmAnd 編譯安裝</string>
@ -1241,7 +1241,7 @@
    <string name="index_name_canada">北美洲 - 加拿大</string>
    <string name="always_center_position_on_map">位置顯示始終處於中心</string>
    <string name="voice_pref_title">聲音</string>
-    <string name="localization_pref_title">定位</string>
+    <string name="localization_pref_title">所在地</string>
    <string name="interrupt_music_descr">當語音預告時中斷音樂</string>
    <string name="interrupt_music">中斷音樂</string>
    <string name="misc_pref_title">雜項</string>
@ -1917,11 +1917,11 @@
    <string name="favorite_category_name">類別名稱</string>
    <string name="favorite_category_add_new_title">增加新的類別</string>
    <string name="confirm_download_roadmaps">您確定要下載只有道路的地圖，即使您已經擁有標準(完整的)地圖？</string>
-    <string name="value_downloaded_from_max">%1$.1f 從 %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f 從 %2$.1f MB</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="update_all">全部更新 (%1$s MB)</string>
    <string name="free_downloads_used">免費下載使用</string>
-    <string name="free_downloads_used_description">您可以設置，您有使用多少免費下載</string>
+    <string name="free_downloads_used_description">顯示已使用的免費下載</string>
    <string name="simulate_initial_startup_descr">設定標誌指示第一次應用程式啟動，而保持著所有其它設定不變</string>
    <string name="simulate_initial_startup">模擬第一次應用程式啟動</string>
    <string name="share_geo">地理：</string>
@ -2014,4 +2014,7 @@
    <string name="use_dashboard_btn">使用儀表板</string>
    <string name="use_drawer_btn">使用地圖</string>
    <string name="please_specify_poi_type_only_from_list">"請指定正確的興趣點類型或跳過它。 "</string>
-    </resources>
+    <string name="routing_attr_avoid_stairs_name">避開樓梯</string>
+	<string name="routing_attr_avoid_stairs_description">避開樓梯</string>
+	<string name="routing_attr_avoid_borders_name">避開跨越邊界</string>
+	</resources>
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@ -172,4 +172,10 @@

 	<color name="color_dialog_buttons">#2f7af5</color>
 	<color name="dialog_inactive_text_color_dark">#78909c</color>
+
+	<!-- DownloadedRegionsLayer -->
+	<color name="region_uptodate">#5532C832</color>
+	<color name="region_updateable">#55FF8F00</color>
+	<color name="region_selected">#55FFFF00</color>
+	<color name="region_downloading">#44FF61FF</color>
 </resources>
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@ -183,7 +183,7 @@

 	<string name="poi_ford">Ford</string>
 	<string name="poi_ford_stepping_stones">Step-stone bridge</string>
-	<string name="poi_mountain_pass_yes">Mountain pass</string>
+	<string name="poi_mountain_pass">Mountain pass</string>
 	<string name="poi_gate">Gate</string>
 	<string name="poi_city_wall">City wall</string>
 	<string name="poi_lift_gate">Lift gate</string>
@ -1253,7 +1253,7 @@
 	<string name="poi_pump_manual">Manual pump</string>
 	<string name="poi_pump_powered">Powered pump</string>
 	<string name="poi_pump_no">No pump</string>
-	<string name="poi_pump">Pump</string>
+	<string name="poi_pump_yes">Pump</string>

 	<string name="poi_water_characteristic_mineral">Water characteristic: mineral</string>
 	<string name="poi_water_characteristic_mud">Water characteristic: mud</string>
@ -1804,7 +1804,8 @@
 	<string name="poi_internet_access_type_wired">Internet access type: wired</string>
 	<string name="poi_internet_access_type_public">Internet access type: public</string>
 	<string name="poi_internet_access_type_service">Internet access type: service</string>
-	<string name="poi_internet_access_type_no">Internet access type: no</string>
+	<string name="poi_internet_access_type_no">No Internet access</string>
+	<string name="poi_internet_access_type_yes">With Internet access</string>

 	<string name="poi_maxwidth">Maximum width</string>
 	<string name="poi_iata">IATA code</string>
@ -2004,8 +2005,8 @@

 	<string name="poi_fuel_91ul">91UL fuel</string>
 	<string name="poi_fuel_100ll">100LL fuel</string>
-	<string name="poi_autogas">Autogas</string>
-	<string name="poi_jeta1">Jet A-1 fuel</string>
+	<string name="poi_fuel_autogas">Autogas</string>
+	<string name="poi_fuel_jeta1">Jet A-1 fuel</string>
 	<string name="poi_fuel_adblue">AdBlue fuel</string>

 	<string name="poi_fuel_wood">Fuel: wood</string>
@ -2458,4 +2459,78 @@
 	<string name="poi_craft_electronics">Electronics repair</string>
 	<string name="poi_fireworks">Fireworks store</string>

+	<string name="poi_aerialway_length">Length</string>
+
+	<string name="poi_health_specialty_general_yes">Health specialty: general practitioner</string>
+	<string name="poi_health_specialty_ophthalmology_yes">Health specialty: ophthalmology</string>
+	<string name="poi_health_specialty_gynaecology_yes">Health specialty: gynaecology</string>
+	<string name="poi_health_specialty_internal_medicine_yes">Health specialty: internal medicine</string>
+	<string name="poi_health_specialty_orthopaedics_yes">Health specialty: orthopaedics</string>
+	<string name="poi_health_specialty_otolaryngology_yes">Health specialty: otolaryngology</string>
+	<string name="poi_health_specialty_paediatrics_yes">Health specialty: paediatrics</string>
+	<string name="poi_health_specialty_paediatrics_no">Health specialty: paediatrics: no</string>
+	<string name="poi_health_specialty_dermatology_yes">Health specialty: dermatology</string>
+	<string name="poi_health_specialty_urology_yes">Health specialty: urology</string>
+	<string name="poi_health_specialty_surgery_yes">Health specialty: general surgery</string>
+	<string name="poi_health_specialty_radiology_yes">Health specialty: radiology</string>
+	<string name="poi_health_specialty_psychiatry_yes">Health specialty: psychiatry</string>
+	<string name="poi_health_specialty_neurology_yes">Health specialty: neurology</string>
+	<string name="poi_health_specialty_dermatovenereology_yes">Health specialty: dermato-venereology</string>
+	<string name="poi_health_specialty_cardiology_yes">Health specialty: cardiology</string>
+	<string name="poi_health_specialty_trauma_yes">Health specialty: traumatology</string>
+	<string name="poi_health_specialty_biology_yes">Health specialty: clinical biology</string>
+	<string name="poi_health_specialty_osteopathy_yes">Health specialty: osteopathy</string>
+	<string name="poi_health_specialty_anaesthetics_yes">Health specialty: anaesthetics</string>
+	<string name="poi_health_specialty_pulmonology_yes">Health specialty: respiratory medicine</string>
+	<string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Health specialty: dental, oral and maxillo-facial surgery</string>
+	<string name="poi_health_specialty_maternity_yes">Health specialty: maternity</string>
+	<string name="poi_health_specialty_emergency_medicine_yes">Health specialty: accident and emergency medicine</string>
+	<string name="poi_health_specialty_emergency_medicine_no">Health specialty: accident and emergency medicine: no</string>
+	<string name="poi_health_specialty_plastic_surgery_yes">Health specialty: plastic surgery</string>
+	<string name="poi_health_specialty_orthodontics_yes">Health specialty: orthodontics</string>
+	<string name="poi_health_specialty_physiotherapy_yes">Health specialty: physiotherapy</string>
+	<string name="poi_health_specialty_biochemistry_yes">Health specialty: biological chemistry</string>
+	<string name="poi_health_specialty_occupational_yes">Health specialty: occupational therapy</string>
+	<string name="poi_health_specialty_child_psychiatry_yes">Health specialty: child psychiatry</string>
+	<string name="poi_health_specialty_physiatry_yes">Health specialty: physical medicine and rehabilitation</string>
+	<string name="poi_health_specialty_maxillofacial_surgery_yes">Health specialty: maxillo-facial surgery</string>
+	<string name="poi_health_specialty_diagnostic_radiology_yes">Health specialty: diagnostic radiology</string>
+	<string name="poi_health_specialty_gastroenterology_yes">Health specialty: gastroenterology</string>
+	<string name="poi_health_specialty_dentistry_yes">Health specialty: dentistry</string>
+	<string name="poi_health_specialty_nephrology_yes">Health specialty: nephrology (renal diseases)</string>
+	<string name="poi_health_specialty_neurosurgery_yes">Health specialty: neurological surgery</string>
+	<string name="poi_health_specialty_neuropsychiatry_yes">Health specialty: neuropsychiatry</string>
+	<string name="poi_health_specialty_endocrinology_yes">Health specialty: endocrinology</string>
+	<string name="poi_health_specialty_nuclear_medicine_yes">Health specialty: nuclear medicine</string>
+	<string name="poi_health_specialty_pathology_yes">Health specialty: pathological anatomy</string>
+	<string name="poi_health_specialty_oncology_yes">Health specialty: oncology</string>
+	<string name="poi_health_specialty_tropical_medicine_yes">Health specialty: tropical medicine</string>
+	<string name="poi_health_specialty_tropical_medicine_no">Health specialty: tropical medicine: no</string>
+	<string name="poi_health_specialty_obstetrics_postnatal_yes">Health specialty: obstetrics (postnatal)</string>
+	<string name="poi_health_specialty_obstetrics_postnatal_no">Health specialty: obstetrics (postnatal): no</string>
+	<string name="poi_health_specialty_obstetrics_antenatal_yes">Health specialty: obstetrics (antenatal)</string>
+	<string name="poi_health_specialty_obstetrics_antenatal_no">Health specialty: obstetrics (antenatal): no</string>
+	<string name="poi_health_specialty_social_paediatrics_yes">Health specialty: social paediatrics</string>
+	<string name="poi_health_specialty_social_paediatrics_no">Health specialty: social paediatrics: no</string>
+	<string name="poi_health_specialty_obstetrics_caesarean_section_yes">Health specialty: obstetrics (caesarean section)</string>
+	<string name="poi_health_specialty_obstetrics_caesarean_section_no">Health specialty: obstetrics (caesarean section): no</string>
+	<string name="poi_health_specialty_addiction_medicine_yes">Health specialty: addiction medicine</string>
+	<string name="poi_health_specialty_optometry_yes">Health specialty: optometry</string>
+	<string name="poi_health_specialty_clinical_pathology_yes">Health specialty: clinical pathology</string>
+	<string name="poi_health_specialty_speech_therapy_yes">Health specialty: speech therapy</string>
+	<string name="poi_health_specialty_manual_therapy_yes">Health specialty: manual therapy</string>
+	<string name="poi_health_specialty_sports_medicine_yes">Health specialty: sports medicine</string>
+	<string name="poi_health_specialty_podology_yes">Health specialty: podology</string>
+	<string name="poi_health_specialty_adult_psychiatry_yes">Health specialty: adult psychiatry</string>
+	<string name="poi_health_specialty_acupuncture_yes">Health specialty: acupuncture</string>
+	<string name="poi_health_specialty_homeopathy_yes">Health specialty: homeopathy</string>
+	<string name="poi_health_specialty_traditional_chinese_medicine_yes">Health specialty: traditional chinese medicine</string>
+	<string name="poi_health_specialty_reiki_yes">Health specialty: reiki</string>
+	<string name="poi_health_specialty_herbalism_yes">Health specialty: herbalism</string>
+	<string name="poi_health_specialty_chiropractic_yes">Health specialty: chiropractic</string>
+	<string name="poi_health_specialty_naturopathy_yes">Health specialty: naturopathy</string>
+	<string name="poi_health_specialty_depth_psychology_yes">Health specialty: depth psychology</string>
+	<string name="poi_health_specialty_behavior_yes">Health specialty: behavior</string>
+
+
 </resources>
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@ -781,6 +781,9 @@
 	<string name="routing_attr_avoid_ferries_description">Avoid ferries</string>
 	<string name="routing_attr_avoid_motorway_name">Avoid motorways</string>
 	<string name="routing_attr_avoid_motorway_description">Avoid motorways</string>
+	<string name="routing_attr_avoid_stairs_name">Avoid stairs</string>
+	<string name="routing_attr_avoid_stairs_description">Avoid stairs</string>
+	<string name="routing_attr_avoid_borders_name">Avoid border crossing</string>
 	<string name="routing_attr_avoid_borders_description">Avoid crossing a border into another country</string>
 	<string name="routing_attr_weight_name">Weight limit</string>
 	<string name="routing_attr_weight_description">Specify vehicle weight to be permitted on routes</string>
@ -1693,7 +1696,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="osmand_net_previously_installed">A previous OsmAnd version is installed. All offline data will be supported by the new application. But Favorite points should be exported in the old application and later imported by the new one.</string>
 	<string name="build_installed">Build {0} successfully installed ({1}).</string>
 	<string name="downloading_build">Downloading build…</string>
-	<string name="install_selected_build">Do you want to install OsmAnd - {0} from {1} {2} MB ?</string>
+	<string name="install_selected_build">Do you want to install OsmAnd - {0} of {1} {2} MB ?</string>
 	<string name="loading_builds_failed">Retrieving the list of OsmAnd builds failed</string>
 	<string name="loading_builds">Loading OsmAnd builds…</string>
 	<string name="select_build_to_install">Select an OsmAnd build to install</string>
@ -2063,11 +2066,11 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
    <string name="get_full_version">Full version</string>
    <string name="downloads">Downloads</string>
    <string name="confirm_download_roadmaps">Are you sure you want to download the roads-only map, even though you already have the standard (full) map?</string>
-    <string name="value_downloaded_from_max">%1$.1f from %2$.1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f of %2$.1f MB</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="update_all">Update all (%1$s MB)</string>
    <string name="free_downloads_used">Free downloads used</string>
-    <string name="free_downloads_used_description">You can set how many free downloads you have used</string>
+    <string name="free_downloads_used_description">Displays the used free downloads</string>

    <string name="application_dir_description">Choose where you want to save map files.</string>
    
--- a/OsmAnd/src/net/osmand/plus/AppInitializer.java
+++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java
@ -289,7 +289,7 @@ public class AppInitializer implements IProgress {
 						return app.getString(in);
 					}
 				} catch (Exception e) {
-					System.err.println(e.getMessage());
+					System.err.println("No translation for "+ type.getIconKeyName() + " " + e.getMessage());
 				}
 				return null;
 			}
--- a/OsmAnd/src/net/osmand/plus/FirstUsageFragment.java
+++ b/OsmAnd/src/net/osmand/plus/FirstUsageFragment.java
@ -21,6 +21,7 @@ import net.osmand.plus.download.DownloadActivity;

 public class FirstUsageFragment extends Fragment {
 	public static final String TAG = "FirstUsageFragment";
+	public static boolean SHOW = true;
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
--- a/OsmAnd/src/net/osmand/plus/NotificationHelper.java
+++ b/OsmAnd/src/net/osmand/plus/NotificationHelper.java
@ -102,6 +102,8 @@ public class NotificationHelper {
 			} else {
 				notificationText = notificationText + Integer.toString(soi / 1000 / 60) + " " + app.getString(R.string.int_min);
 			}
+		} else if(monitoringPlugin == null) {
+			return null;
 		} else {
 			notificationText =	app.getString(R.string.shared_string_trip_recording);
 			float dst = app.getSavingTrackHelper().getDistance();
--- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
@ -172,7 +172,7 @@ public class OsmandApplication extends Application {
 		if (routingHelper != null) {
 			routingHelper.getVoiceRouter().onApplicationTerminate();
 		}
-        if(RateUsBottomSheetDialog.shouldShow(osmandSettings)) {
+        if(RateUsBottomSheetDialog.shouldShow(this)) {
            osmandSettings.RATE_US_STATE.set(RateUsBottomSheetDialog.RateUsState.IGNORED);
        }
        getNotificationHelper().removeServiceNotification();
--- a/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
+++ b/OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
@ -126,7 +126,7 @@ public class TargetPointsHelper {
 	public List<TargetPoint> getIntermediatePointsNavigation() {
 		List<TargetPoint> intermediatePoints = new ArrayList<>();
 		if (settings.USE_INTERMEDIATE_POINTS_NAVIGATION.get()) {
-			for (TargetPoint t : intermediatePoints) {
+			for (TargetPoint t : this.intermediatePoints) {
 				intermediatePoints.add(t);
 			}
 		}
@ -135,7 +135,7 @@ public class TargetPointsHelper {
 	
 	public List<LatLon> getIntermediatePointsLatLon() {
 		List<LatLon> intermediatePointsLatLon = new ArrayList<LatLon>();
-		for (TargetPoint t : intermediatePoints) {
+		for (TargetPoint t : this.intermediatePoints) {
 			intermediatePointsLatLon.add(t.point);
 		}
 		return intermediatePointsLatLon;
@ -144,7 +144,7 @@ public class TargetPointsHelper {
 	public List<LatLon> getIntermediatePointsLatLonNavigation() {
 		List<LatLon> intermediatePointsLatLon = new ArrayList<LatLon>();
 		if (settings.USE_INTERMEDIATE_POINTS_NAVIGATION.get()) {
-			for (TargetPoint t : intermediatePoints) {
+			for (TargetPoint t : this.intermediatePoints) {
 				intermediatePointsLatLon.add(t.point);
 			}
 		}
@ -153,7 +153,7 @@ public class TargetPointsHelper {

 	public List<TargetPoint> getIntermediatePointsWithTarget() {
 		List<TargetPoint> res = new ArrayList<TargetPoint>();
-		res.addAll(intermediatePoints);
+		res.addAll(this.intermediatePoints);
 		if(pointToNavigate != null) {
 			res.add(pointToNavigate);
 		}
--- a/OsmAnd/src/net/osmand/plus/Version.java
+++ b/OsmAnd/src/net/osmand/plus/Version.java
@ -30,7 +30,7 @@ public class Version {
 		} else if (isGooglePlayEnabled(ctx)) {
 			return "market://search?q=pname:";
 		} 
-		return "http://osmand.net/apps?"; 
+		 return "http://osmand.net/apps?id="; 
 	}
 	
 	private static boolean isAmazonEnabled(OsmandApplication ctx) {
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@ -176,7 +176,9 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents {

 		mapView = new OsmandMapTileView(this, getWindow().getDecorView().getWidth(),
 				getWindow().getDecorView().getHeight());
-		if(app.getAppInitializer().checkAppVersionChanged(this)) {
+		if(app.getAppInitializer().checkAppVersionChanged(this) && 
+				WhatsNewDialogFragment.SHOW) {
+			WhatsNewDialogFragment.SHOW = false;
 			new WhatsNewDialogFragment().show(getSupportFragmentManager(), null);
 		}
 		mapActions = new MapActivityActions(this);
@ -238,7 +240,8 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents {
 		}
 		mapView.refreshMap(true);

-		if (getMyApplication().getAppInitializer().isFirstTime(this)) {
+		if (getMyApplication().getAppInitializer().isFirstTime(this) && FirstUsageFragment.SHOW) {
+			FirstUsageFragment.SHOW = false;
 			getSupportFragmentManager().beginTransaction()
 					.add(R.id.fragmentContainer, new FirstUsageFragment(),
 							FirstUsageFragment.TAG).commit();
@ -399,7 +402,7 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents {
 				} else {
 					if (ErrorBottomSheetDialog.shouldShow(settings, this)) {
 						new ErrorBottomSheetDialog().show(getFragmentManager(), "dialog");
-					} else if (RateUsBottomSheetDialog.shouldShow(settings)) {
+					} else if (RateUsBottomSheetDialog.shouldShow(app)) {
 						new RateUsBottomSheetDialog().show(getFragmentManager(), "dialog");
 					}
 				}
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@ -277,6 +277,11 @@ public class MapActivityActions implements DialogProvider {
 			adapter.item(R.string.context_menu_item_directions_from).iconColor(
 					R.drawable.ic_action_gdirections_dark).reg();
 		}
+		if (getMyApplication().getTargetPointsHelper().getPointToNavigate() != null && 
+				(mapActivity.getRoutingHelper().isFollowingMode() || mapActivity.getRoutingHelper().isRoutePlanningMode())) {
+			adapter.item(R.string.context_menu_item_last_intermediate_point).iconColor(
+					R.drawable.ic_action_flage_dark).reg();
+		}
 		OsmandPlugin.registerMapContextMenu(mapActivity, latitude, longitude, adapter, selectedObj);

 		final AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity);
@ -290,6 +295,10 @@ public class MapActivityActions implements DialogProvider {
 				OnContextMenuClick click = adapter.getClickAdapter(which);
 				if (click != null) {
 					click.onContextMenuClick(listAdapter, standardId, which, false);
+				} else if (standardId == R.string.context_menu_item_last_intermediate_point) {
+					getMyApplication().getTargetPointsHelper().navigateToPoint(new LatLon(latitude, longitude), 
+							true, getMyApplication().getTargetPointsHelper().getIntermediatePoints().size(),
+							mapActivity.getContextMenu().getPointDescription());
 				} else if (standardId == R.string.context_menu_item_search) {
 					Intent intent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getSearchActivity());
 					intent.putExtra(SearchActivity.SEARCH_LAT, latitude);
@ -442,17 +451,18 @@ public class MapActivityActions implements DialogProvider {
 					settings.LAST_ROUTING_APPLICATION_MODE != ApplicationMode.DEFAULT) {
 				mode = settings.LAST_ROUTING_APPLICATION_MODE;
 			}
-			if (from != null && targets.getPointToNavigate() != null) {
-				double dist = MapUtils.getDistance(from, targets.getPointToNavigate().getLatitude(),
-						targets.getPointToNavigate().getLongitude());
-				if (dist >= 50000 && mode.isDerivedRoutingFrom(ApplicationMode.PEDESTRIAN)) {
-					mode = ApplicationMode.CAR;
-				} else if (dist >= 300000 && mode.isDerivedRoutingFrom(ApplicationMode.BICYCLE)) {
-					mode = ApplicationMode.CAR;
-				} else if (dist < 2000 && mode.isDerivedRoutingFrom(ApplicationMode.CAR)) {
-					mode = ApplicationMode.PEDESTRIAN;
-				}
-			}
+			// didn't provide good results
+//			if (from != null && targets.getPointToNavigate() != null) {
+//				double dist = MapUtils.getDistance(from, targets.getPointToNavigate().getLatitude(),
+//						targets.getPointToNavigate().getLongitude());
+//				if (dist >= 50000 && mode.isDerivedRoutingFrom(ApplicationMode.PEDESTRIAN)) {
+//					mode = ApplicationMode.CAR;
+//				} else if (dist >= 300000 && mode.isDerivedRoutingFrom(ApplicationMode.BICYCLE)) {
+//					mode = ApplicationMode.CAR;
+//				} else if (dist < 2000 && mode.isDerivedRoutingFrom(ApplicationMode.CAR)) {
+//					mode = ApplicationMode.PEDESTRIAN;
+//				}
+//			}
 		}
 		return mode;
 	}
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
@ -23,7 +23,6 @@ import android.support.v7.app.AlertDialog;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.Toast;
-
 import net.osmand.IProgress;
 import net.osmand.IndexConstants;
 import net.osmand.access.AccessibleToast;
@ -255,7 +254,8 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 			((ListPreference) screen.findPreference(settings.PREFERRED_LOCALE.getId())).setTitle(getString(R.string.preferred_locale) + " (" + getString(R.string.preferred_locale_no_translate) + ")");
 		}

-		registerListPreference(settings.MAP_PREFERRED_LOCALE, screen, ConfigureMapMenu.getMapNamesValues(this), ConfigureMapMenu.mapNamesIds);
+		String[] ids = ConfigureMapMenu.getSortedMapNamesIds(this);
+		registerListPreference(settings.MAP_PREFERRED_LOCALE, screen, ConfigureMapMenu.getMapNamesValues(this, ids), ids);
 	}


--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchByNameAbstractActivity.java
@ -545,7 +545,7 @@ public abstract class SearchByNameAbstractActivity<T> extends OsmandListActivity
 	protected void select(int mode) {
 		LatLon searchPoint = settings.getLastSearchedPoint();
 		AddressInformation ai = getAddressInformation();
-		if (ai != null) {
+		if (ai != null && searchPoint != null) {
 			if (mode == ADD_TO_FAVORITE) {
 				Bundle b = new Bundle();
 				Dialog dlg = FavoriteDialogs.createAddFavouriteDialog(getActivity(), b);
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@ -317,7 +317,6 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 				if (loc != null && loc.hasAltitude()) {
 					double alt = loc.getAltitude();
 					String altString = (int) (Math.abs(alt) * 100.0) + "/100";
-					System.err.println(altString);
 					setAttribute.invoke(exInstance, "GPSAltitude", altString);
 					setAttribute.invoke(exInstance, "GPSAltitudeRef", alt < 0 ? "1" : "0");
 				}
--- a/OsmAnd/src/net/osmand/plus/base/FavoriteImageDrawable.java
+++ b/OsmAnd/src/net/osmand/plus/base/FavoriteImageDrawable.java
@ -13,7 +13,7 @@ import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.util.DisplayMetrics;
+
 import net.osmand.plus.R;

 import java.util.TreeMap;
@ -35,41 +35,33 @@ public class FavoriteImageDrawable extends Drawable {
 		this.withShadow = withShadow;
 		this.resources = ctx.getResources();
 		this.color = color;
-		paintIcon = new Paint();
-		int col = color == 0 || color == Color.BLACK ? getResources().getColor(R.color.color_favorite) : color;
-		paintIcon.setColorFilter(new PorterDuffColorFilter(col, PorterDuff.Mode.SRC_IN));
 		paintBackground = new Paint();
+		int col = color == 0 || color == Color.BLACK ? getResources().getColor(R.color.color_favorite) : color;
+		paintBackground.setColorFilter(new PorterDuffColorFilter(col, PorterDuff.Mode.MULTIPLY));
+		paintIcon = new Paint();
 		favIcon = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.map_favorite);
 		favBackground = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.map_white_favorite_shield);
-		
-		
 		listDrawable = getResources().getDrawable(R.drawable.ic_action_fav_dark).mutate();
-		listDrawable.setColorFilter(new PorterDuffColorFilter(col, PorterDuff.Mode.SRC_IN));
-		DisplayMetrics metrics = getResources().getDisplayMetrics();
+
 		paintOuter = new Paint();
 		paintOuter.setAntiAlias(true);
 		paintOuter.setStyle(Style.FILL_AND_STROKE);
 		paintInnerCircle = new Paint();
 		paintInnerCircle.setStyle(Style.FILL_AND_STROKE);
-		if(metrics != null && metrics.density > 0) {
-			paintOuter.setStrokeWidth(metrics.density * 1);
-		} else {
-			paintOuter.setStrokeWidth(1);
-		}
-//		paintOuter.setColor(color == 0 || color == Color.BLACK ? 0x88555555 : color);
-		paintOuter.setColor(0xffbbbbbb);
-		paintInnerCircle.setColor(Color.WHITE);
+		paintOuter.setColor(color == 0 || color == Color.BLACK ? 0x88555555 : color);
+		paintInnerCircle.setColor(color == 0 || color == Color.BLACK ? getResources().getColor(R.color.color_favorite)
+				: color);
 		paintInnerCircle.setAntiAlias(true);
 	}
-	
+
 	@Override
 	protected void onBoundsChange(Rect bounds) {
 		super.onBoundsChange(bounds);
-		
+
 		if (!withShadow) {
 			Rect bs = new Rect(bounds);
-			 //bs.inset((int) (4 * density), (int) (4 * density));
-			bs.inset(bs.width() / 4, (int) bs.height() / 4);
+			//bs.inset((int) (4 * density), (int) (4 * density));
+			bs.inset(bs.width() / 4, bs.height() / 4);
 			listDrawable.setBounds(bs);
 		}
 	}
@ -100,8 +92,8 @@ public class FavoriteImageDrawable extends Drawable {
 			canvas.drawBitmap(favIcon, bs.exactCenterX() - favIcon.getWidth() / 2f, bs.exactCenterY() - favIcon.getHeight() / 2f, paintIcon);
 		} else {
 			int min = Math.min(bs.width(), bs.height());
-			int r = (int) (min * 4 / 10);
-			int rs = (int) (r - 1);
+			int r = (min * 4 / 10);
+			int rs = (r - 1);
 			canvas.drawCircle(min / 2, min / 2, r, paintOuter);
 			canvas.drawCircle(min / 2, min / 2, rs, paintInnerCircle);
 			listDrawable.draw(canvas);
@ -152,4 +144,4 @@ public class FavoriteImageDrawable extends Drawable {
 		}
 		return drawable;
 	}
-}
+}
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashRateUsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashRateUsFragment.java
@ -10,9 +10,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
-
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
+import net.osmand.plus.Version;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dashboard.tools.DashFragmentData;
 import net.osmand.plus.dialogs.RateUsBottomSheetDialog;
@ -24,7 +24,7 @@ public class DashRateUsFragment extends DashBaseFragment {
 			new DashboardOnMap.DefaultShouldShow() {
 				@Override
 				public boolean shouldShow(OsmandSettings settings, MapActivity activity, String tag) {
-					return RateUsBottomSheetDialog.shouldShow(settings)
+					return RateUsBottomSheetDialog.shouldShow(activity.getMyApplication())
 							&& super.shouldShow(settings, activity, tag);
 				}
 			};
@ -76,38 +76,37 @@ public class DashRateUsFragment extends DashBaseFragment {
 		public void onClick(View v) {
 			final OsmandSettings settings = getMyApplication().getSettings();
 			switch (state) {
-				case INITIAL_STATE:
-					state = RateUsBottomSheetDialog.FragmentState.USER_LIKES_APP;
+			case INITIAL_STATE:
+				state = RateUsBottomSheetDialog.FragmentState.USER_LIKES_APP;

-					header.setText(getResources().getString(R.string.rate_this_app));
-					subheader.setText(getResources().getString(R.string.rate_this_app_long));
-					positiveButton.setText(getResources().getString(R.string.shared_string_ok));
-					negativeButton.setText(getResources().getString(R.string.shared_string_no_thanks));
-					return;
-				case USER_LIKES_APP:
-					settings.RATE_US_STATE.set(RateUsBottomSheetDialog.RateUsState.LIKED);
-					// Assuming GooglePlay
-					Uri uri = Uri.parse("market://details?id=" + getActivity().getPackageName());
-					Intent goToMarket = new Intent(Intent.ACTION_VIEW, uri);
-					try {
-						startActivity(goToMarket);
-					} catch (ActivityNotFoundException e) {
-						startActivity(new Intent(Intent.ACTION_VIEW,
-								Uri.parse("http://play.google.com/store/apps/details?id="
-										+ getActivity().getPackageName())));
-					}
-					break;
-				case USER_DISLIKES_APP:
-					String email = getString(R.string.support_email);
-					settings.RATE_US_STATE.set(RateUsBottomSheetDialog.RateUsState.DISLIKED_WITH_MESSAGE);
-					settings.NUMBER_OF_APPLICATION_STARTS.set(0);
-					settings.LAST_DISPLAY_TIME.set(System.currentTimeMillis());
-					Intent sendEmail = new Intent(Intent.ACTION_SENDTO);
-					sendEmail.setType("text/plain");
-					sendEmail.setData(Uri.parse("mailto:" + email));
-					sendEmail.putExtra(Intent.EXTRA_EMAIL, email);
-					startActivity(sendEmail);
-					break;
+				header.setText(getResources().getString(R.string.rate_this_app));
+				subheader.setText(getResources().getString(R.string.rate_this_app_long));
+				positiveButton.setText(getResources().getString(R.string.shared_string_ok));
+				negativeButton.setText(getResources().getString(R.string.shared_string_no_thanks));
+				return;
+			case USER_LIKES_APP:
+				settings.RATE_US_STATE.set(RateUsBottomSheetDialog.RateUsState.LIKED);
+				Uri uri = Uri.parse(Version.marketPrefix(getMyApplication()) + getActivity().getPackageName());
+				Intent goToMarket = new Intent(Intent.ACTION_VIEW, uri);
+				try {
+					startActivity(goToMarket);
+				} catch (ActivityNotFoundException e) {
+					startActivity(new Intent(Intent.ACTION_VIEW,
+
+					Uri.parse(Version.marketPrefix(getMyApplication()) + getActivity().getPackageName())));
+				}
+				break;
+			case USER_DISLIKES_APP:
+				String email = getString(R.string.support_email);
+				settings.RATE_US_STATE.set(RateUsBottomSheetDialog.RateUsState.DISLIKED_WITH_MESSAGE);
+				settings.NUMBER_OF_APPLICATION_STARTS.set(0);
+				settings.LAST_DISPLAY_TIME.set(System.currentTimeMillis());
+				Intent sendEmail = new Intent(Intent.ACTION_SENDTO);
+				sendEmail.setType("text/plain");
+				sendEmail.setData(Uri.parse("mailto:" + email));
+				sendEmail.putExtra(Intent.EXTRA_EMAIL, email);
+				startActivity(sendEmail);
+				break;
 			}
 			dashboard.refreshDashboardFragments();
 		}
--- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
@ -8,7 +8,6 @@ import android.support.v7.app.AlertDialog;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.Toast;
-
 import net.osmand.PlatformUtil;
 import net.osmand.access.AccessibleToast;
 import net.osmand.core.android.MapRendererContext;
@ -39,11 +38,16 @@ import net.osmand.util.Algorithms;

 import org.apache.commons.logging.Log;

+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;

 import gnu.trove.list.array.TIntArrayList;

@ -369,21 +373,21 @@ public class ConfigureMapMenu {
 				AlertDialog.Builder b = new AlertDialog.Builder(view.getContext());
 				// test old descr as title
 				b.setTitle(R.string.map_preferred_locale);
-				final String[] txtValues = mapNamesIds;
-				final String[] txtNames = getMapNamesValues(activity);
+				final String[] txtIds = getSortedMapNamesIds(activity);
+				final String[] txtValues = getMapNamesValues(activity, txtIds);
 				int selected = -1;
-				for (int i = 0; i < txtValues.length; i++) {
-					if(view.getSettings().MAP_PREFERRED_LOCALE.get().equals(txtValues[i])) {
+				for (int i = 0; i < txtIds.length; i++) {
+					if(view.getSettings().MAP_PREFERRED_LOCALE.get().equals(txtIds[i])) {
 						selected = i;
 						break;
 					}
 				}
-				b.setSingleChoiceItems(txtNames, selected, new DialogInterface.OnClickListener() {
+				b.setSingleChoiceItems(txtValues, selected, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
-						view.getSettings().MAP_PREFERRED_LOCALE.set(txtValues[which]);
+						view.getSettings().MAP_PREFERRED_LOCALE.set(txtIds[which]);
 						refreshMapComplete(activity);
-						adapter.setItemDescription(pos, txtValues[which]);
+						adapter.setItemDescription(pos, txtIds[which]);
 						ad.notifyDataSetInvalidated();
 						dialog.dismiss();
 					}
@ -415,11 +419,36 @@ public class ConfigureMapMenu {
 	
 	public static String[] mapNamesIds = new String[] { "", "en", "als", "af", "ar", "az", "be", "bg", "bn", "bpy", "br", "bs", "ca", "ceb", "cs", "cy", "da", "de", "el", "et", "es", "eu", "fa", "fi", "fr", "fy", "ga", "gl", "he", "hi", "hr", "ht", "hu", "hy", "id", "is", "it", "ja", "ka", "ko", "ku", "la", "lb", "lt", "lv", "mk", "ml", "mr", "ms", "nds", "new", "nl", "nn", "no", "nv", "os", "pl", "pms", "pt", "ro", "ru", "sh", "sc", "sk", "sl", "sq", "sr", "sv", "sw", "ta", "te", "th", "tl", "tr", "uk", "vi", "vo", "zh" };

-	public static String[] getMapNamesValues(Context ctx) {
-		String[] translates = new String[mapNamesIds.length];
-		translates[0] = ctx.getString(R.string.local_map_names);
-		for(int i = 1; i < translates.length; i++) {
-			translates[i] = ((OsmandApplication)ctx.getApplicationContext()).getLangTranslation(mapNamesIds[i]);
+	
+	public static String[] getSortedMapNamesIds(Context ctx) {
+		String[] vls = getMapNamesValues(ctx, mapNamesIds);
+		final Map<String, String> mp = new HashMap<String, String>();
+		for(int i = 0; i < mapNamesIds.length; i++) {
+			mp.put(mapNamesIds[i], vls[i]);
+		}
+		ArrayList<String> lst = new ArrayList<String>(mp.keySet());
+		Collections.sort(lst, new Comparator<String>() {
+			@Override
+			public int compare(String lhs, String rhs) {
+				int i1 = Algorithms.isEmpty(lhs)? 0 : (lhs.equals("en") ? 1 : 2);
+				int i2 = Algorithms.isEmpty(rhs)? 0 : (rhs.equals("en") ? 1 : 2);
+				if(i1 != i2) {
+					return i1 < i2 ? -1 : 1;
+				}
+				return mp.get(lhs).compareTo(mp.get(rhs));
+			}
+		});
+		return lst.toArray(new String[lst.size()]);
+	}
+	
+	public static String[] getMapNamesValues(Context ctx, String[] ids) {
+		String[] translates = new String[ids.length];
+		for(int i = 0; i < translates.length; i++) {
+			if(Algorithms.isEmpty(ids[i])) {
+				translates[i] = ctx.getString(R.string.local_map_names);		
+			} else {
+				translates[i] = ((OsmandApplication)ctx.getApplicationContext()).getLangTranslation(ids[i]);
+			}
 		}
 		
 		return translates;
--- a/OsmAnd/src/net/osmand/plus/dialogs/RateUsBottomSheetDialog.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/RateUsBottomSheetDialog.java
@ -10,9 +10,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
-
+import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
+import net.osmand.plus.Version;
 import net.osmand.plus.base.BottomSheetDialogFragment;

 import java.util.Calendar;
@ -34,7 +35,11 @@ public class RateUsBottomSheetDialog extends BottomSheetDialogFragment {
 		return view;
 	}

-	public static boolean shouldShow(OsmandSettings settings) {
+	public static boolean shouldShow(OsmandApplication app) {
+		if(!Version.isMarketEnabled(app)) {
+			return false;
+		}
+		OsmandSettings settings = app.getSettings();
 		if(!settings.LAST_DISPLAY_TIME.isSet()) {
 			settings.LAST_DISPLAY_TIME.set(System.currentTimeMillis());
 		}
--- a/OsmAnd/src/net/osmand/plus/dialogs/WhatsNewDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/WhatsNewDialogFragment.java
@ -19,6 +19,7 @@ import org.apache.commons.logging.Log;

 public class WhatsNewDialogFragment extends DialogFragment {
 	private static final Log LOG = PlatformUtil.getLog(WhatsNewDialogFragment.class);
+	public static boolean SHOW = true;

 	@NonNull
 	@Override
--- a/OsmAnd/src/net/osmand/plus/download/DownloadResources.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadResources.java
@ -42,12 +42,14 @@ public class DownloadResources extends DownloadResourceGroup {
 	public IndexItem getWorldBaseMapItem() {
 		DownloadResourceGroup worldMaps = getSubGroupById(DownloadResourceGroupType.WORLD_MAPS.getDefaultId());
 		IndexItem worldMap = null;
-		List<IndexItem> list = worldMaps.getIndividualResources();
-		if(list != null) {
-			for(IndexItem ii  : list) {
-				if(ii.getBasename().equalsIgnoreCase(WorldRegion.WORLD_BASEMAP)) {
-					worldMap = ii;
-					break;
+		if (worldMaps != null) {
+			List<IndexItem> list = worldMaps.getIndividualResources();
+			if (list != null) {
+				for (IndexItem ii : list) {
+					if (ii.getBasename().equalsIgnoreCase(WorldRegion.WORLD_BASEMAP)) {
+						worldMap = ii;
+						break;
+					}
 				}
 			}
 		}
--- a/OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java
+++ b/OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java
@ -189,7 +189,7 @@ public class ItemViewHolder {
 				double mb = indexItem.getArchiveSizeMB();
 				String v ;
 				if (progress != -1) {
-					v = context.getString(R.string.value_downloaded_from_max, mb * progress / 100, mb);
+					v = context.getString(R.string.value_downloaded_of_max, mb * progress / 100, mb);
 				} else {
 					v = context.getString(R.string.file_size_in_mb, mb);
 				}
--- a/OsmAnd/src/net/osmand/plus/helpers/SearchHistoryHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/SearchHistoryHelper.java
@ -433,7 +433,7 @@ public class SearchHistoryHelper {
 							st.put(p, e);
 						} while (query.moveToNext());
 						if(reinsert) {
-							System.err.println("Reinsert all values");
+							System.err.println("Reinsert all values for search history");
 							db.execSQL("DELETE FROM " + HISTORY_TABLE_NAME); //$NON-NLS-1$
 							entries.clear();
 							entries.addAll(st.values());
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
@ -229,13 +229,17 @@ public class MapContextMenu extends MenuTitleController {

 	public void show() {
 		if (!isVisible()) {
-			MapContextMenuFragment.showInstance(mapActivity);
+			if (!MapContextMenuFragment.showInstance(this, mapActivity)) {
+				active = false;
+			}
 		}
 	}

 	public void show(LatLon latLon, PointDescription pointDescription, Object object) {
 		if (init(latLon, pointDescription, object)) {
-			MapContextMenuFragment.showInstance(mapActivity);
+			if (!MapContextMenuFragment.showInstance(this, mapActivity)) {
+				active = false;
+			}
 		}
 	}

--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@ -142,6 +142,12 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		markerPaddingXPx = dpToPx(MARKER_PADDING_X_DP);

 		menu = getMapActivity().getContextMenu();
+		view = inflater.inflate(R.layout.map_context_menu_fragment, container, false);
+		if (!menu.isActive()) {
+			return view;
+		}
+		mainView = view.findViewById(R.id.context_menu_main);
+
 		leftTitleButtonController = menu.getLeftTitleButtonController();
 		rightTitleButtonController = menu.getRightTitleButtonController();
 		topRightTitleButtonController = menu.getTopRightTitleButtonController();
@ -166,9 +172,6 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		IconsCache iconsCache = getMyApplication().getIconsCache();
 		boolean light = getMyApplication().getSettings().isLightContent();

-		view = inflater.inflate(R.layout.map_context_menu_fragment, container, false);
-		mainView = view.findViewById(R.id.context_menu_main);
-
 		// Left title button
 		final Button leftTitleButton = (Button) view.findViewById(R.id.title_button);
 		if (leftTitleButtonController != null) {
@ -219,6 +222,9 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		updateButtonsAndProgress();

 		if (menu.isLandscapeLayout()) {
+			final TypedValue typedValueAttr = new TypedValue();
+			getMapActivity().getTheme().resolveAttribute(R.attr.left_menu_view_bg, typedValueAttr, true);
+			mainView.setBackgroundResource(typedValueAttr.resourceId);
 			mainView.setLayoutParams(new FrameLayout.LayoutParams(dpToPx(menu.getLandscapeWidthDp()),
 					ViewGroup.LayoutParams.MATCH_PARENT));
 			View fabContainer = view.findViewById(R.id.context_menu_fab_container);
@ -241,16 +247,22 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 			private float maxVelocityY;

 			private boolean hasMoved;
+			private boolean centered;

 			@Override
 			public boolean onTouch(View v, MotionEvent event) {

 				if (singleTapDetector.onTouchEvent(event)) {
-					showOnMap(menu.getLatLon(), true, false);
-
-					if (hasMoved) {
-						applyPosY(getViewY(), false, false, 0, 0);
+					int posY = getViewY();
+					if (!centered) {
+						showOnMap(menu.getLatLon(), true, false,
+								map.getCurrentRotatedTileBox().getPixHeight() / 2 < posY - markerPaddingPx);
+						centered = true;
 					}
+					if (hasMoved) {
+						applyPosY(posY, false, false, 0, 0);
+					}
+					openMenuHalfScreen();
 					return true;
 				}

@ -294,7 +306,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 					case MotionEvent.ACTION_UP:
 					case MotionEvent.ACTION_CANCEL:
 						int currentY = getViewY();
-						
+
 						slidingUp = Math.abs(maxVelocityY) > 500 && (currentY - dyMain) < -50;
 						slidingDown = Math.abs(maxVelocityY) > 500 && (currentY - dyMain) > 50;

@ -330,6 +342,11 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		// FAB
 		fabView = (ImageView)view.findViewById(R.id.context_menu_fab_view);
 		if (menu.fabVisible()) {
+			if (menu.isLandscapeLayout()) {
+				FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) fabView.getLayoutParams();
+				params.setMargins(0, 0, dpToPx(28f), 0);
+				fabView.setLayoutParams(params);
+			}
 			fabView.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
@ -399,6 +416,15 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		changeMenuState(getViewY(), true, true, false);
 	}

+	public void openMenuHalfScreen() {
+		int oldMenuState = menu.getCurrentMenuState();
+		if(oldMenuState == MenuState.HEADER_ONLY) {
+			changeMenuState(getViewY(), false, true, false);
+		} else if(oldMenuState == MenuState.FULL_SCREEN && !menu.isLandscapeLayout()) {
+			changeMenuState(getViewY(), false, false, true);
+		}
+	}
+
 	private void changeMenuState(int currentY, boolean skipHalfScreenState,
 								boolean slidingUp, boolean slidingDown) {
 		boolean needCloseMenu = false;
@ -438,26 +464,24 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 						.setDuration(200)
 						.setInterpolator(new DecelerateInterpolator())
 						.setListener(new AnimatorListenerAdapter() {
+
+							boolean canceled = false;
+
 							@Override
 							public void onAnimationCancel(Animator animation) {
-								if (needCloseMenu) {
-									menu.close();
-								} else {
-									updateMainViewLayout(posY);
-									if (previousMenuState != 0 && newMenuState != 0 && previousMenuState != newMenuState) {
-										doAfterMenuStateChange(previousMenuState, newMenuState);
-									}
-								}
+								canceled = true;
 							}

 							@Override
 							public void onAnimationEnd(Animator animation) {
-								if (needCloseMenu) {
-									menu.close();
-								} else {
-									updateMainViewLayout(posY);
-									if (previousMenuState != 0 && newMenuState != 0 && previousMenuState != newMenuState) {
-										doAfterMenuStateChange(previousMenuState, newMenuState);
+								if (!canceled) {
+									if (needCloseMenu) {
+										menu.close();
+									} else {
+										updateMainViewLayout(posY);
+										if (previousMenuState != 0 && newMenuState != 0 && previousMenuState != newMenuState) {
+											doAfterMenuStateChange(previousMenuState, newMenuState);
+										}
 									}
 								}
 							}
@ -611,6 +635,10 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 	@Override
 	public void onResume() {
 		super.onResume();
+		if (!menu.isActive()) {
+			dismissMenu();
+			return;
+		}
 		screenOrientation = DashLocationFragment.getScreenOrientation(getActivity());
 		if (menu.displayDistanceDirection()) {
 			getMapActivity().getMapViewTrackingUtilities().setContextMenu(menu);
@ -626,7 +654,9 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 	@Override
 	public void onDestroyView() {
 		super.onDestroyView();
-		map.setLatLon(mapCenter.getLatitude(), mapCenter.getLongitude());
+		if (mapCenter != null) {
+			map.setLatLon(mapCenter.getLatitude(), mapCenter.getLongitude());
+		}
 		menu.setMapCenter(null);
 		getMapActivity().getMapLayers().getMapControlsLayer().setControlsClickable(true);
 	}
@ -647,6 +677,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		runLayoutListener();
 	}

+	@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 	private void runLayoutListener() {
 		ViewTreeObserver vto = view.getViewTreeObserver();
 		vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@ -671,7 +702,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 				menuFullHeight = view.findViewById(R.id.context_menu_main).getHeight();

 				int dy = 0;
-				if (!menu.isLandscapeLayout() && menuTopViewHeight != 0) {
+				if (!menu.isLandscapeLayout() && menuTopViewHeight != 0 && menu.getCurrentMenuState() == MenuState.HEADER_ONLY) {
 					dy = Math.max(0, newMenuTopViewHeight - menuTopViewHeight);
 				}
 				menuTopViewHeight = newMenuTopViewHeight;
@ -691,7 +722,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		});
 	}

-	private void showOnMap(LatLon latLon, boolean updateCoords, boolean ignoreCoef) {
+	private void showOnMap(LatLon latLon, boolean updateCoords, boolean ignoreCoef, boolean needMove) {
 		AnimateDraggingMapThread thread = map.getAnimatedDraggingThread();
 		int fZoom = map.getZoom();
 		double flat = latLon.getLatitude();
@ -714,7 +745,9 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 			origMarkerY = cp.getCenterPixelY();
 		}

-		thread.startMoving(flat, flon, fZoom, true);
+		if (needMove) {
+			thread.startMoving(flat, flon, fZoom, true);
+		}
 	}

 	private void setAddressLocation() {
@ -881,7 +914,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		}

 		if (animated) {
-			showOnMap(latlon, false, true);
+			showOnMap(latlon, false, true, true);
 		} else {
 			map.setLatLon(latlon.getLatitude(), latlon.getLongitude());
 		}
@ -933,22 +966,32 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 		return (OsmandApplication) getActivity().getApplication();
 	}

-	public static void showInstance(final MapActivity mapActivity) {
+	public static boolean showInstance(final MapContextMenu menu, final MapActivity mapActivity) {
+		try {

-		int slideInAnim = R.anim.slide_in_bottom;
-		int slideOutAnim = R.anim.slide_out_bottom;
+			if (menu.getLatLon() == null) {
+				return false;
+			}

-		MapContextMenu menu = mapActivity.getContextMenu();
-		if (menu.isExtended()) {
-			slideInAnim = menu.getSlideInAnimation();
-			slideOutAnim = menu.getSlideOutAnimation();
+			int slideInAnim = R.anim.slide_in_bottom;
+			int slideOutAnim = R.anim.slide_out_bottom;
+
+			if (menu.isExtended()) {
+				slideInAnim = menu.getSlideInAnimation();
+				slideOutAnim = menu.getSlideOutAnimation();
+			}
+
+			MapContextMenuFragment fragment = new MapContextMenuFragment();
+			mapActivity.getSupportFragmentManager().beginTransaction()
+					.setCustomAnimations(slideInAnim, slideOutAnim, slideInAnim, slideOutAnim)
+					.add(R.id.fragmentContainer, fragment, TAG)
+					.addToBackStack(TAG).commitAllowingStateLoss();
+
+			return true;
+
+		} catch (RuntimeException e) {
+			return false;
 		}
-
-		MapContextMenuFragment fragment = new MapContextMenuFragment();
-		mapActivity.getSupportFragmentManager().beginTransaction()
-				.setCustomAnimations(slideInAnim, slideOutAnim, slideInAnim, slideOutAnim)
-				.add(R.id.fragmentContainer, fragment, TAG)
-				.addToBackStack(TAG).commitAllowingStateLoss();
 	}

 	//DownloadEvents
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuTitleController.java
@ -1,7 +1,6 @@
 package net.osmand.plus.mapcontextmenu;

 import android.graphics.drawable.Drawable;
-
 import net.osmand.Location;
 import net.osmand.ResultMatcher;
 import net.osmand.binary.RouteDataObject;
@ -141,9 +140,18 @@ public abstract class MenuTitleController {
 					public boolean publish(RouteDataObject object) {
 						if (object != null) {
 							OsmandSettings settings = getMapActivity().getMyApplication().getSettings();
-							streetStr = RoutingHelper.formatStreetName(object.getName(settings.MAP_PREFERRED_LOCALE.get()),
-									object.getRef(), object.getDestinationName(settings.MAP_PREFERRED_LOCALE.get()));
-
+							String streetName = object.getName(settings.MAP_PREFERRED_LOCALE.get());
+							String ref = object.getRef();
+							if(Algorithms.isEmpty(streetName)) {
+								streetName = "";
+							}
+							if(!Algorithms.isEmpty(ref)) {
+								if(!Algorithms.isEmpty(streetName)) {
+									streetName += ", ";
+								}
+								streetName += ref;
+							}
+							streetStr = streetName;
 							if (!Algorithms.isEmpty(streetStr)) {
 								MenuController menuController = getMenuController();
 								if (menuController == null || menuController.displayStreetNameInTitle()) {
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java
@ -262,7 +262,7 @@ public class MapDataMenuController extends MenuController {
 			double mb = indexItem.getArchiveSizeMB();
 			String v ;
 			if (titleProgressController.progress != -1) {
-				v = getMapActivity().getString(R.string.value_downloaded_from_max, mb * titleProgressController.progress / 100, mb);
+				v = getMapActivity().getString(R.string.value_downloaded_of_max, mb * titleProgressController.progress / 100, mb);
 			} else {
 				v = getMapActivity().getString(R.string.file_size_in_mb, mb);
 			}
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
@ -24,6 +24,7 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;

+import net.osmand.AndroidUtils;
 import net.osmand.data.LatLon;
 import net.osmand.data.QuadPoint;
 import net.osmand.data.RotatedTileBox;
@ -44,6 +45,7 @@ public abstract class PointEditorFragment extends Fragment {

 	private View view;
 	private int mainViewHeight;
+	private EditText nameEdit;

 	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
 	@Override
@ -103,7 +105,7 @@ public abstract class PointEditorFragment extends Fragment {
 		TextView categoryCaption = (TextView) view.findViewById(R.id.category_caption);
 		categoryCaption.setText(getCategoryCaption());

-		EditText nameEdit = (EditText) view.findViewById(R.id.name_edit);
+		nameEdit = (EditText) view.findViewById(R.id.name_edit);
 		nameEdit.setText(getNameInitValue());
 		AutoCompleteTextViewEx categoryEdit = (AutoCompleteTextViewEx) view.findViewById(R.id.category_edit);
 		categoryEdit.setText(getCategoryInitValue());
@ -152,6 +154,16 @@ public abstract class PointEditorFragment extends Fragment {
 		getMapActivity().getContextMenu().setBaseFragmentVisibility(false);
 	}

+	@Override
+	public void onResume() {
+		super.onResume();
+		if (getEditor().isNew()) {
+			nameEdit.selectAll();
+			nameEdit.requestFocus();
+			AndroidUtils.softKeyboardDelayed(nameEdit);
+		}
+	}
+
 	@Override
 	public void onStop() {
 		super.onStop();
@ -233,11 +245,13 @@ public abstract class PointEditorFragment extends Fragment {

 	private void hideKeyboard() {
 		InputMethodManager inputMethodManager = (InputMethodManager) getActivity().getSystemService(Activity.INPUT_METHOD_SERVICE);
-		View currentFocus =  getActivity().getCurrentFocus();
-		if (currentFocus != null) {
-			IBinder windowToken = currentFocus.getWindowToken();
-			if (windowToken != null) {
-				inputMethodManager.hideSoftInputFromWindow(windowToken, 0);
+		if (inputMethodManager != null) {
+			View currentFocus = getActivity().getCurrentFocus();
+			if (currentFocus != null) {
+				IBinder windowToken = currentFocus.getWindowToken();
+				if (windowToken != null) {
+					inputMethodManager.hideSoftInputFromWindow(windowToken, 0);
+				}
 			}
 		}
 	}
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapMultiSelectionMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapMultiSelectionMenu.java
@ -156,11 +156,13 @@ public class MapMultiSelectionMenu extends BaseMenuController {
 			hide();
 		}

+/*
 		for (Map.Entry<Object, IContextMenuProvider> e : selectedObjects.entrySet()) {
 			if (e.getValue() instanceof ContextMenuLayer.IContextMenuProviderSelection) {
 				((ContextMenuLayer.IContextMenuProviderSelection) e.getValue()).setSelectedObject(e.getKey());
 			}
 		}
+*/

 		this.latLon = latLon;
 		createCollection(selectedObjects);
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@ -179,10 +179,8 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 	}

 	public static void updateCurrentTrack(View v, final Activity ctx, final OsmandApplication app) {
-		if (OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class) == null) {
-			return;
-		}
-		if (v == null || ctx == null || app == null) {
+		final OsmandMonitoringPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class);
+		if (v == null || ctx == null || app == null || plugin == null) {
 			return;
 		}
 		final boolean isRecording = app.getSettings().SAVE_GLOBAL_TRACK_TO_GPX.get();
@ -195,10 +193,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		stop.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				final OsmandMonitoringPlugin plugin = OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class);
 				if (isRecording) {
 					plugin.stopRecording();
-				} else {
+				} else if(plugin != null){
 					if (app.getLocationProvider().checkGPSEnabled(ctx)) {
 						plugin.startGPXMonitoring(ctx);
 					}
--- a/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java
@ -335,7 +335,7 @@ public class SelectedGPXFragment extends OsmAndListFragment {
 			public void onClick(DialogInterface dialog, int which) {
 				SelectedGpxFile sf = app.getSelectedGpxHelper().selectGpxFile(getGpx(), vis.isChecked(), false);
 				int clr = list.get(colorSpinner.getSelectedItemPosition());
-				if(clr != 0 ) {
+				if(clr != 0 && sf.getModifiableGpxFile() != null) {
 					sf.getModifiableGpxFile().setColor(clr);
 					sf.processPoints();
 				}
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
@ -334,7 +334,7 @@ public class EditPoiDialogFragment extends DialogFragment {
 		Node original = editPoiData.getEntity();
 		final boolean offlineEdit = mOpenstreetmapUtil instanceof OpenstreetmapLocalUtil;
 		Node node = new Node(original.getLatitude(), original.getLongitude(), original.getId());
-		OsmPoint.Action action = node.getId() == -1 ? OsmPoint.Action.CREATE : OsmPoint.Action.MODIFY;
+		OsmPoint.Action action = node.getId() < 0 ? OsmPoint.Action.CREATE : OsmPoint.Action.MODIFY;
 		for (Map.Entry<String, String> tag : editPoiData.getTagValues().entrySet()) {
 			if (tag.getKey().equals(EditPoiData.POI_TYPE_TAG)) {
 				final PoiType poiType = editPoiData.getAllTranslatedSubTypes().get(tag.getValue().trim().toLowerCase());
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java
@ -213,7 +213,7 @@ public class OsmEditingPlugin extends OsmandPlugin {
 		if (selectedObj instanceof Amenity) {
 			Amenity amenity = (Amenity) selectedObj;
 			final PoiType poiType = amenity.getType().getPoiTypeByKeyName(amenity.getSubType());
-			isEditable = !amenity.getType().isWiki() && !poiType.isNotEditableOsm();
+			isEditable = poiType != null && !amenity.getType().isWiki() && !poiType.isNotEditableOsm();
 		}
 		if (isEditable) {
 			adapter.item(R.string.poi_context_menu_modify).iconColor(R.drawable.ic_action_edit_dark).listen(listener).position(1).reg();
--- a/OsmAnd/src/net/osmand/plus/srtmplugin/HillshadeLayer.java
+++ b/OsmAnd/src/net/osmand/plus/srtmplugin/HillshadeLayer.java
@ -48,9 +48,11 @@ public class HillshadeLayer extends MapTileLayer {
 			private SQLiteDatabase sqliteDb;
 			@Override
 			protected Void doInBackground(Void... params) {
+				
 				File tilesDir = app.getAppPath(IndexConstants.TILES_INDEX_DIR);
+				File cacheDir = app.getCacheDir();
 				// fix http://stackoverflow.com/questions/26937152/workaround-for-nexus-9-sqlite-file-write-operations-on-external-dirs
-				sqliteDb = SQLiteDatabase.openDatabase(new File(tilesDir, HILLSHADE_CACHE).getPath() , 
+				sqliteDb = SQLiteDatabase.openDatabase(new File(cacheDir, HILLSHADE_CACHE).getPath() , 
 						 null, SQLiteDatabase.ENABLE_WRITE_AHEAD_LOGGING
 						    | SQLiteDatabase.CREATE_IF_NECESSARY );
 				if(sqliteDb.getVersion() == 0) {
--- a/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java
@ -104,10 +104,10 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
 		rm = app.getResourceManager();
 		osmandRegions = rm.getOsmandRegions();

-		paintDownloaded = getPaint(Color.argb(100, 50, 200, 50));
-		paintSelected = getPaint(Color.argb(100, 255, 143, 0));
-		paintDownloading = getPaint(Color.argb(40, 50, 200, 50));
-		paintOutdated = getPaint(Color.argb(100, 0, 128, 255));
+		paintDownloaded = getPaint(view.getResources().getColor(R.color.region_uptodate));
+		paintSelected = getPaint(view.getResources().getColor(R.color.region_selected));
+		paintDownloading = getPaint(view.getResources().getColor(R.color.region_downloading));
+		paintOutdated = getPaint(view.getResources().getColor(R.color.region_updateable));

 		textPaint = new TextPaint();
 		final WindowManager wmgr = (WindowManager) view.getApplication().getSystemService(Context.WINDOW_SERVICE);
@ -123,12 +123,12 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
 		pathOutdated = new Path();

 		data = new MapLayerData<List<BinaryMapDataObject>>() {
-			
+
 			@Override
 			public void layerOnPostExecute() {
 				view.refreshMap();
 			}
-			
+
 			public boolean queriedBoxContains(final RotatedTileBox queriedData, final RotatedTileBox newBox) {
 				if (newBox.getZoom() < ZOOM_TO_SHOW_SELECTION) {
 					if (queriedData != null && queriedData.getZoom() < ZOOM_TO_SHOW_SELECTION) {
@ -139,19 +139,19 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
 				}
 				List<BinaryMapDataObject> queriedResults = getResults();
 				if(queriedData != null && queriedData.containsTileBox(newBox) && queriedData.getZoom() >= ZOOM_TO_SHOW_MAP_NAMES) {
-					if(queriedResults != null && ( queriedResults.isEmpty() || 
+					if(queriedResults != null && ( queriedResults.isEmpty() ||
 							Math.abs(queriedData.getZoom() - newBox.getZoom()) <= 1)) {
 						return true;
 					}
 				}
 				return false;
 			}
-			
+
 			@Override
 			protected List<BinaryMapDataObject> calculateResult(RotatedTileBox tileBox) {
 				return queryData(tileBox);
 			}
-			
+
 		};

 	}
@ -184,19 +184,19 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
 			final List<BinaryMapDataObject> selectedObjects = new LinkedList<>(this.selectedObjects);

 			if (selectedObjects.size() > 0) {
-				currentObjects.removeAll(selectedObjects);
+				removeObjectsFromList(currentObjects, selectedObjects);
 				drawBorders(canvas, tileBox, selectedObjects, pathSelected, paintSelected);
 			}

 			if (zoom >= ZOOM_TO_SHOW_BORDERS_ST && zoom < ZOOM_TO_SHOW_BORDERS) {
-				downloadingObjects.removeAll(selectedObjects);
+				removeObjectsFromList(downloadingObjects, selectedObjects);
 				if (downloadingObjects.size() > 0) {
-					currentObjects.removeAll(downloadingObjects);
+					removeObjectsFromList(currentObjects, downloadingObjects);
 					drawBorders(canvas, tileBox, downloadingObjects, pathDownloading, paintDownloading);
 				}
-				outdatedObjects.removeAll(selectedObjects);
+				removeObjectsFromList(outdatedObjects, selectedObjects);
 				if (outdatedObjects.size() > 0) {
-					currentObjects.removeAll(outdatedObjects);
+					removeObjectsFromList(currentObjects, outdatedObjects);
 					drawBorders(canvas, tileBox, outdatedObjects, pathOutdated, paintOutdated);
 				}
 				if (currentObjects.size() > 0) {
@ -216,6 +216,19 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
 		}
 	}

+	private void removeObjectsFromList(List<BinaryMapDataObject> list, List<BinaryMapDataObject> objects) {
+		Iterator<BinaryMapDataObject> it = list.iterator();
+		while (it.hasNext()) {
+			BinaryMapDataObject o = it.next();
+			for (BinaryMapDataObject obj : objects) {
+				if (o.getId() == obj.getId()) {
+					it.remove();
+					break;
+				}
+			}
+		}
+	}
+
 	private void drawBorders(Canvas canvas, RotatedTileBox tileBox, final List<BinaryMapDataObject> objects, Path path, Paint paint) {
 		path.reset();
 		for (BinaryMapDataObject o : objects) {
@ -240,11 +253,11 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
 	}


-	
+
 	private List<BinaryMapDataObject> queryData(RotatedTileBox tileBox) {
 		if (tileBox.getZoom() >= ZOOM_AFTER_BASEMAP) {
 			if(!checkIfMapEmpty(tileBox)) {
-				return Collections.emptyList();	
+				return Collections.emptyList();
 			}
 		}
 		LatLon lt = tileBox.getLeftTopLatLon();
@ -252,7 +265,7 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
 //		if (tileBox.getZoom() >= ZOOM_TO_SHOW_MAP_NAMES) {
 //			lt = rb = tileBox.getCenterLatLon();
 //		}
-		
+
 		List<BinaryMapDataObject> result = null;
 		int left = MapUtils.get31TileNumberX(lt.getLongitude());
 		int right = MapUtils.get31TileNumberX(rb.getLongitude());
@ -484,7 +497,8 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe

 	private void getWorldRegionFromPoint(RotatedTileBox tb, PointF point, List<? super DownloadMapObject> dataObjects) {
 		int zoom = tb.getZoom();
-		if (zoom >= ZOOM_TO_SHOW_SELECTION_ST && zoom < ZOOM_TO_SHOW_SELECTION && osmandRegions.isInitialized()) {
+		if (zoom >= ZOOM_TO_SHOW_SELECTION_ST && zoom < ZOOM_TO_SHOW_SELECTION
+				&& data.results != null && osmandRegions.isInitialized()) {
 			LatLon pointLatLon = tb.getLatLonFromPixel(point.x, point.y);
 			int point31x = MapUtils.get31TileNumberX(pointLatLon.getLongitude());
 			int point31y = MapUtils.get31TileNumberY(pointLatLon.getLatitude());
@ -493,18 +507,15 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
 			Iterator<BinaryMapDataObject> it = result.iterator();
 			while (it.hasNext()) {
 				BinaryMapDataObject o = it.next();
-				if (!osmandRegions.isDownloadOfType(o, OsmandRegions.MAP_TYPE) || !osmandRegions.contain(o, point31x, point31y)) {
+				if (!osmandRegions.contain(o, point31x, point31y) ) {
 					it.remove();
 				}
 			}
-
-			selectedObjects = result;
-
 			OsmandRegions osmandRegions = app.getRegions();
 			for (BinaryMapDataObject o : result) {
 				String fullName = osmandRegions.getFullName(o);
 				WorldRegion region = osmandRegions.getRegionData(fullName);
-				if (region != null) {
+				if (region != null && region.isRegionMapDownload()) {
 					List<IndexItem> indexItems = app.getDownloadThread().getIndexes().getIndexItems(region);
 					List<IndexItem> dataItems = new LinkedList<>();
 					IndexItem regularMapItem = null;
@ -550,9 +561,6 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
 		if (o instanceof DownloadMapObject) {
 			DownloadMapObject mapObject = ((DownloadMapObject) o);
 			List<BinaryMapDataObject> list = new LinkedList<>();
-			if (selectedObjects. size() > 0) {
-				list.addAll(selectedObjects);
-			}
 			list.add(mapObject.dataObject);
 			selectedObjects = list;
 		}
--- a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
@ -3,8 +3,11 @@ package net.osmand.plus.views;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.PointF;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;

 import net.osmand.data.FavouritePoint;
 import net.osmand.data.LatLon;
@ -25,7 +28,7 @@ import java.util.List;
 public class FavoritesLayer  extends OsmandMapLayer implements ContextMenuLayer.IContextMenuProvider, MapTextProvider<LocationPoint> {

 	protected int startZoom = 6;
-	
+
 	protected OsmandMapTileView view;
 	private Paint paint;
 	private FavouritesDbHelper favorites;
@ -33,21 +36,22 @@ public class FavoritesLayer  extends OsmandMapLayer implements ContextMenuLayer.
 	private MapTextLayer textLayer;
 	private Paint paintIcon;
 	private Bitmap pointSmall;
+	private int defaultColor;

 	private OsmandSettings settings;
-	
+
 	protected Class<? extends LocationPoint> getFavoriteClass() {
 		return (Class<? extends LocationPoint>) FavouritePoint.class;
 	}
-	
+
 	protected String getObjName() {
 		return view.getContext().getString(R.string.favorite);
 	}
-	
+
 	protected List<? extends LocationPoint> getPoints() {
 		return favorites.getFavouritePoints();
 	}
-	
+
 	@Override
 	public void initLayer(OsmandMapTileView view) {
 		this.view = view;
@ -60,8 +64,9 @@ public class FavoritesLayer  extends OsmandMapLayer implements ContextMenuLayer.
 		textLayer = view.getLayerByClass(MapTextLayer.class);
 		paintIcon = new Paint();
 		pointSmall = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_white_shield_small);
+		defaultColor = view.getResources().getColor(R.color.color_favorite);
 	}
-	
+
 	private boolean calculateBelongs(int ex, int ey, int objx, int objy, int radius) {
 		return (Math.abs(objx - ex) <= radius * 2 && Math.abs(objy - ey) <= radius * 2) ;
 //		return Math.abs(objx - ex) <= radius && (ey - objy) <= radius / 2 && (objy - ey) <= 3 * radius ;
@ -70,37 +75,42 @@ public class FavoritesLayer  extends OsmandMapLayer implements ContextMenuLayer.

 	@Override
 	public void destroyLayer() {
-		
+
 	}
-	
+

 	@Override
 	public boolean drawInScreenPixels() {
 		return true;
 	}
-	
-	
+
+
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings settings) {
 	}
-	
+
 	@Override
 	public void onPrepareBufferImage(Canvas canvas, RotatedTileBox tileBox, DrawSettings settings) {
 		cache.clear();
 		if (this.settings.SHOW_FAVORITES.get()) {
 			if (tileBox.getZoom() >= startZoom) {
 				float iconSize = FavoriteImageDrawable.getOrCreate(view.getContext(), 0,
-						 true).getIntrinsicWidth() * 3 / 2.5f;
+						true).getIntrinsicWidth() * 3 / 2.5f;
 				QuadTree<QuadRect> boundIntersections = initBoundIntersections(tileBox);

 				// request to load
 				final QuadRect latLonBounds = tileBox.getLatLonBounds();
 				List<LocationPoint> fullObjects = new ArrayList<>();
 				for (LocationPoint o : getPoints()) {
+					if (!o.isVisible()) {
+						continue;
+					}
 					float x = tileBox.getPixXFromLatLon(o.getLatitude(), o.getLongitude());
 					float y = tileBox.getPixYFromLatLon(o.getLatitude(), o.getLongitude());

 					if (intersects(boundIntersections, x, y, iconSize, iconSize)) {
+						int col = o.getColor() == 0 || o.getColor() == Color.BLACK ? defaultColor : o.getColor();
+						paintIcon.setColorFilter(new PorterDuffColorFilter(col, PorterDuff.Mode.MULTIPLY));
 						canvas.drawBitmap(pointSmall, x - pointSmall.getWidth() / 2, y - pointSmall.getHeight() / 2, paintIcon);
 					} else {
 						fullObjects.add(o);
@ -130,8 +140,8 @@ public class FavoritesLayer  extends OsmandMapLayer implements ContextMenuLayer.
 //							y - favoriteIcon.getHeight(), paint);
 		}
 	}
-	
-	
+
+
 	@Override
 	public boolean onLongPressEvent(PointF point, RotatedTileBox tileBox) {
 		return false;
@ -147,8 +157,8 @@ public class FavoritesLayer  extends OsmandMapLayer implements ContextMenuLayer.
 	}

 	private void getFavFromPoint(RotatedTileBox tb, List<? super LocationPoint> res, int r, int ex, int ey,
-			LocationPoint n) {
-		if (n.isVisible()) { 
+								 LocationPoint n) {
+		if (n.isVisible()) {
 			int x = (int) tb.getPixXFromLatLon(n.getLatitude(), n.getLongitude());
 			int y = (int) tb.getPixYFromLatLon(n.getLatitude(), n.getLongitude());
 			if (calculateBelongs(ex, ey, x, y, r)) {
@ -166,8 +176,8 @@ public class FavoritesLayer  extends OsmandMapLayer implements ContextMenuLayer.
 		return null;
 	}

-	
-	
+
+
 	@Override
 	public PointDescription getObjectName(Object o) {
 		if(o instanceof LocationPoint){
@ -215,7 +225,7 @@ public class FavoritesLayer  extends OsmandMapLayer implements ContextMenuLayer.
 	public String getText(LocationPoint o) {
 		return PointDescription.getSimpleName(o, view.getContext());
 	}
-	
+

 }

--- a/OsmAnd/src/net/osmand/plus/views/GPXLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/GPXLayer.java
@ -10,6 +10,7 @@ import android.graphics.Paint.Align;
 import android.graphics.Paint.Style;
 import android.graphics.Path;
 import android.graphics.PointF;
+import android.graphics.PorterDuff;
 import android.graphics.PorterDuff.Mode;
 import android.graphics.PorterDuffColorFilter;
 import android.support.annotation.NonNull;
@ -42,11 +43,11 @@ import java.util.List;

 import gnu.trove.list.array.TIntArrayList;

-public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContextMenuProvider, 
-			MapTextProvider<WptPt> {
-	
+public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContextMenuProvider,
+		MapTextProvider<WptPt> {
+
 	private OsmandMapTileView view;
-	
+
 	private Paint paint;
 	private Paint paint2;
 	private boolean isPaint2;
@ -61,7 +62,7 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex

 	private static final int startZoom = 7;

-	
+
 	private GpxSelectionHelper selectedGpxHelper;
 	private Paint paintBmp;
 	private List<WptPt> cache = new ArrayList<WptPt>();
@ -79,7 +80,7 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 	private List<TrkSegment> points;
 	private GPXFile gpx;

-	
+
 	private void initUI() {
 		paint = new Paint();
 		paint.setStyle(Style.STROKE);
@ -93,21 +94,21 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 		paint_1 = new Paint();
 		paint_1.setStyle(Style.STROKE);
 		paint_1.setAntiAlias(true);
-		

-		
+
+
 		paintBmp = new Paint();
 		paintBmp.setAntiAlias(true);
 		paintBmp.setFilterBitmap(true);
 		paintBmp.setDither(true);
-		
+
 		paintTextIcon = new Paint();
 		paintTextIcon.setTextSize(10 * view.getDensity());
 		paintTextIcon.setTextAlign(Align.CENTER);
 		paintTextIcon.setFakeBoldText(true);
 		paintTextIcon.setColor(Color.BLACK);
 		paintTextIcon.setAntiAlias(true);
-		
+
 		textLayer = view.getLayerByClass(MapTextLayer.class);

 		paintOuter = new Paint();
@ -122,7 +123,7 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 		paintIcon = new Paint();
 		pointSmall = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_white_shield_small);
 	}
-	
+

 	@Override
 	public void initLayer(OsmandMapTileView view) {
@ -132,11 +133,11 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 		initUI();
 	}

-	
+
 	public void updateLayerStyle() {
 		cachedHash = -1;
 	}
-	
+
 	private int updatePaints(int color, boolean routePoints, boolean currentTrack, DrawSettings nightMode, RotatedTileBox tileBox){
 		RenderingRulesStorage rrs = view.getApplication().getRendererRegistry().getCurrentSelectedRenderer();
 		final boolean isNight = nightMode != null && nightMode.isNightMode();
@ -195,7 +196,7 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 		paint.setColor(color == 0 ? cachedColor : color);
 		return cachedColor;
 	}
-	
+
 	private int calculateHash(Object... o) {
 		return Arrays.hashCode(o);
 	}
@ -220,9 +221,9 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 			}
 		}
 	}
-	
-	private void drawSelectedFilesSplits(Canvas canvas, RotatedTileBox tileBox, List<SelectedGpxFile> selectedGPXFiles, 
-			DrawSettings settings) {
+
+	private void drawSelectedFilesSplits(Canvas canvas, RotatedTileBox tileBox, List<SelectedGpxFile> selectedGPXFiles,
+										 DrawSettings settings) {
 		if (tileBox.getZoom() >= startZoom) {
 			// request to load
 			for (SelectedGpxFile g : selectedGPXFiles) {
@ -240,7 +241,7 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 	private void drawSplitItems(Canvas canvas, RotatedTileBox tileBox, List<GpxDisplayItem> items, DrawSettings settings) {
 		final QuadRect latLonBounds = tileBox.getLatLonBounds();
 		int r = (int) (12 * tileBox.getDensity());
-		int dr = r * 3 / 2; 
+		int dr = r * 3 / 2;
 		int px = -1;
 		int py = -1;
 		for(int k = 0; k < items.size(); k++) {
@ -294,6 +295,9 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 						float y = tileBox.getPixYFromLatLon(o.lat, o.lon);

 						if (intersects(boundIntersections, x, y, iconSize, iconSize)) {
+							boolean visit = isPointVisited(o);
+							int col = visit ? visitedColor : o.getColor(fcolor);
+							paintIcon.setColorFilter(new PorterDuffColorFilter(col, PorterDuff.Mode.MULTIPLY));
 							canvas.drawBitmap(pointSmall, x - pointSmall.getWidth() / 2, y - pointSmall.getHeight() / 2, paintIcon);
 						} else {
 							fullObjects.add(o);
@ -313,7 +317,7 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 	}

 	private void drawSelectedFilesSegments(Canvas canvas, RotatedTileBox tileBox,
-			List<SelectedGpxFile> selectedGPXFiles, DrawSettings settings) {
+										   List<SelectedGpxFile> selectedGPXFiles, DrawSettings settings) {
 		for (SelectedGpxFile g : selectedGPXFiles) {
 			List<TrkSegment> points = g.getPointsToDisplay();
 			boolean routePoints = g.isRoutePoints();
@ -346,8 +350,8 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 		for (TrkSegment l : points) {
 			int startIndex = -1;
 			int endIndex = -1;
-		    int prevCross = 0;
-		    double shift = 0;
+			int prevCross = 0;
+			double shift = 0;
 			for (int i = 0; i < l.points.size(); i++) {
 				WptPt ls = l.points.get(i);
 				int cross = 0;
@ -376,13 +380,13 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 			}
 		}
 	}
-	
+
 	@Override
 	public void onDraw(Canvas canvas, RotatedTileBox tileBox, DrawSettings settings) {
 	}


-	
+
 	private void drawSegment(Canvas canvas, RotatedTileBox tb, TrkSegment l, int startIndex, int endIndex) {
 		TIntArrayList tx = new TIntArrayList();
 		TIntArrayList ty = new TIntArrayList();
@ -414,10 +418,10 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 			canvas.drawPath(path, paint2);
 		}
 		canvas.rotate(tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY());
-		
+
 	}
-	
-	
+
+
 	private boolean calculateBelongs(int ex, int ey, int objx, int objy, int radius) {
 		return (Math.abs(objx - ex) <= radius * 2 && Math.abs(objy - ey) <= radius * 2) ;
 //		return Math.abs(objx - ex) <= radius && (ey - objy) <= radius / 2 && (objy - ey) <= 3 * radius ;
@ -447,7 +451,7 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 		}
 		return null;
 	}
-	
+
 	@Override
 	public PointDescription getObjectName(Object o) {
 		if(o instanceof WptPt){
@ -478,11 +482,11 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 		}
 		return null;
 	}
-	
-	
+
+
 	@Override
 	public void destroyLayer() {
-		
+
 	}
 	@Override
 	public boolean drawInScreenPixels() {
@ -518,4 +522,4 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex



-}
+}
--- a/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java
@ -8,7 +8,6 @@ import android.graphics.Paint;
 import android.graphics.Paint.Align;
 import android.graphics.Paint.Style;
 import android.graphics.PointF;
-
 import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.data.QuadPoint;
@ -19,6 +18,7 @@ import net.osmand.plus.TargetPointsHelper.TargetPoint;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.views.ContextMenuLayer.IContextMenuProvider;

+import java.util.Iterator;
 import java.util.List;

 public class PointNavigationLayer extends OsmandMapLayer implements IContextMenuProvider {
@ -103,7 +103,12 @@ public class PointNavigationLayer extends OsmandMapLayer implements IContextMenu
 			int locationY = tb.getPixYFromLatNoRot(pointToNavigate.getLatitude());
 			canvas.rotate(-tb.getRotate(), locationX, locationY);
 			canvas.drawBitmap(targetPoint, locationX - marginX, locationY - marginY, bitmapPaint);
-		} else if (pointToNavigate != null) {
+		} 
+		Iterator<TargetPoint> it = targetPoints.getIntermediatePoints().iterator();
+		if(it.hasNext()) {
+			pointToNavigate = it.next();
+		}
+		if (pointToNavigate != null && !isLocationVisible(tb, pointToNavigate)) {
 			boolean show = !view.getApplication().getRoutingHelper().isRouteCalculated();
 			if(view.getSettings().SHOW_DESTINATION_ARROW.isSet()) {
 				show = view.getSettings().SHOW_DESTINATION_ARROW.get();
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
@ -50,8 +50,8 @@ public class NextTurnInfoWidget extends TextInfoWidget {
 	}
 	
 	public void setTurnType(TurnType turnType) {
-		updateVisibility(turnType != null);
-		if (turnDrawable.setTurnType(turnType)) {
+		boolean vis = updateVisibility(turnType != null);
+		if (turnDrawable.setTurnType(turnType) || vis) {
 			if(horisontalMini) {
 				setImageDrawable(turnDrawable, false);
 			} else {
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
@ -849,6 +849,7 @@ public class RouteInfoWidgetsFactory {
 						}
 					} else if(alarm.getType() == AlarmInfoType.TOLL_BOOTH) {
 						//image done by drawing red ring
+						text = "$";
 					} else if(alarm.getType() == AlarmInfoType.TRAFFIC_CALMING) {
 						if(settings.DRIVING_REGION.get().americanSigns){
 							locimgId = R.drawable.warnings_traffic_calming_us;
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
Yurii Mazurevich	f42b4c3e47	Merge pull request #2253 from osmandapp/r2.2samsung R2.2samsung	2016-02-19 12:38:20 +02:00
Yurii Mazurevich	76640327b6	Update AndroidManifest.xml	2016-02-19 12:36:48 +02:00
Yurii Mazurevich	b00e8255ea	Update no_translate.xml	2016-02-19 12:36:10 +02:00
Yurii Mazurevich	537a21fb33	Update build.gradle	2016-02-19 12:35:16 +02:00
GaidamakUA	72842b97c3	Uses feature for Famsung	2016-02-17 16:49:46 +02:00
GaidamakUA	99940646e3	Raster map: synchronized model with view.	2016-02-11 15:09:37 +02:00
GaidamakUA	f15f35f37c	Removed reference from versionName in manifest.	2016-02-01 15:15:29 +02:00
vshcherb	16c2c5a3c7	Update Version.java	2016-01-10 12:14:18 +01:00
Victor Shcherb	63ef62eea2	Fix first time dialog	2015-12-22 10:45:58 +01:00
Alexey Kulish	e64db571e3	Revert fav/wpt icon. Fix fav's visibility on small zooms	2015-12-11 16:44:17 +03:00
Victor Shcherb	b14e285e76	Fix waypoints bug (not removing) in navigation	2015-12-09 17:22:20 +01:00
xmd5a	a024b79297	Fix ru phrase	2015-12-02 19:08:20 +03:00
Victor Shcherb	8a4dda7341	Fix poi not found	2015-11-30 22:42:13 +01:00
Victor Shcherb	dfd41fd89b	Merge branch 'r2.2' of github.com:osmandapp/Osmand into r2.2	2015-11-30 21:03:23 +01:00
Victor Shcherb	1ae0258121	Update activity	2015-11-30 21:03:15 +01:00
xmd5a	95cabe1f99	Update phrases	2015-11-30 22:24:04 +03:00
Alexey Kulish	252f821eb9	Fix build.gradle + small context menu fix	2015-11-30 17:39:07 +03:00
Alexey Kulish	51234689df	Fix - add fav/wpt: select name and open keyboard automatically	2015-11-30 15:49:19 +03:00
Alexey Kulish	41b0baa36e	Fix strings typo	2015-11-30 15:47:41 +03:00
xmd5a	abb9e7648c	Update ru strings	2015-11-29 21:41:36 +03:00
xmd5a	b3bb19f211	Update strings and phrases	2015-11-28 17:05:54 +03:00
xmd5a	bb513289d5	Improve ru string	2015-11-28 16:59:08 +03:00
xmd5a	4289cf9855	Fix ru string	2015-11-27 19:28:51 +03:00
Alexey Kulish	2ff332c49e	Fixes - context menu + download maps layer	2015-11-27 16:24:57 +03:00
Alexey Kulish	fd80843baf	Fix context menu crash and bottom lines hiding	2015-11-27 15:26:37 +03:00
xmd5a	41c33c13ed	Fix phrases	2015-11-26 12:55:05 +03:00
Alexey Kulish	72320e3198	Fix - point centered under context menu	2015-11-25 22:24:57 +03:00
xmd5a	dd506bbfa4	Update phrases	2015-11-25 20:42:58 +03:00
xmd5a	33eb0e73dc	Update phrases	2015-11-25 20:09:59 +03:00
Victor Shcherb	87ddee7c84	Fix #1885	2015-11-25 16:49:38 +01:00
Victor Shcherb	4934413ac6	Fix #1847 top left icon	2015-11-25 14:50:13 +01:00
Victor Shcherb	7583d2447b	Fix small issue	2015-11-25 14:43:35 +01:00
Victor Shcherb	500f000939	Fix null ref	2015-11-25 14:38:10 +01:00
Victor Shcherb	a583417eee	Fix #1898	2015-11-25 14:18:30 +01:00
Victor Shcherb	b59e745b2e	Fix #1929	2015-11-25 13:38:33 +01:00
Victor Shcherb	247e608e8d	Update map actions	2015-11-25 13:34:02 +01:00
Victor Shcherb	3ac7bac83b	Merge branch 'r2.2' of github.com:osmandapp/Osmand into r2.2	2015-11-25 12:11:45 +01:00
Victor Shcherb	bab02e3d08	Fix release issues	2015-11-25 12:11:37 +01:00
Alexey Kulish	0cbe471b58	Fixed 8,9	2015-11-25 13:32:05 +03:00
Alexey Kulish	741f954077	Fixed crash at OsmEditingPlugin (12)	2015-11-25 13:13:45 +03:00
Victor Shcherb	57319bce46	Merge branch 'r2.2' of github.com:osmandapp/Osmand into r2.2	2015-11-25 11:10:29 +01:00
Victor Shcherb	79bb246c72	Fix some crashes	2015-11-25 11:10:21 +01:00
Alexey Kulish	32090f7ed6	Fix crash at DownloadedRegionsLayer (4), fix - show selection of map region only after it was choosen from multi menu	2015-11-25 12:48:07 +03:00
Victor Shcherb	4e2bdf8553	Open half menu on tap	2015-11-24 09:42:05 +01:00
Victor Shcherb	a3d3d6764e	Merge branch 'r2.2' of github.com:osmandapp/Osmand into r2.2	2015-11-24 09:26:22 +01:00
Victor Shcherb	ac8e5ec798	Remove notification	2015-11-24 09:26:15 +01:00
xmd5a	46d7066480	Fix phrase	2015-11-23 21:33:24 +03:00
xmd5a	066a6e75f7	Tweak region downloads fill from basemap	2015-11-23 20:49:34 +03:00
GaidamakUA	1ca1d687c7	Fix for missing XML tag	2015-11-23 16:08:55 +02:00
Victor Shcherb	388b1a9214	Merge branch 'r2.2' of github.com:osmandapp/Osmand into r2.2	2015-11-23 10:23:00 +01:00
Victor Shcherb	ecb58268c9	Change destination red cursor to 1st intermediate	2015-11-23 10:22:54 +01:00
Alexey Kulish	1691e80b19	Merge branch 'r2.2' of https://github.com/osmandapp/Osmand into r2.2	2015-11-23 12:21:26 +03:00
Alexey Kulish	dad767c480	Fix crash at getWorldBaseMapItem	2015-11-23 12:18:02 +03:00
xmd5a	2c4d214bbd	Change regiond downloads colors (from basemap)	2015-11-23 12:04:55 +03:00
Victor Shcherb	73dcb066b7	Add dollar sign	2015-11-23 08:57:46 +01:00
Victor Shcherb	7d32c614d1	Merge branch 'r2.2' of github.com:osmandapp/Osmand into r2.2	2015-11-22 21:46:36 +01:00
Victor Shcherb	bfbd0ff810	Improve regions layer	2015-11-22 20:54:36 +03:00
Victor Shcherb	404bf0e805	Merge branch 'master' into r2.2 Conflicts: OsmAnd/res/values/strings.xml	2015-11-22 20:33:33 +03:00
xmd5a	5822fbaadc	Fix fuel names	2015-11-20 20:02:14 +03:00
Victor Shcherb	9ac4b23f63	Merge branch 'r2.2' of github.com:osmandapp/Osmand into r2.2	2015-11-20 13:28:19 +03:00
Victor Shcherb	493e7d8111	Remove crash setting	2015-11-20 13:28:08 +03:00
xmd5a	e0372f0583	Update strings	2015-11-20 10:16:27 +03:00
Victor Shcherb	53219e506e	Fix some poi issues Conflicts: OsmAnd/res/values/strings.xml	2015-11-20 01:21:53 +03:00
Victor Shcherb	57b288481a	Fix clothes and other duplicate poi types in poi search	2015-11-20 01:01:25 +03:00