diff --git a/OsmAnd-java/src/test/java/net/osmand/util/GeoPointParserUtilTest.java b/OsmAnd-java/src/test/java/net/osmand/util/GeoPointParserUtilTest.java
index 05138ea91e..a2e7469cfc 100644
--- a/OsmAnd-java/src/test/java/net/osmand/util/GeoPointParserUtilTest.java
+++ b/OsmAnd-java/src/test/java/net/osmand/util/GeoPointParserUtilTest.java
@@ -11,7 +11,7 @@ import org.junit.Test;
 import net.osmand.util.GeoPointParserUtil.GeoParsedPoint;
 
 public class GeoPointParserUtilTest {
-	
+
 	@Test
 	public void testGeoPointUrlDecode() {
 		// bug in get scheme getSchemeSpecificPart()
@@ -19,14 +19,14 @@ public class GeoPointParserUtilTest {
 		GeoParsedPoint test = GeoPointParserUtil.parse("geo:0,0?q=86HJV99P%2B29");
 		Assert.assertEquals(test.getQuery(), "86HJV99P+29");
 	}
-	
+
 	@Test
 	public void testGoogleMaps() {
 		// https://www.google.com/maps?daddr=Bahnhofplatz+3,+7000+Chur@46.853582,9.529903
 		GeoParsedPoint actual = GeoPointParserUtil.parse(
 				"https://www.google.com/maps?daddr=Bahnhofplatz+3,+7000+Chur");
 		assertGeoPoint(actual, new GeoParsedPoint("Bahnhofplatz 3, 7000 Chur"));
-		
+
 		actual = GeoPointParserUtil.parse(
 				"https://www.google.com/maps?daddr=Bahnhofplatz+3,+7000+Chur@46.853582,9.529903");
 		System.out.println(actual);
@@ -97,8 +97,8 @@ public class GeoPointParserUtilTest {
 			System.out.println(" Passed!");
 		}
 
-		
-		
+
+
 		// geo:34,-106
 		url = "geo:" + ilat + "," + ilon;
 		System.out.println("url: " + url);
@@ -111,7 +111,7 @@ public class GeoPointParserUtilTest {
 		System.out.println("url: " + url);
 		actual = GeoPointParserUtil.parse(url);
 		assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon));
-		
+
 		// geo:34.99393,-106.61568
 		url = "geo:" + dlat + "," + dlon;
 		System.out.println("url: " + url);
@@ -271,12 +271,12 @@ public class GeoPointParserUtilTest {
 		actual = GeoPointParserUtil.parse(url);
 		assertGeoPoint(actual, new GeoParsedPoint(dlat, -Math.abs(dlon)));
 
-		url = "http://maps.google.com/maps?f=d&saddr=" + dlat +"," +dlon +"&daddr=" +dlat +"," +dlon+"&hl=en"; 
+		url = "http://maps.google.com/maps?f=d&saddr=" + dlat +"," +dlon +"&daddr=" +dlat +"," +dlon+"&hl=en";
 		System.out.println("url: " + url);
 		actual = GeoPointParserUtil.parse(url);
 		assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon));
-		
-		url = "http://maps.google.com/maps?f=d&saddr=My+Location&daddr=" +dlat +"," +dlon+"&hl=en"; 
+
+		url = "http://maps.google.com/maps?f=d&saddr=My+Location&daddr=" +dlat +"," +dlon+"&hl=en";
 		System.out.println("url: " + url);
 		actual = GeoPointParserUtil.parse(url);
 		assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon));
@@ -407,7 +407,7 @@ public class GeoPointParserUtilTest {
 		System.out.println("url: " + url);
 		actual = GeoPointParserUtil.parse(url);
 		assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
-		
+
 		// https://maps.google.com/maps?q=loc:-21.8835112,-47.7838932 (Name)
 		url = "https://maps.google.com/maps?q=loc:" + dlat + "," + dlon + " (Name)" ;
 		System.out.println("url: " + url);
@@ -843,7 +843,7 @@ public class GeoPointParserUtilTest {
 	}
 
 
-	
 
-	
+
+
 }
diff --git a/OsmAnd-telegram/res/layout/activity_main.xml b/OsmAnd-telegram/res/layout/activity_main.xml
index 5118492b0c..8b5341d7c2 100644
--- a/OsmAnd-telegram/res/layout/activity_main.xml
+++ b/OsmAnd-telegram/res/layout/activity_main.xml
@@ -8,8 +8,9 @@
 	android:orientation="vertical"
 	tools:context=".ui.MainActivity">
 
-	<FrameLayout
+	<android.support.design.widget.CoordinatorLayout
 		android:layout_width="match_parent"
+		android:id="@+id/coordinator"
 		android:layout_height="0dp"
 		android:layout_weight="1">
 
@@ -25,7 +26,7 @@
 			android:scaleType="fitXY"
 			android:src="?attr/bottom_nav_shadow"/>
 
-	</FrameLayout>
+	</android.support.design.widget.CoordinatorLayout>
 
 	<LinearLayout
 		android:id="@+id/buttons_bar"
diff --git a/OsmAnd-telegram/res/layout/login_dialog.xml b/OsmAnd-telegram/res/layout/login_dialog.xml
index c102c53312..f442d1b8c9 100644
--- a/OsmAnd-telegram/res/layout/login_dialog.xml
+++ b/OsmAnd-telegram/res/layout/login_dialog.xml
@@ -125,6 +125,7 @@
 			android:background="@android:color/transparent">
 
 			<ScrollView
+				android:id="@+id/scroll_view"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
 				android:fillViewport="true">
diff --git a/OsmAnd-telegram/res/layout/my_location_sharing_chat.xml b/OsmAnd-telegram/res/layout/my_location_sharing_chat.xml
index e3766f4e57..0d0285dc08 100644
--- a/OsmAnd-telegram/res/layout/my_location_sharing_chat.xml
+++ b/OsmAnd-telegram/res/layout/my_location_sharing_chat.xml
@@ -108,7 +108,7 @@
 			android:id="@+id/show_on_map_row"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:minHeight="@dimen/list_item_height_big"
+			android:minHeight="60dp"
 			android:gravity="center_vertical"
 			android:orientation="horizontal"
 			android:paddingLeft="@dimen/content_padding_standard"
@@ -117,7 +117,7 @@
 			<LinearLayout
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
-				android:layout_gravity="center_vertical"
+				android:layout_gravity="top"
 				android:layout_marginEnd="@dimen/content_padding_standard"
 				android:layout_marginRight="@dimen/content_padding_standard"
 				android:layout_weight="1"
@@ -131,6 +131,7 @@
 					android:text="@string/turn_off_location_sharing"
 					android:textColor="?attr/ctrl_active_color"
 					android:textSize="@dimen/hint_text_size"
+					app:firstBaselineToTopHeight="24sp"
 					app:typeface="@string/font_roboto_medium" />
 
 				<net.osmand.telegram.ui.views.TextViewEx
@@ -141,6 +142,7 @@
 					android:textColor="?android:attr/textColorSecondary"
 					android:textSize="@dimen/hint_text_size"
 					app:typeface="@string/font_roboto_regular"
+					app:lastBaselineToBottomHeight="10sp"
 					tools:text="@string/expire_at" />
 
 				<net.osmand.telegram.ui.views.TextViewEx
@@ -151,6 +153,7 @@
 					android:text="@string/gps_points"
 					android:textColor="?android:attr/textColorSecondary"
 					android:textSize="@dimen/hint_text_size"
+					app:lastBaselineToBottomHeight="16sp"
 					app:typeface="@string/font_roboto_regular" />
 
 			</LinearLayout>
diff --git a/OsmAnd-telegram/res/layout/user_list_item.xml b/OsmAnd-telegram/res/layout/user_list_item.xml
index 8fc125f4c5..7dd6034ec0 100644
--- a/OsmAnd-telegram/res/layout/user_list_item.xml
+++ b/OsmAnd-telegram/res/layout/user_list_item.xml
@@ -47,6 +47,7 @@
 					android:maxLines="1"
 					android:textColor="?android:textColorPrimary"
 					android:textSize="@dimen/list_item_title_text_size"
+					android:paddingTop="@dimen/content_padding_half"
 					app:typeface="@string/font_roboto_regular"
 					tools:text="Share location"/>
 
@@ -112,6 +113,7 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:visibility="gone"
+					android:paddingBottom="@dimen/content_padding_half"
 					tools:visibility="visible">
 
 					<net.osmand.telegram.ui.views.TextViewEx
diff --git a/OsmAnd-telegram/res/values-ast/strings.xml b/OsmAnd-telegram/res/values-ast/strings.xml
index 1d419eb73c..495cf2ac0f 100644
--- a/OsmAnd-telegram/res/values-ast/strings.xml
+++ b/OsmAnd-telegram/res/values-ast/strings.xml
@@ -42,7 +42,6 @@
     <string name="monitoring_is_disabled">La supervisión ta desactivada</string>
     <string name="end_date">Data de fin</string>
     <string name="start_date">Data d\'aniciu</string>
-    <string name="timeline_description">Activa la supervisión pa recoyer en segundu planu los datos de la movición.</string>
     <string name="send_location_as">Unviar l\'allugamientu como</string>
     <string name="send_location_as_descr">Escueyi cómo van vese los mensaxes col to allugamientu.</string>
     <string name="shared_string_text">Testu</string>
@@ -70,8 +69,8 @@
     <string name="no_internet_connection">Nun hai conexón a internet</string>
     <string name="add_device">Amestar un preséu</string>
     <string name="live_now_description">Contautos y grupos que tán compartiendo l\'allugamientu contigo.</string>
-    <string name="logout_from_osmand_telegram_descr">¿De xuru que quies zarrar sesión n\'OsmAnd Telegram pa que nun pueas compartir l\'allugamientu nin ver el d\'otros\?</string>
-    <string name="logout_from_osmand_telegram">¿Zarrar la sesión d\'OsmAnd Telegram\?</string>
+    <string name="logout_from_osmand_telegram_descr">¿De xuru que quies zarrar sesión n\'OsmAnd Tracker pa que nun pueas compartir l\'allugamientu nin ver el d\'otros\?</string>
+    <string name="logout_from_osmand_telegram">¿Zarrar la sesión d\'OsmAnd Tracker\?</string>
     <string name="by_distance">pola distancia</string>
     <string name="by_name">pol nome</string>
     <string name="by_group">pol grupu</string>
@@ -81,13 +80,13 @@
     <string name="disable_all_sharing">Desactivar toles comparticiones</string>
     <string name="turn_off_all">Desactivar too</string>
     <string name="shared_string_group">Grupu</string>
-    <string name="disconnect_from_telegram_desc">Pa revocar l\'accesu a la compartición del allugamientu. Abri Telegram, vete a Axustes → Privacidá y seguranza → Sesiones y zarra la sesión d\'OsmAnd Telegram.</string>
+    <string name="disconnect_from_telegram_desc">Pa revocar l\'accesu a la compartición del allugamientu. Abri Telegram, vete a Axustes → Privacidá y seguranza → Sesiones y zarra la sesión d\'OsmAnd Tracker.</string>
     <string name="disconnect_from_telegram">Cómo desactivar la compartición del allugamientu con OsmAnd dende Telegram</string>
     <string name="logout_help_desc">Cómo desactivar la compartición del allugamientu con OsmAnd dende Telegram</string>
     <string name="connected_account">Cuenta coneutada</string>
     <string name="shared_string_account">Cuenta</string>
     <string name="in_time">en %1$s</string>
