diff --git a/OsmAnd/res/layout/search_address.xml b/OsmAnd/res/layout/search_address.xml
index 495a9fa299..43d5c816ca 100644
--- a/OsmAnd/res/layout/search_address.xml
+++ b/OsmAnd/res/layout/search_address.xml
@@ -1,55 +1,156 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" 
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:custom="http://schemas.android.com/apk/res/net.osmand.plus"
-			android:layout_width="fill_parent" android:layout_height="fill_parent">
-<LinearLayout
-  android:layout_width="fill_parent"
-  android:layout_height="wrap_content" android:orientation="vertical" android:gravity="center_horizontal">
-  
-   
-<net.osmand.view.ExpandableLinearLayout custom:maxVisibleWidth="800dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" >
-    
-<TableLayout android:id="@+id/TableLayout" android:layout_width="fill_parent" android:stretchColumns="1" android:layout_height="wrap_content" >
-<TableRow android:id="@+id/TableRow" android:layout_marginLeft = "5dp">
-<TextView android:id="@+id/TextView" android:text="@string/search_address_region">
-</TextView>
-<Button android:id="@+id/CountryButton" android:text="@string/ChooseCountry" />
-<ImageButton android:id="@+id/ResetCountry" android:layout_marginRight = "5dp" android:layout_gravity="center_vertical" 
-    android:background="?attr/reset_image" android:contentDescription="@string/default_buttons_reset">
-</ImageButton>
-</TableRow>
-<TableRow android:id="@+id/TableRow" android:layout_marginLeft = "5dp" >
-<TextView android:id="@+id/TextView" android:text="@string/search_address_city">
-</TextView>
-<Button  android:id="@+id/CityButton" android:text="@string/choose_city" />
-<ImageButton android:id="@+id/ResetCity" android:layout_marginRight = "5dp" android:layout_gravity="center_vertical" 
-    android:background="?attr/reset_image" android:contentDescription="@string/default_buttons_reset">
-</ImageButton>
-</TableRow>
-<TableRow android:id="@+id/TableRow" android:layout_marginLeft = "5dp">
-<TextView android:id="@+id/TextView" android:text="@string/search_address_street">
-</TextView>
-<Button android:id="@+id/StreetButton" android:text="@string/choose_street" />
-<ImageButton android:id="@+id/ResetStreet" android:layout_marginRight = "5dp" android:layout_gravity="center_vertical" 
-    android:background="?attr/reset_image" android:contentDescription="@string/default_buttons_reset">
-</ImageButton>
-</TableRow>
-<TableRow android:id="@+id/TableRow" android:layout_marginLeft = "5dp">
-<TextView android:id="@+id/BuildingText" android:text="@string/search_address_building">
-</TextView>
-<Button android:id="@+id/BuildingButton" android:text="@string/choose_building" />
-<ImageButton android:id="@+id/ResetBuilding" android:layout_marginRight = "5dp"  android:layout_gravity="center_vertical"
-    android:background="?attr/reset_image" android:contentDescription="@string/default_buttons_reset">
-</ImageButton>
-</TableRow>
-</TableLayout>
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
 
-<RadioGroup android:orientation="horizontal" android:layout_span="3" android:id="@+id/RadioGroup" android:layout_marginLeft="5dp" android:layout_width="fill_parent" android:layout_height="wrap_content">
-<RadioButton android:id="@+id/RadioBuilding" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/search_address_building_option"></RadioButton>
-<RadioButton android:id="@+id/RadioIntersStreet" android:layout_width="wrap_content" android:layout_marginLeft = "5dp" android:layout_height="wrap_content" android:text="@string/search_address_street_option"></RadioButton>
-</RadioGroup>
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical" >
 
