Merge branch 'master' of https://github.com/osmandapp/Osmand into tracker_fixes

OsmAnd-java/src/test/resources/search/double_parking.json

@@ -17,6 +17,7 @@
     "Parking fee: no (Charging station / Transportation)",
     "Parking fee: yes (Charging station / Transportation)",
     "Parking lot (Fire hydrant / Emergency infrastructure)",
+    "Parking space (Personal transport)",
     "Parking tickets (Vending machine / Store)",
     "Parking tickets (Vending machine / Store)",
     "Parking time limit (Parking / Personal transport)",

OsmAnd-telegram/res/values-be/strings.xml

@@ -260,4 +260,7 @@
     <string name="unit_of_speed_system">Адзінка вымярэння хуткасці</string>
     <string name="buffer_time_descr">Максімальны час захоўвання пунктаў у буферы</string>
     <string name="buffer_time">Час дзеяння буферу</string>
+    <string name="shared_string_suggested">Прапанавана</string>
+    <string name="status_widget_title">Статус OsmAnd Tracker</string>
+    <string name="back_to_osmand">Вярнуцца ў OsmAnd</string>
 </resources>

OsmAnd-telegram/res/values-da/strings.xml

@@ -259,4 +259,8 @@
     <string name="unit_of_speed_system">Hastighed</string>
     <string name="buffer_time_descr">Maksimal tid til lagring af punkter i bufferen</string>
     <string name="buffer_time">Buffer udløbstid</string>
+    <string name="unit_of_length_descr">Ændr enhed for afstand.</string>
+    <string name="shared_string_suggested">Foreslået</string>
+    <string name="status_widget_title">OsmAnd Tracker-status</string>
+    <string name="back_to_osmand">Tilbage til OsmAnd</string>
 </resources>

OsmAnd-telegram/res/values-nb/strings.xml

@@ -237,7 +237,7 @@
     <string name="privacy">Personvern</string>
     <string name="shared_string_select">Velg</string>
     <string name="min_logging_distance">Minste loggingsavstand</string>
-    <string name="min_logging_distance_descr">Filter: Minimumsdistanse til neste loggingspunkt</string>
+    <string name="min_logging_distance_descr">Filter: Minimumsavstand for logging av nytt punkt</string>
     <string name="min_logging_accuracy">Minimumsnøyaktighet for logging</string>
     <string name="min_logging_accuracy_descr">Filter: Ingen logging med mindre nøyaktigheten nås</string>
     <string name="min_logging_speed">Minimumshastighet ved logging</string>
@@ -262,4 +262,5 @@
     <string name="buffer_time">Utløpstid for mellomlager</string>
     <string name="shared_string_suggested">Foreslått</string>
     <string name="status_widget_title">OsmAnd-sporerstatus</string>
+    <string name="back_to_osmand">Tilbake til OsmAnd</string>
 </resources>

OsmAnd-telegram/res/values-pl/strings.xml

@@ -260,4 +260,7 @@
     <string name="buffer_time_descr">Maksymalny czas przechowywania punktów w buforze</string>
     <string name="buffer_time">Czas ważności bufora</string>
     <string name="time_zone_descr">Wybierz strefę czasową, która ma być wyświetlana w wiadomościach o Twojej lokalizacji.</string>
+    <string name="shared_string_suggested">Proponowane</string>
+    <string name="status_widget_title">Stan modułu śledzącego OsmAnd</string>
+    <string name="back_to_osmand">Wróć do OsmAnd</string>
 </resources>

OsmAnd-telegram/res/values-pt/strings.xml

@@ -259,4 +259,7 @@
     <string name="unit_of_speed_system">Unidade de velocidade</string>
     <string name="buffer_time_descr">Tempo máximo para armazenar pontos no buffer</string>
     <string name="buffer_time">Tempo de expiração do buffer</string>
+    <string name="shared_string_suggested">Sugerido</string>
+    <string name="status_widget_title">Estado do Rastreador de OsmAnd</string>
+    <string name="back_to_osmand">Voltar para OsmAnd</string>
 </resources>

OsmAnd-telegram/res/values-sc/strings.xml

@@ -261,4 +261,5 @@
     <string name="buffer_time">Tempus de iscadidura de sa memòria tampone</string>
     <string name="shared_string_suggested">Cunsigiadu</string>
     <string name="status_widget_title">Istadu de s\'arrastadore de OsmAnd</string>
+    <string name="back_to_osmand">Torra a OsmAnd</string>
 </resources>

OsmAnd-telegram/src/net/osmand/telegram/TelegramService.kt

@@ -245,6 +245,8 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
 					oldestTime = -1
 				}
 				app().showLocationHelper.addOrUpdateStatusWidget(oldestTime, isSending)
+			} else {
+				app().showLocationHelper.addOrUpdateStatusWidget(-1, false)
 			}
 			startWidgetUpdates()
 		}, UPDATE_WIDGET_INTERVAL_MS)

OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt

@@ -851,22 +851,7 @@ class TelegramSettings(private val app: TelegramApplication) {
 			lastChatsInfo.forEach { lastInfo ->
 				val obj = JSONObject()
 				obj.put(LastChatInfo.CHAT_ID_KEY, lastInfo.chatId)
-				obj.put(LastChatInfo.PERIODS_KEY, convertPeriodsToJson(lastInfo.periods))
-				jArray.put(obj)
-			}
-			jArray
-		} catch (e: JSONException) {
-			log.error(e)
-			null
-		}
-	}
-
-	private fun convertPeriodsToJson(periods: LinkedList<Long>): JSONArray? {
-		return try {
-			val jArray = JSONArray()
-			for (i in 0 until periods.count()) {
-				val obj = JSONObject()
-				obj.put(i.toString(), periods[i])
+				obj.put(LastChatInfo.PERIOD_KEY, lastInfo.period)
 				jArray.put(obj)
 			}
 			jArray
@@ -947,12 +932,7 @@ class TelegramSettings(private val app: TelegramApplication) {
 			val obj = json.getJSONObject(i)
 			val lastInfo = LastChatInfo().apply {
 				chatId = obj.optLong(LastChatInfo.CHAT_ID_KEY)
-				periods = LinkedList<Long>()
-				val jsonArray = obj.getJSONArray(LastChatInfo.PERIODS_KEY)
-				for (j in 0 until jsonArray.length()) {
-					val o = jsonArray.get(j) as JSONObject
-					periods.addLast(o.optLong(j.toString()))
-				}
+				period = obj.optLong(LastChatInfo.PERIOD_KEY)
 			}
 			lastChatsInfo.addLast(lastInfo)
 		}
@@ -964,16 +944,14 @@ class TelegramSettings(private val app: TelegramApplication) {
 			addItemToSuggested(id, time)
 		} else {
 			val index = lastChatsInfo.indexOf(lastInfo)
-			lastChatsInfo[index].periods = addTimeToPeriods(lastChatsInfo[index].periods, time)
+			lastChatsInfo[index].period = time
 		}
 	}
 
 	private fun addItemToSuggested(id: Long, time: Long) {
 		val newLastInfo = LastChatInfo().apply {
 			chatId = id
-			periods = LinkedList<Long>().apply {
-				addFirst(time)
-			}
+			period = time
 		}
 		if (lastChatsInfo.size < 5) {
 			lastChatsInfo.addFirst(newLastInfo)
@@ -983,30 +961,6 @@ class TelegramSettings(private val app: TelegramApplication) {
 		}
 	}
 
-	private fun addTimeToPeriods(periods: LinkedList<Long>?, time: Long): LinkedList<Long> {
-		if (periods?.isNotEmpty() != null) {
-			return if (periods.size < 5) {
-				periods.addFirst(time)
-				periods
-			} else {
-				periods.removeLast()
-				periods.addFirst(time)
-				periods
-			}
-		}
-		return LinkedList<Long>().apply { addFirst(time) }
-	}
-
-	fun calcLivePeriod(periods: LinkedList<Long>): Long {
-		val sortedPeriods = periods.toLongArray()
-		sortedPeriods.sort()
-		return if (sortedPeriods.size % 2 == 0) {
-			(sortedPeriods[sortedPeriods.size / 2] + sortedPeriods[sortedPeriods.size / 2 - 1]) / 2
-		} else {
-			sortedPeriods[sortedPeriods.size / 2]
-		}
-	}
-
 	private fun getLiveNowChats() = app.telegramHelper.getMessagesByChatIds(locHistoryTime).keys
 
 	private fun updatePrefs() {
@@ -1512,11 +1466,11 @@ class TelegramSettings(private val app: TelegramApplication) {
 	class LastChatInfo {
 
 		var chatId = -1L
-		var periods = LinkedList<Long>()
+		var period = -1L
 
 		companion object {
 			internal const val CHAT_ID_KEY = "chatId"
-			internal const val PERIODS_KEY = "periods"
+			internal const val PERIOD_KEY = "period"
 		}
 	}
 }

OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt

@@ -580,7 +580,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 			val lastInfo = lastChatsInfo.find { it.chatId == chatId }
 			if (chat != null && lastInfo != null) {
 				val index = lastChatsInfo.indexOf(lastInfo)
-				lastItems.add(LastChat(chat, settings.calcLivePeriod(lastChatsInfo[index].periods)))
+				lastItems.add(LastChat(chat, lastChatsInfo[index].period))
 			}
 		}
 		return lastItems

OsmAnd/res/layout/close_measurement_tool_dialog.xml

@@ -10,6 +10,9 @@
         android:layout_width="0dp"
         android:layout_weight="1"
         android:layout_height="wrap_content"
+        android:textColor="?android:textColorPrimary"
+        android:layout_marginLeft="@dimen/content_padding_small"
+        android:layout_marginStart="@dimen/content_padding_small"
         android:text="@string/keep_showing_on_map"/>
 
     <android.support.v7.widget.SwitchCompat

OsmAnd/res/layout/dashboard_settings_dialog_item.xml

@@ -5,6 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="@dimen/list_item_height"
+    android:background="?attr/selectableItemBackground"
     android:paddingLeft="20dp"
     android:orientation="horizontal">
 

OsmAnd/res/layout/show_dashboard_on_start_dialog_item.xml

@@ -2,6 +2,7 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:osmand="http://schemas.android.com/apk/res-auto"
+    android:background="?attr/selectableItemBackground"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 

OsmAnd/res/layout/waypoint_reached.xml

@@ -48,7 +48,7 @@
             android:layout_gravity="center_vertical"
             android:ellipsize="end"
             android:maxLines="2"
-            android:textColor="?android:textColorSecondary"
+            android:textColor="?android:textColorPrimary"
             android:textSize="@dimen/default_list_text_size"
             tools:text="Some waypoint text"/>
 

OsmAnd/res/values-ar/strings.xml

@@ -1965,7 +1965,7 @@
 \n 
 \nهذه الرؤية يمكن التراجع عنها إما عن طريق تعطيلها هنا، أو تغيير \'نمط الخريطة\' في \'ضبط الخريطة\' حسب الرغبة.</string>
     <string name="create_poi_link_to_osm_doc">
-        <u>على الانترنت OSM</u> تصنيف الخريطة مع الصور.</string>
+        <u>Online OSM</u> تصنيف الخريطة مع الصور.</string>
     <string name="background_service_wait_int_descr">تعيين الحد الأقصى لوقت الانتظار لكل إصلاح موقع في الخلفية.</string>
     <string name="background_service_wait_int">الانتظار الأقصى للإصلاح</string>
     <string name="voice_data_not_supported">إصدار غير معتمد من البيانات الصوتية</string>
@@ -3335,4 +3335,9 @@
     <string name="choose_icon_color_name">اختر الايقونة واللون والاسم</string>
     <string name="reorder_profiles">تحرير قائمة ملفات التعريف</string>
     <string name="selected_profile">الملف الشخصي المحدد</string>
+    <string name="reset_confirmation_descr">بالضغط على %1$s، ستفقد كل تغييراتك.</string>
+    <string name="reset_all_profile_settings_descr">سيتم إعادة ضبط جميع إعدادات البروفايل إلى الحالة بعد التثبيت.</string>
+    <string name="reset_all_profile_settings">إعادة تعيين جميع إعدادات البروفايل إلى الوضع الافتراضي؟</string>
+    <string name="ltr_or_rtl_combine_via_space">%2$s %1$s</string>
+    <string name="ltr_or_rtl_combine_via_colon">%2$s :%1$s</string>
 </resources>

OsmAnd/res/values-ca/strings.xml

@@ -3308,8 +3308,8 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="shared_string_memory_mb_desc">%1$s MB</string>
     <string name="shared_string_memory_kb_desc">%1$s kB</string>
     <string name="track_storage_directory">Carpeta d\'emmagatzematge de traces</string>
-    <string name="track_storage_directory_descrp">Les traces es poden emmagatzemar a la carpeta \'rec\', a les carpetes mensuals o a les diàries.</string>
-    <string name="store_tracks_in_rec_directory">Enregistra les traces a la carpeta \'rec\'</string>
+    <string name="track_storage_directory_descrp">Les traces es poden emmagatzemar a la carpeta «rec», a les carpetes mensuals o a les diàries.</string>
+    <string name="store_tracks_in_rec_directory">Enregistra les traces a la carpeta «rec»</string>
     <string name="store_tracks_in_daily_directories">Enregistra les traces a les carpetes diàries</string>
     <string name="store_tracks_in_daily_directories_descrp">Enregistra les traces en carpetes segons el dia d\'enregistrament (tipus 2019-01-01).</string>
     <string name="shared_string_memory_used_tb_desc">%1$s TB utilitzats</string>
@@ -3378,7 +3378,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="shared_sting_tiles">Tessel·les</string>
     <string name="export_profile">Exporta el perfil</string>
     <string name="exported_osmand_profile">Perfil d\'OsmAnd: %1$s</string>
-    <string name="overwrite_profile_q">El perfil \'%1$s\' ja existeix. El voleu sobreescriure\?</string>
+    <string name="overwrite_profile_q">El perfil «%1$s» ja existeix. El voleu sobreescriure\?</string>
     <string name="export_profile_failed">No s\'ha pogut exportar el perfil.</string>
     <string name="profile_import">Importació del perfil</string>
     <string name="profile_import_descr">Per a importar un perfil, seleccioneu-ne el fitxer en el dispositiu i obriu-lo amb OsmAnd.</string>
@@ -3427,4 +3427,8 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="reorder_profiles">Edita la llista de perfils</string>
     <string name="selected_profile">Perfil seleccionat</string>
     <string name="quick_action_directions_from_desc">Un botó per establir el punt central de la pantalla com el punt de sortida i calcular la ruta vers la destinació o obrir una petició per seleccionar-la si no hi ha un marcador de destinació al mapa.</string>
+    <string name="logcat_buffer">Memòria intermèdia del Logcat</string>
+    <string name="reset_confirmation_descr">En fer clic a %1$s perdreu tots els vostres canvis.</string>
+    <string name="reset_all_profile_settings_descr">La configuració de tot el perfil es reinicialitzarà a l\'estat postinstalació.</string>
+    <string name="reset_all_profile_settings">Voleu reinicialitzar totes les configuracions del perfil als valors per defecte\?</string>
 </resources>

OsmAnd/res/values-da/strings.xml

@@ -3429,4 +3429,6 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="reset_confirmation_descr">Ved at klikke på %1$s, mistes alle ændringer.</string>
     <string name="reset_all_profile_settings_descr">Alle profilindstillinger nulstilles.</string>
     <string name="reset_all_profile_settings">Nulstil alle profilindstillinger til standard\?</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
+    <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
 </resources>

OsmAnd/res/values-de/phrases.xml

@@ -439,7 +439,7 @@
     <string name="poi_beacon_safe_water">Mitte-Fahrwasser-Bake</string>
     <string name="poi_beacon_special_purpose">Sonderzeichen-Bake</string>
     <string name="poi_berth">Landesteg</string>
-    <string name="poi_seamark_bridge">Brücke (Seezeichen)</string>
+    <string name="poi_seamark_bridge">Seezeichen: Brücke</string>
     <string name="poi_seamark_building">Seezeichengebäude</string>
     <string name="poi_buoy_cardinal">Untiefentonne (Kardinal)</string>
     <string name="poi_buoy_installation">Ansteuertonne</string>
@@ -456,7 +456,7 @@
     <string name="poi_seamark_harbour">Hafen</string>
     <string name="poi_harbour_basin">Hafenbecken</string>
     <string name="poi_landmark">Landmarke</string>
-    <string name="poi_seamark_light">Leuchtfeuer, Seezeichen</string>
+    <string name="poi_seamark_light">Seezeichen: Leuchtfeuer</string>
     <string name="poi_seamark_light_float">Treibendes Leuchtfeuer</string>
     <string name="poi_seamark_light_major">Hauptleuchtfeuer</string>
     <string name="poi_seamark_light_minor">Nebenleuchtfeuer</string>
@@ -763,7 +763,7 @@
     <string name="poi_wiki_lang_sk">Slowakisches Wiki</string>
     <string name="poi_wiki_lang_pl">Polnisches Wiki</string>
     <string name="poi_wiki_lang_nl">Niederländisches Wiki</string>
-    <string name="poi_wiki_lang_nn">Neu-Norwegisches Wiki</string>
+    <string name="poi_wiki_lang_nn">Neu-norwegisches Wiki</string>
     <string name="poi_wiki_lang_no">Norwegisches Wiki</string>
     <string name="poi_wiki_lang_hr">Kroatisches Wiki</string>
     <string name="poi_wiki_lang_ht">Haitianisches Wiki</string>
@@ -773,7 +773,7 @@
     <string name="poi_wiki_lang_ar">Arabisches Wiki</string>
     <string name="poi_wiki_lang_be">Weißrussisches Wiki</string>
     <string name="poi_wiki_lang_bg">Bulgarisches Wiki</string>
-    <string name="poi_wiki_lang_ceb">Cebuanosprachiges Wiki</string>
+    <string name="poi_wiki_lang_ceb">Cebuano-Wiki</string>
     <string name="poi_wiki_lang_cs">Tschechisches Wiki</string>
     <string name="poi_wiki_lang_da">Dänisches Wiki</string>
     <string name="poi_wiki_lang_de">Deutsches Wiki</string>
@@ -864,7 +864,7 @@
     <string name="poi_route_hiking_nwn_poi">Nationaler Wanderweg</string>
     <string name="poi_route_hiking_rwn_poi">Regionaler Wanderweg</string>
     <string name="poi_route_hiking_lwn_poi">Örtlicher Wanderweg</string>
-    <string name="poi_route_hiking_ref_poi">Wanderwegshinweis</string>
+    <string name="poi_route_hiking_ref_poi">Wanderweghinweis</string>
     <string name="poi_collection_times">Leerungszeiten</string>
     <string name="poi_service_times">Betriebszeiten</string>
     <string name="poi_abandoned_poi">Verlassenes Objekt</string>
@@ -933,7 +933,7 @@
     <string name="poi_shower">Dusche</string>
     <string name="poi_email">E-Mail</string>
     <string name="poi_fax">Fax</string>
-    <string name="facebook">"Facebook "</string>
+    <string name="facebook">Facebook</string>
     <string name="poi_mobile">Handy</string>
     <string name="poi_fee_no">nein</string>
     <string name="poi_drinking_water_yes">ja</string>
@@ -944,7 +944,7 @@
     <string name="poi_access_no">Zutritt verboten</string>
     <string name="poi_access_customers">Kundenverkehr frei</string>
     <string name="poi_access_delivery">Lieferverkehr frei</string>
-    <string name="poi_access_agricultural">Landwirtschaftl. Verkehr frei</string>
+    <string name="poi_access_agricultural">Landwirtschaftlicher Verkehr frei</string>
     <string name="poi_recycling_centre">Recyclingzentrum</string>
     <string name="poi_recycling_aluminium">Aluminium</string>
     <string name="poi_recycling_white_goods">Weiße Ware</string>
@@ -1012,13 +1012,13 @@
     <string name="poi_religion_voodoo">Voodoo</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_roman_catholic">Römisch-katholisch</string>
     <string name="poi_denomination_orthodox">Orthodox</string>
     <string name="poi_denomination_lutheran">Lutherisch</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_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>
@@ -1030,7 +1030,7 @@
     <string name="poi_start_date">Anfangsdatum</string>
     <string name="poi_wheelchair_yes">ja</string>
     <string name="poi_wheelchair_no">nein</string>
-    <string name="poi_wheelchair_limited">Eingeschränkt</string>
+    <string name="poi_wheelchair_limited">eingeschränkt</string>
     <string name="poi_wholesale">Großhandel</string>
     <string name="poi_content_silage">Inhalt: Silage</string>
     <string name="poi_content_water">Inhalt: Wasser</string>
@@ -1096,7 +1096,7 @@
     <string name="poi_intermittent">Zeitweise</string>
     <string name="poi_deadlock">Verklemmung</string>
     <string name="poi_aerialway_length">Länge</string>
-    <string name="poi_craft_electronics_repair">Elektrogeräte-Reparatur</string>
+    <string name="poi_craft_electronics_repair">Elektrogerätereparatur</string>
     <string name="poi_aerialway_pylon">Stütze</string>
     <string name="poi_memorial_war">Kriegsdenkmal</string>
     <string name="poi_memorial_statue">Statue</string>
@@ -1133,10 +1133,10 @@
     <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_faa">FAA-Code</string>
     <string name="poi_width">Breite</string>
     <string name="poi_architect_name">Architekt</string>
-    <string name="poi_architecture_modern">Architektur: Modern</string>
+    <string name="poi_architecture_modern">Architektur: modern</string>
     <string name="poi_tunnel_car">Straßentunnel</string>
     <string name="poi_tunnel_pedestrian">Fußgängertunnel</string>
     <string name="poi_tunnel_railway">Eisenbahntunnel</string>
@@ -1174,7 +1174,7 @@
     <string name="poi_clothes_dance">Tanz</string>
     <string name="poi_clothes_military">Militär</string>
     <string name="poi_shoes_children">Kinder</string>
-    <string name="poi_shoes_women">Frauen</string>
+    <string name="poi_shoes_women">Damen</string>
     <string name="poi_shoes_sport">Sport</string>
     <string name="poi_shoes_men">Männer</string>
     <string name="poi_shoes_orthopedic">Orthopädisch</string>
@@ -1277,14 +1277,14 @@
     <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_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_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">Koptisch-Orthodox</string>
+    <string name="poi_denomination_georgian_orthodox">Georgisch-orthodox</string>
+    <string name="poi_denomination_coptic_orthodox">Koptisch-orthodox</string>
     <string name="poi_bicycle_parking_stands">Fahrradständer</string>
     <string name="poi_bicycle_parking_wall_loops">Vorderradständer</string>
     <string name="poi_leaf_type_mixed">Gemischt</string>
@@ -1329,7 +1329,7 @@
     <string name="poi_covered_yes">ja</string>
     <string name="poi_covered_no">Nicht überdacht</string>
     <string name="poi_smoking_no">Nicht erlaubt</string>
-    <string name="poi_smoking_outside">Nur Außerhalb</string>
+    <string name="poi_smoking_outside">Nur außerhalb</string>
     <string name="poi_smoking_yes">Erlaubt</string>
     <string name="poi_smoking_separated">In einem separaten Raum</string>
     <string name="poi_traffic_signals_sound_yes">ja</string>
@@ -1357,9 +1357,9 @@
     <string name="poi_ford_stepping_stones">Trittsteine</string>
     <string name="poi_greenfield">Grüne Wiese</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_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">ja</string>
     <string name="poi_capacity_disabled_no">Keine Behindertenplätze</string>
@@ -1374,8 +1374,8 @@
     <string name="poi_capacity_parent">Elternplätze</string>
     <string name="poi_aerialway_occupancy">Kabinen-, Gondel-, Sesselkapazitä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">mit Überdachung</string>
+    <string name="poi_aerialway_duration">Durchschnittliche Fahrzeit, Minuten</string>
+    <string name="poi_aerialway_bubble_yes">Mit Überdachung</string>
     <string name="poi_aerialway_bubble_no">Ohne Überdachung</string>
     <string name="poi_aerialway_heating_yes">ja</string>
     <string name="poi_aerialway_heating_no">Keine Heizung</string>
@@ -1387,7 +1387,7 @@
     <string name="poi_aerialway_access_both">Ein- 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">Sommer Ein- und Ausgang</string>
+    <string name="poi_aerialway_summer_access_both">Sommerein- und -ausgang</string>
     <string name="poi_stars_1">1 (Tourist)</string>
     <string name="poi_stars_1s">1S (gehobener Tourist)</string>
     <string name="poi_stars_2">2 (Standard)</string>
@@ -1397,14 +1397,14 @@
     <string name="poi_stars_4">4 (Erste Klasse)</string>
     <string name="poi_stars_4s">4S (gehobene Erste Klasse)</string>
     <string name="poi_stars_5">5 (Luxus)</string>
-    <string name="poi_stars_5s">5S (gehobenes De Luxe)</string>
+    <string name="poi_stars_5s">5S (gehobener Luxus)</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</string>
     <string name="poi_payment_coins_no">Münzen nicht akzeptiert</string>
-    <string name="poi_payment_coins_0_5">$0,50 Münzen</string>
-    <string name="poi_payment_coins_50c12">50c, 1€ und 2€ Münzen</string>
+    <string name="poi_payment_coins_0_5">Halbdollar-Münzen</string>
+    <string name="poi_payment_coins_50c12">50-Cent-, 1-Euro- und 2-Euro-Münzen</string>
     <string name="poi_payment_telephone_cards_yes">Telefonkarten</string>
     <string name="poi_payment_telephone_cards_no">Telefonkarten nicht akzeptiert</string>
     <string name="poi_payment_credit_cards_yes">Kreditkarten</string>
@@ -1467,10 +1467,10 @@
     <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_shia">Schiitisch</string>
     <string name="poi_denomination_united">Vereinigten</string>
     <string name="poi_denomination_tibetan">Tibetisch</string>
-    <string name="poi_denomination_united_reformed">Vereinigt Reformiert</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>
@@ -1482,13 +1482,13 @@
     <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">Armenisch-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_armenian_apostolic">Armenisch-apostolisch</string>
+    <string name="poi_denomination_dutch_reformed">Niederländisch-reformiert</string>
+    <string name="poi_denomination_latter_day_saints">Heilige 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_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>
@@ -1504,11 +1504,11 @@
     <string name="poi_site_type_city">Stadt</string>
     <string name="poi_site_type_necropolis">Nekropole</string>
     <string name="poi_site_type_earthwork">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_megalith_type_menhir">Megalithtyp: Menhir</string>
+    <string name="poi_megalith_type_dolmen">Megalithtyp: Dolmen</string>
     <string name="poi_fortification_type_hill_fort">Befestigungstyp: Wallburg</string>
     <string name="poi_fortification_type_limes">Befestigungstyp: Limes</string>
-    <string name="poi_fortification_type_sconce">Festungsbautyp: Schanze</string>
+    <string name="poi_fortification_type_sconce">Befestungstyp: Schanze</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>
@@ -1592,19 +1592,19 @@
     <string name="poi_wetland_bog">Moor</string>
     <string name="poi_wetland_marsh">Marsch</string>
     <string name="poi_wetland_reedbed">Schilf</string>
-    <string name="poi_recycling_hardcore">(Bau)Schutt</string>
+    <string name="poi_recycling_hardcore">Bauschutt</string>
     <string name="poi_brownfield">Bauland</string>
     <string name="poi_religion_unitarian_universalist">Unitarischer Universalismus</string>
     <string name="poi_religion_multifaith">Multikonfessionell</string>
     <string name="poi_religion_scientologist">Scientology</string>
     <string name="poi_denomination_uniting">Vereinigung</string>
     <string name="poi_denomination_congregational">Kongregationalistisch</string>
-    <string name="poi_denomination_ethiopian_orthodox_tewahedo">Äthiopisch-Orthodoxe Tewahedo-Kirche</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">Wesleyaner</string>
     <string name="poi_denomination_shingon_shu">Shingon-shū</string>
-    <string name="poi_denomination_mahayana">Mahayana Buddhisten</string>
-    <string name="poi_jersey_barrier">Jersey Barriere</string>
+    <string name="poi_denomination_mahayana">Mahayana-Buddhisten</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>
@@ -1620,7 +1620,7 @@
     <string name="poi_toll_hgv_yes">Lkw-Maut</string>
     <string name="poi_tactile_paving_yes">ja</string>
     <string name="poi_tactile_paving_no">Ohne Blindenleitsystem</string>
-    <string name="poi_traffic_signals_sound_walk">Nur wenn Gehen erlaubt ist</string>
+    <string name="poi_traffic_signals_sound_walk">Nur, wenn Gehen erlaubt ist</string>
     <string name="poi_services">Raststätte</string>
     <string name="poi_railway_level_crossing">Bahnübergang</string>
     <string name="poi_horse_riding">Reiten</string>
@@ -1643,7 +1643,7 @@
     <string name="poi_garden_type_botanical">Gartentyp: botanisch</string>
     <string name="poi_garden_style_kitchen">Gartenstil: Küchengarten</string>
     <string name="poi_garden_style_rosarium">Gartenstil: Rosengarten</string>
-    <string name="poi_garden_style_french">Gartenstil: Französisch</string>
+    <string name="poi_garden_style_french">Gartenstil: französisch</string>
     <string name="poi_love_hotel">Liebeshotel</string>
     <string name="poi_payment_electronic_purses_yes">Elektronische Geldbörsen</string>
     <string name="poi_payment_uta_yes">UTA</string>
@@ -1669,7 +1669,7 @@
     <string name="poi_payment_routex_no">Routex-Tankkarten nicht akzeptiert</string>
     <string name="poi_payment_bancomat_yes">Bancomat</string>
     <string name="poi_payment_bancomat_no">Bancomat nicht akzeptiert</string>
-    <string name="poi_payment_prepaid_ticket_yes">vorausbezahlte Fahrkarten</string>
+    <string name="poi_payment_prepaid_ticket_yes">Vorausbezahlte Fahrkarten</string>
     <string name="poi_payment_jcb_yes">JCB</string>
     <string name="poi_payment_jcb_no">JCB-Karten nicht akzeptiert</string>
     <string name="poi_payment_eurowag_yes">Eurowag</string>
@@ -1693,9 +1693,9 @@
     <string name="poi_payment_e_zpass_no">E‑ZPass nicht akzeptiert</string>
     <string name="poi_payment_kitcard_yes">KITCard</string>
     <string name="poi_payment_kitcard_no">KITCard nicht akzeptiert</string>
-    <string name="poi_payment_v_pay_yes">V PAY</string>
+    <string name="poi_payment_v_pay_yes">V-Pay</string>
     <string name="poi_payment_v_pay_no">V-Pay-Karten nicht akzeptiert</string>
-    <string name="poi_payment_dogecoin_yes">Dogecoin Ɖ</string>
+    <string name="poi_payment_dogecoin_yes">Dogecoin</string>
     <string name="poi_payment_dogecoin_no">Dogecoin nicht akzeptiert</string>
     <string name="poi_payment_cibus_yes">Cibus</string>
     <string name="poi_payment_cibus_no">Cibus-Karten nicht akzeptiert</string>
@@ -1705,7 +1705,7 @@
     <string name="poi_payment_ep_cash_no">Geldkarte nicht akzeptiert</string>
     <string name="poi_payment_ep_proton_yes">Proton</string>
     <string name="poi_payment_ep_proton_no">Proton-Karten nicht akzeptiert</string>
-    <string name="poi_payment_ep_avant_yes">Avant Karte</string>
+    <string name="poi_payment_ep_avant_yes">Avantcard</string>
     <string name="poi_payment_ep_avant_no">Avantcard nicht akzeptiert</string>
     <string name="poi_payment_ep_mep_yes">MEP</string>
     <string name="poi_payment_ep_mep_no">MEP nicht akzeptiert</string>
@@ -1719,7 +1719,7 @@
     <string name="poi_payment_ep_monedero4b_no">Monedero 4B nicht akzeptiert</string>
     <string name="poi_payment_ep_monedero_yes">Monedero</string>
     <string name="poi_payment_ep_monedero_no">Monedero nicht akzeptiert</string>
-    <string name="poi_payment_bankaxess_yes">BankAxes</string>
+    <string name="poi_payment_bankaxess_yes">BankAxess</string>
     <string name="poi_payment_bankaxess_no">BankAxess nicht akzeptiert</string>
     <string name="poi_payment_coinkite_yes">Coinkite</string>
     <string name="poi_payment_coinkite_no">Coinkite nicht akzeptiert</string>
@@ -1727,8 +1727,8 @@
     <string name="poi_payment_roadrunner_no">Roadrunner-Karten nicht akzeptiert</string>
     <string name="poi_payment_svg_yes">SVG</string>
     <string name="poi_payment_svg_no">SVG nicht akzeptiert</string>
-    <string name="poi_payment_sms_yes">SMS Zahlungen</string>
-    <string name="poi_payment_sms_no">SMS-Zahlung nicht akzeptiert</string>
+    <string name="poi_payment_sms_yes">SMS-Zahlungen</string>
+    <string name="poi_payment_sms_no">SMS-Zahlungen nicht akzeptiert</string>
     <string name="poi_payment_ov_chipkaart_yes">OV-Chipkaart</string>
     <string name="poi_payment_ov_chipkaart_no">OV-Chipkaart nicht akzeptiert</string>
     <string name="poi_payment_oyster_yes">Oyster</string>
@@ -1751,7 +1751,7 @@
     <string name="poi_payment_golden_crown_no">Golden Crown-Karten nicht akzeptiert</string>
     <string name="poi_payment_pro100_yes">PRO100</string>
     <string name="poi_payment_pro100_no">PRO100-Karten nicht akzeptiert</string>
-    <string name="poi_payment_union_card_yes">Union Karte</string>
+    <string name="poi_payment_union_card_yes">Union-Karte</string>
     <string name="poi_payment_union_card_no">Union-Karte nicht akzeptiert</string>
     <string name="poi_payment_mtsmoney_yes">MTS-Money</string>
     <string name="poi_payment_mtsmoney_no">MTS-Money nicht akzeptiert</string>
@@ -1762,19 +1762,19 @@
     <string name="poi_internet_access_fee_no">Internetzugang: kostenlos</string>
     <string name="poi_events_venue">Veranstaltungsort</string>
     <string name="poi_diet_vegetarian_only">Nur vegetarisch</string>
-    <string name="poi_diet_vegetarian_yes">Vegetarische</string>
+    <string name="poi_diet_vegetarian_yes">Vegetarisch</string>
     <string name="poi_diet_vegetarian_no">Vegetarisch: nein</string>
-    <string name="poi_diet_vegetarian_few">vegetarisch (wenige)</string>
+    <string name="poi_diet_vegetarian_few">Vegetarisch (wenige)</string>
     <string name="poi_diet_vegan_only">Nur vegan</string>
     <string name="poi_diet_vegan_yes">Vegan</string>
     <string name="poi_diet_vegan_no">Vegan: nein</string>
-    <string name="poi_diet_gluten_free_only">Nur glutenfreie</string>
-    <string name="poi_diet_gluten_free_yes">glutenfrei</string>
+    <string name="poi_diet_gluten_free_only">Nur glutenfrei</string>
+    <string name="poi_diet_gluten_free_yes">Glutenfrei</string>
     <string name="poi_diet_gluten_free_no">Glutenfrei: nein</string>
     <string name="poi_diet_kosher_only">Nur koscher</string>
     <string name="poi_diet_kosher_yes">Koscher</string>
     <string name="poi_diet_kosher_no">Koscher: nein</string>
-    <string name="poi_diet_halal_only">Nur Halal</string>
+    <string name="poi_diet_halal_only">Nur halal</string>
     <string name="poi_diet_halal_yes">Halal</string>
     <string name="poi_diet_halal_no">Halal: nein</string>
     <string name="poi_diet_lactose_free_only">Nur laktosefrei</string>
@@ -1799,7 +1799,7 @@
     <string name="poi_full_service_yes">Rundumservice</string>
     <string name="poi_aeroway_fuel">Flugzeugtankstelle</string>
     <string name="poi_public_bath">Öffentliches Bad</string>
-    <string name="poi_indoor_no">im Freien</string>
+    <string name="poi_indoor_no">Im Freien</string>
     <string name="poi_indoor_yes">Innen</string>
     <string name="poi_toilets_wheelchair_yes">Rollstuhlgerechte Toilette: ja</string>
     <string name="poi_toilets_wheelchair_no">Rollstuhlgerechte Toilette: nein</string>
@@ -1817,7 +1817,7 @@
     <string name="poi_vending_public_transport_tickets">Fahrscheine</string>
     <string name="poi_vending_drinks">Getränke</string>
     <string name="poi_vending_sweets">Süßigkeiten</string>
-    <string name="poi_vending_parcel_pickup_mail_in">Paketausgabe und -annahmestelle</string>
+    <string name="poi_vending_parcel_pickup_mail_in">Paketausgabe- und -annahmestelle</string>
     <string name="poi_vending_condoms">Kondome</string>
     <string name="poi_vending_stamps">Briefmarken</string>
     <string name="poi_vending_food">Essen</string>
@@ -1850,7 +1850,7 @@
     <string name="poi_memorial_stele">Stele</string>
     <string name="poi_memorial_bust">Büste</string>
     <string name="poi_memorial_koshinto">Koshinto</string>
-    <string name="poi_memorial_blue_plaque">blaue Plakette</string>
+    <string name="poi_memorial_blue_plaque">Blaue Plakette</string>
     <string name="poi_memorial_jizo">Jizo</string>
     <string name="poi_memorial_cross">Kreuzförmig</string>
     <string name="poi_memorial_vehicle">Fahrzeug</string>
@@ -1905,8 +1905,8 @@
     <string name="poi_shelter_type_rock_shelter">Felsüberhang</string>
     <string name="poi_shelter_type_sun_shelter">Sonnenschutz</string>
     <string name="poi_shelter_type_field_shelter">Feldhütte</string>
-    <string name="poi_shelter_type_tent">Unterstand-Typ: Zelt</string>
-    <string name="poi_shelter_type_abandoned">Unterstand-Typ: verlassen</string>
+    <string name="poi_shelter_type_tent">Unterstandtyp: Zelt</string>
+    <string name="poi_shelter_type_abandoned">Unterstandtyp: verlassen</string>
     <string name="poi_memorial_prasat">Tempelturm</string>
     <string name="poi_resource_barite">Baryt</string>
     <string name="poi_wetland_string_bog">Strangmoor</string>
@@ -1923,16 +1923,16 @@
     <string name="poi_artwork_type_graffiti">Kunstart: Graffiti</string>
     <string name="poi_artwork_type_stele">Kunstart: Stele</string>
     <string name="poi_artwork_type_fountain">Kunstart: Brunnen</string>
-    <string name="poi_architecture_stalinist_neoclassicism">Architektur: Stalinistischer Neoklassizismus</string>
-    <string name="poi_architecture_eclectic">Architektur: Eklektisch</string>
+    <string name="poi_architecture_stalinist_neoclassicism">Architektur: stalinistischer Neoklassizismus</string>
+    <string name="poi_architecture_eclectic">Architektur: eklektisch</string>
     <string name="poi_architecture_new_objectivity">Architektur: Neue Sachlichkeit</string>
-    <string name="poi_architecture_contemporary">Architektur: Zeitgenössisch</string>
+    <string name="poi_architecture_contemporary">Architektur: zeitgenössisch</string>
     <string name="poi_architecture_constructivism">Architektur: Konstruktivismus</string>
     <string name="poi_architecture_umgebinde">Architektur: Umgebinde</string>
     <string name="poi_architecture_timber_frame">Architektur: Holzrahmen</string>
     <string name="poi_architecture_art_nouveau">Architektur: Jugendstil</string>
     <string name="poi_architecture_neoclassicism">Architektur: Neoklassizismus</string>
-    <string name="poi_architecture_victorian">Architektur: Viktorianisch</string>
+    <string name="poi_architecture_victorian">Architektur: viktorianisch</string>
     <string name="poi_architecture_brutalism">Architektur: Brutalismus</string>
     <string name="poi_architecture_classicism">Architektur: Klassizismus</string>
     <string name="poi_architecture_gothic">Architektur: Gotik</string>
@@ -1943,12 +1943,12 @@
     <string name="poi_architecture_romanesque">Architektur: Romanik</string>
     <string name="poi_tunnel_waterway">Wassertunnel</string>
     <string name="poi_bridge_waterway">Wasserbrücke</string>
-    <string name="poi_bridge_structure_beam">Brückenkonstruktion: Strahl</string>
+    <string name="poi_bridge_structure_beam">Brückenkonstruktion: Balken</string>
     <string name="poi_bridge_structure_simple_suspension">Brückenkonstruktion: einfache Aufhängung</string>
     <string name="poi_bridge_structure_suspension">Brückenkonstruktion: Aufhängung</string>
     <string name="poi_bridge_structure_arch">Brückenkonstruktion: Bogen</string>
     <string name="poi_bridge_structure_truss">Brückenkonstruktion: Fachwerk</string>
-    <string name="poi_bridge_structure_floating">Brückenkonstruktion: Schwimmend</string>
+    <string name="poi_bridge_structure_floating">Brückenkonstruktion: schwimmend</string>
     <string name="poi_bridge_structure_humpback">Brückenkonstruktion: Buckel</string>
     <string name="poi_bridge_structure_cable_stayed">Brückenkonstruktion: Schrägseil</string>
     <string name="poi_bridge_structure_boardwalk">Brückenkonstruktion: Promenade</string>
@@ -1966,7 +1966,7 @@
     <string name="poi_bridge_movable_retractable">Beweglicher Brückentyp: Schubbrücke</string>
     <string name="poi_lit_yes">Beleuchtung: ja</string>
     <string name="poi_lit_no">Beleuchtung: nein</string>
-    <string name="poi_surface_unpaved">Oberfläche: unbefestigte</string>
+    <string name="poi_surface_unpaved">Oberfläche: unbefestigt</string>
     <string name="poi_surface_paved">Oberfläche: befestigt</string>
     <string name="poi_surface_asphalt">Oberfläche: Asphalt</string>
     <string name="poi_surface_concrete">Oberfläche: Beton</string>
@@ -1990,7 +1990,7 @@
     <string name="poi_surface_salt">Oberfläche: Salz</string>
     <string name="poi_surface_snow">Oberfläche: Schnee</string>
     <string name="poi_route_bus_ref">Bus</string>
-    <string name="poi_route_share_taxi_ref">geteiltes Taxi</string>
+    <string name="poi_route_share_taxi_ref">Geteiltes Taxi</string>
     <string name="poi_route_trolleybus_ref">Oberleitungsbus</string>
     <string name="poi_route_tram_ref">Straßenbahn</string>
     <string name="poi_route_train_ref">Zug</string>
@@ -2012,7 +2012,7 @@
     <string name="poi_service_bicycle_pump_no">Fahrradpumpe: nein</string>
     <string name="poi_service_bicycle_diy_no">Fahrradwerkzeuge für Eigenreparatur: nein</string>
     <string name="poi_service_bicycle_diy_yes">Werkzeuge für Eigenreparatur</string>
-    <string name="poi_service_bicycle_cleaning_yes">Reinigung</string>
+    <string name="poi_service_bicycle_cleaning_yes">Fahrradreinigung</string>
     <string name="poi_service_bicycle_cleaning_no">Fahrradreinigung: nein</string>
     <string name="poi_service_bicycle_chaintool_yes">Fahrradkettenwerkzeug</string>
     <string name="poi_service_bicycle_chaintool_no">Fahrradkettenwerkzeug: nein</string>
@@ -2055,7 +2055,7 @@
     <string name="poi_animal_boarding_horse">Beförderungstyp: Pferd</string>
     <string name="poi_honey">Honiggeschäft</string>
     <string name="poi_technical_monument">Technisches Denkmal</string>
-    <string name="poi_office_camping">Camping-Büro</string>
+    <string name="poi_office_camping">Campingbüro</string>
     <string name="poi_model_aerodrome">Modellflugplatz</string>
     <string name="poi_guide">Fremdenführerbüro</string>
     <string name="poi_quango">Mittlerorganisation</string>
@@ -2105,7 +2105,7 @@
     <string name="poi_castle_type_palace">Burgtyp: Palast</string>
     <string name="poi_castle_type_defensive_stately">Burgtyp: Verteidigung, stattlich</string>
     <string name="poi_massage_thai">Thailändisch</string>
-    <string name="poi_massage_sexual">Sexuelle</string>
+    <string name="poi_massage_sexual">Sexuell</string>
     <string name="poi_massage_yes">Massagen</string>
     <string name="poi_massage_therapeutic">Therapeutisch</string>
     <string name="poi_sauna_yes">Sauna</string>
@@ -2172,25 +2172,25 @@
     <string name="poi_tomb_sarcophagus">Typ: Sarkophag</string>
     <string name="poi_tomb_crypt">Typ: Krypta</string>
     <string name="poi_tomb_pyramid">Typ: Pyramide</string>
-    <string name="poi_historic_civilization_ancient_roman">Kultur: Römische Antike (753 v.Chr. - 284 n.Chr..)</string>
-    <string name="poi_historic_civilization_nuragic">Kultur: Nuraghen (18. Jh. v.Chr. - 2 Jh. n.Chr.)</string>
+    <string name="poi_historic_civilization_ancient_roman">Kultur: römische Antike (753 v. Chr. - 284 n. Chr.)</string>
+    <string name="poi_historic_civilization_nuragic">Kultur: Nuraghen (18. Jh. v. Chr. - 2. Jh. n. Chr.)</string>
     <string name="poi_historic_civilization_etruscan">Kultur: Etrusker (12. - 6. Jh. v. Chr.)</string>
-    <string name="poi_historic_civilization_prehistoric">Kultur: Prähistorisch</string>
-    <string name="poi_historic_civilization_ancient_greek">Kultur: Griechische Antike</string>
-    <string name="poi_historic_civilization_roman">Kultur: Römisch</string>
-    <string name="poi_historic_civilization_byzantine">"Kultur: byzantinisch (285 - 1453  n. Chr.)"</string>
-    <string name="poi_historic_civilization_imperial_chinese">"Kultur: Chinesische Kaiserzeit (221 - 1911  v.Chr.)"</string>
-    <string name="poi_historic_civilization_ancient_egyptian">Kultur: Altes Ägypten (bis 332 v.Chr.)</string>
-    <string name="poi_historic_civilization_celtic">Kultur: Keltisch</string>
-    <string name="poi_historic_civilization_western_roman">Kultur: Weströmisch (285 - 476 n. Chr.)</string>
-    <string name="poi_historic_civilization_mycenaean">Kultur: Mykenisch</string>
+    <string name="poi_historic_civilization_prehistoric">Kultur: prähistorisch</string>
+    <string name="poi_historic_civilization_ancient_greek">Kultur: griechische Antike</string>
+    <string name="poi_historic_civilization_roman">Kultur: römisch</string>
+    <string name="poi_historic_civilization_byzantine">Kultur: byzantinisch (285 - 1453)</string>
+    <string name="poi_historic_civilization_imperial_chinese">Kultur: chinesische Kaiserzeit (221 v. Chr. - 1911 n. Chr.)</string>
+    <string name="poi_historic_civilization_ancient_egyptian">Kultur: altes Ägypten (bis 332 v. Chr.)</string>
+    <string name="poi_historic_civilization_celtic">Kultur: keltisch</string>
+    <string name="poi_historic_civilization_western_roman">Kultur: weströmisch (285 - 476)</string>
+    <string name="poi_historic_civilization_mycenaean">Kultur: mykenisch</string>
     <string name="poi_historic_civilization_dacian">Kultur: Daker</string>
     <string name="poi_historic_civilization_hernici">Kultur: Herniker</string>
-    <string name="poi_historic_civilization_greek_egyptian">Kultur: Griechisch-ägyptisch (322 - 30 v.Chr.)</string>
-    <string name="poi_historic_civilization_roman_and_byzantine_egyptian">Kultur: Römisch- und byzantinisch-ägyptisch</string>
+    <string name="poi_historic_civilization_greek_egyptian">Kultur: griechisch-ägyptisch (322 - 30 v. Chr.)</string>
+    <string name="poi_historic_civilization_roman_and_byzantine_egyptian">Kultur: römisch- und byzantinisch-ägyptisch</string>
     <string name="poi_historic_civilization_helladic">Kultur: Helladikum</string>
     <string name="poi_historic_civilization_cycladic">Kultur: Kykladen</string>
-    <string name="poi_historic_civilization_minoan">Kultur: Minoisch</string>
+    <string name="poi_historic_civilization_minoan">Kultur: minoisch</string>
     <string name="poi_historic_civilization_tiahuanacota">Kultur: Tiahuanaco</string>
     <string name="poi_animal_training">Tierausbildung</string>
     <string name="poi_animal_training_dog">Hund</string>
@@ -2199,21 +2199,21 @@
     <string name="poi_historic_period_stone_bronze_undetermined">Historisches Zeitalter: Steinzeit / Bronzezeit (unbestimmt)</string>
     <string name="poi_historic_period_bronze_age">Historisches Zeitalter: Bronzezeit</string>
     <string name="poi_historic_period_principate">Historisches Zeitalter: Prinzipat (27 v. Chr. - 284 n. Chr.)</string>
-    <string name="poi_historic_period_classical_greece">Historisches Zeitalter: Klassisches Griechenland (5. - 4. Jhd. v. Chr.)</string>
+    <string name="poi_historic_period_classical_greece">Historisches Zeitalter: klassisches Griechenland (5. - 4. Jhd. v. Chr.)</string>
     <string name="poi_historic_period_archaic_greece">Historisches Zeitalter: Archaisches Griechenland</string>
     <string name="poi_historic_period_iron_age">Historisches Zeitalter: Eisenzeit</string>
-    <string name="poi_historic_period_roman_republic">Historisches Zeitalter: Römische Republik (508 - 27 v. Chr.)</string>
+    <string name="poi_historic_period_roman_republic">Historisches Zeitalter: römische Republik (508 - 27 v. Chr.)</string>
     <string name="poi_historic_period_hellenistic_greece">Historisches Zeitalter: Hellenistisches Griechenland</string>
-    <string name="poi_historic_period_new_kingdom">"Historisches Zeitalter: Pharaonen, Neues Reich  (1550 - 1068 v. Chr.)"</string>
-    <string name="poi_historic_period_middle_kingdom">Historisches Zeitalter: Pharaonen, Mittleres Reich (2055 - 1650 v. Chr.)</string>
+    <string name="poi_historic_period_new_kingdom">Historisches Zeitalter: Pharaonen, neues Reich (1550 - 1068 v. Chr.)</string>
+    <string name="poi_historic_period_middle_kingdom">Historisches Zeitalter: Pharaonen, mittleres Reich (2055 - 1650 v. Chr.)</string>
     <string name="poi_historic_period_predynastic_egypt">Historisches Zeitalter: Vordynastisches Ägypten</string>
     <string name="poi_historic_period_early_dynastic_period">Historisches Zeitalter: Pharaonen, frühdynastische Zeit (3100 – 2686 v. Chr.)</string>
-    <string name="poi_historic_period_old_kingdom">Historisches Zeitalter: Pharaonen, Altes Reich (2686 - 2181 v. Chr.)</string>
-    <string name="poi_historic_period_first_intermediate_period">Historisches Zeitalter: Pharaonen, Erste Zwischenzeit (2181 – 2055 v. Chr.)</string>
-    <string name="poi_historic_period_second_intermediate_period">Historisches Zeitalter: Pharaonen, Zweite Zwischenzeit (1650 – 1550 v. Chr.)</string>
-    <string name="poi_historic_period_third_intermediate_period">Historisches Zeitalter: Pharaonen, Dritte Zwischenzeit (1069 – 664 v. Chr.)</string>
+    <string name="poi_historic_period_old_kingdom">Historisches Zeitalter: Pharaonen, altes Reich (2686 - 2181 v. Chr.)</string>
+    <string name="poi_historic_period_first_intermediate_period">Historisches Zeitalter: Pharaonen, erste Zwischenzeit (2181 – 2055 v. Chr.)</string>
+    <string name="poi_historic_period_second_intermediate_period">Historisches Zeitalter: Pharaonen, zweite Zwischenzeit (1650 – 1550 v. Chr.)</string>
+    <string name="poi_historic_period_third_intermediate_period">Historisches Zeitalter: Pharaonen, dritte Zwischenzeit (1069 – 664 v. Chr.)</string>
     <string name="poi_historic_period_first_persian_period">Historisches Zeitalter: Erstes persisches Zeitalter</string>
-    <string name="poi_historic_period_late_period">Historisches Zeitalter: Altägyptische Spätzeit (664 - 332 v. Chr.)</string>
+    <string name="poi_historic_period_late_period">Historisches Zeitalter: altägyptische Spätzeit (664 - 332 v. Chr.)</string>
     <string name="poi_historic_period_second_persian_period">Historisches Zeitalter: Zweites persisches Zeitalter</string>
     <string name="poi_historic_period_alexander_the_great">Historisches Zeitalter: Alexander der Große</string>
     <string name="poi_resource_bauxite">Bauxit</string>
@@ -2221,15 +2221,15 @@
     <string name="poi_historic_period_christian_egypt">Historisches Zeitalter: Christliches Ägypten</string>
     <string name="poi_historic_period_byzantine_egypt">Historisches Zeitalter: byzantinisches Ägypten (30 v. Chr. - 641 n. Chr.)</string>
     <string name="poi_historic_period_persian_occupation">Historisches Zeitalter: Persische Besetzung</string>
-    <string name="poi_historic_period_greek_dark_ages">Historisches Zeitalter: Dunkle Jahrhunderte (Antike) (1100 - 800 v. Chr.)</string>
-    <string name="poi_historic_period_roman_greece">Historisches Zeitalter: Römisches Griechenland (146 v. Chr - 330 n. Chr.)</string>
-    <string name="poi_historic_period_roman_kingdom">Historisches Zeitalter: Römische Königszeit (756 - 509 v. Chr.)</string>
-    <string name="poi_historic_period_dominate">Historisches Zeitalter: Dominat (285 - 476 n. Chr.)</string>
-    <string name="poi_historic_period_ptolemaic_egypt">Historisches Zeitalter: Ptolemäisches Königreich (305 - 30 v. Chr.)</string>
-    <string name="poi_historic_period_villager">Historisches Zeitalter: Ländliches Tiahuanaco (I., II. Epoche, 1580 v. Chr. - 133 n. Chr.)</string>
-    <string name="poi_historic_period_urban">Historisches Zeitalter: Städtisches Tiahuanaco (III. Epoche, 133 - 374 n. Chr.)</string>
-    <string name="poi_historic_period_classical">Historisches Zeitalter: Klassisches Tiahuanaco (IV. Epoche, 374 - 900 n. Chr.)</string>
-    <string name="poi_historic_period_imperial">Historisches Zeitalter: Imperialistisches Tiahuanaco (V. Epoche, 900 - 1200 n. Chr.)</string>
+    <string name="poi_historic_period_greek_dark_ages">Historisches Zeitalter: dunkle Jahrhunderte (Antike) (1100 - 800 v. Chr.)</string>
+    <string name="poi_historic_period_roman_greece">Historisches Zeitalter: römisches Griechenland (146 v. Chr - 330 n. Chr.)</string>
+    <string name="poi_historic_period_roman_kingdom">Historisches Zeitalter: römische Königszeit (756 - 509 v. Chr.)</string>
+    <string name="poi_historic_period_dominate">Historisches Zeitalter: Dominat (285 - 476)</string>
+    <string name="poi_historic_period_ptolemaic_egypt">Historisches Zeitalter: ptolemäisches Königreich (305 - 30 v. Chr.)</string>
+    <string name="poi_historic_period_villager">Historisches Zeitalter: ländliches Tiahuanaco (I., II. Epoche, 1580 v. Chr. - 133 n. Chr.)</string>
+    <string name="poi_historic_period_urban">Historisches Zeitalter: städtisches Tiahuanaco (III. Epoche, 133 - 374)</string>
+    <string name="poi_historic_period_classical">Historisches Zeitalter: klassisches Tiahuanaco (IV. Epoche, 374 - 900)</string>
+    <string name="poi_historic_period_imperial">Historisches Zeitalter: imperialistisches Tiahuanaco (V. Epoche, 900 - 1200)</string>
     <string name="poi_historic_era_paleolithic">Historische Epoche: Altsteinzeit (2,6 Mio. - 10000 Jahre vor heute)</string>
     <string name="poi_historic_era_mesolithic">Historische Epoche: Mittelsteinzeit</string>
     <string name="poi_historic_era_neolithic">Historische Epoche: Jungsteinzeit</string>
@@ -2237,9 +2237,9 @@
     <string name="poi_stone_type_conciliation_cross">Typ: Steinkreuz</string>
     <string name="poi_site_type_hut_circle">Hüttenkreis</string>
     <string name="poi_site_type_petroglyph">Petroglyphe</string>
-    <string name="poi_megalith_type_nuraghe">Megalith-Typ: Nuraghe</string>
-    <string name="poi_megalith_type_stone_circle">Megalith-Typ: Steinkreis</string>
-    <string name="poi_megalith_type_passage_grave">Megalith-Typ: Ganggrab</string>
+    <string name="poi_megalith_type_nuraghe">Megalithtyp: Nuraghe</string>
+    <string name="poi_megalith_type_stone_circle">Megalithtyp: Steinkreis</string>
+    <string name="poi_megalith_type_passage_grave">Megalithtyp: Ganggrab</string>
     <string name="poi_summit_cross">Gipfelkreuz: ja</string>
     <string name="poi_conveying_yes">Vermittlung: ja</string>
     <string name="poi_wiki_lang_af">Afrikanisches Wiki</string>
@@ -2248,7 +2248,7 @@
     <string name="poi_wiki_lang_bpy">Bishnupriyaisches Wiki</string>
     <string name="poi_wiki_lang_br">Bretonisches Wiki</string>
     <string name="poi_wiki_lang_cy">Walisisches Wiki</string>
-    <string name="poi_wiki_lang_eo">Esperantoisches Wiki</string>
+    <string name="poi_wiki_lang_eo">Esperanto-Wiki</string>
     <string name="poi_wiki_lang_eu">Baskisches Wiki</string>
     <string name="poi_wiki_lang_fa">Farsisches Wiki</string>
     <string name="poi_wiki_lang_ml">Malayalamisches Wiki</string>
@@ -2256,8 +2256,8 @@
     <string name="poi_wiki_lang_nv">Navajoisches Wiki</string>
     <string name="poi_wiki_lang_war">Warayisches Wiki</string>
     <string name="poi_wiki_lang_min">Minangkabauisches Wiki</string>
-    <string name="poi_wiki_lang_zhminnan">Minnanisches Wiki</string>
-    <string name="poi_wiki_lang_mg">Malagasisches Wiki</string>
+    <string name="poi_wiki_lang_zhminnan">Minnan-Wiki</string>
+    <string name="poi_wiki_lang_mg">Madagassisches Wiki</string>
     <string name="poi_wiki_lang_tt">Tatarisches Wiki</string>
     <string name="poi_wiki_lang_ky">Kirgisisches Wiki</string>
     <string name="poi_wiki_lang_tg">Tadschikisches Wiki</string>
@@ -2270,7 +2270,7 @@
     <string name="poi_wiki_lang_an">Aragonesisches Wiki</string>
     <string name="poi_wiki_lang_gu">Gujaratisches Wiki</string>
     <string name="poi_wetland_palsa_bog">Palsamoor</string>
-    <string name="poi_payment_icsf_yes">IC gespeicherte Fährfahrkarten</string>
+    <string name="poi_payment_icsf_yes">IC-gespeicherte Fährfahrkarten</string>
     <string name="poi_payment_icsf_no">IC-gespeicherte Fährfahrkarten nicht akzeptiert</string>
     <string name="poi_health_specialty_general_yes">Allgemeinmediziner</string>
     <string name="poi_health_specialty_ophthalmology_yes">Augenheilkunde</string>
@@ -2368,7 +2368,7 @@
     <string name="poi_futsal">Futsal</string>
     <string name="poi_lacrosse">Lacrosse</string>
     <string name="poi_official_name">Offizieller Name</string>
-    <string name="poi_seamark_dyke">Seezeichen Deich</string>
+    <string name="poi_seamark_dyke">Seezeichen: Deich</string>
     <string name="poi_dolphin">Dalbe</string>
     <string name="poi_forestry_compartment">Schild: Forstabteilung</string>
     <string name="poi_forestry_allotment">Schild: Forstparzelle</string>
@@ -2460,7 +2460,7 @@
     <string name="poi_free_flying_paragliding_no">Paragleiten: nein</string>
     <string name="poi_free_flying_hanggliding_yes">Drachenfliegen</string>
     <string name="poi_free_flying_hanggliding_no">Drachenfliegen: nein</string>
-    <string name="poi_free_flying_rigid_yes">Strikt</string>
+    <string name="poi_free_flying_rigid_yes">Freeflying starr</string>
     <string name="poi_free_flying_rigid_no">Freeflying starr: nein</string>
     <string name="poi_free_flying_site_orientation_n">Freeflying Ausrichtung: N</string>
     <string name="poi_free_flying_site_orientation_ne">Freeflying-Platzausrichtung: NO</string>
@@ -3222,13 +3222,13 @@
     <string name="poi_water_supply_type">Wasserversorgungsart</string>
     <string name="poi_water_purification">Wasseraufbereitung</string>
     <string name="poi_water_place_access">Wasserplatzzugang</string>
-    <string name="poi_location_rooftop">Lage: Auf dem Dach</string>
+    <string name="poi_location_rooftop">Lage: auf dem Dach</string>
     <string name="poi_visibility_house">Sichtbarkeit: Haus</string>
     <string name="poi_visibility_street">Sichtbarkeit: Straße</string>
     <string name="poi_visibility_area">Sichtbarkeit: Bereich</string>
     <string name="poi_operational_status_open">Offen</string>
     <string name="poi_operational_status_closed">Geschlossen</string>
-    <string name="poi_operational_status_restricted">Eingeschränkt</string>
+    <string name="poi_operational_status_restricted">eingeschränkt</string>
     <string name="poi_operational_status_broken">Beschädigt</string>
     <string name="poi_operational_status_needs_maintenance">Wartung benötigt</string>
     <string name="poi_water_purification_none">Keine</string>
@@ -3320,11 +3320,11 @@
     <string name="poi_parking_fee_no">Parkgebühr: nein</string>
     <string name="poi_parking_fee">Parkgebühr</string>
     <string name="poi_amperage">Stromstärke</string>
-    <string name="poi_location_overhead">Lage: Oben</string>
-    <string name="poi_water_place_durability_durable">Wasserstelle Haltbarkeit: Dauerhaft</string>
+    <string name="poi_location_overhead">Lage: oben</string>
+    <string name="poi_water_place_durability_durable">Wasserstelle Haltbarkeit: dauerhaft</string>
     <string name="poi_water_place_durability_emergency">Wasserstelle Haltbarkeit: Notfall</string>
     <string name="poi_water_place_access_multifamilies">Mehrfamilien</string>
-    <string name="poi_charging_station_output">Ladestation Ausgang</string>
+    <string name="poi_charging_station_output">Ladestation: Ausgang</string>
     <string name="poi_map_type_topo">Kartentyp: Gelände</string>
     <string name="poi_map_type_street">Kartentyp: Straße</string>
     <string name="poi_map_type_scheme">Kartentyp: Übersicht</string>
@@ -3458,13 +3458,13 @@
     <string name="poi_service_vehicle_car_parts_yes">Autoteile</string>
     <string name="poi_service_vehicle_batteries_yes">Batterien</string>
     <string name="poi_service_vehicle_air_conditioning_yes">Klimatisierung</string>
-    <string name="poi_service_vehicle_body_repair_yes">Karosserie-Reparatur</string>
+    <string name="poi_service_vehicle_body_repair_yes">Karosseriereparatur</string>
     <string name="poi_service_vehicle_electrical_yes">Elektrik</string>
     <string name="poi_service_vehicle_wheels_yes">Räder</string>
     <string name="poi_service_vehicle_glass_yes">Glas</string>
     <string name="poi_service_vehicle_truck_repair_yes">Lkw-Reparatur</string>
     <string name="poi_service_vehicle_alignment_yes">Fahrwerkseinstellung</string>
-    <string name="poi_service_vehicle_transmission_repair_yes">Getriebe-Reparatur</string>
+    <string name="poi_service_vehicle_transmission_repair_yes">Getriebereparatur</string>
     <string name="poi_service_vehicle_motor_yes">Motor</string>
     <string name="poi_service_vehicle_insurance_yes">Versicherung</string>
     <string name="poi_service_vehicle_tyres_yes">Reifen</string>
@@ -3520,7 +3520,7 @@
     <string name="poi_bulk_purchase">Verpackungsfreie Waren</string>
     <string name="poi_substation_type">Typ</string>
     <string name="poi_bulk_purchase_yes">ja</string>
-    <string name="poi_bulk_purchase_only">Nur</string>
+    <string name="poi_bulk_purchase_only">Nur verpackungsfrei</string>
     <string name="poi_substation_transmission">Umspannwerk</string>
     <string name="poi_substation_distribution">Verteiler</string>
     <string name="poi_substation_minor_distribution">Haushaltsverteilung</string>
@@ -3770,4 +3770,6 @@
     <string name="poi_community_gender_male">Geschlecht der Gemeinschaft: männlich</string>
     <string name="poi_community_gender_mixed">Geschlecht der Gemeinschaft: gemischt</string>
     <string name="poi_grave">Grab</string>
+    <string name="poi_parking_space">Parkplatz</string>
+    <string name="poi_url">URL</string>
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -709,7 +709,7 @@
     <string name="follow">Zielführung starten</string>
     <string name="recalculate_route_to_your_location">Nutzerprofil:</string>
     <string name="mark_final_location_first">Bitte zuerst ein Ziel festlegen</string>
-    <string name="get_directions">Wegbeschreibung</string>
+    <string name="get_directions">Navigation</string>
     <string name="opening_hours">Öffnungszeiten</string>
     <string name="opening_changeset">Änderungssatz öffnen…</string>
     <string name="closing_changeset">Änderungssatz schließen…</string>
@@ -946,8 +946,8 @@
     <string name="map_widget_intermediate_distance">Zwischenziel</string>
     <string name="ending_point_too_far">Endpunkt zu weit von der nächsten Straße entfernt.</string>
     <string name="intermediate_point_too_far">Zwischenziel %1$s ist zu weit von der nächsten Straße entfernt.</string>
-    <string name="context_menu_item_last_intermediate_point">Als letztes Zwischenziel einfügen</string>
-    <string name="context_menu_item_first_intermediate_point">Als erstes Zwischenziel einfügen</string>
+    <string name="context_menu_item_last_intermediate_point">Als letztes Zwischenziel hinzufügen</string>
+    <string name="context_menu_item_first_intermediate_point">Als erstes Zwischenziel hinzufügen</string>
     <string name="target_point">Ziel %1$s</string>
     <string name="shared_string_target_points">Ziele</string>
     <string name="add_as_first_destination_point">Als erstes Zwischenziel hinzufügen</string>
@@ -1802,7 +1802,7 @@ Lon %2$s</string>
     <string name="dashboard_or_drawer_title">Übersichtsseite oder Menüsteuerung</string>
     <string name="dashboard_or_drawer_description">Es besteht die Möglichkeit, die App primär über die flexible Übersichtsseite oder ein statisches Menü zu steuern. Ihre Wahl kann jederzeit in den Übersichtsseiten-Einstellungen geändert werden.</string>
     <string name="access_from_map">Aufruf von der Karte aus</string>
-    <string name="favorite_category_add_new">Neu erstellen</string>
+    <string name="favorite_category_add_new">Neue Katagorie 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 einen gültigen POI-Typ angeben oder überspringen.</string>
@@ -2789,7 +2789,7 @@ Lon %2$s</string>
     <string name="off_road_render_descr">Für den Einsatz im Gelände, basierend auf dem \'Topo\'-Kartenstil und zur Verwendung mit grünen Satellitenbildern als Unterlagekarte. Verringerte Linienstärke für Straßen, erhöhte für Fußwege, Wander-, Rad- und andere Outdoor-Routen.</string>
     <string name="touring_view_render_descr">Touring-Stil mit hohem Kontrast und maximalen Details. Enthält alle Optionen des OsmAnd-Standardstils und zeigt dabei so viele Details wie möglich an, insbesondere Straßen, Pfade und andere Verkehrswege. Klare Unterscheidung zwischen den Straßentypen durch den „Touring-Atlas“. Geeignet für den Einsatz bei Tag, Nacht und im Freien.</string>
     <string name="access_intermediate_arrival_time">Ankunftszeit Zwischenziel</string>
-    <string name="map_widget_intermediate_time">Reisezeit Zwischenziel</string>
+    <string name="map_widget_intermediate_time">Zwischenankunftszeit</string>
     <string name="unirs_render_descr">Änderung des Standardstils, um den Kontrast von Fußgänger- und Fahrradwegen zu erhöhen. Verwendet alte Mapnik-Farben.</string>
     <string name="shared_string_gpx_files">GPX-Dateien</string>
     <string name="get_osmand_live">Holen Sie sich OsmAnd Live, um alle Funktionen freizuschalten: Tägliche Karten-Updates mit unbegrenzten Downloads, alle kostenpflichtigen und kostenlosen Plugins, Wikipedia, Wikivoyage und vieles mehr.</string>
@@ -3426,4 +3426,5 @@ Lon %2$s</string>
     <string name="reset_all_profile_settings_descr">Alle Profil-Einstellungen werden auf den Ausgangszustand nach App-Installation zurückgesetzt.</string>
     <string name="reset_all_profile_settings">Alle Profil-Einstellungen auf den Standard zurücksetzen\?</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
 </resources>

OsmAnd/res/values-eo/strings.xml

@@ -3401,4 +3401,5 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="reset_all_profile_settings_descr">Ĉiuj agordoj pri profiloj revenos al la post-instala stato.</string>
     <string name="reset_all_profile_settings">Ĉu rekomencigi ĉiujn agordojn pri profiloj\?</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
 </resources>

OsmAnd/res/values-es-rAR/phrases.xml

@@ -3774,4 +3774,6 @@
     <string name="poi_community_gender_male">Género de la comunidad: masculino</string>
     <string name="poi_community_gender_mixed">Género de la comunidad: mixto</string>
     <string name="poi_grave">Tumba</string>
+    <string name="poi_parking_space">Espacio de estacionamiento</string>
+    <string name="poi_url">URL</string>
 </resources>

OsmAnd/res/values-es-rAR/strings.xml

@@ -3425,4 +3425,6 @@ Lon %2$s</string>
     <string name="reset_confirmation_descr">Al pulsar en %1$s, se perderán todos los cambios.</string>
     <string name="reset_all_profile_settings_descr">Todos los ajustes del perfil serán restablecidos al estado después de la instalación.</string>
     <string name="reset_all_profile_settings">¿Restablecer todos los ajustes del perfil a su valor predefinido\?</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
+    <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
 </resources>

OsmAnd/res/values-et/strings.xml

@@ -3353,4 +3353,5 @@
     <string name="reset_all_profile_settings_descr">Kõik profiiliseaded lähtestatakse paigaldusjärgsesse olekusse.</string>
     <string name="reset_all_profile_settings">Taasta kõikide profiiliseadete vaikeväärtused\?</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
 </resources>

OsmAnd/res/values-fr/strings.xml

@@ -3394,4 +3394,5 @@ représentant la zone : %1$s x %2$s</string>
     <string name="reset_all_profile_settings_descr">Tous les paramètres de profil vont être ré-initialisés aux valeurs par défaut.</string>
     <string name="reset_all_profile_settings">Ré-initialiser tous les paramètres de profil \?</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s : %2$s</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
 </resources>

OsmAnd/res/values-he/strings.xml

@@ -3412,4 +3412,5 @@
     <string name="reset_all_profile_settings_descr">כל הגדרות הפרופיל יאופסו למצב כמו שלאחר ההתקנה.</string>
     <string name="reset_all_profile_settings">לאפס את הגדרות הפרופיל לבררת המחדל\?</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s:‏ %2$s</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
 </resources>

OsmAnd/res/values-hu/phrases.xml

@@ -3760,4 +3760,6 @@
     <string name="poi_health_food">Egészségesélelmiszer-bolt</string>
     <string name="poi_craft_floorer">Padlólerakó</string>
     <string name="poi_pet_grooming">Állatkozmetika</string>
+    <string name="poi_parking_space">Parkolóhely</string>
+    <string name="poi_url">URL</string>
 </resources>

OsmAnd/res/values-hu/strings.xml

@@ -3421,4 +3421,5 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
     <string name="reset_all_profile_settings">Minden profil visszaálljon az alapértelmezett helyzetbe\?</string>
     <string name="app_mode_wagon">Családi autó</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
 </resources>

OsmAnd/res/values-is/strings.xml

@@ -3430,4 +3430,6 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="reset_all_profile_settings_descr">Allar sniðstillingar verða endurstilltar á sína stöðu eftir uppsetningu.</string>
     <string name="reset_all_profile_settings">Núllstilla allar sniðstillingar\?</string>
     <string name="ltr_or_rtl_combine">%1$s: %2$s</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
+    <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
 </resources>

OsmAnd/res/values-it/strings.xml

@@ -3420,4 +3420,6 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="reset_all_profile_settings_descr">Tutte le impostazioni del profilo saranno reimpostate come da prima installazione.</string>
     <string name="reset_all_profile_settings">Reimpostare tutte le impostazioni del profilo a quelle preimpostate\?</string>
     <string name="ltr_or_rtl_combine">%1$s: %2$s</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
+    <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
 </resources>

OsmAnd/res/values-nb/strings.xml

@@ -3428,4 +3428,5 @@
     <string name="reset_all_profile_settings_descr">Alle profilinnstillinger må tilbakestilles til forvalg.</string>
     <string name="reset_all_profile_settings">Tilbakestill alle innstillinger til forvalg\?</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
 </resources>

OsmAnd/res/values-pt-rBR/phrases.xml

@@ -3767,4 +3767,6 @@
     <string name="poi_community_gender_male">Gênero da comunidade: masculino</string>
     <string name="poi_community_gender_mixed">Gênero da comunidade: ambos</string>
     <string name="poi_grave">Túmulo</string>
+    <string name="poi_parking_space">Espaço de estacionamento</string>
+    <string name="poi_url">URL</string>
 </resources>

OsmAnd/res/values-pt-rBR/strings.xml

@@ -3408,4 +3408,5 @@ Pôr do Sol: %2$s</string>
     <string name="reset_all_profile_settings_descr">Todas as configurações de perfil serão redefinidas para o estado após a instalação.</string>
     <string name="reset_all_profile_settings">Redefinir todas as configurações de perfil para o padrão\?</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
 </resources>

OsmAnd/res/values-pt/phrases.xml

@@ -3752,4 +3752,6 @@
     <string name="poi_community_gender_male">Sexo comunitário: masculino</string>
     <string name="poi_community_gender_mixed">Sexo comunitário: misto</string>
     <string name="poi_grave">Grave</string>
+    <string name="poi_parking_space">Espaço de estacionamento</string>
+    <string name="poi_url">URL</string>
 </resources>

OsmAnd/res/values-pt/strings.xml

@@ -2208,7 +2208,7 @@
     <string name="ski_map_render_descr">Para esquiar. Contém pistas de esqui, elevadores, pistas de cross country, etc. Escurece objetos de mapa secundários.</string>
     <string name="light_rs_render_descr">Estilo simples e contrastante para a navegação do carro. É suave para os olhos no modo noturno. Características principais: curvas de nível, estradas contrastantes de estilo laranja, menos objetos secundários do mapa para evitar distrações.</string>
     <string name="topo_render_descr">Para caminhadas, trekking e ciclismo de natureza. Legível ao ar livre. Estradas e objetos naturais contrastantes, diferentes tipos de rotas, opções avançadas de linha de contorno, detalhes extras. O ajuste da integridade da superfície distingue a qualidade da estrada. Sem modo noturno.</string>
-    <string name="mapnik_render_descr">Velho estilo de renderização padrão \'Mapnik\'. Características principais: as cores são semelhantes ao estilo \'Mapnik\'.</string>
+    <string name="mapnik_render_descr">O velho estilo padrão \'Mapnik\'. Cores como \'Mapnik\'.</string>
     <string name="touring_view_render_descr">Estilo de alto detalhe para turismo. Inclui todas as opções de configuração de estilo padrão e além disso: mostra o máximo de detalhes possível, em particular todas as estradas, caminhos e outras formas de viajar. Distinção visual clara entre todos os tipos de estradas diferentes, reminiscente de muitos mapas de turismo. Esquema de cores de alto contraste para uso ao ar livre, modo diurno e noturno.</string>
     <string name="default_render_descr">Estilo de propósito geral. Renderização simplificada e limpa em cidades densamente povoadas. Características principais: linhas de contorno, rotas, qualidade de superfície, restrições de acesso, escudos rodoviários, caminhos de renderização de acordo com a escala SAC, características desportivas Whitewater.</string>
     <string name="open_wikipedia_link_online">Abrir página da Wikipédia na Internet</string>
@@ -2233,14 +2233,14 @@
     <string name="download_file">Descarregar ficheiro</string>
     <string name="start_editing_card_image_text">O mundo livre guia de viagem, que qualquer pessoa pode editar.</string>
     <string name="welcome_to_open_beta_description">Os guias de viagem estão atualmente baseados no Wikivoyage. Teste todos os recursos gratuitamente durante o teste aberto beta. Posteriormente os guias de viagem estarão disponíveis para assinantes do OsmAnd Unlimited e proprietários da OsmAnd+.</string>
-    <string name="start_editing_card_description">Pode e deve editar qualquer artigo no Wikivoyage. Partilhe saber, experiência, talento e a sua atenção</string>
+    <string name="start_editing_card_description">Pode e deve editar qualquer artigo no Wikivoyage. Partilhe saber, experiência, talento e a sua atenção.</string>
     <string name="start_editing">Começar a editar</string>
     <string name="get_unlimited_access">Obter acesso ilimitado</string>
     <string name="welcome_to_open_beta">Bem-vindo ao beta aberto</string>
     <string name="wikivoyage_travel_guide">Guias de viagem</string>
     <string name="wikivoyage_travel_guide_descr">Guias para os lugares mais interessantes do mundo dentro do OsmAnd, sem uma conexão com a Internet.</string>
-    <string name="monthly_map_updates">Atualizações de mapa: a cada mês</string>
-    <string name="daily_map_updates">Atualizações de mapa: a cada hora</string>
+    <string name="monthly_map_updates">Atualizações de mapa mensais</string>
+    <string name="daily_map_updates">Atualizações de mapa a cada hora</string>
     <string name="in_app_purchase">Compra na aplicação</string>
     <string name="in_app_purchase_desc">Pagamento de uma só vez</string>
     <string name="in_app_purchase_desc_ex">Uma vez comprado, estará sempre disponível para si.</string>
@@ -2252,7 +2252,7 @@
     <string name="unlock_all_features">Desbloquear todas as características de OsmAnd</string>
     <string name="purchase_dialog_title">Escolher plano</string>
     <string name="purchase_dialog_travel_description">Compre uma das opções seguintes para receber a funcionalidade da guia de viagem offline:</string>
-    <string name="purchase_dialog_subtitle">Escolha o artigo adequado:</string>
+    <string name="purchase_dialog_subtitle">Escolha o artigo adequado</string>
     <string name="shared_string_dont">Não</string>
     <string name="shared_string_do">Fazer</string>
     <string name="shared_string_only_with_wifi">Apenas em Wi-Fi</string>
@@ -2269,7 +2269,7 @@
     <string name="download_maps_travel">Guias de viagem</string>
     <string name="shared_string_wikivoyage">Wikivoyage</string>
     <string name="article_removed">Artigo removido</string>
-    <string name="wikivoyage_search_hint">Pesquisa: país, cidade, província</string>
+    <string name="wikivoyage_search_hint">Pesquisar por país, cidade ou província</string>
     <string name="shared_string_read">Ler</string>
     <string name="saved_articles">Artigos marcados</string>
     <string name="shared_string_explore">Explorar</string>
@@ -2284,8 +2284,8 @@
     <string name="clear_all_intermediates">Limpar todos os pontos intermediários</string>
     <string name="group_deleted">Grupo eliminado</string>
     <string name="rendering_attr_whiteWaterSports_name">Whitewater esportes</string>
-    <string name="distance_farthest">Distância: primeiro o mais distante</string>
-    <string name="distance_nearest">Distância: primeiro o mais próximo</string>
+    <string name="distance_farthest">Primeiro o mais distante</string>
+    <string name="distance_nearest">Primeiro o mais próximo</string>
     <string name="enter_lon">Digite a longitude</string>
     <string name="enter_lat">Digite a latitude</string>
     <string name="enter_lat_and_lon">Digite a latitude e a longitude</string>
@@ -2304,7 +2304,7 @@
     <string name="enter_the_file_name">Digite o nome do ficheiro.</string>
     <string name="map_import_error">Erro de importação de mapa</string>
     <string name="map_imported_successfully">Mapa importado</string>
-    <string name="make_as_start_point">Faça este o ponto de partida</string>
+    <string name="make_as_start_point">Fazer este o ponto de partida</string>
     <string name="shared_string_current">Atual</string>
     <string name="last_intermediate_dest_description">Adiciona paragem intermédia</string>
     <string name="first_intermediate_dest_description">Adiciona paragem inicial</string>
@@ -2315,8 +2315,8 @@
     <string name="osc_file_desc">OSC - adequado para exportar para o OpenStreetMap.</string>
     <string name="shared_string_gpx_file">Ficheiro GPX</string>
     <string name="osc_file">Ficheiro OSC</string>
-    <string name="choose_file_type">Escolha o tipo de ficheiro</string>
-    <string name="osm_edits_export_desc">Selecione o tipo de exportação: notas do OSM, POI ou ambos.</string>
+    <string name="choose_file_type">Selecione o tipo de ficheiro</string>
+    <string name="osm_edits_export_desc">Selecione o tipo de exportação: notas do OSM, POIs ou ambos.</string>
     <string name="all_data">Todos os dados</string>
     <string name="osm_notes">Notas do OSM</string>
     <string name="will_open_tomorrow_at">Abre amanhã às</string>
@@ -2348,11 +2348,11 @@
 \n• Assinatura OsmAnd Live agora suporta todas as funcionalidades do OsmAnd
 \n
 \n</string>
-    <string name="modify_the_search_query">Modificar a consulta de pesquisa.</string>
+    <string name="modify_the_search_query">Modifique a sua pesquisa.</string>
     <string name="shared_string_actions">Ações</string>
     <string name="shared_string_marker">Marcador</string>
     <string name="empty_state_osm_edits">Criar ou modificar objetos OSM</string>
-    <string name="empty_state_osm_edits_descr">Criar ou modifiquar POI OSM, abrir ou comentar notas do OSM e contribuir com ficheiros gravados GPX.</string>
+    <string name="empty_state_osm_edits_descr">Criar ou modificar POIs do OSM, abrir ou comentar notas do OSM e contribuir com ficheiros gravados de GPX.</string>
     <string name="shared_string_deleted">Eliminado</string>
     <string name="shared_string_edited">Editado</string>
     <string name="shared_string_added">Adicionado</string>
@@ -3436,4 +3436,6 @@
     <string name="reset_confirmation_descr">Ao clicar em %1$s perderá todas as suas alterações.</string>
     <string name="reset_all_profile_settings_descr">Todas as configurações de perfil serão redefinidas para o estado após a instalação.</string>
     <string name="reset_all_profile_settings">Redefinir todas as configurações de perfil para o padrão\?</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
+    <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
 </resources>

OsmAnd/res/values-ru/phrases.xml

@@ -3642,4 +3642,21 @@
     <string name="poi_cuisine_buschenschank">Бушеншанк (изысканные австрийские вина)</string>
     <string name="poi_cuisine_fine_dining">Изысканная кухня</string>
     <string name="poi_network">Сеть</string>
+    <string name="poi_parking_space">Парковочное место</string>
+
+	<string name="poi_volcano_type_scoria">Шлаковый конус</string>
+	<string name="poi_volcano_type_stratovolcano">Стратовулкан</string>
+	<string name="poi_volcano_type_shield">Щитовой</string>
+	<string name="poi_volcano_type_maar">Маар</string>
+	<string name="poi_volcano_type_caldera">Калдера</string>
+	<string name="poi_volcano_type_lava_dome">Лавовый купол</string>
+	<string name="poi_volcano_type_dirt">Грязевой</string>
+	<string name="poi_volcano_last_eruption">Последнее извержение</string>
+	<string name="poi_volcano_status_extinct">Потухший</string>
+	<string name="poi_volcano_status_dormant">Спящий</string>
+	<string name="poi_volcano_status_active">Активный</string>
+	<string name="poi_volcano_status_inactive">Неактивный</string>
+	<string name="poi_volcano_number_of_eruptions">Число извержений</string>
+
+
 </resources>

OsmAnd/res/values-sc/strings.xml

@@ -3421,4 +3421,5 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="reset_all_profile_settings_descr">Totu sas impostatziones de su profilu ant a torrare a s\'istadu chi teniant in antis de s\'installatzione.</string>
     <string name="reset_all_profile_settings">Ripristinare totu sas impostatziones de su profilu a sos valores predefinidos\?</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
 </resources>

OsmAnd/res/values-sk/strings.xml

@@ -79,7 +79,7 @@
 \n
 \nDlaždicové mapy môžete získať priamo zo zdrojov na Internete, alebo ich môžete pripraviť na použitie offline (skopírovať ručne do dátového priečinka OsmAnd) ako SQLite databázu, ktorú vedia vytvoriť viaceré programy na prípravu máp.</string>
     <string name="osmand_background_plugin_description">Zobrazí nastavenia na zapnutie stopovania a navigácie v pozadí systému pravidelným prebúdzaním GPS zariadenia (pri vypnutej obrazovke).</string>
-    <string name="osmand_accessibility_description">Tento modul zobrazí funkcie uľahčenia prístupu priamo v OsmAnd. Napr. je možné zmeniť rýchlosť TTS hlasu, použiť trackball na približovanie, alebo automaticky oznamovať polohu hlasom.</string>
+    <string name="osmand_accessibility_description">Tento modul zobrazí funkcie uľahčenia prístupu priamo v OsmAnd. Napr. je možné zmeniť rýchlosť generovaného hlasu, použiť trackball na približovanie, alebo automaticky oznamovať polohu hlasom.</string>
     <string name="osmand_development_plugin_description">Tento modul zobrazí nastavenia pre funkcie vývoja a ladenia, ako simulácia trasy, zobrazenie výkonu vykresľovania alebo hlasové oznamy. Tieto nastavenia sú určené pre vývojárov a nie sú potrebné pre bežné použitie programu.</string>
     <string name="plugins_screen">Zásuvné moduly</string>
     <string name="prefs_plugins_descr">Zásuvné moduly aktivujú pokročilé nastavenia a dodatočné funkcie.</string>
@@ -193,9 +193,7 @@
     <string name="global_settings">Globálne nastavenia</string>
     <string name="global_app_settings">Globálne nastavenia aplikácie</string>
     <string name="download_files_not_enough_space">Nie je dostatok voľného miesta pre stiahnutie %1$s MB (voľné: %2$s).</string>
-    <string name="download_files_question_space">Naozaj stiahnuť {0} súbor(ov)?
- V úložisku je potrebných {1} MB.
- (Dostupné miesto je {2} MB.)</string>
+    <string name="download_files_question_space">Stiahnuť {0} súbor(ov)\? Bude použitých {1} MB (z {2} MB).</string>
     <string name="use_transparent_map_theme">Priehľadná téma</string>
     <string name="native_library_not_supported">Natívna knižnica nie je podporovaná na tomto zariadení.</string>
     <string name="init_native_library">Inicializácia natívnej knižnice…</string>
@@ -679,7 +677,7 @@
     <string name="osb_comment_dialog_message">Správa</string>
     <string name="osb_comment_dialog_author">Meno autora</string>
     <string name="osb_comment_dialog_success">Komentár pridaný</string>
-    <string name="osb_comment_dialog_error">Nepodarilo sa pridať komentár</string>
+    <string name="osb_comment_dialog_error">Nepodarilo sa pridať komentár.</string>
     <string name="poi_edit_title">Upravenie bodu záujmu (POI)</string>
     <string name="poi_create_title">Vytvorenie bodu záujmu (POI)</string>
     <string name="poi_error_poi_not_found">Bod sa nedá nájsť alebo je bod záujmu tvorený viacerými bodmi, s čím zatiaľ nie je možné pracovať.</string>
@@ -891,7 +889,7 @@ Proporčná pamäť %4$s MB (Limit Androidu %5$s MB, Dalvik %6$s MB).</string>
     <string name="map_widget_distancemeasurement">Meranie vzdialenosti</string>
     <string name="audionotes_location_not_defined">Umiestnenie na spojenie s poznámkou ešte nie je definované. Ak chcete priradiť poznámku k vybranému umiestneniu, použite \"Použiť umiestnenie…\".</string>
     <string name="map_widget_audionotes">Zvukové poznámky</string>
-    <string name="audionotes_plugin_description">Modul Audio/video poznámok poskytuje funkcie na vytváranie obrazových/zvukových/video poznámok počas výletu, buď tlačidlom na obrazovke mapy alebo priamo v kontextovom menu bodu na mape.</string>
+    <string name="audionotes_plugin_description">Modul Audio/video poznámok poskytuje funkcie na vytváranie obrazových/zvukových/video poznámok počas výletu, buď tlačidlom na mape alebo priamo v kontextovom menu bodu na mape.</string>
     <string name="audionotes_plugin_name">Audio/video poznámky</string>
     <string name="srtm_plugin_description">Tento modul poskytuje vrstevnice a tieňované reliéfy, ktoré môžu byť zobrazené ponad štandardné mapy. Táto funkcia je vhodná pre atlétov, turistov, chodcov a všetkých, ktorých zaujíma reliéf terénu. (Samotné vrstevnice sú samostatnými dátami, ktoré je potrebné stiahnuť po aktivovaní modulu.) 
 \n 
@@ -1287,9 +1285,9 @@ Proporčná pamäť %4$s MB (Limit Androidu %5$s MB, Dalvik %6$s MB).</string>
     <string name="speed_limit_exceed_message">Zvoľte toleranciu prekročenia povolenej rýchlosti, po ktorej dostanete hlasové oznámenie.</string>
     <string name="anonymous_user">Anonymný používateľ</string>
     <string name="logged_as">Prihlásený ako %1$s</string>
-    <string name="anonymous_user_hint">Anonymný používateľ nemôže:
-\n- Vytvárať skupiny;
-\n- Synchronizovať skupiny a zariadenia so serverom;
+    <string name="anonymous_user_hint">Anonymní používatelia nemôžu:
+\n- Vytvárať skupiny; 
+\n- Synchronizovať skupiny a zariadenia so serverom; 
 \n- Spravovať skupiny a zariadenia na osobnej nástenke na webovej stránke.</string>
     <string name="rendering_category_details">Podrobnosti</string>
     <string name="rendering_category_transport">Doprava</string>
@@ -1453,7 +1451,7 @@ Proporčná pamäť %4$s MB (Limit Androidu %5$s MB, Dalvik %6$s MB).</string>
     <string name="shared_string_remember_my_choice">Zapamätať voľbu</string>
     <string name="shared_string_refresh">Obnoviť</string>
     <string name="shared_string_download">Stiahnuť</string>
-    <string name="shared_string_downloading">Sťahovanie</string>
+    <string name="shared_string_downloading">Sťahovanie…</string>
     <string name="shared_string_download_successful">Stiahnuté</string>
     <string name="shared_string_io_error">Chyba čítania/zápisu</string>
     <string name="shared_string_unexpected_error">Neočakávaná chyba</string>
@@ -1500,7 +1498,7 @@ Dĺžka %2$s</string>
     <string name="waypoint_visit_after">Navštíviť po</string>
     <string name="waypoint_visit_before">Navštíviť pred</string>
     <string name="shared_string_collapse">Skryť</string>
-    <string name="local_osm_changes_upload_all_confirm">Idete odoslať %1$d zmien do OSM. Ste si istí?</string>
+    <string name="local_osm_changes_upload_all_confirm">Naozaj chcete odoslať %1$d zmien do OSM\?</string>
     <string name="confirmation_to_clear_history">Vymazať históriu?</string>
     <string name="osmand_parking_overdue">prekročený čas</string>
     <string name="confirm_usage_speed_cameras">Vo viacerých krajinách (ako Nemecko, Francúzsko, Taliansko) je použitie varovaní pred rýchlostnými radarmi/kamerami zakázané zákonom (nelegálne). OsmAnd nepreberá žiadnu zodpovednosť ak porušíte zákon. Stlačte \"Áno\" len ak ste na to oprávnený použiť túto funkciu.</string>
@@ -1512,7 +1510,7 @@ Dĺžka %2$s</string>
     <string name="osm_changes_added_to_local_edits">Zmeny OSM pridané do lokálnej sady zmien</string>
     <string name="mark_to_delete">Označte pre výmaz</string>
     <string name="agps_info">Informácie o A-GPS</string>
-    <string name="agps_data_last_downloaded">A-GPS dáta boli naposledy stiahnuté: %1$s</string>
+    <string name="agps_data_last_downloaded">A-GPS dáta boli stiahnuté: %1$s</string>
     <string name="shared_string_message">Správa</string>
     <string name="shared_string_do_not_use">Nepoužívať</string>
     <string name="shared_string_address">Adresa</string>
@@ -1555,12 +1553,12 @@ Dĺžka %2$s</string>
     <string name="shared_string_show_details">Zobraziť detaily</string>
     <string name="download_wikipedia_maps">Wikipédia</string>
     <string name="shared_string_import2osmand">Importovať do OsmAnd</string>
-    <string name="local_recordings_delete_all_confirm">Chystáte sa vymazať %1$d poznámok. Ste si istí?</string>
-    <string name="gps_network_not_enabled">Služba zisťovania pozície vypnutá. Zapnúť teraz?</string>
+    <string name="local_recordings_delete_all_confirm">Naozaj chcete vymazať %1$d poznámok\?</string>
+    <string name="gps_network_not_enabled">Služba zisťovania pozície je vypnutá. Zapnúť teraz\?</string>
     <string name="disable_recording_once_app_killed">Zakázať samostatné zaznamenávanie</string>
     <string name="disable_recording_once_app_killed_descrp">Zastaví záznam GPX keď je aplikácia ukončená (cez nedávne aplikácie). (Ikona režimu na pozadí zmizne z notifikačnej oblasti Androidu.)</string>
     <string name="archive_wikipedia_data">Máte stiahnuté staré nekompatibilné dáta z Wikipédie. Chcete ich archivovať?</string>
-    <string name="download_wikipedia_files">Stiahnuť ďalšie dáta z Wikipédie (%1$s MB) ?</string>
+    <string name="download_wikipedia_files">Stiahnuť ďalšie dáta z Wikipédie (%1$s MB)\?</string>
     <string name="lang_es_ar">Španielsky (Argentína)</string>
     <string name="lang_nb">Nórsky Bokmål</string>
     <string name="lang_vo">Volapuk</string>
@@ -1609,7 +1607,7 @@ Dĺžka %2$s</string>
     <string name="rendering_value_blue_name">Modrá</string>
     <string name="rendering_value_purple_name">Fialová</string>
     <string name="rendering_value_translucent_purple_name">Priehľadná fialová</string>
-    <string name="restart_is_required">Manuálne reštartujte aplikáciu pre použitie všetkých zmien.</string>
+    <string name="restart_is_required">Pre použitie zmeny je potrebný reštart aplikácie.</string>
     <string name="rendering_value_default13_name">Predvolená (13)</string>
     <string name="rendering_value_defaultTranslucentCyan_name">Predvolená (priehľadná azúrová)</string>
     <string name="rendering_value_translucent_blue_name">Priehľadná modrá</string>
@@ -1669,7 +1667,7 @@ Dĺžka %2$s</string>
     <string name="favourites_context_menu_add">Pridať Obľúbený bod</string>
     <string name="roads">Cesty</string>
     <string name="favorite_category_add_new">Pridať nový</string>
-    <string name="favorite_category_select">Zvoľte kategóriu</string>
+    <string name="favorite_category_select">Vyberte kategóriu</string>
     <string name="default_speed_system_descr">Zvoľte jednotku rýchlosti.</string>
     <string name="default_speed_system">Jednotka rýchlosti</string>
     <string name="nm">nmi</string>
@@ -1775,9 +1773,9 @@ Dĺžka %2$s</string>
     <string name="osn_reopen_dialog_title">Znovuotvoriť poznámku</string>
     <string name="osn_close_dialog_title">Uzavrieť poznámku</string>
     <string name="osn_add_dialog_success">Poznámka vytvorená</string>
-    <string name="osn_add_dialog_error">Nepodarilo sa vytvoriť poznámku</string>
+    <string name="osn_add_dialog_error">Nepodarilo sa vytvoriť poznámku.</string>
     <string name="osn_close_dialog_success">Poznámka uzavretá</string>
-    <string name="osn_close_dialog_error">Nepodarilo sa uzavrieť poznámku</string>
+    <string name="osn_close_dialog_error">Nepodarilo sa uzavrieť poznámku.</string>
     <string name="shared_string_commit">Odoslať</string>
     <string name="rendering_attr_currentTrackColor_description">Farba GPX</string>
     <string name="rendering_attr_currentTrackWidth_description">Šírka GPX</string>
@@ -1815,9 +1813,9 @@ Dĺžka %2$s</string>
     <string name="missing_write_external_storage_permission">OsmAnd nemá oprávnenie použiť pamäťovú kartu</string>
     <string name="impassable_road_desc">Vyberte cesty, ktorým sa chcete navigácii vyhnúť.</string>
     <string name="shared_string_sound">Zvuk</string>
-    <string name="no_location_permission">Aplikácia nemá oprávnenia na prístup k údajom o polohe.</string>
-    <string name="no_camera_permission">Aplikácia nemá oprávnenia na prístup k fotoaparátu.</string>
-    <string name="no_microphone_permission">Aplikácia nemá oprávnenia na prístup k mikrofónu.</string>
+    <string name="no_location_permission">Udeľte oprávnenie na prístup k údajom o polohe.</string>
+    <string name="no_camera_permission">Udeľte oprávnenia na prístup k fotoaparátu.</string>
+    <string name="no_microphone_permission">Udeľte oprávnenia na prístup k mikrofónu.</string>
     <string name="select_voice_provider">Zvoľte hlasové pokyny</string>
     <string name="select_voice_provider_descr">Vyberte alebo stiahnite hlasové pokyny pre váš jazyk.</string>
     <string name="live_updates">Okamžité aktualizácie</string>
@@ -1866,10 +1864,8 @@ Dĺžka %2$s</string>
     <string name="rendering_attr_showMtbRoutes_name">Zobraziť trasy pre horské bicykle</string>
     <string name="select_map_marker">Zvoľte mapovú značku</string>
     <string name="map_markers_other">Iné značky</string>
-    <string name="download_files_error_not_enough_space">Nedostatok miesta!
- V úložisku je dočasne je potrebných {3} MB, natrvalo {1} MB.
- Dostupné miesto je len {2} MB.</string>
-    <string name="download_files_question_space_with_temp">Naozaj stiahnuť {0} súbor(ov)? V úložisku je dočasne je potrebných {3} MB, natrvalo {1} MB. ({2} MB voľného miesta.)</string>
+    <string name="download_files_error_not_enough_space">Nedostatok miesta! V úložisku je dočasne je potrebných {3} MB, natrvalo {1} MB. (Dostupných je len {2} MB.)</string>
+    <string name="download_files_question_space_with_temp">Naozaj stiahnuť {0} súbor(ov)\? V úložisku je dočasne je potrebných {3} MB, natrvalo {1} MB. (Z {2} MB.)</string>
     <string name="upload_osm_note_description">Odošlite OSM poznámku anonymne alebo použite svoj účet na OpenStreetMap.org.</string>
     <string name="upload_osm_note">Odoslať OSM poznámku</string>
     <string name="map_marker_1st">Prvá mapová značka</string>
@@ -1894,11 +1890,11 @@ Dĺžka %2$s</string>
     <string name="osm_editors_ranking">Pozícia medzi editormi OSM</string>
     <string name="osm_live_subscription">Predplatné OsmAnd Live</string>
     <string name="osm_live_subscribe_btn">Registrovať</string>
-    <string name="osm_live_email_desc">Potrebné pre poskytnutie Vám informácií o príspevkoch.</string>
+    <string name="osm_live_email_desc">Potrebné pre informovanie vás o vašich príspevkoch.</string>
     <string name="osm_live_user_public_name">Verejné meno</string>
     <string name="osm_live_hide_user_name">Nezobrazovať moje meno v prehľadoch</string>
     <string name="osm_live_support_region">Podporovaný región</string>
-    <string name="osm_live_month_cost">Mesačná cena</string>
+    <string name="osm_live_month_cost">Cena za mesiac</string>
     <string name="osm_live_month_cost_desc">Mesačná platba</string>
     <string name="osm_live_active">Aktívne</string>
     <string name="osm_live_not_active">Neaktívne</string>
@@ -3409,4 +3405,5 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="reset_all_profile_settings_descr">Všetky nastavenia profilu budú vrátené do východzieho stavu.</string>
     <string name="reset_all_profile_settings">Resetovať nastavenia profilu na predvolené hodnoty\?</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
 </resources>

OsmAnd/res/values-tr/strings.xml

@@ -3372,4 +3372,5 @@
     <string name="reset_all_profile_settings_descr">Tüm profil ayarları kurulumdan sonraki duruma sıfırlanacaktır.</string>
     <string name="reset_all_profile_settings">Tüm profil ayarları varsayılana sıfırlansın mı\?</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
 </resources>

OsmAnd/res/values-uk/phrases.xml

@@ -3755,4 +3755,6 @@
     <string name="poi_community_gender_male">Стать спільноти: чоловіча</string>
     <string name="poi_community_gender_mixed">Стать спільноти: обидві статі</string>
     <string name="poi_grave">Могила</string>
+    <string name="poi_parking_space">Паркувальне місце</string>
+    <string name="poi_url">URL</string>
 </resources>

OsmAnd/res/values-uk/strings.xml

@@ -780,8 +780,8 @@
     <string name="clear_dest_confirm">Ви впевнені, що хочете вилучити пункт призначення (і проміжні точки)?</string>
     <string name="recording_context_menu_show">Показати</string>
     <string name="recording_photo_description">Фото %1$s %2$s</string>
-    <string name="av_def_action_picture">Сфотографувати</string>
-    <string name="recording_context_menu_precord">Сфотографувати</string>
+    <string name="av_def_action_picture">Зробити світлину</string>
+    <string name="recording_context_menu_precord">Зробити світлину</string>
     <string name="dropbox_plugin_description">Втулок Dropbox дозволяє вам часоузгодити треки та звуко/відео-примітки з вашим обліковим записом Dropbox.</string>
     <string name="dropbox_plugin_name">Втулок Dropbox</string>
     <string name="intermediate_points_change_order">Змінити порядок</string>
@@ -797,7 +797,7 @@
     <string name="av_video_format">Формат відео</string>
     <string name="av_use_external_recorder_descr">Використовувати системну програму для запису відео.</string>
     <string name="av_use_external_recorder">Використовувати системну програму</string>
-    <string name="av_use_external_camera_descr">Використовувати системну програму для фотографій.</string>
+    <string name="av_use_external_camera_descr">Використовувати системний додаток для світлин.</string>
     <string name="recording_unavailable">недоступно</string>
     <string name="shared_string_control_stop">Стоп</string>
     <string name="shared_string_control_start">Старт</string>
@@ -2417,18 +2417,18 @@
 \nОтримайте надійний навігатор у вашій країні — будь то Україна, Франція, Німеччина, Мексика, Великобританія, Іспанія, Нідерланди, США, Росія, Бразилія чи будь-яка інша…
 \n</string>
     <string name="save_poi_too_many_uppercase">Назва містить занадто багато великих літер. Продовжити?</string>
-    <string name="shared_string_add_photos">Додати фотографії</string>
+    <string name="shared_string_add_photos">Додати світлини</string>
     <string name="mapillary_action_descr">Поділитися своїми вуличними видами цієї місцевості через Mapillary.</string>
     <string name="mapillary_widget">Віджет Mapillary</string>
     <string name="mapillary_widget_descr">Дозволяє швидко зробити внесок в Mapillary.</string>
     <string name="mapillary_descr">Світлини вулиць в мережі для всіх. Відкрийте для себе місця, діліться та знимкуйте весь світ.</string>
-    <string name="plugin_mapillary_descr">Вуличні фотографії для усіх. Відкривайте для себе місця, співпрацюйте, знімкуйте світ.</string>
-    <string name="online_photos">Мережеві світлинознімки</string>
+    <string name="plugin_mapillary_descr">Вуличні світлини для усіх. Відкривайте для себе місця, співпрацюйте, знімкуйте світ.</string>
+    <string name="online_photos">Мережеві світлини</string>
     <string name="no_photos_descr">Тут нема світлин.</string>
     <string name="open_mapillary">Відкрити Mapillary</string>
     <string name="shared_string_install">Встановити</string>
     <string name="improve_coverage_mapillary">Поліпшити фото-покриття Mapillary</string>
-    <string name="improve_coverage_install_mapillary_desc">Встановіть Mapillary, щоб додати одну або кілька фотографій до цього місця на мапі.</string>
+    <string name="improve_coverage_install_mapillary_desc">Встановіть Mapillary, щоб додати одну або кілька світлин до цього місця на мапі.</string>
     <string name="mapillary_image">Зображення Mapillary</string>
     <string name="distance_moving">Відстань виправлена</string>
     <string name="shared_string_permissions">Права доступу</string>
@@ -2445,7 +2445,7 @@
     <string name="mapillary_menu_edit_text_hint">Введіть ім\'я користувача</string>
     <string name="mapillary_menu_descr_username">Переглянути лише зображення додані</string>
     <string name="mapillary_menu_title_username">Ім\'я користувача</string>
-    <string name="mapillary_menu_filter_description">Фільтрувати фотографії за подавачем, датою чи типом. Фільтри застосовуються лише для великих масштабів.</string>
+    <string name="mapillary_menu_filter_description">Фільтрувати світлини за подавачем, датою чи видом. Фільтри застосовуються лише для великих масштабів.</string>
     <string name="shared_string_reset">Скинути</string>
     <string name="store_tracks_in_monthly_directories">Зберігати записані треки у помісячних теках</string>
     <string name="store_tracks_in_monthly_directories_descrp">Зберігати записані треки в підтеках відповідно місяцю запису (наприклад, 2018-01).</string>
@@ -3412,4 +3412,5 @@
     <string name="reset_all_profile_settings_descr">Усі налаштування профілю буде скинуто після встановлення.</string>
     <string name="reset_all_profile_settings">Скинути всі усталені налаштування профілю\?</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
 </resources>

OsmAnd/res/values-zh-rTW/phrases.xml

@@ -3766,4 +3766,6 @@
     <string name="poi_community_gender_male">社群性別：男</string>
     <string name="poi_community_gender_mixed">社群性別：混合</string>
     <string name="poi_grave">墳墓</string>
+    <string name="poi_parking_space">停車位</string>
+    <string name="poi_url">URL</string>
 </resources>

OsmAnd/res/values-zh-rTW/strings.xml

@@ -3409,4 +3409,5 @@
     <string name="reset_all_profile_settings_descr">所有設定檔都將被重設為安裝後的狀態。</string>
     <string name="reset_all_profile_settings">將所有設定檔重設為預設值？</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s：%2$s</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
 </resources>

OsmAnd/res/values/phrases.xml

@@ -129,6 +129,8 @@
 	<string name="poi_cash_withdrawal_bank_card">Cash withdrawal</string>
 	<string name="poi_bath_type">Type</string>
 	<string name="poi_bath_open_air">Open air</string>
+	<string name="poi_volcano_type">Type</string>
+	<string name="poi_volcano_status">Status</string>
 
 <!--  categories -->
 	<string name="poi_shop">Store</string>
@@ -4157,4 +4159,22 @@
 
 	<string name="poi_grave">Grave</string>
 
+	<string name="poi_parking_space">Parking space</string>
+
+	<string name="poi_url">URL</string>
+
+	<string name="poi_volcano_type_scoria">Scoria</string>
+	<string name="poi_volcano_type_stratovolcano">Stratovolcano</string>
+	<string name="poi_volcano_type_shield">Shield</string>
+	<string name="poi_volcano_type_maar">Maar</string>
+	<string name="poi_volcano_type_caldera">Caldera</string>
+	<string name="poi_volcano_type_lava_dome">Lava dome</string>
+	<string name="poi_volcano_type_dirt">Dirt</string>
+	<string name="poi_volcano_last_eruption">Last eruption</string>
+	<string name="poi_volcano_status_extinct">Extinct</string>
+	<string name="poi_volcano_status_dormant">Dormant</string>
+	<string name="poi_volcano_status_active">Active</string>
+	<string name="poi_volcano_status_inactive">Inactive</string>
+	<string name="poi_volcano_number_of_eruptions">Number of eruptions</string>
+
 </resources>

OsmAnd/src/net/osmand/plus/MapMarkersHelper.java

@@ -9,6 +9,8 @@ import android.support.v4.content.ContextCompat;
 
 import net.osmand.AndroidUtils;
 import net.osmand.GPXUtilities;
+import net.osmand.GPXUtilities.GPXFile;
+import net.osmand.GPXUtilities.WptPt;
 import net.osmand.IndexConstants;
 import net.osmand.PlatformUtil;
 import net.osmand.data.FavouritePoint;
@@ -16,8 +18,6 @@ import net.osmand.data.LatLon;
 import net.osmand.data.LocationPoint;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
-import net.osmand.GPXUtilities.GPXFile;
-import net.osmand.GPXUtilities.WptPt;
 import net.osmand.plus.GeocodingLookupService.AddressLookupRequest;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
 import net.osmand.plus.mapmarkers.MapMarkersDbHelper;
@@ -53,9 +53,9 @@ public class MapMarkersHelper {
 	public static final int BY_DISTANCE_DESC = 1;
 	public static final int BY_DISTANCE_ASC = 2;
 	public static final int BY_DATE_ADDED_DESC = 3;
-	
+
 	public static final int BY_DATE_ADDED_ASC = 4;
-	
+
 	private static final Log LOG = PlatformUtil.getLog(MapMarkersHelper.class);
 
 	@Retention(RetentionPolicy.SOURCE)
@@ -64,7 +64,6 @@ public class MapMarkersHelper {
 	}
 
 	private OsmandApplication ctx;
-	private OsmandSettings settings;
 	private MapMarkersDbHelper markersDbHelper;
 
 	private ExecutorService executorService = Executors.newSingleThreadExecutor();
@@ -76,8 +75,6 @@ public class MapMarkersHelper {
 	private List<MapMarkerChangedListener> listeners = new ArrayList<>();
 	private Set<OnGroupSyncedListener> syncListeners = new HashSet<>();
 
-	private boolean startFromMyLocation;
-
 	private MarkersPlanRouteContext planRouteContext;
 
 	public List<MapMarker> getMapMarkers() {
@@ -93,12 +90,11 @@ public class MapMarkersHelper {
 	}
 
 	public boolean isStartFromMyLocation() {
-		return startFromMyLocation;
+		return ctx.getSettings().ROUTE_MAP_MARKERS_START_MY_LOC.get();
 	}
 
 	public void setStartFromMyLocation(boolean startFromMyLocation) {
-		this.startFromMyLocation = startFromMyLocation;
-		settings.ROUTE_MAP_MARKERS_START_MY_LOC.set(startFromMyLocation);
+		ctx.getSettings().ROUTE_MAP_MARKERS_START_MY_LOC.set(startFromMyLocation);
 	}
 
 	public MarkersPlanRouteContext getPlanRouteContext() {
@@ -107,10 +103,8 @@ public class MapMarkersHelper {
 
 	public MapMarkersHelper(OsmandApplication ctx) {
 		this.ctx = ctx;
-		settings = ctx.getSettings();
 		markersDbHelper = ctx.getMapMarkersDbHelper();
 		planRouteContext = new MarkersPlanRouteContext(ctx);
-		startFromMyLocation = settings.ROUTE_MAP_MARKERS_START_MY_LOC.get();
 		markersDbHelper.removeDisabledGroups();
 		loadMarkers();
 		loadGroups();
@@ -616,7 +610,7 @@ public class MapMarkersHelper {
 
 	private List<MapMarker> getMarkers() {
 		List<MapMarker> res = new ArrayList<>(mapMarkers);
-		if (settings.KEEP_PASSED_MARKERS_ON_MAP.get()) {
+		if (ctx.getSettings().KEEP_PASSED_MARKERS_ON_MAP.get()) {
 			res.addAll(mapMarkersHistory);
 		}
 		return res;
@@ -883,7 +877,7 @@ public class MapMarkersHelper {
 							@Nullable List<WptPt> wptPts,
 							@Nullable List<String> mapObjNames) {
 		if (points.size() > 0) {
-			settings.SHOW_MAP_MARKERS.set(true);
+			ctx.getSettings().SHOW_MAP_MARKERS.set(true);
 			int colorIndex = -1;
 			List<MapMarker> addedMarkers = new ArrayList<>();
 			for (int i = 0; i < points.size(); i++) {

OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java

@@ -76,6 +76,8 @@ public class OsmAndLocationProvider implements SensorEventListener {
 	private static final long LOCATION_TIMEOUT_TO_BE_STALE = 1000 * 60 * 2; // 2 minutes
 	private static final long STALE_LOCATION_TIMEOUT_TO_BE_GONE = 1000 * 60 * 20; // 20 minutes
 
+	private static final long AGPS_TO_REDOWNLOAD = 16 * 60 * 60 * 1000; // 16 hours
+
 	private static final int REQUESTS_BEFORE_CHECK_LOCATION = 100;
 	private AtomicInteger locationRequestsCounter = new AtomicInteger();
 	private AtomicInteger staleLocationRequestsCounter = new AtomicInteger();
@@ -114,7 +116,6 @@ public class OsmAndLocationProvider implements SensorEventListener {
 	private int currentScreenOrientation;
 
 	private OsmandApplication app;
-	private OsmandSettings settings;
 
 	private NavigationInfo navigationInfo;
 	private CurrentPositionHelper currentPositionHelper;
@@ -128,9 +129,6 @@ public class OsmAndLocationProvider implements SensorEventListener {
 	private List<OsmAndCompassListener> compassListeners = new ArrayList<OsmAndLocationProvider.OsmAndCompassListener>();
 	private Listener gpsStatusListener;
 	private float[] mRotationM = new float[9];
-	private OsmandPreference<Boolean> USE_MAGNETIC_FIELD_SENSOR_COMPASS;
-	private OsmandPreference<Boolean> USE_FILTER_FOR_COMPASS;
-	private static final long AGPS_TO_REDOWNLOAD = 16 * 60 * 60 * 1000; // 16 hours
 
 
 	public class SimulationProvider {
@@ -234,9 +232,6 @@ public class OsmAndLocationProvider implements SensorEventListener {
 	public OsmAndLocationProvider(OsmandApplication app) {
 		this.app = app;
 		navigationInfo = new NavigationInfo(app);
-		settings = app.getSettings();
-		USE_MAGNETIC_FIELD_SENSOR_COMPASS = settings.USE_MAGNETIC_FIELD_SENSOR_COMPASS;
-		USE_FILTER_FOR_COMPASS = settings.USE_KALMAN_FILTER_FOR_COMPASS;
 		currentPositionHelper = new CurrentPositionHelper(app);
 		locationSimulation = new OsmAndLocationSimulation(app, this);
 		addLocationListener(navigationInfo);
@@ -393,7 +388,7 @@ public class OsmAndLocationProvider implements SensorEventListener {
 		} else if (!sensorRegistered && register) {
 			Log.d(PlatformUtil.TAG, "Enable sensor"); //$NON-NLS-1$
 			SensorManager sensorMgr = (SensorManager) app.getSystemService(Context.SENSOR_SERVICE);
-			if (USE_MAGNETIC_FIELD_SENSOR_COMPASS.get()) {
+			if (app.getSettings().USE_MAGNETIC_FIELD_SENSOR_COMPASS.get()) {
 				Sensor s = sensorMgr.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
 				if (s == null || !sensorMgr.registerListener(this, s, SensorManager.SENSOR_DELAY_UI)) {
 					Log.e(PlatformUtil.TAG, "Sensor accelerometer could not be enabled");
@@ -476,7 +471,8 @@ public class OsmAndLocationProvider implements SensorEventListener {
 				default:
 					return;
 				}
-				if (USE_MAGNETIC_FIELD_SENSOR_COMPASS.get()) {
+				OsmandSettings settings = app.getSettings();
+				if (settings.USE_MAGNETIC_FIELD_SENSOR_COMPASS.get()) {
 					if (mGravs != null && mGeoMags != null) {
 						boolean success = SensorManager.getRotationMatrix(mRotationM, null, mGravs, mGeoMags);
 						if (!success) {
@@ -495,7 +491,7 @@ public class OsmAndLocationProvider implements SensorEventListener {
 				lastValSin = (float) Math.sin(valRad);
 				lastValCos = (float) Math.cos(valRad);
 				// lastHeadingCalcTime = System.currentTimeMillis();
-				boolean filter = USE_FILTER_FOR_COMPASS.get(); //USE_MAGNETIC_FIELD_SENSOR_COMPASS.get();
+				boolean filter = settings.USE_KALMAN_FILTER_FOR_COMPASS.get(); //USE_MAGNETIC_FIELD_SENSOR_COMPASS.get();
 				if (filter) {
 					filterCompassValue();
 				} else {
@@ -806,9 +802,9 @@ public class OsmAndLocationProvider implements SensorEventListener {
 		if (routingHelper.isFollowingMode()) {
 			if (location == null || isPointAccurateForRouting(location)) {
 				// Update routing position and get location for sticking mode
-				updatedLocation = routingHelper.setCurrentLocation(location, settings.SNAP_TO_ROAD.get());
+				updatedLocation = routingHelper.setCurrentLocation(location, app.getSettings().SNAP_TO_ROAD.get());
 			}
-		} else if(routingHelper.isRoutePlanningMode() && settings.getPointToStart() == null) {
+		} else if(routingHelper.isRoutePlanningMode() && app.getSettings().getPointToStart() == null) {
 			routingHelper.setCurrentLocation(location, false);
 		} else if(getLocationSimulation().isRouteAnimating()) {
 			routingHelper.setCurrentLocation(location, false);

OsmAnd/src/net/osmand/plus/OsmandApplication.java

@@ -291,7 +291,6 @@ public class OsmandApplication extends MultiDexApplication {
 	public void setOsmandSettings(OsmandSettings osmandSettings) {
 		//android.os.Process.killProcess(android.os.Process.myPid());
 		this.osmandSettings = osmandSettings;
-		resourceManager.getRenderer().updateSettings();
 		OsmandPlugin.initPlugins(this);
 	}
 

OsmAnd/src/net/osmand/plus/OsmandSettings.java

@@ -1471,8 +1471,6 @@ public class OsmandSettings {
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<String> PREFERRED_LOCALE = new StringPreference("preferred_locale", "").makeGlobal();
 
-	public static final String TRANSPORT_STOPS_OVER_MAP = "transportStops";
-
 	public final OsmandPreference<String> MAP_PREFERRED_LOCALE = new StringPreference("map_preferred_locale", "").makeGlobal().cache();
 	public final OsmandPreference<Boolean> MAP_TRANSLITERATE_NAMES = new BooleanPreference("map_transliterate_names", false).makeGlobal().cache();
 
@@ -2292,6 +2290,7 @@ public class OsmandSettings {
 	public static final String LAST_KNOWN_MAP_LAT = "last_known_map_lat"; //$NON-NLS-1$
 	public static final String LAST_KNOWN_MAP_LON = "last_known_map_lon"; //$NON-NLS-1$
 	public static final String LAST_KNOWN_MAP_ZOOM = "last_known_map_zoom"; //$NON-NLS-1$
+	public static final String LAST_KNOWN_MAP_ELEVATION = "last_known_map_elevation"; //$NON-NLS-1$
 
 	public static final String MAP_LABEL_TO_SHOW = "map_label_to_show"; //$NON-NLS-1$
 	public static final String MAP_LAT_TO_SHOW = "map_lat_to_show"; //$NON-NLS-1$
@@ -2405,6 +2404,14 @@ public class OsmandSettings {
 		settingsAPI.edit(globalPreferences).putInt(LAST_KNOWN_MAP_ZOOM, zoom).commit();
 	}
 
+	public float getLastKnownMapElevation() {
+		return settingsAPI.getFloat(globalPreferences, LAST_KNOWN_MAP_ELEVATION, 90);
+	}
+
+	public void setLastKnownMapElevation(float elevation) {
+		settingsAPI.edit(globalPreferences).putFloat(LAST_KNOWN_MAP_ELEVATION, elevation).commit();
+	}
+
 	public final static String POINT_NAVIGATE_LAT = "point_navigate_lat"; //$NON-NLS-1$
 	public final static String POINT_NAVIGATE_LON = "point_navigate_lon"; //$NON-NLS-1$
 	public final static String POINT_NAVIGATE_ROUTE = "point_navigate_route_integer"; //$NON-NLS-1$

OsmAnd/src/net/osmand/plus/TargetPointsHelper.java

@@ -12,6 +12,7 @@ import net.osmand.data.PointDescription;
 import net.osmand.plus.GeocodingLookupService.AddressLookupRequest;
 import net.osmand.plus.routing.RouteProvider.RouteService;
 import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener;
 import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 
@@ -147,6 +148,16 @@ public class TargetPointsHelper {
 		this.settings = ctx.getSettings();
 		this.routingHelper = ctx.getRoutingHelper();
 		readFromSettings();
+
+		OsmAndAppCustomizationListener customizationListener = new OsmAndAppCustomizationListener() {
+			@Override
+			public void onOsmAndSettingsCustomized() {
+				settings = TargetPointsHelper.this.ctx.getSettings();
+				readFromSettings();
+				updateRouteAndRefresh(true);
+			}
+		};
+		ctx.getAppCustomization().addListener(customizationListener);
 	}
 
 	public void lookupAddessAll() {

OsmAnd/src/net/osmand/plus/activities/ContributionVersionActivity.java

@@ -257,20 +257,23 @@ public class ContributionVersionActivity extends OsmandListActivity {
 			OsmAndBuild build = getItem(position);
 			TextView tagView = (TextView) row.findViewById(R.id.download_tag);
 			tagView.setText(build.tag);
-			
-			TextView description = (TextView) row.findViewById(R.id.download_descr);
-			StringBuilder format = new StringBuilder();
-			format.append(AndroidUtils.formatDateTime(getMyApplication(), build.date.getTime()))/*.append(" : ").append(build.size).append(" MB")*/;
-			description.setText(format.toString());
 
-			int color = getResources().getColor(R.color.color_unknown);
-			if(currentInstalledDate != null){
-				if(currentInstalledDate.before(build.date)){
-					color = getResources().getColor(R.color.color_update);
+
+			if (build.date != null) {
+				TextView description = (TextView) row.findViewById(R.id.download_descr);
+				StringBuilder format = new StringBuilder();
+				format.append(AndroidUtils.formatDateTime(getMyApplication(), build.date.getTime()))/*.append(" : ").append(build.size).append(" MB")*/;
+				description.setText(format.toString());
+				int color = getResources().getColor(R.color.color_unknown);
+				if (currentInstalledDate != null) {
+					if (currentInstalledDate.before(build.date)) {
+						color = getResources().getColor(R.color.color_update);
+					}
 				}
+				description.setTextColor(color);
+				tagView.setTextColor(color);
 			}
-			description.setTextColor(color);
-			tagView.setTextColor(color);
+
 			return row;
 		}
 		

OsmAnd/src/net/osmand/plus/activities/DayNightHelper.java

@@ -10,7 +10,6 @@ import net.osmand.PlatformUtil;
 import net.osmand.StateChangedListener;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandSettings.CommonPreference;
 import net.osmand.plus.OsmandSettings.DayNightMode;
 import net.osmand.util.SunriseSunset;
 
@@ -41,15 +40,13 @@ import android.location.LocationManager;
  * @author pavol.zibrita
  */
 public class DayNightHelper implements SensorEventListener {
+
 	private static final Log log = PlatformUtil.getLog(DayNightHelper.class);
 	
 	private final OsmandApplication osmandApplication;
 
-	private CommonPreference<DayNightMode> pref;
-
 	public DayNightHelper(OsmandApplication osmandApplication) {
 		this.osmandApplication = osmandApplication;
-		pref = osmandApplication.getSettings().DAYNIGHT_MODE;
 	}
 
 	private DayNightHelper listener;
@@ -79,7 +76,7 @@ public class DayNightHelper implements SensorEventListener {
 	}
 
 	public boolean isNightModeForProfile(ApplicationMode mode) {
-		DayNightMode dayNightMode = pref.getModeValue(mode);
+		DayNightMode dayNightMode = osmandApplication.getSettings().DAYNIGHT_MODE.getModeValue(mode);
 		if (dayNightMode.isDay()) {
 			return false;
 		} else if (dayNightMode.isNight()) {
@@ -138,7 +135,7 @@ public class DayNightHelper implements SensorEventListener {
 
 	public void startSensorIfNeeded(StateChangedListener<Boolean> sensorStateListener) {
 		this.sensorStateListener = sensorStateListener;
-		DayNightMode dayNightMode = pref.get();
+		DayNightMode dayNightMode = osmandApplication.getSettings().DAYNIGHT_MODE.get();
 		if (listener == null && dayNightMode.isSensor()) {
 			SensorManager mSensorManager = (SensorManager) osmandApplication.getSystemService(Context.SENSOR_SERVICE);
 			Sensor mLight = mSensorManager.getDefaultSensor(Sensor.TYPE_LIGHT);

OsmAnd/src/net/osmand/plus/activities/MapActivity.java

@@ -474,7 +474,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 			OsmAndMapLayersView ml = (OsmAndMapLayersView) findViewById(R.id.MapLayersView);
 			ml.setVisibility(View.VISIBLE);
 			atlasMapRendererView.setAzimuth(0);
-			atlasMapRendererView.setElevationAngle(90);
+			atlasMapRendererView.setElevationAngle(app.getSettings().getLastKnownMapElevation());
 			NativeCoreContext.getMapRendererContext().setMapRendererView(atlasMapRendererView);
 			ml.setMapView(mapView);
 			mapViewTrackingUtilities.setMapView(mapView);
@@ -488,6 +488,12 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		}
 	}
 
+	public void setMapElevation(float angle) {
+		if (atlasMapRendererView != null) {
+			atlasMapRendererView.setElevationAngle(angle);
+		}
+	}
+
 	private void createProgressBarForRouting() {
 		final ProgressBar pb = (ProgressBar) findViewById(R.id.map_horizontal_progress);
 
@@ -1490,6 +1496,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		}
 
 		settings.setLastKnownMapZoom(mapView.getZoom());
+		settings.setLastKnownMapElevation(mapView.getElevationAngle());
 		settings.MAP_ACTIVITY_ENABLED.set(false);
 		app.getResourceManager().interruptRendering();
 		OsmandPlugin.onMapActivityPause(this);

OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java

@@ -208,8 +208,6 @@ public class MapActivityLayers {
 	public void updateLayers(OsmandMapTileView mapView) {
 		OsmandSettings settings = getApplication().getSettings();
 		updateMapSource(mapView, settings.MAP_TILE_SOURCES);
-		boolean showStops = settings.getCustomRenderBooleanProperty(OsmandSettings.TRANSPORT_STOPS_OVER_MAP).get();
-		transportStopsLayer.setShowTransportStops(showStops);
 		OsmandPlugin.refreshLayers(mapView, activity);
 	}
 

OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java

@@ -27,6 +27,7 @@ import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.CommonPreference;
 import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.dashboard.DashboardOnMap;
 
@@ -67,7 +68,7 @@ public class DashboardSettingsDialogFragment extends DialogFragment
 		TypedValue typedValue = new TypedValue();
 		FragmentActivity activity = requireActivity();
 		OsmandApplication app = (OsmandApplication) activity.getApplication();
-		boolean nightMode = app.getDaynightHelper().isNightModeForMapControls();
+		boolean nightMode = isNightMode();
 		context = new ContextThemeWrapper(activity, !nightMode ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme);
 		Theme theme = context.getTheme();
 		theme.resolveAttribute(android.R.attr.textColorPrimary, typedValue, true);
@@ -132,14 +133,13 @@ public class DashboardSettingsDialogFragment extends DialogFragment
 		subtextView.setText(description);
 		final CompoundButton compoundButton = (CompoundButton) view.findViewById(R.id.toggle_item);
 		compoundButton.setChecked(pref.get());
-		textView.setTextColor(pref.get() ? textColorPrimary : textColorSecondary);
-		compoundButton.setOnCheckedChangeListener(
-				new CompoundButton.OnCheckedChangeListener() {
-					@Override
-					public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
-						textView.setTextColor(b ? textColorPrimary : textColorSecondary);
-					}
-				});
+		view.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				compoundButton.setChecked(!compoundButton.isChecked());
+			}
+		});
+		UiUtilities.setupCompoundButton(compoundButton, isNightMode(), UiUtilities.CompoundButtonType.GLOBAL);
 		return view;
 	}
 
@@ -244,6 +244,7 @@ public class DashboardSettingsDialogFragment extends DialogFragment
 	}
 	
 	private class DashViewHolder {
+		final View view;
 		final TextView textView;
 		final CompoundButton compoundButton;
 		final TextView numberOfRowsTextView;
@@ -252,6 +253,7 @@ public class DashboardSettingsDialogFragment extends DialogFragment
 		private DashFragmentAdapter dashFragmentAdapter;
 
 		public DashViewHolder(DashFragmentAdapter dashFragmentAdapter, View view, Context ctx) {
+			this.view = view;
 			this.dashFragmentAdapter = dashFragmentAdapter;
 			this.numberOfRowsTextView = (TextView) view.findViewById(R.id.numberOfRowsTextView);
 			this.textView = (TextView) view.findViewById(R.id.text);
@@ -277,9 +279,16 @@ public class DashboardSettingsDialogFragment extends DialogFragment
 					textColorSecondary);
 			this.position = position;
 
+			view.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					compoundButton.setChecked(!compoundButton.isChecked());
+				}
+			});
 			compoundButton.setChecked(dashFragmentAdapter.isChecked(position));
 			compoundButton.setTag(this);
 			compoundButton.setOnCheckedChangeListener(dashFragmentAdapter.onTurnedOnOffListener);
+			UiUtilities.setupCompoundButton(compoundButton, isNightMode(), UiUtilities.CompoundButtonType.GLOBAL);
 
 			numberOfRowsTextView.setTag(this);
 			numberOfRowsTextView.setOnClickListener(dashFragmentAdapter.onNumberClickListener);
@@ -287,4 +296,8 @@ public class DashboardSettingsDialogFragment extends DialogFragment
 		
 
 	}
+	
+	private boolean isNightMode() {
+		return mapActivity.getMyApplication().getDaynightHelper().isNightModeForMapControls();
+	}
 }

OsmAnd/src/net/osmand/plus/download/IndexItem.java

@@ -89,7 +89,7 @@ public class IndexItem implements Comparable<IndexItem> {
 	}
 
 	public String getSizeDescription(Context ctx) {
-		return ctx.getString(R.string.ltr_or_rtl_combine_via_colon, size, "MB");
+		return ctx.getString(R.string.ltr_or_rtl_combine_via_space, size, "MB");
 	}
 	
 
@@ -247,4 +247,4 @@ public class IndexItem implements Comparable<IndexItem> {
 	}
 
 
-}
+}

OsmAnd/src/net/osmand/plus/helpers/LockHelper.java

@@ -13,6 +13,7 @@ import android.os.PowerManager.WakeLock;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
+import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.OsmandSettings.CommonPreference;
@@ -65,6 +66,16 @@ public class LockHelper implements SensorEventListener {
 				unlockEvent();
 			}
 		};
+		OsmAndAppCustomizationListener customizationListener = new OsmAndAppCustomizationListener() {
+			@Override
+			public void onOsmAndSettingsCustomized() {
+				OsmandSettings settings = app.getSettings();
+				turnScreenOnEnabled = settings.TURN_SCREEN_ON_ENABLED;
+				turnScreenOnTime = settings.TURN_SCREEN_ON_TIME_INT;
+				turnScreenOnSensor = settings.TURN_SCREEN_ON_SENSOR;
+			}
+		};
+		app.getAppCustomization().addListener(customizationListener);
 		app.getRoutingHelper().getVoiceRouter().addVoiceMessageListener(voiceMessageListener);
 	}
 

OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java

@@ -292,7 +292,7 @@ public class PlanRouteFragment extends BaseOsmAndFragment implements OsmAndLocat
 				}
 				Object item = adapter.getItem(pos);
 				if (item instanceof Location) {
-					markersHelper.setStartFromMyLocation(!mapActivity.getMyApplication().getSettings().ROUTE_MAP_MARKERS_START_MY_LOC.get());
+					markersHelper.setStartFromMyLocation(!markersHelper.isStartFromMyLocation());
 				} else if (item instanceof MapMarker) {
 					MapMarker marker = (MapMarker) item;
 					selectedCount = marker.selected ? selectedCount - 1 : selectedCount + 1;

OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java

@@ -1512,6 +1512,13 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 				final View view = UiUtilities.getInflater(mapActivity, nightMode).inflate(R.layout.close_measurement_tool_dialog, null);
 				final SwitchCompat showOnMapToggle = (SwitchCompat) view.findViewById(R.id.toggle_show_on_map);
 
+				view.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						showOnMapToggle.setChecked(!showOnMapToggle.isChecked());
+					}
+				});
+
 				builder.setView(view);
 				builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 					@Override
@@ -1531,6 +1538,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 						}
 					}
 				});
+				UiUtilities.setupCompoundButton(showOnMapToggle, nightMode, UiUtilities.CompoundButtonType.GLOBAL);
 			} else {
 				builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 					@Override

OsmAnd/src/net/osmand/plus/monitoring/LiveMonitoringHelper.java

@@ -1,6 +1,5 @@
 package net.osmand.plus.monitoring;
 
-import android.content.Context;
 import android.os.AsyncTask;
 
 import net.osmand.PlatformUtil;
@@ -24,23 +23,25 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-public class LiveMonitoringHelper  {
-	
-	protected Context ctx;
-	private OsmandSettings settings;
-	private long lastTimeUpdated;
-	private LatLon lastPoint;
+public class LiveMonitoringHelper {
+
 	private final static Log log = PlatformUtil.getLog(LiveMonitoringHelper.class);
+
+	private OsmandApplication app;
+
 	private ConcurrentLinkedQueue<LiveMonitoringData> queue;
+
+	private LatLon lastPoint;
+	private long lastTimeUpdated;
 	private boolean started = false;
 
-	public LiveMonitoringHelper(Context ctx){
-		this.ctx = ctx;
-		settings = ((OsmandApplication) ctx.getApplicationContext()).getSettings();
+	public LiveMonitoringHelper(OsmandApplication app) {
+		this.app = app;
 		queue = new ConcurrentLinkedQueue<>();
 	}
-	
-	public boolean isLiveMonitoringEnabled(){
+
+	public boolean isLiveMonitoringEnabled() {
+		OsmandSettings settings = app.getSettings();
 		return settings.LIVE_MONITORING.get() && (settings.SAVE_TRACK_TO_GPX.get() || settings.SAVE_GLOBAL_TRACK_TO_GPX.get());
 	}
 
@@ -50,6 +51,7 @@ public class LiveMonitoringHelper  {
 		if (location != null && isLiveMonitoringEnabled()
 				&& OsmAndLocationProvider.isNotSimulatedLocation(location)
 				&& OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class) != null) {
+			OsmandSettings settings = app.getSettings();
 			if (locationTime - lastTimeUpdated > settings.LIVE_MONITORING_INTERVAL.get()) {
 				record = true;
 			}
@@ -112,10 +114,11 @@ public class LiveMonitoringHelper  {
 		@Override
 		protected Void doInBackground(ConcurrentLinkedQueue<LiveMonitoringData>... concurrentLinkedQueues) {
 			while (isLiveMonitoringEnabled()) {
+				int maxSendInterval = app.getSettings().LIVE_MONITORING_MAX_INTERVAL_TO_SEND.get();
 				for (ConcurrentLinkedQueue queue : concurrentLinkedQueues) {
 					if (!queue.isEmpty()) {
 						LiveMonitoringData data = (LiveMonitoringData) queue.peek();
-						if (!(System.currentTimeMillis() - data.time > settings.LIVE_MONITORING_MAX_INTERVAL_TO_SEND.get())) {
+						if (!(System.currentTimeMillis() - data.time > maxSendInterval)) {
 							sendData(data);
 						} else {
 							queue.poll();
@@ -128,10 +131,52 @@ public class LiveMonitoringHelper  {
 	}
 
 	public void sendData(LiveMonitoringData data) {
-		String st = settings.LIVE_MONITORING_URL.get();
+		String urlStr = getLiveUrl(data);
+		try {
+			// Parse the URL and let the URI constructor handle proper encoding of special characters such as spaces
+			URL url = new URL(urlStr);
+			HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
+			URI uri = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(),
+					url.getPath(), url.getQuery(), url.getRef());
+
+			urlConnection.setConnectTimeout(15000);
+			urlConnection.setReadTimeout(15000);
+
+			log.info("Monitor " + uri);
+
+			if (urlConnection.getResponseCode() / 100 != 2) {
+
+				String msg = urlConnection.getResponseCode() + " : " + //$NON-NLS-1$//$NON-NLS-2$
+						urlConnection.getResponseMessage();
+				log.error("Error sending monitor request: " + msg);
+			} else {
+				queue.poll();
+				InputStream is = urlConnection.getInputStream();
+				StringBuilder responseBody = new StringBuilder();
+				if (is != null) {
+					BufferedReader in = new BufferedReader(new InputStreamReader(is, "UTF-8")); //$NON-NLS-1$
+					String s;
+					while ((s = in.readLine()) != null) {
+						responseBody.append(s);
+						responseBody.append("\n"); //$NON-NLS-1$
+					}
+					is.close();
+				}
+				log.info("Monitor response (" + urlConnection.getHeaderField("Content-Type") + "): " + responseBody.toString());
+			}
+
+			urlConnection.disconnect();
+
+		} catch (Exception e) {
+			log.error("Failed connect to " + urlStr + ": " + e.getMessage(), e);
+		}
+	}
+
+	private String getLiveUrl(LiveMonitoringData data) {
+		String st = app.getSettings().LIVE_MONITORING_URL.get();
 		List<String> prm = new ArrayList<String>();
 		int maxLen = 0;
-		for(int i = 0; i < 7; i++) {
+		for (int i = 0; i < 7; i++) {
 			boolean b = st.contains("{"+i+"}");
 			if(b) {
 				maxLen = i;
@@ -165,45 +210,6 @@ public class LiveMonitoringHelper  {
 				break;
 			}
 		}
-		String urlStr = MessageFormat.format(st, prm.toArray());
-		try {
-
-			// Parse the URL and let the URI constructor handle proper encoding of special characters such as spaces
-			URL url = new URL(urlStr);
-			HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
-			URI uri = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(),
-						url.getPath(), url.getQuery(), url.getRef());
-
-			urlConnection.setConnectTimeout(15000);
-			urlConnection.setReadTimeout(15000);
-
-			log.info("Monitor " + uri);
-
-			if (urlConnection.getResponseCode()/100 != 2) {
-
-				String msg = urlConnection.getResponseCode() + " : " + //$NON-NLS-1$//$NON-NLS-2$
-						urlConnection.getResponseMessage();
-				log.error("Error sending monitor request: " +  msg);
-			} else {
-				queue.poll();
-				InputStream is = urlConnection.getInputStream();
-				StringBuilder responseBody = new StringBuilder();
-				if (is != null) {
-					BufferedReader in = new BufferedReader(new InputStreamReader(is, "UTF-8")); //$NON-NLS-1$
-					String s;
-					while ((s = in.readLine()) != null) {
-						responseBody.append(s);
-						responseBody.append("\n"); //$NON-NLS-1$
-					}
-					is.close();
-				}
-				log.info("Monitor response (" + urlConnection.getHeaderField("Content-Type") + "): " + responseBody.toString());
-			}
-
-			urlConnection.disconnect();
-			
-		} catch (Exception e) {
-			log.error("Failed connect to " + urlStr + ": " + e.getMessage(), e);
-		}
+		return MessageFormat.format(st, prm.toArray());
 	}
 }

OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java

@@ -39,6 +39,7 @@ import net.osmand.data.QuadPointDouble;
 import net.osmand.data.QuadRect;
 import net.osmand.data.RotatedTileBox;
 import net.osmand.map.MapTileDownloader;
+import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
@@ -121,6 +122,15 @@ public class MapRenderRepositories {
 		this.renderer = new OsmandRenderer(context);
 		handler = new Handler(Looper.getMainLooper());
 		prefs = context.getSettings();
+
+		OsmAndAppCustomizationListener customizationListener = new OsmAndAppCustomizationListener() {
+			@Override
+			public void onOsmAndSettingsCustomized() {
+				prefs = MapRenderRepositories.this.context.getSettings();
+				clearCache();
+			}
+		};
+		context.getAppCustomization().addListener(customizationListener);
 	}
 
 	public Context getContext() {
@@ -153,11 +163,6 @@ public class MapRenderRepositories {
 		return prevBmpLocation;
 	}
 
-	public void updateSettings() {
-		prefs = context.getSettings();
-		clearCache();
-	}
-
 	public synchronized void closeConnection(String file) {
 		LinkedHashMap<String, BinaryMapIndexReader> cpfiles = new LinkedHashMap<String, BinaryMapIndexReader>(files);
 		BinaryMapIndexReader bmir = cpfiles.remove(file);

OsmAnd/src/net/osmand/plus/render/TextRenderer.java

@@ -317,7 +317,7 @@ public class TextRenderer {
 			float coef = rc.getDensityValue(rc.screenDensityRatio * rc.textScale);
 			Bitmap ico = RenderingIcons.getIcon(context, sr, true);
 			if (ico != null) {
-				float left = text.centerX - ico.getWidth() / 2 * coef;// - 0.5f;
+				float left = text.centerX - ico.getWidth() / 2 * coef - 0.5f;
 				float top = text.centerY - ico.getHeight() / 2 * coef -  paintText.descent() * 1.5f;
 				if(rc.screenDensityRatio != 1f){
 					RectF rf = new RectF(left, top, left + ico.getWidth() * coef, 

OsmAnd/src/net/osmand/plus/routepreparationmenu/AddPointBottomSheetDialog.java

@@ -319,8 +319,8 @@ public class AddPointBottomSheetDialog extends MenuBottomSheetDialogFragment {
 		final View switchStartAndEndView = View.inflate(new ContextThemeWrapper(getContext(), themeRes), R.layout.bottom_sheet_item_simple_56dp, null);
 		TextView title = (TextView) switchStartAndEndView.findViewById(R.id.title);
 
-		String start = getString(R.string.route_start_point).toLowerCase();
-		String destination = getString(R.string.route_descr_destination).toLowerCase();
+		String start = getString(R.string.route_start_point);
+		String destination = getString(R.string.route_descr_destination);
 		String titleS = getString(R.string.swap_two_places, start, destination);
 		SpannableString titleSpan = new SpannableString(titleS);
 		int startIndex = titleS.indexOf(start);

OsmAnd/src/net/osmand/plus/routepreparationmenu/RoutingOptionsHelper.java

@@ -63,13 +63,11 @@ public class RoutingOptionsHelper {
 	public static final String DRIVING_STYLE = "driving_style";
 
 	private OsmandApplication app;
-	private OsmandSettings settings;
 
 	private Map<ApplicationMode, RouteMenuAppModes> modes = new HashMap<>();
 
 	public RoutingOptionsHelper(OsmandApplication application) {
 		app = application;
-		settings = app.getSettings();
 	}
 
 	private void addRouteMenuAppModes(ApplicationMode am, List<String> routingParameters) {
@@ -104,6 +102,7 @@ public class RoutingOptionsHelper {
 	}
 
 	public void switchMusic() {
+		OsmandSettings settings = app.getSettings();
 		boolean mt = !settings.INTERRUPT_MUSIC.get();
 		settings.INTERRUPT_MUSIC.set(mt);
 	}
@@ -311,6 +310,7 @@ public class RoutingOptionsHelper {
 	}
 
 	public void showLocalRoutingParameterGroupDialog(final LocalRoutingParameterGroup group, final MapActivity mapActivity, final OnClickListener listener) {
+		OsmandSettings settings = app.getSettings();
 		final ContextMenuAdapter adapter = new ContextMenuAdapter();
 		int i = 0;
 		int selectedIndex = -1;
@@ -364,6 +364,7 @@ public class RoutingOptionsHelper {
 				.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
+						OsmandSettings settings = app.getSettings();
 						int position = selectedPosition[0];
 						if (position >= 0 && position < group.getRoutingParameters().size()) {
 							for (int i = 0; i < group.getRoutingParameters().size(); i++) {

OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java

@@ -8,6 +8,7 @@ import net.osmand.data.LatLon;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.GPXUtilities.GPXFile;
 import net.osmand.plus.NavigationService;
+import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener;
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
@@ -95,11 +96,19 @@ public class RoutingHelper {
 	public RoutingHelper(OsmandApplication context){
 		this.app = context;
 		settings = context.getSettings();
-		voiceRouter = new VoiceRouter(this, settings);
+		voiceRouter = new VoiceRouter(this);
 		provider = new RouteProvider();
 		transportRoutingHelper = context.getTransportRoutingHelper();
 		transportRoutingHelper.setRoutingHelper(this);
 		setAppMode(settings.APPLICATION_MODE.get());
+
+		OsmAndAppCustomizationListener customizationListener = new OsmAndAppCustomizationListener() {
+			@Override
+			public void onOsmAndSettingsCustomized() {
+				settings = app.getSettings();
+			}
+		};
+		app.getAppCustomization().addListener(customizationListener);
 	}
 
 	public TransportRoutingHelper getTransportRoutingHelper() {
@@ -825,21 +834,21 @@ public class RoutingHelper {
 //		return false;
 //	}
 
-	public synchronized String getCurrentName(TurnType[] next){
-		NextDirectionInfo n = getNextRouteDirectionInfo(new NextDirectionInfo(), true);
+	public synchronized String getCurrentName(TurnType[] next, NextDirectionInfo n){
 		Location l = lastFixedLocation;
 		float speed = 0;
 		if(l != null && l.hasSpeed()) {
 			speed = l.getSpeed();
 		}
+		if(next != null) {
+			next[0] = n.directionInfo.getTurnType();
+		}
 		if(n.distanceTo > 0  && n.directionInfo != null && !n.directionInfo.getTurnType().isSkipToSpeak() &&
 				voiceRouter.isDistanceLess(speed, n.distanceTo, voiceRouter.PREPARE_DISTANCE * 0.75f, 0f)) {
 			String nm = n.directionInfo.getStreetName();
-//			String rf = n.directionInfo.getRef();
+			String rf = n.directionInfo.getRef();
 			String dn = n.directionInfo.getDestinationName();
-			if(next != null) {
-				next[0] = n.directionInfo.getTurnType();
-			}
+
 			return formatStreetName(nm, null, dn, "»");
 		}
 		RouteSegmentResult rs = getCurrentSegmentResult();

OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java

@@ -8,6 +8,8 @@ import net.osmand.Location;
 import net.osmand.binary.RouteDataObject;
 import net.osmand.data.PointDescription;
 import net.osmand.plus.ApplicationMode;
+import net.osmand.plus.OsmAndAppCustomization.OsmAndAppCustomizationListener;
+import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
 import net.osmand.plus.routing.AlarmInfo.AlarmInfoType;
@@ -46,9 +48,11 @@ public class VoiceRouter {
 	public static final String FROM_STREET_NAME = "fromStreetName";
 	public static final String FROM_DEST = "fromDest";
 
-	protected final RoutingHelper router;
 	protected static CommandPlayer player;
-	protected final OsmandSettings settings;
+
+	protected final OsmandApplication app;
+	protected final RoutingHelper router;
+	protected OsmandSettings settings;
 
 	private static int currentStatus = STATUS_UNKNOWN;
 	private static boolean playedAndArriveAtTarget = false;
@@ -84,9 +88,18 @@ public class VoiceRouter {
 
 	private List<WeakReference<VoiceMessageListener>> voiceMessageListeners = new ArrayList<>();
     
-	VoiceRouter(RoutingHelper router, final OsmandSettings settings) {
+	VoiceRouter(RoutingHelper router) {
 		this.router = router;
-		this.settings = settings;
+		this.app = router.getApplication();
+		this.settings = app.getSettings();
+
+		OsmAndAppCustomizationListener customizationListener = new OsmAndAppCustomizationListener() {
+			@Override
+			public void onOsmAndSettingsCustomized() {
+				settings = app.getSettings();
+			}
+		};
+		app.getAppCustomization().addListener(customizationListener);
 	}
 	
 	public void setPlayer(CommandPlayer player) {
@@ -695,10 +708,9 @@ public class VoiceRouter {
 			String tParam = getTurnType(next.getTurnType());
 			boolean isPlay = true;
 			ExitInfo exitInfo = next.getExitInfo();
-			String lang = player.getLanguage();
 			if (tParam != null) {
 				if (exitInfo != null) {
-					p.takeExit(tParam, dist, getSpeakableExitName(next, exitInfo, true));
+					p.takeExit(tParam, dist, Integer.parseInt(exitInfo.getRef()), getSpeakableExitName(next, exitInfo, true));
 				} else {
 					p.turn(tParam, dist, getSpeakableStreetName(currentSegment, next, true));
 				}
@@ -769,10 +781,9 @@ public class VoiceRouter {
 			String tParam = getTurnType(next.getTurnType());
 			ExitInfo exitInfo = next.getExitInfo();
 			boolean isplay = true;
-			String lang = player.getLanguage();
 			if (tParam != null) {
 				if (exitInfo != null) {
-					p.takeExit(tParam, getSpeakableExitName(next, exitInfo, !suppressDest));
+					p.takeExit(tParam, Integer.parseInt(exitInfo.getRef()), getSpeakableExitName(next, exitInfo, !suppressDest));
 				} else {
 					p.turn(tParam, getSpeakableStreetName(currentSegment, next, !suppressDest));
 				}