-    <string name="osmand_connect_desc">Escueyi la versión d\'OsmAnd qu\'OsmAnd Telegram va usar p\'amosar les posiciones.</string>
+    <string name="osmand_connect_desc">Escueyi la versión d\'OsmAnd qu\'OsmAnd Tracker va usar p\'amosar les posiciones.</string>
     <string name="osmand_connect">Conexón a OsmAnd</string>
     <string name="location_history_desc">Anubre los contautos que nun se movieren nel tiempu apurríu.</string>
     <string name="location_history">Historial d\'allugamientos</string>
@@ -116,7 +115,7 @@
     <string name="visible_time_for_all">Visibilidá xeneral demientres</string>
     <string name="set_time">Afitamientu del tiempu</string>
     <string name="location_sharing_description">Esbilla los contautos y grupos colos que quies compartir el to allugamientu.</string>
-    <string name="app_name">OsmAnd Telegram</string>
+    <string name="app_name">OsmAnd Online GPS Tracker</string>
     <string name="phone_number_title">Númberu telefónicu</string>
     <string name="phone_number_descr">Númberu telefónicu nel formatu internacional</string>
     <string name="shared_string_password">Contraseña</string>
@@ -128,10 +127,10 @@
     <string name="gps_network_not_enabled">¿Activar «Allugamientu»\?</string>
     <string name="not_logged_in">Nun aniciesti sesión</string>
     <string name="gps_not_available">Activa «Allugamientu» nos axustes del sistema</string>
-    <string name="osmand_service_descr">OsmAnd Telegram execútase en segundu planu cola pantalla apagada.</string>
+    <string name="osmand_service_descr">OsmAnd Tracker execútase en segundu planu cola pantalla apagada.</string>
     <string name="shared_string_distance">Distancia</string>
     <string name="sharing_location">Compartiendo l\'allugamientu</string>
-    <string name="process_service">Serviciu d\'OsmAnd Telegram</string>
+    <string name="process_service">Serviciu d\'OsmAnd Tracker</string>
     <string name="osmand_logo">Logu d\'OsmAnd</string>
     <string name="install_osmand_dialog_message">Primero precises instalar la versión de baldre o de pagu d\'OsmAnd</string>
     <string name="install_osmand">Instalación d\'OsmAnd</string>
diff --git a/OsmAnd-telegram/res/values-be/strings.xml b/OsmAnd-telegram/res/values-be/strings.xml
index 745704c45c..230c149fbf 100644
--- a/OsmAnd-telegram/res/values-be/strings.xml
+++ b/OsmAnd-telegram/res/values-be/strings.xml
@@ -21,7 +21,7 @@
 	<string name="connecting_to_the_internet">Злучэнне з Інтэрнэтам</string>
 	<string name="background_work_description">Змена параметраў аптымізацыі батарэі для стабілізацыі абмену інфармацыяй аб месцазнаходжанні.</string>
 	<string name="background_work">Праца ў фонавым рэжыме</string>
-	<string name="battery_optimization_description">Выключыць аптымізацыю батарэі для OsmAnd Telegram, каб прадухіліць нечаканае выключэнне фонавага рэжыму.</string>
+	<string name="battery_optimization_description">Выключыць аптымізацыю батарэі для OsmAnd Tracker, каб прадухіліць нечаканае выключэнне фонавага рэжыму.</string>
 	<string name="sharing_in_background">Абмен у фонавым рэжыме</string>
 	<string name="go_to_settings">Перайсці ў налады</string>
 	<string name="shared_string_later">Пазней</string>
@@ -39,8 +39,8 @@
 	<string name="add_device">Дадаць прыладу</string>
 	<string name="share_location_as">Падзяліцца месцазнаходжаннем як</string>
 	<string name="live_now_description">Кантакты і групы для абмену месцазнаходжаннем.</string>
-	<string name="logout_from_osmand_telegram_descr">Вы не зможаце падзяліцца сваім месцазнаходжаннем і ўбачыць месцазнаходжанне іншых. Сапраўды выйсці з OsmAnd Telegram\?</string>
-	<string name="logout_from_osmand_telegram">Выйсці з OsmAnd Telegram\?</string>
+	<string name="logout_from_osmand_telegram_descr">Вы не зможаце падзяліцца сваім месцазнаходжаннем і ўбачыць месцазнаходжанне іншых. Сапраўды выйсці з OsmAnd Tracker\?</string>
+	<string name="logout_from_osmand_telegram">Выйсці з OsmAnd Tracker\?</string>
 	<string name="shared_string_name">Імя</string>
 	<string name="by_distance">Па адлегласці</string>
 	<string name="by_name">Па імёнах</string>
@@ -58,13 +58,13 @@
 	<string name="shared_string_group">Група</string>
 	<string name="logout_no_internet_msg">Падлучыцеся да Інтэрнэту, каб карэктна выйсці з Тэлеграм.</string>
 	<string name="shared_string_close">Закрыць</string>
-	<string name="disconnect_from_telegram_desc">Для таго, каб скасаваць абмен месцазнаходжаннем, адкрыйце Тэлеграм, перайдзіце ў Налады → Прыватнасць і бяспека → Сеансы і спыніце сеанс OsmAnd Telegram.</string>
+	<string name="disconnect_from_telegram_desc">Для таго, каб скасаваць абмен месцазнаходжаннем, адкрыйце Тэлеграм, перайдзіце ў Налады → Прыватнасць і бяспека → Сеансы і спыніце сеанс OsmAnd Tracker.</string>
 	<string name="disconnect_from_telegram">Як выключыць абмен месцазнаходжаннем у OsmAnd праз Тэлеграм</string>
 	<string name="logout_help_desc">Як выключыць абмен месцазнаходжаннем у OsmAnd праз Тэлеграм</string>
 	<string name="connected_account">Падлучаны акаўнт</string>
 	<string name="shared_string_account">Рахунак</string>
 	<string name="in_time">у %1$s</string>
-	<string name="osmand_connect_desc">Абраць версію OsmAnd, якую OsmAnd Telegram будзе выкарыстоўваць для адлюстравання пазіцыі.</string>
+	<string name="osmand_connect_desc">Абраць версію OsmAnd, якую OsmAnd Tracker будзе выкарыстоўваць для адлюстравання пазіцыі.</string>
 	<string name="osmand_connect">Злучэнне з OsmAnd</string>
 	<string name="location_history_desc">Схаваць кантакты, якія не перамяшчаліся пэўны час.</string>
 	<string name="location_history">Гісторыя месцазнаходжанняў</string>
@@ -104,7 +104,7 @@
 	<string name="my_location_search_hint">Пошук: група альбо кантакт</string>
 	<string name="start_location_sharing">Падзяліцца месцазнаходжаннем</string>
 	<string name="show_on_map">Паказаць на мапе</string>
-	<string name="app_name">ОsmAnd Telegram</string>
+	<string name="app_name">OsmAnd Online GPS Tracker</string>
 	<string name="phone_number_title">Нумар тэлефона</string>
 	<string name="phone_number_descr">Нумар тэлефона ў міжнародным фармаце</string>
 	<string name="shared_string_password">Пароль</string>
@@ -127,11 +127,11 @@
 	<string name="gps_not_available">Калі ласка, ўключыце \"Месцазнаходжанне\" ў сістэмных наладах</string>
 	<string name="location_service_no_gps_available">Абярыце аднаго пастаўшчыка месцазнаходжання, каб падзяліцца сваім месцазнаходжаннем.</string>
 	<string name="osmand_service">Фонавы рэжым</string>
-	<string name="osmand_service_descr">OsmAnd Telegram працуе ў фонавым рэжыме з выключаным экранам.</string>
+	<string name="osmand_service_descr">OsmAnd Tracker працуе ў фонавым рэжыме з выключаным экранам.</string>
 	<string name="shared_string_distance">Адлегласць</string>
 	<string name="share_location">Падзяліцца месцазнаходжаннем</string>
 	<string name="sharing_location">Абмен данымі аб месцазнаходжанні</string>
-	<string name="process_service">Сэрвіс OsmAnd Telegram</string>
+	<string name="process_service">Сэрвіс OsmAnd Tracker</string>
 	<string name="osmand_logo">Лагатып OsmAnd</string>
 	<string name="install_osmand_dialog_message">Спачатку вам неабходна ўсталяваць бясплатную ці платную версію OsmAnd</string>
 	<string name="install_osmand">Усталяваць OsmAnd</string>
@@ -185,7 +185,6 @@
     <string name="open_in_osmand">Адкрыць у OsmAnd</string>
     <string name="end_date">Дата закрыцця</string>
     <string name="start_date">Час адкрыцця</string>
-    <string name="timeline_description">Уключаць маніторынг для збору данных руху ў фоне.</string>
     <string name="timeline">Храналогія</string>
     <string name="please_update_osmand">Калі ласка, абнавіце OsmAnd каб паглядзець даныя на мапе</string>
     <string name="shared_string_update">Абнавіць</string>
diff --git a/OsmAnd-telegram/res/values-da/strings.xml b/OsmAnd-telegram/res/values-da/strings.xml
index a2578c5431..af2f4bbea1 100644
--- a/OsmAnd-telegram/res/values-da/strings.xml
+++ b/OsmAnd-telegram/res/values-da/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources><string name="background_work_description">Skift indstillinger for batterioptimering, for stabil deling af placering.</string>
 	<string name="background_work">Baggrundstilstand</string>
-	<string name="battery_optimization_description">Sluk for batterioptimering af OsmAnd Telegram, så det ikke pludseligt bliver slukket, når det er i baggrunden.</string>
+	<string name="battery_optimization_description">Sluk for batterioptimering af OsmAnd Tracker, så det ikke pludseligt bliver slukket, når det er i baggrunden.</string>
 	<string name="sharing_in_background">Deling i baggrunden</string>
 	<string name="go_to_settings">Gå til indstillinger</string>
 	<string name="shared_string_later">Senere</string>
@@ -18,8 +18,8 @@
 	<string name="add_device">Tilføj enhed</string>
 	<string name="share_location_as">Del placering som</string>
 	<string name="live_now_description">Kontakter og grupper som der deles placering med.</string>
-	<string name="logout_from_osmand_telegram_descr">Er du sikker på at du vil logge ud af OsmAnd Telegram, så du ikke kan dele din placering eller se placeringen af andre\?</string>
-	<string name="logout_from_osmand_telegram">Log ud af OsmAnd Telegram\?</string>
+	<string name="logout_from_osmand_telegram_descr">Er du sikker på at du vil logge ud af OsmAnd Tracker, så du ikke kan dele din placering eller se placeringen af andre\?</string>
+	<string name="logout_from_osmand_telegram">Log ud af OsmAnd Tracker\?</string>
 	<string name="shared_string_name">Navn</string>
 	<string name="by_distance">Efter afstand</string>
 	<string name="by_name">Efter navn</string>
@@ -37,13 +37,13 @@
 	<string name="shared_string_group">Gruppe</string>
 	<string name="logout_no_internet_msg">Opret forbindelse til Internettet for at logge ud af Telegram.</string>
 	<string name="shared_string_close">Luk</string>