+        <net.osmand.view.ExpandableLinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            custom:maxVisibleWidth="800dp" >
+
+            <TableLayout
+                android:id="@+id/TableLayout"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:stretchColumns="1" >
+
+                <TableRow
+                    android:id="@+id/TableRow"
+                    android:layout_marginLeft="5dp" >
+
+                    <TextView
+                        android:id="@+id/TextView"
+                        android:text="@string/search_address_region" >
+                    </TextView>
+
+                    <Button
+                        android:id="@+id/CountryButton"
+                        android:text="@string/ChooseCountry" 
+                        android:scrollHorizontally="true" 
+    					android:lines="1"
+    					android:ellipsize="end"
+    					/>
+
+                    <ImageButton
+                        android:id="@+id/ResetCountry"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="5dp"
+                        android:background="?attr/reset_image"
+                        android:contentDescription="@string/default_buttons_reset" >
+                    </ImageButton>
+                </TableRow>
+
+                <TableRow
+                    android:id="@+id/TableRow"
+                    android:layout_marginLeft="5dp" >
+
+                    <TextView
+                        android:id="@+id/TextView"
+                        android:text="@string/search_address_city" >
+                    </TextView>
+
+                    <Button
+                        android:id="@+id/CityButton"
+                        android:text="@string/choose_city"
+                        android:scrollHorizontally="true" 
+    					android:lines="1"
+    					android:ellipsize="end" 
+                        />
+
+                    <ImageButton
+                        android:id="@+id/ResetCity"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="5dp"
+                        android:background="?attr/reset_image"
+                        android:contentDescription="@string/default_buttons_reset" >
+                    </ImageButton>
+                </TableRow>
+
+                <TableRow
+                    android:id="@+id/TableRow"
+                    android:layout_marginLeft="5dp" >
+
+                    <TextView
+                        android:id="@+id/TextView"
+                        android:text="@string/search_address_street" >
+                    </TextView>
+
+                    <Button
+                        android:id="@+id/StreetButton"
+                        android:text="@string/choose_street"
+                        android:scrollHorizontally="true" 
+    					android:lines="1"
+    					android:ellipsize="end"
+                         />
+
+                    <ImageButton
+                        android:id="@+id/ResetStreet"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="5dp"
+                        android:background="?attr/reset_image"
+                        android:contentDescription="@string/default_buttons_reset" >
+                    </ImageButton>
+                </TableRow>
+
+                <TableRow
+                    android:id="@+id/TableRow"
+                    android:layout_marginLeft="5dp" >
+
+                    <TextView
+                        android:id="@+id/BuildingText"
+                        android:text="@string/search_address_building" >
+                    </TextView>
+
+                    <Button
+                        android:id="@+id/BuildingButton"
+                        android:text="@string/choose_building"
+                        android:scrollHorizontally="true" 
+    					android:lines="1"
+    					android:ellipsize="end"
+    					 />
+
+                    <ImageButton
+                        android:id="@+id/ResetBuilding"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginRight="5dp"
+                        android:background="?attr/reset_image"
+                        android:contentDescription="@string/default_buttons_reset" >
+                    </ImageButton>
+                </TableRow>
+            </TableLayout>
+
+            <RadioGroup
+                android:id="@+id/RadioGroup"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:layout_span="3"
+                android:orientation="horizontal" >
+
+                <RadioButton
+                    android:id="@+id/RadioBuilding"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/search_address_building_option" >
+                </RadioButton>
+
+                <RadioButton
+                    android:id="@+id/RadioIntersStreet"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:text="@string/search_address_street_option" >
+                </RadioButton>
+            </RadioGroup>
+        </net.osmand.view.ExpandableLinearLayout>
+    </LinearLayout>
 
-</net.osmand.view.ExpandableLinearLayout >
-</LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/OsmAnd/res/values-af/strings.xml b/OsmAnd/res/values-af/strings.xml
index 0aeb05dafb..4c5c4fe287 100644
--- a/OsmAnd/res/values-af/strings.xml
+++ b/OsmAnd/res/values-af/strings.xml
@@ -201,7 +201,7 @@
   <string name="live_monitoring">Aanlyn lewendige spoor-natrek</string>
   <string name="live_monitoring_interval_descr">Spesifiseer lewendige spoor-natrek interval</string>
   <string name="live_monitoring_interval">Lewendige spoor-natrek interval</string>
-  <string name="live_monitoring_url_descr">Spesifiseer die web adres met parameteroordrag sinsbou: lat = {0}, lon = {1}, tyd stempel = {2}, hdop = {3}, hoogte = {4}, spoed = {5}</string>
+  <string name="live_monitoring_url_descr">Spesifiseer die web adres met parameteroordrag sinsbou: lat = {0}, lon = {1}, tyd stempel = {2}, hdop = {3}, hoogte = {4}, spoed = {5}, bearing={6}</string>
   <string name="live_monitoring_url">Lewendige spoor-natrek webadres</string>
   <string name="gpx_monitoring_disabled_warn">Skakel asseblief \'Meld spoor na GPX\' aan in natrekking instellings.</string>
   <string name="show_current_gpx_title">Wys huidige spoor</string>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 61ed8c7bad..5053521c27 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -770,7 +770,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="live_monitoring">Online tracking</string>
 	<string name="live_monitoring_interval_descr">Specify online tracking interval</string>
 	<string name="live_monitoring_interval">Online tracking interval</string>
