Merge remote-tracking branch 'origin/master' into Suggested_List

# Conflicts:
#	OsmAnd-telegram/res/values/strings.xml

OsmAnd-java/src/main/java/net/osmand/binary/GeocodingUtilities.java

@@ -5,7 +5,6 @@ import net.osmand.ResultMatcher;
 import net.osmand.CollatorStringMatcher.StringMatcherMode;
 import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
 import net.osmand.data.Building;
-import net.osmand.data.Building.BuildingInterpolation;
 import net.osmand.data.City;
 import net.osmand.data.LatLon;
 import net.osmand.data.MapObject;
@@ -22,14 +21,12 @@ import org.apache.commons.logging.Log;
 import java.io.IOException;
 import java.text.Collator;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import java.util.TreeSet;
 
 import gnu.trove.set.hash.TLongHashSet;
 

OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java

@@ -629,6 +629,7 @@ public class OsmandRegions {
 			return;
 		}
 		WorldRegion world = new WorldRegion(WorldRegion.WORLD);
+		initWorldRegion(world, WorldRegion.ANTARCTICA_REGION_ID);
 		initWorldRegion(world, WorldRegion.AFRICA_REGION_ID);
 		initWorldRegion(world, WorldRegion.ASIA_REGION_ID);
 		initWorldRegion(world, WorldRegion.CENTRAL_AMERICA_REGION_ID);

OsmAnd-java/src/main/java/net/osmand/map/WorldRegion.java

@@ -10,6 +10,7 @@ import java.util.List;
 public class WorldRegion implements Serializable {
 
 	public static final String WORLD_BASEMAP = "world_basemap";
+	public static final String ANTARCTICA_REGION_ID = "antarctica";
 	public static final String AFRICA_REGION_ID = "africa";
 	public static final String ASIA_REGION_ID = "asia";
 	public static final String AUSTRALIA_AND_OCEANIA_REGION_ID = "australia-oceania";

OsmAnd-java/src/main/java/net/osmand/util/MapUtils.java

@@ -4,6 +4,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import net.osmand.Location;
 import net.osmand.data.LatLon;
 import net.osmand.data.MapObject;
 import net.osmand.data.QuadPoint;
@@ -626,6 +627,12 @@ public class MapUtils {
 			r.bottom = Math.min(r.bottom, latitude);
 		}
 	}
+
+	public static boolean areLatLonEqual(Location l1, Location l2) {
+		return l1 == null && l2 == null
+				|| (l1 != null && l2 != null && Math.abs(l1.getLatitude() - l2.getLatitude()) < 0.00001
+				&& Math.abs(l1.getLongitude() - l2.getLongitude()) < 0.00001);
+	}
 }
 
 

OsmAnd-telegram/res/values-ar-rSA/strings.xml

@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="time_zone">المنطقة الزمنية</string>
+</resources>

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

@@ -11,7 +11,7 @@
     <string name="privacy_policy_use_telegram">يستخدم تيليجرام (تطبيق المراسلة) للاتصال والتواصل مع الأشخاص.</string>
     <string name="shared_string_later">لاحقا</string>
     <string name="osmand_service">حالة وضع السكون</string>
-    <string name="nm_h">م.بح/س</string>
+    <string name="nm_h">ميل بحري</string>
     <string name="si_nm_h">ميل بحري في الساعة (عقدة)</string>
     <string name="si_km_m">كم ، متر</string>
     <string name="shared_string_end">نهاية</string>
@@ -34,7 +34,7 @@
     <string name="shared_string_off">إيقاف</string>
     <string name="shared_string_install">تثبيت</string>
     <string name="shared_string_share">مشاركة</string>
-    <string name="shared_string_back">العودة</string>
+    <string name="shared_string_back">عودة</string>
     <string name="shared_string_password">كلمة المرور</string>
     <string name="shared_string_continue">استمرار</string>
     <string name="shared_string_cancel">إلغاء</string>
@@ -66,4 +66,7 @@
     <string name="shared_string_start">بدء</string>
     <string name="shared_string_apply">تطبيق</string>
     <string name="shared_string_enabled">مفعل</string>
+    <string name="units_and_formats">الوحدات والأشكال</string>
+    <string name="unit_of_length_descr">اختيار الوحدات: كم، ميل، ميل بحري.. إلخ.</string>
+    <string name="unit_of_length">وحدات الطول</string>
 </resources>

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

@@ -46,7 +46,7 @@
     <string name="closing">S\'està tancant</string>
     <string name="app_name_short">Rastrejador OsmAnd</string>
     <string name="privacy_policy_telegram_client">El rastrejador d\'OsmAnd és un dels clients que usen la plataforma oberta de Telegram. Els vostres contactes poden usar qualsevol altra client de Telegram.</string>
-    <string name="privacy_policy_agree">En fer clic a continuar, accepteu les condicions de la Política de Privadesa de Telegram i de la Política de Privadesa d\'OsmAnd.</string>
+    <string name="privacy_policy_agree">En clicar \"Continua\" accepteu les condicions de les polítiques de privadesa de Telegram i d\'OsmAnd.</string>
     <string name="shared_string_accept">D\'acord</string>
     <string name="telegram_privacy_policy">Política de Privadesa de Telegram</string>
     <string name="osmand_privacy_policy">Política de Privadesa d\'OsmAnd</string>
@@ -250,4 +250,14 @@
     <string name="shared_string_apply">Aplica</string>
     <string name="set_time_timeline_descr">Seleccioneu la durada a mostrar</string>
     <string name="start_end_date">Data d\' Inici — Fi</string>
+    <string name="saved_messages">Missatges desats</string>
+    <string name="time_zone_descr">Seleccioneu fus horari per mostrar en els vostres missatges d\'ubicació.</string>
+    <string name="time_zone">Fus horari</string>
+    <string name="units_and_formats">Unitats i formats</string>
+    <string name="unit_of_length_descr">Canvieu en què es mesuren les distàncies.</string>
+    <string name="unit_of_length">Unitats de longitud</string>
+    <string name="unit_of_speed_system_descr">Establiu la unitat de velocitat.</string>
+    <string name="unit_of_speed_system">Unitat de velocitat</string>
+    <string name="buffer_time_descr">Temps màxim per mantenir punts a la memòria intermèdia</string>
+    <string name="buffer_time">Temps de caducitat de la memòria intermèdia</string>
 </resources>

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

@@ -204,7 +204,7 @@
     <string name="shared_string_telegram">Telegram</string>
     <string name="privacy_policy_use_telegram">Telegram (besked app) bruges til at forbinde og kommunikere med mennesker.</string>
     <string name="privacy_policy_telegram_client">OsmAnd Tracker er en af de klienter, der bruger den åbne Telegram platform. Kontaktpersoner kan bruge enhver anden Telegram klient.</string>
-    <string name="privacy_policy_agree">Ved at klikke på fortsæt accepteres betingelserne i Telegram Privacy Policy og OsmAnd Privacy Policy.</string>
+    <string name="privacy_policy_agree">Ved at klikke på \"Fortsæt\" accepteres betingelserne i Telegram- og OsmAnd privatlivspolitik.</string>
     <string name="shared_string_accept">Accepter</string>
     <string name="telegram_privacy_policy">Telegram privatlivspolitik</string>
     <string name="osmand_privacy_policy">OsmAnd privatlivspolitik</string>
@@ -250,4 +250,13 @@
     <string name="shared_string_apply">Anvend</string>
     <string name="set_time_timeline_descr">Vælg tid at vise</string>
     <string name="start_end_date">Start — slutdato</string>
+    <string name="saved_messages">Gemte beskeder</string>
+    <string name="time_zone_descr">Vælg tidszone, der skal vises i placeringsbeskeder.</string>
+    <string name="time_zone">Tidszone</string>
+    <string name="units_and_formats">Enheder &amp; formater</string>
+    <string name="unit_of_length">Længdeenheder</string>
+    <string name="unit_of_speed_system_descr">Vælg enhed for hastighed.</string>
+    <string name="unit_of_speed_system">Hastighed</string>
+    <string name="buffer_time_descr">Maksimal tid til lagring af punkter i bufferen</string>
+    <string name="buffer_time">Buffer udløbstid</string>
 </resources>

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

@@ -251,4 +251,13 @@
     <string name="shared_string_apply">Anwenden</string>
     <string name="set_time_timeline_descr">Dauer der Anzeige auswählen</string>
     <string name="saved_messages">Gespeicherte Nachrichten</string>
+    <string name="time_zone">Zeitzone</string>
+    <string name="units_and_formats">Einheiten und Formate</string>
+    <string name="unit_of_length">Längeneinheiten</string>
+    <string name="unit_of_speed_system_descr">Geschwindigkeitseinheit festlegen.</string>
+    <string name="unit_of_speed_system">Geschwindigkeitseinheit</string>
+    <string name="time_zone_descr">Wählen Sie die Zeitzone aus, die in Ihren Standortmeldungen angezeigt werden soll.</string>
+    <string name="unit_of_length_descr">Maß für Entfernungen ändern.</string>
+    <string name="buffer_time_descr">Maximale Zeit zum Speichern von Punkten im Puffer</string>
+    <string name="buffer_time">Verfallszeit des Puffers</string>
 </resources>

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

@@ -1,2 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="shared_string_ok">Εντάξει</string>
+    <string name="shared_string_update">Ενημέρωση</string>
+    <string name="shared_string_map">Χάρτης</string>
+    <string name="shared_string_add">Προσθήκη</string>
+    <string name="shared_string_hide">Απόκρυψη</string>
+    <string name="shared_string_save">Αποθήκευση</string>
+    <string name="shared_string_sort">Ταξινόμηση</string>
+    <string name="km">χλμ</string>
+    <string name="m">μ</string>
+    <string name="nm">ναυτικό μίλι</string>
+    <string name="min_mile">λεπτά/μίλι</string>
+    <string name="min_km">λεπτά/χιλιόμετρο</string>
+    <string name="m_s">μέτρα/δευτερόλεπτο</string>
+    <string name="km_h">χλμ/ω</string>
+    <string name="si_kmh">Χιλιόμετρα ανά ώρα</string>
+    <string name="si_mph">Μίλια ανά ώρα</string>
+    <string name="si_m_s">Μέτρα ανά δευτερόλεπτο</string>
+    <string name="si_min_km">Λεπτά ανά χιλιόμετρο</string>
+    <string name="si_min_m">Λεπτά ανά μίλι</string>
+    <string name="si_nm">Ναυτικά μίλια</string>
+    <string name="si_mi_meters">Μίλια/μέτρα</string>
+    <string name="shared_string_all">Όλα</string>
+    <string name="altitude">Υψόμετρο</string>
+    <string name="shared_string_name">Όνομα</string>
+    <string name="osmand_service">Κατάσταση παρασκηνίου</string>
+    <string name="shared_string_apply">Εφαρμογή</string>
+    <string name="shared_string_select">Επιλέξτε</string>
+    <string name="shared_string_enable">Ενεργοποίηση</string>
+    <string name="shared_string_search">Αναζήτηση</string>
+    <string name="average_altitude">Μέσο υψόμετρο</string>
+    <string name="average_speed">Μέση ταχύτητα</string>
+    <string name="shared_string_status">Κατάσταση</string>
+    <string name="shared_string_disable">Απενεργοποίηση</string>
+    <string name="shared_string_close">Κλείσιμο</string>
+    <string name="shared_string_off">Ανενεργό</string>
+    <string name="shared_string_install">Εγκατάσταση</string>
+    <string name="shared_string_share">Διαμοιρασμός</string>
+    <string name="shared_string_back">Προηγούμενο</string>
+    <string name="shared_string_continue">Συνέχεια</string>
+    <string name="shared_string_cancel">Ακύρωση</string>
+    <string name="shared_string_settings">Επιλογές</string>
+    <string name="shared_string_enabled">Ενεργοποιημένο</string>
+    <string name="units_and_formats">Μονάδες μέτρησης &amp; φορμά</string>
+</resources>

OsmAnd-telegram/res/values-es-rUS/strings.xml

@@ -250,4 +250,13 @@
     <string name="set_time_timeline_descr">Elige la hora de visualización</string>
     <string name="start_end_date">Fecha de inicio — fin</string>
     <string name="saved_messages">Mensajes guardados</string>
+    <string name="time_zone_descr">Marca la zona horaria que deseas que aparezca en los mensajes de ubicación.</string>
+    <string name="time_zone">Zona horaria</string>
+    <string name="units_and_formats">Unidades y formatos</string>
+    <string name="unit_of_length_descr">Cambia las unidades de longitud.</string>
+    <string name="unit_of_length">Unidades de longitud</string>
+    <string name="unit_of_speed_system_descr">Define la unidad de velocidad.</string>
+    <string name="unit_of_speed_system">Unidad de velocidad</string>
+    <string name="buffer_time_descr">Tiempo máximo para almacenar puntos en el búfer</string>
+    <string name="buffer_time">Tiempo de expiración del búfer</string>
 </resources>

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

@@ -203,7 +203,7 @@
     <string name="shared_string_telegram">Telegram</string>
     <string name="privacy_policy_use_telegram">Telegram (la aplicación de mensajería) se utiliza para conectar y comunicar a las personas.</string>
     <string name="privacy_policy_telegram_client">El rastreador de OsmAnd (en inglés como «OsmAnd Tracker»), es uno de los clientes que utiliza la plataforma abierta de Telegram. Sus contactos pueden utilizar cualquier otro cliente de Telegram.</string>
-    <string name="privacy_policy_agree">Al pulsar en continuar, acepta las Políticas de Privacidad de Telegram y de OsmAnd.</string>
+    <string name="privacy_policy_agree">Al hacer clic en \"Continuar\", aceptas las condiciones de la política de privacidad de Telegram- y OsmAnd.</string>
     <string name="shared_string_accept">Aceptar</string>
     <string name="telegram_privacy_policy">Política de privacidad de Telegram</string>
     <string name="osmand_privacy_policy">Política de privacidad de OsmAnd</string>
@@ -249,4 +249,14 @@
     <string name="shared_string_start">Inicio</string>
     <string name="set_time_timeline_descr">Elige la hora de visualización</string>
     <string name="start_end_date">Fecha de Inicio — Fin</string>
+    <string name="saved_messages">Mensajes guardados</string>
+    <string name="time_zone_descr">Seleccione la zona horaria que desea mostrar en los mensajes de ubicación.</string>
+    <string name="time_zone">Zona horaria</string>
+    <string name="units_and_formats">Unidades y formatos</string>
+    <string name="unit_of_length_descr">Cambia las unidades de longitud.</string>
+    <string name="unit_of_length">Unidades de longitud</string>
+    <string name="unit_of_speed_system_descr">Definir la unidad de velocidad.</string>
+    <string name="unit_of_speed_system">Unidad de velocidad</string>
+    <string name="buffer_time_descr">Tiempo después del cual se eliminarán los mensajes de ubicación almacenados en búfer</string>
+    <string name="buffer_time">Tiempo de expiración del búfer</string>
 </resources>

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

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="buffer_time_descr">Maksimaalne punktide puhvris säilitamise aeg</string>
+    <string name="buffer_time">Puhvri aegumisaeg</string>
+    <string name="time_zone_descr">Vali oma asukohateadetes kuvatav ajavöönd.</string>
+    <string name="time_zone">Ajavöönd</string>
+    <string name="units_and_formats">Ühikud ja formaadid</string>
+    <string name="unit_of_length_descr">Muuda kauguse mõõtmise ühikuid.</string>
+    <string name="unit_of_length">Pikkusühikud</string>
+    <string name="unit_of_speed_system_descr">Määra kiiruse ühik.</string>
+    <string name="unit_of_speed_system">Kiiruse ühik</string>
+    <string name="saved_messages">Salvestatud sõnumid</string>
+    <string name="shared_string_end">Lõpp</string>
+    <string name="shared_string_start">Algus</string>
+    <string name="shared_string_apply">Rakenda</string>
+    <string name="set_time_timeline_descr">Vali kuvatav aeg</string>
+    <string name="start_end_date">Alguse — Lõpu kuupäev</string>
+    <string name="timeline_no_data_descr">Meil pole valitud päeva kohta andmeid kogutud</string>
+    <string name="timeline_no_data">Andmed puuduvad</string>
+    <string name="shared_string_select">Vali</string>
+    <string name="min_logging_distance">Vähim logimise vahemaa</string>
+    <string name="min_logging_distance_descr">Filter: vähim vahemaa, mille järel uus punkt logida</string>
+    <string name="min_logging_accuracy">Vähim logimise täpsus</string>
+    <string name="min_logging_accuracy_descr">Filter: mitte logida kuni täpsus pole saavutatud</string>
+    <string name="min_logging_speed">Vähim logimise kiirus</string>
+    <string name="min_logging_speed_descr">Filter: mitte logida alla valitud kiiruse</string>
+    <string name="gpx_settings">GPX seaded</string>
+    <string name="proxy_key">Võti</string>
+    <string name="proxy_password">Salasõna</string>
+    <string name="proxy_username">Kasutajanimi</string>
+    <string name="proxy_credentials">Rekvisiidid</string>
+    <string name="proxy_port">Port</string>
+    <string name="proxy_server">Server</string>
+    <string name="shared_string_connection">Ühendus</string>
+    <string name="shared_string_enable">Luba</string>
+    <string name="proxy_type">Puhverserveri liik</string>
+    <string name="proxy_connected">Ühendatud</string>
+    <string name="proxy_disconnected">Ühendus puudub</string>
+    <string name="proxy_settings">Puhverserveri seaded</string>
+    <string name="proxy">Puhverserver</string>
+    <string name="altitude">Kõrgus</string>
+    <string name="shared_string_search">Otsi</string>
+    <string name="shared_string_ok">OK</string>
+    <string name="shared_string_update">Uuenda</string>
+    <string name="average_altitude">Keskmine kõrgus</string>
+    <string name="average_speed">Keskmine kiirus</string>
+    <string name="shared_string_map">Kaart</string>
+    <string name="shared_string_add">Lisa</string>
+    <string name="shared_string_hide">Peida</string>
+    <string name="shared_string_enabled">Lubatud</string>
+    <string name="shared_string_status">Olek</string>
+    <string name="shared_string_disable">Keela</string>
+    <string name="shared_string_save">Salvesta</string>
+    <string name="shared_string_name">Nimi</string>
+    <string name="shared_string_sort">Sorteeri</string>
+    <string name="shared_string_exit">Välju</string>
+    <string name="shared_string_close">Sulge</string>
+    <string name="shared_string_all">Kõik</string>
+    <string name="shared_string_off">Väljas</string>
+    <string name="shared_string_install">Paigalda</string>
+    <string name="shared_string_share">Jaga</string>
+    <string name="shared_string_back">Tagasi</string>
+    <string name="shared_string_continue">Jätka</string>
+    <string name="shared_string_cancel">Tühista</string>
+    <string name="shared_string_settings">Seaded</string>
+    <string name="osmand_service">Taustarežiim</string>
+    <string name="yard">yd</string>
+    <string name="foot">ft</string>
+    <string name="mile">mi</string>
+    <string name="km">km</string>
+    <string name="m">m</string>
+    <string name="nm">mpk</string>
+    <string name="min_mile">min/m</string>
+    <string name="min_km">min/km</string>
+    <string name="m_s">m/s</string>
+    <string name="km_h">km/h</string>
+    <string name="mile_per_hour">mph</string>
+    <string name="si_kmh">Kilomeetrit tunnis</string>
+    <string name="si_mph">Miili tunnis</string>
+    <string name="si_m_s">Meetrit sekundis</string>
+    <string name="si_min_km">Minutit kilomeetri kohta</string>
+    <string name="si_min_m">Minutit miili kohta</string>
+    <string name="si_mi_feet">Miilid/jalad</string>
+    <string name="si_mi_yard">Miilid/jardid</string>
+    <string name="si_km_m">Kilomeetrid/meetrid</string>
+    <string name="si_nm">Meremiilid</string>
+    <string name="si_mi_meters">Miilid/meetrid</string>
+</resources>

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

@@ -69,4 +69,7 @@
     <string name="nm_h">nmi/h</string>
     <string name="si_nm_h">مایل دریایی بر ساعت (نات)</string>
     <string name="shared_string_enabled">فعال</string>
+    <string name="units_and_formats">یکاها و قالب‌ها</string>
+    <string name="unit_of_length_descr">یکاهای طول را تغییر دهید.</string>
+    <string name="unit_of_length">یکاهای طول</string>
 </resources>

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

@@ -139,7 +139,7 @@
     <string name="no_location_permission">A aplicación non ten permiso para acceder ós datos da ubicación.</string>
     <string name="gps_not_available">Activar «Ubicación» nos axustes do sistema</string>
     <string name="location_service_no_gps_available">Escolle un dos fornecedores da ubicación para compartilla-la túa ubicación.</string>
-    <string name="osmand_service">Modo no segundo plano</string>
+    <string name="osmand_service">Modo en segundo plano</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>

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

@@ -195,7 +195,7 @@
     <string name="shared_string_telegram">טלגרם</string>
     <string name="privacy_policy_use_telegram">טלגרם (יישומון ההתכתבות) משמש תשתית להתחברות ולתקשורת עם אנשים.</string>
     <string name="privacy_policy_telegram_client">העוקב של OsmAnd הוא אחד הלקוחות שמשתמש בפלטפורמה הפתוחה של טלגרם. אנשי הקשר שלך יכולים להשתמש בכל לקוח טלגרם שיבחרו.</string>
-    <string name="privacy_policy_agree">לחיצה על המשך מהווה את הסכמתך לתנאי מדיניות הפרטיות של טלגרם ולתנאי מדיניות הפרטיות של OsmAnd.</string>
+    <string name="privacy_policy_agree">לחיצה על „המשך” מהווה את הסכמתך לתנאי מדיניות הפרטיות של טלגרם ושל OsmAnd.</string>
     <string name="shared_string_accept">קבלה</string>
     <string name="telegram_privacy_policy">מדיניות הפרטיות של טלגרם</string>
     <string name="osmand_privacy_policy">מדיניות הפרטיות של OsmAnd</string>