-	<string name="disconnect_from_telegram_desc">"Sådan tilbagekaldes adgang til placeringsdeling. Åbn Telegram, gå til Settings - Privacy and Security - Sessions og afslut OsmAnd Telegram session. "</string>
+	<string name="disconnect_from_telegram_desc">"Sådan tilbagekaldes adgang til placeringsdeling. Åbn Telegram, gå til Settings - Privacy and Security - Sessions og afslut OsmAnd Tracker session. "</string>
 	<string name="disconnect_from_telegram">Hvordan afbrydes OsmAnd placeringsdeling fra Telegram</string>
 	<string name="logout_help_desc">Hvordan afbrydes OsmAnd placeringsdeling fra Telegram</string>
 	<string name="connected_account">Tilsluttet konto</string>
 	<string name="shared_string_account">Konto</string>
 	<string name="in_time">i %1$s</string>
-	<string name="osmand_connect_desc">Vælg den OsmAnd version, som OsmAnd Telegram bruger til vise placeringer på kortet.</string>
+	<string name="osmand_connect_desc">Vælg den OsmAnd version, som OsmAnd Tracker bruger til vise placeringer på kortet.</string>
 	<string name="osmand_connect">Tilslut OsmAnd</string>
 	<string name="location_history_desc">Skjul kontakter, der ikke har bevæget sig i en given tid.</string>
 	<string name="location_history">Placeringshistorik</string>
@@ -82,7 +82,7 @@
 	<string name="my_location_search_hint">Søg: gruppe eller kontakt</string>
 	<string name="start_location_sharing">Del placering</string>
 	<string name="show_on_map">Vis på kort</string>
-	<string name="app_name">OsmAnd Telegram</string>
+	<string name="app_name">OsmAnd Online GPS Tracker</string>
 	<string name="phone_number_title">Telefonnummer</string>
 	<string name="phone_number_descr">Telefonnummer i internationalt format</string>
 	<string name="shared_string_password">Adgangskode</string>
@@ -101,11 +101,11 @@
 	<string name="gps_not_available">Tænd for \"Placering\" i systemindstillinger</string>
 	<string name="location_service_no_gps_available">Vælg en af placeringsudbyderne til at dele placering.</string>
 	<string name="osmand_service">Baggrundstilstand</string>
-	<string name="osmand_service_descr">OsmAnd Telegram kører i baggrunden med skærmen slukket.</string>
+	<string name="osmand_service_descr">OsmAnd Tracker kører i baggrunden med skærmen slukket.</string>
 	<string name="shared_string_distance">Afstand</string>
 	<string name="share_location">Del placering</string>
 	<string name="sharing_location">Deler placering</string>
-	<string name="process_service">OsmAnd Telegram tjeneste</string>
+	<string name="process_service">OsmAnd Tracker tjeneste</string>
 	<string name="osmand_logo">OsmAnd logo</string>
 	<string name="install_osmand_dialog_message">Det er nødvendigt at installere en gratis eller betalt version af OsmAnd</string>
 	<string name="install_osmand">Installer OsmAnd</string>
@@ -196,5 +196,4 @@
     <string name="monitoring_is_enabled">Overvågning er aktiveret</string>
     <string name="monitoring_is_disabled">Overvågning er deaktiveret</string>
     <string name="time_on_the_move">tid i bevægelse</string>
-    <string name="timeline_description">Aktiver overvågning for at indsamle bevægelsesdata i baggrunden.</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-es/strings.xml b/OsmAnd-telegram/res/values-es/strings.xml
index 9478238711..3e1b4d31c1 100644
--- a/OsmAnd-telegram/res/values-es/strings.xml
+++ b/OsmAnd-telegram/res/values-es/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources><string name="background_work_description">Cambiar los ajustes de optimización de la batería para estabilizar la ubicación compartida.</string>
 	<string name="background_work">Funcionamiento en segundo plano</string>
-	<string name="battery_optimization_description">Desactivar la optimización de la batería para OsmAnd Telegram de modo que no se desconecte repentinamente cuando esté en segundo plano.</string>
+	<string name="battery_optimization_description">Desactivar la optimización de la batería para OsmAnd Tracker de modo que no se desconecte repentinamente cuando esté en segundo plano.</string>
 	<string name="sharing_in_background">Compartir en segundo plano</string>
 	<string name="go_to_settings">Ir a los ajustes</string>
 	<string name="shared_string_later">Luego</string>
@@ -18,8 +18,8 @@
 	<string name="add_device">Añadir dispositivo</string>
 	<string name="share_location_as">Compartir ubicación como</string>
 	<string name="live_now_description">Contactos y grupos que comparten la ubicación contigo.</string>
-	<string name="logout_from_osmand_telegram_descr">¿Cerrar sesión en OsmAnd Telegram\? No podrá compartir la ubicación o ver la ubicación de otros</string>
-	<string name="logout_from_osmand_telegram">¿Cerrar sesión de OsmAnd Telegram\?</string>
+	<string name="logout_from_osmand_telegram_descr">¿Cerrar sesión en OsmAnd Tracker\? No podrá compartir la ubicación o ver la ubicación de otros</string>
+	<string name="logout_from_osmand_telegram">¿Cerrar sesión de OsmAnd Tracker\?</string>
 	<string name="shared_string_name">Nombre</string>
 	<string name="by_distance">Por distancia</string>
 	<string name="by_name">Por nombre</string>
@@ -43,7 +43,7 @@
 	<string name="connected_account">Cuenta conectada</string>
 	<string name="shared_string_account">Cuenta</string>
 	<string name="in_time">en %1$s</string>
-	<string name="osmand_connect_desc">Elija la versión de OsmAnd el cual «OsmAnd Telegram» utilizará para mostrar las ubicaciones.</string>
+	<string name="osmand_connect_desc">Elija la versión de OsmAnd el cual «OsmAnd Tracker» utilizará para mostrar las ubicaciones.</string>
 	<string name="osmand_connect">Conectar OsmAnd</string>
 	<string name="location_history_desc">Ocultar los contactos que no se han movido en un tiempo determinado.</string>
 	<string name="location_history">Historial de ubicación</string>
@@ -82,7 +82,7 @@
 	<string name="my_location_search_hint">Buscar: Grupo o contacto</string>
 	<string name="start_location_sharing">Compartir ubicación</string>
 	<string name="show_on_map">Mostrar en el mapa</string>
-	<string name="app_name">OsmAnd Telegram</string>
+	<string name="app_name">OsmAnd Online GPS Tracker</string>
 	<string name="phone_number_title">Número de teléfono</string>
 	<string name="phone_number_descr">Número de teléfono en formato internacional</string>
 	<string name="shared_string_password">Contraseña</string>
@@ -101,11 +101,11 @@
 	<string name="gps_not_available">Activar «Ubicación» en los ajustes del sistema</string>
 	<string name="location_service_no_gps_available">Elija uno de los proveedores de ubicación para compartir su ubicación.</string>
 	<string name="osmand_service">Modo en segundo plano</string>
-	<string name="osmand_service_descr">OsmAnd Telegram se ejecuta en modo reposo con la pantalla apagada.</string>
+	<string name="osmand_service_descr">OsmAnd Tracker se ejecuta en modo reposo con la pantalla apagada.</string>
 	<string name="shared_string_distance">Distancia</string>
 	<string name="share_location">Compartir ubicación</string>
 	<string name="sharing_location">Compartir ubicación</string>
-	<string name="process_service">Servicio de OsmAnd Telegram</string>
+	<string name="process_service">Servicio de OsmAnd Tracker</string>
 	<string name="osmand_logo">Logotipo de OsmAnd</string>
 	<string name="install_osmand_dialog_message">Necesita instalar primero la versión gratuita o de pago de OsmAnd</string>
 	<string name="install_osmand">Instalar OsmAnd</string>
@@ -185,7 +185,6 @@
     <string name="open_in_osmand">Abrir en OsmAnd</string>
     <string name="end_date">Fecha de fin</string>
     <string name="start_date">Fecha de inicio</string>
-    <string name="timeline_description">Activar la monitorización para recopilar datos de movimiento en segundo plano.</string>
     <string name="timeline">Línea de tiempo</string>
     <string name="gps_points_in_buffer">enviado (%1$d en búfer)</string>
     <string name="points_size">%1$d puntos</string>
diff --git a/OsmAnd-telegram/res/values-fa/strings.xml b/OsmAnd-telegram/res/values-fa/strings.xml
index 302ffb89d8..6ec7716a90 100644
--- a/OsmAnd-telegram/res/values-fa/strings.xml
+++ b/OsmAnd-telegram/res/values-fa/strings.xml
@@ -11,7 +11,7 @@
 	<string name="successfully_sent_and_updated">با موفقیت ارسال و به‌روز شد</string>
 	<string name="waiting_for_response_from_telegram">در انتظار پاسخ از تلگرام</string>
 	<string name="searching_for_gps">در حال موقعیت‌یابی…</string>
-	<string name="battery_optimization_description">بهینه‌سازی باتری را برای OsmAnd Telegram غیرفعال کنید تا هنگامی که در پس‌زمینه کار می‌کند ناگهان بسته نشود.</string>
+	<string name="battery_optimization_description">بهینه‌سازی باتری را برای OsmAnd Tracker غیرفعال کنید تا هنگامی که در پس‌زمینه کار می‌کند ناگهان بسته نشود.</string>
 	<string name="go_to_settings">برو به تنظیمات</string>
 	<string name="shared_string_later">بعداً</string>
 	<string name="not_sent_yet">هنوز ارسال نشده</string>
diff --git a/OsmAnd-telegram/res/values-gl/strings.xml b/OsmAnd-telegram/res/values-gl/strings.xml
index 4abcdc0a85..abac18d60e 100644
--- a/OsmAnd-telegram/res/values-gl/strings.xml
+++ b/OsmAnd-telegram/res/values-gl/strings.xml
@@ -18,8 +18,8 @@
 	<string name="add_device">Engadir dispositivo</string>
 	<string name="share_location_as">Compartillar ubicación coma</string>
 	<string name="live_now_description">Contactos e grupos que están a compartilla-la súa ubicación para vostede.</string>
-	<string name="logout_from_osmand_telegram_descr">Está na certeza de que desexa desconectarse do Telegram OsmAnd para non poder compartilla-la ubicación ou olla-la ubicación doutros\?</string>
-	<string name="logout_from_osmand_telegram">Pecha-la sesión do Telegram OsmAnd\?</string>
+	<string name="logout_from_osmand_telegram_descr">Está na certeza de que desexa desconectarse do Tracker OsmAnd para non poder compartilla-la ubicación ou olla-la ubicación doutros\?</string>
+	<string name="logout_from_osmand_telegram">Pecha-la sesión do Tracker OsmAnd\?</string>
 	<string name="shared_string_name">Nome</string>
 	<string name="by_distance">Pola distancia</string>
 	<string name="by_name">Polo nome</string>
@@ -88,12 +88,12 @@
 	<string name="initializing">Estase a iniciar</string>
 	<string name="searching_for_gps">Estase a posicionar…</string>
 	<string name="connecting_to_the_internet">Estase a conectar á Internet</string>