-	<string name="live_monitoring_url_descr">Specify the web address with parameter syntax: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+	<string name="live_monitoring_url_descr">Specify the web address with parameter syntax: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
 	<string name="live_monitoring_url">Online tracking web address</string>
 	<string name="gpx_monitoring_disabled_warn">Калі ласка, дазвольце \'Лагаваньне трэкаў у GPX файл\' у наладах трэкінгу</string>
 	<string name="show_current_gpx_title">Паказаць дзейны трэк</string>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 8e6e67530a..7fe4f366ce 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -225,7 +225,7 @@
 <string name="test_voice_prompts">Prova els indicadors de veu</string>
 <string name="support_new_features">Ajuda per a noves característiques</string>
 <string name="rendering_out_of_memory">No hi ha prou memòria de procés per mostrar l\'àrea seleccionada</string>
-<string name="live_monitoring_url_descr">Especifiqueu l\'adreça de la pàgina web amb la sintaxi dels paràmetres: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+<string name="live_monitoring_url_descr">Especifiqueu l\'adreça de la pàgina web amb la sintaxi dels paràmetres: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
 <string name="index_name_north_america">Amèrica del Nord</string>
 <string name="index_name_us">Amèrica del Nord - Estats Units</string>
 <string name="index_name_central_america">Amèrica Central</string>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 2a72a8624e..6d4b9cdc7e 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -102,7 +102,7 @@
   <string name="live_monitoring">Přímý přenos pozice</string>
   <string name="live_monitoring_interval_descr">Zadejte interval nahrávání pozice na server</string>
   <string name="live_monitoring_interval">Interval přímého přenosu</string>
-  <string name="live_monitoring_url_descr">Zadejte webovou adresu serveru pro přímý přenos pozice. Parametry: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+  <string name="live_monitoring_url_descr">Zadejte webovou adresu serveru pro přímý přenos pozice. Parametry: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
   <string name="live_monitoring_url">Server pro přímý přenos</string>
   <string name="gpx_monitoring_disabled_warn">Prosím, zapněte funkci \'Uložit trasu do GPX\'.</string>
   <string name="show_current_gpx_title">Zobrazit aktuální trasu</string>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index ef64ccb490..7c7aaef3fc 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -474,7 +474,7 @@
 	<string name="live_monitoring">Online sporing</string>
 	<string name="live_monitoring_interval_descr">Indstil interval for onlinesporing</string>
 	<string name="live_monitoring_interval">Interval for online sporing</string>
-	<string name="live_monitoring_url_descr">Angiv webadressen med parametersyntaks: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+	<string name="live_monitoring_url_descr">Angiv webadressen med parametersyntaks: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
 	<string name="live_monitoring_url">Webadresse for online sporing</string>
 	<string name="gpx_monitoring_disabled_warn">Aktiver \'Log spor til GPX-fil\' indstilling.</string>
 	<string name="show_current_gpx_title">Vis aktuelt spor</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 7fa981cbbe..2bf6080e1e 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -413,7 +413,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua un
 	<string name="live_monitoring">Online-Tracking aktivieren</string>
 	<string name="live_monitoring_interval_descr">Angabe des Online-Tracking Invervalls</string>
 	<string name="live_monitoring_interval">Online-Tracking Intervall</string>
-	<string name="live_monitoring_url_descr">Spezifikation der Online-Tracking Web-Adresse mit Datenübergabe: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+	<string name="live_monitoring_url_descr">Spezifikation der Online-Tracking Web-Adresse mit Datenübergabe: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
 	<string name="live_monitoring_url">Online-Tracking Web-Adresse</string>
 	<string name="gpx_monitoring_disabled_warn">Bitte Aufzeichnung unter \'Einstellungen\' → \'Navigation\' aktivieren.</string>
 	<string name="show_current_gpx_title">Aktuellen Track anzeigen</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 6231f65058..b2d608cbe5 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -336,7 +336,7 @@
 	<string name="live_monitoring">Online ιχνηλάτηση</string>
 	<string name="live_monitoring_interval_descr">Καθορίστε το διάστημα της online ιχνηλάτησης</string>
 	<string name="live_monitoring_interval">Διάστημα online ιχνηλάτησης</string>
-	<string name="live_monitoring_url_descr">Καθορίστε τη διεύθυνση web με την σύνταξη παραμέτρων : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+	<string name="live_monitoring_url_descr">Καθορίστε τη διεύθυνση web με την σύνταξη παραμέτρων : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
 	<string name="live_monitoring_url">Διαδικτυακή διεύθυνση online ιχνηλάτησης</string>
 	<string name="gpx_monitoring_disabled_warn">Παρακαλώ ενεργοποιήστε τις ρυθμίσεις \'Εγγραφή ίχνους σε αρχείο GPX\'.</string>
 	<string name="show_current_gpx_title">Εμφάνιση τρέχοντος ίχνους</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 21e7b6ccbb..f447bbbeb8 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -43,7 +43,7 @@
   <string name="live_monitoring">Seguimiento en directo</string>
   <string name="live_monitoring_interval_descr">Especifica el intervalo de seguimiento en directo</string>
   <string name="live_monitoring_interval">Intervalo de seguimiento en directo</string>
