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

2018-07-02 10:29:38 +03:00 · 2018-07-02 10:29:38 +03:00 · 3eb4472c2f
commit 3eb4472c2f
parent 498dbc19b4 734b53abd6
64 changed files with 1291 additions and 338 deletions
--- a/OsmAnd-telegram/build.gradle
+++ b/OsmAnd-telegram/build.gradle
@ -16,6 +16,7 @@ android {
 			java.srcDirs = ["src"]
 			resources.srcDirs = ["src"]
 			res.srcDirs = ["res"]
+			assets.srcDirs = ["assets"]
 		}
 	}

@ -113,6 +114,7 @@ task downloadPrebuiltTelegram {

 task collectFonts(type: Copy) {
 	from "../../resources/fonts"
+	from "../../resources/fonts-telegram"
 	into "assets/fonts"
 	include "*.ttf"
 }
--- a/OsmAnd-telegram/res/drawable-hdpi/bg_introduction_image_top.webp
+++ b/OsmAnd-telegram/res/drawable-hdpi/bg_introduction_image_top.webp
--- a/OsmAnd-telegram/res/drawable-hdpi/bg_pattern_light.png
+++ b/OsmAnd-telegram/res/drawable-hdpi/bg_pattern_light.png
--- a/OsmAnd-telegram/res/drawable-hdpi/img_my_location_roadbg.webp
+++ b/OsmAnd-telegram/res/drawable-hdpi/img_my_location_roadbg.webp
--- a/OsmAnd-telegram/res/drawable-hdpi/img_my_location_user.png
+++ b/OsmAnd-telegram/res/drawable-hdpi/img_my_location_user.png
--- a/OsmAnd-telegram/res/drawable-mdpi/bg_introduction_image_top.webp
+++ b/OsmAnd-telegram/res/drawable-mdpi/bg_introduction_image_top.webp
--- a/OsmAnd-telegram/res/drawable-mdpi/bg_pattern_light.png
+++ b/OsmAnd-telegram/res/drawable-mdpi/bg_pattern_light.png
--- a/OsmAnd-telegram/res/drawable-mdpi/img_my_location_roadbg.webp
+++ b/OsmAnd-telegram/res/drawable-mdpi/img_my_location_roadbg.webp
--- a/OsmAnd-telegram/res/drawable-mdpi/img_my_location_user.png
+++ b/OsmAnd-telegram/res/drawable-mdpi/img_my_location_user.png
--- a/OsmAnd-telegram/res/drawable-xhdpi/bg_introduction_image_top.webp
+++ b/OsmAnd-telegram/res/drawable-xhdpi/bg_introduction_image_top.webp
--- a/OsmAnd-telegram/res/drawable-xhdpi/bg_pattern_light.png
+++ b/OsmAnd-telegram/res/drawable-xhdpi/bg_pattern_light.png
--- a/OsmAnd-telegram/res/drawable-xhdpi/img_my_location_roadbg.webp
+++ b/OsmAnd-telegram/res/drawable-xhdpi/img_my_location_roadbg.webp
--- a/OsmAnd-telegram/res/drawable-xhdpi/img_my_location_user.png
+++ b/OsmAnd-telegram/res/drawable-xhdpi/img_my_location_user.png
--- a/OsmAnd-telegram/res/drawable-xxhdpi/bg_introduction_image_top.webp
+++ b/OsmAnd-telegram/res/drawable-xxhdpi/bg_introduction_image_top.webp
--- a/OsmAnd-telegram/res/drawable-xxhdpi/bg_pattern_light.png
+++ b/OsmAnd-telegram/res/drawable-xxhdpi/bg_pattern_light.png
--- a/OsmAnd-telegram/res/drawable-xxhdpi/img_my_location_roadbg.webp
+++ b/OsmAnd-telegram/res/drawable-xxhdpi/img_my_location_roadbg.webp
--- a/OsmAnd-telegram/res/drawable-xxhdpi/img_my_location_user.png
+++ b/OsmAnd-telegram/res/drawable-xxhdpi/img_my_location_user.png
--- a/OsmAnd-telegram/res/layout/activity_main.xml
+++ b/OsmAnd-telegram/res/layout/activity_main.xml
@ -27,6 +27,35 @@

 	</FrameLayout>

+	<LinearLayout
+		android:id="@+id/buttons_bar"
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/buttons_bottom_bar_height"
+		android:background="?attr/card_bg_color"
+		android:gravity="center_vertical"
+		android:paddingLeft="@dimen/content_padding_half"
+		android:paddingRight="@dimen/content_padding_half"
+		android:visibility="gone"
+		tools:visibility="visible">
+
+		<include
+			layout="@layout/secondary_btn"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"/>
+
+		<View
+			android:layout_width="@dimen/content_padding_half"
+			android:layout_height="match_parent"/>
+
+		<include
+			layout="@layout/primary_btn"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"/>
+
+	</LinearLayout>
+
 	<android.support.design.widget.BottomNavigationView
 		android:id="@+id/bottom_navigation"
 		android:layout_width="match_parent"
--- a/OsmAnd-telegram/res/layout/fragment_my_location_tab.xml
+++ b/OsmAnd-telegram/res/layout/fragment_my_location_tab.xml
@ -28,21 +28,27 @@
 			android:paddingLeft="@dimen/my_location_text_sides_margin"
 			android:paddingRight="@dimen/my_location_text_sides_margin">

-			<TextView
-				android:id="@+id/title"
+			<FrameLayout
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="center"
-				android:text="@string/start_location_sharing"
-				android:textColor="?attr/ctrl_active_color"
-				android:textSize="@dimen/title_text_size"
-				android:textStyle="bold"/>
+				android:layout_height="@dimen/action_bar_height">
+
+				<net.osmand.telegram.ui.views.TextViewEx
+					android:id="@+id/title"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:gravity="center"
+					android:text="@string/start_location_sharing"
+					android:textColor="?attr/ctrl_active_color"
+					android:textSize="@dimen/title_text_size"
+					app:typeface="@string/font_roboto_mono_bold"/>
+
+			</FrameLayout>

 			<TextView
 				android:id="@+id/description"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginTop="@dimen/content_padding_half"
 				android:gravity="center"
 				android:text="@string/location_sharing_description"
 				android:textColor="?android:attr/textColorSecondary"
--- a/OsmAnd-telegram/res/layout/fragment_set_time_dialog.xml
+++ b/OsmAnd-telegram/res/layout/fragment_set_time_dialog.xml
@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/card_bg_color"
+	android:orientation="vertical">
+
+	<android.support.design.widget.AppBarLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/card_bg_color">
+
+		<net.osmand.telegram.ui.views.TextViewEx
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/action_bar_height"
+			android:ellipsize="end"
+			android:gravity="center_vertical"
+			android:maxLines="1"
+			android:paddingLeft="@dimen/content_padding_standard"
+			android:paddingRight="@dimen/content_padding_standard"
+			android:text="@string/set_time"
+			android:textColor="@color/app_bar_title_light"
+			android:textSize="@dimen/title_text_size"
+			app:typeface="@string/font_roboto_mono_bold"/>
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="@dimen/action_bar_descr_bottom_margin"
+			android:paddingLeft="@dimen/content_padding_standard"
+			android:paddingRight="@dimen/content_padding_standard"
+			android:text="@string/set_time_description"
+			android:textColor="?android:attr/textColorSecondary"
+			android:textSize="@dimen/descr_text_size"/>
+
+		<LinearLayout
+			android:id="@+id/time_for_all_row"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/action_bar_row_button_height"
+			android:background="?attr/selectableItemBackground"
+			android:gravity="center_vertical"
+			android:paddingLeft="@dimen/content_padding_standard"
+			android:paddingRight="@dimen/content_padding_standard">
+
+			<ImageView
+				android:id="@+id/time_for_all_icon"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginEnd="@dimen/content_padding_big"
+				android:layout_marginRight="@dimen/content_padding_big"
+				tools:src="@drawable/ic_action_time_span"
+				tools:tint="@color/ctrl_active_light"/>
+
+			<TextView
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_marginEnd="@dimen/content_padding_standard"
+				android:layout_marginRight="@dimen/content_padding_standard"
+				android:layout_weight="1"
+				android:ellipsize="end"
+				android:maxLines="1"
+				android:text="@string/visible_time_for_all"
+				android:textColor="?android:attr/textColorPrimary"
+				android:textSize="@dimen/descr_text_size"/>
+
+			<net.osmand.telegram.ui.views.TextViewEx
+				android:id="@+id/time_for_all_value"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:ellipsize="end"
+				android:maxLines="1"
+				android:textColor="?attr/ctrl_active_color"
+				android:textSize="@dimen/text_button_text_size"
+				app:typeface="@string/font_roboto_medium"
+				tools:text="1 hour"/>
+
+		</LinearLayout>
+
+	</android.support.design.widget.AppBarLayout>
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1">
+
+		<android.support.v7.widget.RecyclerView
+			android:id="@+id/recycler_view"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:clipToPadding="false"
+			android:paddingTop="9dp"/>
+
+		<ImageView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="bottom"
+			android:scaleType="fitXY"
+			android:src="?attr/bottom_nav_shadow"/>
+
+	</FrameLayout>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/buttons_bottom_bar_height"
+		android:gravity="center_vertical"
+		android:paddingLeft="@dimen/content_padding_half"
+		android:paddingRight="@dimen/content_padding_half">
+
+		<include
+			layout="@layout/secondary_btn"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"/>
+
+		<View
+			android:layout_width="@dimen/content_padding_half"
+			android:layout_height="match_parent"/>
+
+		<include
+			layout="@layout/primary_btn"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"/>
+
+	</LinearLayout>
+
+</LinearLayout>
--- a/OsmAnd-telegram/res/layout/live_now_chat_card.xml
+++ b/OsmAnd-telegram/res/layout/live_now_chat_card.xml
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
@ -37,23 +38,26 @@
 				android:layout_weight="1"
 				android:orientation="vertical">

-				<TextView
+				<net.osmand.telegram.ui.views.TextViewEx
 					android:id="@+id/title"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:ellipsize="end"
 					android:maxLines="1"
-					android:textAppearance="?attr/textAppearanceListItem"
-					android:textStyle="bold"
+					android:textColor="?android:textColorPrimary"
+					android:textSize="@dimen/list_item_title_text_size"
+					app:typeface="@string/font_roboto_regular"
 					tools:text="Share location"/>

-				<TextView
+				<net.osmand.telegram.ui.views.TextViewEx
 					android:id="@+id/description"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:ellipsize="end"
 					android:maxLines="1"
-					android:textAppearance="?attr/textAppearanceListItemSecondary"
+					android:textColor="?attr/android:textColorSecondary"
+					android:textSize="@dimen/list_item_description_text_size"
+					app:typeface="@string/font_roboto_regular"
 					tools:text="Live: 1 • All: 36"/>

 			</LinearLayout>
--- a/OsmAnd-telegram/res/layout/primary_btn.xml
+++ b/OsmAnd-telegram/res/layout/primary_btn.xml
@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/primary_btn_container"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="?attr/primary_btn_bg">

-	<TextView
+	<net.osmand.telegram.ui.views.TextViewEx
 		android:id="@+id/primary_btn"
 		android:layout_width="match_parent"
 		android:layout_height="@dimen/dialog_button_height"
@ -19,6 +20,7 @@
 		android:maxLines="1"
 		android:textColor="?attr/primary_btn_text_color"
 		android:textSize="@dimen/text_button_text_size"
+		app:typeface="@string/font_roboto_medium"
 		tools:ignore="UnusedAttribute"
 		tools:text="Primary button"/>

--- a/OsmAnd-telegram/res/layout/secondary_btn.xml
+++ b/OsmAnd-telegram/res/layout/secondary_btn.xml
@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/secondary_btn_container"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="?attr/secondary_btn_bg">

-	<TextView
+	<net.osmand.telegram.ui.views.TextViewEx
 		android:id="@+id/secondary_btn"
 		android:layout_width="match_parent"
 		android:layout_height="@dimen/dialog_button_height"
@ -19,6 +20,7 @@
 		android:maxLines="1"
 		android:textColor="?attr/ctrl_active_color"
 		android:textSize="@dimen/text_button_text_size"
+		app:typeface="@string/font_roboto_medium"
 		tools:ignore="UnusedAttribute"
 		tools:text="Secondary button"/>

--- a/OsmAnd-telegram/res/layout/user_list_item.xml
+++ b/OsmAnd-telegram/res/layout/user_list_item.xml
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
@ -36,23 +37,26 @@
 				android:layout_weight="1"
 				android:orientation="vertical">

-				<TextView
+				<net.osmand.telegram.ui.views.TextViewEx
 					android:id="@+id/title"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:ellipsize="end"
 					android:maxLines="1"
-					android:textAppearance="?attr/textAppearanceListItem"
-					android:textStyle="bold"
+					android:textColor="?android:textColorPrimary"
+					android:textSize="@dimen/list_item_title_text_size"
+					app:typeface="@string/font_roboto_regular"
 					tools:text="Share location"/>

-				<TextView
+				<net.osmand.telegram.ui.views.TextViewEx
 					android:id="@+id/description"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:ellipsize="end"
 					android:maxLines="1"
-					android:textAppearance="?attr/textAppearanceListItemSecondary"
+					android:textColor="?attr/android:textColorSecondary"
+					android:textSize="@dimen/list_item_description_text_size"
+					app:typeface="@string/font_roboto_regular"
 					tools:text="Live: 1 • All: 36"/>

 			</LinearLayout>
@ -66,6 +70,25 @@
 				android:visibility="gone"
 				tools:visibility="visible"/>

+			<net.osmand.telegram.ui.views.TextViewEx
+				android:id="@+id/text_in_area"
+				android:layout_width="wrap_content"
+				android:layout_height="@dimen/dialog_button_height"
+				android:layout_marginEnd="@dimen/image_button_padding"
+				android:layout_marginRight="@dimen/image_button_padding"
+				android:background="?attr/secondary_btn_bg"
+				android:ellipsize="end"
+				android:gravity="center"
+				android:maxLines="1"
+				android:paddingLeft="@dimen/image_button_padding"
+				android:paddingRight="@dimen/image_button_padding"
+				android:textColor="?attr/ctrl_active_color"
+				android:textSize="@dimen/text_button_text_size"
+				android:visibility="gone"
+				app:typeface="@string/font_roboto_medium"
+				tools:text="1 h"
+				tools:visibility="visible"/>
+
 		</LinearLayout>

 	</FrameLayout>
--- a/OsmAnd-telegram/res/values/colors.xml
+++ b/OsmAnd-telegram/res/values/colors.xml
@ -34,4 +34,6 @@
 	<color name="primary_btn_text_light">#ffffff</color>
 	<color name="primary_btn_text_dark">#cccccc</color>

+	<color name="app_bar_title_light">#333333</color>
+
 </resources>
--- a/OsmAnd-telegram/res/values/dimens.xml
+++ b/OsmAnd-telegram/res/values/dimens.xml
@ -3,10 +3,13 @@
 	<dimen name="content_padding_small">4dp</dimen>
 	<dimen name="content_padding_half">8dp</dimen>
 	<dimen name="content_padding_standard">16dp</dimen>
+	<dimen name="content_padding_big">24dp</dimen>

 	<dimen name="progress_bar_size_small">32dp</dimen>

-	<dimen name="action_bar_height">60dp</dimen>
+	<dimen name="action_bar_height">56dp</dimen>
+	<dimen name="action_bar_descr_bottom_margin">12dp</dimen>
+	<dimen name="action_bar_row_button_height">52dp</dimen>

 	<dimen name="dialog_padding_vertical">24dp</dimen>
 	<dimen name="dialog_padding_horizontal">60dp</dimen>
@ -36,6 +39,8 @@

 	<dimen name="search_box_height">48dp</dimen>

+	<dimen name="buttons_bottom_bar_height">56dp</dimen>
+
 	<dimen name="text_button_letter_spacing" format="float">0.01</dimen>

 	<!-- Text sizes -->
@ -45,6 +50,9 @@
 	<dimen name="title_text_size">18sp</dimen>
 	<dimen name="descr_text_size">16sp</dimen>

+	<dimen name="list_item_title_text_size">16sp</dimen>
+	<dimen name="list_item_description_text_size">12sp</dimen>
+
 	<dimen name="text_button_text_size">15sp</dimen>

 </resources>
--- a/OsmAnd-telegram/res/values/fonts.xml
+++ b/OsmAnd-telegram/res/values/fonts.xml
@ -2,4 +2,5 @@
 <resources>
 	<string name="font_roboto_regular">fonts/Roboto-Regular.ttf</string>
 	<string name="font_roboto_medium">fonts/Roboto-Medium.ttf</string>
+	<string name="font_roboto_mono_bold">fonts/RobotoMono-Bold.ttf</string>
 </resources>
--- a/OsmAnd-telegram/res/values/strings.xml
+++ b/OsmAnd-telegram/res/values/strings.xml
@ -1,4 +1,9 @@
 <resources>
+	<string name="shared_string_share">Share</string>
+	<string name="shared_string_back">Back</string>
+	<string name="visible_time_for_all">Visible time for all</string>
+	<string name="set_time_description">Set the time that your selected contacts and groups will see your location in real time.</string>
+	<string name="set_time">Set time</string>
 	<string name="location_sharing_description">Select the contacts and groups with whom you want to share your location.</string>
 	<string name="my_location_search_hint">Search: group or contact</string>
 	<string name="start_location_sharing">Start location sharing</string>
--- a/OsmAnd-telegram/src/net/osmand/telegram/helpers/FontCache.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/helpers/FontCache.kt
@ -3,22 +3,25 @@ package net.osmand.telegram.helpers
 import android.content.Context
 import android.graphics.Typeface
 import android.util.Log
+import net.osmand.telegram.R
 import java.util.concurrent.ConcurrentHashMap

 private const val TAG = "FontCache"
-private const val ROBOTO_MEDIUM = "fonts/Roboto-Medium.ttf"
-private const val ROBOTO_REGULAR = "fonts/Roboto-Regular.ttf"

 object FontCache {

 	private val fontsMap = ConcurrentHashMap<String, Typeface>()

 	fun getRobotoMedium(context: Context): Typeface? {
-		return getFont(context, ROBOTO_MEDIUM)
+		return getFont(context, context.getString(R.string.font_roboto_medium))
 	}

 	fun getRobotoRegular(context: Context): Typeface? {
-		return getFont(context, ROBOTO_REGULAR)
+		return getFont(context, context.getString(R.string.font_roboto_regular))
+	}
+
+	fun getRobotoMonoBold(context: Context): Typeface? {
+		return getFont(context, context.getString(R.string.font_roboto_mono_bold))
 	}

 	fun getFont(context: Context, fontName: String): Typeface? {
--- a/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramUiHelper.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramUiHelper.kt
@ -0,0 +1,29 @@
+package net.osmand.telegram.helpers
+
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.widget.ImageView
+import net.osmand.telegram.R
+import net.osmand.telegram.TelegramApplication
+
+object TelegramUiHelper {
+
+	fun setupPhoto(app: TelegramApplication, iv: ImageView?, photoPath: String?) {
+		if (iv == null) {
+			return
+		}
+		var drawable: Drawable? = null
+		var bitmap: Bitmap? = null
+		if (photoPath != null && photoPath.isNotEmpty()) {
+			bitmap = app.uiUtils.getCircleBitmap(photoPath)
+		}
+		if (bitmap == null) {
+			drawable = app.uiUtils.getThemedIcon(R.drawable.ic_group)
+		}
+		if (bitmap != null) {
+			iv.setImageBitmap(bitmap)
+		} else {
+			iv.setImageDrawable(drawable)
+		}
+	}
+}
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/LiveNowTabFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/LiveNowTabFragment.kt
@ -1,7 +1,5 @@
 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
@ -17,6 +15,7 @@ import net.osmand.telegram.R
 import net.osmand.telegram.TelegramApplication
 import net.osmand.telegram.helpers.TelegramHelper.TelegramAuthorizationState
 import net.osmand.telegram.helpers.TelegramHelper.TelegramListener
+import net.osmand.telegram.helpers.TelegramUiHelper
 import org.drinkless.td.libcore.telegram.TdApi

 private const val CHAT_VIEW_TYPE = 0
@ -140,7 +139,7 @@ class LiveNowTabFragment : Fragment(), TelegramListener {
 				val nextItemIsUser = !lastItem && items[position + 1] is TdApi.User
 				val chatTitle = item.title

-				setupIcon(holder.icon, item.photo?.small?.local?.path)
+				TelegramUiHelper.setupPhoto(app, holder.icon, item.photo?.small?.local?.path)
 				holder.title?.text = chatTitle
 				holder.description?.text = "Chat description" // FIXME
 				holder.imageButton?.setImageDrawable(app.uiUtils.getThemedIcon(R.drawable.ic_overflow_menu_white))
@ -180,7 +179,7 @@ class LiveNowTabFragment : Fragment(), TelegramListener {
 				holder.bottomDivider?.visibility = if (nextItemIsUser) View.VISIBLE else View.GONE
 				holder.bottomShadow?.visibility = if (lastItem) View.VISIBLE else View.GONE
 			} else if (item is TdApi.User && holder is ContactViewHolder) {
-				setupIcon(holder.icon, telegramHelper.getUserPhotoPath(item))
+				TelegramUiHelper.setupPhoto(app, holder.icon, telegramHelper.getUserPhotoPath(item))
 				holder.title?.text = "${item.firstName} ${item.lastName}"
 				holder.description?.text = "User description" // FIXME
 				holder.bottomShadow?.visibility = if (lastItem) View.VISIBLE else View.GONE
@ -189,22 +188,6 @@ class LiveNowTabFragment : Fragment(), TelegramListener {

 		override fun getItemCount() = items.size

-		private fun setupIcon(iv: ImageView?, photoPath: String?) {
-			var drawable: Drawable? = null
-			var bitmap: Bitmap? = null
-			if (photoPath != null && photoPath.isNotEmpty()) {
-				bitmap = app.uiUtils.getCircleBitmap(photoPath)
-			}
-			if (bitmap == null) {
-				drawable = app.uiUtils.getThemedIcon(R.drawable.ic_group)
-			}
-			if (bitmap != null) {
-				iv?.setImageBitmap(bitmap)
-			} else {
-				iv?.setImageDrawable(drawable)
-			}
-		}
-
 		inner class ContactViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
 			val icon: ImageView? = view.findViewById(R.id.icon)
 			val title: TextView? = view.findViewById(R.id.title)
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
@ -17,6 +17,8 @@ import android.support.v7.widget.AppCompatTextView
 import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.SwitchCompat
 import android.view.*
+import android.widget.LinearLayout
+import android.widget.TextView
 import android.widget.Toast
 import net.osmand.PlatformUtil
 import net.osmand.telegram.R
@ -24,6 +26,7 @@ import net.osmand.telegram.TelegramApplication
 import net.osmand.telegram.helpers.TelegramHelper
 import net.osmand.telegram.helpers.TelegramHelper.*
 import net.osmand.telegram.ui.LoginDialogFragment.LoginDialogType
+import net.osmand.telegram.ui.MyLocationTabFragment.ActionButtonsListener
 import net.osmand.telegram.ui.views.LockableViewPager
 import net.osmand.telegram.utils.AndroidUtils
 import org.drinkless.td.libcore.telegram.TdApi
@ -38,7 +41,7 @@ private const val PROGRESS_MENU_ID = 2
 private const val MY_LOCATION_TAB_POS = 0
 private const val LIVE_NOW_TAB_POS = 1

-class MainActivity : AppCompatActivity(), TelegramListener {
+class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListener {

 	private val log = PlatformUtil.getLog(TelegramHelper::class.java)

@ -54,6 +57,11 @@ class MainActivity : AppCompatActivity(), TelegramListener {

 	private val listeners: MutableList<WeakReference<TelegramListener>> = mutableListOf()

+	private var myLocationTabFragment: MyLocationTabFragment? = null
+
+	private lateinit var buttonsBar: LinearLayout
+	private lateinit var bottomNav: BottomNavigationView
+
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(R.layout.activity_main)
@ -66,17 +74,34 @@ class MainActivity : AppCompatActivity(), TelegramListener {
 			adapter = ViewPagerAdapter(supportFragmentManager)
 		}

-		findViewById<BottomNavigationView>(R.id.bottom_navigation).setOnNavigationItemSelectedListener {
-			var pos = -1
-			when (it.itemId) {
-				R.id.action_my_location -> pos = MY_LOCATION_TAB_POS
-				R.id.action_live_now -> pos = LIVE_NOW_TAB_POS
+		bottomNav = findViewById<BottomNavigationView>(R.id.bottom_navigation).apply {
+			setOnNavigationItemSelectedListener {
+				var pos = -1
+				when (it.itemId) {
+					R.id.action_my_location -> pos = MY_LOCATION_TAB_POS
+					R.id.action_live_now -> pos = LIVE_NOW_TAB_POS
+				}
+				if (pos != -1 && pos != viewPager.currentItem) {
+					viewPager.currentItem = pos
+					return@setOnNavigationItemSelectedListener true
+				}
+				false
 			}
-			if (pos != -1 && pos != viewPager.currentItem) {
-				viewPager.currentItem = pos
-				return@setOnNavigationItemSelectedListener true
+		}
+
+		buttonsBar = findViewById<LinearLayout>(R.id.buttons_bar).apply {
+			findViewById<TextView>(R.id.primary_btn).apply {
+				text = getString(R.string.shared_string_continue)
+				setOnClickListener {
+					myLocationTabFragment?.onPrimaryBtnClick()
+				}
+			}
+			findViewById<TextView>(R.id.secondary_btn).apply {
+				text = getString(R.string.shared_string_cancel)
+				setOnClickListener {
+					myLocationTabFragment?.onSecondaryBtnClick()
+				}
 			}
-			false
 		}

 		if (!LoginDialogFragment.welcomeDialogShown) {
@ -110,6 +135,9 @@ class MainActivity : AppCompatActivity(), TelegramListener {
 		if (fragment is TelegramListener) {
 			listeners.add(WeakReference(fragment))
 		}
+		if (fragment is MyLocationTabFragment) {
+			myLocationTabFragment = fragment
+		}
 	}

 	override fun onResume() {
@ -207,6 +235,14 @@ class MainActivity : AppCompatActivity(), TelegramListener {
 		}
 	}

+	override fun switchButtonsVisibility(visible: Boolean) {
+		val buttonsVisibility = if (visible) View.VISIBLE else View.GONE
+		if (buttonsBar.visibility != buttonsVisibility) {
+			buttonsBar.visibility = buttonsVisibility
+			bottomNav.visibility = if (visible) View.GONE else View.VISIBLE
+		}
+	}
+
 	private fun removeNonexistingChatsFromSettings() {
 		val presentChatTitles = telegramHelper.getChatTitles()
 		settings.removeNonexistingChats(presentChatTitles)
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt
@ -1,8 +1,6 @@
 package net.osmand.telegram.ui

 import android.animation.*
-import android.graphics.Bitmap
-import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.os.Bundle
@ -17,6 +15,7 @@ import net.osmand.telegram.R
 import net.osmand.telegram.TelegramApplication
 import net.osmand.telegram.helpers.TelegramHelper
 import net.osmand.telegram.helpers.TelegramHelper.TelegramListener
+import net.osmand.telegram.helpers.TelegramUiHelper
 import net.osmand.telegram.ui.MyLocationTabFragment.MyLocationListAdapter.ChatViewHolder
 import org.drinkless.td.libcore.telegram.TdApi

@ -49,11 +48,18 @@ class MyLocationTabFragment : Fragment(), TelegramListener {

 	private val selectedChats = HashSet<Long>()

+	private var actionButtonsListener: ActionButtonsListener? = null
+
 	override fun onCreateView(
 		inflater: LayoutInflater,
 		container: ViewGroup?,
 		savedInstanceState: Bundle?
 	): View? {
+		val activity = activity
+		if (activity is ActionButtonsListener) {
+			actionButtonsListener = activity
+		}
+
 		textMarginSmall = resources.getDimensionPixelSize(R.dimen.content_padding_standard)
 		textMarginBig = resources.getDimensionPixelSize(R.dimen.my_location_text_sides_margin)
 		searchBoxHeight = resources.getDimensionPixelSize(R.dimen.search_box_height)
@ -61,6 +67,9 @@ class MyLocationTabFragment : Fragment(), TelegramListener {

 		savedInstanceState?.apply {
 			selectedChats.addAll(getLongArray(SELECTED_CHATS_KEY).toSet())
+			if (selectedChats.isNotEmpty()) {
+				actionButtonsListener?.switchButtonsVisibility(true)
+			}
 		}

 		val mainView = inflater.inflate(R.layout.fragment_my_location_tab, container, false)
@ -164,6 +173,18 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 	override fun onSendLiveLocationError(code: Int, message: String) {
 	}

+	fun onPrimaryBtnClick() {
+		activity?.supportFragmentManager?.also {
+			SetTimeDialogFragment.showInstance(it, selectedChats)
+		}
+	}
+
+	fun onSecondaryBtnClick() {
+		selectedChats.clear()
+		adapter.notifyDataSetChanged()
+		actionButtonsListener?.switchButtonsVisibility(false)
+	}
+
 	private fun adjustText() {
 		val gravity = if (appBarCollapsed) Gravity.START else Gravity.CENTER
 		val padding = if (appBarCollapsed) textMarginSmall else textMarginBig
@ -195,23 +216,30 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 			searchBox.layoutParams = params
 		}

-		val animatorSet = AnimatorSet()
-		animatorSet.duration = 200
-		animatorSet.playTogether(cornerAnimator, marginAnimator)
-		if (Build.VERSION.SDK_INT >= 21) {
-			if (appBarCollapsed) {
-				animatorSet.addListener(object : AnimatorListenerAdapter() {
-					override fun onAnimationEnd(animation: Animator?) {
-						if (Build.VERSION.SDK_INT >= 21 && appBarCollapsed) {
-							appBarLayout.outlineProvider = appBarOutlineProvider
-						}
+		AnimatorSet().apply {
+			duration = 200
+			playTogether(cornerAnimator, marginAnimator)
+			addListener(object : AnimatorListenerAdapter() {
+				override fun onAnimationEnd(animation: Animator?) {
+					updateTitleTextColor()
+					if (appBarCollapsed && Build.VERSION.SDK_INT >= 21) {
+						appBarLayout.outlineProvider = appBarOutlineProvider
 					}
-				})
-			} else {
-				appBarLayout.outlineProvider = null
-			}
+				}
+			})
+			start()
+		}
+
+		if (!appBarCollapsed && Build.VERSION.SDK_INT >= 21) {
+			appBarLayout.outlineProvider = null
+		}
+	}
+
+	private fun updateTitleTextColor() {
+		val color = if (appBarCollapsed) R.color.app_bar_title_light else R.color.ctrl_active_light
+		context?.also {
+			title.setTextColor(ContextCompat.getColor(it, color))
 		}
-		animatorSet.start()
 	}

 	private fun updateList() {
@ -244,20 +272,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 			val chat = chats[position]
 			val lastItem = position == itemCount - 1

-			var drawable: Drawable? = null
-			var bitmap: Bitmap? = null
-			val chatPhoto = chat.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)
-			}
+			TelegramUiHelper.setupPhoto(app, holder.icon, chat.photo?.small?.local?.path)
 			holder.title?.text = chat.title
 			holder.description?.text = "Some description" // FIXME
 			holder.checkBox?.apply {
@ -270,6 +285,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 					} else {
 						selectedChats.remove(chat.id)
 					}
+					actionButtonsListener?.switchButtonsVisibility(selectedChats.isNotEmpty())
 				}
 			}
 			holder.bottomShadow?.visibility = if (lastItem) View.VISIBLE else View.GONE
@ -290,4 +306,8 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 			val bottomShadow: View? = view.findViewById(R.id.bottom_shadow)
 		}
 	}
+
+	interface ActionButtonsListener {
+		fun switchButtonsVisibility(visible: Boolean)
+	}
 }
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/SetTimeDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/SetTimeDialogFragment.kt
@ -0,0 +1,210 @@
+package net.osmand.telegram.ui
+
+import android.app.TimePickerDialog
+import android.os.Bundle
+import android.support.v4.app.DialogFragment
+import android.support.v4.app.FragmentManager
+import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+import net.osmand.telegram.R
+import net.osmand.telegram.TelegramApplication
+import net.osmand.telegram.helpers.TelegramUiHelper
+import net.osmand.telegram.ui.SetTimeDialogFragment.SetTimeListAdapter.ChatViewHolder
+import org.drinkless.td.libcore.telegram.TdApi
+import java.util.concurrent.TimeUnit
+
+class SetTimeDialogFragment : DialogFragment() {
+
+	private val app: TelegramApplication
+		get() = activity?.application as TelegramApplication
+
+	private val telegramHelper get() = app.telegramHelper
+
+	private val adapter = SetTimeListAdapter()
+
+	private val chatIdsToDuration = HashMap<Long, Long>()
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setStyle(DialogFragment.STYLE_NO_FRAME, R.style.AppTheme_NoActionbar)
+	}
+
+	override fun onCreateView(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+		savedInstanceState: Bundle?
+	): View? {
+		readFromBundle(savedInstanceState ?: arguments)
+
+		val view = inflater.inflate(R.layout.fragment_set_time_dialog, container)
+
+		view.findViewById<View>(R.id.time_for_all_row).apply {
+			findViewById<ImageView>(R.id.time_for_all_icon).setImageDrawable(
+				app.uiUtils.getIcon(R.drawable.ic_action_time_span, R.color.ctrl_active_light)
+			)
+			findViewById<TextView>(R.id.time_for_all_value).text = "1 hour"
+			setOnClickListener {
+				selectDuration()
+			}
+		}
+
+		view.findViewById<RecyclerView>(R.id.recycler_view).apply {
+			layoutManager = LinearLayoutManager(context)
+			adapter = this@SetTimeDialogFragment.adapter
+		}
+
+		view.findViewById<TextView>(R.id.secondary_btn).apply {
+			text = getString(R.string.shared_string_back)
+			setOnClickListener {
+				dismiss()
+			}
+		}
+
+		view.findViewById<TextView>(R.id.primary_btn).apply {
+			text = getString(R.string.shared_string_share)
+			setOnClickListener {
+				Toast.makeText(context, "Share", Toast.LENGTH_SHORT).show()
+			}
+		}
+
+		return view
+	}
+
+	override fun onResume() {
+		super.onResume()
+		updateList()
+	}
+
+	override fun onSaveInstanceState(outState: Bundle) {
+		super.onSaveInstanceState(outState)
+		val chats = mutableListOf<Long>()
+		for ((id, duration) in chatIdsToDuration) {
+			chats.add(id)
+			chats.add(duration)
+		}
+		outState.putLongArray(CHATS_KEY, chats.toLongArray())
+	}
+
+	private fun readFromBundle(bundle: Bundle?) {
+		chatIdsToDuration.clear()
+		bundle?.getLongArray(CHATS_KEY)?.also {
+			for (i in 0 until it.size step 2) {
+				chatIdsToDuration[it[i]] = it[i + 1]
+			}
+		}
+	}
+
+	private fun selectDuration(id: Long? = null) {
+		val (defHours, defMinutes) = secondsToHoursAndMinutes(DEFAULT_VISIBLE_TIME_SECONDS)
+		TimePickerDialog(
+			context,
+			TimePickerDialog.OnTimeSetListener { _, hours, minutes ->
+				val seconds = TimeUnit.HOURS.toSeconds(hours.toLong()) +
+						TimeUnit.MINUTES.toSeconds(minutes.toLong())
+				if (id != null) {
+					chatIdsToDuration[id] = seconds
+				} else {
+					chatIdsToDuration.keys.forEach {
+						chatIdsToDuration[it] = seconds
+					}
+				}
+				adapter.notifyDataSetChanged()
+			}, defHours, defMinutes, true
+		).show()
+	}
+
+	private fun secondsToHoursAndMinutes(seconds: Long): Pair<Int, Int> {
+		val hours = TimeUnit.SECONDS.toHours(seconds)
+		val minutes = TimeUnit.SECONDS.toMinutes(seconds - TimeUnit.HOURS.toSeconds(hours))
+		return Pair(hours.toInt(), minutes.toInt())
+	}
+
+	private fun formatDuration(seconds: Long): String {
+		val (hours, minutes) = secondsToHoursAndMinutes(seconds)
+		return when {
+			hours != 0 && minutes == 0 -> String.format("%d h", hours)
+			hours == 0 && minutes != 0 -> String.format("%02d m", minutes)
+			else -> String.format("%d h, %02d m", hours, minutes)
+		}
+	}
+
+	private fun updateList() {
+		val chats: MutableList<TdApi.Chat> = mutableListOf()
+		telegramHelper.getChatList().filter { chatIdsToDuration.keys.contains(it.chatId) }
+			.forEach { orderedChat ->
+				telegramHelper.getChat(orderedChat.chatId)?.also { chats.add(it) }
+			}
+		adapter.chats = chats
+	}
+
+	inner class SetTimeListAdapter : RecyclerView.Adapter<ChatViewHolder>() {
+
+		var chats: List<TdApi.Chat> = emptyList()
+			set(value) {
+				field = value
+				notifyDataSetChanged()
+			}
+
+		override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChatViewHolder {
+			val view = LayoutInflater.from(parent.context)
+				.inflate(R.layout.user_list_item, parent, false)
+			return ChatViewHolder(view)
+		}
+
+		override fun onBindViewHolder(holder: ChatViewHolder, position: Int) {
+			val chat = chats[position]
+
+			TelegramUiHelper.setupPhoto(app, holder.icon, chat.photo?.small?.local?.path)
+			holder.title?.text = chat.title
+			holder.description?.text = "Some description" // FIXME
+			holder.textInArea?.apply {
+				visibility = View.VISIBLE
+				chatIdsToDuration[chat.id]?.also { text = formatDuration(it) }
+			}
+			holder.bottomShadow?.visibility = View.GONE
+			holder.itemView.setOnClickListener {
+				selectDuration(chat.id)
+			}
+		}
+
+		override fun getItemCount() = chats.size
+
+		inner class ChatViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
+			val icon: ImageView? = view.findViewById(R.id.icon)
+			val title: TextView? = view.findViewById(R.id.title)
+			val description: TextView? = view.findViewById(R.id.description)
+			val textInArea: TextView? = view.findViewById(R.id.text_in_area)
+			val bottomShadow: View? = view.findViewById(R.id.bottom_shadow)
+		}
+	}
+
+	companion object {
+
+		private const val TAG = "SetTimeDialogFragment"
+		private const val CHATS_KEY = "chats_key"
+		private const val DEFAULT_VISIBLE_TIME_SECONDS = 60 * 60L // 1 hour
+
+		fun showInstance(fm: FragmentManager, chatIds: Set<Long>): Boolean {
+			return try {
+				val chats = mutableListOf<Long>()
+				for (id in chatIds) {
+					chats.add(id)
+					chats.add(DEFAULT_VISIBLE_TIME_SECONDS)
+				}
+				SetTimeDialogFragment().apply {
+					arguments = Bundle().apply { putLongArray(CHATS_KEY, chats.toLongArray()) }
+					show(fm, TAG)
+				}
+				true
+			} catch (e: RuntimeException) {
+				false
+			}
+		}
+	}
+}
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="recording_context_menu_show">اظهر</string>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="recording_context_menu_show">اظهر</string>
    <string name="av_def_action_picture">التقط صورة</string>
    
    <string name="av_def_action_video">تسجيل الفيديو</string>
@ -2326,7 +2327,7 @@
    <string name="trip_rec_notification_settings_desc">عرض اشعار نظامي للسماح ببدء تسجيل الرحلة.</string>
    <string name="shared_string_notifications">الإشعارات</string>
    <string name="gpx_no_tracks_title_folder">يمكنك أيضا إضافة مسارات إلى المجلد</string>
-    <string name="gpx_add_track">إضافة مسار</string>
+    <string name="gpx_add_track">إضافة المزيد …</string>
    <string name="gpx_appearance">المظهر</string>
    
    <string name="upload_poi">رفع POI</string>
@ -2660,7 +2661,7 @@
    <string name="choose_navigation_type">اختر بروفايل الملاحة</string>
    <string name="add_route_points">إضافة نقاط مسار</string>
    <string name="add_line">إضافة خط</string>
-    <string name="empty_state_my_tracks">إضافة وتسجيل المسارات</string>
+    <string name="empty_state_my_tracks">إضافة ملفات GPX</string>
    <string name="empty_state_my_tracks_desc">تسجيل أو استيراد مسارات للعرض.</string>
    <string name="empty_state_favourites">إضافة المفضلات</string>
    <string name="empty_state_favourites_desc">إضافة المفضلة على الخريطة أو استيرادها من ملف.</string>
@ -2796,7 +2797,7 @@
    <string name="osm_recipients_label">مساهمي OSM المستفيدون</string>
    <string name="winter_and_ski_renderer">الشتاء و التزحلق</string>
    <string name="nautical_renderer">الملاحة البحرية</string>
-<string name="nothing_found_in_radius">لم نتمكن مِن العثور على أي شيء في هذا القُطر :</string>
+<string name="nothing_found_in_radius">لم نتمكن مِن العثور على أي شيء :</string>
    <string name="select_waypoints_category_description">بإمكانك إضافة كل نقاط المسار أو إختيار فئات أخرى.</string>
    <string name="shared_string_total">الإجمالي</string>
    <string name="clear_all_intermediates">إزالة كافة النقاط الوسيطة</string>
@ -2894,6 +2895,6 @@
    <string name="how_to_open_link">كيف يُفتح الرابط ؟</string>
    <string name="read_wikipedia_offline">قراءة ويكيبيديا مِن دون اتصال</string>
    <string name="download_all">تنزيل الكل</string>
-    <string name="shared_string_restart">إعادة التشغيل</string>
+    <string name="shared_string_restart">إعادة تشغيل التطبيق</string>
    <string name="shared_string_bookmark">إشارة مرجعية</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@ -3902,4 +3902,7 @@

 	<string name="poi_outcrop">Агаленне</string>

+<string name="poi_payment_contactless_yes">Безкантактная</string>
+	<string name="poi_payment_contactless_no">Безкантактная аплата не прымаецца</string>
+
 </resources>
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@ -3946,4 +3946,7 @@

 	<string name="poi_outcrop">Klippefremspring</string>

+<string name="poi_payment_contactless_yes">Kontaktløs</string>
+	<string name="poi_payment_contactless_no">Kontaktløs ikke accepteret</string>
+
 </resources>
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@ -2427,7 +2427,7 @@ Proportional hukommelse %4$s MB (Android grænse %5$s MB, Dalvik %6$s MB).</stri
    
    <string name="gpx_no_tracks_title">Endnu ingen GPX-filer</string>
    <string name="gpx_no_tracks_title_folder">Tilføj også GPX-filer til mappen</string>
-    <string name="gpx_add_track">Tilføj GPX-fil</string>
+    <string name="gpx_add_track">Tilføj flere…</string>
    <string name="gpx_appearance">Udseende</string>
    <string name="rendering_value_fine_name">Fin</string>
    <string name="route_calculation">Ruteberegning</string>
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@ -3864,4 +3864,7 @@

 	<string name="poi_outcrop">Aufschluss</string>

+<string name="poi_payment_contactless_yes">Kontaktlos</string>
+	<string name="poi_payment_contactless_no">Kontaktlos nicht akzeptiert</string>
+
 </resources>
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@ -2325,7 +2325,7 @@ Derzeit sind nur {2} MB verfügbar.</string>
    <string name="route_calculation">Routenberechnung</string>
    <string name="gpx_no_tracks_title">Sie haben noch keine GPX-Dateien</string>
    <string name="gpx_no_tracks_title_folder">GPX-Dateien können dem Ordner hinzugefügt werden</string>
-    <string name="gpx_add_track">GPX-Datei hinzufügen</string>
+    <string name="gpx_add_track">Weitere hinzufügen…</string>
    <string name="upload_poi">POI hochladen</string>
    <string name="route_roundabout_short">Nehmen Sie die %1$d Ausfahrt</string>
    <string name="search_map_hint">Suche Stadt oder Region</string>
--- a/OsmAnd/res/values-el/phrases.xml
+++ b/OsmAnd/res/values-el/phrases.xml
@ -3143,4 +3143,44 @@
 	<string name="poi_toilets_disposal_chemical">Εκκένωση τουαλέτας: χημική</string>
 	<string name="poi_toilets_disposal_bucket">Εκκένωση τουαλέτας: κουβάς</string>

+	<string name="poi_length">Μήκος</string>
+
+	<string name="poi_wiki_link">Βικιπαίδεια</string>
+
+	<string name="poi_xmas">Χριστούγεννα</string>
+	<string name="poi_xmas_event">Χριστουγεννιάτικη γιορτή</string>
+	<string name="poi_xmas_market">Χριστουγεννιατικές αγορές</string>
+	<string name="poi_xmas_pyramid">Πυραμίδα των Χριστουγέννων</string>
+	<string name="poi_xmas_shop">Χριστουγεννιάτικο κατάστημα</string>
+	<string name="poi_xmas_shop_christmas_tree">Κατάστημα με χριστουγεννιάτικα δέντρα</string>
+	<string name="poi_xmas_tree">Χριστουγεννιάτικο δέντρο</string>
+	<string name="poi_xmas_day_date">Χριστούγεννα: περίοδος εκδήλωσης</string>
+	<string name="poi_xmas_note">Χριστούγεννα: σημείωση</string>
+	<string name="poi_xmas_opening_hours">Χριστούγεννα: ώρες λειτουργίας</string>
+	<string name="poi_xmas_location">Χριστούγεννα: τοποθεσία</string>
+	<string name="poi_xmas_url">Χριστούγεννα: ιστότοπος</string>
+
+	<string name="poi_public_bookcase">Δημόσια βιβλιοθήκη</string>
+	<string name="poi_public_bookcase_type_phone_box">Τύπος: τηλεφωνικός θάλαμος</string>
+	<string name="poi_public_bookcase_type_reading_box">Τύπος: κιβώτιο ανάγνωσης</string>
+	<string name="poi_public_bookcase_type_wooden_cabinet">Τύπος: ξύλινο ερμάριο</string>
+	<string name="poi_public_bookcase_type_metal_cabinet">Τύπος: μεταλλικό ερμάριο</string>
+	<string name="poi_public_bookcase_type_shelf">Τύπος: ραφιέρα</string>
+
+	<string name="poi_cuisine">Κουζίνα</string>
+	<string name="poi_cuisine_pizza">Πίτσα</string>
+	<string name="poi_cuisine_burger">Μπέργκερ</string>
+	<string name="poi_cuisine_coffee">Καφές</string>
+	<string name="poi_cuisine_sandwich">Σάντουιτς</string>
+	<string name="poi_cuisine_kebab">Καλαμάκι (Κεμπάμπ)</string>
+	<string name="poi_cuisine_doner">Ντόνερ κεμπάμπ (σαουάρμα)</string>
+	<string name="poi_cuisine_chicken">Κοτόπουλο</string>
+	<string name="poi_cuisine_ice_cream">Παγωτό</string>
+	<string name="poi_cuisine_sushi">Σούσι</string>
+	<string name="poi_cuisine_fish_and_chips">Ψάρι και πατατάκια</string>
+	<string name="poi_cuisine_seafood">Θαλασσινά</string>
+	<string name="poi_cuisine_barbecue">Ψησταριά</string>
+	<string name="poi_cuisine_noodle">Ζυμαρικά (νουντλ)</string>
+	<string name="poi_cuisine_donut">Λουκουμάς (ντόνατ)</string>
+	<string name="poi_cuisine_ramen">Ράμεν</string>
 	</resources>
--- a/OsmAnd/res/values-eo/phrases.xml
+++ b/OsmAnd/res/values-eo/phrases.xml
@ -3871,4 +3871,7 @@

 	<string name="poi_outcrop">Rok-malfermejo</string>

+<string name="poi_payment_contactless_yes">senkontakta (alproksima)</string>
+	<string name="poi_payment_contactless_no">Senkontakta pagmaniero malakceptata</string>
+
 </resources>
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@ -2197,7 +2197,7 @@ Proporcia memoro %4$s MB (limito de Android %5$s MB, Dalvik %6$s MB).</string>
    
    <string name="gpx_no_tracks_title">Vi ankoraŭ havas neniujn GPX-dosierojn</string>
    <string name="gpx_no_tracks_title_folder">Vi ankaŭ povas aldoni GPX-dosierojn al la dosierujo</string>
-    <string name="gpx_add_track">Aldoni GPX-dosieron</string>
+    <string name="gpx_add_track">Aldoni pli…</string>
    <string name="gpx_appearance">Aspekto</string>
    <string name="rendering_value_fine_name">Eteta</string>
    <string name="route_calculation">Difinado de vojo</string>
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@ -3918,4 +3918,7 @@

 	<string name="poi_outcrop">Afloramiento</string>

+<string name="poi_payment_contactless_yes">Pago sin contacto</string>
+	<string name="poi_payment_contactless_no">No acepta Pagos sin contacto</string>
+
 </resources>
--- a/OsmAnd/res/values-es-rUS/phrases.xml
+++ b/OsmAnd/res/values-es-rUS/phrases.xml
@ -3677,4 +3677,7 @@

 	<string name="poi_outcrop">Afloramiento</string>

+<string name="poi_payment_contactless_yes">Pago sin contacto</string>
+	<string name="poi_payment_contactless_no">"No acepta Pagos sin contacto "</string>
+
 </resources>
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="no_route">Ei reittiä</string>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="no_route">Ei reittiä</string>
 	<string name="delete_target_point">Poista päämäärä</string>
 	<string name="target_point">Päämäärä %1$s</string>
    <string name="intermediate_point">Välietappi %1$s</string>
@ -279,7 +280,7 @@
 	<string name="map_orientation_portrait">Pystysuunta</string>
 	<string name="map_orientation_landscape">Vaakasuunta</string>
 	<string name="map_screen_orientation">Näytön orientaatio</string>
-	<string name="map_screen_orientation_descr">Pysty, vaaka tai laitteen</string>
+	<string name="map_screen_orientation_descr">Pysty, vaaka tai sama kuin laitteen.</string>
 	<string name="add_new_rule">Lisää uusi sääntö</string>
 	<string name="transport_Routes">Reitit</string>
 	<string name="transport_Stop">Pysähdys</string>
@ -760,7 +761,7 @@
 	<string name="search_for">Etsi</string>
 	<string name="search_poi_category_hint">Kirjoita etsiäksesi kaikista</string>
    <string name="search_position_map_view">Nykyisen kartan keskusta</string>
-	<string name="configure_map">Kartta asetukset</string>
+	<string name="configure_map">Kartta-asetukset</string>
    <string name="plugins_screen">Lisäosat</string>
 	<string name="prefs_plugins">Lisäosat</string>
 	<string name="route_descr_select_destination">Valitse kohde</string>
@ -777,7 +778,7 @@
 	<string name="routing_attr_avoid_motorway_description">Vältä moottoriteitä</string>
 	<string name="shared_string_none">Ei mitään</string>
 	<string name="max_speed_none">ei mitään</string>
-    <string name="routing_settings_2">Navigointi asetukset</string>
+    <string name="routing_settings_2">Navigointiasetukset</string>
    <string name="navigate_point_top_text">Syötä leveysaste &amp; pituusaste valitussa muodossa (D - astetta, M - minuuttia, S - sekuntia)</string>
 	<string name="navigate_point_format">Muoto</string>
 	<string name="storage_directory_external">Ulkoinen tallennustila</string>
@ -912,15 +913,15 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
 	<string name="search_map_hint">Etsi kaupunkia tai aluetta</string>
    <string name="route_roundabout_short">Poistu %1$d. liittymästä</string>
    <string name="route_calculation">Reitin laskenta</string>
-    <string name="gpx_no_tracks_title">Sinulla ei ole vielä jälkiä</string>
-    <string name="gpx_no_tracks_title_folder">Voit myös lisätä jälkiä hakemistoon</string>
+    <string name="gpx_no_tracks_title">Sinulla ei ole vielä yhtään GPX-tiedostoa</string>
+    <string name="gpx_no_tracks_title_folder">Voit myös lisätä GPX-tiedostoja hakemistoon</string>
    <string name="gpx_add_track">Lisää jälki</string>
    <string name="gpx_appearance">Ulkoasu</string>
    
    
    
    <string name="trip_rec_notification_settings">Matkan tallennus (ei dataa)</string>
-    <string name="trip_rec_notification_settings_desc">Näytä huomautus, josta voi aloittaa matkan mittauksen painamalla Nauhoita-näppäintä</string>
+    <string name="trip_rec_notification_settings_desc">Näytä ilmoitus, josta voi aloittaa matkan tallennuksen painamalla Nauhoita-näppäintä.</string>
    <string name="shared_string_notifications">Huomautukset</string>
    <string name="shared_string_continue">Jatka</string>
    <string name="shared_string_pause">Keskeytä</string>
@ -930,7 +931,7 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
    <string name="gpx_logging_no_data">Ei dataa</string>
    <string name="rendering_attr_contourColorScheme_description">Korkeuskäyräviivojen väripaletti</string>
    <string name="save_track_min_speed">Miniminopeuden kirjaaminen</string>
-    <string name="save_track_min_speed_descr">Aseta miniminopeus kirjattavalle pisteelle</string>
+    <string name="save_track_min_speed_descr">Aseta miniminopeus kirjattavalle pisteelle.</string>
    <string name="save_track_min_distance">Liikkeen tunnistuksen kirjaus</string>
    <string name="save_track_min_distance_descr">Aseta kirjattavan pisteen minimietäisyys edellisestä sijainnista</string>
    <string name="save_track_precision">Pienin kirjattava tarkkuus</string>
@ -965,18 +966,18 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
    <string name="storage_free_space">Vapaata tilaa</string>
    <string name="give_permission">Anna oikeus</string>
    <string name="allow_access_location">Salli pääsy sijaintiin</string>
-    <string name="search_my_location">Hae sijaintini</string>
-    <string name="no_update_info">Älä näytä päivityksiä</string>
-    <string name="update_all_maps_now">Haluatko päivittää kaikki kartat nyt?</string>
+    <string name="search_my_location">Löydä sijaintini</string>
+    <string name="no_update_info">Älä näytä uusia versioita</string>
+    <string name="update_all_maps_now">Päivitetäänkö kaikki kartat nyt?</string>
    <string name="clear_tile_data">Poista kaikki tiilet</string>
    <string name="routing_attr_short_way_name">Polttoainetaloudellinen reitti</string>
-    <string name="routing_attr_short_way_description">Käytä polttoainetaloudellista reittiä (tavallisesti lyhin)</string>
+    <string name="routing_attr_short_way_description">Käytä polttoainetta säästävää reittiä (tavallisesti lyhin).</string>
    <string name="shared_string_change">Muuta</string>
    <string name="get_started">Aloita</string>
    <string name="coords_search">Koordinaattihaku</string>
    <string name="advanced_coords_search">Edistynyt koordinaattihaku</string>
    <string name="back_to_search">Takaisin hakuun</string>
-    <string name="confirmation_to_delete_history_items">Haluatko poistaa valitsemasi jäsenet historiasta?</string>
+    <string name="confirmation_to_delete_history_items">Haluatko poistaa valitsemasi kohteet historiasta?</string>
    <string name="show_something_on_map">Näytä %1$s kartalla</string>
    <string name="search_categories">Luokat</string>
    <string name="postcode">Postinumero</string>
@ -985,20 +986,20 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
 	<string name="shared_string_is_open_24_7">Avoinna 24/7</string>
    <string name="storage_directory_card">Muistikortti</string>
    <string name="coords_format">Koordinaattimuoto</string>
-    <string name="coords_format_descr">Maantieteellisten koordinaattien muoto</string>
+    <string name="coords_format_descr">Maantieteellisten koordinaattien muoto.</string>
  	<string name="app_mode_bus">Bussi</string>
 	<string name="app_mode_train">Juna</string>
    <string name="current_track">Nykyinen jälki</string>
    <string name="map_widget_battery">Akun taso</string>
-    <string name="change_markers_position">Muuta merkin sijaintia</string>
-    <string name="use_osm_live_routing">OSM Live suunnistamine</string>
-    <string name="access_no_destination">Päämäärää ei ole asetettu</string>
+    <string name="change_markers_position">Muuta markkerin sijaintia</string>
+    <string name="use_osm_live_routing">OsmAnd Live -navigointi</string>
+    <string name="access_no_destination">Kohdetta ei asetettu</string>
    <string name="access_default_color">Oletusväri</string>
    <string name="access_category_choice">Valitse luokka</string>
    <string name="access_hint_enter_name">Anna nimi</string>
    <string name="access_hint_enter_category">Anna luokka</string>
-    <string name="access_hint_enter_description">Anna kuvaus</string>
-    <string name="access_map_linked_to_location">Kartta on linkitetty sijaintiin</string>
+    <string name="access_hint_enter_description">Syötä kuvaus.</string>
+    <string name="access_map_linked_to_location">Kartta linkitetty sijaintiin</string>
    <string name="access_shared_string_not_installed">Ei asennettu</string>
    <string name="access_widget_expand">Laajenna</string>
    <string name="access_shared_string_navigate_up">Navigointi ylös</string>
@ -1017,8 +1018,8 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
    
    
    
-    <string name="shared_string_move_up">Siirrä ylös</string>
-    <string name="shared_string_move_down">Siirrä alas</string>
+    <string name="shared_string_move_up">Siirrä ↑</string>
+    <string name="shared_string_move_down">Siirrä ↓</string>
    <string name="finish_navigation">Lopeta navigaatio</string>
    <string name="avoid_road">Vältä teitä</string>
    <string name="storage_directory_shared">Jaettu muisti</string>
@ -1048,29 +1049,29 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
    <string name="rendering_attr_hideOverground_name">Maanpäälliset objektit</string>
    <string name="route_stops_before">%1$s pysähdystä ennen</string>
    <string name="dist_away_from_my_location">Etsi %1$s etäisyydellä</string>
-    <string name="share_history_subject">" jaettu OsmAndista"</string>
+    <string name="share_history_subject">jaettu OsmAndilla</string>
    <string name="shared_string_from">lähtien</string>
    <string name="city_type_district">Alue</string>
-    <string name="move_marker_bottom_sheet_title">Siirrä karttaa muuttaaksesi merkin sijaintia</string>
+    <string name="move_marker_bottom_sheet_title">Siirrä karttaa muuttaaksesi markkerin sijaintia</string>
    <string name="follow_us">Seuraa meitä</string>
-    <string name="access_direction_audio_feedback_descr">Osoita kohdepisteen suuntaa äänellä</string>
-    <string name="access_direction_haptic_feedback_descr">Osoita kohdepisteen suuntaa värinällä</string>
+    <string name="access_direction_audio_feedback_descr">Osoita kohdepisteen suuntaa äänellä.</string>
+    <string name="access_direction_haptic_feedback_descr">Osoita kohdepisteen suuntaa värinällä.</string>
    <string name="use_osm_live_routing_description">Ota käyttöön navigaatio OSM Liven muutoksilla (Beta)</string>
-	<string name="access_disable_offroute_recalc">Älä muuta reittiä kun olet pois tieltä</string>
-    <string name="access_disable_offroute_recalc_descr">Estä automaattinen reitin uudelleen laskenta kun olet varsin kaukana oikealta tieltä</string>
-    <string name="access_disable_wrong_direction_recalc">Älä vaihda reitttiä virheellisellä suunnalla</string>
-    <string name="access_disable_wrong_direction_recalc_descr">Estä automaattinen reitin uudelleenlaskenta kun olet liikkumassa väärään suuntaan</string>
+	<string name="access_disable_offroute_recalc">Ei reitin uudelleenlaskentaa reitiltä poistuttua</string>
+    <string name="access_disable_offroute_recalc_descr">Estä automaattinen reitin uudelleenlaskenta reitiltä poistuessa.</string>
+    <string name="access_disable_wrong_direction_recalc">Älä vaihda reittiä virheellisellä suunnalla</string>
+    <string name="access_disable_wrong_direction_recalc_descr">Estä automaattinen reitin uudelleenlaskenta liikkuessasi väärään suuntaan.</string>
    <string name="access_smart_autoannounce">Älykkäät automaattiset huomautukset</string>
-    <string name="access_smart_autoannounce_descr">Huomauta ainoastaan kun suuntaa kohdepisteeseen on muutettu</string>
+    <string name="access_smart_autoannounce_descr">Huomauta ainoastaan kun suunta kohdepisteeseen muuttuu.</string>
    <string name="access_autoannounce_period">Automaattisen huomautuksen väliaika</string>
-    <string name="access_autoannounce_period_descr">Minimi aikaväli huomautusten välillä</string>
+    <string name="access_autoannounce_period_descr">Minimiaika kuulutusten välillä.</string>
    <string name="access_expanded_list">Laajennettu luettelo</string>
    <string name="access_collapsed_list">Tiivistetty luettelo</string>
    <string name="access_empty_list">Tyhjä luettelo</string>
    <string name="access_tree_list">Puurakenteinen luettelo</string>
    <string name="no_map_markers_found">Lisää karttamerkit kartalla</string>
    
-    <string name="storage_permission_restart_is_required">Nyt sovelluksella on lupa kirjoittaa ulkoiselle tallennuslaitteelle. Uudelleenkäynnistys vaaditaan.</string>
+    <string name="storage_permission_restart_is_required">Sovelluksella on nyt lupa kirjoittaa ulkoiselle tallennusvälineelle. Uudelleenkäynnistys vaaditaan.</string>
    <string name="shared_string_topbar">Yläpalkki</string>
    <string name="full_report">Koko raportti</string>
    <string name="open_street_map_login_and_pass">"OpenStreetMap-käyttäjätunnus ja  -salasana"</string>
@ -1089,17 +1090,17 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
    <string name="map_markers_other">Muut markkerit</string>
    <string name="upload_anonymously">Lataa anonyymisti</string>
    <string name="show_transparency_seekbar">Näytä läpinäkyvä hakutieto</string>
-    <string name="map_marker_1st">Ensimmäinen karttamerkki</string>
-    <string name="map_marker_2nd">Toinen karttamerkki</string>
+    <string name="map_marker_1st">Ensimmäinen karttamarkkeri</string>
+    <string name="map_marker_2nd">Toinen karttamarkkeri</string>
    <string name="add_points_to_map_markers_q">Haluatko lisätä kaikki pisteet karttamarkkereihin?</string>
    <string name="shared_string_add_to_map_markers">Lisää karttamarkkereihin</string>
    <string name="select_map_markers">Valitse karttamarkkerit</string>
    <string name="shared_string_reverse_order">Käänteinen järjestys</string>
    <string name="show_map_markers_description">Aktivoi karttamarkkeriominaisuus</string>
    <string name="clear_active_markers_q">Haluatko poistaa kaikki aktiiviset markkerit?</string>
-    <string name="clear_markers_history_q">Haluatko tyhjentää karttamarkerien historian?</string>
+    <string name="clear_markers_history_q">Tyhjennä karttamarkkerien historia?</string>
    <string name="active_markers">Aktivoi markkerit</string>
-    <string name="map_markers">Karttamarkerit</string>
+    <string name="map_markers">Karttamarkkerit</string>
    <string name="map_marker">Karttamarkkeri</string>
    <string name="back_to_map">Takaisin karttaan</string>
    <string name="rendering_category_transport">Kulkuväline</string>
@ -1107,9 +1108,9 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
    <string name="map_widget_magnetic_bearing">Magneettinen suunta</string>
    <string name="map_widget_bearing">Suhteellinen suunta</string>
    <string name="anonymous_user_hint">Anonyymi käyttäjä ei voi:
- luoda ryhmiä;
- synkronoida ryhmiä ja laitteita palvelimen kanssa;
- hallita ryhmiä ja laitteita henkilökohtaisella hallintapanelilla websivustolla.</string>
+\n- luoda ryhmiä; 
+\n- synkronoida ryhmiä ja laitteita palvelimen kanssa;
+\n- hallita ryhmiä ja laitteita henkilökohtaisella hallintapaneelilla websivustolla.</string>
    <string name="osm_user_stat">Muokkauksia %1$s, sijoitus %2$s, muokkaukset yhteensä %3$s</string>
    <string name="osm_editors_ranking">OSM-muokkaajien sijoitukset</string>
    <string name="download_files_error_not_enough_space">Tilaa ei ole tarpeeksi!
@ -1333,7 +1334,7 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
    <string name="everything_up_to_date">Kaikki tiedostot ovat päivitettyjä</string>
    <string name="use_opengl_render">Käytä OpenGL hahmottamista</string>
    <string name="poi_dialog_poi_type">POI tyyppi</string>
-    <string name="number_of_rows_in_dash">Rivien lukumäärä panelissa %1$s</string>
+    <string name="number_of_rows_in_dash">Rivien lukumäärä paneelissa %1$s</string>
    <string name="please_specify_poi_type">Ole hyvä ja määritä POI tyyppi.</string>
    <string name="working_days">Työpäivät</string>
    <string name="recent_places">Viime sijainnit</string>
@ -1407,9 +1408,9 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
    <string name="map_legend">Karttaselite</string>
    <string name="save_poi_without_poi_type_message">Haluatko todella tallettaa POIn inman POI tyyppiä?</string>
    <string name="poi_context_menu_modify_osm_change">Muokkaa OSM muutosta</string>
-    <string name="use_dashboard_btn">Käytä hallintapanelia</string>
+    <string name="use_dashboard_btn">Käytä hallintapaneelia</string>
    <string name="use_drawer_btn">Käytä valikkoa</string>
-    <string name="dashboard_or_drawer_title">Hallintapaneli tai valikko-ohjaus</string>
+    <string name="dashboard_or_drawer_title">Hallintapaneeli tai valikko-ohjaus</string>
    <string name="update">Päivitä</string>
    <string name="only_download_over_wifi">Lataa ainoastaan käyttäen WiFiä</string>
    <string name="live_update">Live päivitys</string>
@ -1483,7 +1484,7 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
    <string name="local_map_names">Paikalliset nimet</string>
    <string name="map_preferred_locale">Kartalle haluttu kieli</string>
    <string name="forward">Eteenpäin</string>
-    <string name="home">Hallintapaneli</string>
+    <string name="home">Hallintapaneeli</string>
    <string name="live_monitoring_m">Online seuranta (GPX pakollinen)</string>
    <string name="live_monitoring_start">Aloita online seuranta</string>
    <string name="live_monitoring_stop">Lopeta online seuranta</string>
@ -1667,7 +1668,7 @@ Jälki %2$s</string>
    <string name="ttsvoice">TTS ääni</string>
    <string name="search_offline_clear_search">Uusi haku</string>
    <string name="map_text_size_descr">Valitse tekstin koko nimille kartalla</string>
-    <string name="map_text_size">Kartan merkkien koko</string>
+    <string name="map_text_size">Kartan fonttikoko</string>
    <string name="trace_rendering">Hahmottamisen testaustiedot</string>
    <string name="trace_rendering_descr">Näytä hahmottamisen tehokkuus</string>
    <string name="installing_new_resources">Puretaan uutta tietoa…</string>
@ -1732,7 +1733,7 @@ Jälki %2$s</string>
    <string name="delete_change">Poista muutos</string>
    <string name="try_again">Yritä uudelleen</string>
    <string name="error_message_pattern">Virhe: {0}</string>
-    <string name="dahboard_options_dialog_title">Konfiguroi hallintapaneli</string>
+    <string name="dahboard_options_dialog_title">Konfiguroi hallintapaneeli</string>

    <string name="shared_string_card_was_hidden">Kortti oli piilotettu</string>
    <string name="shared_string_undo">PALAUTA</string>
@ -1747,7 +1748,7 @@ Jälki %2$s</string>
    <string name="file_size_in_mb">%.1f MB</string>
    <string name="update_all">Päivitä kaikki (%1$s MB)</string>
    <string name="enter_country_name">Anna maan nimi</string>
-    <string name="upload_osm_note_description">Voit ladata huomautuksia OSM:iin anonyymisti tai OpenStreetMap.org-profiilillasi.</string>
+    <string name="upload_osm_note_description">Lataa OSM-huomautuksesi anonyymisti tai käyttämällä OpenStreetMap.org-profiiliasi.</string>
    <string name="wiki_around">Lähimmät Wikipedia-artikkelit</string>
    <string name="upload_poi">Lataa (vie) POI:t</string>
    
@ -1789,7 +1790,7 @@ Jälki %2$s</string>
    <string name="traffic_warning_speed_limit">Nopeusrajoitus</string>
    <string name="traffic_warning_border_control">Rajatarkastus</string>
    <string name="traffic_warning_payment">Tullirakennus</string>
-    <string name="traffic_warning_stop">Pysähtymismerkki</string>
+    <string name="traffic_warning_stop">Stop-merkki</string>
    <string name="traffic_warning_calming">Hidaste</string>
    <string name="traffic_warning_speed_camera">Nopeuskamera</string>
    <string name="traffic_warning">Liikennevaroitus</string>
@ -1945,8 +1946,8 @@ Paina ja pidä nähdäksesi kartalla</string>
    <string name="settings_direction_style_descr">Valitse tyyli ilmaistaksesi suhteelliset suunnat liikuttaessa</string>
    <string name="auto_announce_on">Käynnistä automaattiset ilmoitukset</string>
    <string name="auto_announce_off">Keskeytä automaattiset ilmoitukset</string>
-    <string name="access_direction_audio_feedback">Suunta (äänipalautteena)</string>
-    <string name="access_direction_haptic_feedback">Suunta (värinäpalautteena)</string>
+    <string name="access_direction_audio_feedback">Reittiohjaus (äänipalautteena)</string>
+    <string name="access_direction_haptic_feedback">Reittiohjaus (värinäpalautteena)</string>
    
    
    
@ -1954,7 +1955,7 @@ Paina ja pidä nähdäksesi kartalla</string>
    
    
    
-    <string name="storage_directory_readonly_desc">Valittuun datahakemistoon ei voi kirjoittaa. Datahakemisto on hetkellisesti vaihdettu sisäiseen muistiin. Ole hyvä ja valitse sopiva datahakemisto.</string>
+    <string name="storage_directory_readonly_desc">"Datahakemisto on vaihdettu sisäiseen muistiin, sillä valittu hakemisto on vain luku -tilassa.  Ole hyvä ja valitse sopiva datahakemisto."</string>
    <string name="osm_live_email_desc">Tarvitsemme sen huolehtiaksemme tiedostasi maksuosuuksia varten</string>
    <string name="translit_name_if_miss">Translitteroi, jos nimi puuttuu kielellä %1$s</string>
    <string name="translit_names">Translitteroi nimet</string>
@ -1976,7 +1977,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
    <string name="osm_settings_descr">Määrittele Openstreetmap.org (OSM) asetukset jotka tarvitaan OSM huomautuksiin</string>
    <string name="show_poi_over_map_description">Näytä POI kartalla (käytä viimeksi valittua suodatinta)</string>
    <string name="routing_attr_allow_motorway_name">Salli moottoritiet</string>
-    <string name="routing_attr_allow_motorway_description">Salli moottoritiet</string>
+    <string name="routing_attr_allow_motorway_description">Salli moottoritiet.</string>
    <string name="rec_split">Nauhoituksen jako</string>
    <string name="rec_split_title">Käytä nauhoituksen jakoa</string>
    <string name="rec_split_desc">Kirjoita leikkeet uudelleen kun käytetty tila ylittää tallennustilan koon</string>
@ -1987,7 +1988,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
    <string name="plugin_touringview_name">Tiekarttanäyttö</string>
 	<string name="avoid_roads_msg">Voit muuttaa toiselle reitille valitsemalla vältettäviä teitä</string>
    <string name="rendering_attr_contourWidth_description">Korkeuskäyräviivojen leveys</string>
-    <string name="rendering_attr_contourWidth_name">Korkeuskäyriäviivojen leveys</string>
+    <string name="rendering_attr_contourWidth_name">Korkeuskäyräviivojen leveys</string>
    <string name="rendering_attr_hideWaterPolygons_description">Vesi</string>
    <string name="legacy_search">Vanha haku</string>
    <string name="show_legacy_search">Näytä vanha haku</string>
@ -2091,15 +2092,15 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
    <string name="rendering_value_medium_w_name">Keskitaso</string>
    <string name="rendering_attr_contourDensity_description">Korkeuskäyräviivojen tiheys</string>
    <string name="rendering_attr_contourDensity_name">Korkeuskäyräviivojen tiheys</string>
-    <string name="rendering_attr_depthContours_name">Korkeuskäyrät</string>
-	<string name="rendering_attr_depthContours_description">Näytä korkeuskäyrät ja -pisteet</string>
+    <string name="rendering_attr_depthContours_name">Merelliset korkeuskäyrät</string>
+	<string name="rendering_attr_depthContours_description">Näytä korkeuskäyrät ja -pisteet.</string>
    
    
    <string name="route_altitude">Reitin korkeus</string>
    <string name="altitude_descent">Lasku</string>
    <string name="altitude_ascent">Nousu</string>
    <string name="altitude_range">Korkeuserot</string>
-    <string name="average_altitude">Keskimäärin</string>
+    <string name="average_altitude">Keskimääräinen korkeus</string>
    <string name="shared_string_time">Aika</string>
    <string name="total_distance">Kokonaisetäisyys</string>
    
@ -2140,14 +2141,14 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
    <string name="osn_modify_dialog_title">Muokkaa huomautusta</string>
    <string name="context_menu_item_modify_note">Muokkaa OSM huomautusta</string>
    <string name="make_round_trip_descr">Lisää lähtöpisteen kopio maalipisteeksi.</string>
-    <string name="make_round_trip">Tee kiertoajelu</string>
+    <string name="make_round_trip">Tee edestakainen matka</string>
    
    <string name="shared_string_markers">Markkerit</string>
    <string name="coordinates_format">Koordinaattien muoto</string>
    <string name="use_system_keyboard">Käytä järjestelmän näppäimistöä</string>
    <string name="fast_coordinates_input">Nopea koordinaattien syöttö</string>
    <string name="routing_attr_avoid_ice_roads_fords_name">Vältä jääteitä, kahlaamoja</string>
-    <string name="routing_attr_avoid_ice_roads_fords_description">Vältä jääteitä ja kahlaamoja</string>
+    <string name="routing_attr_avoid_ice_roads_fords_description">Vältä jääteitä ja kahlaamoja.</string>
    <string name="use_location">Käytä sijaintia</string>
    <string name="add_location_as_first_point_descr">Lisää sijaintisi täydellisen reittisuunnitelmasi lähtöpisteeksi.</string>
    <string name="my_location">Sijaintini</string>
@ -2156,16 +2157,16 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
    <string name="shared_string_sort">Lajittele</string>
    <string name="coordinate_input">Koordinaattien syöttö</string>
    <string name="is_saved">on talletettu</string>
-    <string name="marker_save_as_track_descr">Vie markkerisi tiedostoon jonka voit määrittellä tässä:</string>
-    <string name="marker_save_as_track">Tallenna jälkenä</string>
+    <string name="marker_save_as_track_descr">Vie markkerisi seuraavaan GPX-tiedostoon:</string>
+    <string name="marker_save_as_track">Tallenna GPX-tiedostona</string>
    <string name="move_to_history">Siirrä historiaan</string>
-    <string name="group_will_be_removed_after_restart">Ryhmä poistetaan uudelleen käynnistyksen jälkeen</string>
+    <string name="group_will_be_removed_after_restart">Ryhmä poistetaan sovelluksen uudelleenkäynnistyksen jälkeen.</string>
    <string name="show_arrows_on_the_map">Näytä nuolet kartalla</string>
-    <string name="remove_from_map_markers">Poista Karttamarkkereista</string>
+    <string name="remove_from_map_markers">Poista karttamarkkereista</string>
    <string name="descendingly">laskeva</string>
    <string name="ascendingly">nouseva</string>
    <string name="date_added">Päiväys lisätty</string>
-    <string name="order_by">Järjestetys:</string>
+    <string name="order_by">Järjestysperuste:</string>
    <string name="all_markers_moved_to_history">Kaikki karttamarkkerit siirretty historiaan</string>
    <string name="marker_moved_to_history">Karttamarkkeri siirretty historiaan</string>
    <string name="marker_moved_to_active">Karttamarkkeri siirretty aktiiviseksi</string>
@ -2179,8 +2180,8 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
    <string name="show_direction">Etäisyyden näyttö</string>
    <string name="sort_by">Lajittelu</string>
    <string name="do_not_use_animations">Älä käytä animaatioita</string>
-    <string name="do_not_use_animations_descr">Poistaa animaatioiden käytön sovellutuksessa</string>
-    <string name="exit_without_saving">Poistu ilman talletusta?</string>
+    <string name="do_not_use_animations_descr">Poistaa animaatiot käytöstä sovelluksessa.</string>
+    <string name="exit_without_saving">Poistu tallentamatta?</string>
    <string name="save_as_route_point">Tallenna reittipisteinä</string>
    <string name="save_as_line">Tallenna viivana</string>
    <string name="route_point">Reittipiste</string>
@ -2194,30 +2195,30 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
    <string name="show_on_map_after_saving">Näytä kartalla tallennuksen jälkeen</string>
    <string name="measurement_tool_action_bar">Selaile karttaa ja lisää pisteet</string>
    <string name="measurement_tool">Mittaa etäisyys</string>
-    <string name="quick_action_resume_pause_navigation">Palauta/keskeytä navigointi</string>
-    <string name="quick_action_show_navigation_finish_dialog">Näytä Navigointi lopetettu -vuoropuhelu</string>
+    <string name="quick_action_resume_pause_navigation">Pysäytä/jatka navigointia</string>
+    <string name="quick_action_show_navigation_finish_dialog">Näytä Navigointi lopetettu -dialogi</string>
    <string name="quick_action_start_stop_navigation">Käynnistä/lopeta navigointi</string>
-    <string name="shared_string_reset">Käynnistä uudelleen</string>
+    <string name="shared_string_reset">Resetoi</string>
    <string name="shared_string_reload">Lataa uudelleen</string>
-    <string name="wrong_user_name">Väärä käyttäjänimi!</string>
-    <string name="mapillary_menu_title_dates">Päiväykset</string>
-    <string name="mapillary_menu_edit_text_hint">Anna käyttäjänimi</string>
+    <string name="wrong_user_name">Väärä käyttäjänimi</string>
+    <string name="mapillary_menu_title_dates">Päiväyks</string>
+    <string name="mapillary_menu_edit_text_hint">Kirjoita käyttäjänimi</string>
    <string name="mapillary_menu_title_username">Käyttäjänimi</string>
    <string name="shared_string_permissions">Käyttöoikeudet</string>
    <string name="distance_moving">Etäisyys korjattu</string>
-    <string name="mapillary_image">Mapillary kuva</string>
+    <string name="mapillary_image">Mapillary-kuva</string>
    <string name="open_mapillary">Avaa Mapillary</string>
    <string name="shared_string_install">Asenna</string>
-    <string name="online_photos">Online kuvat</string>
+    <string name="online_photos">Online-kuvat</string>
    <string name="shared_string_add_photos">Lisää kuviin</string>
-    <string name="no_photos_descr">Tälle sijainnille ei ole kuvia</string>
+    <string name="no_photos_descr">Tästä sijainnista ei ole kuvia.</string>
    <string name="mapillary">Mapillary</string>
    <string name="restart_search">Käynnistä haku uudelleen</string>
-    <string name="nothing_found">EI löytynyt mitään :(</string>
-    <string name="quick_action_showhide_osmbugs_title">Näytä/piilota OSM huomautukset</string>
-    <string name="quick_action_osmbugs_show">Näytä OSM huomautukset</string>
-    <string name="quick_action_osmbugs_hide">Piilota OSM huomautukset</string>
-    <string name="sorted_by_distance">Lajiteltu etäisyydellä</string>
+    <string name="nothing_found">Mitään ei löytynyt</string>
+    <string name="quick_action_showhide_osmbugs_title">Näytä/piilota OSM-huomautukset</string>
+    <string name="quick_action_osmbugs_show">Näytä OSM-huomautukset</string>
+    <string name="quick_action_osmbugs_hide">Piilota OSM-huomautukset</string>
+    <string name="sorted_by_distance">Lajiteltu etäisyyden perusteella</string>
    <string name="search_favorites">Etsi suosikeista</string>
    <string name="hide_from_zoom_level">Piilota zoomaustasosta</string>
    <string name="srtm_menu_download_descr">Näyttääksesi korkeuskäyrät kartalla tulee Sinun ladata korkeuskäyräkartta tältä alueelta.</string>
@ -2225,7 +2226,212 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
    <string name="show_from_zoom_level">Näytä zoomaustasolta</string>
    <string name="display_zoom_level">Näytä zoomaustaso: %1$s</string>
    <string name="favorite_group_name">Ryhmän nimi</string>
-    <string name="change_color">Muuta väri</string>
+    <string name="change_color">Muuta väriä</string>
    <string name="edit_name">Muokkaa nimeä</string>
-    <string name="animate_my_location">Sijaintini animaatio</string>
-    </resources>
+    <string name="animate_my_location">Animoi sijaintini</string>
+    <string name="coord_input_edit_point">Muokkaa pistettä</string>
+    <string name="coord_input_add_point">Lisää piste</string>
+    <string name="coord_input_save_as_track">Tallenna jälkenä</string>
+    <string name="coord_input_save_as_track_descr">Lisäsit %1 pistettä. Kirjoita tiedostonimi ja paina \"Tallenna\".</string>
+    <string name="error_notification_desc">Ole ystävällinen ja lähetä tästä ilmoituksesta ruutukaappaus osoitteeseen support@osmand.net</string>
+    <string name="get_osmand_live">Hanki OsmAnd Live avataksesi kaikki toiminnot: Voit ladata rajattomasti päivittäisiä karttapäivityksiä, käyttää kaikkia ilmaisia sekä maksullisia plugineja, Wikipediaa, Wikivoyagea ja paljon muuta.</string>
+    <string name="unirs_render_descr">Oletustyylin muunnos, joka lisää jalkakäytävien ja pyöräteiden kontrastia. Käyttää vanhoja Mapnikin värejä.</string>
+    <string name="shared_string_bookmark">Kirjanmerkki</string>
+    <string name="hide_full_description">Piilota täysi kuvaus</string>
+    <string name="show_full_description">Näytä täysi kuvaus</string>
+    <string name="open_wikipedia_link_online">Avaa Wikipedia-linkki verkossa</string>
+    <string name="open_wikipedia_link_online_description">Linkki avataan selaimessa.</string>
+    <string name="how_to_open_link">Kuinka linkki avataan?</string>
+    <string name="read_wikipedia_offline">Lue Wikipediaa ilman verkkoyhteyttä</string>
+    <string name="download_all">Lataa kaikki</string>
+    <string name="shared_string_restart">Sovelluksen uudelleenkäynnistys</string>
+    <string name="show_images">Näytä kuvat</string>
+    <string name="maps_you_need">Kartat, joita tarvitset</string>
+    <string name="osmand_team">OsmAnd -tiimi</string>
+    <string name="popular_destinations">Suosittuja kohteita</string>
+    <string name="paid_app">Maksettu sovellus</string>
+    <string name="paid_plugin">Maksettu lisäosa</string>
+    <string name="update_is_available">Päivitys saatavilla</string>
+	<string name="download_file">Lataa tiedosto</string>
+    <string name="start_editing">Aloita muokkaus</string>
+    <string name="get_unlimited_access">Hanki rajaton pääsy</string>
+    <string name="welcome_to_open_beta">Tervetuloa avoimeen betaan</string>
+    <string name="wikivoyage_travel_guide">Matkaoppaat</string>
+    <string name="monthly_map_updates">Karttapäivitykset: <b>joka kuukausi</b></string>
+    <string name="daily_map_updates">Karttapäivitykset: <b>joka tunti</b></string>
+    <string name="in_app_purchase">Sovelluksensisäinen ostos</string>
+    <string name="in_app_purchase_desc">Kertamaksu</string>
+    <string name="shared_string_dont">Älä</string>
+    <string name="shared_string_only_with_wifi">Vain Wi-Fi yhteydellä</string>
+    <string name="wikivoyage_download_pics">Lataa kuvat</string>
+    <string name="shared_string_wifi_only">Vain Wi-Fi yhteydellä</string>
+    <string name="select_travel_book">Valitse matkaopas</string>
+    <string name="shared_string_travel_book">Matkaopas</string>
+    <string name="online_webpage_warning">Sivu saatavilla vain verkossa. Avataanko selaimessa?</string>
+    <string name="images_cache">Kuvavälimuisti</string>
+    <string name="delete_search_history">Poista hakuhistoria</string>
+    <string name="download_images">Lataa kuvat</string>
+    <string name="download_maps_travel">Matkaoppaat</string>
+    <string name="shared_string_wikivoyage">Wikivoyage</string>
+    <string name="article_removed">Artikkeli poistettu</string>
+    <string name="wikivoyage_search_hint">Hae: maa, kaupunki, alue</string>
+    <string name="shared_string_read">Lue</string>
+    <string name="saved_articles">Kirjainmerkit</string>
+    <string name="shared_string_explore">Tutki</string>
+    <string name="shared_string_contents">Sisältö</string>
+    <string name="shared_string_result">Tulos</string>
+    <string name="shared_string_travel_guides">Matkaoppaat</string>
+    <string name="waypoints_removed_from_map_markers">Välietapit poistettu karttamarkkereista</string>
+    <string name="nothing_found_in_radius">Mitään ei löydetty:</string>
+    <string name="select_waypoints_category_description">Lisää kaikki jäljen välietapit tai valitse erilliset kategoriat.</string>
+    <string name="shared_string_total">Yhteensä</string>
+    <string name="clear_all_intermediates">Poista kaikki välipisteet</string>
+    <string name="group_deleted">Ryhmä poistettu</string>
+    <string name="distance_farthest">Etäisyys: etäisin ensin</string>
+    <string name="distance_nearest">Etäisyys: lähin ensin</string>
+    <string name="enter_lon">Syötä pituuspiiri</string>
+    <string name="enter_lat">Syötä leveyspiiri</string>
+    <string name="enter_lat_and_lon">Syötä leveys- ja pituuspiiri</string>
+	<string name="optional_point_name">Valinnainen pisteen nimi</string>
+    <string name="enter_the_file_name">Kirjoita tiedostonimi.</string>
+    <string name="map_import_error">Virhe kartan tuonnissa</string>
+    <string name="map_imported_successfully">Kartta tuotu</string>
+    <string name="make_as_start_point">Tää tästä lähtöpiste</string>
+    <string name="shared_string_current">Nykyinen</string>
+    <string name="last_intermediate_dest_description">Lisää välipysähdys</string>
+    <string name="first_intermediate_dest_description">Lisää ensimmäisen pysähdys</string>
+    <string name="show_closed_notes">Näytä suljetut huomautukset</string>
+    <string name="switch_osm_notes_visibility_desc">Näytä/Piilota OSM-huomautukset kartalla.</string>
+    <string name="gpx_file_desc">GPX - soveltuu vietäväksi JOSM:iin tai muihin OSM-editoreihin.</string>
+    <string name="osc_file_desc">OSC - soveltuu vietäväksi OpenStreetMappiin.</string>
+    <string name="shared_string_gpx_file">GPX-tiedosto</string>
+    <string name="osc_file">OSC-tiedosto</string>
+    <string name="choose_file_type">Valitsi tietostotyyppi</string>
+    <string name="osm_edits_export_desc">Valitse viennin tyyppi: OSM-huomautukset, POI tai molemmat.</string>
+    <string name="all_data">Kaikki data</string>
+    <string name="osm_notes">OSM-huomautukset</string>
+    <string name="will_open_tomorrow_at">Aukeaa huomenna kello</string>
+    <string name="shared_string_without_name">Ilman nimiä</string>
+    <string name="what_is_here">Täällä on:</string>
+    <string name="parked_at">parkkeerattu</string>
+    <string name="pick_up_till">Noudettava ennen</string>
+    <string name="without_time_limit">Ilman aikarajaa</string>
+    <string name="context_menu_read_full_article">Lue täysi artikkeli</string>
+    <string name="context_menu_read_article">Lue artikkeli</string>
+    <string name="context_menu_points_of_group">Kaikki ryhmän pisteet</string>
+    <string name="open_from"/>
+    <string name="av_locations_selected_desc">GPX-tiedosto, jossa koordinaatit ja valittujen huomautuksien data.</string>
+    <string name="av_locations_all_desc">GPX-tiedosto, jossa koordinaatit ja kaikkien huomautuksien data.</string>
+    <string name="modify_the_search_query">Muokkaa hakua.</string>
+    <string name="shared_string_actions">Toiminnot</string>
+    <string name="shared_string_marker">Markkeri</string>
+    <string name="empty_state_osm_edits">Luo tai muokkaa OSM-objekteja</string>
+    <string name="empty_state_osm_edits_descr">Luo tai muokkaa OSM POI:ta, avaa tai kommentoi OSM-huomautuksia ja tue jakamalla tallennettuja GPX-tiedostoja.</string>
+    <string name="shared_string_deleted">Poistettu</string>
+    <string name="shared_string_edited">Muokattu</string>
+    <string name="shared_string_added">Lisätty</string>
+    <string name="marker_activated">Markkeri %s aktivoitu.</string>
+    <string name="one_tap_active_descr">Tökkää kartalla olevaa markkeria siirtääksesi se ylimmäksi aktiiviseksi markkeriksi avaamatta valikkoa.</string>
+    <string name="one_tap_active">\"Yhden napautuksen\" aktivointi</string>
+    <string name="empty_state_av_notes">Tee muistiinpanoja!</string>
+    <string name="empty_state_av_notes_desc">Lisää ääni-, video- tai kuvamuistiinpano mihin tahansa kartan pisteeseen käyttämällä widgettiä tai valikkoa.</string>
+    <string name="shared_string_more_without_dots">Lisää</string>
+    <string name="appearance_on_the_map">Ilmiasu kartalla</string>
+    <string name="add_track_to_markers_descr">Valitse jälki lisätäksesi sen välietapit markkereihin.</string>
+    <string name="add_favourites_group_to_markers_descr">Valitse suosikkikategoria, johon markkerit lisätään.</string>
+    <string name="shared_string_gpx_waypoints">Jäljen välietapit</string>
+    <string name="favourites_group">Suosikkikategoria</string>
+    <string name="add_group">Lisää ryhmä</string>
+    <string name="add_group_descr">Tuo ryhmät suosikeista tai GPX-välietapeista.</string>
+    <string name="empty_state_markers_active">Luo karttamarkkereita!</string>
+    <string name="empty_state_markers_groups">Tuo ryhmät</string>
+    <string name="empty_state_markers_groups_desc">Tuo suosikkiryhmät tai välietapit markkereina.</string>
+    <string name="empty_state_markers_history_desc">Ohitetuiksi merkatut markkerit ilmestyvät tälle ruudulle.</string>
+    <string name="shared_string_two">Kaksi</string>
+    <string name="shared_string_one">Yksi</string>
+    <string name="show_guide_line_descr">Näytä suuntaviiva sijainnistasi aktiivisten markkerien sijainteihin.</string>
+    <string name="show_arrows_descr">Näytä yksi tai kaksi nuolta ilmaisemaan suunta aktiivisiin markkereihin.</string>
+    <string name="distance_indication_descr">Valitse, kuinka etäisyys aktiivisiin pisteisiin näytetään.</string>
+    <string name="active_markers_descr">Valitse, kuinka monta suuntailmaisinta näytetään.</string>
+    <string name="digits_quantity">Desimaalien määrä</string>
+    <string name="quick_action_edit_actions">Muokkaa toimintoja</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>
+	<string name="dd_mm_mmmm_format">DD°MM.MMMM′</string>
+	<string name="dd_mm_mmm_format">DD°MM.MMM′</string>
+	<string name="east_abbreviation">E</string>
+	<string name="west_abbreviation">W</string>
+	<string name="south_abbreviation">S</string>
+	<string name="north_abbreviation">N</string>
+	<string name="show_number_pad">Näytä numeronäppäimistö</string>
+    <string name="shared_string_paste">Liitä</string>
+    <string name="coordinate_input_accuracy_description">"Vaihda automaattisesti seuraavaan kenttään, kun %1$d desimaalia on syötetty. "</string>
+    <string name="coordinate_input_accuracy">%1$d desimaalia</string>
+    <string name="go_to_next_field">Seuraava kenttä</string>
+    <string name="rename_marker">Uudelleennimeä markkeri</string>
+    <string name="tap_on_map_to_hide_interface_descr">Kartan koskettaminen näyttää/piilottaa nappulat ja widgetit.</string>
+    <string name="tap_on_map_to_hide_interface">Kokoruututila</string>
+    <string name="mark_passed">Merkkaa ohitetuksi</string>
+    <string name="import_gpx_file_description">voidaan tuoda suosikkina tai GPX-tiedostona.</string>
+    <string name="import_as_gpx">Tuo GPX-tiedostona</string>
+    <string name="import_as_favorites">Tuo suosikkina</string>
+    <string name="import_file">Tuo tiedosto</string>
+	<string name="wrong_input">Väärä syöte</string>
+	<string name="enter_new_name">Syötä uusi nimi</string>
+	<string name="shared_string_back">Takaisin</string>
+	<string name="shared_string_view">Näytä</string>
+	<string name="waypoints_added_to_map_markers">Välietapit lisätty karttamarkkereihin</string>
+	<string name="wrong_format">Väärä muoto</string>
+    <string name="shared_string_road">Tie</string>
+    <string name="show_map">Näytä kartta</string>
+    <string name="route_is_calculated">Reitti laskettu</string>
+    <string name="round_trip">Edestakainen matka</string>
+    <string name="plan_route_no_markers_toast">Sinun täytyy lisätä ainakin yksi markkeri käyttääksesti tätä toimintoa.</string>
+    <string name="osn_modify_dialog_error">Huomautusta ei voitu muokata</string>
+    <string name="fast_coordinates_input_descr">Valitse koordinaattien syöttömuoto. Voit aina vaihtaa sen tökkäämällä asetuksia.</string>
+    <string name="show_guide_line">Näytä suuntaviivat</string>
+    <string name="show_passed">Näytä ohitetut</string>
+    <string name="hide_passed">Piilota ohitetut</string>
+    <string name="marker_show_distance_descr">Valitse kuinka korkeutta ja suuntaa karttamerkkareihin ilmaistaan karttaruudulla:</string>
+    <string name="passed">Viimeksi käytetty: %1$s</string>
+    <string name="move_all_to_history">Siirrä kaikki historiaan</string>
+    <string name="keep_showing_on_map">Jatka kartalla näyttämistä</string>
+    <string name="line">Viiva</string>
+    <string name="measurement_tool_snap_to_road_descr">OsmAnd yhdistää pisteet valitun profiilin mukaisilla reiteillä.</string>
+    <string name="measurement_tool_save_as_new_track_descr">Tallenna pisteet joko reittipisteinä tai viivana.</string>
+    <string name="quick_action_resume_pause_navigation_descr">Paina tätä nappulaa pysäyttääksesi tai jatkaaksesi navigointia.</string>
+    <string name="quick_action_start_stop_navigation_descr">Paina tätä nappulaa aloittaaksesi tai lopettaaksesi navigoinnin.</string>
+    <string name="store_tracks_in_monthly_directories">Säilytä tallennetut jäljet kuukausittaisissa kansioissa</string>
+    <string name="store_tracks_in_monthly_directories_descrp">Säilytä tallennetut jäljet kuukausien mukaisissa alihakemistoissa (kuten 2018-01).</string>
+    <string name="mapillary_menu_descr_tile_cache">Lataa karttalaatat uudelleen nähdäksesi ajantasaista dataa.</string>
+    <string name="mapillary_menu_title_tile_cache">Karttalaattavälimuisti</string>
+    <string name="mapillary_menu_descr_dates">Näytä vain lisätyt kuvat</string>
+    <string name="mapillary_menu_descr_username">Näytä vain kuvat, jotka on lisännyt</string>
+    <string name="mapillary_menu_filter_description">Suoda kuvat lisääjän tai päivänmäärän perusteella. Aktiivinen vain lähelle tarkennettaessa.</string>
+    <string name="import_gpx_failed_descr">OsmAnd ei voi tuoda tiedostoa. Ole hyvä ja tarkista, onko OsmAndilla tarvittavat käyttöoikeudet tiedoston lukemiseen sen sijainnista.</string>
+    <string name="mapillary_widget">Mapillary-widgetti</string>
+    <string name="private_access_routing_req">Määränpääsi sijaitsee yksityisalueella. Saako tällä matkalla käyttää yksityisteitä?</string>
+    <string name="increase_search_radius">Kasvata haun laajuutta</string>
+    <string name="nothing_found_descr">Muokkaa hakusanoja tai lisää haun laajuutta.</string>
+    <string name="quick_action_showhide_osmbugs_descr">Tämän toimintonappulan tökkääminen näyttää tai piilottaa OSM-huomautukset kartalla.</string>
+    <string name="srtm_color_scheme">Väriskeema</string>
+    <string name="routing_attr_allow_private_name">Salli yksityisalueet</string>
+    <string name="routing_attr_allow_private_description">Salli pääsy yksityisalueille.</string>
+    <string name="animate_my_location_desc">Ota käyttöön animoitu sijaintini kartan vieritys navigaation aikana.</string>
+    <string name="shared_string_overview">Yleiskatsaus</string>
+    <string name="select_street">Valitse tie</string>
+    <string name="type_address">Kirjoita osoite</string>
+    <string name="type_city_town">Kirjoita kaupunki</string>
+    <string name="type_postcode">Kirjoita postinumero</string>
+    <string name="nearest_cities">Lähimmät kaupungit</string>
+    <string name="select_city">Valitse kaupunki</string>
+    <string name="select_postcode">Valitse postinumero</string>
+    <string name="quick_action_auto_zoom">Kartan automaattinen tarkennus päälle/pois</string>
+    <string name="quick_action_auto_zoom_desc">Tämän toimintonappulan koskettaminen ottaa käyttöön/poistaa käytöstä nopeuteesi perustuvan kartan automaattisen tarkennuksen.</string>
+    <string name="quick_action_auto_zoom_on">"Ota kartan automaattinen tarkennus käyttöön "</string>
+    <string name="quick_action_auto_zoom_off">"Poista kartan automaattinen tarkennus käytöstä "</string>
+    <string name="quick_action_add_destination">Lisää määränpää</string>
+    <string name="quick_action_replace_destination">Korvaa määränpää</string>
+    <string name="quick_action_add_first_intermediate">Lisää ensimmäinen välietappi</string>
+    </resources>
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@ -1235,7 +1235,7 @@
    
    <string name="shared_string_pause">הפסקה</string>
    <string name="map_markers_other">סמנים אחרים</string>
-    <string name="gpx_add_track">הוספת קובץ GPX</string>
+    <string name="gpx_add_track">הוספת עוד…</string>
    <string name="gpx_no_tracks_title">עדיין אין לך קובצי GPX</string>
    <string name="rendering_value_dark_brown_name">חום כהה</string>
    <string name="rendering_value_light_brown_name">חום בהיר</string>
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@ -410,8 +410,8 @@
 	<string name="poi_office_administrative">Közigazgatási hivatal</string>
 	<string name="poi_customs">Vámhivatal</string>
 	<string name="poi_isolated_dwelling">Magányos lakóhely</string>
-	<string name="poi_suburb">Jelentős városrész</string>
-	<string name="poi_quarter">Városnegyed</string>
+	<string name="poi_suburb">Városrész</string>
+	<string name="poi_quarter">Kis városrész</string>
 	<string name="poi_neighbourhood">Környék</string>
 	<string name="poi_place_allotments">Kiskertes településrész</string>
 	<string name="poi_place_farm">Tanya</string>
@ -3871,4 +3871,7 @@

 <string name="poi_appliance">Háztartásigép-bolt</string>

-	</resources>
+	<string name="poi_payment_contactless_yes">Érintés nélküli</string>
+	<string name="poi_payment_contactless_no">Érintés nélkülit nem fogad el</string>
+
+</resources>
--- a/OsmAnd/res/values-is/phrases.xml
+++ b/OsmAnd/res/values-is/phrases.xml
@ -3845,4 +3845,7 @@
 <string name="poi_checkpoint_type_quize">Spurningalisti</string>
 	<string name="poi_appliance">Heimilistækjaverslun</string>

-	</resources>
+	<string name="poi_payment_contactless_yes">Snertilaust</string>
+	<string name="poi_payment_contactless_no">Ekki tekið við snertilausum kortum</string>
+
+</resources>
--- a/OsmAnd/res/values-nb/phrases.xml
+++ b/OsmAnd/res/values-nb/phrases.xml
@ -1267,4 +1267,29 @@
 	<string name="poi_payment_mastercard_no">MasterCard er ikke akseptert</string>
 	<string name="poi_access_permissive">Adgang tillatt</string>
 	<string name="poi_toilets_access_permissive">Toalettadgang: Tillatt</string>
+	<string name="poi_tactile_paving">Korrugert fortau</string>
+	<string name="poi_ferry_terminal_cargo">Gods</string>
+	<string name="poi_observatory_designation">Betegnelse</string>
+	<string name="poi_pharmacy_dispensing">Utlevering</string>
+	<string name="poi_denomination">Betegnelse</string>
+	<string name="poi_information_type">Type</string>
+	<string name="poi_scout_camp">Speiderleir</string>
+	<string name="poi_theatre_genre">Sjanger</string>
+	<string name="poi_water_characteristic">Vannegenskap</string>
+	<string name="poi_health_specialty">Helsespesialitet</string>
+	<string name="poi_climbing_style">Klatringsstil</string>
+	<string name="poi_socket">Uttak</string>
+	<string name="poi_checkpoint_type">Kontrollpunktstype</string>
+
+<string name="poi_emergency_infrastructure">Kriseinfrastruktur</string>
+	<string name="poi_chemist">Apotek</string>
+	<string name="poi_clothes_children">Barneklær</string>
+	<string name="poi_fishing">Fiskeutstyr</string>
+	<string name="poi_free_flying">Fluefiskeutstyr</string>
+<string name="poi_garden_furniture">Hagemøbelbutikk</string>
+	<string name="poi_gas">Gassbutikk</string>
+	<string name="poi_glaziery">Glassmester</string>
+	<string name="poi_video">Videobutikk</string>
+	<string name="poi_window_blind">Solskjermingsbutikk</string>
+	<string name="poi_atv">Firhjulingsbutikk</string>
 	</resources>
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@ -203,7 +203,7 @@
    <string name="index_name_tts_voice">Talemeldinger (TTS-syntetisert, anbefales)</string>
    <string name="amenity_type_osmwiki">Wikipedia (offline)</string>
    <string name="amenity_type_user_defined">Brukerdefinert</string>
-    <string name="fav_export_confirmation">Fil som inneholder tidligere eksporterte favoritter finnes allerede. Erstatt den?</string>
+    <string name="fav_export_confirmation">Fil inneholdende tidligere eksporterte favoritter finnes allerede. Vil du erstatte den?</string>
    <string name="profile_settings">Profilspesifikke innstillinger</string>
    <string name="settings_preset">Standardprofil</string>
    <string name="settings_preset_descr">Kartvisning- og navigeringsinnstillinger lagres per profil. Sett din standardprofil her.</string>
@ -549,7 +549,7 @@
    <string name="osb_comment_dialog_message">Melding</string>
    <string name="poi_edit_title">Rediger interessepunkt</string>
    <string name="poi_create_title">Opprett interessepunkt</string>
-    <string name="poi_remove_confirm_template">Slette {0} (skriv kommentar)?</string>
+    <string name="poi_remove_confirm_template">Slette {0} (kommentar)?</string>
    <string name="poi_remove_title">Slett interessepunkt</string>
    <string name="poi_remove_success">Interessepunkt slettet</string>
    <string name="poi_action_add">legg til</string>
@ -1415,7 +1415,7 @@
    <string name="get_full_version">Fullversjon</string>
    <string name="confirm_download_roadmaps">Det rene veikartet er ikke nødvendig siden du har det fullstendige standardkartet. Laste det ned likevel?</string>
    <string name="later">Senere</string>
-    <string name="activate_srtm_plugin">Aktiver \"koter\" -tillegget</string>
+    <string name="activate_srtm_plugin">Aktiver programtillegget for koter</string>
    <string name="opening_at">Åpner</string>
    <string name="closing_at">Lukker</string>
    
@ -1845,27 +1845,27 @@
    <string name="rendering_attr_contourWidth_description">Kotebredde</string>
    <string name="rendering_attr_contourWidth_name">Kotebredde</string>
    <string name="srtm_paid_version_msg">Overvei å betale for kote-programtillegget for å støtte videre utvikling.</string>
-    <string name="osmand_long_description_1000_chars">OsmAnd (OSM Automated Navigation Directions)
-\n
-\n OsmAnd er et navigeringsprogram med åpen kildekode og med tilgang til et bredt mangfold av globale data fra OpenStreetMap (OSM). Alle kartdata (vektor- eller fliskart) kan lagres på telefonens minnekort for nettfrakoblet bruk. Frakoblet og nettbasert rutefunksjon tilbys også, inkludert talebaserte anvisninger.
-\n
-\n Noen av kjernefunksjonene:
-\n - Fullstendig nettfrakoblet funksjonalitet (lagre nedlastede vektor- eller fliskart i enhetens lagringsmedium)
-\n - Kompakte frakoblede vektorkart fra hele verden tilgjengelige
-\n - Last ned lands- eller regionkart direkte fra programmet
-\n - Overlegg av flere kartlag mulig, som GPX og navigeringsspor, interessepunkter, favoritter, koter, stoppesteder for offentlig transport, ytterligere kart med egendefinert gjennomsiktighet
-\n - Frakoblet søk etter adresser og steder (interessepunkter)
-\n - Frakoblet ruteplanlegging for middels avstander
-\n - Bil, sykkel eller fotgjengermoduser med valgfri:
-\n - Automatisk skifting mellom dag/natt-visning
-\n - Fartsavhengig kart-zooming
-\n - Kartjustering etter kompass- eller bevegelsesretning
-\n - Filhenvisning, fartsgrensevisning, innspilte og TTS-tale
-\n
-\n Begrensninger i gratisversjonen av OsmAnd:
-\n - Antall kartnedlastinger er begrenset
-\n - Ingen nettfrakoblet tilgang til interessepunkter fra Wikipedia
-\n
+    <string name="osmand_long_description_1000_chars">OsmAnd (OSM Automated Navigation Directions) 
+\n 
+\n OsmAnd er et navigeringsprogram med åpen kildekode og med tilgang til et bredt mangfold av globale data fra OpenStreetMap (OSM). Alle kartdata (vektor- eller fliskart) kan lagres på telefonens minnekort for nettfrakoblet bruk. Frakoblet og nettbasert rutefunksjon tilbys også, inkludert talebaserte anvisninger. 
+\n 
+\n Noen av kjernefunksjonene: 
+\n - Fullstendig nettfrakoblet funksjonalitet (lagre nedlastede vektor- eller fliskart i enhetens lagringsmedium) 
+\n - Kompakte frakoblede vektorkart fra hele verden tilgjengelige 
+\n - Last ned lands- eller regionkart direkte fra programmet 
+\n - Overlegg av flere kartlag mulig, som GPX og navigeringsspor, interessepunkter, favoritter, koter, stoppesteder for offentlig transport, ytterligere kart med egendefinert gjennomsiktighet 
+\n - Frakoblet søk etter adresser og steder (interessepunkter) 
+\n - Frakoblet ruteplanlegging for middels avstander 
+\n - Bil, sykkel eller fotgjengermoduser med valgfri: 
+\n - Automatisk skifting mellom dag/natt-visning 
+\n - Fartsavhengig kartforstørring
+\n - Kartjustering etter kompass- eller bevegelsesretning 
+\n - Filhenvisning, fartsgrensevisning, innspilte og TTS-tale 
+\n 
+\n Begrensninger i gratisversjonen av OsmAnd: 
+\n - Antall kartnedlastinger er begrenset 
+\n - Ingen nettfrakoblet tilgang til interessepunkter fra Wikipedia 
+\n 
 \n OsmAnd utvikles aktivt, og prosjektet vårt og dets videre framdrift avhenger av finansielle bidrag for å drive utviklingen og testingen av nye funksjoner. Overvei å kjøpe OsmAnd+ eller støtte spesifikke nye funksjoner eller bidra med en generell donasjon på https://osmand.net.</string>
 	<string name="upload_osm_note_description">Last opp ditt OSM-notat anonymt eller ved å bruke din profil hos OpenStreetMap.org</string>
    <string name="gpx_no_tracks_title">Du har ingen GPX-filer enda</string>
@ -1883,7 +1883,7 @@
    <string name="translit_name_if_miss">Transkriber hvis %1$s navn mangler</string>
    <string name="translit_names">Transkriber navn</string>
    <string name="get_for_month">Få for %1$s måned</string>
-    <string name="osm_live_banner_desc">Få ubegrensede kartnedlastinger, og kartoppdateringer mer enn en gang i måneden: Ukentlig, daglig eller hver time.</string>
+    <string name="osm_live_banner_desc">Få ubegrensede kartnedlastinger og kartoppdateringer mer enn en gang i måneden: Ukentlig, daglig eller timevist.</string>
    <string name="access_direction_audio_feedback">Lydbaserte anvisninger</string>
    <string name="access_direction_audio_feedback_descr">Indiker retning til målpunkt med lyd.</string>
    <string name="access_direction_haptic_feedback">Anvisninger med vibrasjon</string>
@ -1900,7 +1900,7 @@
    
    <string name="osm_user_stat">Redigeringer %1$s, rang %2$s, redigeringer totalt %3$s</string>
    <string name="osm_editors_ranking">Rangering av OSM-bidragsytere</string>
-    <string name="osm_live_email_desc">For å gi deg informasjon om bidrag.</string>
+    <string name="osm_live_email_desc">Behøves for å gi deg informasjon om bidrag.</string>
    <string name="osm_live_support_region">Støttet region</string>
    <string name="osm_live_thanks">Takk for at du støtter OsmAnd!
 \nFor å aktivere alle nye funksjoner må du starte OsmAnd på nytt.</string>
@ -2109,8 +2109,8 @@
    <string name="route_roundabout">Rundkjøring: Ta avkjøring %1$d og fortsett</string>
    <string name="support_new_features">Støtt nye funksjoner</string>
    <string name="max_speed">Maksimumshastighet</string>
-    <string name="shared_string_start_time">Avreise</string>
-    <string name="shared_string_end_time">Ankomst</string>
+    <string name="shared_string_start_time">Starttid</string>
+    <string name="shared_string_end_time">Sluttid</string>
    <string name="shared_string_color">Farge</string>
    <string name="file_can_not_be_moved">Filen kan ikke flyttes.</string>
    <string name="shared_string_move">Flytt</string>
@ -2158,29 +2158,29 @@
    <string name="points_delete_multiple_succesful">Punkt(er) slettet.</string>
    <string name="points_delete_multiple">Du skal slette %1$d punkt(er). Er du sikker?</string>
    <string name="average_speed">Gjennomsnittshastighet</string>
-    <string name="select_gpx_folder">Velg GPX-fil -mappe</string>
+    <string name="select_gpx_folder">Velg mappe for GPX-fil</string>
    <string name="osmand_extended_description_part1">OsmAnd (OSM Automated Navigation Directions) er et kart- og navigeringsprogram med tilgang til gratis, verdensomspennende og høykvalitets data fra OpenStreetMap (OSM).
 \n
 \n Gled deg over tale og visuell navigering, visning av interessepunkter, oppretting og behandling av GPX-spor, bruk av kotevisualisering og høydeinformasjon (gjennom programtillegg), et valg mellom kjøring, sykling, fotgjenger-modus, OSM-redigering og mye mer.</string>
-    <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automated Navigation Directions)
-\n
-\n OsmAnd+ er et navigeringsprogram med åpen kildekode og med tilgang til et bredt mangfold av globale data fra OpenStreetMap (OSM). Alle kartdata (vektor- eller fliskart) kan lagres på telefonens minnekort for nettfrakoblet bruk. Frakoblet og nettbasert rutefunksjon tilbys også, inkludert talebaserte anvisninger.
-\n
-\n OsmAnd+ er betalingsversjonen, ved å kjøpe den støtter du prosjektet, finansierer utviklingen av nye funksjoner, og mottar de siste oppdateringene.
-\n
-\n Noen av kjernefunksjonene:
-\n - Fullstendig nettfrakoblet funksjonalitet (lagre nedlastede vektor- eller fliskart i enhetens lagringsmedium)
-\n - Kompakte frakoblede vektorkart fra hele verden tilgjengelige
-\n - Ubegrenset nedlasting av lands- eller regionkart direkte fra programmet
-\n - Frakoblede Wikipedia-funksjoner (last ned Wikipedia-interessepunkter), flott for sightseeing
-\n - Overlegg av flere kartlag mulig, som GPX og navigeringsspor, interessepunkter, favoritter, koter, stoppesteder for offentlig transport, ytterligere kart med egendefinert gjennomsiktighet
-\n - Frakoblet søk etter adresser og steder (interessepunkter)
-\n - Frakoblet ruteplanlegging for middels avstander
-\n - Bil, sykkel eller fotgjengermoduser med valgfri:
-\n - Automatisk skifting mellom dag/natt-visning
-\n - Fartsavhengig kart-zooming
-\n - Kartjustering etter kompass- eller bevegelsesretning
-\n - Filhenvisning, fartsgrensevisning, innspilte og TTS-tale
+    <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automated Navigation Directions) 
+\n 
+\n OsmAnd+ er et navigeringsprogram med åpen kildekode og med tilgang til et bredt mangfold av globale data fra OpenStreetMap (OSM). Alle kartdata (vektor- eller fliskart) kan lagres på telefonens minnekort for nettfrakoblet bruk. Frakoblet og nettbasert rutefunksjon tilbys også, inkludert talebaserte anvisninger. 
+\n 
+\n OsmAnd+ er betalingsversjonen, ved å kjøpe den støtter du prosjektet, finansierer utviklingen av nye funksjoner, og mottar de siste oppdateringene. 
+\n 
+\n Noen av kjernefunksjonene: 
+\n - Fullstendig nettfrakoblet funksjonalitet (lagre nedlastede vektor- eller fliskart i enhetens lagringsmedium) 
+\n - Kompakte frakoblede vektorkart fra hele verden tilgjengelige 
+\n - Ubegrenset nedlasting av lands- eller regionkart direkte fra programmet 
+\n - Frakoblede Wikipedia-funksjoner (last ned Wikipedia-interessepunkter), flott for sightseeing 
+\n - Overlegg av flere kartlag mulig, som GPX og navigeringsspor, interessepunkter, favoritter, koter, stoppesteder for offentlig transport, ytterligere kart med egendefinert gjennomsiktighet 
+\n - Frakoblet søk etter adresser og steder (interessepunkter) 
+\n - Frakoblet ruteplanlegging for middels avstander 
+\n - Bil, sykkel eller fotgjengermoduser med valgfri: 
+\n - Automatisk skifting mellom dag/natt-visning 
+\n - Fartsavhengig kartforstørring
+\n - Kartjustering etter kompass- eller bevegelsesretning 
+\n - Filhenvisning, fartsgrensevisning, innspilte og TTS-tale 
 \n</string>
    <string name="osmand_plus_extended_description_part1">OsmAnd+ (OSM Automated Navigation Directions) er et kart- og navigeringsprogram med tilgang til gratis, verdensomspennende og høykvalitets data fra OpenStreetMap (OSM).
 \n Gled deg over tale og visuell navigering, visning av interessepunkter, oppretting og behandling av GPX-spor, bruk av kotevisualisering og høydeinformasjon, et valg mellom kjøring, sykling, fotgjenger-modus, OSM-redigering og mye mer.
@ -2212,11 +2212,11 @@
    <string name="quick_action_navigation_voice_off">Tale er av</string>
    <string name="quick_action_navigation_voice_on">Tale er på</string>
    <string name="sorted_by_distance">Sortert etter avstand</string>
-    <string name="search_favorites">Søk favoritter</string>
+    <string name="search_favorites">Søk blandt favoritter</string>
    <string name="configure_screen_quick_action">Hurtighandling</string>
    <string name="quick_action_new_action">Legg til handling</string>
    <string name="dialog_add_action_title">Legg til handling</string>
-    <string name="private_access_routing_req">Reisemålet ditt ligger i et område med privat adgang. Bruk private veier for denne turen?</string>
+    <string name="private_access_routing_req">Reisemålet ditt ligger i et område med privat adgang. Tillate adgang til de private veiene for denne turen?</string>
    <string name="restart_search">Start søk på nytt</string>
    <string name="increase_search_radius">Øk søkeradius</string>
    <string name="nothing_found">Ingenting funnet</string>
@ -2246,7 +2246,7 @@
    <string name="add_new_folder">Legg til ny mappe</string>
    <string name="shared_string_gpx_track">GPX-spor</string>
    <string name="routing_attr_height_obstacles_name">Bruk høydedata</string>
-    <string name="routing_attr_height_obstacles_description">Ta hensyn til terrenghøydedata (fra SRTM-, ASTER- og EU-DEM -data).</string>
+    <string name="routing_attr_height_obstacles_description">Ta hensyn til terrenghøyde (data fra SRTM, ASTER og EU-DEM).</string>
    <string name="quick_action_bug_message">Melding</string>
    <string name="shared_string_permissions">Tillatelser</string>
    <string name="import_gpx_failed_descr">OsmAnd kan ikke importere filen. Kontroller om OsmAnd har leserettighet for fillagringsstedet.</string>
@ -2331,7 +2331,7 @@
    <string name="full_version_thanks">Takk for at du kjøpte betalingsversjonen av OsmAnd.</string>
    <string name="routing_attr_driving_style_speed_name">Kortere ruter</string>
    <string name="routing_attr_driving_style_balance_name">Balansert</string>
-    <string name="track_points_category_name">Rutepunkter, fremtredende punkter på denne ruten, navngitte karakteristika.</string>
+    <string name="track_points_category_name">Rutepunkter, interessepunkter, navngitte objekter</string>
    <string name="shared_string_time_moving">Tid i bevegelse</string>
    <string name="shared_string_time_span">Varighet</string>
    <string name="shared_string_max">Maks.</string>
@ -2462,7 +2462,7 @@
    <string name="error_calculating_route_occured">Kunne ikke beregne rute</string>
    <string name="empty_route_calculated">Beregnet rute er tom</string>
    <string name="new_route_calculated_dist">Ny rute beregnet, distanse</string>
-    <string name="saving_gpx_tracks">Lagrer GPX-fil til SD-kort…</string>
+    <string name="saving_gpx_tracks">Lagrer GPX-fil…</string>
    <string name="data_settings_descr">Angi språk, last ned/gjeninnlast data.</string>
    <string name="av_camera_focus">Kameraets fokusmetode</string>
    <string name="av_camera_focus_descr">Velg fokusmodus for kameraet.</string>
@ -2509,8 +2509,8 @@
    <string name="quick_action_fav_name_descr">La stå tomt for å bruke adressen eller stedsnavnet.</string>
    <string name="quick_action_bug_descr">Denne meldingen inkluderes i kommentarfeltet.</string>
    <string name="mappilary_no_internet_desc">Du må være koblet til internett for å vise bilder fra Mapillary.</string>
-    <string name="hillshade_menu_download_descr">Last ned relieffskyggeoverleggskartet for å se relieffskygger for denne regionen.</string>
-    <string name="hillshade_purchase_header">Installer programtillegget for koter for å vise relieffskygger på kartet</string>
+    <string name="hillshade_menu_download_descr">Last ned relieffskyggeoverleggskartet for denne regionen for å se relieffskygger på kartet.</string>
+    <string name="hillshade_purchase_header">Kjøp og installer programtillegget for koter for å se relieffskygger på kartet</string>
    <string name="enter_new_name">Oppfør nytt navn</string>
 	<string name="shared_string_back">Tilbake</string>
 	<string name="waypoints_added_to_map_markers">Rutepunkter lagt til kartmarkører</string>
@ -2529,7 +2529,7 @@
    <string name="import_as_favorites">Importer som favoritt</string>
    <string name="import_file">Importer fil</string>
 	<string name="marker_show_distance_descr">Velg hvordan avstand og retning til kartmarkører på kartskjermen angis:</string>
-    <string name="import_gpx_file_description">kan importeres som favoritt, eller GPX-fil.</string>
+    <string name="import_gpx_file_description">kan importeres som favoritt eller GPX-fil.</string>
    <string name="tap_on_map_to_hide_interface">Fullskjermmodus</string>
    
    <string name="appearance_on_the_map">Utseende på kartet</string>
@ -2571,14 +2571,14 @@
    <string name="rendering_value_darkyellow_name">Mørkegul</string>
    <string name="rendering_value_translucent_pink_name">Gjennomskinnelig rosa</string>
    <string name="modify_the_search_query">Endre søkeord.</string>
-    <string name="looking_for_tracks_with_waypoints">Ser etter GPX-filer med rutepunkter</string>
+    <string name="looking_for_tracks_with_waypoints">Ser etter spor med rutepunkter</string>
    <string name="shared_string_gpx_waypoints">Spor-rutepunkter</string>
    <string name="add_group_descr">Importer grupper fra favoritter eller GPX-rutepunkter.</string>
    <string name="empty_state_markers_groups_desc">Importer favorittgrupper eller rutepunkter som markører.</string>
-    <string name="show_guide_line_descr">Vis veivisningslinjer fra din posisjon til de aktive markørplasseringene.</string>
+    <string name="show_guide_line_descr">Vis retningsbestemte linjer fra din posisjon til de aktive markørplasseringene.</string>
    <string name="show_arrows_descr">Vis én eller to piler som indikerer retningen til de aktive markørene.</string>
    <string name="distance_indication_descr">Velg hvordan avstanden til aktive markører skal vises.</string>
-    <string name="active_markers_descr">Velg antall aktive markører som skal vises.</string>
+    <string name="active_markers_descr">Velg hvor mange retningsindikatorer som skal vises.</string>
    <string name="tap_on_map_to_hide_interface_descr">Et trykk på kartet skjuler/viser kontrollknappene og miniprogrammene.</string>
    <string name="mark_passed">Marker som passert</string>
    <string name="osn_modify_dialog_error">Kunne ikke endre notatet</string>
@ -2676,7 +2676,7 @@
    <string name="disable_recording_once_app_killed_descrp">Vil sette GPX-logging i pausemodus når programmet avsluttes (via nylig brukte apper). (OsmAnds bakgrunnsindikasjon forsvinner fra Android-varslingslinjen.)</string>
    <string name="route_is_too_long_v2">Legg til mellomliggende reisemål hvis denne lange ruten ikke er beregnet innen 10 minutter.</string>
    <string name="intermediate_items_sort_return">Optimalisert rekkefølge av mellomliggende reisemål underveis til målet.</string>
-    <string name="audionotes_location_not_defined">Sted å assosiere med notatet er ikke definert ennå. \"Bruk posisjon …\" for å tilordne et notat til det angitte stedet.</string>
+    <string name="audionotes_location_not_defined">Sted å assosiere med notatet er ikke definert ennå. \"Bruk posisjon…\" for å tilordne et notat til det angitte stedet.</string>
    <string name="add_waypoint_dialog_title">Legg til rutepunkt i innspilt GPX-spor</string>
    <string name="voice_is_not_available_msg">Taleveiledning er ikke tilgjengelig, gå til \'Innstillinger\' → \'Navigeringsinnstillinger\' → \'Taleveiledning\' og velg eller last ned en språkpakke.</string>
    <string name="use_fast_recalculation_desc">For lange turer, beregn på nytt bare den første delen av ruten.</string>
@ -2833,7 +2833,7 @@
    <string name="record_plugin_description">Dette programtillegget aktiverer funksjoner for å ta opp og lagre sporene dine ved å manuelt trykke på miniprogrammet for GPX-logging på kartskjermen, eller også for å automatisk logge alle dine navigeringsruter til en GPX-fil. 
 \n
 \nSpor som er tatt opp kan deles med dine venner eller brukes som OSM-bidrag. Idrettsutøvere kan bruke innspilte spor til å følge treningen sin. Noe grunnleggende sporingsanalyse kan utføres direkte i OsmAnd, som rundetider, gjennomsnittshastighet etc., og spor kan selvfølgelig også analyseres senere i spesielle tredjeparts analyseprogrammer.</string>
-    <string name="osmand_development_plugin_description">Dette programtillegget viser innstillinger for utvikling og feilrettingsfunksjoner, for testing eller simulering av veivisning, skjermtegningsytelse, eller stemmeanvisning. Disse innstillingene er ment for utviklere, og trengs ikke for vanlige brukere.</string>
+    <string name="osmand_development_plugin_description">Dette programtillegget viser innstillinger for utvikling og feilrettingsfunksjoner som testing eller simulering av ruteberegning, skjermopptegningsytelse eller talemeldinger. Disse innstillingene er ment for utviklere og trengs ikke for vanlige brukere.</string>
    <string name="osmand_extended_description_part2">GPS-navigering
 \n • Velg mellom frakoblet modus (ingen roaming-kostnader når du er utenlands) eller nettbasert modus (raskere)
 \n • Taleveiledning sving-for-sving leder deg langs veien (innspilt og syntetisert tale)
@ -2941,17 +2941,17 @@
 \n De fleste landene i verden kan lastes ned.
 \n Få pålitelig navigering i ditt land - det være seg Frankrike, Tyskland, Mexico, Storbritannia, Spania, Nederland, USA, Russland, Brasil eller andre.</string>
    <string name="osmand_team">OsmAnd-laget</string>
-    <string name="plugin_touringview_descr">"Aktivering av denne visningen endrer OsmAnds kartstil til \"Turvisning, dette er et spesielt høydetaljskart for dem på reisefot og folk i transportbransjen. 
+    <string name="plugin_touringview_descr">Aktivering av denne visningen endrer kartstilen til \'Turvisning\', dette er en spesielt detaljert visning for reisende og yrkessjåfører.
 \n
-\nDenne visningen gir, uansett forstørrelsesnivå, høyest antall reisedetaljer tilgjengelig i kartdataen (i særdeleshet veier, småveier, stier  og orienteringsmerker). 
-\n 
-\nDet viser også alle typer veier, klart adskilt med fargemerking, som er nyttig når du kjører for eksempel store kjøretøy. 
+\nDenne visningen gir, uansett zoomnivå, det høyeste antall reisedetaljer tilgjengelig i kartdataene (i særdeleshet veier, småveier, stier og orienteringsmerker).
 \n
-\nDet gir også spesielle turvalg, som visning av sykkelveier eller fjellruter. 
-\n 
-\nMan trenger ikke å laste ned noe ekstra, visningen lages basert på standardkart. 
-\n 
-\nDenne visningen kan tilbakestilles enten ved å deaktivere den igjen her, eller å endre \"Kartstil\" under \"Sett opp kart\" man ønsker."</string>
+\nViser også alle typer veier klart adskilt med fargemerking, som er nyttig ved kjøring av f.eks. store kjøretøy.
+\n
+\nGir også spesielle turvalg som visning av sykkelruter eller fjellruter.
+\n
+\nMan trenger ikke laste ned noe ekstra, visningen lages basert på standardkart.
+\n
+\nVisningen kan tilbakestilles enten ved å deaktivere den igjen her, eller ved å endre \'Kartstil\' under \"Kartinnstilling\" som ønsket.</string>
    <string name="plugin_nautical_descr">Dette programtillegget beriker OsmAnds kart og navigasjonsprogram til også å tjene som sjøkart, for båt, seiling eller andre typer vannsport.
 \n
 \nDette spesielle karttillegget for OsmAnd gir alle sjømerker, for innom-, og utenskjærs bruk. Beskrivelsen av hvert av dem gir detaljer nok til å identifisere dem og deres mening (kategori, form, farge, sekvens, referanse, osv.).
@ -2963,22 +2963,21 @@
    <string name="osmand_distance_planning_plugin_description">Dette programtillegget tilbyr et miniprogram for kartskjermen der du kan opprette stier ved å trykke på kartet, eller ved å endre eksisterende GPX-filer, for å planlegge en tur og måle avstanden mellom punkter. Resultatet kan lagres som en GPX-fil, som senere kan brukes for veiledning.</string>
    <string name="osm_editing_plugin_description">Via dette programtillegget kan OsmAnd brukes til å sende inn OSM-bidrag, som opprettelse eller endring av OSM-POI-objekter, åpning eller kommentering av OSM-notater, og bidrag til GPX-spor. OSM er et verdensomspennende kartprosjekt i offentlig eiendom. For detaljer, se https://openstreetmap.org. Aktiv deltagelse verdsettes, og bidrag kan gjøres direkte fra OsmAnd, hvis du angir din personlige OSM-innloggingsinfo i programmet.</string>
    <string name="osmand_extended_description_part3">Kart
-\n • Viser POI-er (interessepunkter) rundt deg
-\n • Orienterer kartet i fartsretning (eller etter kompass)
-\n • Viser din plassering og retningen du ser i
-\n • Del din plassering slik at dine venner kan finne deg
+\n • Viser interessepunkter rundt deg
+\n • Orienterer kartet etter bevegelsesretning (eller kompass)
+\n • Viser din posisjon og retningen du ser i
+\n • Del din posisjon slik at dine venner kan finne deg
 \n • Beholder dine viktigste steder i \"Favoritter\"
-\n • Tillater deg å velge hvordan du vil vise navn i kartet: På engelsk, lokale navn, eller fonetisk staving
-\n • Viser spesialiserte nettbaserte flis, satellittvisning (fra Bing), forskjellige overleggslag, som tur/navigasjon-GPX-spor og ytterligere lag med tilpassbar gjennomsiktighet
+\n • Lar deg velge hvordan du vil vise navn på kartet: På engelsk, lokale navn, eller fonetisk staving
+\n • Viser spesialiserte nettbaserte kartfliser, satellittvisning (fra Bing), forskjellige overlegg som GPX-spor til tur/navigering og ytterligere lag med tilpassbar gjennomsiktighet
 \n</string>
    <string name="osmand_plus_extended_description_part3">Kartvisning
 \n • Vis din posisjon og retning
-\n • Valgfri rotasjon av kartet mot kompass eller fartsretning
+\n • Eventuelt orienter kartet etter kompass eller bevegelsesretning
 \n • Lagre dine viktigste steder som favoritter
-\n • Vis POI-er (interessepunkter) rundt deg
-\n • Vis spesialiserte nettbaserte fil, satellittvisning (fra Bing), forskjellige overleggslag, som tur/navigasjons-GPX-spor og ytterligere lag med tilpassbar gjennomsiktighet
-\n • Valgfri visning av stedsnavn på Engelsk, lokal, eller fonetisk staving
-\n</string>
+\n • Vis interessepunkter rundt deg
+\n • Vis spesialiserte nettbaserte kartfliser, satellittvisning (fra Bing), forskjellige overlegg som GPX-spor til tur/navigering og ytterligere lag med tilpassbar gjennomsiktighet
+\n • Valgfri visning av stedsnavn på engelsk, lokalt språk, eller fonetisk staving</string>
    <string name="osmand_plus_extended_description_part4">Bruk OSM- og Wikipedia-data
 \n • Høykvalitetsinfo fra de beste samarbeidsprosjektene i verden
 \n • OSM-data tilgjengelig per land eller region
@ -2990,9 +2989,9 @@
    <string name="osmand_plus_extended_description_part7">Bidra direkte til OSM
 \n • Rapporter datafeil
 \n • Last opp GPX-spor til OSM direkte fra programmet
-\n • Legg til POI-er og last dem opp direkte til OSM (eller senere hvis du ikke har nett)
-\n • Valgfri turopptaksmodus i bakgrunnen (mens enheten er i dvalemodus)
-\n OsmAnd er aktivt utviklet fri programvare. Alle kan bidra til programmet ved å rapportere feil, forbedre oversettelser, eller kode nye funksjoner. Ytterligere avhenger prosjektet av finansielle bidrag for å støtte koding og testing av ny funksjonalitet.
+\n • Legg til interessepunkter og last dem opp direkte til OSM (eller senere hvis uten Internett)
+\n • Valgfri turopptak også i bakgrunnsmodus (mens enheten er i dvalemodus)
+\n OsmAnd er aktivt utviklet programvare med åpen kildekode. Alle kan bidra til programmet ved å rapportere feil, forbedre oversettelser eller kode nye funksjoner. I tillegg avhenger prosjektet av finansielle bidrag for å støtte koding og testing av nye funksjoner.
 \n</string>
    <string name="hide_full_description">Skjul full beskrivelse</string>
    <string name="show_full_description">Vis full beskrivelse</string>
@ -3028,5 +3027,5 @@
    <string name="coord_input_edit_point">Rediger punkt</string>
    <string name="coord_input_add_point">Legg til punkt</string>
    <string name="coord_input_save_as_track">Lagre som spor</string>
-    <string name="coord_input_save_as_track_descr">Du har lagt til %1$s punkter. Skriv inn navnet på filen og klikk \"Lagre\".</string>
+    <string name="coord_input_save_as_track_descr">Du har lagt til %1$s punkter. Skriv inn navnet på filen og trykk \"Lagre\".</string>
    </resources>
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@ -2803,4 +2803,58 @@

 	<string name="poi_social_facility_for_disabled">Gehandicapten</string>
 	<string name="poi_service_vehicle_muffler_yes">Geluiddemper</string>
+	<string name="poi_social_facility_assisted_living">Begeleid wonen</string>
+	<string name="poi_social_facility_shelter">Opvang</string>
+	<string name="poi_social_facility_workshop">Workshop</string>
+	<string name="poi_social_facility_day_care">Dagzorg</string>
+
+	<string name="poi_social_facility_for_senior">Senioren</string>
+	<string name="poi_social_facility_for_child">Kinderen</string>
+	<string name="poi_social_facility_for_mental_health">Patiënten met mentale beperkingen</string>
+	<string name="poi_social_facility_for_juvenile">Jeugdig</string>
+	<string name="poi_historic_civilization_ancient_roman">Beschaving: oude romeinen (753 v.Chr. – 284 n.Chr.)</string>
+	<string name="poi_animal_training_dog">Hond</string>
+	<string name="poi_animal_training_horse">Paard</string>
+
+	<string name="poi_horse_yes">Paarden toegestaan</string>
+	<string name="poi_horse_no">Paarden niet toegestaan</string>
+	<string name="poi_animal_yes">Dieren toegestaan</string>
+	<string name="poi_animal_no">Dieren niet toegestaan</string>
+
+	<string name="poi_microwave_oven_yes">Magnetron: ja</string>
+	<string name="poi_microwave_oven_no">Magnetron: nee</string>
+	<string name="poi_water_heater_yes">Waterkoker: ja</string>
+	<string name="poi_water_heater_no">Waterkoker: nee</string>
+
+	<string name="poi_parking_garage_boxes">Garageboxen</string>
+	<string name="poi_parking_carports">Carports</string>
+
+	<string name="poi_badminton">Badminton</string>
+	<string name="poi_judo">Judo</string>
+	<string name="poi_squash">Squash</string>
+	<string name="poi_socket_nema_14_30_yes">NEMA 14-30</string>
+	<string name="poi_socket_nema_14_50_yes">NEMA 14-50</string>
+	<string name="poi_socket_schuko_yes">Schuko</string>
+	<string name="poi_socket_bs1363_yes">BS 1363</string>
+	<string name="poi_socket_as3112_yes">AS/NZS 3112</string>
+
+	<string name="poi_socket_chademo_output_high">Hoog</string>
+	<string name="poi_socket_chademo_output_medium">Middel</string>
+	<string name="poi_socket_chademo_output_low">Laag</string>
+	<string name="poi_socket_type2_output_high">Hoog</string>
+	<string name="poi_socket_type2_output_medium">Middel</string>
+	<string name="poi_socket_type2_output_low">Laag</string>
+	<string name="poi_socket_type2_combo_output_high">Hoog</string>
+	<string name="poi_socket_type2_combo_output_medium">Middel</string>
+	<string name="poi_socket_type2_combo_output_low">Laag</string>
+	<string name="poi_socket_type3_output_high">Hoog</string>
+	<string name="poi_socket_type3_output_medium">Middel</string>
+	<string name="poi_socket_type3_output_low">Laag</string>
+	<string name="poi_socket_cee_blue_output_high">Hoog</string>
+	<string name="poi_socket_cee_blue_output_medium">Middel</string>
+	<string name="poi_socket_cee_blue_output_low">Laag</string>
+	<string name="poi_socket_schuko_output_high">Hoog</string>
+	<string name="poi_socket_schuko_output_medium">Middel</string>
+	<string name="poi_socket_schuko_output_low">Laag</string>
+
 	</resources>
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@ -3883,4 +3883,7 @@

 	<string name="poi_outcrop">Wychodnia</string>

+<string name="poi_payment_contactless_yes">Zbliżeniowo</string>
+	<string name="poi_payment_contactless_no">Płatność zbliżeniowa nieakceptowana</string>
+
 </resources>
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@ -3077,8 +3077,9 @@ Reprezentuje obszar: %1$s x %2$s</string>
    <string name="read_wikipedia_offline">Czytaj Wikipedię offline</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>
+    <string name="error_notification_desc">Proszę przesłać zrzut ekranu tego powiadomienia na adres support@osmand.net</string>
    <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>
+    <string name="coord_input_save_as_track_descr">Dodano %1$s punktów. Proszę wprowadzić nazwę pliku i nacisnąć „Zapisz”.</string>
+    <string name="coord_input_save_as_track">Zapisz jako ślad</string>
    </resources>
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@ -163,7 +163,7 @@
 	<string name="poi_gate">Portão</string>
 	<string name="poi_city_wall">Muralha</string>
 	<string name="poi_lift_gate">Cancela elevatória</string>
-	<string name="poi_toll_booth">Cabine de pedágio</string>
+	<string name="poi_toll_booth">Pedágio</string>
 	<string name="poi_border_control">Alfândega</string>
 	<string name="poi_traffic_calming_bump">Lombada (curta)</string>
 	<string name="poi_traffic_calming_hump">Lombada rápida</string>
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@ -130,7 +130,7 @@
 	<string name="shared_string_favorites">Favoritos</string>
 	<string name="shared_string_address">Endereço</string>
 	<string name="shared_string_add">Adicionar</string>
-	<string name="shared_string_add_to_favorites">Adicionar aos favoritos</string>
+	<string name="shared_string_add_to_favorites">Adicionar aos \'Favoritos\'</string>
 	<string name="shared_string_my_location">Minha posição</string>
 	<string name="shared_string_my_favorites">Meus favoritos</string>
 	<string name="shared_string_tracks">Minhas trilhas</string>
@ -194,12 +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.
+	<string name="osmand_srtm_long_description_1000_chars">Este plugin fornece curvas de nível e camada de sombras de 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>
+\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 Terra, o satélite principal do Sistema de Observação da Terra da NASA. ASTER é um esforço conjunto da NASA, do Ministério da Economia, Comércio e Indústria do Japão (METI) e do Sistema Espacial Japonês (J-spacesystems).</string>
+	<string name="srtm_plugin_description">Este plugin fornece curvas de nível e camada de sombras de relevo por cima do mapa padrão do OsmAnd. Esta funcionalidade será muito apreciada por atletas, viajantes e qualquer interessado na estrutura de relevo da paisagem. (Por favor, note que as curvas de nível e/ou dados de relevo são downloads adicionais separados disponíveis depois de ativar o plugin.)
+\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 Terra, o satélite principal do Sistema de Observação da Terra da NASA. ASTER é um esforço conjunto da NASA, do Ministério da Economia, Comércio e Indústria do Japão (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>
@ -270,7 +270,7 @@
    <string name="logged_as">Conectado como %1$s</string>
 	<string name="speed_limit_exceed">Tolerância do limite de velocidade</string>
 	<string name="speed_limit_exceed_message">Selecione a margem de tolerância de limite de velocidade, acima do qual você receberá um aviso de voz.</string>
-	<string name="fav_point_emoticons_message">O nome do favorito foi modificado para %1$s para facilitar a salvar corretamente a seqüência de caracteres com emoticons para um arquivo.</string>
+	<string name="fav_point_emoticons_message">O nome do Favorito foi modificado para %1$s para facilitar salvar corretamente a sequência de caracteres com emoticons para um arquivo.</string>
    <string name="speak_title">Anunciar…</string>
 	<string name="show_pedestrian_warnings">Faixas de pedestre</string>
    <string name="routing_attr_no_new_routing_description">Não use as regras de roteamento introduzidas na v1.9</string>
@ -587,7 +587,7 @@
    <string name="index_name_italy">Europa - Itália</string>
    <string name="index_name_gb">Europa - Grã-Bretanha</string>
    <string name="calculate_osmand_route_without_internet">Calcular segmento de rota OsmAnd sem Internet</string>
-    <string name="keep_and_add_destination_point">Adicionar como ponto de destino</string>
+    <string name="keep_and_add_destination_point">Adicionar como destino seguinte</string>
    <string name="select_gpx">Selecionar GPX…</string>
    <string name="route_descr_select_destination">Selecionar destino</string>
    <string name="route_preferences">Preferências de rota</string>
@ -686,7 +686,7 @@ Pôr do Sol: %2$s</string>
 	<string name="avoid_in_routing_descr">Evitar vias com pedágio, não-pavimentadas, balsas</string>
 	<string name="bg_service_sleep_mode_off">Ativar\n modo segundo plano</string>
 	<string name="show_cameras">Radares</string>
-	<string name="show_traffic_warnings">Moderadores de tráfego</string>
+	<string name="show_traffic_warnings">Alertas de trânsito</string>
 	<string name="destination_point">Destino %1$s</string>
    <string name="context_menu_item_destination_point">Definir como destino</string>
    <string name="please_select_address">Selecionar primeiro a cidade ou rua</string>
@ -1591,7 +1591,7 @@ Pôr do Sol: %2$s</string>
 	<string name="navigate_point_top_text">Insira a latitude e longitude no formato selecionado (D - graus, M - minutos, S - segundos)</string>
 	<string name="navigate_point_latitude">Latitude</string>
 	<string name="navigate_point_longitude">Longitude</string>
-	<string name="navigate_point_format_D">DDD.DD</string>
+	<string name="navigate_point_format_D">GGG.GG</string>
 	<string name="navigate_point_format_DM">DDD MM.MM</string>
 	<string name="navigate_point_format_DMS">DDD MM SS.SS</string>
 	<string name="search_address_top_text">Escolher endereço</string>
@ -1775,7 +1775,7 @@ Pôr do Sol: %2$s</string>
 	<string name="building_number">Número de edifício</string>
 	<string name="next_proceed">Próximo</string>
 	<string name="opening_at">Abre às</string>
-	<string name="closing_at">Fecha em</string>
+	<string name="closing_at">Fecha às</string>
 <string name="av_locations_descr">Arquivo GPX com notas de posição.</string>
    <string name="av_locations">Posições</string>
    
@ -1877,7 +1877,7 @@ Pôr do Sol: %2$s</string>
    <string name="shared_string_navigation">Navegação</string>
    <string name="osmand_running_in_background">Rodando em segundo plano</string>
    <string name="lang_fy">Frisão</string>
-    <string name="favourites_edit_dialog_title">Informação do favorito</string>
+    <string name="favourites_edit_dialog_title">Informação do Favorito</string>
    <string name="simulate_your_location_stop_descr">Parar de simular sua posição.</string>
    <string name="simulate_your_location_descr">Simular a sua posição usando uma rota calculada ou uma trilha GPX gravada.</string>
    <string name="rendering_attr_currentTrackColor_description">Cor do GPX</string>
@ -2008,7 +2008,7 @@ Pôr do Sol: %2$s</string>
    <string name="find_parking">Achar estacionamento</string>
    <string name="show_polygons">Mostrar polígonos de áreas</string>
    
-    <string name="add_points_to_map_markers_q">Você quer adicionar todos os pontos aos marcadores de mapa?</string>
+    <string name="add_points_to_map_markers_q">Adicionar todos os pontos como marcadores de mapa?</string>
    <string name="shared_string_add_to_map_markers">Adicionar aos marcadores de mapa</string>
    <string name="select_map_markers">Selecionar marcadores de mapa</string>
    <string name="shared_string_reverse_order">Ordem inversa</string>
@ -2054,7 +2054,7 @@ Pôr do Sol: %2$s</string>
    <string name="skip_map_downloading_desc">Você não possui mapas offlines. Você deve escolher um mapa da lista ou baixar mapas mais tarde pelo Menu - %1$s.</string>
    <string name="search_another_country">Selecione um outro local</string>
    <string name="search_map">Procurando mapas…</string>
-    <string name="first_usage_wizard_desc">Deixar OsmAnd determinar o seu local e sugerir mapas da região para baixar.</string>
+    <string name="first_usage_wizard_desc">Deixe o OsmAnd determinar o seu local e sugerir mapas da região para baixar.</string>
    <string name="location_not_found">Local não encontrado</string>
    <string name="no_inet_connection">Sem conexão à Internet</string>
    <string name="no_inet_connection_desc_map">É necessário baixar os mapas.</string>
@ -2067,7 +2067,7 @@ Pôr do Sol: %2$s</string>
    <string name="no_update_info">Não mostrar atualizações</string>
    <string name="update_all_maps_now">Atualizar todos os mapas agora?</string>
    <string name="clear_tile_data">Limpar todos os títulos</string>
-    <string name="replace_favorite_confirmation">Você tem certeza que deseja substituir seu favorito %1$s?</string>
+    <string name="replace_favorite_confirmation">Você tem certeza que deseja substituir o Favorito %1$s?</string>
    <string name="shared_string_change">Mudar</string>
    <string name="coords_search">Busca de coordenadas</string>
    <string name="advanced_coords_search">Busca avançada de coordenadas</string>
@ -2111,7 +2111,7 @@ Pôr do Sol: %2$s</string>
    <string name="total_distance">Distância total</string>
    <string name="shared_string_slope">Inclinação</string>
    <string name="open_street_map_login_and_pass">Usuário e senha do OpenStreetMap</string>
-    <string name="osn_modify_dialog_error">Ocorreu exceção: a anotação não foi modificada</string>
+    <string name="osn_modify_dialog_error">Não foi possível modificar a nota</string>
    <string name="osn_modify_dialog_title">Modificar anotação</string>
    <string name="context_menu_item_modify_note">Modificar anotação do OSM</string>
    <string name="make_round_trip_descr">Adicionar cópia do ponto de partida como destino.</string>
@ -2119,28 +2119,28 @@ Pôr do Sol: %2$s</string>
    <string name="shared_string_markers">Marcações</string>
    <string name="coordinates_format">Formato das coordenadas</string>
    <string name="use_system_keyboard">Usar teclado do sistema</string>
-    <string name="fast_coordinates_input_descr">Escolha o formato de inserção de coordenadas. Você sempre pode alterá-la tocando em Opções.</string>
+    <string name="fast_coordinates_input_descr">Escolha o formato de inserção de coordenadas. Você sempre pode alterá-la tocando em \'Opções\'.</string>
    <string name="fast_coordinates_input">Inserção de coordenadas rápida</string>
    <string name="use_location">Usar posição</string>
-    <string name="add_location_as_first_point_descr">Adicione sua posição como ponto de partida para planejar uma rota perfeita.</string>
+    <string name="add_location_as_first_point_descr">Adicione sua posição como ponto de partida para planejar a rota perfeita.</string>
    <string name="my_location">Minha posição</string>
    <string name="shared_string_finish">Terminar</string>
    <string name="plan_route">Planejar rota</string>
    <string name="shared_string_sort">Classificar</string>
    <string name="coordinate_input">Inserção de coordenada</string>
    <string name="is_saved">está salvo</string>
-    <string name="marker_save_as_track_descr">Exporte suas marcações para um arquivo que você pode especificar aqui:</string>
-    <string name="marker_save_as_track">Salvar como trilha</string>
+    <string name="marker_save_as_track_descr">Exporte seus marcadores para o seguinte arquivo GPX:</string>
+    <string name="marker_save_as_track">Salvar como arquivo GPX</string>
    <string name="move_to_history">Mover para o histórico</string>
-    <string name="group_will_be_removed_after_restart">O grupo será excluído na próxima vez que reiniciar o aplicativo.</string>
+    <string name="group_will_be_removed_after_restart">O grupo será excluído na próxima vez em que reiniciar o aplicativo.</string>
    <string name="show_arrows_on_the_map">Mostrar setas no mapa</string>
-    <string name="remove_from_map_markers">Excluir das Marcações de Mapa</string>
+    <string name="remove_from_map_markers">Excluir dos marcadores de mapa</string>
    <string name="descendingly">decrescente</string>
    <string name="ascendingly">ascendente</string>
    <string name="date_added">Data adicionada</string>
    <string name="order_by">Ordenar por:</string>
    <string name="marker_show_distance_descr">Selecionar como indicar distância e orientação para marcadores de mapa na tela do mapa:</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">Selecione a baixo em qual velocidade a orientação do mapa alterna de \'Na direção do movimento\' para \'Pela bússola\'.</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Selecione a baixo em qual velocidade a orientação do mapa muda de \'Na direção do movimento\' para \'Pela bússola\'.</string>
    <string name="all_markers_moved_to_history">Todas as marcações de mapa foram movidas para o histórico</string>
    <string name="marker_moved_to_history">O marcador de mapa foi movido para o histórico</string>
    <string name="marker_moved_to_active">O marcador de mapa foi movido para ativo</string>
@ -2155,7 +2155,7 @@ Pôr do Sol: %2$s</string>
    <string name="move_all_to_history">Mover tudo para o histórico</string>
    <string name="show_direction">Indicação de distância</string>
    <string name="sort_by">Classificar por</string>
-    <string name="do_not_use_animations">Não usar animações</string>
+    <string name="do_not_use_animations">Sem animações</string>
    <string name="do_not_use_animations_descr">Desabilitar animações no aplicativo.</string>
    <string name="keep_showing_on_map">Manter mostrando no aplicativo</string>
    <string name="exit_without_saving">Sair sem salvar?</string>
@ -2168,7 +2168,7 @@ Pôr do Sol: %2$s</string>
    <string name="add_point_after">Adicionar ponto após</string>
    <string name="shared_string_options">Opções</string>
    <string name="measurement_tool_snap_to_road_descr">OsmAnd irá conectar os pontos com rotas para o perfil selecionado.</string>
-    <string name="measurement_tool_save_as_new_track_descr">Você pode salvar os pontos tanto como pontos da rota quanto como uma linha.</string>
+    <string name="measurement_tool_save_as_new_track_descr">Salve os pontos ou como pontos da rota ou como uma linha.</string>
    <string name="choose_navigation_type">Selecionar perfil de navegação</string>
    <string name="none_point_error">Favor adicionar ao menos um ponto.</string>
    <string name="enter_gpx_name">Nome do arquivo GPX:</string>
@ -2180,11 +2180,11 @@ Pôr do Sol: %2$s</string>
    <string name="quick_action_start_stop_navigation">Iniciar/parar navegação</string>
    <string name="quick_action_start_stop_navigation_descr">Toque neste botão para iniciar ou parar a navegação.</string>
    <string name="store_tracks_in_monthly_directories">Armazenar trilhas gravadas em pastas mensais</string>
-    <string name="store_tracks_in_monthly_directories_descrp">Armazenar trilhas gravadas em subpastas por mês gravado (como 2017-01).</string>
+    <string name="store_tracks_in_monthly_directories_descrp">Armazenar trilhas gravadas em subpastas por mês (ex.: 2018-01).</string>
    <string name="shared_string_reset">Redefinir</string>
    <string name="shared_string_reload">Recarregar</string>
    <string name="mapillary_menu_descr_tile_cache">Recarregar ladrilhos para visualizar dados atualizados.</string>
-    <string name="wrong_user_name">Nome de usuário errado!</string>
+    <string name="wrong_user_name">Nome de usuário errado</string>
    <string name="shared_string_to">Para</string>
    <string name="mapillary_menu_date_from">De</string>
    <string name="mapillary_menu_descr_dates">Ver somente imagens adicionadas</string>
@ -2206,25 +2206,25 @@ Pôr do Sol: %2$s</string>
    <string name="no_photos_descr">Não temos fotos para este local.</string>
    <string name="mapillary_action_descr">Contribuir com suas próprias vistas de rua deste local através do Mapillary.</string>
    <string name="mapillary_widget">Ferramenta Mapillary</string>
-    <string name="mapillary_widget_descr">Permite que você contribua rapidamente ao Mapillary.</string>
+    <string name="mapillary_widget_descr">Permite contribuições rápidas ao Mapillary.</string>
    <string name="mapillary_descr">Fotos ao nível da rua, online, para todos. Descobrir lugares, colaborar, capturar o mundo.</string>
    <string name="mapillary">Mapillary</string>
    <string name="plugin_mapillary_descr">Fotos ao nível da rua para todos. Descubra lugares, colabore, capture o mundo.</string>
-    <string name="private_access_routing_req">Seu destino está localizado em uma área de acesso privado. Você quer permitir acesso às estradas privadas para esta viagem?</string>
+    <string name="private_access_routing_req">Seu destino está localizado numa área de acesso privado. Permitir acesso às vias privadas para esta viagem?</string>
    <string name="restart_search">Reiniciar pesquisa</string>
    <string name="increase_search_radius">Aumentar o raio de busca</string>
-    <string name="nothing_found">Nada encontrado :(</string>
+    <string name="nothing_found">Nada encontrado</string>
    <string name="nothing_found_descr">Modifique o texto da pesquisa ou aumente o raio de busca.</string>
    <string name="quick_action_showhide_osmbugs_title">Mostrar/ocultar notas OSM</string>
    <string name="quick_action_osmbugs_show">Mostrar Anotações do OSM</string>
    <string name="quick_action_osmbugs_hide">Ocultar notas OSM</string>
-    <string name="quick_action_showhide_osmbugs_descr">Tocar neste botão de ação mostra ou oculta as notas OSM no mapa.</string>
+    <string name="quick_action_showhide_osmbugs_descr">Tocar neste botão de ação mostra ou oculta as Notas OSM no mapa.</string>
    <string name="sorted_by_distance">Classificado por distância</string>
-    <string name="search_favorites">Pesquisar favoritos</string>
-    <string name="hillshade_menu_download_descr">Para ver o sombreamento do relevo no mapa, você precisa baixar a camada de mapa de sombreamento de relevo desta região.</string>
-    <string name="hillshade_purchase_header">Para ver o sombreamento de relevo no mapa, você precisa comprar e instalar o plugin de Curvas de Nível</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="search_favorites">Pesquisar Favoritos</string>
+    <string name="hillshade_menu_download_descr">Para ver as sombras de relevo no mapa, baixe a camada de sombras de relevo desta região.</string>
+    <string name="hillshade_purchase_header">Para ver o sombreamento de relevo no mapa, você precisa comprar e instalar o plugin \'Curvas de Nível\'</string>
+    <string name="hide_from_zoom_level">Ocultar a partir do nível de zoom</string>
+    <string name="srtm_menu_download_descr">Baixe o mapa \'Curvas de nível\' para usar nesta 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 plugin \'Curvas de Nível\'</string>
    <string name="srtm_color_scheme">Esquema de cores</string>
@ -2235,15 +2235,15 @@ Pôr do Sol: %2$s</string>
    <string name="quick_action_show_navigation_finish_dialog">Mostrar diálogo \'Navegação finalizada\'</string>
    <string name="mapillary_menu_title_tile_cache">Cache de quadrícula</string>
    <string name="map_widget_ruler_control">Régua de raio</string>
-    <string name="show_from_zoom_level">Mostrar do nível de ampliação</string>
+    <string name="show_from_zoom_level">Exibir a partir do nível de zoom</string>
    <string name="routing_attr_allow_private_name">Permitir acesso privado</string>
    <string name="routing_attr_allow_private_description">Permitir acesso a áreas privadas.</string>
-    <string name="display_zoom_level">Mostrar nível de ampliação: %1$s</string>
+    <string name="display_zoom_level">Nível de zoom mín.: %1$s</string>
    <string name="favorite_group_name">Nome do grupo</string>
    <string name="change_color">Alterar cor</string>
    <string name="edit_name">Editar nome</string>
    <string name="animate_my_location">Animar Minha Posição</string>
-    <string name="animate_my_location_desc">Ativar animação de deslizamento de mapa da Minha Posição durante a navegação.</string>
+    <string name="animate_my_location_desc">Ativar animação de deslizamento de mapa da \'Minha Posição\' durante a navegação.</string>
    <string name="shared_string_overview">Visão geral</string>
    <string name="select_street">Selecionar rua</string>
    <string name="shared_string_in_name">em %1$s</string>
@ -2289,21 +2289,21 @@ Pôr do Sol: %2$s</string>
    <string name="looking_for_tracks_with_waypoints">Procurando trilhas com pontos de passagem</string>
    <string name="shared_string_more_without_dots">Mais</string>
    <string name="appearance_on_the_map">Aparência no mapa</string>
-    <string name="add_track_to_markers_descr">Pontos de passagem podem ser adicionados a marcadores selecionando uma dessas trilhas que os tem.</string>
-    <string name="add_favourites_group_to_markers_descr">Selecione uma categoria favorita para adicionar aos marcadores.</string>
+    <string name="add_track_to_markers_descr">Selecione uma trilha para adicionar seus pontos de passagem aos marcadores.</string>
+    <string name="add_favourites_group_to_markers_descr">Selecione uma categoria dos Favoritos para adicionar aos marcadores.</string>
    <string name="shared_string_gpx_waypoints">Pontos de passagem de trilhas</string>
    <string name="favourites_group">Categoria favoritos</string>
    <string name="add_group">Adicionar um grupo</string>
-    <string name="add_group_descr">Você pode importar grupos dos favoritos ou pontos de passagem de trilhas.</string>
+    <string name="add_group_descr">Importar grupos dos Favoritos ou pontos de passagem de trilhas.</string>
    <string name="empty_state_markers_active">Crie marcadores de mapa!</string>
    <string name="empty_state_markers_active_desc">Toque longo ou rápido em \'Lugares\', e em seguida toque no botão de bandeira.</string>
    <string name="empty_state_markers_groups">Importar grupos</string>
-    <string name="empty_state_markers_groups_desc">Você pode importar grupos de favoritos ou pontos de passagem de trilhas como marcadores.</string>
+    <string name="empty_state_markers_groups_desc">Importar grupos de Favoritos ou pontos de passagem de trilhas como marcadores.</string>
    <string name="empty_state_markers_history_desc">Marcadores marcados como visitados aparecerão nesta tela.</string>
    <string name="shared_string_two">Dois</string>
    <string name="shared_string_one">Um</string>
-    <string name="show_guide_line_descr">Exibir as linhas de guia desde a sua posição até os locais dos marcadores ativos.</string>
-    <string name="show_arrows_descr">Exibir uma ou duas setas indicando a direção para os marcadores ativos.</string>
+    <string name="show_guide_line_descr">Mostrar linha direcional desde a sua posição até os locais dos marcadores ativos.</string>
+    <string name="show_arrows_descr">Mostrar uma ou duas setas indicando a direção para os marcadores ativos.</string>
    <string name="distance_indication_descr">Escolher como exibir a distância para os marcadores ativos.</string>
    <string name="active_markers_descr">Escolha o número de indicadores de direção a exibir.</string>
    <string name="digits_quantity">Número de casas decimais</string>
@ -2318,7 +2318,7 @@ Pôr do Sol: %2$s</string>
    <string name="tap_on_map_to_hide_interface_descr">Um toque no mapa mostra/oculta os botões de controle e widgets.</string>
    <string name="tap_on_map_to_hide_interface">Modo tela cheia</string>
    <string name="mark_passed">Marcador visitado</string>
-    <string name="import_gpx_file_description">pode ser importado como pontos favoritos, ou como arquivo de trilha.</string>
+    <string name="import_gpx_file_description">pode ser importado como Favoritos ou arquivo GPX.</string>
    <string name="import_as_gpx">Importar como arquivo GPX</string>
    <string name="import_as_favorites">Importar como Favoritos</string>
    <string name="import_file">Importar arquivo</string>
@ -2328,7 +2328,7 @@ Pôr do Sol: %2$s</string>
    <string name="shared_string_road">Via</string>
    <string name="round_trip">Ida e volta</string>
    <string name="plan_route_no_markers_toast">Você precisa adicionar ao menos um marcador para usar esta função.</string>
-    <string name="show_guide_line">Mostrar linhas de guia</string>
+    <string name="show_guide_line">Mostrar linhas direcionais</string>
    <string name="no_overlay">Sem camada superior</string>
    <string name="no_underlay">Sem camada inferior</string>
    <string name="subscribe_email_error">Erro</string>
@ -2398,8 +2398,8 @@ Pôr do Sol: %2$s</string>
    <string name="upload_poi">Subir POI</string>
    <string name="route_calculation">Cálculo da rota</string>
    <string name="gpx_no_tracks_title">Você não tem trilhas ainda</string>
-    <string name="gpx_no_tracks_title_folder">Você pode também adicionar trilhas para a pasta</string>
-    <string name="gpx_add_track">Adicionar trilha</string>
+    <string name="gpx_no_tracks_title_folder">Você pode também adicionar arquivos GPX na pasta</string>
+    <string name="gpx_add_track">Adicionar…</string>
    <string name="gpx_appearance">Aparência</string>
    
    
@ -2427,7 +2427,7 @@ Pôr do Sol: %2$s</string>
    <string name="translit_name_if_miss">Transliterar se o nome %1$s for ausente</string>
    <string name="translit_names">Transliterar nomes</string>
    <string name="import_track_desc">Arquivo %1$s não possui pontos de passagem, importe-o como uma trilha?</string>
-    <string name="add_segment_to_the_track">Adicionar a uma trilha GPX</string>
+    <string name="add_segment_to_the_track">Adicionar a um arquivo GPX</string>
 <string name="empty_state_av_notes_desc">Adicionar nota de áudio, vídeo ou foto para cada ponto no mapa, usando o widget ou o menu de contexto.</string>
    <string name="quick_action_add_destination_desc">Tocar no botão de ação adicionará um destino no local do centro da tela. O destino anteriormente definido se torna o último destino intermediário.</string>
    <string name="quick_action_replace_destination_desc">Tocar no botão de ação substituirá o destino com o local do centro da tela.</string>
@ -2701,8 +2701,8 @@ Pôr do Sol: %2$s</string>
 \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>
+\nA maioria dos países ao redor do globo disponível como downloads! 
+\nDo Afeganistão ao Zimbabue, 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>
@ -2744,14 +2744,14 @@ Pôr do Sol: %2$s</string>
 	<string name="south_abbreviation">S</string>
 	<string name="north_abbreviation">N</string>
 	<string name="optional_point_name">Nome do ponto opcional</string>
-    <string name="transport_nearby_routes_within">Rotas a menos de</string>
+    <string name="transport_nearby_routes_within">Rotas próximas a</string>
    <string name="transport_nearby_routes">Cerca de</string>
    <string name="enter_the_file_name">Digite o nome do arquivo.</string>
    <string name="map_import_error">Erro de importação de mapa</string>
    <string name="map_imported_successfully">Mapa importado</string>
    <string name="rendering_attr_whiteWaterSports_name">Esportes em corredeiras</string>
    <string name="make_as_start_point">Converter em ponto de partida</string>
-    <string name="select_waypoints_category_description">Você pode adicionar todos os pontos da trilha, ou selecione categorias separadas.</string>
+    <string name="select_waypoints_category_description">Adicione todos os pontos da trilha, ou selecione categorias separadas.</string>
    <string name="shared_string_total">Total</string>
    <string name="clear_all_intermediates">Limpar todos os pontos intermédios</string>
    <string name="group_deleted">Grupo excluído</string>
@ -2762,7 +2762,13 @@ Pôr do Sol: %2$s</string>
    <string name="waypoints_removed_from_map_markers">Pontos de passagem removidos dos marcadores de mapa</string>
    <string name="shared_string_result">Resultado</string>
    
-    <string name="osmand_plus_extended_description_part2">Navegação • Funciona on-line (rápido) ou offline (sem custo de roaming quando estiver no exterior) • Orientação por voz passo-a-passo (vozes gravadas e sintetizadas) • Orientação de faixas opcional, exibição do nome da rua e tempo estimado de chegada • Suporta pontos intermediários do seu itinerário • Correção de rota automático sempre que você sair da rota • Busque lugares por endereço, pelo tipo (ex.: restaurante, hotel, posto de gasolina, museu), ou por coordenadas geográficas</string>
+    <string name="osmand_plus_extended_description_part2">Navegação
+\n• Funciona on-line (rápido) ou offline (sem custo de roaming quando estiver no exterior)
+\n• Orientação por voz passo-a-passo (vozes gravadas e sintetizadas)
+\n• Orientação de faixas opcional, exibição do nome da rua e tempo estimado de chegada
+\n• Suporta pontos intermediários do seu itinerário
+\n• Correção de rota automático sempre que você sair da rota
+\n• Busque lugares por endereço, pelo tipo (ex.: restaurante, hotel, posto de gasolina, museu), ou por coordenadas geográficas</string>
    <string name="osmand_plus_extended_description_part3">Visualização de mapa
 \n• Exiba sua posição e orientação
 \n• Opcionalmente alinhe a tela de acordo com a bússola ou a direção de seu movimento
@ -2780,7 +2786,7 @@ Pôr do Sol: %2$s</string>
    <string name="article_removed">Artigo excluído</string>
    <string name="wikivoyage_search_hint">Pesquisar: país, cidade, estado</string>
    <string name="shared_string_read">Ler</string>
-    <string name="saved_articles">Artigos salvos</string>
+    <string name="saved_articles">Artigos marcados</string>
    <string name="shared_string_explore">Explorar</string>
    <string name="shared_string_contents">Conteúdos</string>
    <string name="index_item_world_wikivoyage">Artigos Wikivoyage mundiais</string>
@ -2833,13 +2839,13 @@ Pôr do Sol: %2$s</string>
    <string name="shared_string_restart">Reiniciar app</string>
    <string name="purchase_cancelled_dialog_descr">Renove a assinatura para continuar a usar todos os recursos:</string>

-    <string name="maps_you_need_descr">Baseado nos artigos que você salvou, recomendamos você baixar os seguintes mapas:</string>
+    <string name="maps_you_need_descr">Baseado nos artigos que você marcou, recomendamos você baixar os seguintes mapas:</string>
    <string name="maps_you_need">Mapas que você precisa</string>
    <string name="travel_card_download_descr">Baixe guias de viagem Wikivoyage para ver os artigos sobre lugares ao redor do mundo sem uma conexão à Internet.</string>
-	<string name="welcome_to_open_beta_description">Travel baseia-se no Wikivoyage. Teste todos os recursos durante o teste beta aberto, de graça. Depois, Travel estará disponível para assinantes OsmAnd Unlimited e proprietários de OsmAnd+.</string>
+	<string name="welcome_to_open_beta_description">Os guias de viagem atualmente baseiam-se no Wikivoyage. Teste todos os recursos durante o teste beta aberto, de graça. Depois, os guias estarão disponíveis para assinantes OsmAnd Unlimited e proprietários do OsmAnd+.</string>
    
    <string name="download_wikipedia_description">Baixe artigos da Wikipédia por %1$s para lê-los offline.</string>
-    <string name="wiki_article_search_text">Procurando o artigo wiki necessário</string>
+    <string name="wiki_article_search_text">Procurando o artigo wiki correspondente</string>
    <string name="shared_string_bookmark">Marcador</string>
    <string name="hide_full_description">Ocultar descrição completa</string>
    <string name="show_full_description">Mostrar descrição completa</string>
@ -2884,4 +2890,38 @@ Pôr do Sol: %2$s</string>
 \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>
    <string name="touring_view_render_descr">Estilo de elevado detalhe para fins de turismo. Inclui todas as opções de configuração de estilo padrão, além disso: exibe o máximo de detalhes possível, em particular todas as estradas, caminhos e outras maneiras de viajar. Distinção visual claro entre todos os tipos de caminhos diferentes, similar a muitos atlas turismo. Esquema de cores de alto contraste para uso ao ar livre, modo dia e noite.</string>
+    <string name="wikivoyage_download_pics_descr">Imagens do artigo podem ser baixadas para uso offline.
+\nSempre disponível em \'Explorar\' → \'Opções\'.</string>
+    <string name="osmand_extended_description_part2">Navegação GPS
+\n• Escolha entre modos off-line (sem tarifa de roaming quando estiver no exterior) ou on-line (mais rápido)
+\n• Orientação por voz passo-a-passo lhe guia ao longo do caminho (vozes gravadas e sintetizadas)
+\n• A rota se recalcula sempre que se desviar dela
+\n• Orientação de pista, nomes de ruas e tempo estimado de chegada ajudará ao longo do caminho
+\n• Para fazer sua viagem mais segura, modo dia/noite se alterna automaticamente
+\n• Visualize limites de velocidade e receba aviso se ultrapassá-los
+\n• Zoom do mapa se ajusta a sua velocidade
+\n• Pesquise destinos pelo endereço, tipo (p. ex.: estacionamento, restaurante, hotel, posto de gasolina, museu), ou coordenadas geográficas
+\n• Suporta pontos intermédios em seu itinerário
+\n• Grave ou carregue uma trilha GPX e siga-a
+\n</string>
+    <string name="osmand_extended_description_part3">Mapa
+\n• Exibe POIs (ponto de interesse) em torno de você
+\n• Ajusta o mapa na sua direção de movimento (ou bússola)
+\n• Mostra a sua posição e direção para onde está olhando
+\n• Compartilhe sua posição para que seus amigos possam encontrá-lo
+\n• Mantém seus lugares mais importantes em \'Favoritos\'
+\n• Permite-lhe escolher como exibir nomes no mapa: em inglês, local ou escrita fonética
+\n• Exibe mapas on-line especializados, vista de satélite (do Bing), camadas diferentes como trilhas GPX de navegação/turismo e camadas adicionais com transparência personalizável</string>
+    <string name="osmand_plus_extended_description_part1">OsmAnd+ (OSM Automated Navigation Directions) é um aplicativo de mapa e navegação com acesso a dados do OpenStreetMap (OSM) livre, em todo o mundo e alta qualidade.
+\nDesfrute da navegação visual ou por voz, exibindo POIs (pontos de interesse), criando e gerenciando trilhas GPX, usando informação de altitude e curvas de nível, escolher entre modos dirigir, andar de bicicleta e pedestres, editar o OSM e muito mais.
+\n
+\nOsmAnd+ é a versão paga do app. Ao comprá-lo, você apoiar o projeto, financia o desenvolvimento de novas funcionalidades e recebe as últimas atualizações.
+\n
+\nAlgumas das principais características:</string>
+    <string name="osmand_plus_extended_description_part7">Contribuia diretamente para o OSM
+\n• Avisar erros dados
+\n• Fazer upload de trilhas GPX para o OSM diretamente do app
+\n• Adicionar POIs e fazer o upload diretamente para OSM (ou mais tarde se off-line)
+\n• Gravação de viagem opcional também em modo background (enquanto o dispositivo está no modo sleep)
+\nOsmAnd é um software de código aberto desenvolvido ativamente. Todos podem contribuir para o app, reportando bugs, melhorando as traduções ou programando novas funcionalidades. Além disso, o projeto conta com as contribuições financeiras para financiar o desenvolvimento e testes de novas funcionalidades.</string>
    </resources>
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@ -3815,4 +3815,7 @@

 	<string name="poi_outcrop">Обнажение пород</string>

+	<string name="poi_payment_contactless_yes">Бесконтактная оплата</string>
+	<string name="poi_payment_contactless_no">Бесконтактная оплата не принимается</string>
+
 </resources>
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@ -3880,4 +3880,7 @@

 	<string name="poi_outcrop">Afioramentu (bessida a pitzu) de roca</string>

+<string name="poi_payment_contactless_yes">Chene cuntatu (Contactless)</string>
+	<string name="poi_payment_contactless_no">Cartas chene cuntatu non atzetadas</string>
+
 </resources>
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@ -2223,7 +2223,7 @@ Dĺžka %2$s</string>
    
    <string name="gpx_no_tracks_title">Nemáte zatiaľ žiadne súbory GPX</string>
    <string name="gpx_no_tracks_title_folder">Do priečinka môžete pridať aj súbory GPX</string>
-    <string name="gpx_add_track">Pridať súbor GPX</string>
+    <string name="gpx_add_track">Pridať viac…</string>
    <string name="gpx_appearance">Vzhľad</string>
    <string name="rendering_value_fine_name">Jemné</string>
    <string name="route_calculation">Výpočet trasy</string>
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@ -649,7 +649,7 @@
 	<string name="srtm_paid_version_title">Додатак за изохипсе</string>
    <string name="osmand_srtm_short_description_80_chars">OsmAnd додатак за линије изохипси ван мреже</string>
 	<string name="srtm_plugin_name">Изохипсе</string>
-	<string name="plugin_touringview_name">Возачки преглед карте</string>
+	<string name="plugin_touringview_name">Туристички преглед карте</string>
 	<string name="audionotes_plugin_name">Забелешке звука и снимака</string>
    <string name="audionotes_plugin_description">Додатак за бележење звука и снимака омогућује да се сниме звуци, слике и видео приликом путовања, или притиском дугмета на приказу карте, или непосредно у приручном изборнику за сваки положај на карти.</string>
    <string name="osmand_parking_plugin_name">Положај паркирања</string>
@ -1107,7 +1107,7 @@
    <string name="route_calculation">Прорачун путање</string>
    <string name="gpx_no_tracks_title">Још увек немате ниједан GPX фајл</string>
    <string name="gpx_no_tracks_title_folder">Такође, можете додати GPX фајлове у фасциклу</string>
-    <string name="gpx_add_track">Додај GPX фајл</string>
+    <string name="gpx_add_track">И још…</string>
    <string name="gpx_appearance">Приказ</string>
    
    
@ -2954,4 +2954,15 @@
    <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="plugin_touringview_descr">Укључивањем овог погледа се мења стил мапе на \"Туристички преглед\", који је специјални високодетаљни преглед за туристе и професионалне возаче.
+\n
+\nОвај поглед нуди, на сваком нивоу зума, највећу количину туристичких детаља на подацима карте (посебно путеве, путање, стазе и знакове за оријентацију).
+\n
+\nТакође и јасно представља све врсте путева по боји, тако да никад не буде забуне, што је корисно када се нпр. возе већа возила.
+\n
+\nА нуди се и посебне туристичке опције као што су приказ бициклистичких или планинских рута.
+\n
+\nНије потребно скидање посебне карте, поглед се прави од стандардних карти.
+\n
+\nОвај поглед се може искључити тако што се или овде деактивира, или тако што се, по жељи, промени \"Стил карте\" под \"Подеси карту\".</string>
    </resources>
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@ -910,7 +910,7 @@
 	<string name="poi_theatre_genre_circus">Цирк</string>
 	<string name="poi_gallery">Художня галерея</string>
 	<string name="poi_dance_floor">Танцмайданчик</string>
-	<string name="poi_nightclub">Нічний клуб</string>
+	<string name="poi_nightclub">Нічний клуб;Диско</string>
 	<string name="poi_stripclub">Клуб з показом стриптизу</string>
 	<string name="poi_ski_resort">Гірськолижний курорт</string>
 	<string name="poi_beach_resort">Пляжний комплекс</string>
@ -3379,7 +3379,7 @@

 <string name="poi_motorcycle_sales_yes">Продаж</string>
 	<string name="poi_motorcycle_sales_no">Продаж: немає</string>
-	<string name="poi_motorcycle_sales_yes_used">Продаж: є; також б/у</string>
+	<string name="poi_motorcycle_sales_yes_used">Продаж: є, також б/у</string>
 	<string name="poi_motorcycle_sales_used">Продаж: б/у</string>
 	<string name="poi_motorcycle_rental_yes">Оренда</string>
 	<string name="poi_motorcycle_rental_no">Оренда: немає</string>
@ -3774,4 +3774,40 @@

 	<string name="poi_whitewater_rapid_name">Назва річкових порогів</string>

-</resources>
+<string name="poi_service_car">Автопослуги</string>
+	<string name="poi_glacier_type">Тип льодовика</string>
+	<string name="poi_checkpoint_type">Тип контрольного пункту</string>
+
+<string name="poi_outpost">Пункт видачі замовлень</string>
+
+	<string name="poi_barbecue_grill">Мангал: є</string>
+
+	<string name="poi_water_utility">Офіс водопостачання</string>
+
+	<string name="poi_amusement_arcade">Ігровий зал</string>
+	<string name="poi_adult_gaming_centre">Ігровий зал для дорослих</string>
+
+	<string name="poi_service_vehicle_car_repair_yes">Авторемонт</string>
+	<string name="poi_service_vehicle_oil_change_yes">Заміна мастила</string>
+	<string name="poi_service_vehicle_used_car_sales_yes">Продаж вживаних авто</string>
+	<string name="poi_service_vehicle_brakes_yes">Гальма</string>
+	<string name="poi_service_vehicle_new_car_sales_yes">Продаж нових авто</string>
+	<string name="poi_service_vehicle_diagnostics_yes">Діагностика</string>
+	<string name="poi_service_vehicle_car_parts_yes">Автозапчастини</string>
+	<string name="poi_service_vehicle_batteries_yes">Акумулятори</string>
+	<string name="poi_service_vehicle_air_conditioning_yes">Кондиціонери</string>
+	<string name="poi_service_vehicle_body_repair_yes">Ремонт кузова</string>
+	<string name="poi_service_vehicle_electrical_yes">Електрика</string>
+	<string name="poi_service_vehicle_wheels_yes">Колеса</string>
+	<string name="poi_service_vehicle_glass_yes">Скло</string>
+	<string name="poi_service_vehicle_truck_repair_yes">Ремонт вантажівок</string>
+	<string name="poi_service_vehicle_muffler_yes">Глушник</string>
+	<string name="poi_service_vehicle_alignment_yes">Розвал-сходження</string>
+	<string name="poi_service_vehicle_transmission_repair_yes">Ремонт трансмісії</string>
+	<string name="poi_service_vehicle_motor_yes">Двигун</string>
+	<string name="poi_service_vehicle_insurance_yes">Страхування</string>
+	<string name="poi_service_vehicle_tyres_yes">Шиномонтаж</string>
+
+	<string name="poi_via_ferrata_scale">Складність</string>
+
+	</resources>
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/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="asap">Швидко</string>
  
  <string name="route_roundabout">Круговий рух : %1$d з’їзд</string>
@ -3083,4 +3084,12 @@
    <string name="distance_nearest">Відстань: спочатку найближче</string>
    <string name="group_deleted">Групу було видалено</string>
    <string name="rendering_attr_whiteWaterSports_name">Сплавний спорт</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="quick_action_edit_actions">Редагувати дії</string>
+    <string name="get_osmand_live">Отримайте OsmAnd Live, аби розблокувати всі функції: щоденні оновлення карт з необмеженим завантаженням, всі платні та безкоштовні додатки, Вікіпедія, Вікімандри та багато іншого.</string>
+    <string name="shared_string_bookmark">Закладка</string>
+    <string name="hide_full_description">Приховати повний опис</string>
+    <string name="show_full_description">Показати повний опис</string>
+    </resources>
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@ -2373,7 +2373,7 @@
    
    <string name="gpx_no_tracks_title">您尚未有任何的 GPX 檔案</string>
    <string name="gpx_no_tracks_title_folder">您也可以增加 GPX 檔案到資料夾</string>
-    <string name="gpx_add_track">增加 GPX 檔案</string>
+    <string name="gpx_add_track">增加更多…</string>
    <string name="gpx_appearance">外表</string>
    
    <string name="trip_rec_notification_settings">啟用錄製快速開始</string>
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@ -3838,4 +3838,7 @@

 	<string name="poi_outcrop">Outcrop</string>

+	<string name="poi_payment_contactless_yes">Contactless</string>
+	<string name="poi_payment_contactless_no">Contactless not accepted</string>
+
 </resources>