-	<string name="battery_optimization_description">Desactiva-la optimización da batería para o OsmAnd Telegram de xeito que non se desconecte de xeito súbito cando esté no segundo plano.</string>
+	<string name="battery_optimization_description">Desactiva-la optimización da batería para o OsmAnd Tracker de xeito que non se desconecte de xeito súbito cando esté no segundo plano.</string>
 	<string name="logout_no_internet_msg">Conéctese á Internet para pecha-la sesión no Telegram de xeito correcto.</string>
 	<string name="disconnect_from_telegram_desc">Para revoga-lo acceso á ubicación compartillada. Abra o Telegram, vaia cara ós «Axustes → Privacidade e Seguranza → Sesións» e peche a sesión do OsmAnd Telegram.</string>
 	<string name="disconnect_from_telegram">De que xeito desactiva-la «Ubicación compartillada do OsmAnd» dende o Telegram</string>
 	<string name="logout_help_desc">De que xeito desactiva-la «Ubicación compartillada do OsmAnd» dende o Telegram</string>
-	<string name="osmand_connect_desc">Escolla a versión do OsmAnd na cal o «OsmAnd Telegram» empregará para amosa-las ubicacións.</string>
+	<string name="osmand_connect_desc">Escolla a versión do OsmAnd na cal o «OsmAnd Tracker» empregará para amosa-las ubicacións.</string>
 	<string name="osmand_connect">Conecta-lo OsmAnd</string>
 	<string name="location_history_desc">Agocha-los contactos que non se moveron nun tempo determinado.</string>
 	<string name="stale_location_desc">A última vez que un contacto se moveu.</string>
@@ -116,7 +116,7 @@
 	<string name="my_location_search_hint">Procurar: Grupo ou contacto</string>
 	<string name="start_location_sharing">Compartillar ubicación</string>
 	<string name="show_on_map">Amosar no mapa</string>
-	<string name="app_name">OsmAnd Telegram</string>
+	<string name="app_name">OsmAnd Online GPS Tracker</string>
 	<string name="phone_number_title">Número do teléfono móbil</string>
 	<string name="phone_number_descr">Número do teléfono móbil no formato internacional</string>
 	<string name="shared_string_password">Contrasinal</string>
@@ -138,11 +138,11 @@
 	<string name="gps_not_available">Activar «Ubicación» nos axustes do sistema</string>
 	<string name="location_service_no_gps_available">Escolla un dos fornecedores da ubicación para compartilla-la súa ubicación.</string>
 	<string name="osmand_service">Modo no segundo plano</string>
-	<string name="osmand_service_descr">O OsmAnd Telegram execútase no modo en segundo plano ca pantalla apagada.</string>
+	<string name="osmand_service_descr">O OsmAnd Tracker execútase no modo en segundo plano ca pantalla apagada.</string>
 	<string name="shared_string_distance">Distancia</string>
 	<string name="share_location">Compartillar ubicación</string>
 	<string name="sharing_location">Estase a compartilla-la ubicación</string>
-	<string name="process_service">Servizo do OsmAnd Telegram</string>
+	<string name="process_service">Servizo do OsmAnd Tracker</string>
 	<string name="osmand_logo">Logotipo do OsmAnd</string>
 	<string name="install_osmand_dialog_message">Precísase instalar primeiro a versión de balde ou de pagamento do OsmAnd</string>
 	<string name="install_osmand">Instala-lo OsmAnd</string>
@@ -185,6 +185,5 @@
     <string name="open_in_osmand">Abrir no OsmAnd</string>
     <string name="end_date">Data de finalización</string>
     <string name="start_date">Data de inicio</string>
-    <string name="timeline_description">Activar o monitoramento para recompilar datos de movemento no segundo plano.</string>
     <string name="timeline">Liña do tempo</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-he/strings.xml b/OsmAnd-telegram/res/values-he/strings.xml
index 6f10587c39..175dda977a 100644
--- a/OsmAnd-telegram/res/values-he/strings.xml
+++ b/OsmAnd-telegram/res/values-he/strings.xml
@@ -72,7 +72,6 @@
     <string name="open_in_osmand">פתיחה ב־OsmAnd</string>
     <string name="end_date">מועד סיום</string>
     <string name="start_date">מועד התחלה</string>
-    <string name="timeline_description">יש להפעיל ניטור כדי לאסוף נתוני תנועה ברקע.</string>
     <string name="disconnect_from_telegram_desc">כדי לשלול גישה לשיתוף המיקום. יש לפתוח את טלגרם, לגשת להגדרות ← פרטיות ← הפעלות ולסגור את הפעלת הטלגרם של OsmAnd.</string>
     <string name="disconnect_from_telegram">איך לכבות את שיתוף המיקום של OsmAnd מטלגרם</string>
     <string name="logout_help_desc">איך לכבות את שיתוף המיקום של OsmAnd מטלגרם</string>
@@ -116,7 +115,7 @@
     <string name="my_location_search_hint">חיפוש: קבוצה או איש קשר</string>
     <string name="start_location_sharing">שיתוף מיקום</string>
     <string name="show_on_map">הצגה במפה</string>
-    <string name="app_name">OsmAnd טלגרם</string>
+    <string name="app_name">OsmAnd Online GPS Tracker</string>
     <string name="phone_number_title">מספר טלפון</string>
     <string name="phone_number_descr">מספר טלפון בתצורה בינלאומית</string>
     <string name="shared_string_password">ססמה</string>
diff --git a/OsmAnd-telegram/res/values-it/strings.xml b/OsmAnd-telegram/res/values-it/strings.xml
index dfa1dd3667..76ce6037c8 100644
--- a/OsmAnd-telegram/res/values-it/strings.xml
+++ b/OsmAnd-telegram/res/values-it/strings.xml
@@ -21,7 +21,7 @@
 	<string name="connecting_to_the_internet">Collegamento a Internet</string>
 	<string name="background_work_description">Cambia le impostazioni di ottimizzazione della batteria per stabilizzare la condivisione della posizione.</string>
 	<string name="background_work">Funzionamento in secondo piano</string>
-	<string name="battery_optimization_description">Disattiva l\'ottimizzazione della batteria per OsmAnd Telegram in modo che non venga chiuso improvvisamente quando è in secondo piano.</string>
+	<string name="battery_optimization_description">Disattiva l\'ottimizzazione della batteria per OsmAnd Tracker in modo che non venga chiuso improvvisamente quando è in secondo piano.</string>
 	<string name="sharing_in_background">Condivisione in secondo piano</string>
 	<string name="go_to_settings">Vai alle impostazioni</string>
 	<string name="shared_string_later">Più tardi</string>
@@ -39,7 +39,7 @@
 	<string name="add_device">Aggiungi dispositivo</string>
 	<string name="share_location_as">Condividi posizione come</string>
 	<string name="live_now_description">Contatti e gruppi che condividono la posizione con te.</string>
-	<string name="logout_from_osmand_telegram">Disconnettersi da OsmAnd Telegram\?</string>
+	<string name="logout_from_osmand_telegram">Disconnettersi da OsmAnd Tracker\?</string>
 	<string name="shared_string_name">Nome</string>
 	<string name="by_distance">Per distanza</string>
 	<string name="by_name">Per nome</string>
@@ -63,7 +63,7 @@
 	<string name="connected_account">Account connesso</string>
 	<string name="shared_string_account">Account</string>
 	<string name="in_time">in %1$s</string>
-	<string name="osmand_connect_desc">Scegli la versione di OsmAnd che OsmAnd Telegram userà per mostrare le posizioni.</string>
+	<string name="osmand_connect_desc">Scegli la versione di OsmAnd che OsmAnd Tracker userà per mostrare le posizioni.</string>
 	<string name="location_history_desc">Nascondi i contatti che non si sono spostati per un certo periodo di tempo.</string>
 	<string name="location_history">Cronologia delle posizioni</string>
 	<string name="stale_location_desc">L\'ultima volta in cui un contatto si è spostato.</string>
@@ -100,7 +100,7 @@
 	<string name="my_location_search_hint">Cerca: gruppo o contatto</string>
 	<string name="start_location_sharing">Condividi la posizione</string>
 	<string name="show_on_map">Mostra sulla mappa</string>
-	<string name="app_name">OsmAnd Telegram</string>
+	<string name="app_name">OsmAnd Online GPS Tracker</string>
 	<string name="phone_number_title">Numero di telefono</string>
 	<string name="phone_number_descr">Numero di telefono nel formato internazionale</string>
 	<string name="shared_string_password">Password</string>
@@ -123,11 +123,11 @@
 	<string name="gps_not_available">Si prega di attivare la \"posizione\" nelle impostazioni di sistema</string>
 	<string name="location_service_no_gps_available">Seleziona uno dei provider della posizione per condividerla.</string>
 	<string name="osmand_service">In secondo piano</string>
-	<string name="osmand_service_descr">OsmAnd Telegram funziona in secondo piano quando lo schermo è spento.</string>
+	<string name="osmand_service_descr">OsmAnd Tracker funziona in secondo piano quando lo schermo è spento.</string>
 	<string name="shared_string_distance">Distanza</string>
 	<string name="share_location">Condividi la posizione</string>
 	<string name="sharing_location">Condivisione della posizione</string>
-	<string name="process_service">Servizio di OsmAnd Telegram</string>
+	<string name="process_service">Servizio di OsmAnd Tracker</string>
 	<string name="osmand_logo">Logo di OsmAnd</string>
 	<string name="install_osmand_dialog_message">Devi installare prima la versione gratis o a pagamento di OsmAnd</string>
 	<string name="install_osmand">Installa OsmAnd</string>
@@ -163,7 +163,7 @@
 	<string name="live_now">Ora in diretta</string>
 
 
-<string name="logout_from_osmand_telegram_descr">Sei sicuro di volerti disconnettere da OsmAnd Telegram, cosicché non potrai condividere la posizione o vedere quella di altri\?</string>
+<string name="logout_from_osmand_telegram_descr">Sei sicuro di volerti disconnettere da OsmAnd Tracker, cosicché non potrai condividere la posizione o vedere quella di altri\?</string>
 	<string name="osmand_connect">Connessione OsmAnd</string>
 	<string name="set_visible_time_for_all">Imposta un orario visibile a tutti</string>
 	<string name="visible_time_for_all">Orario visibile a tutti</string>
@@ -180,7 +180,6 @@
     <string name="open_in_osmand">Apri in OsmAnd</string>
     <string name="end_date">Data di fine</string>
     <string name="start_date">Data d\'inizio</string>
-    <string name="timeline_description">Abilita il monitoraggio per raccogliere i dati degli spostamenti in secondo piano.</string>
     <string name="send_location_as">Invia la localizzazione come</string>
     <string name="send_location_as_descr">Scegli l\'aspetto dei messaggi con la tua localizzazione.</string>
     <string name="shared_string_map">Mappa</string>
diff --git a/OsmAnd-telegram/res/values-pl/strings.xml b/OsmAnd-telegram/res/values-pl/strings.xml
index ad2d41358f..3773b6bfd8 100644
--- a/OsmAnd-telegram/res/values-pl/strings.xml
+++ b/OsmAnd-telegram/res/values-pl/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources><string name="background_work_description">Zmień ustawienia optymalizacji baterii, aby zapewnić stabilną lokalizację.</string>
 	<string name="background_work">Praca w tle</string>