-  <string name="live_monitoring_url_descr">Especifica la dirección web con sintaxis de parámetros : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+  <string name="live_monitoring_url_descr">Especifica la dirección web con sintaxis de parámetros : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
   <string name="live_monitoring_url">Dirección web de Seguimiento en directo</string>
   <string name="gpx_monitoring_disabled_warn">Por favor, active la opción \'Guardar traza en fichero GPX\'.</string>
   <string name="show_current_gpx_title">Mostrar traza actual</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 1e340fac28..29c2f1e7db 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -25,7 +25,7 @@
   <string name="live_monitoring">Activer le suivi en ligne</string>
   <string name="live_monitoring_interval_descr">Préciser l\'intervalle pour le suivi en ligne</string>
   <string name="live_monitoring_interval">Intervalle pour le suivi en ligne</string>
-  <string name="live_monitoring_url_descr">Précisez l\'adresse web pour le suivi en ligne avec la syntaxe : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+  <string name="live_monitoring_url_descr">Précisez l\'adresse web pour le suivi en ligne avec la syntaxe : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
   <string name="live_monitoring_url">Adresse web pour le suivi en ligne</string>
   <string name="gpx_monitoring_disabled_warn">Veuillez activer \'Enregistrer l\'itinéraire en GPX\' en paramètre de suivi.</string>
   <string name="show_current_gpx_title">Afficher le trajet en cours</string>
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index 66e1b26626..dd89ef25ea 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -349,7 +349,7 @@
 	<string name="live_monitoring">מעקב חי מקוון</string>
 	<string name="live_monitoring_interval_descr">נא לציין הפסקות בין דיווחי מעקב חי</string>
 	<string name="live_monitoring_interval">הפסקות בין דיווחי מעקב חי</string>
-	<string name="live_monitoring_url_descr">נא לציין את כתובת השרת עם תחביר הפרמטרים הבא: רוחב={0}, אורך={1}, חותמת_זמן={2}, hdop‏={3}, גובה={4}, מהירות={5}</string>
+	<string name="live_monitoring_url_descr">נא לציין את כתובת השרת עם תחביר הפרמטרים הבא: רוחב={0}, אורך={1}, חותמת_זמן={2}, hdop‏={3}, גובה={4}, מהירות={5}, bearing={6} </string>
 	<string name="live_monitoring_url">כתובת שרת המעקב החי</string>
 	<string name="gpx_monitoring_disabled_warn">נא להפעיל את \'מעקב אחר המסלול לקובץ GPX\' בהגדרות.</string>
 	<string name="show_current_gpx_title">הצגת המסלול הנוכחי</string>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 7caec110c4..1fdb08b8ef 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -93,7 +93,7 @@
   <string name="live_monitoring">Online útvonalrögzítés</string>
   <string name="live_monitoring_interval_descr">Online útvonalrögzítés intervalluma</string>
   <string name="live_monitoring_interval">Online rögzítési sűrűség</string>
-  <string name="live_monitoring_url_descr">Add meg a használni kívánt webcímet az alábbi szintaxissal: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+  <string name="live_monitoring_url_descr">Add meg a használni kívánt webcímet az alábbi szintaxissal: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
   <string name="live_monitoring_url">Online rögzítés webcíme</string>
   <string name="gpx_monitoring_disabled_warn">Kérlek engedélyezd az \'Útvonal rögzítése GPX-be\' beállítást.</string>
   <string name="show_current_gpx_title">Aktív útvonalrögzítés</string>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 65d3e9d7d5..ed81923735 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -26,7 +26,7 @@
   <string name="live_monitoring">Tracking online in diretta</string>
   <string name="live_monitoring_interval_descr">Specifica l\'intervallo del tracking in diretta</string>
   <string name="live_monitoring_interval">Intervallo del Live tracking</string>
-  <string name="live_monitoring_url_descr">Specifica l\'indirizzo internet con la sintassi dei parametri: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+  <string name="live_monitoring_url_descr">Specifica l\'indirizzo internet con la sintassi dei parametri: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
   <string name="live_monitoring_url">Indirizzo internet per il tracking in diretta</string>
   <string name="gpx_monitoring_disabled_warn">Abilita nelle impostazioni \'Registrazione della traccia nel file GPX\'.</string>
   <string name="show_current_gpx_title">Visualizza la traccia corrente</string>
diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml
index 6e36c10e0f..ce174ce46f 100644
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@@ -147,7 +147,7 @@
   <string name="live_monitoring">დევნა მიმდინარე რეჟიმში</string>
   <string name="live_monitoring_interval_descr">მიუთითეთ მიმდინარე რეჟიმში დევნის ინტერვალი</string>
   <string name="live_monitoring_interval">ცოცხალი დევნის ინტერვალი</string>
-  <string name="live_monitoring_url_descr">მიუთითეთ ვებ მისამართუ შემდეგი პარამეტრების სინტაქსით : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+  <string name="live_monitoring_url_descr">მიუთითეთ ვებ მისამართუ შემდეგი პარამეტრების სინტაქსით : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
   <string name="live_monitoring_url">ცოცხალი დევნის ვებ-მისამართი</string>
   <string name="gpx_monitoring_disabled_warn">გთხოვთ ჩართოთ \'დევნის GPX ჟურნალში ჩაწერა\' დევნის პარამეტრებში.</string>
   <string name="show_current_gpx_title">მიმდინარე დევნის ჩვენება</string>
diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index f28f9b1e32..3734f71407 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -91,7 +91,7 @@
 	<string name="live_monitoring">라이브 트래킹 활성화</string>
 	<string name="live_monitoring_interval_descr">라이브 트래킹 시간 간격을 설정합니다</string>
 	<string name="live_monitoring_interval">라이브 트래킹 시간 간격</string>
-	<string name="live_monitoring_url_descr">라이브 트래킹 웹 주소를 설정합니다. 매개변수 형식 : 위도={0}, 경도={1}, 시간={2}, hdop={3}, 고도={4}, 속도={5}</string>
+	<string name="live_monitoring_url_descr">라이브 트래킹 웹 주소를 설정합니다. 매개변수 형식 : 위도={0}, 경도={1}, 시간={2}, hdop={3}, 고도={4}, 속도={5}, bearing={6}</string>
 	<string name="live_monitoring_url">라이브 트래킹 웹 주소</string>
 	<string name="gpx_monitoring_disabled_warn">\'Log track to GPX\' 트래킹 설정을 활성화하세요</string>
 	<string name="show_current_gpx_title">현재 트랙을 보여줍니다</string>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 0ccc2c1926..c3d1626c69 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -213,7 +213,7 @@
   <string name="live_monitoring">Tiesioginis sekimas internete</string>
   <string name="live_monitoring_interval_descr">Nurodyti tiesioginio sekimo intervalą</string>
   <string name="live_monitoring_interval">Tiesioginio sekimo intervalas</string>
-  <string name="live_monitoring_url_descr">Nurodykite interneto adresą su tokia parametrų sintakse : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+  <string name="live_monitoring_url_descr">Nurodykite interneto adresą su tokia parametrų sintakse : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
   <string name="live_monitoring_url">Tiesioginio sekimo tarnybos interneto adresas</string>
   <string name="gpx_monitoring_disabled_warn">Turite įjungti \'Išsaugoti kelionės istoriją į GPX\' sekimo nustatymą.</string>
   <string name="show_current_gpx_title">Rodyti dabartinės kelionės istoriją</string>
diff --git a/OsmAnd/res/values-lv/strings.xml b/OsmAnd/res/values-lv/strings.xml
index a73c048c22..6ec854e6e1 100644
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@@ -103,7 +103,7 @@
   <string name="live_monitoring">Tiešsaistes sekošana</string>
   <string name="live_monitoring_interval_descr">Norādīt tiešsaistes sekošanas intervālu</string>
   <string name="live_monitoring_interval">Tiešaistes sekošanas intervāls</string>
-  <string name="live_monitoring_url_descr">Norādiet web adresi ar parametru sintaksi : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+  <string name="live_monitoring_url_descr">Norādiet web adresi ar parametru sintaksi : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
   <string name="live_monitoring_url">Tiešaistes sekošanas web adrese</string>
   <string name="gpx_monitoring_disabled_warn">Lūdzu iespējojat \'Ierakstīt treku GPX failā\' uzstādījumu.</string>
   <string name="show_current_gpx_title">Rādīt tekošo treku</string>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index b60c7f8cc4..0261f75c32 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -129,7 +129,7 @@
   <string name="live_monitoring">Online tracking</string>
   <string name="live_monitoring_interval_descr">Specificeer interval voor online tracking</string>
   <string name="live_monitoring_interval">Interval voor online tracking</string>