@@ -250,4 +250,13 @@
     <string name="location_sharing_status">משותף: %1$s</string>
     <string name="shared_string_enabled">מופעל</string>
     <string name="saved_messages">הודעות שמורות</string>
+    <string name="time_zone_descr">נא לבחור את אזור הזמן בהודעות המיקום שלך.</string>
+    <string name="time_zone">אזור זמן</string>
+    <string name="units_and_formats">יחידות ותבניות</string>
+    <string name="unit_of_length_descr">שינוי היחידות שבהן מודדים מרחק.</string>
+    <string name="unit_of_length">יחידות אורך</string>
+    <string name="unit_of_speed_system_descr">הגדרת יחידת מהירות.</string>
+    <string name="unit_of_speed_system">יחידת מהירות</string>
+    <string name="buffer_time_descr">הזמן המרבי לשמירת נקודות בזיכרון</string>
+    <string name="buffer_time">זמן פקיעת הזיכרון</string>
 </resources>

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

@@ -3,7 +3,7 @@
     <string name="shared_string_telegram">Telegram</string>
     <string name="privacy_policy_use_telegram">A Telegram (üzenetküldő alkalmazás) a másokkal való összekapcsolódásra és kommunikációra használható.</string>
     <string name="privacy_policy_telegram_client">A Telegram nyílt platformot használó kliensprogramok egyike az OsmAnd tracker. Partnerei bármelyik másik Telegram kliensprogramot is használhatják.</string>
-    <string name="privacy_policy_agree">A továbbra kattintva elfogadja a Telegram és az OsmAnd adatvédelmi irányelveinek feltételeit.</string>
+    <string name="privacy_policy_agree">A „Tovább”-ra kattintva elfogadja a Telegram és az OsmAnd adatvédelmi irányelveinek feltételeit.</string>
     <string name="shared_string_accept">Elfogadás</string>
     <string name="telegram_privacy_policy">Telegram adatvédelmi irányelvei</string>
     <string name="osmand_privacy_policy">OsmAnd adatvédelmi irányelvei</string>
@@ -62,7 +62,7 @@
     <string name="last_available_location">Utolsó elérhető tartózkodási hely</string>
     <string name="sharing_status">Megosztás állapota</string>
     <string name="location_sharing_status">Megosztás: %1$s</string>
-    <string name="shared_string_enabled">engedélyezve</string>
+    <string name="shared_string_enabled">Engedélyezve</string>
     <string name="shared_string_status">Állapot</string>
     <string name="no_gps_connection">Nincs GPS-kapcsolat</string>
     <string name="no_internet_connection">Nincs internetkapcsolat</string>
@@ -249,4 +249,14 @@
     <string name="shared_string_apply">Alkalmazás</string>
     <string name="set_time_timeline_descr">Megjelenítendő időszak kijelölése</string>
     <string name="start_end_date">Kezdő és záró dátum</string>
+    <string name="saved_messages">Mentett üzenetek</string>
+    <string name="time_zone_descr">Időzóna kijelölése a helyzetjelentésekben való megjelenítéshez.</string>
+    <string name="time_zone">Időzóna</string>
+    <string name="units_and_formats">Mértékegységek &amp; formátumok</string>
+    <string name="unit_of_length_descr">Távolság mértékegységének módosítása</string>
+    <string name="unit_of_length">Hosszmértékegységek</string>
+    <string name="unit_of_speed_system_descr">Sebesség mértékegységének meghatározása</string>
+    <string name="unit_of_speed_system">Sebesség mértékegysége</string>
+    <string name="buffer_time_descr">Az az idő, amely után a pufferelt helyzetjelentések törlődnek</string>
+    <string name="buffer_time">Puffer lejárati ideje</string>
 </resources>

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

@@ -251,4 +251,9 @@
     <string name="set_time_timeline_descr">Seleziona l\'ora da visualizzare</string>
     <string name="start_end_date">Data di inizio - fine</string>
     <string name="saved_messages">Messaggi salvati</string>
+    <string name="units_and_formats">Unità e formati</string>
+    <string name="unit_of_length_descr">Cambia l\'unità di misura della distanza.</string>
+    <string name="unit_of_length">Unità di misura di lunghezza</string>
+    <string name="time_zone">Fuso orario</string>
+    <string name="unit_of_speed_system">Unità di misura della velocità</string>
 </resources>

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

@@ -46,7 +46,7 @@
     <string name="shared_string_telegram">テレグラム</string>
     <string name="privacy_policy_use_telegram">テレグラム(メッセージングアプリ)は、他の人々と通信するために使用されます。</string>
     <string name="privacy_policy_telegram_client">OsmAndトラッカーは、Telegramオープンプラットフォームを利用するクライアントの1つです。連絡先は他のTelegramクライアントのものを利用できます。</string>
-    <string name="privacy_policy_agree">続行をクリックすると、TelegramプライバシーポリシーおよびOsmAndプライバシーポリシーの条件に同意したとみなされます。</string>
+    <string name="privacy_policy_agree">続行をクリックすると、TelegramおよびOsmAndプライバシーポリシーの条件に同意したとみなされます。</string>
     <string name="shared_string_accept">決定</string>
     <string name="telegram_privacy_policy">Telegramプライバシーポリシー</string>
     <string name="osmand_privacy_policy">OsmAndプライバシーポリシー</string>
@@ -108,7 +108,7 @@
     <string name="last_available_location">最後に有効化されていた場所</string>
     <string name="sharing_status">共有ステータス</string>
     <string name="location_sharing_status">共有:%1$s</string>
-    <string name="shared_string_enabled">有効化</string>
+    <string name="shared_string_enabled">有効</string>
     <string name="shared_string_status">ステータス</string>
     <string name="no_gps_connection">GPS未接続</string>
     <string name="no_internet_connection">インターネット未接続</string>
@@ -242,9 +242,22 @@
     <string name="shared_string_hour_short">時間</string>
     <string name="shared_string_minute_short">分</string>
     <string name="shared_string_second_short">秒</string>
-    <string name="welcome_descr"><b>OsmAnd Tracker</b>OsmAndで現在地を共有して他の人たちの現在地も確認できます。<br/><br/>アプリはTelegram APIを使用するため、Telegramアカウントが必要です。</string>
+    <string name="welcome_descr">
+        <b>OsmAnd Tracker</b>OsmAndで現在地を共有して他の人たちの現在地も確認できます。<br/>
+        <br/>アプリはTelegram APIを使用するため、Telegramアカウントが必要です。</string>
     <string name="my_location">現在地</string>
     <string name="live_now">今現在</string>
     <string name="timeline">タイムライン</string>
     <string name="si_min_km">分/キロメートル</string>
+    <string name="si_min_m">分/マイル</string>
+    <string name="units_and_formats">単位と形式</string>
+    <string name="unit_of_length">長さの単位</string>
+    <string name="saved_messages">保存したメッセージ</string>
+    <string name="time_zone_descr">ロケーションメッセージに表示するタイムゾーンを選択します。</string>
+    <string name="time_zone">タイムゾーン</string>
+    <string name="unit_of_length_descr">測定する距離を変更します。</string>
+    <string name="unit_of_speed_system_descr">速度の単位を指定します。</string>
+    <string name="unit_of_speed_system">速度の単位</string>
+    <string name="buffer_time_descr">バッファー内に保存する時間を指定します</string>
+    <string name="buffer_time">バッファー有効時間</string>
 </resources>

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

@@ -9,7 +9,7 @@
     <string name="shared_string_telegram">Telegram</string>
     <string name="privacy_policy_use_telegram">Telegram (de berichten-app) wordt gebruikt om mensen te verbinden en te communiceren met mensen.</string>
     <string name="privacy_policy_telegram_client">OsmAnd-tracker is een van de app clients die het open platform van Telegram gebruiken. Uw contactpersonen kunnen elke andere Telegram-client gebruiken.</string>
-    <string name="privacy_policy_agree">Door op Doorgaan te klikken gaat u accoord met het privacy beleid van Telegram en van OsmAnd.</string>
+    <string name="privacy_policy_agree">Door op Doorgaan te klikken gaat u akkoord met het privacy beleid van zowel Telegram als OsmAnd.</string>
     <string name="shared_string_accept">Aanvaard</string>
     <string name="telegram_privacy_policy">Telegram privacy beleid</string>
     <string name="osmand_privacy_policy">OsmAnd privacy beleid</string>
@@ -169,7 +169,7 @@
     <string name="initialization">Initialiseer</string>
     <string name="location_service_no_gps_available">Selecteer de locatie provider waarmee u uw locatie deelt.</string>
     <string name="osmand_service">Achtergrond modus</string>
-    <string name="osmand_service_descr">OsmAnd loopt in de achtergrond met uitgeschakeld scherm.</string>
+    <string name="osmand_service_descr">OsmAnd tracker loopt in de achtergrond met uitgeschakeld scherm.</string>
     <string name="shared_string_distance">Afstand</string>
     <string name="share_location">Deel locatie</string>
     <string name="sharing_location">Locatie wordt gedeeld</string>
@@ -250,4 +250,11 @@
     <string name="set_time_timeline_descr">Kies te tonen tijd</string>
     <string name="start_end_date">Start — Eind datum</string>
     <string name="saved_messages">Bewaarde gesprekken</string>
+    <string name="time_zone_descr">Selecteer de te tonen tijdzone in uw locatie berichten.</string>
+    <string name="time_zone">Tijdzone</string>
+    <string name="units_and_formats">Eenheden &amp; formaten</string>
+    <string name="unit_of_length_descr">Wijzig de eenheid van afstand voor metingen.</string>
+    <string name="unit_of_length">Afstand eenheden</string>
+    <string name="unit_of_speed_system_descr">Definieer de eenheid voor snelheid.</string>
+    <string name="unit_of_speed_system">Eenheid van snelheid</string>
 </resources>

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

@@ -251,4 +251,12 @@
     <string name="set_time_timeline_descr">Wybierz czas wyświetlania</string>
     <string name="start_end_date">Daty rozpoczęcia i zakończenia</string>
     <string name="saved_messages">Zapisane wiadomości</string>
+    <string name="time_zone">Strefa czasowa</string>
+    <string name="units_and_formats">Jednostki i formaty</string>
+    <string name="unit_of_length_descr">Zmienia jednostki długości.</string>
+    <string name="unit_of_length">Jednostki długości</string>
+    <string name="unit_of_speed_system_descr">Zdefiniuj jednostkę prędkości.</string>
+    <string name="unit_of_speed_system">Jednostka prędkości</string>
+    <string name="buffer_time_descr">Maksymalny czas przechowywania punktów w buforze</string>
+    <string name="buffer_time">Czas ważności bufora</string>
 </resources>

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

@@ -251,4 +251,13 @@
     <string name="set_time_timeline_descr">Selecionar a hora para exibir</string>
     <string name="start_end_date">Data de início - fim</string>
     <string name="saved_messages">Mensagens salvas</string>
+    <string name="units_and_formats">Unidades e formatos</string>
+    <string name="unit_of_length_descr">Altere as unidades de medida.</string>
+    <string name="unit_of_length">Unidades de medida</string>
+    <string name="time_zone_descr">Selecione o fuso horário para mostrar nas mensagens de localização.</string>
+    <string name="time_zone">Fuso horário</string>
+    <string name="unit_of_speed_system_descr">Defina a unidade de velocidade.</string>
+    <string name="unit_of_speed_system">Unidade de velocidade</string>
+    <string name="buffer_time_descr">Tempo máximo para armazenar pontos no buffer</string>
+    <string name="buffer_time">Tempo de expiração do buffer</string>
 </resources>

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

@@ -96,7 +96,9 @@
     <string name="not_possible_to_send_to_telegram_chats">Não é possível enviar para bate-papo do Telegram:</string>
     <string name="not_sent_yet">Ainda não enviado</string>
     <string name="points_size">%1$d pontos</string>
-    <string name="welcome_descr"><b>OsmAnd Tracker</b> permite que partilhe a sua localização e veja a dos outros no OsmAnd.<br/> <br/>O app usa a API Telegram e você precisa de uma conta Telegram.</string>
+    <string name="welcome_descr">
+        <b>OsmAnd Tracker</b> permite que partilhe a sua localização e veja a dos outros no OsmAnd.<br/>
+        <br/>O app usa a API Telegram e você precisa de uma conta Telegram.</string>
     <string name="min_logging_distance_descr">Filtro: distância mínima para registrar um novo ponto</string>
     <string name="device_name_cannot_be_empty">O nome do aparelho não pode estar vazio</string>
     <string name="yard">yd</string>
@@ -249,4 +251,13 @@
     <string name="si_mi_yard">Milhas/jardas</string>
     <string name="initializing">Iniciando</string>
     <string name="saved_messages">Mensagens gravadas</string>
+    <string name="time_zone_descr">Selecione o fuso horário a mostrar nas suas mensagens de localização.</string>
+    <string name="time_zone">Fuso horário</string>
+    <string name="units_and_formats">Unidades e formatos</string>
+    <string name="unit_of_length_descr">Alterar unidade de distância.</string>
+    <string name="unit_of_length">Unidades de comprimento</string>
+    <string name="unit_of_speed_system_descr">Definir unidade de velocidade.</string>
+    <string name="unit_of_speed_system">Unidade de velocidade</string>
+    <string name="buffer_time_descr">Tempo máximo para armazenar pontos no buffer</string>
+    <string name="buffer_time">Tempo de expiração do buffer</string>
 </resources>

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

@@ -16,7 +16,7 @@
     <string name="altitude">Altitude</string>
     <string name="shared_string_search">Pesquisar</string>
     <string name="shared_string_ok">Ok</string>
-    <string name="app_name_short">OsmAnd Tracker</string>
+    <string name="app_name_short">Rastreador OsmAnd</string>
     <string name="shared_string_telegram">Telegram</string>
     <string name="shared_string_appearance">Aparência</string>
     <string name="shared_string_update">Atualizar</string>
@@ -250,4 +250,13 @@
     <string name="live_now">Ao vivo agora</string>
     <string name="timeline">Cronologia</string>
     <string name="saved_messages">Mensagens gravadas</string>
+    <string name="time_zone_descr">Selecione o fuso horário para mostrar nas suas mensagens de localização.</string>
+    <string name="time_zone">Fuso horário</string>
+    <string name="units_and_formats">Unidades e formatos</string>
+    <string name="unit_of_length_descr">Alterar unidade de medida de distância.</string>
+    <string name="unit_of_length">Unidades de comprimento</string>
+    <string name="unit_of_speed_system_descr">Definir unidade de velocidade.</string>
+    <string name="unit_of_speed_system">Unidade de velocidade</string>
+    <string name="buffer_time_descr">Tempo máximo para armazenar pontos no buffer</string>
+    <string name="buffer_time">Tempo de expiração do buffer</string>
 </resources>

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

@@ -121,7 +121,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 Tracker использует для отображения местоположений на карте.</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>
@@ -139,7 +139,7 @@
     <string name="last_available_location">Последнее местоположение</string>
     <string name="sharing_status">Статус отправки</string>
     <string name="location_sharing_status">Трансляция: %1$s</string>
-    <string name="shared_string_enabled">Включена</string>
+    <string name="shared_string_enabled">Включен</string>
     <string name="shared_string_status">Статус</string>
     <string name="no_gps_connection">Отсутствует GPS</string>
     <string name="no_internet_connection">Отсутствует интернет</string>
@@ -251,4 +251,13 @@
     <string name="shared_string_start">Начало</string>
     <string name="set_time_timeline_descr">Выберите время для отображения</string>
     <string name="saved_messages">Сохраненные сообщения</string>
+    <string name="time_zone_descr">Выберите часовой пояс, чтобы показывать время вашего местоположения в сообщениях.</string>
+    <string name="time_zone">Часовой пояс</string>
+    <string name="units_and_formats">Единицы измерения и форматы</string>
+    <string name="unit_of_length_descr">Изменить единицу измерения расстояния.</string>
+    <string name="unit_of_length">Единицы измерения расстояния</string>
+    <string name="unit_of_speed_system_descr">Выберите единицу измерения скорости.</string>
+    <string name="unit_of_speed_system">Единица измерения скорости</string>
+    <string name="buffer_time_descr">Максимальное время хранения точек в буфере</string>
+    <string name="buffer_time">Срок действия буфера</string>
 </resources>

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

@@ -233,7 +233,7 @@
     <string name="proxy_settings">Impostatziones de su servidore intermediàriu</string>
     <string name="proxy">Servidore intermediàriu (proxy)</string>
     <string name="privacy">Privadesa</string>
-    <string name="bearing">Andamentu</string>
+    <string name="bearing">Orientamentu</string>
     <string name="shared_string_select">Seletziona</string>
     <string name="min_logging_distance">Distàntzia mìnima de registratzione</string>
     <string name="min_logging_distance_descr">FIltru: distàntzia mìnima pro registrare unu puntu nou</string>
@@ -250,4 +250,13 @@
     <string name="set_time_timeline_descr">Ischerta su tempus de ammustrare</string>
     <string name="start_end_date">Data de incumintzu — de acabu</string>
     <string name="saved_messages">Messàgios sarvados</string>
+    <string name="time_zone_descr">Issèbera su fusu oràriu de ammustrare in sos messàgios de positzione tuos.</string>
+    <string name="time_zone">Fusu oràriu</string>
+    <string name="units_and_formats">Unidades e formados</string>
+    <string name="unit_of_length_descr">Muda s\'unidade de mèdida pro sa distàntzia.</string>
+    <string name="unit_of_length">Unidades de longària</string>
+    <string name="unit_of_speed_system_descr">Issèbera s\'unidade de letresa.</string>
+    <string name="unit_of_speed_system">Unidade de lestresa</string>
+    <string name="buffer_time_descr">Tempus a pustis de su cale sos messàgios de positzione in sa memòria tampone (buffer) ant a èssere iscantzellados</string>
+    <string name="buffer_time">Tempus de iscadidura de sa memòria tampone</string>
 </resources>

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

@@ -50,4 +50,7 @@
     <string name="si_mi_meters">Миље/метри</string>
     <string name="shared_string_apply">Примени</string>
     <string name="shared_string_enabled">Укључен</string>
+    <string name="units_and_formats">Мерне јединице &amp; форматирања</string>
+    <string name="unit_of_length_descr">Промени јединице за дужину.</string>
+    <string name="unit_of_length">Јединице дужине</string>
 </resources>

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

@@ -211,7 +211,7 @@
     <string name="my_location_search_hint">Ara: Grup veya kişi</string>
     <string name="start_location_sharing">Konumu paylaş</string>
     <string name="show_on_map">Haritada göster</string>
-    <string name="app_name">OsmAnd Online GPS Tracker</string>
+    <string name="app_name">OsmAnd Çevrimiçi GPS İzleyici</string>
     <string name="phone_number_title">Telefon numarası</string>
     <string name="phone_number_descr">Uluslararası formatta telefon numarası</string>
     <string name="shared_string_password">Parola</string>
@@ -245,8 +245,19 @@
     <string name="shared_string_hour_short">sa</string>
     <string name="shared_string_minute_short">dk</string>
     <string name="shared_string_second_short">sn</string>
-    <string name="welcome_descr"><b>OsmAnd Tracker</b> konumunuzu paylaşmanıza ve OsmAnd\'daki diğer kişileri görmenize olanak sağlar.<br/><br/>Uygulama Telegram API\'sini kullanmaktadır, bu nedenle bir Telegram hesabına ihtiyacınız vardır.</string>
+    <string name="welcome_descr">
+        <b>OsmAnd Tracker</b> konumunuzu paylaşmanıza ve OsmAnd\'daki diğer kişileri görmenize olanak sağlar.<br/>
+        <br/>Uygulama Telegram API\'sini kullanmaktadır, bu nedenle bir Telegram hesabına ihtiyacınız vardır.</string>
     <string name="my_location">Konumum</string>
     <string name="live_now">Şimdi canlı</string>
     <string name="timeline">Zaman çizelgesi</string>
+    <string name="time_zone_descr">Konum mesajlarınızda gösterilecek saat dilimini seçin.</string>
+    <string name="time_zone">Saat dilimi</string>
+    <string name="units_and_formats">Birimler ve formatlar</string>
+    <string name="unit_of_length_descr">Mesafe ölçüm birimini değiştir.</string>
+    <string name="unit_of_length">Uzunluk birimleri</string>
+    <string name="unit_of_speed_system_descr">Hız birimini tanımlayın.</string>
+    <string name="unit_of_speed_system">Hız birimi</string>
+    <string name="buffer_time_descr">Noktaların arabellekte saklanacağı maksimum süre</string>
+    <string name="buffer_time">Arabellek zaman aşım süresi</string>
 </resources>

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

@@ -249,6 +249,15 @@
     <string name="min_logging_accuracy">Мінімальна точність реєстрації</string>
     <string name="min_logging_accuracy_descr">Фільтр: реєстрація не проводиться, якщо не досягнуто точності</string>
     <string name="min_logging_speed">Мінімальна швидкість реєстрації</string>
-    <string name="min_logging_speed_descr">Фільтр: не реєструвати, якщо швидкість меньша за обрану</string>
+    <string name="min_logging_speed_descr">Фільтр: не реєструвати, якщо швидкість менша за обрану</string>
     <string name="saved_messages">Збережені повідомлення</string>
+    <string name="time_zone_descr">Оберіть часовий пояс щоб відобразити повідомлення у вашому розташуванні.</string>
+    <string name="time_zone">Часовий пояс</string>
+    <string name="units_and_formats">Одиниця вимірювання та формати</string>
+    <string name="unit_of_length">Одиниці вимірювання довжини</string>
+    <string name="unit_of_length_descr">Змінити одиницю вимірювання відстані.</string>
+    <string name="unit_of_speed_system_descr">Визначити одиницю швидкості.</string>
+    <string name="unit_of_speed_system">Одиниця вимірювання швидкості</string>
+    <string name="buffer_time_descr">Найбільший час зберігання точок у буфері</string>
+    <string name="buffer_time">Термін дії буфера</string>
 </resources>

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