-	<string name="battery_optimization_description">Aby stabilnie udostępniać swoją pozycję w tle, zaleca się wyłączenie optymalizacji baterii dla Telegram OsmAnd.
+	<string name="battery_optimization_description">Aby stabilnie udostępniać swoją pozycję w tle, zaleca się wyłączenie optymalizacji baterii dla Tracker OsmAnd.
 \n
 \nJeśli włączona jest optymalizacja, system może automatycznie wyłączyć aplikację działającą w tle (gdy ekran jest zablokowany i/lub aplikacja jest zminimalizowana). Dzieje się tak bez powiadomienia i powoduje zatrzymanie położenia geograficznego.</string>
 	<string name="sharing_in_background">Udostępnianie w tle</string>
@@ -21,8 +21,8 @@
 	<string name="add_device">Dodaj urządzenie</string>
 	<string name="share_location_as">Udostępnij lokalizację jako</string>
 	<string name="live_now_description">Kontakty i grupy, które udostępniają Ci swoją lokalizację.</string>
-	<string name="logout_from_osmand_telegram_descr">Czy na pewno chcesz się wylogować z OsmAnd Telegram, aby nie udostępniać lokalizacji ani nie widzieć lokalizacji innych\?</string>
-	<string name="logout_from_osmand_telegram">Wylogować się z OsmAnd Telegram\?</string>
+	<string name="logout_from_osmand_telegram_descr">Czy na pewno chcesz się wylogować z OsmAnd Tracker, aby nie udostępniać lokalizacji ani nie widzieć lokalizacji innych\?</string>
+	<string name="logout_from_osmand_telegram">Wylogować się z OsmAnd Tracker\?</string>
 	<string name="shared_string_name">Nazwa</string>
 	<string name="by_distance">Według odległości</string>
 	<string name="by_name">Według nazwy</string>
@@ -45,7 +45,7 @@
 	<string name="connected_account">Połączone konta</string>
 	<string name="shared_string_account">Konto</string>
 	<string name="in_time">w %1$s</string>
-	<string name="osmand_connect_desc">Wybierz wersję OsmAnd, którą Telegram OsmAnd będzie używał do wyświetlaniu pozycji.</string>
+	<string name="osmand_connect_desc">Wybierz wersję OsmAnd, którą Tracker OsmAnd będzie używał do wyświetlaniu pozycji.</string>
 	<string name="osmand_connect">Połącz OsmAnd</string>
 	<string name="location_history_desc">Ukryj kontakty, które nie zostały przeniesione w określonym czasie.</string>
 	<string name="location_history">Historia lokalizacji</string>
@@ -83,7 +83,7 @@
 	<string name="my_location_search_hint">Szukaj: Grupa lub kontakt</string>
 	<string name="start_location_sharing">Udostępnij lokalizację</string>
 	<string name="show_on_map">Pokazuj na mapie</string>
-	<string name="app_name">OsmAnd Telegram</string>
+	<string name="app_name">OsmAnd Online GPS Tracker</string>
 	<string name="phone_number_title">Numer telefonu</string>
 	<string name="phone_number_descr">Numer telefonu w formacie międzynarodowym</string>
 	<string name="shared_string_password">Hasło</string>
@@ -103,11 +103,11 @@
 	<string name="gps_not_available">Włącz \"Lokalizacja\" w ustawieniach systemu</string>
 	<string name="location_service_no_gps_available">Wybierz jednego z dostawców lokalizacji, aby udostępnić swoją lokalizację.</string>
 	<string name="osmand_service">Tryb tła</string>
-	<string name="osmand_service_descr">Telegram OsmAnd będzie działał w tle przy wygaszonym ekranie.</string>
+	<string name="osmand_service_descr">Tracker OsmAnd będzie działał w tle przy wygaszonym ekranie.</string>
 	<string name="shared_string_distance">Odległość</string>
 	<string name="share_location">Udostępnij lokalizację</string>
 	<string name="sharing_location">Udostępnianie lokalizacji</string>
-	<string name="process_service">Usługa Telegramu OsmAnd</string>
+	<string name="process_service">Usługa Tracker OsmAnd</string>
 	<string name="osmand_logo">Logo OsmAnd</string>
 	<string name="install_osmand_dialog_message">Najpierw musisz zainstalować darmową lub płatną wersję OsmAnd</string>
 	<string name="install_osmand">Zainstaluj OsmAnd</string>
@@ -187,7 +187,6 @@
     <string name="open_in_osmand">Otwarte w OsmAnd</string>
     <string name="end_date">Data końcowa</string>
     <string name="start_date">Data rozpoczęcia</string>
-    <string name="timeline_description">Umożliwia monitorowanie, by zgromadzić dane ruchu w tle.</string>
     <string name="timeline">Linia czasu</string>
     <string name="please_update_osmand">Proszę zaktualizować OsmAnd, by zobaczyć dane na mapie</string>
     <string name="shared_string_update">Aktualizuj</string>
diff --git a/OsmAnd-telegram/res/values-pt-rBR/strings.xml b/OsmAnd-telegram/res/values-pt-rBR/strings.xml
index 6c9294bd83..28f262a100 100644
--- a/OsmAnd-telegram/res/values-pt-rBR/strings.xml
+++ b/OsmAnd-telegram/res/values-pt-rBR/strings.xml
@@ -27,7 +27,7 @@
     <string name="connecting_to_the_internet">Conectando-se à Internet</string>
     <string name="background_work_description">Altere as configurações de otimização da bateria para estabilizar o compartilhamento de local.</string>
     <string name="background_work">"Funcionamento em segundo plano "</string>
-    <string name="battery_optimization_description">Desative a otimização da bateria do OsmAnd Telegram para que não seja desligado repentinamente quando estiver em segundo plano.</string>
+    <string name="battery_optimization_description">Desative a otimização da bateria do OsmAnd Tracker para que não seja desligado repentinamente quando estiver em segundo plano.</string>
     <string name="sharing_in_background">Compartilhando em segundo plano</string>
     <string name="go_to_settings">Vá para as configurações</string>
     <string name="shared_string_later">Mais tarde</string>
@@ -45,8 +45,8 @@
     <string name="add_device">Adicionar dispositivo</string>
     <string name="share_location_as">Compartilhar localização como</string>
     <string name="live_now_description">Contatos e grupos compartilhando o local para você.</string>
-    <string name="logout_from_osmand_telegram_descr">Tem certeza de que deseja sair do OsmAnd Telegram para que você não possa compartilhar a localização ou ver a localização de outras pessoas\?</string>
-    <string name="logout_from_osmand_telegram">Sair do OsmAnd Telegram\?</string>
+    <string name="logout_from_osmand_telegram_descr">Tem certeza de que deseja sair do OsmAnd Tracker para que você não possa compartilhar a localização ou ver a localização de outras pessoas\?</string>
+    <string name="logout_from_osmand_telegram">Sair do OsmAnd Tracker\?</string>
     <string name="shared_string_name">Nome</string>
     <string name="by_distance">Pela distância</string>
     <string name="by_name">Por nome</string>
@@ -70,7 +70,7 @@
     <string name="connected_account">Conta conectada</string>
     <string name="shared_string_account">Conta</string>
     <string name="in_time">no %1$s</string>
-    <string name="osmand_connect_desc">Escolha a versão OsmAnd que OsmAnd Telegram usa para exibir posições.</string>
+    <string name="osmand_connect_desc">Escolha a versão OsmAnd que OsmAnd Tracker usa para exibir posições.</string>
     <string name="osmand_connect">"Conectar OsmAnd "</string>
     <string name="location_history_desc">Ocultar contatos que não foram movidos em um determinado momento.</string>
     <string name="location_history">Histórico de localização</string>
@@ -110,7 +110,7 @@
     <string name="my_location_search_hint">Pesquisa: Grupo ou contato</string>
     <string name="start_location_sharing">Compartilhar localização</string>
     <string name="show_on_map">Mostrar no mapa</string>
-    <string name="app_name">OsmAnd Telegram</string>
+    <string name="app_name">OsmAnd Online GPS Tracker</string>
     <string name="phone_number_title">Número de telefone</string>
     <string name="phone_number_descr">Número de telefone no formato internacional</string>
     <string name="shared_string_password">Senha</string>
@@ -133,11 +133,11 @@
     <string name="gps_not_available">Por favor, ligue \"Localização\" nas configurações do sistema</string>
     <string name="location_service_no_gps_available">Selecione um dos provedores de localização para compartilhar sua localização.</string>
     <string name="osmand_service">Modo em segundo plano</string>
-    <string name="osmand_service_descr">OsmAnd Telegram é executado em segundo plano com a tela desligada.</string>
+    <string name="osmand_service_descr">OsmAnd Tracker é executado em segundo plano com a tela desligada.</string>
     <string name="shared_string_distance">Distância</string>
     <string name="share_location">Compartilhar localização</string>
     <string name="sharing_location">Compartilhando localização</string>
-    <string name="process_service">Serviço OsmAnd Telegram</string>
+    <string name="process_service">Serviço OsmAnd Tracker</string>
     <string name="osmand_logo">Logotipo do OsmAnd</string>
     <string name="install_osmand_dialog_message">Você precisa instalar a versão gratuita ou paga do OsmAnd primeiro</string>
     <string name="install_osmand">Instalar OsmAnd</string>
@@ -185,7 +185,6 @@
     <string name="open_in_osmand">Aberto no OsmAnd</string>
     <string name="end_date">Data final</string>
     <string name="start_date">Data de início</string>
-    <string name="timeline_description">Ative o monitoramento para coletar dados de movimento em segundo plano.</string>
     <string name="timeline">"Linha do tempo "</string>
     <string name="gps_points_in_buffer">enviado (%1$d em buffer)</string>
     <string name="points_size">"%1$d pontos "</string>
diff --git a/OsmAnd-telegram/res/values-ru/strings.xml b/OsmAnd-telegram/res/values-ru/strings.xml
index 276d546758..c8ba7cc3aa 100644
--- a/OsmAnd-telegram/res/values-ru/strings.xml
+++ b/OsmAnd-telegram/res/values-ru/strings.xml
@@ -1,9 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+	<string name="timeline_available_for_free_now">"Попробуйте функцию Хронология бесплатно.</string>
+	<string name="location_recording_enabled">Запись местоположений включена</string>
 	<string name="privacy_policy_use_telegram">Мы используем Telegram (messaging app), чтобы соединять людей и чтобы вам было проще общаться с ними.</string>
 	<string name="privacy_policy_telegram_client">Telegram открытая платформа и OsmAnd Tracker является одним из клиентов. Ваши контакты могут использовать любой другой Telegram client.</string>
 	<string name="privacy_policy_agree">Нажимая продолжить, вы соглашаетесь с Telegram Privacy Policy и OsmAnd Privacy Policy.</string>
-	<string name="timeline_description">Включите мониторинг, для сбора данных о перемещении в фоновом режиме.</string>
+	<string name="timeline_description">Включите мониторинг, чтобы сохранять все местоположения в истории.</string>
 	<string name="last_update_from_telegram">Последнее обновление в Telegram</string>
 	<string name="device_name">Имя устройства</string>
 	<string name="shared_string_hide">Спрятать</string>