-  <string name="live_monitoring_url_descr">Specificeer het webadres met parameter syntax : lat={0}, lon={1}, timestamp={2}, hdop={3}, hoogte={4}, snelheid={5}</string>
+  <string name="live_monitoring_url_descr">Specificeer het webadres met parameter syntax : lat={0}, lon={1}, timestamp={2}, hdop={3}, hoogte={4}, snelheid={5}, bearing={6}</string>
   <string name="live_monitoring_url">Webadres voor online tracking</string>
   <string name="gpx_monitoring_disabled_warn">Zet eerst \'Registreer track in GPX-bestand\' aan.</string>
   <string name="show_current_gpx_title">Toon huidige track</string>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 7febf61aeb..6ea6a8be81 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -787,7 +787,7 @@
   <string name="live_monitoring">Śledzenie online</string>
   <string name="live_monitoring_interval_descr">Określ interwał pomiędzy wysyłaniem danych</string>
   <string name="live_monitoring_interval">Interwał wysyłania danych</string>
-  <string name="live_monitoring_url_descr">Określ adres usługi webowej używając następujących parametrów ({n} określa dany parametr): {0}=lat, {1}=lon, {2}=znacznik czasu, {3}=HDOP, {4}=wysokość, {5}=prędkość</string>
+  <string name="live_monitoring_url_descr">Określ adres usługi webowej używając następujących parametrów ({n} określa dany parametr): {0}=lat, {1}=lon, {2}=znacznik czasu, {3}=HDOP, {4}=wysokość, {5}=prędkość, bearing={6}</string>
   <string name="live_monitoring_url">Adres śledzenia online</string>
   <string name="gpx_monitoring_disabled_warn">Proszę włączyć ustawienia \'Zapisuj ślad GPX\'.</string>
   <string name="show_current_gpx_title">Pokaż aktualną ścieżkę</string>
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 18980db32c..c035fc3f16 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -573,7 +573,7 @@
   <string name="live_monitoring">Online live tracking</string>
   <string name="live_monitoring_interval_descr">Specify live tracking interval</string>
   <string name="live_monitoring_interval">Live tracking interval</string>
-  <string name="live_monitoring_url_descr">Specify the web address with parameter syntax : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+  <string name="live_monitoring_url_descr">Specify the web address with parameter syntax : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
   <string name="live_monitoring_url">Live tracking web address</string>
   <string name="gpx_monitoring_disabled_warn">Please enable \'Log track to GPX\' Tracking settings.</string>
   <string name="show_current_gpx_title">Mostrar rota atual</string>
diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index 13f2a58c17..c830543a9e 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -369,7 +369,7 @@
 	<string name="live_monitoring">Monitorizare online a poziției</string>
 	<string name="live_monitoring_interval_descr">Specificarea intervalului de timp între două trimiteri consecutive ale poziției curente</string>
 	<string name="live_monitoring_interval">Intervalul de trimitere a poziției</string>
-	<string name="live_monitoring_url_descr">Specificarea adresei de web la care se trimit coordonatele poziției curente cu sintaxa: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+	<string name="live_monitoring_url_descr">Specificarea adresei de web la care se trimit coordonatele poziției curente cu sintaxa: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
 	<string name="live_monitoring_url">Adresa web a serviciului de monitorizare</string>
 	<string name="gpx_monitoring_disabled_warn">Vă rog să activați opțiunea \'Salvează traseul GPX\'.</string>
 	<string name="show_current_gpx_title">Arată traseul curent</string>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 11a79906c5..a5adc7ef18 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -158,7 +158,7 @@
   <string name="live_monitoring">Включить Live слежение</string>
   <string name="live_monitoring_interval_descr">Укажите интервал Live слежения</string>
   <string name="live_monitoring_interval">Интервал Live слежения</string>
-  <string name="live_monitoring_url_descr">Укажите адрес Live слежения со следующими параметрами : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+  <string name="live_monitoring_url_descr">Укажите адрес Live слежения со следующими параметрами : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
   <string name="live_monitoring_url">Web адрес Live слежения</string>
   <string name="gpx_monitoring_disabled_warn">Пожалуйста включите \'Записывать путь в GPX\' в Настройках.</string>
   <string name="show_current_gpx_title">Показывать текущий путь</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 9d5556fb51..7d8c8380af 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -217,7 +217,7 @@
   <string name="live_monitoring">Zapnúť stopovanie naživo</string>
   <string name="live_monitoring_interval_descr">Určenie intervalu stopovania naživo</string>
   <string name="live_monitoring_interval">Interval stopovania naživo</string>
