Merge branch 'master' of ssh://github.com/osmandapp/Osmand into CoordinateInputImprovements

2018-06-25 10:25:02 +03:00 · 2018-06-25 10:25:02 +03:00 · 4ea9e5731b
commit 4ea9e5731b
parent 2cf1f35581 ab9c9ad4dd
29 changed files with 391 additions and 126 deletions
--- a/OsmAnd-telegram/res/layout/fragment_live_now_tab.xml
+++ b/OsmAnd-telegram/res/layout/fragment_live_now_tab.xml
@ -9,6 +9,8 @@
 		android:id="@+id/recycler_view"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
+		android:clipToPadding="false"
+		android:paddingBottom="@dimen/list_view_bottom_padding"
 		android:scrollbars="vertical"/>

 </LinearLayout>
--- a/OsmAnd-telegram/res/values/dimens.xml
+++ b/OsmAnd-telegram/res/values/dimens.xml
@ -25,6 +25,8 @@
 	<dimen name="list_item_content_margin">64dp</dimen>
 	<dimen name="list_item_bottom_margin">3dp</dimen>

+	<dimen name="list_view_bottom_padding">52dp</dimen>
+
 	<dimen name="card_divider_bottom_margin">6dp</dimen>

 	<dimen name="image_button_padding">12dp</dimen>
--- a/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt
@ -77,21 +77,10 @@ class TelegramHelper private constructor() {

 	fun getChatList(): TreeSet<OrderedChat> {
 		synchronized(chatList) {
-			return TreeSet<OrderedChat>(chatList)
+			return TreeSet(chatList.filter { !it.isChannel })
 		}
 	}

-	fun getChatIndex(chatId: Long): Int {
-		synchronized(chatList) {
-			for ((i, chat) in chatList.withIndex()) {
-				if (chat.chatId == chatId) {
-					return i
-				}
-			}
-		}
-		return -1
-	}
-
 	fun getChatTitles(): List<String> {
 		return chatTitles.keys().toList()
 	}
@ -149,6 +138,10 @@ class TelegramHelper private constructor() {
 		}
 	}