@@ -24,9 +26,9 @@
 	<string name="gps_not_available">Пожалуйста, включите «Местоположение» в системных настройках</string>
 	<string name="location_service_no_gps_available">Выберите один из провайдеров определения местоположения, чтобы поделиться своим местоположением.</string>
 	<string name="background_work">Работа в фоне</string>
-	<string name="battery_optimization_description">Отключите оптимизацию батареи для OsmAnd Telegram, чтобы оно не было внезапно отключено в фоновом режиме.</string>
+	<string name="battery_optimization_description">Отключите оптимизацию батареи для OsmAnd Tracker, чтобы оно не было внезапно отключено в фоновом режиме.</string>
 	<string name="osmand_service">Фоновый режим</string>
-	<string name="osmand_service_descr">OsmAnd Telegram работает в фоновом режиме с выключенным экраном.</string>
+	<string name="osmand_service_descr">OsmAnd Tracker работает в фоновом режиме с выключенным экраном.</string>
 	<string name="choose_osmand_desc">Выберите версию OsmAnd, в которой контакты будут отображаться на карте.</string>
 	<string name="choose_osmand">Выберите версию OsmAnd для использования</string>
 	<string name="disable_all_sharing_desc">Остановить трансляцию своей позиции всем ранее выбранным чатам (%1$d).</string>
@@ -117,7 +119,7 @@
 	<string name="location_history_desc">Скройте контакты, которые не обновили свое местоположение за определенный промежуток времени.</string>
 	<string name="share_location_as">Поделиться местоположением как</string>
 	<string name="share_location_as_description">Если вы хотите подключить несколько устройств к одной учетной записи Telegram, вам необходимо использовать другое устройство для трансляции местоположения.</string>
-	<string name="osmand_connect_desc">Выберите версию OsmAnd которую OsmAnd Telegram использует для отображения позиций на карте.</string>
+	<string name="osmand_connect_desc">Выберите версию OsmAnd которую OsmAnd Tracker использует для отображения позиций на карте.</string>
 	<string name="osmand_connect">OsmAnd подключение</string>
 	<string name="connected_account">Связанная учетная запись</string>
 	<string name="shared_string_account">Учетная запись</string>
@@ -125,11 +127,11 @@
 	<string name="install_osmand_dialog_message">Вам необходимо сначала установить бесплатную или платную версию OsmAnd</string>
 	<string name="disconnect_from_telegram">Как отключить передачу данных OsmAnd от Telegram</string>
 	<string name="logout_help_desc">Как отключить передачу данных OsmAnd от Telegram</string>
-	<string name="disconnect_from_telegram_desc">Отмена доступа к отправке локаций. Откройте Telegram, перейдите в Настройки - Конфиденциальность и безопасность - Сессии и завершите сеанс OsmAnd Telegram.</string>
-	<string name="logout_from_osmand_telegram">Выйти из OsmAnd Telegram?</string>
+	<string name="disconnect_from_telegram_desc">Отмена доступа к отправке локаций. Откройте Telegram, перейдите в Настройки - Конфиденциальность и безопасность - Сессии и завершите сеанс OsmAnd Tracker.</string>
+	<string name="logout_from_osmand_telegram">Выйти из OsmAnd Tracker?</string>
 	<string name="shared_string_login">Войти</string>
 	<string name="shared_string_logout">Выйти</string>
-	<string name="logout_from_osmand_telegram_descr">Вы уверены, что хотите выйти из OsmAnd Telegram, так вы не сможете делиться местоположением или не видеть местоположения других?</string>
+	<string name="logout_from_osmand_telegram_descr">Вы уверены, что хотите выйти из OsmAnd Tracker, так вы не сможете делиться местоположением или не видеть местоположения других?</string>
 
 	<string name="not_found_yet">Не найдено</string>
 	<string name="re_send_location">Отправить местоположение</string>
diff --git a/OsmAnd-telegram/res/values-sc/strings.xml b/OsmAnd-telegram/res/values-sc/strings.xml
index a9767128a2..092d35ab23 100644
--- a/OsmAnd-telegram/res/values-sc/strings.xml
+++ b/OsmAnd-telegram/res/values-sc/strings.xml
@@ -30,7 +30,7 @@
     <string name="no_location_permission">S’aplicatzione no est autorizada a atzèdere a sos datos de positzione.</string>
     <string name="gps_not_available">Allughe sa \"positzione\" in sas impostatziones</string>
     <string name="osmand_service">Modalidade de isfundu</string>
-    <string name="osmand_service_descr">OsmAnd Telegram sighit a funtzionare in s’isfundu, cun s’ischermu mortu.</string>
+    <string name="osmand_service_descr">OsmAnd Tracker sighit a funtzionare in s’isfundu, cun s’ischermu mortu.</string>
     <string name="shared_string_distance">Distàntzia</string>
     <string name="share_location">Cumpartzi sa positzione</string>
     <string name="install_osmand">Installa OsmAnd</string>
@@ -38,7 +38,6 @@
     <string name="monitoring_is_enabled">Su monitoràgiu est abilitadu</string>
     <string name="monitoring_is_disabled">Su monitoràgiu est disabilitadu</string>
     <string name="time_on_the_move">tempus in movimentu</string>
-    <string name="timeline_description">Abìlita su monitoràgiu pro collire datos de su movimentu in s\'isfundu.</string>
     <string name="send_location_as">Imbia sa positzione comente</string>
     <string name="send_location_as_descr">Issèbera comente sos messàgios cun sa positzione tua ant a aparire.</string>
     <string name="last_update_from_telegram">Ùrtimu agiornamentu de Telegram</string>
@@ -60,7 +59,7 @@
     <string name="connecting_to_the_internet">Collegamentu a ìnternet</string>
     <string name="background_work_description">Muda sas impostatziones de otimizatzione de sa bateria pro istabilizare sa cumpartzidura de sa positzione.</string>
     <string name="background_work">Modalidade de isfundu</string>
-    <string name="battery_optimization_description">Istuda s\'otimizatzione de sa bateria pro OsmAnd Telegram pro fàghere in modu chi non bèngiat serradu de repente cando est in s\'isfundu.</string>
+    <string name="battery_optimization_description">Istuda s\'otimizatzione de sa bateria pro OsmAnd Tracker pro fàghere in modu chi non bèngiat serradu de repente cando est in s\'isfundu.</string>
     <string name="sharing_in_background">Cumpartzidura in s\'isfundu</string>
     <string name="go_to_settings">Bae a sas impostatziones</string>
     <string name="not_sent_yet">Galu non imbiadu</string>
@@ -74,8 +73,8 @@
     <string name="add_device">Annanghe unu dispositivu</string>
     <string name="share_location_as">Cumpartzi sa positzione comente</string>
     <string name="live_now_description">Cuntatos e grupos chi cumpartzent sa positzione cun tie.</string>
-    <string name="logout_from_osmand_telegram_descr">Ses seguru de chèrrere essire dae OsmAnd Telegram pro non cumpartzire sa positzione tua o bìdere sa de àtere\?</string>
-    <string name="logout_from_osmand_telegram">Serrare sa sessione de OsmAnd Telegram\?</string>
+    <string name="logout_from_osmand_telegram_descr">Ses seguru de chèrrere essire dae OsmAnd Tracker pro non cumpartzire sa positzione tua o bìdere sa de àtere\?</string>
+    <string name="logout_from_osmand_telegram">Serrare sa sessione de OsmAnd Tracker\?</string>
     <string name="by_distance">Pro distàntzia</string>
     <string name="by_name">Pro nùmene</string>
     <string name="by_group">Pro grupu</string>
@@ -95,7 +94,7 @@
     <string name="connected_account">Contu connessu</string>
     <string name="shared_string_account">Contu</string>
     <string name="in_time">in %1$s</string>
-    <string name="osmand_connect_desc">Issèbera sa versione de OsmAnd chi OsmAnd Telegram at a impreare pro ammustrare sas positziones.</string>
+    <string name="osmand_connect_desc">Issèbera sa versione de OsmAnd chi OsmAnd Tracker at a impreare pro ammustrare sas positziones.</string>
     <string name="location_history_desc">Istichi sos cuntatos chi non si sunt mòvidos in unu perìodu de tempus determinadu.</string>
     <string name="location_history">Cronologia de sas positziones</string>
     <string name="stale_location_desc">S\'ùrtima borta chi unu cuntatu s\'est mòvidu.</string>
@@ -158,7 +157,7 @@
     <string name="my_location_search_hint">Chirca: grupu o cuntatu</string>
     <string name="start_location_sharing">Cumpartzi sa positzione</string>
     <string name="show_on_map">Ammustra in sa mapa</string>
-    <string name="app_name">OsmAnd Telegram</string>
+    <string name="app_name">OsmAnd Online GPS Tracker</string>
     <string name="phone_number_title">Nùmeru de telèfono</string>
     <string name="phone_number_descr">Nùmeru de telèfono in formadu internatzionale</string>
     <string name="shared_string_password">Crae de intrada</string>
@@ -176,7 +175,7 @@
     <string name="not_logged_in">No as fatu s\'atzessu</string>
     <string name="location_service_no_gps_available">Ischerta unu de sos frunidores de sa positzione pro la cumpartzire.</string>
     <string name="sharing_location">Cumpartzende sa positzione</string>
-    <string name="process_service">Servìtziu de OsmAnd Telegram</string>
+    <string name="process_service">Servìtziu de OsmAnd Tracker</string>
     <string name="osmand_logo">Logo de OsmAnd</string>
     <string name="install_osmand_dialog_message">In antis depes installare sa versione de badas o a pagamentu de OsmAnd</string>
     <string name="show_users_on_map">Ammustra sos impreadores in sa mapa</string>
diff --git a/OsmAnd-telegram/res/values-sl/strings.xml b/OsmAnd-telegram/res/values-sl/strings.xml
index 980ec22611..04b19258f8 100644
--- a/OsmAnd-telegram/res/values-sl/strings.xml
+++ b/OsmAnd-telegram/res/values-sl/strings.xml
@@ -32,7 +32,7 @@
 	<string name="shared_string_save">Shrani</string>
 	<string name="add_device">Dodaj napravo</string>
 	<string name="share_location_as">Objavi trenutno mesto kot</string>
-	<string name="logout_from_osmand_telegram">Ali se želite odjaviti iz storitve OsmAnd Telegram\?</string>
+	<string name="logout_from_osmand_telegram">Ali se želite odjaviti iz storitve OsmAnd Tracker\?</string>
 	<string name="shared_string_name">Ime</string>
 	<string name="by_distance">Po razdalji</string>
 	<string name="by_name">Po imenu</string>
@@ -51,7 +51,7 @@
 	<string name="shared_string_account">Račun</string>
 	<string name="in_time">v %1$s</string>
 	<string name="show_on_map">Pokaži na zemljevidu</string>
-	<string name="app_name">OsmAnd Telegram</string>
+	<string name="app_name">OsmAnd Online GPS Tracker</string>
 	<string name="phone_number_title">Telefonska številka</string>
 	<string name="phone_number_descr">Telefonska številka v mednarodnem zapisu</string>
 	<string name="shared_string_password">Geslo</string>