-  <string name="live_monitoring_url_descr">Určenie webovej adresy stopovania naživo so syntaxom parametrov: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+  <string name="live_monitoring_url_descr">Určenie webovej adresy stopovania naživo so syntaxom parametrov: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
   <string name="live_monitoring_url">Webová adresa stopovania naživo</string>
   <string name="gpx_monitoring_disabled_warn">Prosím, zapnite \'Zaznemať stopu do GPX\' v stopovacích nastaveniach.</string>
   <string name="show_current_gpx_title">Zobraziť aktuálnu stopu</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 00faaa96cf..5e49e413e2 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -688,7 +688,7 @@
 	<string name="live_monitoring">Spletno sledenje v živo</string>
 	<string name="live_monitoring_interval_descr">Določi interval sledenja v živo</string>
 	<string name="live_monitoring_interval">Interval sledenja v živo</string>
-	<string name="live_monitoring_url_descr">Določite spletne naslove s skladnjo parametrov: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+	<string name="live_monitoring_url_descr">Določite spletne naslove s skladnjo parametrov: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
 	<string name="live_monitoring_url">Spletni naslov za sledenje v živo</string>
 	<string name="gpx_monitoring_disabled_warn">Omogočite nastavitev \'Beleži sled v datoteko GPX\'.</string>
 	<string name="profile_settings">Za profil določene nastavitve</string>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index a090ca4e1d..cf741b474e 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -318,7 +318,7 @@
 <string name="live_monitoring">Online Live-spårning</string>
 <string name="live_monitoring_interval_descr">Ange intervall för Live tracking</string>
 <string name="live_monitoring_interval">Intervall för Live tracking</string>
-<string name="live_monitoring_url_descr">Ange webbadressen med parametersyntax: lat={0}, lon={1}, tidsstämpel={2}, hdop={3}, höjd={4}, hastighet={5}</string>
+<string name="live_monitoring_url_descr">Ange webbadressen med parametersyntax: lat={0}, lon={1}, tidsstämpel={2}, hdop={3}, höjd={4}, hastighet={5}, bearing={6}</string>
 <string name="live_monitoring_url">Webbadress för Live tracking</string>
 <string name="gpx_monitoring_disabled_warn">Aktivera \'Logga spår till GPX-fil\'-inställningar.</string>
 <string name="show_current_gpx_title">Visa aktuellt spår</string>
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index cbe0f5c4e6..3dcefa11d4 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -657,7 +657,7 @@
 	<string name="live_monitoring">Çevrimiçi canlı izleme</string>
 	<string name="live_monitoring_interval_descr">Canlı izleme aralığı belirtin</string>
 	<string name="live_monitoring_interval">Canlı izleme aralığı</string>
-	<string name="live_monitoring_url_descr">"Parametre sözdizimi ile web adresini belirtin: Enlem={0}, Boylam={1}, Damga zamanı={2}, HDOP={3}, Rakım={4}, Hız={5} "</string>
+	<string name="live_monitoring_url_descr">"Parametre sözdizimi ile web adresini belirtin: Enlem={0}, Boylam={1}, Damga zamanı={2}, HDOP={3}, Rakım={4}, Hız={5}, bearing={6} "</string>
 	<string name="live_monitoring_url">Web adresinden izlemeyi canlı izlemek</string>
 	<string name="gpx_monitoring_disabled_warn">Lütfen \'GPX dosyası yolunda oturum\'ayarlarını etkinleştirin.</string>
 	<string name="show_current_gpx_title">Geçerli izi göster</string>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index eec6af2fa6..6d8601ae7f 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -178,7 +178,7 @@
   <string name="live_monitoring">Online live tracking</string>
   <string name="live_monitoring_interval_descr">Specify live tracking interval</string>
   <string name="live_monitoring_interval">Live tracking interval</string>
-  <string name="live_monitoring_url_descr">Specify the web address with parameter syntax : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+  <string name="live_monitoring_url_descr">Specify the web address with parameter syntax : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
   <string name="live_monitoring_url">Live tracking web address</string>
   <string name="gpx_monitoring_disabled_warn">Будь ласка, ввімкніть \"Записувати шлях в GPX\" в Нашаштуваннях.</string>
   <string name="show_current_gpx_title">Відображати пройдений шлях</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 3e16ca2b7d..ba1e3c1e15 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -341,7 +341,7 @@
 	<string name="live_monitoring">線上即時追蹤</string>
 	<string name="live_monitoring_interval_descr">指定線上即時追蹤間隔</string>
 	<string name="live_monitoring_interval">線上即時追蹤間隔</string>