+	private fun isChannel(chat: TdApi.Chat): Boolean {
+		return chat.type is TdApi.ChatTypeSupergroup && (chat.type as TdApi.ChatTypeSupergroup).isChannel
+	}
+
 	enum class TelegramAuthenticationParameterType {
 		PHONE_NUMBER,
 		CODE,
@ -363,6 +356,10 @@ class TelegramHelper private constructor() {
 			for (chatTitle in chatTitles) {
 				val chatId = this.chatTitles[chatTitle]
 				if (chatId != null) {
+					val chat = chats[chatId]
+					if (chat == null || isChannel(chat)) {
+						return
+					}
 					client?.send(TdApi.SearchChatRecentLocationMessages(chatId, CHAT_LIVE_USERS_LIMIT)) { obj ->
 						when (obj.constructor) {
 							TdApi.Error.CONSTRUCTOR -> {
@ -498,14 +495,16 @@ class TelegramHelper private constructor() {

 	private fun setChatOrder(chat: TdApi.Chat, order: Long) {
 		synchronized(chatList) {
+			val isChannel = isChannel(chat)
+
 			if (chat.order != 0L) {
-				chatList.remove(OrderedChat(chat.order, chat.id))
+				chatList.remove(OrderedChat(chat.order, chat.id, isChannel))
 			}

 			chat.order = order

 			if (chat.order != 0L) {
-				chatList.add(OrderedChat(chat.order, chat.id))
+				chatList.add(OrderedChat(chat.order, chat.id, isChannel))
 			}
 		}
 	}
@ -598,7 +597,7 @@ class TelegramHelper private constructor() {
 		listener?.onTelegramStatusChanged(prevAuthState, newAuthState)
 	}

-	class OrderedChat internal constructor(internal val order: Long, internal val chatId: Long) : Comparable<OrderedChat> {
+	class OrderedChat internal constructor(internal val order: Long, internal val chatId: Long, internal val isChannel: Boolean) : Comparable<OrderedChat> {

 		override fun compareTo(other: OrderedChat): Int {
 			if (this.order != other.order) {
@ -662,40 +661,38 @@ class TelegramHelper private constructor() {
 					val updateNewChat = obj as TdApi.UpdateNewChat
 					val chat = updateNewChat.chat
 					synchronized(chat) {
-						if (chat.type !is TdApi.ChatTypeSupergroup || !(chat.type as TdApi.ChatTypeSupergroup).isChannel) {
-							chats[chat.id] = chat
-							val localPhoto = chat.photo?.small?.local
-							val hasLocalPhoto = if (localPhoto != null) {
-								localPhoto.canBeDownloaded && localPhoto.isDownloadingCompleted && localPhoto.path.isNotEmpty()
-							} else {
-								false
-							}
-							if (!hasLocalPhoto) {
-								val remotePhoto = chat.photo?.small?.remote
-								if (remotePhoto != null && remotePhoto.id.isNotEmpty()) {
-									downloadChatFilesMap[remotePhoto.id] = chat
-									client!!.send(TdApi.GetRemoteFile(remotePhoto.id, null)) { obj ->
-										when (obj.constructor) {
-											TdApi.Error.CONSTRUCTOR -> {
-												val error = obj as TdApi.Error
-												val code = error.code
-												if (code != IGNORED_ERROR_CODE) {
-													listener?.onTelegramError(code, error.message)
-												}
+						chats[chat.id] = chat
+						val localPhoto = chat.photo?.small?.local
+						val hasLocalPhoto = if (localPhoto != null) {
+							localPhoto.canBeDownloaded && localPhoto.isDownloadingCompleted && localPhoto.path.isNotEmpty()
+						} else {
+							false
+						}
+						if (!hasLocalPhoto) {
+							val remotePhoto = chat.photo?.small?.remote
+							if (remotePhoto != null && remotePhoto.id.isNotEmpty()) {
+								downloadChatFilesMap[remotePhoto.id] = chat
+								client!!.send(TdApi.GetRemoteFile(remotePhoto.id, null)) { obj ->
+									when (obj.constructor) {
+										TdApi.Error.CONSTRUCTOR -> {
+											val error = obj as TdApi.Error
+											val code = error.code
+											if (code != IGNORED_ERROR_CODE) {
+												listener?.onTelegramError(code, error.message)
 											}
-											TdApi.File.CONSTRUCTOR -> {
-												val file = obj as TdApi.File
-												client!!.send(TdApi.DownloadFile(file.id, 10), defaultHandler)
-											}
-											else -> listener?.onTelegramError(-1, "Receive wrong response from TDLib: $obj")
 										}
+										TdApi.File.CONSTRUCTOR -> {
+											val file = obj as TdApi.File
+											client!!.send(TdApi.DownloadFile(file.id, 10), defaultHandler)
+										}
+										else -> listener?.onTelegramError(-1, "Receive wrong response from TDLib: $obj")
 									}
 								}
 							}
-							val order = chat.order
-							chat.order = 0
-							setChatOrder(chat, order)
 						}
+						val order = chat.order
+						chat.order = 0
+						setChatOrder(chat, order)
 					}
 					updateChatTitles()
 					listener?.onTelegramChatsChanged()
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/LiveNowTabFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/LiveNowTabFragment.kt
@ -1,5 +1,7 @@
 package net.osmand.telegram.ui

+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v7.widget.LinearLayoutManager
@ -10,6 +12,7 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.Switch
 import android.widget.TextView
+import android.widget.Toast
 import net.osmand.telegram.R
 import net.osmand.telegram.TelegramApplication
 import net.osmand.telegram.helpers.TelegramHelper.TelegramAuthorizationState
@ -27,6 +30,8 @@ class LiveNowTabFragment : Fragment(), TelegramListener {
 		get() = activity?.application as TelegramApplication

 	private val telegramHelper get() = app.telegramHelper
+	private val osmandHelper get() = app.osmandHelper
+	private val settings get() = app.settings

 	private val adapter = LiveNowListAdapter()

@ -39,9 +44,23 @@ class LiveNowTabFragment : Fragment(), TelegramListener {
 		return mainView
 	}

+	override fun onResume() {
+		super.onResume()
+		updateList()
+	}
+
 	override fun onTelegramStatusChanged(prevTelegramAuthorizationState: TelegramAuthorizationState,
 										 newTelegramAuthorizationState: TelegramAuthorizationState) {
-		// TODO: update list
+		when (newTelegramAuthorizationState) {
+			TelegramAuthorizationState.READY -> {
+				updateList()
+			}
+			TelegramAuthorizationState.CLOSED,
+			TelegramAuthorizationState.UNKNOWN -> {
+				adapter.items = emptyList()
+			}
+			else -> Unit
+		}
 	}

 	override fun onTelegramChatsRead() {
@ -107,6 +126,70 @@ class LiveNowTabFragment : Fragment(), TelegramListener {
 		}

 		override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+			val lastItem = position == itemCount - 1
+			val item = items[position]
+			if (item is TdApi.Chat && holder is ChatViewHolder) {
+				val nextItemIsContact = !lastItem && items[position + 1] is TdApi.User
+				val chatTitle = item.title
+
+				var drawable: Drawable? = null
+				var bitmap: Bitmap? = null
+				val chatPhoto = item.photo?.small
+				if (chatPhoto != null && chatPhoto.local.path.isNotEmpty()) {
+					bitmap = app.uiUtils.getCircleBitmap(chatPhoto.local.path)
+				}
+				if (bitmap == null) {
+					drawable = app.uiUtils.getThemedIcon(R.drawable.ic_group)
+				}
+				if (bitmap != null) {
+					holder.icon?.setImageBitmap(bitmap)
+				} else {
+					holder.icon?.setImageDrawable(drawable)
+				}
+				holder.title?.text = chatTitle
+				holder.description?.text = "Chat description" // FIXME
+				holder.imageButton?.setImageDrawable(app.uiUtils.getThemedIcon(R.drawable.ic_overflow_menu_white))
+				holder.imageButton?.setOnClickListener {
+					Toast.makeText(context, "Options", Toast.LENGTH_SHORT).show() // FIXME
+				}
+				holder.showOnMapRow?.setOnClickListener {
+					holder.showOnMapSwitch?.isChecked = !holder.showOnMapSwitch?.isChecked!!
+				}
+				holder.showOnMapSwitch?.setOnCheckedChangeListener(null)
+				holder.showOnMapSwitch?.isChecked = settings.isShowingChatOnMap(chatTitle)
+				holder.showOnMapSwitch?.setOnCheckedChangeListener { _, isChecked ->
+					settings.showChatOnMap(chatTitle, isChecked)
+					if (settings.hasAnyChatToShowOnMap()) {
+						if (osmandHelper.isOsmandNotInstalled()) {
+							if (isChecked) {
+								activity?.let {
+									MainActivity.OsmandMissingDialogFragment().show(it.supportFragmentManager, null)
+								}
+							}
+						} else {
+							if (isChecked) {
+								app.showLocationHelper.showChatMessages(chatTitle)
+							} else {
+								app.showLocationHelper.hideChatMessages(chatTitle)
+							}
+							app.showLocationHelper.startShowingLocation()
+						}
+					} else {
+						app.showLocationHelper.stopShowingLocation()
+						if (!isChecked) {
+							app.showLocationHelper.hideChatMessages(chatTitle)
+						}
+					}
+				}
+				holder.bottomDivider?.visibility = if (nextItemIsContact) View.VISIBLE else View.GONE
+				holder.bottomShadow?.visibility = if (lastItem) View.VISIBLE else View.GONE
+			} else if (item is TdApi.User && holder is ContactViewHolder) {
+				// telegramHelper.getUserPhotoPath(user)
+				holder.icon?.setImageDrawable(app.uiUtils.getThemedIcon(R.drawable.ic_group)) // FIXME
+				holder.title?.text = "${item.firstName} ${item.lastName}"
+				holder.description?.text = "User description" // FIXME
+				holder.bottomShadow?.visibility = if (lastItem) View.VISIBLE else View.GONE
+			}
 		}

 		override fun getItemCount() = items.size
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
@ -211,7 +211,7 @@ class MainActivity : AppCompatActivity(), TelegramListener {

 	override fun onTelegramChatChanged(chat: TdApi.Chat) {
 		runOnUi {
-			updateChat(chat)
+			updateChatsList()
 			listeners.forEach { it.get()?.onTelegramChatChanged(chat) }
 		}
 	}
@ -258,15 +258,6 @@ class MainActivity : AppCompatActivity(), TelegramListener {
 		chatViewAdapter.chats = chats
 	}

-	private fun updateChat(chat: TdApi.Chat) {
-		val chatIndex = telegramHelper.getChatIndex(chat.id)
-		if (chatIndex != -1) {
-			chatViewAdapter.notifyItemChanged(chatIndex)
-		} else {
-			updateChatsList()
-		}
-	}
-
 	fun loginTelegram() {
 		if (telegramHelper.getTelegramAuthorizationState() != TelegramAuthorizationState.CLOSED) {
 			telegramHelper.logout()
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@ -632,7 +632,7 @@ Punktaŭ maršrutu %2$s</string>
 \n 
 \nHlabaĺnyja dadzienyja (pamiž 70 ° na poŭnačy i 70 ° na poŭdni) hruntujucca na vymiarenniach SRTM (Shuttle Radar Topography Mission) i ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), dadzienych instrumientu vizualizacyi Terra, flahmanskaha spadarožnika sistemy nazirannia Ziamli ad NASA. ASTER — heta vynik sumiesnaj pracy NASA, ministerstva ekanomiki Japonii, ministerstva handliu i pramyslovaści Japonii (METI), ahienctva kasmičnych sistem Japonii (J-spacesystems).</string>
    <string name="map_widget_distancemeasurement">Vymiareńnie adlehłaścі</string>
-    <string name="audionotes_location_not_defined">Miescaznachodžańnie dla pryviazki natatki pakul jašče nie vyznačyłasia. «Vykarystać miescaznachodžańnie…» kab pryznačyć natatku ŭ vybranym miescy.</string>
+    <string name="audionotes_location_not_defined">Miescaznachodžannie dlia pryviazki natatki pakuĺ jašče nie vyznačylasia. «Vykarystać miescaznachodžańnie…» kab pryznačyć natatku ŭ vybranym miescy.</string>
    
    <string name="map_widget_audionotes">Aŭdyjo-natatkі</string>
    <string name="audionotes_plugin_description">Modul dla stvareńnia aŭdyjo/vіdea-natatak padčas padarožžaŭ, z dapamohaj vykarystańnia knopkі na ekranie mapy abo praz kantekstnaje meniu na lubym miescy na mapie.</string>
@ -1118,7 +1118,7 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
 	
 	<string name="shared_string_save_as_gpx">Zachavać jak novy GPX-fajl</string>
 	<string name="route_successfully_saved_at">Maršrut zachavany jak %1$s.</string>
-	<string name="filename_input">Imia fajla:</string>
+	<string name="filename_input">Nazva fajla:</string>
 	<string name="file_with_name_already_exist">Fajł z takoj nazvaj užo іsnuje.</string>
 	<string name="shared_string_save">Zachavać</string>
 	
@ -1630,7 +1630,7 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
 	<string name="poi_edit_title">Pravіć POI</string>
 	<string name="poi_create_title">Stvaryć POI</string>
 	<string name="poi_error_poi_not_found">Vuziel nie znojdzieny abo zručnasć (amenity) skladajecca z niekaĺkich vuzloŭ, što nie padtrymlivajecca.</string>
-	<string name="poi_remove_confirm_template">Vydalić {0} (dadać kamientar)?</string>
+	<string name="poi_remove_confirm_template">Vydalić {0} (kamientar)?</string>
 	<string name="poi_remove_title">Vydalić POI</string>
 	<string name="shared_string_delete">Vydalić</string>
 	<string name="poi_remove_success">POI vydalienaja</string>
@ -2963,7 +2963,7 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
 <string name="make_as_start_point">Zrabić pačatkovaj kropkaj</string>
    <string name="map_import_error">Pamyłka impartu mapy</string>
    <string name="map_imported_successfully">Mapa impartavanaja</string>
-    <string name="enter_the_file_name">Uviadzicie imia fajla.</string>
+    <string name="enter_the_file_name">Uviadzicie nazvu fajla.</string>
    <string name="enter_lon">Uviadzicie daŭhatu</string>
    <string name="enter_lat">Uviadzicie šyratu</string>
    <string name="enter_lat_and_lon">Uviadzicie šyratu i daŭhatu</string>
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@ -183,7 +183,7 @@
    <string name="map_widget_av_notes">Аўдыё/відэа-нататкі</string>
    <string name="osmand_srtm_short_description_80_chars">Модуль OsmAnd для пазасеткавых ізаліній вышынь</string>
    <string name="map_widget_distancemeasurement">Вымярэньне адлегласьці</string>
-    <string name="audionotes_location_not_defined">Месцазнаходжаньне для прывязкі нататкі пакуль яшчэ не вызначылася. «Выкарыстаць месцазнаходжаньне…» каб прызначыць нататку ў выбраным месцы.</string>
+    <string name="audionotes_location_not_defined">Месцазнаходжанне для прывязкі нататкі пакуль яшчэ не вызначылася. «Выкарыстаць месцазнаходжаньне…» каб прызначыць нататку ў выбраным месцы.</string>
    
    <string name="map_widget_audionotes">Аўдыё-нататкі</string>
    <string name="audionotes_plugin_description">Модуль для стварэньня аўдыё/відэа-нататак падчас падарожжаў, з дапамогай выкарыстаньня кнопкі на экране мапы або праз кантэкстнае мэню на любым месцы на мапе.</string>
@ -653,7 +653,7 @@
 	<string name="select_search_position">Пачатак:</string>
 	<string name="context_menu_item_search">Шукаць навокал</string>
 	<string name="route_successfully_saved_at">Маршрут захаваны як \'%1$s\'.</string>
-	<string name="filename_input">Імя файла: </string>
+	<string name="filename_input">Назва файла:</string>
 	<string name="file_with_name_already_exist">Файл з такой назвай ужо існуе.</string>
 	
 	<string name="local_index_upload_gpx_description">Адаслаць GPX-файлы ў OSM-супальнасць для паляпшэння мап.</string>
@ -1149,7 +1149,7 @@
 	<string name="poi_edit_title">Правіць POI</string>
 	<string name="poi_create_title">Стварыць POI</string>
 	<string name="poi_error_poi_not_found">Вузел не знойдзены або зручнасць (amenity) складаецца з некалькіх вузлоў, што не падтрымліваецца.</string>
-	<string name="poi_remove_confirm_template">Выдаліць {0} (дадаць каментар)?</string>
+	<string name="poi_remove_confirm_template">Выдаліць {0} (каментар)?</string>
 	<string name="poi_remove_title">Выдаліць POI</string>
 	<string name="poi_remove_success">POI выдаленая</string>
 	<string name="poi_action_add">дадаць</string>
@ -3010,7 +3010,7 @@
 <string name="make_as_start_point">Зрабіць пачатковай кропкай</string>
    <string name="map_import_error">Памылка імпарту мапы</string>
    <string name="map_imported_successfully">Мапа імпартаваная</string>
-    <string name="enter_the_file_name">Увядзіце імя файла.</string>
+    <string name="enter_the_file_name">Увядзіце назву файла.</string>
    <string name="dd_mm_ss_format">DD°MM\'SS\"</string>
 	<string name="dd_dddddd_format">DD,DDDDDD°</string>
 	<string name="dd_ddddd_format">DD,DDDDD°</string>
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@ -34,7 +34,7 @@
 \n
 \nDe globale data (mellem 70° nord og 70° syd) er baseret på målinger af SRTM (Shuttle Radar Topografi Mission) og ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), et billeddannende instrument ombord på Terra satellitten, flagskibet i NASAs Earth Observering system. ASTER er et samarbejde mellem NASA, Japans Ministry of Economy, Trade and Industry  (METI), og Japan Space Systems (J-spacesystems)."</string>
    <string name="map_widget_distancemeasurement">Afstandsmåling</string>
-    <string name="audionotes_location_not_defined">Placering der skal tilknyttes til noten er ikke defineret endnu. \'Brug placering …\' til at knytte en note til den angivne placering.</string>
+    <string name="audionotes_location_not_defined">Placering der skal tilknyttes til noten er ikke defineret endnu. “Brug placering…“ til at knytte en note til den angivne placering.</string>

    <string name="map_widget_audionotes">Lydnoter</string>
    <string name="audionotes_plugin_description">Lyd-/videonoter udvidelse giver funktionalitet til at tage lyd-/foto-/videonoter under en tur, enten ved hjælp en knap på skærmen, eller direkte fra kontekstmenuen for en position på kortet.</string>
@ -870,7 +870,7 @@ Proportional hukommelse %4$s MB (Android grænse %5$s MB, Dalvik %6$s MB).</stri
    <string name="transport_to_go_before">efterfølgende afstand</string>
    <string name="transport_route_distance">Rutelængde</string>
    <string name="transport">Transport</string>
-    <string name="poi_remove_confirm_template">Slet {0} (skriv kommentar)?</string>
+    <string name="poi_remove_confirm_template">Slet {0} (kommentar)?</string>
    
    <string name="osb_comment_dialog_error">Kunne ikke tilføje kommentar</string>
    <string name="osb_comment_dialog_author">Forfatternavn</string>
@ -3167,5 +3167,5 @@ Repræsenterer område: %1$s x %2$s</string>
    <string name="coord_input_edit_point">Rediger punkt</string>
    <string name="coord_input_add_point">Tilføj punkt</string>
    <string name="coord_input_save_as_track">Gem som spor</string>
-    <string name="coord_input_save_as_track_descr">%1$s punkter tilføjet. Indtast filnavn og klik på gem.</string>
+    <string name="coord_input_save_as_track_descr">%1$s punkter tilføjet. Indtast et filnavn og tryk på “Gem“.</string>
    </resources>
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@ -1308,7 +1308,7 @@
 	<string name="poi_material_plastic">Martial: Plastik</string>
 	<string name="poi_material_sandstone">Material: Sandstein</string>
 	<string name="poi_material_granite_stone">Material: Granit</string>
-	<string name="poi_material_metal_wood">Material: Metall; Holz</string>
+	<string name="poi_material_metal_wood">Material: Metall, Holz</string>
 	<string name="poi_material_glass">Material: Glas</string>
 	<string name="poi_material_bronze">Material: Bronze</string>
 	<string name="poi_material_earth">Material: Erde</string>
@ -3386,7 +3386,7 @@

 	<string name="poi_motorcycle_sales_yes">Verkauf</string>
 	<string name="poi_motorcycle_sales_no">Verkauf: nein</string>
-	<string name="poi_motorcycle_sales_yes_used">Verkauf: ja; gebraucht</string>
+	<string name="poi_motorcycle_sales_yes_used">Verkauf: ja, gebraucht</string>
 	<string name="poi_motorcycle_sales_used">Verkauf: gebraucht</string>
 	<string name="poi_motorcycle_rental_yes">Vermietung</string>
 	<string name="poi_motorcycle_rental_no">Vermietung: nein</string>
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@ -406,7 +406,7 @@
 	<string name="show_more_map_detail_descr">Einige Vektor-Daten (Straßen etc.) bereits bei kleineren Vergrößerungen zeigen.</string>
 	<string name="favourites_delete_multiple_succesful">Favorit(en) gelöscht.</string>
 	<string name="favorite_delete_multiple">Es soll(en) %1$d Favorit(en) und %2$d Favoriten-Gruppe(n) gelöscht werden. Fortfahren?</string>
-	<string name="favorite_home_category">Zu Hause</string>
+	<string name="favorite_home_category">Zuhause</string>
 	<string name="favorite_friends_category">Freunde</string>
 	<string name="favorite_places_category">Sehenswertes</string>
 	<string name="shared_string_others">Andere</string>
@ -571,7 +571,7 @@
 	<string name="select_build_to_install">OsmAnd-Build zur Installation auswählen</string>
 	<string name="contribution_activity">Versionen zur Installation</string>
 	<string name="gps_status_app_not_found">App \'GPS Status\' ist nicht installiert. Soll diese im Market gesucht werden werden?</string>
-	<string name="voice_is_not_available_msg">Keine Sprachansage verfügbar. Bitte unter \'Einstellungen\' → \'Allgemeine Einstellungen\' → \'Sprachansagen\' ein Sprachpaket auswählen oder herunterladen.</string>
+	<string name="voice_is_not_available_msg">Keine Sprachansage verfügbar. Bitte unter \'Einstellungen\' → \'Navigationseinstellungen\' → \'Sprachansagen\' ein Sprachpaket auswählen oder herunterladen.</string>
 	<string name="voice_is_not_available_title">Keine Sprachansage ausgewählt</string>
 	<string name="daynight_mode_day">Tag</string>
 	<string name="daynight_mode_night">Nacht</string>
@ -896,7 +896,7 @@
 	<string name="poi_edit_title">POI bearbeiten</string>
 	<string name="poi_create_title">POI erstellen</string>
 	<string name="poi_error_poi_not_found">Punkt wurde nicht gefunden oder das Objekt besteht aus mehreren Punkten, was noch nicht unterstützt wird.</string>
-	<string name="poi_remove_confirm_template">Sicher löschen: {0} (Kommentar eingeben)?</string>
+	<string name="poi_remove_confirm_template">Sicher löschen: {0} (Kommentar)?</string>
 	<string name="poi_remove_title">POI löschen</string>
 	<string name="shared_string_delete">Löschen</string>
 	<string name="poi_remove_success">POI wurde gelöscht</string>
@ -2291,7 +2291,7 @@ Derzeit sind nur {2} MB verfügbar.</string>
    <string name="custom_search">Benutzerdefinierte Suche</string>
    <string name="edit_filter">Kategorien bearbeiten</string>
    <string name="subcategories">Unterkategorien</string>
-    <string name="translit_names">Namen buchstabengetreu umschreiben</string>
+    <string name="translit_names">Namen transliteriren</string>
    <string name="translit_name_if_miss">Transliteration, wenn Namen in %1$s fehlen</string>
    <string name="rendering_value_light_brown_name">Hellbraun</string>
    <string name="rendering_value_dark_brown_name">Dunkelbraun</string>
@ -3065,5 +3065,5 @@ Abgedeckte Fläche: %1$s x %2$s</string>
    <string name="coord_input_edit_point">Punkt bearbeiten</string>
    <string name="coord_input_add_point">Punkt hinzufügen</string>
    <string name="coord_input_save_as_track">Als Track speichern</string>
-    <string name="coord_input_save_as_track_descr">Sie haben %1$s Punkte hinzugefügt. Geben Sie den Namen der Datei ein und klicken Sie auf Speichern.</string>
+    <string name="coord_input_save_as_track_descr">Sie haben %1$s Punkte hinzugefügt. Geben Sie den Dateinamen ein und klicken Sie auf \"Speichern\".</string>
    </resources>
--- a/OsmAnd/res/values-el/phrases.xml
+++ b/OsmAnd/res/values-el/phrases.xml
@ -2352,7 +2352,7 @@
 	<string name="poi_social_facility_for_drug_addicted">Τοξικομανείς</string>
 	<string name="poi_social_facility_for_unemployed">Άνεργοι</string>
 	<string name="poi_social_facility_for_diseased">Ασθενείς</string>
-	<string name="poi_social_facility_for_child_juvenile">Παιδιά, νέοι</string>
+	<string name="poi_social_facility_for_child_juvenile">Νεαρά παιδιά</string>

 	<string name="poi_theatre_genre_philharmonic">Φιλαρμονική</string>
 	<string name="poi_theatre_genre_musical">Μουσικά</string>
@ -3018,4 +3018,73 @@
 	<string name="poi_crossing_light_no">Φως διασταύρωσης: όχι</string>
 	<string name="poi_crossing_on_demand_yes">Διασταύρωση κατά παραγγελία</string>
 	<string name="poi_crossing_on_demand_no">Διασταύρωση κατά παραγγελία: όχι</string>
+	<string name="poi_crossing_saltire_yes">Σήμα σε διασταύρωση σχήματος Χ</string>
+	<string name="poi_crossing_saltire_no">Σήμα σε διασταύρωση σχήματος Χ: όχι</string>
+	<string name="poi_crossing_supervision_yes">Επίβλεψη διασταύρωσης</string>
+	<string name="poi_crossing_supervision_no">Επίβλεψη διασταύρωσης: όχι</string>
+	<string name="poi_crossing_supervision_attendant">Επίβλεψη διασταύρωσης: φύλακας</string>
+	<string name="poi_crossing_supervision_camera">Επίβλεψη διασταύρωσης: κάμερα</string>
+
+	<string name="poi_dispensing_yes">Ναι</string>
+	<string name="poi_dispensing_no">Διάθεση: όχι</string>
+
+	<string name="poi_aerodrome_type_international">Διεθνές</string>
+	<string name="poi_aerodrome_type_regional">Τοπικό</string>
+	<string name="poi_aerodrome_type_public">Δημόσιο</string>
+	<string name="poi_aerodrome_type_military">Στρατιωτικό</string>
+	<string name="poi_aerodrome_type_military_public">Στρατιωτικό/δημόσιο</string>
+	<string name="poi_aerodrome_type_private">Ιδιωτικό</string>
+
+	<string name="poi_valley_balka">Μπάλκα</string>
+
+	<string name="poi_ventilation_shaft">Φρεάτιο εξαερισμού</string>
+
+	<string name="poi_pump_type_beam_pump">Τύπος αντλίας: αντλία δέσμης</string>
+	<string name="poi_pump_type_india_mk_2_3">Τύπος αντλίας: Ινδική Mk II ή III&gt;</string>
+	<string name="poi_pump_type_gravity">Τύπος αντλίας: βαρύτητα</string>
+	<string name="poi_pump_style_modern">Μορφή αντλίας: σύγχρονη</string>
+	<string name="poi_pump_style_historic">Μορφή αντλίας: ιστορική</string>
+	<string name="poi_pump_status_ok">Κατάσταση αντλίας: Σε λειτουργία</string>
+	<string name="poi_pump_status_broken">Κατάσταση αντλίας: χαλασμένη</string>
+	<string name="poi_pump_status_locked">Κατάσταση αντλίας: κλειδωμένη</string>
+
+	<string name="poi_payment_troika_yes">Troika</string>
+	<string name="poi_payment_troika_no">Μη αποδεκτή η κάρτα Troika</string>
+
+	<string name="poi_telescope">Τηλεσκόπιο</string>
+	<string name="poi_telescope_type_optical">Οπτικό</string>
+	<string name="poi_telescope_type_radio">Ράδιο</string>
+	<string name="poi_telescope_type_gamma">Γάμμα</string>
+	<string name="poi_telescope_diameter">Διάμετρος</string>
+	<string name="poi_telescope_spectrum">Φάσμα</string>
+	<string name="poi_telescope_usage_education">Χρήση: εκπαίδευση</string>
+	<string name="poi_telescope_usage_espionage">Χρήση: κατασκοπεία</string>
+	<string name="poi_telescope_usage_research">Χρήση: αναζήτηση</string>
+
+	<string name="poi_observatory_type_espionage">Χρήση: κατασκοπεία</string>
+	<string name="poi_observatory_type_meteorological">Μετεωρολογικό</string>
+	<string name="poi_observatory_type_gravitational">Βαρυτικό</string>
+
+	<string name="poi_greenhouse_horticulture">Κηπευτική θερμοκηπίου</string>
+
+	<string name="poi_voltage">Τάση</string>
+	<string name="poi_generator_output_electricity">Ισχύς εξόδου</string>
+	<string name="poi_generator_output_electricity_yes">Έξοδος: ηλεκτρισμός</string>
+	<string name="poi_generator_output_hot_water">Ισχύς εξόδου ζεστού νερού</string>
+	<string name="poi_generator_output_hot_water_yes">Έξοδος: ζεστό νερό</string>
+	<string name="poi_generator_output_steam_yes">Έξοδος: ατμός</string>
+	<string name="poi_generator_output_hot_air_yes">Έξοδος: ζεστός αέρας</string>
+	<string name="poi_generator_output_cold_water_yes">Έξοδος: κρύο νερό</string>
+	<string name="poi_generator_output_compressed_air">Ισχύς εξόδου πεπιεσμένου αέρα</string>
+	<string name="poi_generator_output_compressed_air_yes">Έξοδος: πεπιεσμένος αέρας</string>
+	<string name="poi_generator_output_vacuum_yes">Έξοδος: κενό</string>
+	<string name="poi_generator_output_biogas">Ισχύς εξόδου βιοαερίου</string>
+	<string name="poi_generator_output_biogas_yes">Έξοδος: βιοαέριο</string>
+
+	<string name="poi_pumping_station">Αντλιοστάσιο</string>
+
+	<string name="poi_display_yes">Οθόνη: ναι</string>
+	<string name="poi_display_no">Οθόνη: όχι</string>
+	<string name="poi_display_analog_yes">Αναλογική οθόνη</string>
+	<string name="poi_display_digital_yes">Ψηφιακή οθόνη</string>
 	</resources>
--- a/OsmAnd/res/values-eo/phrases.xml
+++ b/OsmAnd/res/values-eo/phrases.xml
@ -3386,9 +3386,9 @@
 <string name="poi_motorcycle_services">Servo</string>
 	<string name="poi_motorcycle_type">Motorcikla speco</string>

-<string name="poi_motorcycle_sales_yes">Vendo</string>
-	<string name="poi_motorcycle_sales_no">Vendo: ne</string>
-	<string name="poi_motorcycle_sales_yes_used">Vendo, brokanto</string>
+<string name="poi_motorcycle_sales_yes">vendo</string>
+	<string name="poi_motorcycle_sales_no">vendo: ne</string>
+	<string name="poi_motorcycle_sales_yes_used">vendo, brokanto</string>
 	<string name="poi_motorcycle_sales_used">brokanto</string>
 	<string name="poi_motorcycle_rental_yes">luo</string>
 	<string name="poi_motorcycle_rental_no">Luo: ne</string>
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@ -2588,7 +2588,7 @@ Lon %2$s</string>
    <string name="improve_coverage_install_mapillary_desc">Instala Mapillary para añadir una o más fotos a esta ubicación del mapa.</string>
    <string name="open_mapillary">Abrir Mapillary</string>
    <string name="mapillary_image">Imagen de Mapillary</string>
-    <string name="distance_moving">Distancia corregida</string>
+    <string name="distance_moving">Distancia recorrida</string>
    <string name="shared_string_permissions">Permisos</string>
    <string name="import_gpx_failed_descr">OsmAnd no puede importar el archivo. Comprueba si OsmAnd tiene permiso para leer archivos desde esta ubicación.</string>
    
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@ -2588,7 +2588,7 @@ Lon %2$s</string>
    <string name="improve_coverage_install_mapillary_desc">Instala Mapillary para añadir una o más fotos a esta ubicación del mapa.</string>
    <string name="open_mapillary">Abrir Mapillary</string>
    <string name="mapillary_image">Imagen de Mapillary</string>
-    <string name="distance_moving">Distancia corregida</string>
+    <string name="distance_moving">Distancia recorrida</string>
    <string name="shared_string_permissions">Permisos</string>
    <string name="import_gpx_failed_descr">OsmAnd no puede importar el archivo. Comprueba si OsmAnd tiene permiso para leer archivos desde esta ubicación.</string>
    
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@ -2183,7 +2183,7 @@
 	<string name="poi_social_facility_for_drug_addicted">Drogadictos</string>
 	<string name="poi_social_facility_for_unemployed">Desempleados</string>
 	<string name="poi_social_facility_for_diseased">Enfermos</string>
-	<string name="poi_social_facility_for_child_juvenile">Niños y juvenil</string>
+	<string name="poi_social_facility_for_child_juvenile">Niños, juvenil</string>

 	<string name="poi_theatre_genre_philharmonic">Filarmónica</string>
 	<string name="poi_theatre_genre_musical">Musical</string>
@ -2331,7 +2331,7 @@
 	<string name="poi_material_plastic">Material: plástico</string>
 	<string name="poi_material_sandstone">Material: arenisca</string>
 	<string name="poi_material_granite_stone">Material: piedra de granito</string>
-	<string name="poi_material_metal_wood">Material: metal y madera</string>
+	<string name="poi_material_metal_wood">Material: metal, madera</string>
 	<string name="poi_material_glass">Material: vidrio</string>
 	<string name="poi_material_bronze">Material: bronce</string>
 	<string name="poi_material_earth">Material: tierra</string>
@ -3425,7 +3425,7 @@

 	<string name="poi_motorcycle_sales_yes">Ventas</string>
 	<string name="poi_motorcycle_sales_no">Venden motocicletas: no</string>
-	<string name="poi_motorcycle_sales_yes_used">Venden motocicletas: sí; usadas</string>
+	<string name="poi_motorcycle_sales_yes_used">Venden motocicletas: sí, también usadas</string>
 	<string name="poi_motorcycle_sales_used">Venden motocicletas: usadas</string>
 	<string name="poi_motorcycle_rental_yes">Alquiler</string>
 	<string name="poi_motorcycle_rental_no">Alquilan motocicletas: no</string>
@ -3896,4 +3896,8 @@

 <string name="poi_checkpoint_type_needler">Perforadora</string>
 	<string name="poi_checkpoint_type_quize">Cuestionario</string>
-	</resources>
+	<string name="poi_appliance">Tienda de electrodomésticos</string>
+
+	<string name="poi_outcrop">Afloramiento</string>
+
+</resources>
--- a/OsmAnd/res/values-eu/phrases.xml
+++ b/OsmAnd/res/values-eu/phrases.xml
@ -413,7 +413,7 @@
 	<string name="poi_material_steel">Materiala: altzairua</string>
 	<string name="poi_material_brick">Materiala: adreilua</string>
 	<string name="poi_material_plastic">Materiala: plastikoa</string>
-	<string name="poi_material_metal_wood">Materiala: metala;zura</string>
+	<string name="poi_material_metal_wood">Materiala: metala, zura</string>
 	<string name="poi_material_glass">Materiala: beira</string>
 	<string name="poi_material_bronze">Materiala: brontzea</string>
 	<string name="poi_material_earth">Materiala: lurra</string>
@ -1449,7 +1449,7 @@
 	<string name="poi_social_facility_for_drug_addicted">Drogamenpekoak</string>
 	<string name="poi_social_facility_for_unemployed">Langabeak</string>
 	<string name="poi_social_facility_for_diseased">Gaixoak</string>
-	<string name="poi_social_facility_for_child_juvenile">Haurrak;gazteak</string>
+	<string name="poi_social_facility_for_child_juvenile">Haurrak, gazteak</string>

 	<string name="poi_additional_atm_yes">Kutxazain automatikoa: bai</string>
 	<string name="poi_atm_no">Kutxazain automatikoa: ez</string>
@ -2628,7 +2628,7 @@
 	<string name="poi_letter_box">Buzoia</string>
 	<string name="poi_post_street">Kalea</string>
 	<string name="poi_post_housenumber">Portal zenbakia</string>
-	<string name="poi_post_flats"/>
+	<string name="poi_post_flats">Pisua</string>

 	<string name="poi_money_transfer">Diru-transferentzia</string>

@ -3114,7 +3114,7 @@

 	<string name="poi_motorcycle_sales_yes">Salmenta</string>
 	<string name="poi_motorcycle_sales_no">Salmenta: ez</string>
-	<string name="poi_motorcycle_sales_yes_used">Salmenta: bai; erabilitakoak</string>
+	<string name="poi_motorcycle_sales_yes_used">Salmenta: bai, erabilitakoak</string>
 	<string name="poi_motorcycle_sales_used">Salmenta: erabilitakoak</string>
 	<string name="poi_motorcycle_rental_yes">Alokairua</string>
 	<string name="poi_motorcycle_rental_no">Alokairua: ez</string>
@ -3690,4 +3690,45 @@
 	<string name="poi_protection_object_water">Babestutakoa: Ura</string>

 	<string name="poi_health_facility_type_office">Medikuaren kontsulta</string>
+	<string name="poi_material_masonry">Materiala: hargintza</string>
+	<string name="poi_pa">Pa (Maorien gotortutako kokalekua)</string>
+
+	<string name="poi_historic_threshing_floor">Larrain historikoa</string>
+	<string name="poi_prison_camp">Presondegi izandakoa</string>
+	<string name="poi_firepit">Sutokia</string>
+	<string name="poi_street_cabinet">Kaleko armairua</string>
+
+	<string name="poi_nuclear_explosion_height_of_burst">Eztandaren altuera</string>
+	<string name="poi_nuclear_explosion_ground_zero_altitude">Zero zonaren altitudea</string>
+	<string name="poi_free_flying_paragliding_yes">Parapentea</string>
+	<string name="poi_free_flying_paragliding_no">Parapentea: ez</string>
+	<string name="poi_free_flying_hanggliding_yes">Delta hegala</string>
+	<string name="poi_free_flying_hanggliding_no">Delta hegala: ez</string>
+	<string name="poi_cuisine_piadina">Piadina</string>
+	<string name="poi_cuisine_souvlaki">Souvlaki</string>
+	<string name="poi_cuisine_bubble_tea">"Burbuila tea "</string>
+	<string name="poi_cuisine_waffle">Gofrea</string>
+	<string name="poi_nutrition_supplements">Elikadura-osagarriak</string>
+	<string name="poi_motorcycle_type_offroad">Errepidez kanpokoa</string>
+	<string name="poi_motorcycle_type_dualsport">Helburu bikoitzekoa</string>
+	<string name="poi_spaceport">Jaurtigunea</string>
+
+	<string name="poi_depot">Biltegia</string>
+
+	<string name="poi_payment_centre">Ordainketa zentroa</string>
+	<string name="poi_climbing_length">Eskaladaren luzera</string>
+	<string name="poi_climbing_length_min">Eskaladaren gutxieneko luzera</string>
+	<string name="poi_climbing_length_max">Eskaladaren gehieneko luzera</string>
+	<string name="poi_climbing_rock_limestone">Eskaladaren arroka: kareharria</string>
+	<string name="poi_climbing_rock_granite">Eskaladaren arroka: granitoa</string>
+	<string name="poi_climbing_rock_sandstone">Eskaladaren arroka: hareharria</string>
+	<string name="poi_climbing_rock_quartzite">Eskaladaren arroka: kuartzita</string>
+	<string name="poi_climbing_rock_gneiss">Eskaladaren arroka: gneiss</string>
+	<string name="poi_climbing_rock_porphyry">Eskaladaren arroka: porfiroa</string>
+	<string name="poi_climbing_quality_solid">Eskaladaren kalitatea: solidoa</string>
+	<string name="poi_climbing_quality_fragile">Eskaladaren kalitatea: hauskorra</string>
+	<string name="poi_climbing_bolted_yes">Aingura finkoak: bai</string>
+	<string name="poi_climbing_bolted_no">Aingura finkoak: ez</string>
+	<string name="poi_climbing_routes">Eskalatzeko ibilbideak</string>
+
 	</resources>
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@ -182,7 +182,7 @@
 \n 
 \nDatu globalak (iparraldera 70 gradu eta hegoaldera 70 gradu bitartean) STRM (Shuttle Radar Topography Mission) eta ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer) neurrietan oinarrituak daude, espazioko Terra irudi tresna, NASAren Lurra Behatzeko Sistemaren satelite enblematikoa. ASTER NASAren, Japoniako Ekonomi, Merkataritza eta Industria Ministerioaren (EMIM), eta Japoneko Espazio Sistemaren (J-espaziosistema) elkarlanaren ondorioz sortua izan da.</string>
  <string name="map_widget_distancemeasurement">Distantzia neurketa</string>
-  <string name="audionotes_location_not_defined">Ez da oharrari lotutako kokapenik zehaztu. \"Erabili kokapena …\" oharra zehaztutako kokapenera esleitzeko.</string>
+  <string name="audionotes_location_not_defined">Ez da oharrari lotutako kokapenik zehaztu. \"Erabili kokapena…\" oharra zehaztutako kokapenera esleitzeko.</string>
  
  <string name="map_widget_audionotes">Audio oharrak</string>
  <string name="audionotes_plugin_description">Audio/Bideo gehigarriak bidaian zehar audio/argazki/bideo oharrak hartzeko gaitasuna ematen du, zuzenean maparen pantailan botoi bat erabiliz edo mapako edozein posizioaren laster-menuan.</string>
@ -1192,7 +1192,7 @@ Biltegiratzean {1} MB erabiliko dira.
  <string name="poi_edit_title">Editatu POI-a</string>
  <string name="poi_create_title">Sortu POI bat</string>
  <string name="poi_error_poi_not_found">Ezin da nodoa aurkitu, edo zerbitzua hainbat nodoz osatuta dago, eta ez dago horretarako euskarririk oraindik.</string>
-  <string name="poi_remove_confirm_template">{0} ezabatu (sartu iruzkina)?</string>
+  <string name="poi_remove_confirm_template">{0} ezabatu (iruzkina)?</string>
  <string name="poi_remove_title">Ezabatu POI-a</string>
  <string name="shared_string_delete">Ezabatu</string>
  <string name="poi_remove_success">POI-a ezabatuta</string>
@ -2974,7 +2974,7 @@ Area honi dagokio: %1$s x %2$s</string>
    <string name="tunnel_warning">Tunela aurrean</string>
    <string name="show_tunnels">Tunelak</string>
 <string name="make_as_start_point">Bihurtu hau hasiera puntua</string>
-    <string name="enter_the_file_name">Idatzi fitxategiaren izena.</string>
+    <string name="enter_the_file_name">Idatzi fitxategi-izena.</string>
    <string name="map_import_error">Maparen inportazio errorea</string>
    <string name="map_imported_successfully">Mapa inportatu da</string>
    <string name="transport_nearby_routes_within">Inguruko ibilbideak</string>
@ -3115,5 +3115,5 @@ Area honi dagokio: %1$s x %2$s</string>
    <string name="coord_input_edit_point">Editatu puntua</string>
    <string name="coord_input_add_point">Gehitu puntua</string>
    <string name="coord_input_save_as_track">Gorde lorratz gisa</string>
-    <string name="coord_input_save_as_track_descr">%1$s puntu gehitu dituzu. Sartu fitxategiaren izena eta sakatu gorde.</string>
+    <string name="coord_input_save_as_track_descr">%1$s puntu gehitu dituzu. Idatzi fitxategi-izena eta sakatu \"Gorde\".</string>
    </resources>
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@ -3160,4 +3160,8 @@
    <string name="get_osmand_live">‏‏OsmAnd Live را تهیه کنید تا همهٔ این قابلیت‌ها باز شود: به‌روزآوری روزانهٔ نقشه و دانلودهای نامحدود، همهٔ افزونه‌های رایگان و پولی، ویکی‌پدیا، ویکی‌سفر و...</string>
    <string name="quick_action_edit_actions">ویرایش عملیات</string>
    <string name="error_notification_desc">لطفاً از این اعلان عکس بگیرید و به support@osmand.net بفرستید</string>
+    <string name="coord_input_edit_point">اصلاح نقطه</string>
+    <string name="coord_input_add_point">افزودن نقطه</string>
+    <string name="coord_input_save_as_track">ذخیره به‌عنوان مسیر</string>
+    <string name="coord_input_save_as_track_descr">%1$s نقطه افزودید. نام فایل را بنویسید و روی «ذخیره» بزنید.</string>
    </resources>
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@ -408,7 +408,7 @@
 	
 	<string name="shared_string_save_as_gpx">שמירה כקובץ GPX חדש</string>
 	<string name="route_successfully_saved_at">המסלול נשמר בתור ‚%1$s’.</string>
-	<string name="filename_input">שם הקובץ:</string>
+	<string name="filename_input">שם קובץ:</string>
 	<string name="file_with_name_already_exist">כבר קיים קובץ השם הזה.</string>
 	<string name="shared_string_save">שמירה</string>
 	
@ -943,7 +943,7 @@
 	<string name="poi_edit_title">עריכת נ״ע</string>
 	<string name="poi_create_title">יצירת נ״ע</string>
 	<string name="poi_error_poi_not_found">לא ניתן למצוא את המפרק או שהמתחם מורכב ממספר מפרקים, מצב שלא נתמך עדיין.</string>
-	<string name="poi_remove_confirm_template">האם למחוק את {0} (להזין הערה)?</string>
+	<string name="poi_remove_confirm_template">למחוק את {0} (תגובה)?</string>
 	<string name="poi_remove_title">מחיקת נ״ע</string>
 	<string name="shared_string_delete">מחיקה</string>
 	<string name="poi_remove_success">נ״ע נמחקה</string>
@ -2659,7 +2659,7 @@
    <string name="rendering_attr_hidePOILabels_name">תוויות נ״ע</string>
    <string name="copy_location_name">העתקת שם נקודה/נ״ע</string>
    <string name="toast_empty_name_error">מיקום ללא שם</string>
-<string name="enter_the_file_name">נא להזין את שם הקובץ.</string>
+<string name="enter_the_file_name">נא להקליד שם קובץ.</string>
    <string name="map_import_error">שגיאת ייבוא למפה</string>
    <string name="map_imported_successfully">המפה יובאה</string>
    <string name="make_as_start_point">סימון כנקודת התחלה</string>
@ -3059,5 +3059,5 @@
    <string name="coord_input_edit_point">עריכת נקודה</string>
    <string name="coord_input_add_point">הוספת נקודה</string>
    <string name="coord_input_save_as_track">שמירה כמסלול</string>
-    <string name="coord_input_save_as_track_descr">הוספת %1$s נקודות. נא להקליד את שם הקובץ וללחוץ על שמירה.</string>
+    <string name="coord_input_save_as_track_descr">הוספת %1$s נקודות. נא להקליד שם קובץ וללחוץ על ‚שמירה’.</string>
    </resources>
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="installing_new_resources">新しいデータを展開中…</string>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="installing_new_resources">新しいデータを展開中…</string>
     <string name="internet_connection_required_for_online_route">オンライン経路案内を使用しようとしていますが
 インターネット接続されていません。</string>
     <string name="tts_language_not_supported_title">未サポート言語</string>
@ -848,7 +849,7 @@ POIの更新は利用できません</string>
    <string name="poi_filter_sightseeing">観光(Sightseeing)</string>
    <string name="poi_filter_accomodation">収容施設(Accommodation)</string>
    <string name="show_warnings_title">警告の表示設定…</string>
-	<string name="show_warnings_descr">交通指示警告(法定速度、強制停止、スピードバンプ等含む)、スピードカメラ、車線等の通知を設定します</string>
+	<string name="show_warnings_descr">交通指示警告(法定速度、強制停止、スピードバンプ、トンネル等)、スピードカメラ、車線等の通知を設定します。</string>
 	<string name="use_compass_navigation_descr">方向が全く検出できない場合電子コンパスを使用します</string>
 	<string name="use_compass_navigation">電子コンパスを使用</string>
 	<string name="avoid_motorway">高速道路を使用しない</string>
@ -2530,7 +2531,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
    <string name="quick_favorites_show_favorites_dialog">お気に入りダイアログを表示</string>
    <string name="quick_favorites_name_preset">プリセットに名前を付ける</string>
    <string name="quick_action_add_marker_descr">アクションボタンをタップすると、画面中央アイコンの位置にマップマーカーが追加されます。</string>
-    <string name="quick_action_add_gpx_descr">アクションボタンをタップすると、画面中央アイコンの地点をGPX経由地点として追加します。</string>
+    <string name="quick_action_add_gpx_descr">このアクションボタンをタップすると、画面中央の地点をGPX経由地点として追加します。</string>
    <string name="quick_action_take_audio_note_descr">アクションボタンをタップすると画面中央アイコンの地点に音声メモを追加します。</string>
    <string name="quick_action_take_video_note_descr">アクションボタンをタップすると画面中央アイコンの地点に動画メモが追加されます。</string>
    <string name="quick_action_take_photo_note_descr">アクションボタンをタップすると画面中央アイコンの地点に写真メモが追加されます。</string>
@ -3036,4 +3037,17 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
    <string name="light_rs_render_descr">カーナビゲーション向けのシンプルでコントラストのハッキリしたスタイルです。 夜間モードはさらに目に優しい表示になります。主な特徴：等高線、対照的なオレンジ色の道路で表示、二次的な地図オブジェクトを排し散漫性を軽減します。</string>
    <string name="topo_render_descr">コントラストスタイルは主に自然の中を行き来するハイキング、トレッキング、サイクリングのために設計されています。 複雑な外部照明のある場所でも読み易さを重視しています。主な機能：道路や自然のオブジェクト強調、ルートの種類、拡張設定を用いた等高線、デフォルトのスタイルよりもズームレベルを細かく設定できます。 路面の状態を表示するオプションを使うことで、路面の品質(舗装済み、簡易舗装など)を区別できます。夜間モードはありません。</string>
    <string name="mapnik_render_descr">古い「Mapnik」風のデフォルトレンダリングスタイルです。主な特徴：配色を「Mapnik」スタイルに似せています。</string>
-    </resources>
+    <string name="coord_input_edit_point">地点／座標の編集</string>
+    <string name="coord_input_add_point">座標の追加</string>
+    <string name="coord_input_save_as_track">経路として保存</string>
+    <string name="coord_input_save_as_track_descr">%1$sヶ所の座標を追加しました。ファイル名を付けて\"保存\"をタップしてください。</string>
+    <string name="error_notification_desc">この通知画面のスクリーンショットを、support@osmand.netに送信してください。</string>
+    <string name="quick_action_edit_actions">アクションの編集</string>
+    <string name="clear_all_intermediates">中間経由地点を全て消去</string>
+    <string name="add_waypoint">経由地点を追加</string>
+    <string name="show_tunnels">トンネル</string>
+    <string name="touring_view_render_descr">ツーリングを対象とした高詳細のマップスタイルで、デフォルトスタイルの全オプションが有効となっています。すべての道路、通路、その他の道、異なる道路タイプ間の視覚的区別を可能にし、道以外も可能な限り詳細を表示しており、ツーリング用地図帳を思い起こさせる見た目となっています。アウトドアでの利用や昼夜モードもハイコントラストで対応しています。</string>
+    <string name="default_render_descr">標準的な汎用スタイルです。人口密集地の場合描写の簡素化がなされます。主な機能としては等高線、ルート、路面品質、通行制限、道路標識、SACスケールの通路描写をサポートし、急流下りなどのウォータースポーツにも使用できます。</string>
+    <string name="open_wikipedia_link_online">Wikipediaをオンライン参照</string>
+    <string name="open_wikipedia_link_online_description">このリンクを開くとウェブブラウザで閲覧することができます。</string>
+    </resources>
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@ -1339,7 +1339,7 @@
 	<string name="poi_material_plastic">Materiał: plastik</string>
 	<string name="poi_material_sandstone">Materiał: piaskowiec</string>
 	<string name="poi_material_granite_stone">Materiał: granit</string>
-	<string name="poi_material_metal_wood">Materiał: metal i drewno</string>
+	<string name="poi_material_metal_wood">Materiał: metal, drewno</string>
 	<string name="poi_material_glass">Materiał: szkło</string>
 	<string name="poi_material_bronze">Materiał: brąz</string>
 	<string name="poi_material_earth">Materiał: ziemia</string>
@ -2337,7 +2337,7 @@
 	<string name="poi_social_facility_for_drug_addicted">Uzależnieni od narkotyków</string>
 	<string name="poi_social_facility_for_unemployed">Bezrobotni</string>
 	<string name="poi_social_facility_for_diseased">Chorzy</string>
-	<string name="poi_social_facility_for_child_juvenile">Dzieci i młodzież</string>
+	<string name="poi_social_facility_for_child_juvenile">Nieletni</string>

 	<string name="poi_theatre_genre_philharmonic">Filharmonia</string>
 	<string name="poi_theatre_genre_musical">Teatr muzyczny</string>
@ -3428,7 +3428,7 @@
 	<string name="poi_motorcycle_type_dualsport">dual-sport</string>
 	<string name="poi_motorcycle_type_standard">standardowe</string>

-<string name="poi_animal_shelter_type">Akceptacja zwierząt</string>
+<string name="poi_animal_shelter_type">Przyjmowane zwierzęta</string>
 	<string name="poi_lock_basin">Zbiornik zamknięty</string>
 	<string name="poi_animal_shelter_wildlife">Dzikie zwierzęta</string>
 	<string name="poi_animal_shelter_horse">Konie</string>
@ -3879,4 +3879,8 @@

 	<string name="poi_end_date">Data ukończenia</string>

+<string name="poi_appliance">Sklep z AGD</string>
+
+	<string name="poi_outcrop">Wychodnia</string>
+
 </resources>
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>

    <string name="use_transparent_map_theme">Przezroczysty styl</string>
    <string name="native_library_not_supported">To urządzenie nie obsługuje biblioteki renderowania natywnego.</string>
@ -400,7 +401,7 @@
    <string name="update_poi_error_local">Nie uaktualniono lokalnej listy UM</string>
    <string name="update_poi_error_loading">Nie pobrano danych z serwera</string>
    <string name="update_poi_no_offline_poi_index">Brak danych offline UM dla tego rejonu</string>
-    <string name="update_poi_is_not_available_for_zoom">Uaktualnianie UM jest niedostępne dla małych poziomów przybliżenia</string>
+    <string name="update_poi_is_not_available_for_zoom">Przybliż, żeby zaktualizować Użyteczne Miejsca</string>
    <string name="context_menu_item_update_poi">Uaktualnij użyteczne miejsce</string>
    <string name="context_menu_item_update_map_confirm">Uaktualnić dane lokalne przez Internet?</string>
    <string name="search_history_city">Miasto: {0}</string>
@ -1932,7 +1933,7 @@ Długość %2$s</string>
    <string name="routing_attr_avoid_shuttle_train_name">Omijanie pociągów wahadłowych</string>
    <string name="routing_attr_avoid_shuttle_train_description">Omijanie pociągów wahadłowych transportujących auta</string>
    <string name="traffic_warning_hazard">Zagrożenie</string>
-    <string name="we_really_care_about_your_opinion">Zależy nam na opinii na temat programu i jest dla nas ważne, aby ją poznać.</string>
+    <string name="we_really_care_about_your_opinion">Zależy nam na na Twojej opinii i twoja odpowiedź jest dla nas ważna.</string>
    <string name="dahboard_options_dialog_title">Opcje kokpitu</string>
    <string name="shared_string_card_was_hidden">Ukryto kartę</string>
    <string name="shared_string_undo">Cofnij</string>
@ -3077,4 +3078,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
    <string name="shared_string_gpx_files">Pliki GPX</string>
    <string name="quick_action_edit_actions">Edycja działań</string>
    <string name="error_notification_desc">Prosimy o przesłanie zrzutów ekranu tego powiadomienia na support@osmand.net</string>
-    </resources>
+    <string name="coord_input_edit_point">Edytuj punkt</string>
+    <string name="coord_input_add_point">Dodaj punkt</string>
+    <string name="coord_input_save_as_track_descr">Dodano %1$s punkty/ów. Wpisz nazwę pliku i naciśnij \"Zapisz\".</string>
+    </resources>
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@ -2807,7 +2807,7 @@
 	<string name="poi_power_supply">Fonte de energia</string>
 	<string name="poi_medical_system">Sistema médico</string>
 	<string name="poi_home_visit">Visita domiciliar</string>
-	<string name="poi_dish">Prato</string>
+	<string name="poi_dish">Pratos</string>
 	<string name="poi_payment_transport_type">Tipo de pagamento (transporte)</string>
 	<string name="poi_social_facility_type">Tipo</string>
 	<string name="poi_social_facility_for">Público-alvo</string>
@ -3877,4 +3877,8 @@
 	<string name="poi_checkpoint_type_notebook">Caderno</string>
 	<string name="poi_checkpoint_type_needler">Needler</string>
 	<string name="poi_checkpoint_type_quize">Quize</string>
-	</resources>
+	<string name="poi_appliance">Loja de eletrodomésticos</string>
+
+	<string name="poi_outcrop">Afloramento</string>
+
+</resources>
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@ -194,8 +194,12 @@
    <string name="rendering_attr_streetLighting_name">Iluminação pública</string>
    <string name="proxy_pref_title">Proxy</string>
    <string name="track_points">Pontos da trilha</string>
-	<string name="osmand_srtm_long_description_1000_chars">"Este complemento fornece curva de nível e camada de sombra de colinas (relevo) por cima do mapa padrão do OsmAnd. Esta funcionalidade será muito apreciada por atletas, viajantes e alguém interessado na estrutura de relevo da paisagem.\n\nOs dados globais (entre as latitudes 70º norte e 70º sul) são baseados em medições do SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), um instrumento de imagens da Terra, o principal satélite do Sistema de Observação da Terra da NASA. ASTER é um esforço conjunto da NASA, do Ministério Japonês da Economia, Comércio e Indústria (METI) e do Sistema Espacial Japonês (J-spacesystems). "</string>
-	<string name="srtm_plugin_description">"Este complemento fornece camadas de curvas de nível e de sombras das colinas (relevo) por cima do mapa padrão do OsmAnd. Esta funcionalidade será muito apreciada por atletas, viajantes e alguém interessado na estrutura de relevo da paisagem.\n\nOs dados globais (entre as latitudes 70º norte e 70º sul) são baseados em medições do SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), um instrumento de imagens da Terra, o principal satélite do Sistema de Observação da Terra da NASA. ASTER é um esforço conjunto da NASA, do Ministério Japonês da Economia, Comércio e Indústria (METI) e do Sistema Espacial Japonês (J-spacesystems). "</string>
+	<string name="osmand_srtm_long_description_1000_chars">"Este complemento fornece curva de nível e camada de sombra de colinas (relevo) por cima do mapa padrão do OsmAnd. Esta funcionalidade será muito apreciada por atletas, viajantes e alguém interessado na estrutura de relevo da paisagem.
+\n
+\nOs dados globais (entre as latitudes 70° norte e 70° sul) são baseados em medições do SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), um instrumento de imagens da Terra, o principal satélite do Sistema de Observação da Terra da NASA. ASTER é um esforço conjunto da NASA, do Ministério Japonês da Economia, Comércio e Indústria (METI) e do Sistema Espacial Japonês (J-spacesystems). "</string>
+	<string name="srtm_plugin_description">"Este complemento fornece camadas de curvas de nível e de sombras das colinas (relevo) por cima do mapa padrão do OsmAnd. Esta funcionalidade será muito apreciada por atletas, viajantes e alguém interessado na estrutura de relevo da paisagem.
+\n
+\nOs dados globais (entre as latitudes 70° norte e 70° sul) são baseados em medições do SRTM (Shuttle Radar Topography Mission) e ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), um instrumento de imagens da Terra, o principal satélite do Sistema de Observação da Terra da NASA. ASTER é um esforço conjunto da NASA, do Ministério Japonês da Economia, Comércio e Indústria (METI) e do Sistema Espacial Japonês (J-spacesystems). "</string>
 	<string name="osmand_parking_plugin_description">O plugin de posição de estacionamento grava onde seu carro está estacionado e quanto tempo resta (se o estacionamento for de tempo limitado).
 \nVocê pode encontrar o seu lugar e tempo de estacionamento no painel de instrumentos e no widget do mapa. Pode ser adicionado um evento no calendário, se você quiser um lembrete.</string>
 	<string name="osm_editing_plugin_description">Este complemento do OsmAnd pode ser usado para fazer contribuições ao OSM como criar ou modificar POI, abertura ou comentários de erros do OSM e contribuir com arquivos GPX gravados. OSM é um projeto de mapeamento mundial dirigido pela comunidade e de domínio público. Para mais detalhes, consulte https://openstreetmap.org. Participação ativa é apreciada e as contribuições podem ser feitas diretamente do OsmAnd, se você especificar suas credenciais pessoais de OSM no app.</string>
@ -206,7 +210,7 @@
 	<string name="navigation_over_track">Iniciar a navegação pela trilha?</string>
 	<string name="speak_pedestrian">Travessias de pedestre</string>
    <string name="rendering_attr_roadStyle_name">Estilo das vias</string>
-    <string name="avoid_roads_msg">Você pode obter uma rota alternativa, selecionando quais vias evitar</string>
+    <string name="avoid_roads_msg">Obter uma rota alternativa, selecionando quais vias evitar</string>
 	<string name="rendering_value__name">Predefinido</string>
    <string name="rendering_value_default_name">Predefinido</string>
    <string name="rendering_value_orange_name">Laranja</string>
@ -642,12 +646,12 @@
    <string name="edit_tilesource_choose_existing">Escolher existente…</string>
    <string name="maps_define_edit">Definir/Editar…</string>
 	<string name="map_widget_fps_info">Informações de depuração FPS</string>
-	<string name="driving_region_descr">Selecionar região de direção</string>
+	<string name="driving_region_descr">Selecionar a região de direção.</string>
 	<string name="driving_region">Região de direção</string>
 	<string name="driving_region_japan">Japão</string>
 	<string name="driving_region_us">Estados Unidos</string>
 	<string name="driving_region_canada">Canadá</string>
-	<string name="driving_region_europe_asia">Europa e Ásia</string>
+	<string name="driving_region_europe_asia">Europa, Ásia, América Latina etc</string>
 	<string name="driving_region_uk">Reino Unido, Índia, Austrália e outras</string>
    <string name="speak_descr">Configurar para anunciar nomes de ruas, moderadores de tráfego (paradas obrigatórias, lombadas), radares, limites de velocidade</string>
 	<string name="speak_street_names">Nome das ruas (TTS)</string>
@ -1971,7 +1975,7 @@ Pôr do Sol: %2$s</string>
    <string name="rec_split_clip_length_desc">Limite de tempo máximo para clipes gravados.</string>
    <string name="rec_split_storage_size">Limite de armazenamento</string>
    <string name="rec_split_storage_size_desc">Quantidade de espaço que pode ser ocupado por todos os clipes gravados.</string>
-    <string name="last_map_change">Última mudança de mapa: %s</string>
+    <string name="last_map_change">Última mudança: %s</string>
    <string name="hourly">A cada hora</string>
    <string name="daily">Diariamente</string>
    <string name="weekly">Semanalmente</string>
@ -2222,7 +2226,7 @@ Pôr do Sol: %2$s</string>
    <string name="hide_from_zoom_level">Ocultar deste nível de ampliação</string>
    <string name="srtm_menu_download_descr">Para ver as curvas de nível no mapa, você precisa baixar o mapa de curvas de nível desta região.</string>
    <string name="shared_string_plugin">Complemento</string>
-    <string name="srtm_purchase_header">Para ver as curvas de nível no mapa, você precisa comprar e instalar o complemento Curvas de Nível</string>
+    <string name="srtm_purchase_header">Para ver as curvas de nível no mapa, você precisa comprar e instalar o plugin \'Curvas de Nível\'</string>
    <string name="srtm_color_scheme">Esquema de cores</string>
    <string name="make_round_trip">Fazer viagem de ida e volta</string>
    <string name="routing_attr_avoid_ice_roads_fords_name">Evitar estradas de gelo, vaus</string>
@ -2329,7 +2333,7 @@ Pôr do Sol: %2$s</string>
    <string name="no_underlay">Sem camada inferior</string>
    <string name="subscribe_email_error">Erro</string>
    <string name="depth_contour_descr">Conjunto de mapas contendo as curvas batimétricas do mar e pontos náuticos.</string>
-    <string name="sea_depth_thanks">Obrigado por adquirir a batimetria náutica!</string>
+    <string name="sea_depth_thanks">Obrigado por adquirir a \'Batimetria náutica\'</string>
    <string name="index_item_depth_contours_osmand_ext">Batimetria náutica</string>
    <string name="index_item_depth_points_southern_hemisphere">Pontos de profundidade náuticos, Hemisfério Sul</string>
    <string name="index_item_depth_points_northern_hemisphere">Pontos de profundidade náuticos, Hemisfério Norte</string>
@ -2411,7 +2415,7 @@ Pôr do Sol: %2$s</string>
    <string name="rendering_attr_contourColorScheme_description">Esquema de cores das curvas de nível</string>
    <string name="save_track_min_speed_descr">Filtro: Definir velocidade mínima para um ponto ser registrado.</string>
    <string name="save_track_min_distance">Deslocamento mínimo de registro</string>
-    <string name="save_track_min_distance_descr">Filtro: Definir a distância mínima da última posição para o ponto ser registrado.</string>
+    <string name="save_track_min_distance_descr">Filtro: Definir distância mínima de um ponto para registrar o próximo.</string>
    <string name="save_track_precision_descr">Filtro: Definir precisão mínima para um ponto ser registrado.</string>
    <string name="christmas_poi">POI de Natal</string>
    <string name="christmas_desc_q">Mostrar POI de Natal?</string>
@ -2515,7 +2519,7 @@ Pôr do Sol: %2$s</string>
    <string name="osm_live_region_desc">Parte da sua doação será enviada para os usuários OSM que enviam alterações para o mapa da região.</string>
    <string name="osm_live_subscription_settings">Configurações de assinatura</string>
    <string name="osm_live_ask_for_purchase">Por favor, adquira a assinatura OsmAnd Live primeiro</string>
-    <string name="osm_live_header">Esta assinatura permite atualizações a cada hora para todos os mapas ao redor do mundo. Parte da renda retorna à Comunidade OSM e é pago por cada contribuição OSM. Se você ama OsmAnd e OSM e quer apoiá-los, esta é a maneira perfeita de fazê-lo.</string>
+    <string name="osm_live_header">Esta assinatura permite atualizações a cada hora para todos os mapas ao redor do mundo. Parte da renda retorna à Comunidade OSM e é pago por cada contribuição OSM. Se você gosta do OsmAnd e OSM e deseja apoiar e ser apoiado por eles, esta é a maneira perfeita de fazê-lo.</string>
    <string name="select_map_marker">Selecione marcador de mapa</string>
    <string name="map_markers_other">Outros marcadores</string>
    <string name="upload_anonymously">Enviar anonimamente</string>
@ -2681,7 +2685,19 @@ Pôr do Sol: %2$s</string>
    <string name="osmand_plus_extended_description_part6">Recursos de ciclismo e pedestre • Visualização de caminhos a pé, pistas de caminhadas e ciclovias, ideal para atividades ao ar livre • Roteamento e modos de exibição especiais para bicicleta e pedestres • Paradas de transporte público opcionais (ônibus, troleibus, trem) incluindo nomes de linhas • Gravação opcional de viagem para arquivo GPX local ou serviço on-line • Exibição opcional de velocidade e altitudes • Exibição de curvas de nível e sombreamento de relevo (via plugin adicional)</string>
    <string name="shared_string_without_name">Sem nome</string>
    
-    <string name="osmand_plus_extended_description_part8">Cobertura de mapa e qualidade aproximada: • Europa Ocidental: **** • Europa Oriental: *** • Rússia: *** • América do Norte: *** • América do Sul: ** • Ásia: ** • Japão e Coreia: *** • Oriente Médio: ** • África: ** • Antártica: * A maioria dos países ao redor do globo disponível como downloads! Do Afeganistão ao Zimbabué, da Austrália aos Estados Unidos. Argentina, Brasil, Canadá, França, Alemanha, México, Reino Unido, Espanha,…</string>
+    <string name="osmand_plus_extended_description_part8">Cobertura de mapa e qualidade aproximada:
+\n• Europa Ocidental: ****
+\n• Europa Oriental: ***
+\n• Rússia: ***
+\n• América do Norte: ***
+\n• América do Sul: **
+\n• Ásia: **
+\n• Japão e Coreia: ***
+\n• Oriente Médio: **
+\n• África: **
+\n• Antártida: *
+\nA maioria dos países ao redor do globo disponível como downloads!
+\nDo Afeganistão ao Zimbabué, da Austrália aos Estados Unidos. Argentina, Brasil, Canadá, França, Alemanha, México, Reino Unido, Espanha,…</string>
    
    <string name="lang_lo">Laociano</string>
    <string name="show_closed_notes">Mostrar notas encerradas</string>
@ -2841,4 +2857,25 @@ Pôr do Sol: %2$s</string>
    <string name="error_notification_desc">Favor enviar a captura de tela desta notificação para support@osmand.net</string>
    <string name="quick_action_edit_actions">Editar ações</string>
    <string name="start_editing_card_description">Você pode e deve editar qualquer artigo do Wikivoyage. Compartilhe conhecimento, experiência, talento e sua atenção</string>
+    <string name="coord_input_edit_point">Editar ponto</string>
+    <string name="coord_input_add_point">Adicionar ponto</string>
+    <string name="coord_input_save_as_track">Salvar como trilha</string>
+    <string name="coord_input_save_as_track_descr">Você adicionou %1$s pontos. Digite um nome de arquivo e toque em \"Salvar\".</string>
+    <string name="topo_render_descr">Estilo de contraste projetado principalmente para caminhadas, trekking e ciclismo na natureza. Boa legibilidade sob iluminação externa complexa. Principais características: estradas e objetos naturais contrastantes, diferentes tipos de rotas, curvas de nível com configurações avançadas, mais detalhes conforme níveis de zoom do que o estilo padrão. Opção de integridade de superfície permite distinguir a qualidade de superfície da estrada. Sem modo noite.</string>
+    <string name="mapnik_render_descr">Antigo estilo de renderização padrão do \'Mapnik\'. Principais características: as cores são similares ao estilo \'Mapnik\'.</string>
+    <string name="default_render_descr">Estilo de uso geral. Renderização simplificada mais limpa em cidades densamente povoadas. Principais características: curvas de nível, rotas, qualidade de superfície, restrições de acesso, escudos rodoviários, renderização de caminhos de acordo com a escala SAC, características de esporte em corredeiras.</string>
+    <string name="osmand_extended_description_part8">OsmAnd é um software aberto desenvolvido ativamente. Todos podem contribuir para o app reportando bugs, melhorando traduções ou programando novas funcionalidades. Além disso, o projeto conta com contribuições financeiras para financiar a programação e testes de novas funcionalidades.
+\nCobertura de mapa e qualidade aproximada:
+\n• Europa Ocidental: ****
+\n• Europa Oriental: ***
+\n• Rússia: ***
+\n• América do Norte: ***
+\n• América do Sul: **
+\n• Ásia: **
+\n• Japão e Coreia: ***
+\n• Oriente Médio: **
+\n• África: **
+\n• Antártida: *
+\nA maioria dos países ao redor do globo é disponível para download!
+\nObtenha um navegador confiável em seu país - seja ele França, Alemanha, México, Reino Unido, Espanha, Holanda, EUA, Rússia, Brasil ou qualquer outro.</string>
    </resources>
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
    <string name="av_locations_selected_desc">Файл GPX с координатами и данными выбранных заметок.</string>
    <string name="av_locations_all_desc">Файл GPX с координатами и данными всех заметок.</string>
    <string name="favorite_empty_place_name">Место</string>
@ -2948,4 +2949,8 @@
    <string name="map_widget_intermediate_time">Промежуточное время</string>
    <string name="quick_action_edit_actions">Редактировать действие</string>
    <string name="error_notification_desc">Пожалуйста, пришлите скриншот этого уведомления на support@osmand.net</string>
-    </resources>
+    <string name="coord_input_edit_point">Редактировать точку</string>
+    <string name="coord_input_add_point">Добавить точку</string>
+    <string name="coord_input_save_as_track">Сохранить как трек</string>
+    <string name="coord_input_save_as_track_descr">Добавлено вами точек - %1$s. Введите имя файла и нажмите «Сохранить».</string>
+    </resources>
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@ -2543,7 +2543,7 @@
 	<string name="poi_social_facility_for_drug_addicted">Tosicodipendentes</string>
 	<string name="poi_social_facility_for_unemployed">Disocupados</string>
 	<string name="poi_social_facility_for_diseased">Malàidos</string>
-	<string name="poi_social_facility_for_child_juvenile">Pitzinnos; giòvanos</string>
+	<string name="poi_social_facility_for_child_juvenile">Pitzinnos, giòvanos</string>

 	<string name="poi_theatre_genre_philharmonic">Filarmònica</string>
 	<string name="poi_theatre_genre_musical">Musical</string>
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@ -314,7 +314,7 @@
 \n 
 \nSos datos globales (intre sos 70 grados nord e sos 70 grados sud) sunt basados in supra de sas medidas de su SRTM (Shuttle Radar Topography Mission) e de s’ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), un’aina medidora a bordu de Terra, su satellite de su sistema di osservatzione de sa terra de sa NASA. ASTER est un’isfortzu de coperassione intre sa NASA, su Ministeru de s’Economia Cummèrtziu e Industria (METI) de su Giapne, e su sistema ispatziale giaponesu (J-spacesystems).</string>
    <string name="map_widget_distancemeasurement">Medidura de sa distantzia</string>
-    <string name="audionotes_location_not_defined">Sa positzione da assotziare cun sa nota non est galu dessinida. \"Imprea positzione …\" pro assinzare una nota a sa positzione dislindada.</string>
+    <string name="audionotes_location_not_defined">Sa positzione da assotziare cun sa nota non est galu dessinida. \"Imprea positzione…\" pro assinzare una nota a sa positzione dislindada.</string>

    <string name="map_widget_audionotes">Notas àudio</string>
    <string name="audionotes_plugin_description">S’estensione pro sas notas àudio/vìdeo frunit sas funtzionalidades pro registrare notas àudio/foto/vìdeo durante su biàgiu, impreende su butone in s\'ischermu de sa mapa o su menù de cuntestu pro cale si siat positzione in sa mapa.</string>
@ -1499,7 +1499,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
    <string name="poi_edit_title">Muda PDI</string>
    <string name="poi_create_title">Crea PDI</string>
    <string name="poi_error_poi_not_found">Su nodu non podet èssere agatadu, o s’amenidade est fata de prus nodos, cosa chi no est galu suportada.</string>
-    <string name="poi_remove_confirm_template">Iscantzellare {0} (insertare unu cummentu)?</string>
+    <string name="poi_remove_confirm_template">Iscantzellare {0} (cummentu)?</string>
    <string name="poi_remove_title">Iscantzelladura PDI</string>
    <string name="shared_string_delete">Iscantzella</string>
    <string name="poi_remove_success">PDI iscantzelladu</string>
@ -2975,7 +2975,7 @@ Pro praghere iscrie su còdighe intreu</string>
    <string name="subsequent_dest_description">Moe sa destinatzione in subra, e crea·la</string>
    <string name="map_import_error">Errore cun s\'importatzione de sa mapa</string>
    <string name="map_imported_successfully">Mapa importada</string>
-    <string name="enter_the_file_name">Inserta su nùmene de su documentu.</string>
+    <string name="enter_the_file_name">Iscrie su nùmene de su documentu.</string>
    <string name="enter_lon">Inserta sa longitùdine</string>
    <string name="enter_lat">Inserta sa latitùdine</string>
    <string name="enter_lat_and_lon">Inserta sa longitùdine e sa latitùdine</string>
@ -3099,4 +3099,8 @@ Pro praghere iscrie su còdighe intreu</string>
    <string name="get_osmand_live">Abbona·ti a OsmAnd Live pro isblocare totu sas funtzionalidades: agiornamentos die pro die de sas mapas cun iscarrigamentos illimitados, totu sas estensiones de badas e a pagamentu, Wikipedia, Wikivoyage e meda àteru.</string>
    <string name="quick_action_edit_actions">Acontza sas atziones</string>
    <string name="error_notification_desc">Pro praghere imbia un\'ischermada de custa notìfica a support@osmand.net</string>
+    <string name="coord_input_edit_point">Modìfica su puntu</string>
+    <string name="coord_input_add_point">Annanghe puntu</string>
+    <string name="coord_input_save_as_track">Sarva comente rasta</string>
+    <string name="coord_input_save_as_track_descr">As annantu %1$s puntos. Iscrie unu nùmene pro su documentu e incarca \"Sarva\".</string>
    </resources>
--- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
@ -550,7 +550,7 @@ public class ConfigureMapMenu {
 						final OsmandSettings.OsmandPreference<Float> mapDensity = view.getSettings().MAP_DENSITY;
 						final AlertDialog.Builder bld = new AlertDialog.Builder(view.getContext());
 						int p = (int) (mapDensity.get() * 100);
-						final TIntArrayList tlist = new TIntArrayList(new int[]{33, 50, 75, 100, 150, 200, 300, 400});
+						final TIntArrayList tlist = new TIntArrayList(new int[]{25, 33, 50, 75, 100, 125, 150, 200, 300, 400});
 						final List<String> values = new ArrayList<>();
 						int i = -1;
 						for (int k = 0; k <= tlist.size(); k++) {
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@ -1253,7 +1253,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 				final OsmandSettings.OsmandPreference<Float> mapDensity = view.getSettings().MAP_DENSITY;
 				final AlertDialog.Builder bld = new AlertDialog.Builder(view.getContext());
 				int p = (int) (mapDensity.get() * 100);
-				final TIntArrayList tlist = new TIntArrayList(new int[]{20, 25, 33, 50, 75, 100, 150, 200, 300, 400});
+				final TIntArrayList tlist = new TIntArrayList(new int[]{25, 33, 50, 75, 100, 125, 150, 200, 300, 400});
 				final List<String> values = new ArrayList<>();
 				int i = -1;
 				for (int k = 0; k <= tlist.size(); k++) {