diff --git a/OsmAnd-telegram/res/values-uk/strings.xml b/OsmAnd-telegram/res/values-uk/strings.xml
index 91c5164ce2..d531f8c29a 100644
--- a/OsmAnd-telegram/res/values-uk/strings.xml
+++ b/OsmAnd-telegram/res/values-uk/strings.xml
@@ -20,7 +20,7 @@
 	<string name="connecting_to_the_internet">Зʼєднання із інтернетом</string>
 	<string name="background_work_description">Змініть налаштування оптимізації батареї, для стабільної трансляції позиціювання.</string>
 	<string name="background_work">Робота у фоні</string>
-	<string name="battery_optimization_description">Вимкніть оптимізацію батареї для OsmAnd Telegram, аби додаток не вимикався у фоновому режимі.</string>
+	<string name="battery_optimization_description">Вимкніть оптимізацію батареї для OsmAnd Tracker, аби додаток не вимикався у фоновому режимі.</string>
 	<string name="sharing_in_background">Трансляція у фоновому режимі</string>
 	<string name="go_to_settings">Перейти до налаштувань</string>
 	<string name="shared_string_later">Пізніше</string>
@@ -38,8 +38,8 @@
 	<string name="add_device">Додати пристрій</string>
 	<string name="share_location_as">Поділитися позицією як</string>
 	<string name="live_now_description">Контакти та групи, які транслюють свою позицію Вам.</string>
-	<string name="logout_from_osmand_telegram_descr">Ви впевнені, що бажаєте вийти з OsmAnd Telegram\? Оскільки не зможете транслювати свою позицію чи бачити позицію інших.</string>
-	<string name="logout_from_osmand_telegram">Вийти з OsmAnd Telegram\?</string>
+	<string name="logout_from_osmand_telegram_descr">Ви впевнені, що бажаєте вийти з OsmAnd Tracker\? Оскільки не зможете транслювати свою позицію чи бачити позицію інших.</string>
+	<string name="logout_from_osmand_telegram">Вийти з OsmAnd Tracker\?</string>
 	<string name="shared_string_name">Імʼя</string>
 	<string name="by_distance">За відстанню</string>
 	<string name="by_name">За імʼям</string>
@@ -63,7 +63,7 @@
 	<string name="connected_account">Повʼязаний обліковий запис</string>
 	<string name="shared_string_account">Обліковий запис</string>
 	<string name="in_time">через %1$s</string>
-	<string name="osmand_connect_desc">Оберіть версію OsmAnd, яку OsmAnd Telegram буде використовувати для показу позицій на карті.</string>
+	<string name="osmand_connect_desc">Оберіть версію OsmAnd, яку OsmAnd Tracker буде використовувати для показу позицій на карті.</string>
 	<string name="osmand_connect">Підключення OsmAnd</string>
 	<string name="location_history_desc">Приховайте контакти, які не рухалися на протязі визначеного проміжку часу.</string>
 	<string name="location_history">Історія позицій</string>
@@ -95,7 +95,7 @@
 	<string name="my_location_search_hint">Пошук: Група або контакт</string>
 	<string name="start_location_sharing">Транслювати позицію</string>
 	<string name="show_on_map">Показати на карті</string>
-	<string name="app_name">OsmAnd Telegram</string>
+	<string name="app_name">OsmAnd Online GPS Tracker</string>
 	<string name="phone_number_title">Номер телефону</string>
 	<string name="phone_number_descr">Номер телефону у міжнародному форматі</string>
 	<string name="shared_string_password">Пароль</string>
@@ -117,7 +117,7 @@
 	<string name="no_location_permission">Додаток не має дозволу до отримання даних позиціювання.</string>
 	<string name="gps_not_available">Будь ласка, увімкніть «Позиціювання» у системних налаштуваннях</string>
 	<string name="osmand_service">Фоновий режим</string>
-	<string name="osmand_service_descr">OsmAnd працює у фоновому режимі з вимкненим екраном.</string>
+	<string name="osmand_service_descr">OsmAnd Tracker працює у фоновому режимі з вимкненим екраном.</string>
 	<string name="shared_string_distance">Відстань</string>
 	<string name="share_location">Поділитися позицією</string>
 	<string name="sharing_location">Трансляція позиції</string>
diff --git a/OsmAnd-telegram/res/values-zh-rTW/strings.xml b/OsmAnd-telegram/res/values-zh-rTW/strings.xml
index 3f28d8ae6f..1208daf5e4 100644
--- a/OsmAnd-telegram/res/values-zh-rTW/strings.xml
+++ b/OsmAnd-telegram/res/values-zh-rTW/strings.xml
@@ -52,10 +52,10 @@
     <string name="not_possible_to_send_to_telegram_chats">無法發送到 Telegram 聊天：</string>
     <string name="waiting_for_response_from_telegram">等待 Telegram 回復</string>
     <string name="background_work_description">更改電池最佳化設置以穩定位置共用。</string>
-    <string name="battery_optimization_description">關閉 OsmAnd Telegram 的電池最佳化，這樣在後臺時就不會突然關閉。</string>
+    <string name="battery_optimization_description">關閉 OsmAnd Tracker 的電池最佳化，這樣在後臺時就不會突然關閉。</string>
     <string name="live_now_description">連絡人和群組共用位置給您。</string>
-    <string name="logout_from_osmand_telegram_descr">你確定要登出 OsmAnd Telegram，這樣你就不能共用位置或看到其他人的位置嗎？</string>
-    <string name="logout_from_osmand_telegram">要登出 OsmAnd Telegram 嗎\?</string>
+    <string name="logout_from_osmand_telegram_descr">你確定要登出 OsmAnd Tracker，這樣你就不能共用位置或看到其他人的位置嗎？</string>
+    <string name="logout_from_osmand_telegram">要登出 OsmAnd Tracker 嗎\?</string>
     <string name="choose_osmand_desc">選擇將在地圖上顯示連絡人的 OsmAnd 版本。</string>
     <string name="choose_osmand">選擇要使用的 OsmAnd 版本</string>
     <string name="disable_all_sharing_desc">關閉所有選定聊天的位置共用(%1$d)。</string>
@@ -64,13 +64,13 @@
     <string name="shared_string_group">群組</string>
     <string name="logout_no_internet_msg">連接到網路以正確登出 Telegram。</string>
     <string name="shared_string_close">關閉</string>
-    <string name="disconnect_from_telegram_desc">撤銷位置共用訪問。打開 Telegram，進入設定→隱私和安全→會話，並終 OsmAnd Telegram 會話。</string>
+    <string name="disconnect_from_telegram_desc">撤銷位置共用訪問。打開 Telegram，進入設定→隱私和安全→會話，並終 OsmAnd Tracker 會話。</string>
     <string name="disconnect_from_telegram">如何關閉 Telegram 中的 OsmAnd 交給位置共用</string>
     <string name="logout_help_desc">如何關閉 Telegram 中的 OsmAnd 交給位置共用</string>
     <string name="connected_account">已連接帳戶</string>
     <string name="shared_string_account">帳戶</string>
     <string name="in_time">在 %1$s</string>
-    <string name="osmand_connect_desc">選擇 OsmAnd 和版本的 OsmAnd Telegram 用於顯示位置。</string>
+    <string name="osmand_connect_desc">選擇 OsmAnd 和版本的 OsmAnd Tracker 用於顯示位置。</string>
     <string name="osmand_connect">OsMand 連接</string>
     <string name="location_history_desc">隱藏在給定時間內未移動的連絡人。</string>
     <string name="location_history">位置歷史記錄</string>
@@ -111,7 +111,7 @@
     <string name="my_location_search_hint">搜尋：群組或連絡人</string>
     <string name="start_location_sharing">共用位置</string>
     <string name="show_on_map">在地圖上顯示</string>
-    <string name="app_name">OsmAnd Telegram</string>
+    <string name="app_name">OsmAnd Online GPS Tracker</string>
     <string name="phone_number_title">電話號碼</string>
     <string name="phone_number_descr">國際格式的電話號碼</string>
     <string name="shared_string_password">密碼</string>
@@ -138,7 +138,7 @@
     <string name="shared_string_distance">距離</string>
     <string name="share_location">共用位置</string>
     <string name="sharing_location">共用位置</string>
-    <string name="process_service">OsmAnd Telegram 伺服器</string>
+    <string name="process_service">OsmAnd Tracker 伺服器</string>
     <string name="osmand_logo">OsmAnd 圖示</string>
     <string name="install_osmand_dialog_message">您需要先安裝免費或付費版本的 OsmAnd</string>
     <string name="install_osmand">安裝 OsMand</string>
@@ -186,7 +186,6 @@
     <string name="open_in_osmand">在 OsmAnd 中開啟</string>
     <string name="end_date">結束日期</string>
     <string name="start_date">開始日期</string>
-    <string name="timeline_description">啟用監視以在背景蒐集移動資料。</string>
     <string name="timeline">時間軸</string>
     <string name="shared_string_telegram">Telegram</string>
     <string name="privacy_policy_use_telegram">Telegram（即時通訊應用程式）是用於與人們連線與溝通。</string>
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/TelegramApplication.kt b/OsmAnd-telegram/src/net/osmand/telegram/TelegramApplication.kt
index eddcb80acb..eaa9c5bf88 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/TelegramApplication.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/TelegramApplication.kt
@@ -47,7 +47,7 @@ class TelegramApplication : Application(), OsmandHelperListener {
 				if (connected) {
 					osmandAidlHelper.setNavDrawerItems(
 						applicationContext.packageName,
-						listOf(getString(R.string.app_name)),
+						listOf(getString(R.string.app_name_short_online)),
 						listOf("osmand_telegram://main_activity"),
 						listOf("ic_action_location_sharing_app"),
 						listOf(-1)
@@ -88,6 +88,11 @@ class TelegramApplication : Application(), OsmandHelperListener {
 		telegramHelper.stopSendingLiveLocationMessages(settings.getChatsShareInfo())
 	}
 
+	fun stopMonitoring() {
+		settings.monitoringEnabled = false
+		stopUserLocationService()
+	}
+
 	fun isAnyOsmAndInstalled() = TelegramSettings.AppConnect.getInstalledApps(this).isNotEmpty()
 
 	fun isOsmAndChosen() = settings.appToConnectPackage.isNotEmpty()
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/notifications/LocationNotification.kt b/OsmAnd-telegram/src/net/osmand/telegram/notifications/LocationNotification.kt
index b41306ebca..3acc330828 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/notifications/LocationNotification.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/notifications/LocationNotification.kt
@@ -14,6 +14,7 @@ import net.osmand.util.Algorithms
 
 private const val GROUP_NAME = "share_location"
 private const val DISABLE_SHARING_ACTION = "disable_sharing_action"
+private const val DISABLE_MONITORING_ACTION = "disable_monitoring_action"
 
 class LocationNotification(app: TelegramApplication) : TelegramNotification(app, GROUP_NAME) {
 
@@ -23,6 +24,11 @@ class LocationNotification(app: TelegramApplication) : TelegramNotification(app,
 				app.stopSharingLocation()
 			}
 		}, IntentFilter(DISABLE_SHARING_ACTION))
+		app.registerReceiver(object : BroadcastReceiver() {
+			override fun onReceive(context: Context?, intent: Intent?) {
+				app.stopMonitoring()
+			}
+		}, IntentFilter(DISABLE_MONITORING_ACTION))
 	}
 
 	override val type: TelegramNotification.NotificationType
@@ -66,10 +72,17 @@ class LocationNotification(app: TelegramApplication) : TelegramNotification(app,
 				PendingIntent.FLAG_UPDATE_CURRENT
 			)
 		} else {
-			notificationTitle = app.getString(R.string.show_users_on_map)
+			notificationTitle = app.getString(R.string.location_recording_enabled)
 			notificationText = app.getString(R.string.active_chats) + ": " + app.settings.getShowOnMapChatsCount()
 			color = 0
-			icon = R.drawable.ic_action_view
+			icon = R.drawable.ic_action_timeline
+			actionTextId = R.string.disable_monitoring
+			actionIntent = PendingIntent.getBroadcast(
+				app,
+				0,
+				Intent(DISABLE_MONITORING_ACTION),
+				PendingIntent.FLAG_UPDATE_CURRENT
+			)
 		}
 
 		return createBuilder(wearable)
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
index 0d2b50665f..d0a28d1d48 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
@@ -23,10 +23,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
-import android.widget.Button
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
+import android.widget.*
 import net.osmand.PlatformUtil
 import net.osmand.telegram.R
 import net.osmand.telegram.utils.AndroidNetworkUtils