-	<string name="live_monitoring_url_descr">指定位置的參數語法：lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+	<string name="live_monitoring_url_descr">指定位置的參數語法：lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
 	<string name="live_monitoring_url">線上即時追蹤網路地址</string>
 	<string name="gpx_monitoring_disabled_warn">請啟用\'記錄航跡成 GPX 檔案\'設定。</string>
 	<string name="show_current_gpx_title">顯示目前航跡</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 24d32cffc4..82eedb4e02 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -780,7 +780,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="live_monitoring">Online tracking</string>
 	<string name="live_monitoring_interval_descr">Specify online tracking interval</string>
 	<string name="live_monitoring_interval">Online tracking interval</string>
-	<string name="live_monitoring_url_descr">Specify the web address with parameter syntax: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}</string>
+	<string name="live_monitoring_url_descr">Specify the web address with parameter syntax: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
 	<string name="live_monitoring_url">Online tracking web address</string>
 	<string name="gpx_monitoring_disabled_warn">Please enable \'Log track to GPX file\' settings.</string>
 	<string name="show_current_gpx_title">Show current track</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/LiveMonitoringHelper.java b/OsmAnd/src/net/osmand/plus/activities/LiveMonitoringHelper.java
index 2b01ca8200..76e09aed50 100644
--- a/OsmAnd/src/net/osmand/plus/activities/LiveMonitoringHelper.java
+++ b/OsmAnd/src/net/osmand/plus/activities/LiveMonitoringHelper.java
@@ -47,21 +47,18 @@ public class LiveMonitoringHelper  {
 		if (OsmAndLocationProvider.isPointAccurateForRouting(location) && isLiveMonitoringEnabled()
 				&& OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class) != null) {
 			long locationTime = System.currentTimeMillis();
-			insertData(location.getLatitude(), location.getLongitude(), location.getAltitude(),
-					location.getSpeed(), location.getAccuracy(), locationTime, settings);
+			//* 1000 in next line seems to be wrong with new IntervalChooseDialog
+			//if (time - lastTimeUpdated > settings.LIVE_MONITORING_INTERVAL.get() * 1000) {
+			if (locationTime - lastTimeUpdated > settings.LIVE_MONITORING_INTERVAL.get()) {
+				LiveMonitoringData data = new LiveMonitoringData((float)location.getLatitude(), (float)location.getLongitude(),
+						(float) location.getAltitude(),(float) location.getSpeed(),(float) location.getAccuracy(), (float) location.getBearing(), locationTime );
+				new LiveSender().execute(data);
+				lastTimeUpdated = locationTime;
+			}
 		}
 		
 	}
 	
-	public void insertData(double lat, double lon, double alt, double speed, double hdop, long time, OsmandSettings settings){
-		//* 1000 in next line seems to be wrong with new IntervalChooseDialog
-		//if (time - lastTimeUpdated > settings.LIVE_MONITORING_INTERVAL.get() * 1000) {
-		if (time - lastTimeUpdated > settings.LIVE_MONITORING_INTERVAL.get()) {
-			LiveMonitoringData data = new LiveMonitoringData((float)lat, (float)lon,(float) alt,(float) speed,(float) hdop, time );
-			new LiveSender().execute(data);
-			lastTimeUpdated = time;
-		}
-	}
 	
 	private static class LiveMonitoringData {
 
@@ -69,16 +66,18 @@ public class LiveMonitoringHelper  {
 		private final float lon;
 		private final float alt;
 		private final float speed;
+		private final float bearing;
 		private final float hdop;
 		private final long time;
 
-		public LiveMonitoringData(float lat, float lon, float alt, float speed, float hdop, long time) {
+		public LiveMonitoringData(float lat, float lon, float alt, float speed, float hdop, float bearing, long time) {
 			this.lat = lat;
 			this.lon = lon;
 			this.alt = alt;
 			this.speed = speed;
 			this.hdop = hdop;
 			this.time = time;
+			this.bearing = bearing;
 		}
 		
 	}
@@ -99,7 +98,7 @@ public class LiveMonitoringHelper  {
 		String st = settings.LIVE_MONITORING_URL.get();
 		List<String> prm = new ArrayList<String>();
 		int maxLen = 0;
-		for(int i = 0; i < 6; i++) {
+		for(int i = 0; i < 7; i++) {
 			boolean b = st.contains("{"+i+"}");
 			if(b) {
 				maxLen = i;
@@ -125,6 +124,9 @@ public class LiveMonitoringHelper  {
 			case 5:
 				prm.add(data.speed + "");
 				break;
+			case 6:
+				prm.add(data.bearing + "");
+				break;
 
 			default:
 				break;