@@ -252,4 +252,13 @@
     <string name="location_sharing_status">正在分享：%1$s</string>
     <string name="shared_string_enabled">已啟用</string>
     <string name="saved_messages">已儲存的訊息</string>
+    <string name="time_zone_descr">選取要在您位置訊息中顯示的時區。</string>
+    <string name="time_zone">時區</string>
+    <string name="units_and_formats">單位與格式</string>
+    <string name="unit_of_length_descr">變更距離的測量方式。</string>
+    <string name="unit_of_length">長度單位</string>
+    <string name="unit_of_speed_system_descr">定義速度單位。</string>
+    <string name="unit_of_speed_system">速度單位</string>
+    <string name="buffer_time_descr">在緩衝中儲存點的最長時間</string>
+    <string name="buffer_time">緩衝過期時間</string>
 </resources>

OsmAnd-telegram/res/values/strings.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="shared_string_suggested">Suggested</string>
+    <string name="buffer_time_descr">Maximum time to store points in the buffer</string>
+    <string name="buffer_time">Buffer expiration time</string>
     <string name="time_zone_descr">Select time zone to show in your location messages.</string>
     <string name="time_zone">Time zone</string>
     <string name="units_and_formats">Units &amp; formats</string>

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

@@ -63,6 +63,11 @@ private const val MIN_LOCATION_DISTANCE_INDEX = 0
 private const val MIN_LOCATION_ACCURACY_INDEX = 0
 private const val MIN_LOCATION_SPEED_INDEX = 0
 
+private val BUFFER_TIME = listOf(60 * 60L, 2 * 60 * 60L, 4 * 60 * 60L, 8 * 60 * 60L,
+		12 * 60 * 60L, 24 * 60 * 60L)
+private const val BUFFER_TIME_INDEX = 0
+private const val BUFFER_TIME_KEY = "buffer_time"
+
 private const val SETTINGS_NAME = "osmand_telegram_settings"
 
 private const val SHARE_LOCATION_CHATS_KEY = "share_location_chats"
@@ -145,7 +150,8 @@ class TelegramSettings(private val app: TelegramApplication) {
 
 	var liveNowSortType = LiveNowSortType.SORT_BY_DISTANCE
 
-	val gpsAndLocPrefs = listOf(SendMyLocPref(), StaleLocPref(), LocHistoryPref(), ShareTypePref())
+	val gpsAndLocPrefs = listOf(SendMyLocPref(), StaleLocPref(), LocHistoryPref(), ShareTypePref(),
+			BufferTimePref())
 	val gpxLoggingPrefs = listOf(MinLocationDistance(), MinLocationAccuracy(), MinLocationSpeed())
 	val unitsAndFormatsPrefs = listOf(UnitsOfSpeed(), UnitsOfLength(), UtcOffset())
 
@@ -157,6 +163,8 @@ class TelegramSettings(private val app: TelegramApplication) {
 
 	var proxyEnabled = false
 
+	var bufferTime = BUFFER_TIME[BUFFER_TIME_INDEX]
+
 	init {
 		updatePrefs()
 		read()
@@ -636,6 +644,8 @@ class TelegramSettings(private val app: TelegramApplication) {
 
 		edit.putBoolean(PROXY_ENABLED, proxyEnabled)
 
+		edit.putLong(BUFFER_TIME_KEY, bufferTime)
+
 		val jArray = convertShareChatsInfoToJson()
 		if (jArray != null) {
 			edit.putString(SHARE_CHATS_INFO_KEY, jArray.toString())
@@ -729,6 +739,9 @@ class TelegramSettings(private val app: TelegramApplication) {
 		showGpsPoints = prefs.getBoolean(SHOW_GPS_POINTS, false)
 
 		proxyEnabled = prefs.getBoolean(PROXY_ENABLED, false)
+
+		bufferTime = prefs.getLong(BUFFER_TIME_KEY, BUFFER_TIME[BUFFER_TIME_INDEX])
+
 		try {
 			parseProxyPreferences(JSONObject(prefs.getString(PROXY_PREFERENCES_KEY, "")))
 		} catch (e: JSONException) {
@@ -1197,6 +1210,19 @@ class TelegramSettings(private val app: TelegramApplication) {
 		override fun getMenuItems() = formattedUtcOffsets
 	}
 
+	inner class BufferTimePref : ListPreference(R.drawable.ic_action_time_span, R.string.buffer_time,
+			R.string.buffer_time_descr) {
+		override fun getCurrentValue() = OsmandFormatter.getFormattedDuration(app, bufferTime)
+
+		override fun setCurrentValue(index: Int) {
+			bufferTime = BUFFER_TIME[index]
+		}
+
+		override fun getMenuItems(): List<String> {
+			return BUFFER_TIME.map { OsmandFormatter.getFormattedDuration(app, it) }
+		}
+	}
+
 	abstract inner class ListPreference(
 		@DrawableRes val iconId: Int,
 		@StringRes val titleId: Int,

OsmAnd-telegram/src/net/osmand/telegram/helpers/LocationMessages.kt

@@ -23,6 +23,8 @@ class LocationMessages(val app: TelegramApplication) {
 
 	private val dbHelper: SQLiteHelper
 
+	private var lastRemoveTime: Long? = null
+
 	init {
 		dbHelper = SQLiteHelper(app)
 		readBufferedMessages()
@@ -30,30 +32,37 @@ class LocationMessages(val app: TelegramApplication) {
 	}
 
 	fun getBufferedMessages(): List<BufferMessage> {
+		removeOldBufferedMessages()
 		return bufferedMessages.sortedBy { it.time }
 	}
 
 	fun getBufferedMessagesCount(): Int {
+		removeOldBufferedMessages()
 		return bufferedMessages.size
 	}
 
 	fun getBufferedMessagesCountForChat(chatId: Long, type: Int): Int {
+		removeOldBufferedMessages()
 		return bufferedMessages.count { it.chatId == chatId && it.type == type }
 	}
 
 	fun getBufferedMessagesCountForChat(chatId: Long): Int {
+		removeOldBufferedMessages()
 		return bufferedMessages.count { it.chatId == chatId}
 	}
 
 	fun getBufferedMessagesForChat(chatId: Long): List<BufferMessage> {
+		removeOldBufferedMessages()
 		return bufferedMessages.filter { it.chatId == chatId }.sortedBy { it.time }
 	}
 
 	fun getBufferedTextMessagesForChat(chatId: Long): List<BufferMessage> {
+		removeOldBufferedMessages()
 		return bufferedMessages.filter { it.chatId == chatId && it.type == TYPE_TEXT }.sortedBy { it.time }
 	}
 
 	fun getBufferedMapMessagesForChat(chatId: Long): List<BufferMessage> {
+		removeOldBufferedMessages()
 		return bufferedMessages.filter { it.chatId == chatId && it.type == TYPE_MAP }.sortedBy { it.time }
 	}
 
@@ -84,7 +93,7 @@ class LocationMessages(val app: TelegramApplication) {
 
 	fun addBufferedMessage(message: BufferMessage) {
 		log.debug("addBufferedMessage $message")
-		val messages = mutableListOf(*this.bufferedMessages.toTypedArray())
+		val messages = this.bufferedMessages.toMutableList()
 		messages.add(message)
 		this.bufferedMessages = messages
 		dbHelper.addBufferedMessage(message)
@@ -134,14 +143,38 @@ class LocationMessages(val app: TelegramApplication) {
 
 	fun removeBufferedMessage(message: BufferMessage) {
 		log.debug("removeBufferedMessage $message")
-		val messages = mutableListOf(*this.bufferedMessages.toTypedArray())
+		val messages = this.bufferedMessages.toMutableList()
 		messages.remove(message)
 		this.bufferedMessages = messages
 		dbHelper.removeBufferedMessage(message)
 	}
 
+	private fun removeOldBufferedMessages() {
+		val currentTime = System.currentTimeMillis()
+		if (this.bufferedMessages.isNotEmpty() && isTimeToDelete(currentTime)) {
+			val bufferExpirationTime = app.settings.bufferTime * 1000
+			val messages = this.bufferedMessages.toMutableList()
+			val expiredList = messages.filter {
+				currentTime - it.time > bufferExpirationTime
+			}
+			expiredList.forEach { message ->
+				dbHelper.removeBufferedMessage(message)
+			}
+			messages.removeAll(expiredList)
+			this.bufferedMessages = messages.toList()
+			lastRemoveTime = currentTime
+		}
+	}
+
+	private fun isTimeToDelete(currentTime: Long) = if (lastRemoveTime != null) {
+		currentTime - lastRemoveTime!! > 60000L
+	} else {
+		true
+	}
+
 	private fun readBufferedMessages() {
 		this.bufferedMessages = dbHelper.getBufferedMessages()
+		removeOldBufferedMessages()
 	}
 
 	private fun readLastMessages() {

OsmAnd/AndroidManifest-freehuawei.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools">
+
+	<application>
+		<activity android:name="com.huawei.android.sdk.drm.DrmDialogActivity"
+			android:configChanges="screenSize|orientation|keyboardHidden"
+			android:exported="false"
+			android:theme="@android:style/Theme.Translucent">
+			<meta-data
+				android:name="hwc-theme"
+				android:value="androidhwext:style/Theme.Emui.Translucent" />
+		</activity>
+
+		<provider
+			android:name="android.support.v4.content.FileProvider"
+			android:authorities="net.osmand.huawei.fileprovider"
+			tools:replace="android:authorities" />
+		<service
+			android:name="net.osmand.plus.NavigationService"
+			android:process="net.osmand.huawei"
+			tools:replace="android:process" />
+	</application>
+
+</manifest>

OsmAnd/assets/bundled_assets.xml

@@ -48,6 +48,7 @@
 	<asset source="voice/uk/uk_tts.js" destination="voice/uk-tts/uk_tts.js" mode="overwriteOnlyIfExists" />
 	<asset source="voice/zh/zh_tts.js" destination="voice/zh-tts/zh_tts.js" mode="alwaysOverwriteOrCopy" />
 	<asset source="voice/zh-hk/zh-hk_tts.js" destination="voice/zh-hk-tts/zh-hk_tts.js" mode="overwriteOnlyIfExists" />
+	<asset source="voice/zh-tw/zh-tw_tts.js" destination="voice/zh-tw-tts/zh-tw_tts.js" mode="overwriteOnlyIfExists" />
 
 	<asset source="fonts/05_NotoSans-Regular.ttf" destination="fonts/05_NotoSans-Regular.ttf" mode="alwaysOverwriteOrCopy" />
 	<asset source="fonts/10_NotoSans-Bold.ttf" destination="fonts/10_NotoSans-Bold.ttf" mode="alwaysOverwriteOrCopy" />

OsmAnd/build.gradle

@@ -116,6 +116,9 @@ android {
 		huawei {
 			manifest.srcFile "AndroidManifest-huawei.xml"
 		}
+		freehuawei {
+			manifest.srcFile "AndroidManifest-freehuawei.xml"
+		}
 
 		legacy {
 			jniLibs.srcDirs = ["libc++"]
@@ -189,6 +192,10 @@ android {
 			dimension "version"
 			applicationId "net.osmand.plus.huawei"
 		}
+		freehuawei {
+			dimension "version"
+			applicationId "net.osmand.huawei"
+		}
 
 		// CoreVersion
 		legacy {
@@ -493,4 +500,5 @@ dependencies {
 	}
 
 	huaweiImplementation files('libs/huawei-android-drm_v2.5.2.300.jar')
+	freehuaweiImplementation files('libs/huawei-android-drm_v2.5.2.300.jar')
 }

OsmAnd/libs/.gitignore

@@ -2,4 +2,5 @@ armeabi/
 x86/
 armeabi-v7a/
 mips/
-arm64-v8a/
+arm64-v8a/
+x86_64/

OsmAnd/res/drawable/circle_contour_bg_dark.xml

@@ -1,13 +1,7 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
-	<item
+	android:shape="oval">
-		android:bottom="1dp"
+	<solid android:color="@android:color/transparent" />
-		android:left="1dp"
+	<stroke
-		android:right="1dp"
+		android:width="1dp"
-		android:top="1dp">
+		android:color="@color/divider_color_dark" />
-		<shape android:shape="oval">
+</shape>
-			<stroke
-				android:width="1dp"
-				android:color="@color/divider_color_dark" />
-		</shape>
-	</item>
-</layer-list>

OsmAnd/res/drawable/circle_contour_bg_light.xml

@@ -1,13 +1,7 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
-	<item
+	android:shape="oval">
-		android:bottom="1dp"
+	<solid android:color="@android:color/transparent" />
-		android:left="1dp"
+	<stroke
-		android:right="1dp"
+		android:width="1dp"
-		android:top="1dp">
+		android:color="@color/divider_color_light" />
-		<shape android:shape="oval">
+</shape>
-			<stroke
-				android:width="1dp"
-				android:color="@color/divider_color_light" />
-		</shape>
-	</item>
-</layer-list>

OsmAnd/res/layout/animate_route.xml

@@ -10,6 +10,7 @@
 		android:layout_marginLeft="24dp"
 		android:layout_marginTop="16dp"
 		android:layout_marginRight="16dp"
+		android:textColor="?android:attr/textColorSecondary"
 		android:layout_marginBottom="8dp"
 		android:text="@string/animate_routing_gpx" />
 
@@ -25,6 +26,7 @@
 			android:layout_marginLeft="24dp"
 			android:layout_marginTop="5dp"
 			android:layout_marginRight="16dp"
+			android:textColor="?android:attr/textColorSecondary"
 			android:gravity="left"
 			android:text="@string/select_animate_speedup" />
 
@@ -47,6 +49,7 @@
 				android:id="@+id/MinSpeedup"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
+				android:textColor="?android:attr/textColorSecondary"
 				android:layout_weight="0.5"
 				android:gravity="left"
 				android:text="10" />
@@ -55,6 +58,7 @@
 				android:id="@+id/MaxSpeedup"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
+				android:textColor="?android:attr/textColorSecondary"
 				android:layout_weight="0.5"
 				android:gravity="right"
 				android:text="15" />

OsmAnd/res/layout/bottom_buttons.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/buttons_container"
+	android:layout_width="match_parent"
+	android:layout_height="@dimen/dialog_button_ex_height"
+	android:gravity="center"
+	android:layout_gravity="bottom"
+	android:orientation="horizontal"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding">
+
+	<include
+		android:id="@+id/dismiss_button"
+		layout="@layout/bottom_sheet_dialog_button" />
+
+	<View
+		android:id="@+id/buttons_divider"
+		android:layout_width="@dimen/content_padding"
+		android:layout_height="match_parent"
+		android:visibility="gone"
+		tools:visibility="visible" />
+
+	<include
+		android:id="@+id/right_bottom_button"
+		layout="@layout/bottom_sheet_dialog_button"
+		android:visibility="gone"
+		tools:visibility="visible" />
+
+</LinearLayout>

OsmAnd/res/layout/bottom_sheet_item_pref_info.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<net.osmand.plus.widgets.TextViewEx xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/description"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:letterSpacing="@dimen/text_button_letter_spacing"
+	android:minHeight="@dimen/bottom_sheet_list_item_height"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingTop="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding"
+	android:paddingBottom="@dimen/content_padding"
+	android:textColor="?android:textColorPrimary"
+	android:textSize="@dimen/default_list_text_size"
+	app:typeface="@string/font_roboto_regular"
+	tools:text="@string/reset_all_profile_settings_descr" />

OsmAnd/res/layout/bottom_sheet_item_with_descr_and_radio_btn.xml

@@ -56,7 +56,7 @@
 
 		</LinearLayout>
 
-		<RadioButton
+		<android.support.v7.widget.AppCompatRadioButton
 			android:id="@+id/compound_button"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"

OsmAnd/res/layout/bottom_sheet_menu_base.xml

@@ -26,32 +26,6 @@
 		android:orientation="vertical"
 		android:visibility="gone" />
 
-	<LinearLayout
+	<include layout="@layout/bottom_buttons" />
-		android:id="@+id/buttons_container"
-		android:layout_width="match_parent"
-		android:layout_height="@dimen/dialog_button_ex_height"
-		android:gravity="center"
-		android:orientation="horizontal"
-		android:paddingLeft="@dimen/content_padding"
-		android:paddingRight="@dimen/content_padding">
-
-		<include
-			android:id="@+id/dismiss_button"
-			layout="@layout/bottom_sheet_dialog_button" />
-
-		<View
-			android:id="@+id/buttons_divider"
-			android:layout_width="@dimen/content_padding"
-			android:layout_height="match_parent"
-			android:visibility="gone"
-			tools:visibility="visible" />
-
-		<include
-			android:id="@+id/right_bottom_button"
-			layout="@layout/bottom_sheet_dialog_button"
-			android:visibility="gone"
-			tools:visibility="visible" />
-
-	</LinearLayout>
 
 </LinearLayout>

OsmAnd/res/layout/dialog_list_item_with_compound_button.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_height="wrap_content"
+	android:layout_width="match_parent"
+	android:orientation="vertical">
+
+	<View
+		android:background="?attr/dashboard_divider"
+		android:id="@+id/topDivider"
+		android:layout_height="1dp"
+		android:layout_width="wrap_content"
+		android:visibility="gone"/>
+	
+	<LinearLayout
+		android:id="@+id/button"
+		android:layout_width="match_parent"
+		android:layout_height="?android:attr/listPreferredItemHeightSmall"
+		android:background="?attr/selectableItemBackground"
+		android:orientation="horizontal">
+		
+		<FrameLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="@dimen/context_menu_padding_margin_large"
+			android:layout_marginRight="@dimen/context_menu_padding_margin_large">
+			
+			<android.support.v7.widget.AppCompatRadioButton
+				android:id="@+id/radio"
+				android:checkMark="?android:attr/listChoiceIndicatorSingle"
+				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:clickable="false"
+				android:focusable="false"
+				android:visibility="gone"
+				android:layout_gravity="center"/>
+
+			<android.support.v7.widget.AppCompatCheckBox
+				android:id="@+id/checkbox"
+				android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+				android:layout_height="wrap_content"
+				android:layout_width="wrap_content"
+				android:clickable="false"
+				android:focusable="false"
+				android:visibility="gone"
+				android:layout_gravity="center"/>
+			
+		</FrameLayout>
+		
+		<TextView
+			android:id="@+id/text"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_gravity="center_vertical|start"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="@dimen/default_list_text_size_large"
+			android:text="Item title"/>
+		
+	</LinearLayout>
+
+	<View
+		android:background="?attr/dashboard_divider"
+		android:id="@+id/bottomDivider"
+		android:layout_height="1dp"
+		android:layout_marginTop="@dimen/list_header_padding"
+		android:layout_width="wrap_content"
+		android:visibility="gone"/>
+
+</LinearLayout>
+

OsmAnd/res/layout/edit_profiles_list_fragment.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/activity_background_color"
+	android:orientation="vertical">
+
+	<android.support.design.widget.AppBarLayout
+		android:id="@+id/appbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<include layout="@layout/global_preference_toolbar" />
+
+	</android.support.design.widget.AppBarLayout>
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent">
+
+		<android.support.v7.widget.RecyclerView
+			android:id="@+id/profiles_list"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:background="?attr/list_background_color"
+			android:clipToPadding="false"
+			android:paddingBottom="72dp"
+			android:paddingTop="16dp"/>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="bottom"
+			android:orientation="vertical">
+
+			<ImageView
+				android:id="@+id/buttons_shadow"
+				android:layout_width="match_parent"
+				android:layout_height="10dp"
+				android:background="@drawable/bg_contextmenu_shadow_top_light" />
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="?attr/list_background_color">
+
+				<include
+					layout="@layout/bottom_buttons"
+					android:layout_width="match_parent"
+					android:layout_height="@dimen/dialog_button_ex_height" />
+
+			</LinearLayout>
+
+		</LinearLayout>
+
+	</FrameLayout>
+
+</LinearLayout>

OsmAnd/res/layout/editing_tile_source.xml

@@ -6,46 +6,57 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
+        android:paddingLeft="@dimen/context_menu_padding_margin_large"
+        android:paddingRight="@dimen/context_menu_padding_margin_large"
+	    android:paddingTop="@dimen/context_menu_padding_margin_large"
+	    android:paddingBottom="@dimen/context_menu_padding_margin_large"
         android:orientation="vertical">
 
         <TextView
+	        android:textColor="?android:textColorSecondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/shared_string_name"/>
 
         <EditText
             android:id="@+id/Name"
+	        android:textColor="?android:textColorPrimary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
+            android:layout_marginLeft="@dimen/text_margin_small"
-            android:layout_marginRight="5dp"
+            android:layout_marginRight="@dimen/text_margin_small"
             android:text="">
 
             <requestFocus/>
         </EditText>
 
         <TextView
+	        android:textColor="?android:textColorSecondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:scrollHorizontally="true"
+	        android:layout_marginTop="@dimen/content_padding_half"
             android:text="@string/edit_tilesource_choose_existing"/>
 
         <Spinner
             android:id="@+id/TileSourceSpinner"
+	        android:textColor="?android:textColorPrimary"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
+            android:layout_marginLeft="@dimen/text_margin_small"
-            android:layout_marginRight="5dp"/>
+            android:layout_marginRight="@dimen/text_margin_small"/>
 
         <TextView
+	        android:textColor="?android:textColorSecondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+	        android:layout_marginTop="@dimen/content_padding_half"
             android:text="@string/edit_tilesource_url_to_load"/>
 
         <EditText
             android:id="@+id/URLToLoad"
+	        android:textColor="?android:textColorPrimary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:lines="5"
@@ -53,43 +64,52 @@
             android:text=""/>
 
         <TextView
+	        android:layout_marginTop="@dimen/content_padding_half"
+	        android:textColor="?android:textColorSecondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/edit_tilesource_minzoom"/>
 
         <EditText
             android:id="@+id/MinZoom"
+	        android:textColor="?android:textColorPrimary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text=""/>
 
         <TextView
+	        android:layout_marginTop="@dimen/content_padding_half"
+	        android:textColor="?android:textColorSecondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/edit_tilesource_maxzoom"/>
 
         <EditText
             android:id="@+id/MaxZoom"
+	        android:textColor="?android:textColorPrimary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text=""/>
 
         <TextView
+	        android:layout_marginTop="@dimen/content_padding_half"
+	        android:textColor="?android:textColorSecondary"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:text="@string/edit_tilesource_expiration_time"/>
 
         <EditText
             android:id="@+id/ExpirationTime"
+	        android:textColor="?android:textColorPrimary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text=""/>
 
-        <CheckBox
+        <android.support.v7.widget.AppCompatCheckBox
             android:id="@+id/EllipticMercator"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="5dp"
+	        android:layout_marginTop="@dimen/content_padding_half"
             android:text="@string/edit_tilesource_elliptic_tile"/>
     </LinearLayout>
 

OsmAnd/res/layout/fragment_selected_profile.xml

@@ -239,7 +239,7 @@
 						android:tint="@color/settings_divider"/>
 
 					<net.osmand.plus.widgets.OsmandTextFieldBoxes
-						android:id="@+id/navigation_type_otfb"
+						android:id="@+id/master_profile_otfb"
 						android:layout_width="match_parent"
 						android:layout_height="60dp"
 						app:primaryColor="@color/active_color_primary_dark"
@@ -247,7 +247,7 @@
 						app:labelText="@string/nav_type_hint">
 
 						<studio.carbonylgroup.textfieldboxes.ExtendedEditText
-							android:id="@+id/navigation_type_et"
+							android:id="@+id/master_profile_et"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
 							android:focusable="false"

OsmAnd/res/layout/preference_circle_item.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:padding="6dp">
+
+	<ImageView
+		android:id="@+id/outlineCircle"
+		android:layout_width="56dp"
+		android:layout_height="56dp"
+		app:srcCompat="@drawable/circle_contour_bg_light" />
+
+	<ImageView
+		android:id="@+id/backgroundCircle"
+		android:layout_width="48dp"
+		android:layout_height="48dp"
+		android:layout_margin="4dp"
+		android:background="@drawable/circle_background_light" />
+
+	<ImageView
+		android:id="@+id/checkMark"
+		android:layout_width="24dp"
+		android:layout_height="24dp"
+		android:layout_marginLeft="16dp"
+		android:layout_marginTop="16dp"
+		android:layout_marginRight="4dp"
+		android:layout_marginBottom="4dp"
+		android:clickable="false"
+		app:srcCompat="@drawable/ic_action_done"
+		android:layout_marginStart="16dp"
+		android:layout_marginEnd="4dp" />
+
+</FrameLayout>

OsmAnd/res/layout/preference_color_select.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content">
+
+	<net.osmand.plus.widgets.FlowLayout
+		android:id="@+id/color_items"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="10dp" />
+</LinearLayout>

OsmAnd/res/layout/preference_dropdown_list.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/list_content_padding"
+		android:layout_marginLeft="@dimen/list_content_padding"
+		android:layout_marginTop="@dimen/list_header_top_margin"
+		android:layout_marginEnd="@dimen/list_content_padding"
+		android:layout_marginRight="@dimen/list_content_padding"
+		android:layout_marginBottom="8dp">
+
+		<ImageView
+			android:id="@+id/type_down_arrow"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical|right"
+			android:paddingRight="@dimen/content_padding"
+			android:src="@drawable/ic_action_arrow_drop_down"
+			android:tint="@color/settings_divider" />
+
+		<net.osmand.plus.widgets.OsmandTextFieldBoxes
+			android:id="@+id/master_profile_otfb"
+			android:layout_width="match_parent"
+			android:layout_height="60dp"
+			app:labelText="@string/master_profile"
+			app:primaryColor="@color/active_color_primary_dark"
+			app:secondaryColor="?android:textColorSecondary">
+
+			<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+				android:id="@+id/master_profile_et"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:focusable="false"
+				android:maxLines="1"
+				tools:text="Car" />
+
+		</net.osmand.plus.widgets.OsmandTextFieldBoxes>
+
+		<FrameLayout
+			android:id="@+id/select_nav_type_btn"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:clickable="true"
+			android:focusable="true" />
+
+	</FrameLayout>
+
+</LinearLayout>

OsmAnd/res/layout/preference_profile_item_with_radio_btn.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:minHeight="@dimen/bottom_sheet_large_list_item_height"
+	android:orientation="horizontal">
+
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginTop="@dimen/bottom_sheet_icon_margin"
+		android:layout_marginRight="@dimen/content_padding"
+		android:layout_marginBottom="@dimen/bottom_sheet_icon_margin"
+		tools:src="@drawable/ic_action_coordinates_latitude"
+		tools:tint="?attr/default_icon_color" />
+
+	<LinearLayout
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_weight="1"
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@+id/title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:maxLines="2"
+			android:textAppearance="@style/TextAppearance.ListItemTitle"
+			android:textColor="?android:textColorPrimary"
+			tools:text="Item Title" />
+
+		<TextView
+			android:id="@+id/description"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:maxLines="1"
+			android:textColor="?android:textColorSecondary"
+			tools:text="Item additional desription" />
+
+	</LinearLayout>
+
+	<android.support.v7.widget.AppCompatRadioButton
+		android:id="@+id/compound_button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:background="@null"
+		android:clickable="false"
+		android:focusable="false"
+		android:saveEnabled="false" />
+
+</LinearLayout>

OsmAnd/res/layout/preference_text_field.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:gravity="center_vertical"
+	android:orientation="horizontal">
+
+	<net.osmand.plus.widgets.OsmandTextFieldBoxes
+		android:id="@+id/profile_name_otfb"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:layout_margin="@dimen/list_content_padding"
+		app:primaryColor="@color/active_color_primary_dark"
+		app:secondaryColor="?android:textColorSecondary"
+		app:labelText="@string/profile_name_hint">
+
+		<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+			android:id="@+id/profile_name_et"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:inputType="textMultiLine"
+			android:scrollHorizontally="false"
+			android:maxLines="4"
+			tools:text="@string/lorem_ipsum" />
+
+	</net.osmand.plus.widgets.OsmandTextFieldBoxes>
+</LinearLayout>

OsmAnd/res/layout/preferences_screen.xml

@@ -10,7 +10,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content" />
 
-	<LinearLayout
+	<FrameLayout
 		android:id="@android:id/list_container"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"

OsmAnd/res/layout/profile_edit_list_item.xml

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/list_background_color"
+	android:gravity="center_vertical">
+
+	<LinearLayout
+		android:id="@+id/selectable_list_item"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		tools:background="?android:attr/selectableItemBackground">
+
+		<ImageButton
+			android:id="@+id/action_icon"
+			style="@style/Widget.AppCompat.ActionButton"
+			android:layout_width="@dimen/standard_icon_size"
+			android:layout_height="@dimen/standard_icon_size"
+			android:layout_gravity="center"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginTop="@dimen/bottom_sheet_icon_margin"
+			android:layout_marginRight="@dimen/content_padding"
+			android:layout_marginBottom="@dimen/bottom_sheet_icon_margin"
+			tools:src="@drawable/ic_action_remove"
+			tools:tint="@color/icon_color_default_light" />
+
+		<ImageView
+			android:id="@+id/icon"
+			android:layout_width="@dimen/standard_icon_size"
+			android:layout_height="@dimen/standard_icon_size"
+			android:layout_gravity="center"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:layout_marginTop="@dimen/bottom_sheet_icon_margin"
+			android:layout_marginRight="@dimen/content_padding"
+			android:layout_marginBottom="@dimen/bottom_sheet_icon_margin"
+			tools:src="@drawable/ic_action_car_dark"
+			tools:tint="@color/profile_icon_color_blue_light_default" />
+
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_weight="1"
+			android:orientation="vertical"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding">
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/title"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:ellipsize="marquee"
+				android:fadingEdge="horizontal"
+				android:singleLine="true"
+				android:textColor="?android:textColorPrimary"
+				android:textSize="@dimen/default_list_text_size"
+				osmand:typeface="@string/font_roboto_regular"
+				tools:text="@string/app_mode_car" />
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/description"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:letterSpacing="@dimen/description_letter_spacing"
+				android:maxLines="4"
+				android:textColor="?android:textColorSecondary"
+				android:textSize="@dimen/default_desc_text_size"
+				osmand:typeface="@string/font_roboto_regular"
+				tools:text="@string/base_profile_descr_car" />
+
+		</LinearLayout>
+
+		<ImageView
+			android:id="@+id/move_icon"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingTop="@dimen/bottom_sheet_icon_margin"
+			android:paddingRight="@dimen/content_padding"
+			android:paddingBottom="@dimen/bottom_sheet_icon_margin"
+			android:src="@drawable/ic_action_item_move"
+			android:tint="?attr/secondary_icon_color" />
+
+	</LinearLayout>
+
+</LinearLayout>

OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml

@@ -30,18 +30,38 @@
 				android:src="@drawable/ic_action_mode_back"
 				android:tint="?attr/default_icon_color" />
 
-			<net.osmand.plus.widgets.TextViewEx
+			<LinearLayout
-				android:id="@+id/toolbar_title"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical"
 				android:layout_weight="1"
-				android:letterSpacing="@dimen/text_button_letter_spacing"
+				android:background="?attr/card_and_list_background_basic"
-				android:paddingLeft="@dimen/content_padding"
+				android:orientation="vertical">
-				android:paddingRight="@dimen/content_padding"
+
-				android:textColor="?android:textColorPrimary"
+				<net.osmand.plus.widgets.TextViewEx
-				android:textSize="@dimen/dialog_header_text_size"
+					android:id="@+id/toolbar_title"
-				osmand:typeface="@string/font_roboto_medium"
+					android:layout_width="wrap_content"
-				tools:text="@string/routing_settings_2" />
+					android:layout_height="wrap_content"
+					android:letterSpacing="@dimen/text_button_letter_spacing"
+					android:paddingLeft="@dimen/content_padding"
+					android:paddingRight="@dimen/content_padding"
+					android:textColor="?android:textColorPrimary"
+					android:textSize="@dimen/dialog_header_text_size"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="@string/routing_settings_2" />
+
+				<TextView
+					android:id="@+id/toolbar_subtitle"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:ellipsize="end"
+					android:maxLines="2"
+					android:paddingLeft="@dimen/content_padding"
+					android:paddingRight="@dimen/content_padding"
+					android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+					android:visibility="gone"
+					tools:text="Some description" />
+			</LinearLayout>
 
 			<include
 				layout="@layout/profile_button_small"

OsmAnd/res/layout/simple_category_item.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:minHeight="@dimen/wikivoyage_search_list_header_height"
+	android:orientation="vertical"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding">
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/title"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:letterSpacing="@dimen/description_letter_spacing"
+		android:paddingTop="@dimen/list_header_settings_top_margin"
+		android:singleLine="true"
+		android:textColor="?android:textColorPrimary"
+		android:textSize="@dimen/default_desc_text_size"
+		osmand:typeface="@string/font_roboto_medium"
+		tools:text="@string/plugin_settings" />
+
+</LinearLayout>

OsmAnd/res/values-b+ast/strings.xml

@@ -696,8 +696,8 @@
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s/mes</string>
     <string name="osm_live_payment_current_subscription">La soscripción actual</string>
     <string name="default_price_currency_format">%1$.2f %2$s</string>
-    <string name="osm_live_payment_header">Esbilla\'l periodu de pagu más afayadizu pa ti:</string>
+    <string name="osm_live_payment_header">Intervalu de pagu:</string>
-    <string name="osm_live_payment_contribute_descr">Parte de los ingresos van pa los collaboradores d\'OpenStreetMap.</string>
+    <string name="osm_live_payment_contribute_descr">Les donaciones ayuden a financiar la cartografía d\'OpenStreetMap</string>
     <string name="markers_remove_dialog_msg">¿Desaniciar el marcador «%s» del mapa\?</string>
     <string name="third_party_application">Aplicación de terceros</string>
     <string name="error_notification_desc">Unvia una captura d\'esti avisu a support@osmand.net, por favor</string>
@@ -1394,4 +1394,6 @@
     <string name="configure_profile_info">Tolos axustes qu\'apaecen darréu afeuten únicamente al perfil escoyíu.</string>
     <string name="shared_string_example">Exemplu</string>
     <string name="wake_time">Hora d\'activamientu</string>
+    <string name="descendingly">Z-A</string>
+    <string name="ascendingly">A-Z</string>
 </resources>

OsmAnd/res/values-ca/strings.xml

@@ -176,9 +176,7 @@
     <string name="user_name">El vostre nom d\'usuari d\'OSM</string>
     <string name="user_password">La vostra contrasenya a OSM</string>
     <string name="download_files_not_enough_space">No hi ha prou espai lliure per baixar %1$s MB (lliure: %2$s).</string>
-    <string name="download_files_question_space">"Voleu baixar {0} fitxer(s)?  
+    <string name="download_files_question_space">"Voleu baixar {0} fitxer(s)\? S\'ocuparà  {1} MB (de {2} MB)."</string>
-S\'ocuparà una memòria de {1} MB
-(La memòria disponible es de{2} MB)"</string>
     <string name="use_transparent_map_theme">Tema transparent</string>
     <string name="osmand_parking_event">Traieu el cotxe de l\'aparcament</string>
     <string name="rendering_attr_appMode_description">Optimitza el mapa per</string>
@@ -287,7 +285,7 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
     <string name="system_locale">Sistema</string>
     <string name="shared_string_next">Endavant</string>
     <string name="shared_string_previous">Enrere</string>
-    <string name="unit_of_length_descr">Canvia com es mesura la distància.</string>
+    <string name="unit_of_length_descr">Canvieu en què es mesuren les distàncies.</string>
     <string name="unit_of_length">Unitats de longitud</string>
     <string name="si_mi_feet">Milles/peu</string>
     <string name="si_mi_yard">Milles/iardes</string>
@@ -1900,10 +1898,8 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="osm_live_enter_user_name">Introduïu un nom públic</string>
     <string name="osm_live_subscription_settings">Configuració de la subscripció</string>
     <string name="upload_anonymously">Puja anònimament</string>
-    <string name="download_files_error_not_enough_space">No hi ha prou espai! 
+    <string name="download_files_error_not_enough_space">No hi ha prou espai! Calen {3} MB temporalment i {1} MB de permanents. (Només es disposa de {2} MB).</string>
-Cal una memòria de {3} MB temporals i {1} MB permanents. 
+    <string name="download_files_question_space_with_temp">Voleu baixar {0} fitxer(s)\? S\'utilitzen {3} MB temporalment i {1} MB permanentment. (De {2} MB).</string>
-L\'espai disponible és només de {2} MB.</string>
-    <string name="download_files_question_space_with_temp">Voleu baixar {0} fitxer(s)? L\'ocupació temporal de memòria serà de {3} MB i la permanent {1} MB. (Disposeu de {2} MB)</string>
     <string name="shared_string_move_up">Puja ↑</string>
     <string name="shared_string_move_down">Baixa ↓</string>
     <string name="avoid_road">Evita la via</string>
@@ -2037,7 +2033,7 @@ L\'espai disponible és només de {2} MB.</string>
     <string name="no_update_info_desc">No comprovis noves versions ni ofertes relatives a OsmAnd.</string>
     <string name="no_update_info">No mostris noves versions</string>
     <string name="skip_map_downloading">Omet els mapes en procés de baixada</string>
-    <string name="skip_map_downloading_desc">"No disposeu de cap mapa local. Podeu triar un mapa de la llista o baixar mapes més tard via \'Menú -  %1$s\'."</string>
+    <string name="skip_map_downloading_desc">No disposeu de cap mapa local. Podeu triar un mapa de la llista o baixar mapes més tard via «Menú - %1$s».</string>
     <string name="search_another_country">Selecciona un altre país</string>
     <string name="first_usage_greeting">Obteniu indicacions i descobriu llocs nous sense connexió a Internet</string>
     <string name="si_mi_meters">Milles/metres</string>
@@ -2086,7 +2082,7 @@ L\'espai disponible és només de {2} MB.</string>
     <string name="shared_string_record">Enregistra</string>
     <string name="gpx_logging_no_data">No hi ha dades</string>
     <string name="shared_string_notifications">Notificacions</string>
-    <string name="trip_rec_notification_settings">Habilita l\'enregistrament d\'inici ràpid</string>
+    <string name="trip_rec_notification_settings">Activa l\'enregistrament ràpid</string>
     <string name="trip_rec_notification_settings_desc">Mostra una notificació de sistema que es permet l\'enregistrament de la ruta.</string>
     <string name="gpx_no_tracks_title">No teniu encara cap fitxer GPX</string>
     <string name="gpx_no_tracks_title_folder">També podeu afegir fitxers GPX a la carpeta</string>
@@ -2096,13 +2092,13 @@ L\'espai disponible és només de {2} MB.</string>
     <string name="route_calculation">Càlcul de ruta</string>
     <string name="upload_poi">Puja PDI</string>
     <string name="route_roundabout_short">Agafeu la %1$d sortida i continueu</string>
-    <string name="search_map_hint">Cerca de ciutat o regió</string>
+    <string name="search_map_hint">Ciutat o regió</string>
     <string name="wiki_around">Articles de la zona a la Viquipèdia</string>
     <string name="legacy_search">Cerca de llegat</string>
     <string name="show_legacy_search">Mostra la cerca de llegat</string>
     <string name="show_legacy_search_desc">Afegeix la cerca de llegat en la llista desplegable.</string>
-    <string name="routing_attr_allow_motorway_name">Permet les autopistes</string>
+    <string name="routing_attr_allow_motorway_name">Utilitza les autopistes</string>
-    <string name="routing_attr_allow_motorway_description">Permet les autopistes.</string>
+    <string name="routing_attr_allow_motorway_description">Permet les autopistes</string>
     <string name="lang_sr_latn">Serbi (llatí)</string>
     <string name="lang_zh_hk">Xinès (Hong Kong)</string>
     <string name="rendering_attr_contourWidth_description">Gruix de la corba de nivell</string>
@@ -2213,7 +2209,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="routing_attr_driving_style_name">Estil de conducció</string>
     <string name="shared_string_gpx_tracks">Pistes</string>
     <string name="select_gpx_folder">Seleccioneu la carpeta fitxers GPX</string>
-    <string name="file_can_not_be_moved">El fitxer no es pot moure.</string>
+    <string name="file_can_not_be_moved">No s\'ha pogut moure l\'arxiu.</string>
     <string name="shared_string_move">Mou</string>
     <string name="shared_string_time_moving">Temps en moviment</string>
     <string name="shared_string_time_span">Lapse temporal</string>
@@ -2225,7 +2221,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="average_speed">Velocitat mitjana</string>
     <string name="shared_string_gpx_track">Pista</string>
     <string name="points_delete_multiple_succesful">El(s) punt(s) s\'ha(n) esborrat.</string>
-    <string name="points_delete_multiple">Esteu eliminant %1$d punt(s). Ho confirmeu?</string>
+    <string name="points_delete_multiple">Voleu eliminar %1$d punt(s)\?</string>
     <string name="route_points_category_name">Canvis de direcció a la ruta</string>
     <string name="track_points_category_name">Fites, punts d\'interès, elements famosos</string>
     <string name="add_new_folder">Afegeix a una carpeta nova</string>
@@ -2245,7 +2241,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="do_not_show_startup_messages">No mostris missatges inicials</string>
     <string name="do_not_show_startup_messages_desc">No mostris descomptes de l\'aplicació ni missatges d\'esdeveniments locals destacats.</string>
     <string name="parking_options">Opcions d\'aparcament</string>
-    <string name="right_side_navigation">Conducció per la dreta</string>
+    <string name="right_side_navigation">Trànsit per la dreta</string>
     <string name="driving_region_automatic">Automàtic</string>
     <string name="osmand_extended_description_part1">OsmAnd (OSM Automated Navigation Directions) és una aplicació de navegació i de consulta de mapes que accedeix a les dades obertes de tot el món i d\'alta-qualitat d\'OpenStreetMap (OSM). 
 \n
@@ -2326,12 +2322,12 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="quick_action_auto_zoom_desc">Prement aquest botó d\'acció commuteu l\'escala automàtica del mapa segons la vostra velocitat.</string>
     <string name="quick_action_auto_zoom_on">Activa l\'escala automàtica del mapa</string>
     <string name="quick_action_auto_zoom_off">Desactiva l\'escala automàtica del mapa</string>
-    <string name="quick_action_add_destination">Afegeix destinació</string>
+    <string name="quick_action_add_destination">Establiu destinació</string>
     <string name="quick_action_replace_destination">Substitueix destinació</string>
     <string name="quick_action_add_first_intermediate">Afegeix primer intermedi</string>
-    <string name="quick_action_add_destination_desc">Prement aquest botó d\'acció convertiu el punt central de la pantalla en el nou destí i qualsevol destinació anterior esdevé la darrera destinació intermèdia.</string>
+    <string name="quick_action_add_destination_desc">Un botó per establir el punt central de la pantalla com la nova destinació i qualsevol destinació anterior esdevé la darrera destinació intermèdia.</string>
     <string name="quick_action_replace_destination_desc">Prement aquest botó d\'acció agafeu el punt central de la pantalla com el nou destí, substituint la destinació anterior (si n\'hi ha).</string>
-    <string name="quick_action_add_first_intermediate_desc">Prement aquest botó d\'acció afegiu el punt central de la pantalla com primera destinació intermèdia.</string>
+    <string name="quick_action_add_first_intermediate_desc">Un botó per fer del punt central de la pantalla la primera fita.</string>
     <string name="depth_contour_descr">Isòbates i fondàries nàutiques puntuals.</string>
     <string name="shared_string_paused">En pausa</string>
     <string name="osmand_extended_description_part3">Mapa
@@ -2355,11 +2351,11 @@ Abasta l\'àrea: %1$s x %2$s</string>
 \nOsmAnd + és la versió de pagament de l\'aplicació. En comprar-la, recolzareu el projecte, finançant el desenvolupament de noves característiques i rebreu les darreres actualitzacions. 
 \n
 \nCaracterístiques principals:</string>
-    <string name="type_city_town">Introduïu el poble o ciutat</string>
+    <string name="type_city_town">Introduïu ciutat/població/localitat</string>
     <string name="type_postcode">Introduïu el codi postal</string>
     <string name="nearest_cities">Ciutats més properes</string>
     <string name="select_city">Selecciona el municipi</string>
-    <string name="select_postcode">Selecciona el codi postal</string>
+    <string name="select_postcode">Cerca pel codi postal</string>
     <string name="osmand_plus_extended_description_part3">Consulta del mapa
 \n• Mostra la vostra posició i orientació
 \n• Té l\'opció d\'orientar la imatge segons la vostra pròpia orientació o en la direcció en que us moveu
@@ -2803,8 +2799,9 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="coord_input_save_as_track_descr">Heu afegit %1$s punts. Introduïu un nom de fitxer i premeu \"Desa\".</string>
     <string name="point_deleted">El punt %1$s s\'ha esborrat</string>
     <string name="shared_string_world">Mundial</string>
-    <string name="send_search_query_description">Enviarem la vostra consulta de cerca: \"%1$s\", així com la vostra ubicació.\n
+    <string name="send_search_query_description">Enviarem la vostra consulta de cerca: a \"%1$s\", junt amb la vostra ubicació.
-        \n No es recull informació personal, només les dades utilitzades en la cerca per millorar-ne l\'algorisme.</string>
+\n 
+\n No es recull informació personal, només les dades de la cerca per millorar-la.</string>
     <string name="search_no_results_description">Cap resultat?
 \nParleu-nos-en al respecte.</string>
     <string name="send_search_query">Voleu enviar la consulta de cerca?</string>
@@ -2822,10 +2819,10 @@ Abasta l\'àrea: %1$s x %2$s</string>
 \n
 \n• Altres correccions d\'errors  
 \n"</string>
-    <string name="increase_search_radius_to">Augmenta el radi de cerca fins %1$s</string>
+    <string name="increase_search_radius_to">Allarga el radi de cerca fins %1$s</string>
     <string name="commiting_way">Executant via…</string>
     <string name="thank_you_for_feedback">Gràcies per els vostres comentaris</string>
-    <string name="poi_cannot_be_found">No es pot trobar el node o la via.</string>
+    <string name="poi_cannot_be_found">No s\'ha pogut trobar el node o la via.</string>
     <string name="search_no_results_feedback">Cap resultat en la cerca?
 \nComenteu-nos-ho</string>
     <string name="test_voice_desrc">Premeu un botó i escolteu la corresponent descripció de veu per identificar les descripcions pendents o errònies.</string>
@@ -2854,11 +2851,11 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="ask_for_location_permission">Cal que doneu a OsmAnd accés a la ubicació per continuar.</string>
     <string name="rendering_value_black_name">Negre</string>
     <string name="search_street">Cerca un carrer</string>
-    <string name="start_search_from_city">Seleccioneu primer la ciutat</string>
+    <string name="start_search_from_city">Seleccioneu primer la ciutat/població/localitat</string>
     <string name="shared_string_restore">Restaura</string>
     <string name="keep_passed_markers_descr">Els marcadors afegits a un grup de Preferits i les fites GPX ja assolides romandran al mapa. Si el grup no estigués activat, els marcadors no apareixerien al mapa.</string>
     <string name="keep_passed_markers">Manté al mapa les fites assolides</string>
-    <string name="more_transport_on_stop_hint">Hi ha altres mitjans de transport en aquesta parada.</string>
+    <string name="more_transport_on_stop_hint">Altres mitjans de transport disponibles en aquesta parada.</string>
     <string name="markers_remove_dialog_msg">Voleu esborrar el marcador de mapa \'%s\'\?</string>
     <string name="edit_map_marker">Edita el marcador de mapa</string>
     <string name="third_party_application">Aplicació de tercers</string>
@@ -2874,8 +2871,8 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="osm_live_payment_renews_quarterly">Renovació trimestral</string>
     <string name="osm_live_payment_renews_annually">Renovació anual</string>
     <string name="default_price_currency_format">%1$.2f %2$s</string>
-    <string name="osm_live_payment_header">Seleccioneu el període de pagament que us convingui:</string>
+    <string name="osm_live_payment_header">Cicle de pagament:</string>
-    <string name="osm_live_payment_contribute_descr">Una part dels ingressos és pels col·laboradors d\'OpenStreetMap.</string>
+    <string name="osm_live_payment_contribute_descr">Les donacions ajuden a finançar la cartografia d\'OpenStreetMap.</string>
     <string name="powered_by_osmand">Per OsmAnd</string>
     <string name="osm_live_subscriptions">Subscripcions</string>
     <string name="mapillary_menu_title_pano">Només mostra imatges de 360º</string>
@@ -2887,9 +2884,9 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="quick_action_switch_day_mode">Mode Diürn</string>
     <string name="quick_action_switch_night_mode">Mode Nocturn</string>
     <string name="quick_action_day_night_switch_mode">Canvia mode Diürn/Nocturn</string>
-    <string name="add_destination_point">Afegeix destinació</string>
+    <string name="add_destination_point">Establiu destinació</string>
     <string name="add_intermediate_point">Afegeix punt intermedi</string>
-    <string name="add_start_point">Afegeix el punt inicial</string>
+    <string name="add_start_point">Establiu el punt inicial</string>
     <string name="intermediate_waypoint">Punt intermedi</string>
     <string name="transfers">transferències</string>
     <string name="on_foot">a peu</string>
@@ -2901,7 +2898,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="show_along_the_route">Mostra al llarg de la ruta</string>
     <string name="simulate_navigation">Simula la navegació</string>
     <string name="choose_track_file_to_follow">Seleccioneu l\'arxiu de la traça a seguir</string>
-    <string name="voice_announcements">Anuncis de veu</string>
+    <string name="voice_announcements">Indicacions per veu</string>
     <string name="intermediate_destinations">Destinacions intermèdies</string>
     <string name="arrive_at_time">Arribada a %1$s</string>
     <string name="cubic_m">m³</string>
@@ -2914,10 +2911,10 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="routeInfo_smoothness_name">Uniformitat</string>
     <string name="routeInfo_steepness_name">Pendent</string>
     <string name="add_home">Afegeix casa meva</string>
-    <string name="add_work">Afegeix feina</string>
+    <string name="add_work">Afegeix lloc de la feina</string>
     <string name="work_button">Feina</string>
     <string name="previous_route">Ruta anterior</string>
-    <string name="add_destination_query">Comenceu per afegir la destinació</string>
+    <string name="add_destination_query">Comenceu primer establint la destinació</string>
     <string name="shared_string_swap">Bescanvia</string>
     <string name="show_more">Mostra\'n més</string>
     <string name="tracks_on_map">Traces visualitzades</string>
@@ -2926,8 +2923,8 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="step_by_step">Totes les cruïlles</string>
     <string name="routeInfo_road_types_name">Tipus de carretera</string>
     <string name="exit_at">Sortida a</string>
-    <string name="quick_action_show_hide_gpx_tracks">"Mostra/amaga traces GPX "</string>
+    <string name="quick_action_show_hide_gpx_tracks">Mostra/amaga traces GPX</string>
-    <string name="quick_action_show_hide_gpx_tracks_descr">Prement aquest botó d\'acció es mostren o s\'amaguen al mapa les traces GPX</string>
+    <string name="quick_action_show_hide_gpx_tracks_descr">Un commutador per mostrar o amagar les traces GPX seleccionades al mapa.</string>
     <string name="quick_action_gpx_tracks_hide">Amaga les traces GPX</string>
     <string name="quick_action_gpx_tracks_show">Mostra les traces GPX</string>
     <string name="sit_on_the_stop">Pugeu a la parada</string>
@@ -2950,13 +2947,13 @@ Abasta l\'àrea: %1$s x %2$s</string>
 \n</string>
     <string name="use_osm_live_public_transport_description">Activa les modificacions del transport públic amb OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Transport públic a OsmAnd Live</string>
-    <string name="public_transport_warning_descr_blog">Teniu més informació sobre com OsmAnd calcula les rutes al nostre blog.</string>
+    <string name="public_transport_warning_descr_blog">Llegiu més sobre com OsmAnd calcula les rutes al nostre bloc.</string>
     <string name="public_transport_warning_title">La navegació en transports públics ara està en proves beta, vigileu errors o defectes.</string>
-    <string name="add_intermediate">Afegeix un punt intermedi</string>
+    <string name="add_intermediate">Afegiu un punt intermedi</string>
     <string name="transfers_size">%1$d trasllats</string>
-    <string name="add_start_and_end_points">Afegeix punts inicial i final</string>
+    <string name="add_start_and_end_points">Afegiu inici i destinació</string>
-    <string name="route_add_start_point">Afegeix punt de sortida</string>
+    <string name="route_add_start_point">Afegiu punt de sortida</string>
-    <string name="route_descr_select_start_point">Selecciona punt de sortida</string>
+    <string name="route_descr_select_start_point">Seleccioneu punt de sortida</string>
     <string name="rendering_attr_surface_unpaved_name">Sense asfaltar</string>
     <string name="rendering_attr_surface_sand_name">Sorra</string>
     <string name="rendering_attr_surface_grass_name">Gespa</string>
@@ -3000,8 +2997,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="rendering_attr_highway_class_bridleway_name">Ruta eqüestre</string>
     <string name="rendering_attr_highway_class_cycleway_name">Carril bici</string>
     <string name="shared_string_walk">Caminada</string>
-    <string name="save_poi_value_exceed_length">La longitud màxima de l\'etiqueta \"%s\" és de 255 caràcters. 
+    <string name="save_poi_value_exceed_length">Escurceu la longitud de l\'etiqueta \"%s\" a menys de 255 caràcters.</string>
-\nEscurceu-la per continuar.</string>
     <string name="save_poi_value_exceed_length_title">Longitud del valor de \"%s\"</string>
     <string name="rendering_attr_surface_dirt_name">Pols</string>
     <string name="avoid_pt_types_descr">Seleccioneu quin transport públic no s\'ha d\'incloure a la navegació:</string>
@@ -3013,18 +3009,18 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="angular_measeurement_descr">Canvia la unitat de mesura de l\'azimut.</string>
     <string name="routing_attr_avoid_sett_name">Evita els empedrats i els llambordins</string>
     <string name="routing_attr_avoid_sett_description">Evita els empedrats i els llambordins</string>
-    <string name="routing_attr_avoid_tram_name">Evita el tram</string>
+    <string name="routing_attr_avoid_tram_name">Sense el tram</string>
     <string name="routing_attr_avoid_tram_description">Evita el tram</string>
     <string name="routing_attr_avoid_bus_name">Sense autobús</string>
     <string name="routing_attr_avoid_bus_description">Evita autobús i troleibús</string>
     <string name="routing_attr_avoid_share_taxi_name">Sense taxi compartit</string>
     <string name="routing_attr_avoid_share_taxi_description">Evita el taxi compartit</string>
-    <string name="routing_attr_avoid_train_name">Evita el tren</string>
+    <string name="routing_attr_avoid_train_name">Sense trens</string>
     <string name="routing_attr_avoid_train_description">Evita el tren</string>
-    <string name="routing_attr_avoid_subway_name">Evita el metro</string>
+    <string name="routing_attr_avoid_subway_name">Sense metro</string>
     <string name="routing_attr_avoid_subway_description">Evita el metro i el tram</string>
-    <string name="routing_attr_avoid_ferry_name">Evita el ferri</string>
+    <string name="routing_attr_avoid_ferry_name">Sense ferris</string>
-    <string name="routing_attr_avoid_ferry_description">Evita el ferri</string>
+    <string name="routing_attr_avoid_ferry_description">Evita els ferris</string>
     <string name="release_3_3_7">• Mostra el temps entre transbordaments al transport públic
 \n
 \n• Corregida la IU pels detalls de la ruta
@@ -3051,10 +3047,10 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="rate_dialog_descr">Si us plau, comenteu que us sembla i puntueu la nostra feina a Google Play.</string>
     <string name="button_rate">D\'acord</string>
     <string name="shared_string_privacy_policy">Política de privadesa</string>
-    <string name="help_us_make_osmand_better">Ajudeu-nos a millorar OsmAnd!</string>
+    <string name="help_us_make_osmand_better">Ajudeu-nos a millorar OsmAnd</string>
-    <string name="make_osmand_better_descr">Autoritzeu a OsmAnd a recopilar i processar dades anònimes d\'ús de l\'aplicació. No recopilarem ni emmagatzemarem dades sobre la vostra ubicació ni dels llocs que consulteu al mapa. 
+    <string name="make_osmand_better_descr">Autoritzeu a OsmAnd a recopilar i processar dades anònimes d\'ús de l\'aplicació. No es recollirà cap dada sobre la vostra ubicació ni dels llocs que consulteu al mapa. 
 \n 
-\nPodeu canviar aquesta opció quan vulgueu a Configuració &gt; Privadesa i seguretat.</string>
+\nSempre es pot revisar a \'Configuració\' &gt; \'Privadesa i seguretat\'.</string>
     <string name="choose_data_to_share">Trieu el tipus de dades que voleu compartir:</string>
     <string name="downloaded_maps">Mapes baixats</string>
     <string name="colleted_data">Dades recollides</string>
@@ -3092,7 +3088,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="profile_alert_need_save_msg">Primer heu de desar els canvis en el perfil</string>
     <string name="profile_alert_delete_title">Suprimeix el perfil</string>
     <string name="profile_alert_delete_msg">Esteu segur que voleu suprimir el perfil \"%s\"</string>
-    <string name="select_base_profile_dialog_title">Seleccioneu un perfil base</string>
+    <string name="select_base_profile_dialog_title">Seleccioneu un perfil amb què començar</string>
     <string name="settings_derived_routing_mode_string">Mode usuari, derivat de: %s</string>
     <string name="select_nav_profile_dialog_title">Seleccioneu el tipus de navegació</string>
     <string name="base_profile_descr_car">Cotxe, camió, motocicleta</string>
@@ -3217,7 +3213,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="shared_string_track_is_saved">La traça %s s\'ha desat</string>
     <string name="gpx_join_gaps">Uneix separacions</string>
     <string name="app_mode_camper">Camper</string>
-    <string name="app_mode_campervan">Autocaravana</string>
+    <string name="app_mode_campervan">Autocaravana (RV)</string>
     <string name="rendering_attr_showLez_description">Mostra les zones de baixes emissions al mapa. No afecta el càlcul de ruta.</string>
     <string name="rendering_attr_showLez_name">Mostra les zones de baixes emissions</string>
     <string name="temporary_conditional_routing">Considereu les limitacions temporals</string>
@@ -3330,11 +3326,11 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="routing_attr_driving_style_prefer_unpaved_name">Millor les carreteres sense asfaltar</string>
     <string name="routing_attr_driving_style_prefer_unpaved_description">Millor les carreteres sense asfaltar.</string>
     <string name="layer_osm_edits">Edicions d\'OSM</string>
-    <string name="quick_action_contour_lines_descr">Un commutador per mostrar o amagar les corbes de nivell en el mapa</string>
+    <string name="quick_action_contour_lines_descr">Un botó per a mostrar o amagar les corbes de nivell en el mapa.</string>
     <string name="quick_action_contour_lines_show">Mostra les corbes de nivell</string>
     <string name="quick_action_contour_lines_hide">Amaga les corbes de nivell</string>
     <string name="quick_action_show_hide_contour_lines">Mostra/amaga les corbes de nivell</string>
-    <string name="quick_action_hillshade_descr">Un commutador per mostrar o amagar l\'ombrejat de relleu al mapa</string>
+    <string name="quick_action_hillshade_descr">Un botó per a mostrar o amagar l\'ombrejat de relleu al mapa.</string>
     <string name="quick_action_hillshade_show">Mostra l\'ombrejat de relleu</string>
     <string name="quick_action_hillshade_hide">Amaga l\'ombrejat de relleu</string>
     <string name="quick_action_show_hide_hillshade">Mostra/amaga l\'ombrejat de relleu</string>
@@ -3377,15 +3373,15 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="screen_alerts">Alertes de pantalla</string>
     <string name="route_parameters_descr">Configura els paràmetres de la ruta</string>
     <string name="rendering_attr_piste_type_hike_name">Senderisme</string>
-    <string name="default_speed_dialog_msg">"S\'utilitza per estimar l\'hora d\'arribada per carreteres de tipus desconegut  i per limitar la velocitat a totes les vies (podria canviar la ruta)"</string>
+    <string name="default_speed_dialog_msg">S\'utilitza per estimar l\'hora d\'arribada per carreteres de tipus desconegut i per limitar la velocitat a totes les vies (podria canviar la ruta)</string>
     <string name="shared_string_other">Altres</string>
     <string name="shared_sting_tiles">Tessel·les</string>
     <string name="export_profile">Exporta el perfil</string>
     <string name="exported_osmand_profile">Perfil d\'OsmAnd: %1$s</string>
     <string name="overwrite_profile_q">El perfil \'%1$s\' ja existeix. El voleu sobreescriure\?</string>
     <string name="export_profile_failed">No s\'ha pogut exportar el perfil.</string>
-    <string name="profile_import">Importa el perfil:</string>
+    <string name="profile_import">Importació del perfil</string>
-    <string name="profile_import_descr">Per importar un perfil, seleccioneu el seu arxiu en el dispositiu i obriu-lo amb OsmAnd.</string>
+    <string name="profile_import_descr">Per a importar un perfil, seleccioneu-ne el fitxer en el dispositiu i obriu-lo amb OsmAnd.</string>
     <string name="file_import_error">Error d\'importació de %1$s: %2$s</string>
     <string name="file_imported_successfully">S\'ha importat correctament %1$s.</string>
     <string name="rendering_value_white_name">Blanc</string>
@@ -3397,4 +3393,38 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="clear_confirmation_msg">Voleu netejar %1$s\?</string>
     <string name="dialogs_and_notifications_title">Diàlegs i notificacions</string>
     <string name="dialogs_and_notifications_descr">Emergents de control, diàlegs i notificacions que surten a OsmAnd mentre s\'utilitza.</string>
+    <string name="join_segments">Uneix segments</string>
+    <string name="add_new_profile_q">Voleu afegir el perfil nou \'%1$s\'\?</string>
+    <string name="distance_and_address">%1$s • %2$s</string>
+    <string name="street_city">%1$s, %2$s</string>
+    <string name="personal_category_name">Personal</string>
+    <string name="shared_string_downloading_formatted">S\'està baixant %s</string>
+    <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Mostra les vies ciclistes de xarxa de nodes</string>
+    <string name="download_map_dialog">Diàleg de baixada de mapa</string>
+    <string name="rendering_value_walkingRoutesOSMCNodes_name">Xarxes de nodes</string>
+    <string name="suggested_maps">Mapes suggerits</string>
+    <string name="suggested_maps_descr">Aquests mapes són necessaris per utilitzar-los amb el connector</string>
+    <string name="added_profiles">Perfils afegits</string>
+    <string name="added_profiles_descr">El connector afegeix un nou perfil a OsmAnd</string>
+    <string name="shared_string_turn_off">Desactiva</string>
+    <string name="new_plugin_added">S\'ha afegit un nou connector</string>
+    <string name="desert_render_descr">A deserts i altre àrees poc poblades. Mostra més detalls en una escala de visualització.</string>
+    <string name="routing_attr_width_name">Límit d\'amplada</string>
+    <string name="routing_attr_width_description">Indica el límit d\'amplada de vehicle permesa en les rutes.</string>
+    <string name="rendering_attr_piste_difficulty_aerialway_name">Via aèria</string>
+    <string name="simulate_your_location_gpx_descr">Simula la vostra posició fent servir una traça GPX enregistrada.</string>
+    <string name="rendering_value_thick_name">Gruix</string>
+    <string name="select_navigation_icon">Seleccioneu la icona de navegació</string>
+    <string name="select_map_icon">Seleccioneu la icona del mapa</string>
+    <string name="delete_profiles_descr">Si toqueu Aplica, els perfils suprimits es perdran definitivament.</string>
+    <string name="master_profile">Perfil principal</string>
+    <string name="select_color">Seleccioneu el color</string>
+    <string name="edit_profiles_descr">No podeu suprimir els perfils predeterminats de l\'OsmAnd, però podeu desactivar-los en la pantalla anterior, o moure\'ls a la part inferior.</string>
+    <string name="edit_profiles">Edita els perfils</string>
+    <string name="select_nav_profile_dialog_message">El tipus de navegació determina les regles de càlcul de les rutes.</string>
+    <string name="profile_appearance">Aparença del perfil</string>
+    <string name="choose_icon_color_name">Trieu la icona, el color i el nom</string>
+    <string name="reorder_profiles">Edita la llista de perfils</string>
+    <string name="selected_profile">Perfil seleccionat</string>
+    <string name="quick_action_directions_from_desc">Un botó per establir el punt central de la pantalla com el punt de sortida i calcular la ruta vers la destinació o obrir una petició per seleccionar-la si no hi ha un marcador de destinació al mapa.</string>
 </resources>

OsmAnd/res/values-cs/strings.xml

@@ -949,7 +949,7 @@ Proporcionální paměť %4$s MB (limit Androidu %5$s MB, Dalvik %6$s MB).</stri
     <string name="choose_osmand_theme_descr">Vyberte si vzhled aplikace.</string>
     <string name="street_name">Název ulice</string>
     <string name="hno">číslo domu</string>
-    <string name="download_using_mobile_internet">Není připojeni přes WiFi. Použít současné připojení k internetu pro stahování\?</string>
+    <string name="download_using_mobile_internet">Není připojení přes WiFi. Použít současné připojení k internetu pro stahování\?</string>
     <string name="available_downloads_left">%1$d souborů zbývá ke stažení</string>
     <string name="files_limit">Zbývá %1$d souborů</string>
     <string name="monitoring_settings">Záznam cesty</string>
@@ -2877,7 +2877,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="routeInfo_surface_name">Povrch</string>
     <string name="routeInfo_smoothness_name">Hladkost povrchu</string>
     <string name="routeInfo_steepness_name">Strmost</string>
-    <string name="show_more">Ukaž více</string>
+    <string name="show_more">Ukázat více</string>
     <string name="tracks_on_map">Zobrazené trasy</string>
     <string name="time_of_day">Denní doba</string>
     <string name="step_by_step">Krok za krokem</string>

OsmAnd/res/values-da/phrases.xml

@@ -3765,4 +3765,13 @@
     <string name="poi_bath_open_air_yes">Ja</string>
     <string name="poi_bath_open_air_no">Nej</string>
     <string name="poi_grave">Grav</string>
+    <string name="poi_monastery_type_monastics">Klostertype: munke</string>
+    <string name="poi_monastery_type_convent">Klostertype: konvent</string>
+    <string name="poi_monastery_type_canonry">Klostertype: kanonik</string>
+    <string name="poi_monastery_type_hermitage">Klostertype: hermitage</string>
+    <string name="poi_monastery_type_clerks_regular">Klostertype: faste medarbejdere</string>
+    <string name="poi_tourist_camp">Turistlejr</string>
+    <string name="poi_community_gender_female">Fællesskabet køn: kvinde</string>
+    <string name="poi_community_gender_male">Fællesskabets køn: mand</string>
+    <string name="poi_community_gender_mixed">Fællesskabet køn: blandet</string>
 </resources>

OsmAnd/res/values-da/strings.xml

@@ -3370,7 +3370,7 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="quick_action_contour_lines_show">Vis højdekurver</string>
     <string name="quick_action_contour_lines_hide">Skjul højdekurver</string>
     <string name="quick_action_show_hide_contour_lines">Vis/skjul højdekurver</string>
-    <string name="quick_action_hillshade_descr">Tryk på genvejsknappenviser eller skjuler reliefskygger på kortet</string>
+    <string name="quick_action_hillshade_descr">Tryk på genvejsknappen viser eller skjuler reliefskygger på kortet</string>
     <string name="quick_action_hillshade_show">Vis reliefskygger</string>
     <string name="quick_action_hillshade_hide">Skjul reliefskygger</string>
     <string name="quick_action_show_hide_hillshade">Vis/skjul reliefskygger</string>
@@ -3407,4 +3407,22 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="add_new_profile_q">Tilføj ny profil \'%1$s\'\?</string>
     <string name="save_heading">Medtag overskrift</string>
     <string name="save_heading_descr">Gem overskrift til hvert TrackPoint under optagelsen.</string>
+    <string name="distance_and_address">%1$s • %2$s</string>
+    <string name="street_city">%1$s, %2$s</string>
+    <string name="personal_category_name">Personlig</string>
+    <string name="shared_string_downloading_formatted">Henter %s</string>
+    <string name="rendering_value_thick_name">Tyk</string>
+    <string name="desert_render_descr">Til ørkener og andre tyndt befolkede områder. Viser flere detaljer på en visningsskala.</string>
+    <string name="select_navigation_icon">Vælg navigationsikon</string>
+    <string name="select_map_icon">Vælg kortikon</string>
+    <string name="delete_profiles_descr">Tryk på Anvend og slettede profiler går helt tabt.</string>
+    <string name="master_profile">Hovedprofil</string>
+    <string name="select_color">Vælg farve</string>
+    <string name="edit_profiles_descr">Standard-profiler kan ikke slettes, men de kan deaktiveres på forrige skærmbillede eller flyttes til bunden.</string>
+    <string name="edit_profiles">Rediger profiler</string>
+    <string name="select_nav_profile_dialog_message">Navigationstype påvirker reglerne for ruteberegninger.</string>
+    <string name="profile_appearance">Profilens udseende</string>
+    <string name="choose_icon_color_name">Vælg ikon, farve og navn</string>
+    <string name="reorder_profiles">Rediger profilliste</string>
+    <string name="selected_profile">Valgte profil</string>
 </resources>

OsmAnd/res/values-de/phrases.xml

@@ -346,7 +346,7 @@
     <string name="poi_paragliding">Gleitschirmfliegen</string>
     <string name="poi_park">Park</string>
     <string name="poi_parking">Parkplatz</string>
-    <string name="poi_parking_entrance">Parkeinfahrt</string>
+    <string name="poi_parking_entrance">Parkplatzeinfahrt</string>
     <string name="poi_craft_parquet_layer">Parkettleger</string>
     <string name="poi_pawnbroker">Pfandleiher</string>
     <string name="poi_peak">Berggipfel</string>
@@ -392,7 +392,7 @@
     <string name="poi_public_transport_platform_bus">Bushaltestelle</string>
     <string name="poi_public_transport_platform_tram">Straßenbahnhaltestelle</string>
     <string name="poi_public_transport_platform_trolleybus">Haltestelle für Oberleitungsbus</string>
-    <string name="poi_public_transport_station">Öff. Verkehrsmittel-Station</string>
+    <string name="poi_public_transport_station">ÖPNV-Station</string>
     <string name="poi_quarry">Steinbruch</string>
     <string name="poi_raceway">Rennstrecke</string>
     <string name="poi_racquet">Racquetball</string>
@@ -1151,7 +1151,7 @@
     <string name="poi_fuel_91ul">Avgas UL 91</string>
     <string name="poi_fuel_100ll">Avgas 100LL</string>
     <string name="poi_fuel_autogas">Autogas</string>
-    <string name="poi_fuel_jeta1">Flugzeug A-1 Kraftstoff</string>
+    <string name="poi_fuel_jeta1">Flugkraftstoff Jet A-1</string>
     <string name="poi_fuel_adblue">AdBlue</string>
     <string name="poi_fuel_wood">Kraftstoff: Holz</string>
     <string name="poi_street_lamp">Straßenlaterne</string>
@@ -1337,7 +1337,7 @@
     <string name="poi_rescue_station">Rettungsstation</string>
     <string name="poi_mini_roundabout">Mini-Kreisverkehr</string>
     <string name="poi_railway_crossing">Bahnübergang</string>
-    <string name="poi_bird_hide">Vögelbeobachtungspunkt</string>
+    <string name="poi_bird_hide">Vogelbeobachtungspunkt</string>
     <string name="poi_garden">Garten</string>
     <string name="poi_heath">Heide</string>
     <string name="poi_grass">Gras</string>
@@ -2789,7 +2789,7 @@
     <string name="poi_covered">Überdacht</string>
     <string name="poi_ferry_terminal_cargo">Fracht</string>
     <string name="poi_bicycle_parking_type">Typ</string>
-    <string name="poi_aerialway_bicycle">Radtransport</string>
+    <string name="poi_aerialway_bicycle">Fahrradtransport</string>
     <string name="poi_aerialway_heating">Heizung</string>
     <string name="poi_pump">Pumpe</string>
     <string name="poi_observatory_designation">Bezeichnung</string>
@@ -3614,7 +3614,7 @@
     <string name="poi_access_motorcycle">Zufahrt Motorrad</string>
     <string name="poi_access_moped">Zufahrt Moped</string>
     <string name="poi_access_mofa">Zufahrt Mofa</string>
-    <string name="poi_access_hgv">Zufahrt LKW</string>
+    <string name="poi_access_hgv">Zufahrt Lkw</string>
     <string name="poi_access_goods">Zufahrt leichter Lieferfahrzeuge</string>
     <string name="poi_access_disabled">Behindertengerechter Zugang</string>
     <string name="poi_taxi_office">Taxibüro</string>

OsmAnd/res/values-de/strings.xml

@@ -13,7 +13,7 @@
     <string name="gps_network_not_enabled">Standortservice ist deaktiviert. Einschalten\?</string>
     <string name="disable_recording_once_app_killed">Eigenständige Streckenaufzeichnung unterbinden</string>
     <string name="disable_recording_once_app_killed_descrp">Die GPX-Aufzeichnung wird angehalten, wenn OsmAnd beendet wird (über „zuletzt verwendete Apps“). (Die Hintergrunddienst-Anzeige verschwindet aus der Android-Benachrichtigungsleiste.)</string>
-    <string name="shared_string_import2osmand">Nach OsmAnd importieren</string>
+    <string name="shared_string_import2osmand">In OsmAnd importieren</string>
     <string name="tips_and_tricks_descr">Häufig gestellte Fragen, neueste Änderungen und anderes.</string>
     <string name="delay_to_start_navigation">Zielführung beginnen nach…</string>
     <string name="delay_to_start_navigation_descr">Wartezeit festlegen, um mit der Zielführung zu beginnen.</string>
@@ -29,7 +29,7 @@
     <string name="speak_favorites">Favoriten in der Nähe</string>
     <string name="speak_poi">Nahegelegene POI</string>
     <string name="confirm_every_run">Immer fragen</string>
-    <string name="save_global_track_interval_descr">Aufzeichnungsintervall für die generelle Track-Aufzeichnung festlegen (via Schaltfläche \'GPX-Aufzeichnung\' auf dem Kartenbildschirm).</string>
+    <string name="save_global_track_interval_descr">Aufzeichnungsintervall für die generelle Track-Aufzeichnung festlegen (via Schaltfläche \'GPX\' auf dem Kartenbildschirm).</string>
     <string name="save_global_track_interval">Intervall für generelle Aufzeichnung</string>
     <string name="enable_sleep_mode">GPS-Hintergrunddienst aktivieren</string>
     <string name="sleep_mode_stop_dialog">GPS-Hintergrunddienst beenden?</string>
@@ -41,7 +41,7 @@
     <string name="background_service_int">GPS-Aufwachintervall</string>
     <string name="save_track_to_gpx_globally">Aufzeichnung in GPX-Datei</string>
     <string name="save_track_to_gpx_globally_headline">GPX-Aufzeichnung bei Bedarf</string>
-    <string name="save_track_to_gpx_globally_descr">Generelle Positionserfassung kann mit der Schaltfläche \'GPX-Aufzeichnung\' direkt auf dem Kartenbildschirm aktiviert oder deaktiviert werden.</string>
+    <string name="save_track_to_gpx_globally_descr">Generelle Positionserfassung kann mit der Schaltfläche \'GPX\' direkt auf dem Kartenbildschirm aktiviert oder deaktiviert werden.</string>
     <string name="save_current_track">Aktuellen Track speichern</string>
     <string name="save_current_track_descr">Aktuellen Track jetzt als GPX-Datei speichern.</string>
     <string name="save_track_to_gpx">Während der Navigation automatisch Track aufzeichnen</string>
@@ -261,7 +261,7 @@
     <string name="local_openstreetmap_settings">OSM-POIs/-Notizen auf dem Gerät gespeichert</string>
     <string name="local_openstreetmap_settings_descr">In der Gerätedatenbank vermerkte OSM-POIs/-Notizen anzeigen und verwalten.</string>
     <string name="live_monitoring_m">Online-Aufzeichnung (benötigt GPX)</string>
-    <string name="live_monitoring_m_descr">Track-Daten zu einem festgelegten Internet-Dienst senden, wenn GPX-Aufzeichnung aktiviert ist.</string>
+    <string name="live_monitoring_m_descr">Track-Daten zu einem festgelegten Internetdienst senden, wenn die GPX-Aufzeichnung aktiviert ist.</string>
     <string name="live_monitoring_url">Internetadresse zur Aufzeichnung</string>
     <string name="live_monitoring_url_descr">Spezifikation der Internetadresse zur Aufzeichnung mit Parametern: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
     <string name="live_monitoring_interval">Online-Aufzeichnungsintervall</string>
@@ -295,7 +295,7 @@
     <string name="index_item_world_seamarks">Seezeichen (weltweit)</string>
     <string name="index_item_world_bitcoin_payments">Bitcoin-Bezahlmöglichkeiten (weltweit)</string>
     <string name="index_item_world_basemap">Übersichtskarte der Welt</string>
-    <string name="index_item_world_ski">Ski-Karte (weltweit)</string>
+    <string name="index_item_world_ski">Skikarte (weltweit)</string>
     <string name="index_srtm_parts">Teile</string>
     <string name="index_srtm_ele">Höhenlinien</string>
     <string name="index_name_openmaps">OpenMaps EU</string>
@@ -418,9 +418,9 @@
     <string name="tts_language_not_supported">Die gewählte Sprache wird von der installierten Android-TTS-Engine nicht unterstützt. Stattdessen wird die voreingestellte TTS-Sprache verwendet. Im Market nach einer anderen TTS-Engine suchen\?</string>
     <string name="tts_missing_language_data_title">Fehlendes Sprachpaket</string>
     <string name="tts_missing_language_data">Gewählte Sprache aus dem Market installieren?</string>
-    <string name="switch_to_vector_map_to_see">Eine Offline-Vektorkarte ist für diesen Ort vorhanden. 
+    <string name="switch_to_vector_map_to_see">Es gibt eine Offline-Vektorkarte für diesen Ort. 
 \n\t 
-\n\tZur Verwendung aktivieren: \'Menü\' → \'Karte konfigurieren\' → \'Kartenquelle…\' → \'Offline-Vektorkarten\'.</string>
+\n\tWählen Sie \'Menü\' → \'Karte konfigurieren\' → \'Kartenquelle…\' → \'Offline-Vektorkarten\', um sie zu verwenden.</string>
     <string name="choose_audio_stream">Navi-Sprachausgabe</string>
     <string name="choose_audio_stream_descr">Lautsprecher für Sprachansagen auswählen.</string>
     <string name="voice_stream_voice_call">Wie Anrufe (unterbricht Bluetooth-Verbindung zum Autoradio)</string>
@@ -454,7 +454,7 @@
     <string name="preferred_locale">Anzeigesprache</string>
     <string name="shared_string_next">Weiter</string>
     <string name="shared_string_previous">Zurück</string>
-    <string name="unit_of_length_descr">Ändern Sie, in welcher Entfernung gemessen wird.</string>
+    <string name="unit_of_length_descr">Maß für Entfernungen ändern.</string>
     <string name="unit_of_length">Längeneinheiten</string>
     <string name="si_mi_feet">Meilen/Fuß</string>
     <string name="si_mi_yard">Meilen/Yards</string>
@@ -470,8 +470,8 @@
     <string name="send_location">Standort senden</string>
     <string name="context_menu_item_share_location">Standort mitteilen</string>
     <string name="add_waypoint_dialog_added">GPX-Wegpunkt \'\'{0}\'\' hinzugefügt</string>
-    <string name="add_waypoint_dialog_title">Wegpunkt zum gespeicherten GPX-Track hinzufügen</string>
+    <string name="add_waypoint_dialog_title">Wegpunkt zum aufgezeichneten GPX-Track hinzufügen</string>
-    <string name="context_menu_item_add_waypoint">GPX-Wegpunkt anfügen</string>
+    <string name="context_menu_item_add_waypoint">GPX-Wegpunkt hinzufügen</string>
     <string name="amenity_type_administrative">Verwaltung</string>
     <string name="amenity_type_barrier">Barriere</string>
     <string name="amenity_type_education">Bildung</string>
@@ -560,7 +560,7 @@
     <string name="download_type_to_filter">Nach Typ filtern</string>
     <string name="use_high_res_maps">Hochauflösende Anzeige</string>
     <string name="use_high_res_maps_descr">Unterdrückt Streckung (Unschärfe) von Kartenkacheln auf manchen Anzeigen.</string>
-    <string name="unknown_location">Position noch nicht bekannt</string>
+    <string name="unknown_location">Position noch nicht bekannt.</string>
     <string name="context_menu_item_search_transport">Suche ÖPNV</string>
     <string name="transport_searching_transport">ÖPNV-Ergebnisse (kein Ziel):</string>
     <string name="transport_searching_route">ÖPNV-Ergebnisse ({0} bis zum Ziel):</string>
@@ -609,7 +609,7 @@
     <string name="network_provider">Netzwerk</string>
     <string name="gps_provider">GPS</string>
     <string name="int_seconds">Sekunden</string>
-    <string name="int_min">Min.</string>
+    <string name="int_min">Minuten</string>
     <string name="background_service_provider_descr">Vom Hintergrunddienst verwendete Standortmethode:</string>
     <string name="background_service_provider">Standortbestimmung</string>
     <string name="off_router_service_no_gps_available">Die Hintergrundnavigation erfordert aktivierte Standortdienste.</string>
@@ -643,7 +643,7 @@
     <string name="search_poi_location">Warte auf Signal…</string>
     <string name="search_near_map">Suche in der Nähe</string>
     <string name="search_nearby">Suche um Aufenthaltsort</string>
-    <string name="map_orientation_default">Lagesensor</string>
+    <string name="map_orientation_default">Gleich wie Gerät</string>
     <string name="map_orientation_portrait">Hochformat</string>
     <string name="map_orientation_landscape">Querformat</string>
     <string name="map_screen_orientation">Bildschirmausrichtung</string>
@@ -846,7 +846,7 @@
     <string name="offline_navigation_not_available">OsmAnd-Offline-Navigation steht zur Zeit nicht zur Verfügung.</string>
     <string name="left_side_navigation">Linksverkehr</string>
     <string name="left_side_navigation_descr">Für Länder, in denen man auf der linken Straßenseite fährt.</string>
-    <string name="unknown_from_location">Startpunkt noch nicht ermittelt</string>
+    <string name="unknown_from_location">Startpunkt noch nicht ermittelt.</string>
     <string name="confirm_interrupt_download">Download abbrechen\?</string>
     <string name="basemap_was_selected_to_download">Die Basiskarte, die zur Bereitstellung grundlegender Funktionen erforderlich ist, befindet sich in der Downloadwarteschlange.</string>
     <string name="local_index_routing_data">Routing-Daten</string>
@@ -901,7 +901,7 @@
     <string name="map_widget_back_to_loc">Wo bin ich</string>
     <string name="map_widget_lock_screen">Sperren</string>
     <string name="map_widget_compass">Kompass</string>
-    <string name="map_widget_reset">Auf Voreinstellung setzen</string>
+    <string name="map_widget_reset">Auf Voreinstellung zurücksetzen</string>
     <string name="map_widget_parking">Parken</string>
     <string name="map_widget_monitoring">GPX-Aufzeichnung</string>
     <string name="map_widget_speed">Geschwindigkeit</string>
@@ -961,16 +961,16 @@
     <string name="map_widget_show_destination_arrow">Richtung zum Ziel anzeigen</string>
     <string name="non_optimal_route_calculation">Auch nicht optimale Routen über lange Distanzen berechnen</string>
     <string name="gps_not_available">Bitte aktivieren Sie GPS in den Einstellungen</string>
-    <string name="enable_plugin_monitoring_services">Streckenaufzeichnungs-Modul aktivieren, um Aufzeichnungsdienste (GPX-Aufzeichnung, Online-Aufzeichnung) zu verwenden</string>
+    <string name="enable_plugin_monitoring_services">Erweiterung \'Streckenaufzeichnung\' aktivieren, um Aufzeichnungsdienste (GPX-Aufzeichnung, Online-Verfolgung) zu verwenden</string>
     <string name="zxing_barcode_scanner_not_found">Barcode-Scanner-App ZXing nicht installiert. Soll im Google Play-Store danach gesucht werden?</string>
     <string name="close_changeset">Änderungssatz schließen</string>
     <string name="incomplete_locale">unvollständig</string>
     <string name="srtm_plugin_name">Höhenlinien</string>
-    <string name="srtm_plugin_description">Diese Erweiterung beinhaltet Höhenlinien und Relief-Schattierungen, die als Ergänzung zu den Standard-Offline-Karten von OsmAnd angezeigt werden können. Diese Funktionalität ist vor allem für Sportler, Wanderer, Radfahrer, Trekker und jeden interessant, der sich für das Geländerelief einer Landschaft interessiert. (Bitte beachten Sie, Höhen- und Reliefdaten müssen nach Aktivierung der Erweiterung zusätzlich heruntergeladen werden.) 
+    <string name="srtm_plugin_description">Diese Erweiterung beinhaltet Höhenlinien und Relief-Schattierungen, die als Ergänzung zu den Standard-Offline-Karten von OsmAnd angezeigt werden können. Diese Funktionalität ist vor allem für Sportler, Wanderer, Radfahrer, Trekker und jeden interessant, der sich für das Geländerelief einer Landschaft interessiert. (Bitte beachten Sie, dass Höhen- und Reliefdaten nach Aktivierung der Erweiterung zusätzlich heruntergeladen werden müssen.) 
 \n 
-\nDie globalen Daten (zwischen 70° Nord und 70° Süd) basieren auf Messungen von SRTM (Shuttle Radar Topography Mission) und ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), einem bildgebenden System des Satelliten Terra, dem Flaggschiff des NASA-Erd-Beobachtungsprogramms. ASTER ist der Erfolg der Zusammenarbeit zwischen der NASA, dem japanischen Ministerium für Wirtschaft, Handel und Industrie und dem japanischen Raumfahrtprogramm (J-spacesystems).</string>
+\nDie globalen Daten (zwischen 70° Nord und 70° Süd) basieren auf Messungen von SRTM (Shuttle Radar Topography Mission) und ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), einem bildgebenden System an Bord des Satelliten Terra, dem Flaggschiff des NASA-Programms zur Erdbeobachtung. ASTER beruht auf der erfolgreichen Zusammenarbeit zwischen der NASA, dem japanischen Ministerium für Wirtschaft, Handel und Industrie und dem japanischen Raumfahrtprogramm (J-spacesystems).</string>
     <string name="srtm_paid_version_title">Höhenlinien-Plugin</string>
-    <string name="srtm_paid_version_msg">Bitte ziehen Sie den Kauf des Höhenlinien-Moduls im Play-Store in Erwägung, um die Weiterentwicklung zu fördern.</string>
+    <string name="srtm_paid_version_msg">Bitte erwägen Sie den Kauf der Erweiterung \'Höhenlinien\' im Play-Store, um die Weiterentwicklung zu fördern.</string>
     <string name="download_select_map_types">Andere Karten</string>
     <string name="download_srtm_maps">Höhenlinien</string>
     <string name="av_camera_pic_size">Bildgröße der Kamera</string>
@@ -1019,7 +1019,7 @@
     <string name="monitoring_settings_descr">Konfiguration der Streckenaufzeichnung.</string>
     <string name="monitoring_control_start">GPX</string>
     <string name="map_widget_audionotes">Audio-Notizen</string>
-    <string name="audionotes_plugin_description">Die Erweiterung Audio-/Video-Notizen bietet die Möglichkeit, unterwegs ortsbezogene Audio-/Fotografie-/Video-Notizen aufzunehmen, entweder über eine Taste auf dem Kartenbildschirm für die aktuelle Position oder direkt über das Kontextmenü für jede beliebige Position auf der Karte.</string>
+    <string name="audionotes_plugin_description">Diese Erweiterung bietet die Möglichkeit, unterwegs ortsbezogene Audio- und Video-Notizen sowie Fotos aufzunehmen, entweder über eine Taste auf der Karte für die aktuelle Position oder direkt über das Kontextmenü für eine beliebige Position auf der Karte.</string>
     <string name="audionotes_plugin_name">Audio-/Video-Notizen</string>
     <string name="audionotes_location_not_defined">Benutzen Sie \'Standort verwenden…\', um dem Ort eine Notiz zuzuweisen.</string>
     <string name="osmand_srtm_long_description_1000_chars">Diese Erweiterung beinhaltet Höhenlinien und Relief-Schattierungen, die als Ergänzung zu den Standard-Offline-Karten von OsmAnd angezeigt werden können. Diese Funktionalität ist vor allem für Sportler, Wanderer, Radfahrer, Trekker und jeden interessant, der sich für das Geländerelief einer Landschaft interessiert. 
@@ -1282,7 +1282,7 @@
     <string name="lang_lv">Lettisch</string>
     <string name="lang_mr">Marathi</string>
     <string name="lang_nl">Niederländisch</string>
-    <string name="lang_no">Norwegische Buchsprache</string>
+    <string name="lang_no">Norwegisch (Bokmål)</string>
     <string name="lang_pl">Polnisch</string>
     <string name="lang_pt">Portugiesisch</string>
     <string name="lang_pt_br">Portugiesisch (Brasilien)</string>
@@ -1312,7 +1312,7 @@
     <string name="gpx_info_average_speed">Durchschnittsgeschwindigkeit: %1$s </string>
     <string name="gpx_info_maximum_speed">Höchstgeschwindigkeit: %1$s</string>
     <string name="gpx_info_avg_altitude">Durchschnittliche Höhe: %1$s</string>
-    <string name="gpx_info_diff_altitude">Höhenunterschied: %1$s</string>
+    <string name="gpx_info_diff_altitude">Höhenbereich: %1$s</string>
     <string name="gpx_info_asc_altitude">Ab-/Anstieg: %1$s</string>
     <string name="gpx_timespan">Zeitspanne: %1$s</string>
     <string name="gpx_timemoving">Zeit in Bewegung: %1$s</string>
@@ -1461,22 +1461,22 @@
     <string name="free">Frei %1$s </string>
     <string name="device_memory">Gerätespeicher</string>
     <string name="rendering_attr_pisteGrooming_name">Pistenpflege</string>
-    <string name="plugin_ski_name">Ski-Karte</string>
+    <string name="plugin_ski_name">Skikarte</string>
     <string name="plugin_nautical_name">Seekarte</string>
-    <string name="world_ski_missing">Um Ski-Karten anzeigen zu können, muss die entsprechende Offline-Karte heruntergeladen werden</string>
+    <string name="world_ski_missing">Um Skikarten anzeigen zu können, muss die entsprechende Offline-Karte heruntergeladen werden</string>
-    <string name="nautical_maps_missing">Um See-Karten anzeigen zu können, muss die entsprechende Offline-Karte heruntergeladen werden</string>
+    <string name="nautical_maps_missing">Um Seekarten anzeigen zu können, muss die entsprechende Offline-Karte heruntergeladen werden</string>
     <string name="get_plugin">Erwerben</string>
     <string name="rename_failed">Umbenennen fehlgeschlagen.</string>
     <string name="shared_string_currently_recording_track">Momentane Track-Aufzeichnung</string>
     <string name="back_to_map">Zurück zur Karte</string>
     <string name="plugin_nautical_descr">Diese Erweiterung bereichert OsmAnd um die zusätzliche Darstellungsmöglichkeit nautischer Karten für Bootfahrer, Segler und andere Wassersportler. 
 \n 
-\nEine spezielle Kartenergänzung für OsmAnd (\'Seezeichen (weltweit)\') enthält alle nautischen Navigationsmarken und Kartensymbole zur Navigation auf Binnengewässern und in Küstennähe. Die Beschreibung jeder Navigationsmarke liefert die notwendigen Einzelheiten zu deren Bestimmung und Bedeutung (Kategorie, Form, Farbe, Reihenfolge, Verweis usw.). 
+\nDie spezielle Kartenergänzung \'Seezeichen (weltweit)\' enthält alle nautischen Navigationsmarken und Kartensymbole zur Navigation auf Binnengewässern und in Küstennähe. Die Beschreibung jeder Navigationsmarke liefert die notwendigen Einzelheiten zu deren Bestimmung und Bedeutung (Kategorie, Form, Farbe, Reihenfolge, Verweis usw.). 
 \n 
 \nUm zur herkömmlichen Kartendarstellung in OsmAnd zurückzukehren, kann diese Ansicht hier wieder deaktiviert oder die \'Kartendarstellung\' unter \'Karte konfigurieren\' wie gewünscht geändert werden.</string>
-    <string name="plugin_ski_descr">Diese Erweiterung aktiviert die spezielle Kartendarstellung \'Winter- und Skikarte\', die global Skiabfahrten, Langlaufrouten, alpine Skirouten, Skilifte und Bergbahnen enthält. Routen und Pisten werden farbcodiert nach Schwierigkeit, Landschaftselemente nach winterlichen Gesichtspunkten (Assimilierung einer Schneedecke) angezeigt. 
+    <string name="plugin_ski_descr">Diese Erweiterung stellt Details von weltweiten Skiabfahrten, Langlaufrouten, alpinen Skirouten, Bergbahnen und Skiliften zur Verfügung. Die Routen und Pisten werden farbcodiert nach Schwierigkeit, Landschaftselemente nach winterlichen Gesichtspunkten (Assimilierung einer Schneedecke) angezeigt. 
 \n 
-\nDiese spezielle Kartendarstellung kann zurückgestellt werden, indem sie hier wieder deaktiviert oder indem die \'Kartendarstellung\' unter \'Karte konfigurieren\' wie gewünscht geändert wird.</string>
+\nWenn Sie diese Ansicht aktivieren, ändert sich der Kartenstil in \'Winter und Ski\' und zeigt alle Landschaftsmerkmale unter winterlichen Bedingungen. Diese Ansicht kann hier wieder deaktiviert werden oder indem die \'Kartendarstellung\' unter \'Karte konfigurieren\' wie gewünscht geändert wird.</string>
     <string name="plugin_touringview_descr">Bei Aktivierung dieser Ansicht wechselt die Kartendarstellung zur \'Tourenkarte\', einer besonders detaillierten Darstellung für Fernreisende und Berufsfahrer. 
 \n 
 \nDiese Darstellung liefert für jeden Maßstab den größtmöglichen Umfang an Reisedetails, die die Kartendaten enthalten (insbesondere Straßen, Wege, Pfade und Orientierungspunkte). 
@@ -1522,7 +1522,7 @@
     <string name="shared_string_search">Suchen</string>
     <string name="shared_string_show_description">Beschreibung anzeigen.</string>
     <string name="shared_string_message">Nachricht</string>
-    <string name="agps_data_last_downloaded">A-GPS-Daten zuletzt heruntergeladen: %1$s</string>
+    <string name="agps_data_last_downloaded">A-GPS-Daten heruntergeladen: %1$s</string>
     <string name="confirm_usage_speed_cameras">In vielen Ländern (Deutschland, Frankreich, Italien und andere) ist die Verwendung von Blitzerwarnern gesetzlich nicht erlaubt. OsmAnd übernimmt keine Verantwortung im Fall von Gesetzesübertretungen. Klicken Sie nur auf \'Ja\', wenn Sie zur Verwendung dieser Funktion berechtigt sind.</string>
     <string name="welmode_download_maps">Kartenverwaltung</string>
     <string name="welcome_header">Willkommen</string>
@@ -2097,7 +2097,7 @@ Lon %2$s</string>
     <string name="rendering_attr_hideWaterPolygons_description">Wasser</string>
     <string name="rendering_attr_contourWidth_description">Breite der Höhenlinien</string>
     <string name="rendering_attr_contourWidth_name">Breite der Höhenlinien</string>
-    <string name="rendering_attr_contourDensity_description">Höhenliniendichte</string>
+    <string name="rendering_attr_contourDensity_description">Dichte der Höhenlinien</string>
     <string name="rendering_attr_contourDensity_name">Dichte der Höhenlinien</string>
     <string name="rendering_value_high_name">Hoch</string>
     <string name="rendering_value_medium_w_name">Mittel</string>
@@ -2195,7 +2195,7 @@ Lon %2$s</string>
     <string name="route_altitude">Routenhöhenprofil</string>
     <string name="altitude_descent">Abstieg</string>
     <string name="altitude_ascent">Aufstieg</string>
-    <string name="altitude_range">Höhendifferenz</string>
+    <string name="altitude_range">Höhenbereich</string>
     <string name="average_altitude">Durchschnittliche Höhe</string>
     <string name="shared_string_time">Zeit</string>
     <string name="total_distance">Gesamtstrecke</string>
@@ -2237,7 +2237,7 @@ Lon %2$s</string>
     <string name="driving_region_automatic">Automatisch</string>
     <string name="osmand_extended_description_part1">OsmAnd (OSM Automated Navigation Directions) ist eine Karten- und Navigationsapp mit Zugriff auf die kostenlosen, weltweiten und qualitativ hochwertigen Daten von OpenStreetMap (OSM). 
 \n 
-\nGenießen Sie die akustische und visuelle Navigation, die Anzeige von POIs (Orte von Interesse), die Erstellung und Verwaltung von GPX-Tracks, die Darstellung von Höhenlinien und Höhendaten (durch eine Erweiterung), die Wahl zwischen Auto-, Fahrrad- oder Fußgängerbetrieb, die Möglichkeit, an OSM mitzuarbeiten und vieles mehr.</string>
+\nGenießen Sie die akustische und visuelle Navigation, die Anzeige von POIs (Orte von Interesse), die Erstellung und Verwaltung von GPX-Tracks, die Darstellung von Höhenlinien und -daten (durch eine Erweiterung), die Wahl zwischen Auto-, Fahrrad- oder Fußgängerbetrieb, die Möglichkeit, an OSM mitzuarbeiten und vieles mehr.</string>
     <string name="osmand_extended_description_part2">GPS-Navigation
 \n • Sie haben die Wahl zwischen dem Offline-Betrieb (ohne Roaming-Gebühren, wenn Sie im Ausland sind) oder dem (schnelleren) Online-Betrieb
 \n • Die Sprachführung (mit aufgenommenen oder synthetischen Stimmen) begleitet Sie Schritt für Schritt auf Ihrem Weg
@@ -2259,8 +2259,8 @@ Lon %2$s</string>
 \n • lassen Ihnen die Wahl, wie Bezeichnungen auf der Karte angezeigt werden sollen: in Englisch, Landessprache oder in phonetischer Schreibweise 
 \n • stellen spezielle Online-Karten, Satellitenansichten (von Bing), verschiedene Overlays, wie GPX-Tracks zu Touren-/Routenverläufen und zusätzliche Ebenen mit einstellbarer Transparenz dar
 \n</string>
-    <string name="osmand_extended_description_part4">Ski-Sport
+    <string name="osmand_extended_description_part4">Skisport 
-\n das OsmAnd-Skikarten-Modul ermöglicht Ihnen das Betrachten von Skirouten, deren Schwierigkeitsgrad und einiger zusätzlicher Informationen, wie die Lage von Liften und weiterer Einrichtungen.</string>
+\n Die OsmAnd-Erweiterung \'Skikarte\' ermöglicht Ihnen das Betrachten von Skirouten, deren Schwierigkeitsgrad und einiger zusätzlicher Informationen, wie die Lage von Liften und anderer Einrichtungen.</string>
     <string name="osmand_extended_description_part5">Radfahren
 \n • Sie finden Radwege auf der Karte
 \n • Die GPS-Navigation im Fahrrad-Modus errechnet Ihre Route anhand von Radwegen
@@ -2596,7 +2596,7 @@ Lon %2$s</string>
     <string name="shared_string_gpx_waypoints">Track-Wegpunkte</string>
     <string name="modify_the_search_query">Suchanfrage verändern.</string>
     <string name="empty_state_osm_edits">OSM-Objekte erstellen oder ändern</string>
-    <string name="empty_state_osm_edits_descr">OSM-POIs erstellen oder verändern, OSM-Notizen eröffnen oder bearbeiten, und aufgezeichnete GPX-Dateien hinzufügen.</string>
+    <string name="empty_state_osm_edits_descr">OSM-POIs erstellen oder verändern, OSM-Notizen eröffnen oder bearbeiten und aufgezeichnete GPX-Dateien hinzufügen.</string>
     <string name="shared_string_deleted">Gelöscht</string>
     <string name="shared_string_edited">Bearbeitet</string>
     <string name="shared_string_added">Hinzugefügt</string>
@@ -2782,7 +2782,7 @@ Lon %2$s</string>
     <string name="nautical_render_descr">Zur nautischen Navigation. Hauptmerkmale: Bojen, Leuchttürme, Flussläufe, Schifffahrtswege und -zeichen, Häfen, Seezeichendienste und Tiefenlinien.</string>
     <string name="ski_map_render_descr">Für Skifahrer. Enthält Pisten, Lifte, Langlaufloipen und mehr. Weniger störende sekundäre Kartenobjekte.</string>
     <string name="light_rs_render_descr">Einfacher Kartenstil für die Navigation im Auto. Sanfter Nachtmodus, Höhenlinien, kontrastreiche orangefarbene Straßen, dunkelt sekundäre Kartenobjekte ab.</string>
-    <string name="topo_render_descr">Für Wanderungen, Trekking und Naturradtouren. Im Freien lesbar. Kontrastreiche Straßen und Naturobjekte, verschiedene Routentypen, erweiterte Höhenlinienoptionen, zusätzliche Details. Die Einstellung der Oberflächenintegrität unterscheidet die Straßenqualität. Kein Nachtmodus.</string>
+    <string name="topo_render_descr">Für Wanderungen, Trekking und Radfahren in der Natur. Im Freien lesbar. Kontrastreiche Straßen und Naturobjekte, verschiedene Routentypen, erweiterte Höhenlinienoptionen, zusätzliche Details. Die Einstellung der Oberflächenbeschaffenheit kennzeichnet die Straßenqualität. Kein Nachtmodus.</string>
     <string name="mapnik_render_descr">Alter Mapnik-Stil. Farben ähnlich dem Mapnik-Stil.</string>
     <string name="default_render_descr">Universeller Stil. Klare Darstellung dicht besiedelter Städte. Hauptmerkmale: Höhenlinien, Routen, Oberflächenqualität, Zufahrtsbeschränkungen, Straßenschilder, Wegeführung nach SAC-Skala, Wildwassersportmerkmale.</string>
     <string name="shared_string_bookmark">Lesezeichen</string>
@@ -2963,7 +2963,7 @@ Lon %2$s</string>
     <string name="rendering_attr_smoothness_impassable_name">Unpassierbar</string>
     <string name="rendering_attr_highway_class_motorway_name">Autobahn</string>
     <string name="rendering_attr_highway_class_state_road_name">Staatsstraße</string>
-    <string name="rendering_attr_highway_class_road_name">Straße</string>
+    <string name="rendering_attr_highway_class_road_name">Landstraße</string>
     <string name="rendering_attr_highway_class_street_name">Straße</string>
     <string name="rendering_attr_highway_class_service_name">Dienstleistung</string>
     <string name="rendering_attr_highway_class_footway_name">Gehweg</string>
@@ -3051,7 +3051,7 @@ Lon %2$s</string>
     <string name="collected_data_descr">Bestimmen Sie, welche Daten Sie für OsmAnd freigeben.</string>
     <string name="downloaded_maps_collect_descr">Helfen Sie uns, die Beliebtheit von Karten für Länder und Regionen herauszufinden.</string>
     <string name="visited_screens_collect_descr">Helfen Sie uns, die Beliebtheit von OsmAnd-Funktionen zu verstehen.</string>
-    <string name="privacy_and_security_change_descr">Auf „Erlauben“ tippen, wenn Sie mit %1$s einverstanden sind</string>
+    <string name="privacy_and_security_change_descr">Auf „Erlauben“ tippen, wenn Sie mit unserer %1$s einverstanden sind</string>
     <string name="settings_privacy_and_security">Datenschutz und Sicherheit</string>
     <string name="settings_privacy_and_security_desc">Wählen Sie, welche Daten sie freigeben möchten</string>
     <string name="shared_string_no_thank_you">Nein, danke</string>
@@ -3076,7 +3076,7 @@ Lon %2$s</string>
     <string name="profile_alert_need_save_msg">Änderungen am Profil zuerst speichern</string>
     <string name="profile_alert_delete_title">Profil löschen</string>
     <string name="profile_alert_delete_msg">Möchten Sie das Profil „%s“ wirklich löschen\?</string>
-    <string name="select_base_profile_dialog_title">Ein Basisprofil auswählen</string>
+    <string name="select_base_profile_dialog_title">Wählen Sie zunächst ein Profil aus</string>
     <string name="select_base_profile_dialog_message">Bauen Sie ein eigenes Anwendungsprofil auf einem der Standardprofile der App auf. Dieses bestimmt die Grundeinstellungen wie Voreinstellungen zur Sichtbarkeit von Widgets und die Einheiten für Geschwindigkeit und Entfernungen. Dies sind die App-Standardprofile zusammen mit Beispielen für eigene Anwendungsprofile, die erweitert werden können:</string>
     <string name="select_nav_profile_dialog_title">Navigationsart auswählen</string>
     <string name="base_profile_descr_car">Auto, Lkw, Motorrad</string>
@@ -3118,8 +3118,8 @@ Lon %2$s</string>
     <string name="routing_attr_allow_expert_description">Extrem schwere Routen, mit gefährlichen Hindernissen und schwieriger Umgebung.</string>
     <string name="routing_attr_allow_classic_only_name">Nur klassische Routen zulassen</string>
     <string name="routing_attr_difficulty_preference_name">Bevorzugter Schwierigkeitsgrad</string>
-    <string name="routing_attr_piste_type_downhill_name">Ski Alpin/Abfahrt</string>
+    <string name="routing_attr_piste_type_downhill_name">Ski Alpin/Abfahrtslauf</string>
-    <string name="routing_attr_piste_type_downhill_description">Pisten für Ski Alpin oder Abfahrt und Zugang zu den Skiliften.</string>
+    <string name="routing_attr_piste_type_downhill_description">Pisten für Ski Alpin oder Abfahrtslauf und Zugang zu den Skiliften.</string>
     <string name="process_downloading_service">OsmAnd Download-Dienst</string>
     <string name="shared_string_color_magenta">Magenta</string>
     <string name="shared_string_icon">Symbol</string>
@@ -3261,7 +3261,7 @@ Lon %2$s</string>
     <string name="configure_profile">Profil konfigurieren</string>
     <string name="switch_profile">Profil wechseln</string>
     <string name="language_and_output">Sprache und Ausgabe</string>
-    <string name="reset_to_default">Auf Voreinstellungen zurücksetzen</string>
+    <string name="reset_to_default">Auf Voreinstellung zurücksetzen</string>
     <string name="manage_profiles_descr">Profile erstellen, importieren, bearbeiten</string>
     <string name="manage_profiles">App-Profile verwalten…</string>
     <string name="osmand_settings_descr">Die gesamte App betreffend</string>
@@ -3376,7 +3376,7 @@ Lon %2$s</string>
     <string name="exported_osmand_profile">OsmAnd-Profil: %1$s</string>
     <string name="overwrite_profile_q">Das Profil \'%1$s\' existiert bereits. Überschreiben\?</string>
     <string name="export_profile_failed">Das Profil konnte nicht exportiert werden.</string>
-    <string name="profile_import">Profil-Import:</string>
+    <string name="profile_import">Profilimport</string>
     <string name="profile_import_descr">Um ein Profil zu importieren, wählen Sie die Profildatei auf dem Gerät aus und öffnen Sie diese mit OsmAnd.</string>
     <string name="file_import_error">%1$s Importfehler: %2$s</string>
     <string name="file_imported_successfully">%1$s erfolgreich importiert.</string>
@@ -3402,6 +3402,24 @@ Lon %2$s</string>
     <string name="suggested_maps_descr">Diese Karten sind für die Verwendung mit dem Plugin erforderlich</string>
     <string name="join_segments">Segmente verbinden</string>
     <string name="add_new_profile_q">Neues Profil \'%1$s\' hinzufügen\?</string>
-    <string name="save_heading">Überschrift einbeziehen</string>
+    <string name="save_heading">Richtung einbeziehen</string>
-    <string name="save_heading_descr">Überschrift zu jedem Trackpoint während der Aufnahme speichern.</string>
+    <string name="save_heading_descr">Richtung zu jedem Trackpunkt während der Aufnahme speichern.</string>
+    <string name="distance_and_address">%1$s • %2$s</string>
+    <string name="street_city">%1$s, %2$s</string>
+    <string name="personal_category_name">Persönlich</string>
+    <string name="shared_string_downloading_formatted">%s herunterladen</string>
+    <string name="rendering_value_thick_name">Fett</string>
+    <string name="desert_render_descr">Für Wüsten und andere dünn besiedelte Gebiete. Zeigt mehr Details in einer Ansichtsskala an.</string>
+    <string name="select_navigation_icon">Navigationssymbol wählen</string>
+    <string name="select_map_icon">Kartensymbol wählen</string>
+    <string name="delete_profiles_descr">Nachdem Sie auf Anwenden geklickt haben, gehen gelöschte Profile vollständig verloren.</string>
+    <string name="master_profile">Hauptprofil</string>
+    <string name="select_color">Farbe wählen</string>
+    <string name="edit_profiles_descr">Sie können voreingestellte OsmAnd-Profile nicht löschen, aber im vorherigen Bildschirm deaktivieren oder nach unten verschieben.</string>
+    <string name="edit_profiles">Profile bearbeiten</string>
+    <string name="select_nav_profile_dialog_message">Der Navigationstyp beeinflusst die Regeln für Routenberechnungen.</string>
+    <string name="profile_appearance">Profildarstellung</string>
+    <string name="choose_icon_color_name">Symbol, Farbe und Namen wählen</string>
+    <string name="reorder_profiles">Profilliste bearbeiten</string>
+    <string name="selected_profile">Ausgewähltes Profil</string>
 </resources>

OsmAnd/res/values-en-rGB/strings.xml

@@ -1,95 +1,95 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
+<?xml version="1.0" encoding="utf-8"?>
-	<!--
+<resources>
+    <!--
 		Our app defaults to American English with default strings in res/values
 		This file is manually maintained in res/values-en-rGB and should ONLY contain strings where a different spelling should be used for English as used in the United Kingdom
 	-->
-
+    <string name="rendering_attr_currentTrackColor_name">GPX colour</string>
-	<string name="rendering_attr_currentTrackColor_name">GPX colour</string>
+    <string name="rendering_attr_currentTrackColor_description">GPX colour</string>
-	<string name="rendering_attr_currentTrackColor_description">GPX colour</string>
+    <string name="shared_string_color">Colour</string>
-	<string name="shared_string_color">Colour</string>
+    <string name="mapnik_render_descr">Old \'Mapnik\'-style default rendering style. Key features: colours are similar to \'Mapnik\' style.</string>
-	<string name="mapnik_render_descr">Old \'Mapnik\'-style default rendering style. Key features: colours are similar to \'Mapnik\' style.</string>
+    <string name="touring_view_render_descr">High detail style for touring purposes. Includes all configuration options of default style, in addition: Displays as much detail as possible, in particular all roads, paths, and other ways to travel. Clear visual distinction between all different road types, reminiscent of many touring atlases. High contrast colour scheme for outdoor use, day and night mode.</string>
-	<string name="touring_view_render_descr">High detail style for touring purposes. Includes all configuration options of default style, in addition: Displays as much detail as possible, in particular all roads, paths, and other ways to travel. Clear visual distinction between all different road types, reminiscent of many touring atlases. High contrast colour scheme for outdoor use, day and night mode.</string>
+    <string name="unirs_render_descr">Modification of the default style to increase contrast of pedestrian and bicycle roads. Uses legacy Mapnik colours.</string>
-	<string name="unirs_render_descr">Modification of the default style to increase contrast of pedestrian and bicycle roads. Uses legacy Mapnik colours.</string>
+    <string name="add_favourites_group_to_markers_descr">Select a Favourite category to add to the markers.</string>
-	<string name="add_favourites_group_to_markers_descr">Select a Favourite category to add to the markers.</string>
+    <string name="favourites_group">Favourites category</string>
-	<string name="favourites_group">Favourites category</string>
+    <string name="add_group_descr">You can import groups from favourites or track waypoints.</string>
-	<string name="add_group_descr">You can import groups from favourites or track waypoints.</string>
+    <string name="empty_state_markers_groups_desc">You can import favourite groups or track waypoints as markers.</string>
-	<string name="empty_state_markers_groups_desc">You can import favourite groups or track waypoints as markers.</string>
+    <string name="empty_state_favourites">Add Favourites</string>
-	<string name="empty_state_favourites">Add Favourites</string>
+    <string name="empty_state_favourites_desc">Add favourites on the map or import them from a file.</string>
-	<string name="empty_state_favourites_desc">Add favourites on the map or import them from a file.</string>
+    <string name="import_gpx_file_description">can be imported as Favourites points, or as track file.</string>
-	<string name="import_gpx_file_description">can be imported as Favourites points, or as track file.</string>
+    <string name="import_as_favorites">Import as Favourites</string>
-	<string name="import_as_favorites">Import as Favourites</string>
+    <string name="search_favorites">Search favourites</string>
-	<string name="search_favorites">Search favourites</string>
+    <string name="favourites_edit_dialog_title">Favourite information</string>
-	<string name="favourites_edit_dialog_title">Favourite information</string>
+    <string name="save_as_favorites_points">Save as group of favourites</string>
-	<string name="save_as_favorites_points">Save as group of favourites</string>
+    <string name="quick_action_add_favorite">Add favourite</string>
-	<string name="quick_action_add_favorite">Add favourite</string>
+    <string name="change_color">Change colour</string>
-	<string name="change_color">Change colour</string>
+    <string name="srtm_color_scheme">Colour scheme</string>
-	<string name="srtm_color_scheme">Colour scheme</string>
+    <string name="towards">towards</string>
-	<string name="towards">towards</string>
+    <string name="access_default_color">Default colour</string>
-	<string name="access_default_color">Default colour</string>
+    <string name="rendering_value_walkingRoutesScopeOSMC_name">Colouring according to route scope</string>
-	<string name="rendering_value_walkingRoutesScopeOSMC_name">Colouring according to route scope</string>
+    <string name="rendering_value_walkingRoutesOSMC_name">Colouring according to OSMC</string>
-	<string name="rendering_value_walkingRoutesOSMC_name">Colouring according to OSMC</string>
+    <string name="shared_string_favorite">Favourite</string>
-	<string name="shared_string_favorite">Favourite</string>
+    <string name="shared_string_favorites">Favourites</string>
-	<string name="shared_string_favorites">Favourites</string>
+    <string name="shared_string_add_to_favorites">Add to Favourites</string>
-	<string name="shared_string_add_to_favorites">Add to Favourites</string>
+    <string name="shared_string_my_favorites">My Favourites</string>
-	<string name="shared_string_my_favorites">My Favourites</string>
+    <string name="traffic_warning_railways">Railway crossing</string>
-	<string name="traffic_warning_railways">Railway crossing</string>
+    <string name="traffic_warning_pedestrian">Pedestrian crossing</string>
-	<string name="traffic_warning_pedestrian">Pedestrian crossing</string>
+    <string name="show_railway_warnings">Railway crossings</string>
-	<string name="show_railway_warnings">Railway crossings</string>
+    <string name="show_pedestrian_warnings">Pedestrian crossings</string>
-	<string name="show_pedestrian_warnings">Pedestrian crossings</string>
+    <string name="rendering_attr_subwayMode_name">Underground routes</string>
-	<string name="rendering_attr_subwayMode_name">Underground routes</string>
+    <string name="fav_point_emoticons_message">The favourite point name has been modified to %1$s to facilitate properly saving the string with emoticons to a file.</string>
-	<string name="fav_point_emoticons_message">The favourite point name has been modified to %1$s to facilitate properly saving the string with emoticons to a file.</string>
+    <string name="fav_point_dublicate">Favourite point name duplicate</string>
-	<string name="fav_point_dublicate">Favourite point name duplicate</string>
+    <string name="fav_point_dublicate_message">Specified favourite name already in use, was changed to %1$s to avoid duplication.</string>
-	<string name="fav_point_dublicate_message">Specified favourite name already in use, was changed to %1$s to avoid duplication.</string>
+    <string name="speak_favorites">Nearby Favourites</string>
-	<string name="speak_favorites">Nearby Favourites</string>
+    <string name="rendering_attr_coloredBuildings_name">Colour-code buildings by type</string>
-	<string name="rendering_attr_coloredBuildings_name">Colour-code buildings by type</string>
+    <string name="osmo_edit_color">Display colour</string>
-	<string name="osmo_edit_color">Display colour</string>
+    <string name="favourites_list_activity">Select favourite</string>
-	<string name="favourites_list_activity">Select favourite</string>
+    <string name="rendering_attr_roadColors_description">Select a road colour scheme:</string>
-	<string name="rendering_attr_roadColors_description">Select a road colour scheme:</string>
+    <string name="rendering_attr_roadColors_name">Road colour scheme</string>
-	<string name="rendering_attr_roadColors_name">Road colour scheme</string>
+    <string name="favourites_search_desc">Favourites search</string>
-	<string name="favourites_search_desc">Favourites search</string>
+    <string name="fav_export_confirmation">File with previously exported favourites already exists. Do you want to replace it?</string>
-	<string name="fav_export_confirmation">File with previously exported favourites already exists. Do you want to replace it?</string>
+    <string name="search_position_favorites">Favourites…</string>
-	<string name="search_position_favorites">Favourites…</string>
+    <string name="favourites_delete_multiple_succesful">Favourite point(s) deleted successfully.</string>
-	<string name="favourites_delete_multiple_succesful">Favourite point(s) deleted successfully.</string>
+    <string name="favorite_delete_multiple">You are going to delete %1$d favourite(s) and %2$d favourite group(s). Are you sure?</string>
-	<string name="favorite_delete_multiple">You are going to delete %1$d favourite(s) and %2$d favourite group(s). Are you sure?</string>
+    <string name="fav_imported_sucessfully">Favourites successfully imported</string>
-	<string name="fav_imported_sucessfully">Favourites successfully imported</string>
+    <string name="fav_saved_sucessfully">Favourites successfully saved to {0}</string>
-	<string name="fav_saved_sucessfully">Favourites successfully saved to {0}</string>
+    <string name="no_fav_to_save">No favourite points to save</string>
-	<string name="no_fav_to_save">No favourite points to save</string>
+    <string name="share_fav_subject">Favourites shared via OsmAnd</string>
-	<string name="share_fav_subject">Favourites shared via OsmAnd</string>
+    <string name="fav_points_edited">Favourite point was edited</string>
-	<string name="fav_points_edited">Favourite point was edited</string>
+    <string name="fav_points_not_exist">No favourite points exist</string>
-	<string name="fav_points_not_exist">No favourite points exist</string>
+    <string name="add_favorite_dialog_top_text">Enter favourite name</string>
-	<string name="add_favorite_dialog_top_text">Enter favourite name</string>
+    <string name="add_favorite_dialog_default_favourite_name">Favourite</string>
-	<string name="add_favorite_dialog_default_favourite_name">Favourite</string>
+    <string name="add_favorite_dialog_favourite_added_template">Favourite point \'\'{0}\'\' was added successfully.</string>
-	<string name="add_favorite_dialog_favourite_added_template">Favourite point \'\'{0}\'\' was added successfully.</string>
+    <string name="favourites_context_menu_add">Add favourite</string>
-	<string name="favourites_context_menu_add">Add favourite</string>
+    <string name="favourites_context_menu_edit">Edit favourite</string>
-	<string name="favourites_context_menu_edit">Edit favourite</string>
+    <string name="favourites_context_menu_delete">Delete favourite</string>
-	<string name="favourites_context_menu_delete">Delete favourite</string>
+    <string name="favourites_remove_dialog_msg">Delete favourite point \'%s\'?</string>
-	<string name="favourites_remove_dialog_msg">Delete favourite point \'%s\'?</string>
+    <string name="favourites_remove_dialog_success">Favourite point {0} was successfully deleted.</string>
-	<string name="favourites_remove_dialog_success">Favourite point {0} was successfully deleted.</string>
+    <string name="replace_favorite_confirmation">Are you sure you want to replace favourite %1$s?</string>
-	<string name="replace_favorite_confirmation">Are you sure you want to replace favourite %1$s?</string>
+    <string name="always_center_position_on_map">Display position always in centre</string>
-	
+    <string name="choose_auto_follow_route">Auto-centre map view</string>
-	<string name="always_center_position_on_map">Display position always in centre</string>
+    <string name="auto_follow_route_navigation">Auto-centre nav only</string>
-	<string name="choose_auto_follow_route">Auto-centre map view</string>
+    <string name="auto_follow_route_navigation_descr">Auto-centre map view only while navigating.</string>
-	<string name="auto_follow_route_navigation">Auto-centre nav only</string>
+    <string name="auto_follow_location_enabled">Auto-centre map view in use.</string>
-	<string name="auto_follow_route_navigation_descr">Auto-centre map view only while navigating.</string>
+    <string name="search_position_map_view">Current map centre</string>
-	<string name="auto_follow_location_enabled">Auto-centre map view in use.</string>
+    <string name="search_near_map">Search near current map centre</string>
-	<string name="search_position_map_view">Current map centre</string>
+    <string name="position_on_map_center">Centre</string>
-	<string name="search_near_map">Search near current map centre</string>
+    <string name="route_general_information">Total distance %1$s, travelling time %2$d h %3$d m.</string>
-	<string name="position_on_map_center">Centre</string>
+    <string name="rendering_attr_contourColorScheme_name">Contour lines colour scheme</string>
-	<string name="route_general_information">Total distance %1$s, travelling time %2$d h %3$d m.</string>
+    <string name="quick_action_add_destination_desc">Tapping the action button will add a destination at the screen centre location.</string>
-	<string name="rendering_attr_contourColorScheme_name">Contour lines colour scheme</string>
+    <string name="quick_action_replace_destination_desc">Tapping the action button will replace the destination with the screen centre location.</string>
-	<string name="quick_action_add_destination_desc">Tapping the action button will add a destination at the screen centre location.</string>
+    <string name="quick_action_add_first_intermediate_desc">Tapping the action button will add a first intermediate point at the screen centre location.</string>
-	<string name="quick_action_replace_destination_desc">Tapping the action button will replace the destination with the screen centre location.</string>
+    <string name="quick_action_add_parking_descr">Tapping the action button will add a parking place at the screen centre location.</string>
-	<string name="quick_action_add_first_intermediate_desc">Tapping the action button will add a first intermediate point at the screen centre location.</string>
+    <string name="quick_action_add_osm_bug_descr">Tapping the action button will add an OSM note at the screen centre location.</string>
-	<string name="quick_action_add_parking_descr">Tapping the action button will add a parking place at the screen centre location.</string>
+    <string name="quick_action_add_poi_descr">Tapping the action button will add a POI at the screen centre location.</string>
-	<string name="quick_action_add_osm_bug_descr">Tapping the action button will add an OSM note at the screen centre location.</string>
+    <string name="quick_action_add_marker_descr">Tapping the action button will add a map marker at the screen centre location.</string>
-	<string name="quick_action_add_poi_descr">Tapping the action button will add a POI at the screen centre location.</string>
+    <string name="quick_action_add_gpx_descr">Tapping the action button will add a GPX waypoint at the screen centre location.</string>
-	<string name="quick_action_add_marker_descr">Tapping the action button will add a map marker at the screen centre location.</string>
+    <string name="quick_action_showhide_favorites_descr">Tapping the action button will show or hide the favourite points on the map.</string>
-	<string name="quick_action_add_gpx_descr">Tapping the action button will add a GPX waypoint at the screen centre location.</string>
+    <string name="quick_action_showhide_favorites_title">Show/hide favourites</string>
-	<string name="quick_action_showhide_favorites_descr">Tapping the action button will show or hide the favourite points on the map.</string>
+    <string name="quick_action_favorites_show">Show Favourites</string>
-	<string name="quick_action_showhide_favorites_title">Show/hide favourites</string>
+    <string name="quick_action_favorites_hide">Hide Favourites</string>
-	<string name="quick_action_favorites_show">Show Favourites</string>
+    <string name="quick_action_category_descr">Select the category to save the favourite in.</string>
-	<string name="quick_action_favorites_hide">Hide Favourites</string>
+    <string name="analyze_on_map">Analyse on map</string>
-	<string name="quick_action_category_descr">Select the category to save the favourite in.</string>
+    <string name="purchase_cancelled_dialog_title">You have cancelled your OsmAnd Live subscription</string>
-	<string name="analyze_on_map">Analyse on map</string>
+    <string name="show_transparency_seekbar">Show transparency slider</string>
-<string name="purchase_cancelled_dialog_title">You have cancelled your OsmAnd Live subscription</string>
+</resources>
-    </resources>

OsmAnd/res/values-eo/strings.xml

@@ -415,7 +415,7 @@
     <string name="agps_info">A-GPS informoj</string>
     <string name="rendering_attr_OSMMapperAssistant_name">OSM-mapiga helpilo</string>
     <string name="shared_string_manage">Administri</string>
-    <string name="agps_data_last_downloaded">Lasta elŝuto de A-GPS datumoj: %1$s</string>
+    <string name="agps_data_last_downloaded">A-GPS-datumoj elŝutitaj je %1$s</string>
     <string name="confirm_usage_speed_cameras">En multaj landoj (Germanujo, Francujo, Italujo kaj aliaj) uzado de sciigoj pri rapid-kontroliloj estas kontraŭleĝa. OsmAnd ne respondumos, se vi rompos leĝon. Bonvolu elekti “jes” nur se vi estas permesata por uzi tiun ĉi eblon.</string>
     <string name="welcome_select_region">Por korekte prezenti trafiksignojn kaj regulojn, bonvolu elekti vian trafikan regionon:</string>
     <string name="welcome_text">OsmAnd ebligas uzi tutmondajn mapojn kaj navigadon sen interreta konekto.</string>
@@ -1193,8 +1193,8 @@ Proporcia memoro %4$s MB (limito de Android %5$s MB, Dalvik %6$s MB).</string>
     <string name="left_side_navigation">Maldekstr-flanka trafiko</string>
     <string name="left_side_navigation_descr">Pro landaj kie oni veturas sur maldekstra flanko de vojo.</string>
     <string name="local_index_description">Frapetu ekzistantan elementon por vidi pliajn detalojn, premtenu por malaktivigi aŭ forigi. Datumoj en aparato nuntempe (%1$s malokupiĝa):</string>
-    <string name="unknown_location">Pozicio ankoraŭ ne estas konata</string>
+    <string name="unknown_location">Pozicio ankoraŭ ne estas konata.</string>
-    <string name="unknown_from_location">Komencpunkto ankoraŭ ne precizigita</string>
+    <string name="unknown_from_location">Komencpunkto ankoraŭ ne estas precizigita.</string>
     <string name="modify_transparency">Modifi diafanecon (0 - travidebla, 255 - maldiafana)</string>
     <string name="confirm_interrupt_download">Ĉu ĉesigi elŝutadon\?</string>
     <string name="first_time_msg">Dankon al vi por uzi OsmAnd. Elŝutu eksterretajn regionajn datumojn en la menuo “administri map-dosierojn” por esplori mapojn, serĉi adresojn, interesejojn, publikan transporton kaj pli.</string>
@@ -3061,7 +3061,7 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="profile_alert_need_save_msg">Unue konservu ŝanĝojn al la profilo</string>
     <string name="profile_alert_delete_title">Forigi profilon</string>
     <string name="profile_alert_delete_msg">Ĉu vi certe volas forigi la profilon “%s”\?</string>
-    <string name="select_base_profile_dialog_title">Elektu bazan profilon</string>
+    <string name="select_base_profile_dialog_title">Elektu komencan profilon</string>
     <string name="select_base_profile_dialog_message">Via propra profilo estos bazita sur iu implicita aplikaĵa profilo, kiu difinos bazajn agordojn kiel videblon de fenestraĵoj, unuojn de rapido kaj distanco. Jen implicitaj profiloj kaj ekzemplaj profiloj por krei:</string>
     <string name="select_nav_profile_dialog_title">Elektu navigadan profilon</string>
     <string name="base_profile_descr_car">Aŭto, kamiono, motorciklo</string>
@@ -3350,7 +3350,7 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="exported_osmand_profile">Profilo OsmAnd: %1$s</string>
     <string name="overwrite_profile_q">Profilo “%1$s” jam ekzistas. Ĉu anstataŭigi ĝin\?</string>
     <string name="export_profile_failed">Ne povas elporti profilon.</string>
-    <string name="profile_import">Enporti profilon:</string>
+    <string name="profile_import">Enporti profilon</string>
     <string name="profile_import_descr">Por enporti profilon, elektu ĝian dosieron kaj malfermu ĝin per OsmAnd.</string>
     <string name="file_import_error">Eraro dum enporti %1$s: %2$s</string>
     <string name="file_imported_successfully">Sukcese enportita: %1$s.</string>
@@ -3379,4 +3379,22 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="add_new_profile_q">Ĉu aldoni novan profilon “%1$s”\?</string>
     <string name="save_heading">Inkluzivi direkton</string>
     <string name="save_heading_descr">Konservi direkton al ĉiu punkto de kurso dum registri.</string>
+    <string name="distance_and_address">%1$s • %2$s</string>
+    <string name="street_city">%1$s, %2$s</string>
+    <string name="personal_category_name">Personaj</string>
+    <string name="shared_string_downloading_formatted">Elŝutado de %s</string>
+    <string name="rendering_value_thick_name">Dika</string>
+    <string name="desert_render_descr">Por dezertoj kaj aliaj maldense loĝataj lokoj. Montras pli da detaloj je pligrandigo.</string>
+    <string name="select_navigation_icon">Elekti emblemon de navigo</string>
+    <string name="select_map_icon">Elekti emblemon de mapo</string>
+    <string name="delete_profiles_descr">Kiam vi frapetos “apliki”, la forigitaj profiloj porĉiame perdiĝos.</string>
+    <string name="master_profile">Ĉefa profilo</string>
+    <string name="select_color">Elekti koloron</string>
+    <string name="edit_profiles_descr">Vi ne povas forigi la implicitajn profilojn de OsmAnd, sed vi povas malaktivigi ilin (ĉe la antaŭa ekrano) aŭ movi ilin suben.</string>
+    <string name="edit_profiles">Redakti profilojn</string>
+    <string name="select_nav_profile_dialog_message">Profilo de navigo influas al maniero por kalkuli kurson.</string>
+    <string name="profile_appearance">Aspekto de profilo</string>
+    <string name="choose_icon_color_name">Elekti emblemon, koloron kaj nomon</string>
+    <string name="reorder_profiles">Redakti liston de profiloj</string>
+    <string name="selected_profile">Elektita profilo</string>
 </resources>