@@ -116,6 +113,7 @@ class LoginDialogFragment : BaseDialogFragment() {
 	private var showProgress = false
 	private var dismissedManually = false
 	private lateinit var continueButton: Button
+	private lateinit var scrollView: ScrollView
 
 	enum class LoginDialogType(val viewId: Int, val editorId: Int,
 							   @StringRes val titleId: Int, @StringRes val descriptionId: Int,
@@ -149,6 +147,7 @@ class LoginDialogFragment : BaseDialogFragment() {
 		}
 		val view = inflater.inflate(R.layout.login_dialog, container)
 		continueButton = view.findViewById(R.id.continue_button)
+		scrollView = view.findViewById(R.id.scroll_view)
 
 		buildDialog(view)
 		view.viewTreeObserver.addOnGlobalLayoutListener {
@@ -160,6 +159,7 @@ class LoginDialogFragment : BaseDialogFragment() {
 			if (!softKeyboardShown && softKeyboardVisible) {
 				softKeyboardShown = softKeyboardVisible
 				transformContinueButton(true)
+				scrollToBottom()
 			} else if (softKeyboardShown && !softKeyboardVisible) {
 				transformContinueButton(false)
 			}
@@ -180,6 +180,10 @@ class LoginDialogFragment : BaseDialogFragment() {
 		continueButton.requestLayout()
 	}
 
+	private fun scrollToBottom() {
+		scrollView.post { scrollView.fullScroll(ScrollView.FOCUS_DOWN); }
+	}
+
 	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
 		return object : Dialog(requireActivity(), theme) {
 			override fun onBackPressed() {
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
index b36a164c01..faa5076456 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
@@ -6,6 +6,8 @@ import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
 import android.support.design.widget.BottomNavigationView
+import android.support.design.widget.CoordinatorLayout
+import android.support.design.widget.Snackbar
 import android.support.v4.app.DialogFragment
 import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentManager
@@ -25,7 +27,10 @@ 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.*
+import net.osmand.telegram.utils.AndroidUtils
+import net.osmand.telegram.utils.GRAYSCALE_PHOTOS_DIR
+import net.osmand.telegram.utils.GRAYSCALE_PHOTOS_EXT
+import net.osmand.telegram.utils.OsmandApiUtils
 import org.drinkless.td.libcore.telegram.TdApi
 import java.io.File
 import java.lang.ref.WeakReference
@@ -60,6 +65,9 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 
 	private lateinit var buttonsBar: LinearLayout
 	private lateinit var bottomNav: BottomNavigationView
+	private lateinit var coordinatorLayout: CoordinatorLayout
+
+	private var snackbarShown = false
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
@@ -78,7 +86,7 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 			offscreenPageLimit = 3
 			adapter = ViewPagerAdapter(supportFragmentManager)
 		}
-
+		coordinatorLayout = findViewById(R.id.coordinator)
 		bottomNav = findViewById<BottomNavigationView>(R.id.bottom_navigation).apply {
 			setOnNavigationItemSelectedListener {
 				var pos = -1
@@ -89,9 +97,19 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 				}
 				if (pos != -1 && pos != viewPager.currentItem) {
 					when (pos) {
-						MY_LOCATION_TAB_POS -> liveNowTabFragment?.tabClosed()
-						LIVE_NOW_TAB_POS -> liveNowTabFragment?.tabOpened()
-						TIMELINE_TAB_POS -> liveNowTabFragment?.tabClosed()
+						MY_LOCATION_TAB_POS -> {
+							liveNowTabFragment?.tabClosed()
+							timelineTabFragment?.tabClosed()
+						}
+						LIVE_NOW_TAB_POS -> {
+							timelineTabFragment?.tabClosed()
+							liveNowTabFragment?.tabOpened()
+						}
+						TIMELINE_TAB_POS -> {
+							liveNowTabFragment?.tabClosed()
+							timelineTabFragment?.tabOpened()
+							showSnackBar()
+						}
 					}
 					viewPager.currentItem = pos
 					return@setOnNavigationItemSelectedListener true
@@ -360,6 +378,15 @@ class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListene
 		imageView.setOnClickListener { showOptionsPopupMenu(imageView) }
 	}
 
+	fun showSnackBar() {
+		if (!snackbarShown) {
+			val snackbar = Snackbar.make(coordinatorLayout, R.string.timeline_available_for_free_now, Snackbar.LENGTH_LONG).setAction(R.string.shared_string_ok) {}
+			AndroidUtils.setSnackbarTextColor(snackbar, R.color.ctrl_active_dark)
+			snackbar.show()
+			snackbarShown = true
+		}
+	}
+
 	private fun showOptionsPopupMenu(anchor: View) {
 		val menuList = ArrayList<String>()
 		val settings = getString(R.string.shared_string_settings)
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt
index df68fcd834..0f881ea783 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt
@@ -3,6 +3,7 @@ package net.osmand.telegram.ui
 import android.animation.*
 import android.annotation.SuppressLint
 import android.content.Intent
+import android.graphics.Typeface
 import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.os.Bundle
@@ -15,6 +16,7 @@ import android.support.v7.widget.RecyclerView
 import android.text.SpannableString
 import android.text.SpannableStringBuilder
 import android.text.style.ForegroundColorSpan
+import android.text.style.StyleSpan
 import android.view.*
 import android.view.animation.LinearInterpolator
 import android.widget.*
@@ -22,12 +24,10 @@ import net.osmand.telegram.ADDITIONAL_ACTIVE_TIME_VALUES_SEC
 import net.osmand.telegram.R
 import net.osmand.telegram.SHARE_TYPE_MAP
 import net.osmand.telegram.TelegramApplication
-import net.osmand.telegram.helpers.FontCache
 import net.osmand.telegram.helpers.LocationMessages
 import net.osmand.telegram.helpers.TelegramHelper
 import net.osmand.telegram.helpers.TelegramHelper.TelegramListener
 import net.osmand.telegram.helpers.TelegramUiHelper
-import net.osmand.telegram.ui.views.CustomTypefaceSpan
 import net.osmand.telegram.utils.AndroidUtils
 import net.osmand.telegram.utils.OsmandFormatter
 import org.drinkless.td.libcore.telegram.TdApi
@@ -603,6 +603,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 			}
 
 			holder.title?.text = title
+
 			if (holder is ChatViewHolder) {
 				holder.description?.visibility = View.GONE
 				if (live) {
@@ -703,12 +704,9 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 				holder.sharingExpiresLine?.apply {
 					visibility = if (expiresIn > 0) View.VISIBLE else View.GONE
 					val description = SpannableStringBuilder(getText(R.string.expire_at))
-					val typeface = FontCache.getRobotoMonoBold(app)
 					val start = description.length
 					description.append(" ${OsmandFormatter.getFormattedTime(expiresIn * 1000)} ")
-					if (typeface != null) {
-						description.setSpan(CustomTypefaceSpan(typeface), start, description.length, 0)
-					}
+					description.setSpan(StyleSpan(Typeface.BOLD), start, description.length, 0)
 					description.setSpan(ForegroundColorSpan(ContextCompat.getColor(app, R.color.primary_text_light)), start, description.length, 0)
 					description.append((getString(R.string.in_time, OsmandFormatter.getFormattedDuration(app, expiresIn, true))))
 					text = description
@@ -717,8 +715,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 				holder.gpsPointsLine?.apply {
 					visibility = if (app.settings.showGpsPoints && shareInfo != null) View.VISIBLE else View.GONE
 					if (shareInfo != null) {
-						val description = SpannableStringBuilder(getText(R.string.gps_points))
-						val typeface = FontCache.getRobotoMonoBold(app)
+						val description = SpannableStringBuilder("${getText(R.string.gps_points)}:")
 						val bufferedPoints = if (app.settings.shareTypeValue == SHARE_TYPE_MAP) {
 							shareInfo.pendingTdLibMap + app.locationMessages.getBufferedMessagesCountForChat(shareInfo.chatId, LocationMessages.TYPE_MAP)
 						} else {
@@ -726,9 +723,7 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
 						}
 						val start = description.length
 						description.append(" ${shareInfo.sentMessages} ")
-						if (typeface != null) {
-							description.setSpan(CustomTypefaceSpan(typeface), start, description.length, 0)
-						}
+						description.setSpan(StyleSpan(Typeface.BOLD), start, description.length, 0)
 						description.setSpan(ForegroundColorSpan(ContextCompat.getColor(app, R.color.primary_text_light)), start, description.length, 0)
 						description.append(getString(R.string.gps_points_in_buffer, bufferedPoints))
 						text = description
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/TimelineTabFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/TimelineTabFragment.kt
index 6069f5b5a6..0add6bebed 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/ui/TimelineTabFragment.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/TimelineTabFragment.kt
@@ -44,6 +44,7 @@ class TimelineTabFragment : Fragment() {
 
 	private lateinit var dateBtn: TextView
 	private lateinit var mainView: View
+	private lateinit var switcher: Switch
 
 	private var start = 0L
 	private var end = 0L
@@ -69,7 +70,7 @@ class TimelineTabFragment : Fragment() {
 			adapter = this@TimelineTabFragment.adapter
 		}
 
-		val switcher = mainView.findViewById<Switch>(R.id.monitoring_switcher)
+		switcher = mainView.findViewById<Switch>(R.id.monitoring_switcher)
 		val monitoringTv = mainView.findViewById<TextView>(R.id.monitoring_title)
 		switcher.isChecked = settings.monitoringEnabled
 		monitoringTv.setText(if (settings.monitoringEnabled) R.string.monitoring_is_enabled else R.string.monitoring_is_disabled)
@@ -113,6 +114,16 @@ class TimelineTabFragment : Fragment() {
 		updateEnable = false
 	}
 
+	fun tabOpened() {
+		updateEnable = true
+		switcher.isChecked = settings.monitoringEnabled
+		updateList()
+	}
+
+	fun tabClosed() {
+		updateEnable = false
+	}
+
 	private fun selectDate() {
 		val dateFromDialog =
 			DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
diff --git a/gradle.properties b/gradle.properties
index 3bb8ab935d..5230a4c9b3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 #
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit