Fix backup error handling

Add gradient coloring of route line

OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java

@@ -328,6 +328,16 @@ public class GPXUtilities {
 			}
 		}
 
+		public void setColor(ColorizationType type, int color) {
+			if (type == ColorizationType.SPEED) {
+				speedColor = color;
+			} else if (type == ColorizationType.ELEVATION) {
+				altitudeColor = color;
+			} else if (type == ColorizationType.SLOPE) {
+				slopeColor = color;
+			}
+		}
+
 		public String getBackgroundType() {
 			return getExtensionsToRead().get(BACKGROUND_TYPE_EXTENSION);
 		}
@@ -1103,6 +1113,15 @@ public class GPXUtilities {
 		return trackBounds;
 	}
 
+	public static QuadRect calculateTrackBounds(List<TrkSegment> segments) {
+		QuadRect trackBounds = new QuadRect(Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY,
+				Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY);
+		for (TrkSegment segment : segments) {
+			updateBounds(trackBounds, segment.points, 0);
+		}
+		return trackBounds;
+	}
+
 	public static void updateBounds(QuadRect trackBounds, List<WptPt> pts, int startIndex) {
 		for (int i = startIndex; i < pts.size(); i++) {
 			WptPt pt = pts.get(i);

OsmAnd-java/src/main/java/net/osmand/data/MapObject.java

@@ -16,13 +16,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.zip.GZIPInputStream;
 
 
@@ -183,7 +181,9 @@ public abstract class MapObject implements Comparable<MapObject> {
 	public String getName(String lang, boolean transliterate) {
 		if (lang != null && lang.length() > 0) {
 			if (lang.equals("en")) {
-				return getEnName(transliterate);
+				// for some objects like wikipedia, english name is stored 'name' tag
+				String enName = getEnName(transliterate);
+				return !Algorithms.isEmpty(enName) ? enName : getName();
 			} else {
 				// get name
 				if (names != null) {

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

@@ -5,8 +5,11 @@ import net.osmand.data.QuadRect;
 import net.osmand.util.Algorithms;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 public class WorldRegion implements Serializable {
 
@@ -212,4 +215,22 @@ public class WorldRegion implements Serializable {
 		}
 		return false;
 	}
+
+	public static List<WorldRegion> removeDuplicates(List<WorldRegion> regions) {
+		List<WorldRegion> copy = new ArrayList<>(regions);
+		Set<WorldRegion> duplicates = new HashSet<>();
+		for (int i = 0; i < copy.size() - 1; i++) {
+			WorldRegion r1 = copy.get(i);
+			for (int j = i + 1; j < copy.size(); j++) {
+				WorldRegion r2 = copy.get(j);
+				if (r1.containsRegion(r2)) {
+					duplicates.add(r2);
+				} else if (r2.containsRegion(r1)) {
+					duplicates.add(r1);
+				}
+			}
+		}
+		copy.removeAll(duplicates);
+		return copy;
+	}
 }

OsmAnd-java/src/main/java/net/osmand/osm/edit/OsmMapUtils.java

@@ -340,6 +340,30 @@ public class OsmMapUtils {
 		}
 	}
 
+	public static void simplifyDouglasPeucker(List<Node> nodes, int start, int end, List<Node> survivedNodes, double epsilon) {
+		double dmax = Double.NEGATIVE_INFINITY;
+		int index = -1;
+
+		Node startPt = nodes.get(start);
+		Node endPt = nodes.get(end);
+
+		for (int i = start + 1; i < end; i++) {
+			Node pt = nodes.get(i);
+			double d = MapUtils.getOrthogonalDistance(pt.getLatitude(), pt.getLongitude(),
+					startPt.getLatitude(), startPt.getLongitude(), endPt.getLatitude(), endPt.getLongitude());
+			if (d > dmax) {
+				dmax = d;
+				index = i;
+			}
+		}
+		if (dmax > epsilon) {
+			simplifyDouglasPeucker(nodes, start, index, survivedNodes, epsilon);
+			simplifyDouglasPeucker(nodes, index, end, survivedNodes, epsilon);
+		} else {
+			survivedNodes.add(nodes.get(end));
+		}
+	}
+
 	private static double orthogonalDistance(int zoom, Node nodeLineStart, Node nodeLineEnd, Node node) {
 		LatLon p = MapUtils.getProjection(node.getLatitude(), node.getLongitude(), nodeLineStart.getLatitude(),
 				nodeLineStart.getLongitude(), nodeLineEnd.getLatitude(), nodeLineEnd.getLongitude());

OsmAnd-java/src/main/java/net/osmand/router/RouteColorize.java

@@ -35,6 +35,7 @@ public class RouteColorize {
     public static final int RED = rgbaToDecimal(243, 55, 77, 255);
     public static final int[] colors = new int[] {GREEN, YELLOW, RED};
 
+    private static final float DEFAULT_BASE = 17.2f;
     private static final int MAX_SLOPE_VALUE = 25;
 
     public enum ColorizationType {
@@ -105,6 +106,10 @@ public class RouteColorize {
         }
         for (Track t : gpxFile.tracks) {
             for (TrkSegment ts : t.segments) {
+                if (ts.generalSegment || ts.points.size() < 2) {
+                    continue;
+                }
+
                 for (WptPt p : ts.points) {
                     latList.add(p.lat);
                     lonList.add(p.lon);
@@ -181,7 +186,7 @@ public class RouteColorize {
     public List<RouteColorizationPoint> getResult(boolean simplify) {
         List<RouteColorizationPoint> result = new ArrayList<>();
         if (simplify) {
-            result = simplify();
+            result = simplify(zoom);
         } else {
             for (int i = 0; i < latitudes.length; i++) {
                 result.add(new RouteColorizationPoint(i, latitudes[i], longitudes[i], values[i]));
@@ -195,7 +200,7 @@ public class RouteColorize {
 
     public int getColorByValue(double value) {
         if (Double.isNaN(value)) {
-            value = (minValue + maxValue) / 2;
+            value = colorizationType == ColorizationType.SLOPE ? minValue : (minValue + maxValue) / 2;
         }
         for (int i = 0; i < palette.length - 1; i++) {
             if (value == palette[i][VALUE_INDEX])
@@ -237,11 +242,10 @@ public class RouteColorize {
         return rgbaToDecimal(0, 0, 0, 0);
     }
 
-    private List<RouteColorizationPoint> simplify() {
+    public List<RouteColorizationPoint> simplify(int zoom) {
         if (dataList == null) {
             dataList = new ArrayList<>();
             for (int i = 0; i < latitudes.length; i++) {
-                //System.out.println(latitudes[i] + " " + longitudes[i] + " " + values[i]);
                 dataList.add(new RouteColorizationPoint(i, latitudes[i], longitudes[i], values[i]));
             }
         }
@@ -250,16 +254,20 @@ public class RouteColorize {
         for (RouteColorizationPoint data : dataList) {
             nodes.add(new net.osmand.osm.edit.Node(data.lat, data.lon, data.id));
         }
-        OsmMapUtils.simplifyDouglasPeucker(nodes, zoom + 5, 1, result, true);
+
+        double epsilon = Math.pow(2.0, DEFAULT_BASE - zoom);
+        result.add(nodes.get(0));
+        OsmMapUtils.simplifyDouglasPeucker(nodes, 0, nodes.size() - 1, result, epsilon);
 
         List<RouteColorizationPoint> simplified = new ArrayList<>();
-
-        for (int i = 1; i < result.size() - 1; i++) {
+        for (int i = 1; i < result.size(); i++) {
             int prevId = (int) result.get(i - 1).getId();
             int currentId = (int) result.get(i).getId();
             List<RouteColorizationPoint> sublist = dataList.subList(prevId, currentId);
             simplified.addAll(getExtremums(sublist));
         }
+        Node lastSurvivedPoint = result.get(result.size() - 1);
+        simplified.add(dataList.get((int) lastSurvivedPoint.getId()));
         return simplified;
     }
 
@@ -477,7 +485,7 @@ public class RouteColorize {
     }
 
     public static class RouteColorizationPoint {
-        int id;
+        public int id;
         public double lat;
         public double lon;
         public double val;

OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java

@@ -1317,7 +1317,13 @@ public class SearchCoreFactory {
 							|| !phrase.isSearchTypeAllowed(ObjectType.HOUSE)) {
 						continue;
 					}
-					res.localeName = b.getName(phrase.getSettings().getLang(), phrase.getSettings().isTransliterate());
+					if(interpolation) {
+						res.localeName = lw;
+						res.location = b.getLocation(b.interpolation(lw));
+					} else {
+						res.localeName = b.getName(phrase.getSettings().getLang(), phrase.getSettings().isTransliterate());
+						res.location = b.getLocation();
+					}
 					res.otherNames = b.getAllNames(true);
 					res.object = b;
 					res.file = file;
@@ -1328,12 +1334,6 @@ public class SearchCoreFactory {
 					res.relatedObject = s;
 					res.localeRelatedObjectName = s.getName(phrase.getSettings().getLang(), phrase.getSettings().isTransliterate());
 					res.objectType = ObjectType.HOUSE;
-					if(interpolation) {
-						res.location = b.getLocation(b.interpolation(lw));
-						res.localeName = lw;
-					} else {
-						res.location = b.getLocation();
-					}
 					res.preferredZoom = 17;
 
 					resultMatcher.publish(res);

OsmAnd-java/src/main/java/net/osmand/search/core/SearchResult.java

@@ -55,7 +55,9 @@ public class SearchResult {
 	
 	public double getSumPhraseMatchWeight() {
 		// if result is a complete match in the search we prioritize it higher
-		boolean match = requiredSearchPhrase.countWords(localeName) <= getSelfWordCount();
+		int localWordsMatched = alternateName != null ? 
+				requiredSearchPhrase.countWords(alternateName)  : requiredSearchPhrase.countWords(localeName) ;
+ 		boolean match = localWordsMatched <= getSelfWordCount();
 		double res = ObjectType.getTypeWeight(match ? objectType : null);
 		if (parentSearchResult != null) {
 			res = res + parentSearchResult.getSumPhraseMatchWeight() / MAX_TYPE_WEIGHT;

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

@@ -747,7 +747,9 @@ public class MapUtils {
 		return Math.sqrt((endX - startX) * (endX - startX) + (endY - startY) * (endY - startY));
 	}
 
-
+	public static double getSqrtDistance(float startX, float startY, float endX, float endY) {
+		return Math.sqrt((endX - startX) * (endX - startX) + (endY - startY) * (endY - startY));
+	}
 }
 
 

OsmAnd-java/src/test/java/net/osmand/search/SearchUICoreTest.java

@@ -80,9 +80,9 @@ public class SearchUICoreTest {
     	if (files != null) {
 			for (File file : files) {
 				String fileName = file.getName();
-				if(fileName.endsWith(".json")) {
+				if (fileName.endsWith(".json")) {
 					String name = fileName.substring(0, fileName.length() - ".json".length());
-					arrayList.add(new Object[] {name, file});
+					arrayList.add(new Object[] { name, file });
 				}
 			}
 		}
@@ -191,10 +191,10 @@ public class SearchUICoreTest {
 				if (!Algorithms.stringsEqual(expected, present)) {
 					System.out.println(String.format("Phrase: %s", phrase));
 					System.out.println(String.format("Mismatch for '%s' != '%s'. Result: ", expected, present));
+				}
 					for (SearchResult r : searchResults) {
 						System.out.println(String.format("\t\"%s\",", formatResult(false, r, phrase)));
 					}
-				}
 				Assert.assertEquals(expected, present);
 			}
 		}

OsmAnd-telegram/res/values-b+sr+Latn/strings.xml

@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="shared_string_select">Označi</string>
+    <string name="shared_string_enable">Omogući</string>
+    <string name="altitude">Nadmorska visina</string>
+    <string name="shared_string_search">Traži</string>
+    <string name="shared_string_ok">U redu</string>
+    <string name="shared_string_update">Ažuriraj</string>
+    <string name="average_altitude">Prosečna visina</string>
+    <string name="average_speed">Prosečna brzina</string>
+    <string name="shared_string_map">Karta</string>
+    <string name="shared_string_add">Dodaj</string>
+    <string name="shared_string_hide">Sakrij</string>
+    <string name="shared_string_status">Stanje</string>
+    <string name="shared_string_disable">Onemogući</string>
+    <string name="shared_string_save">Sačuvaj</string>
+    <string name="shared_string_name">Ime</string>
+    <string name="shared_string_sort">Sortiraj</string>
+    <string name="shared_string_exit">Izlaz</string>
+    <string name="shared_string_close">Zatvori</string>
+    <string name="shared_string_all">Sve</string>
+    <string name="shared_string_off">Isključeno</string>
+    <string name="shared_string_install">Instaliraj</string>
+    <string name="shared_string_share">Deli</string>
+    <string name="shared_string_back">Nazad</string>
+    <string name="shared_string_continue">Nastavi</string>
+    <string name="shared_string_cancel">Otkaži</string>
+    <string name="shared_string_settings">Postavke</string>
+    <string name="osmand_service">Pozadinski režim</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">nmi</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">Kilometara na sat</string>
+    <string name="si_mph">Milja na sat</string>
+    <string name="si_m_s">Metara u sekundi</string>
+    <string name="si_min_km">Minuta po kilometru</string>
+    <string name="si_min_m">Minuta po milji</string>
+    <string name="si_mi_feet">Milje/stope</string>
+    <string name="si_mi_yard">Milje/jardi</string>
+    <string name="si_km_m">Kilometri/metri</string>
+    <string name="si_nm">Nautičke milje</string>
+    <string name="si_mi_meters">Milje/metri</string>
+    <string name="shared_string_apply">Primeni</string>
+    <string name="shared_string_enabled">Uključen</string>
+    <string name="units_and_formats">Merne jedinice &amp; formatiranja</string>
+    <string name="unit_of_length_descr">Promeni jedinice za dužinu.</string>
+    <string name="unit_of_length">Jedinice dužine</string>
+    <string name="shared_string_appearance">Izgled</string>
+    <string name="timeline">Vremenska linija</string>
+    <string name="live_now">Uživo sada</string>
+    <string name="my_location">Moja lokacija</string>
+    <string name="welcome_descr"><b>OsmAnd Pratioc</b> omogućava vam da delite svoju lokaciju i vidite lokaciju drugih u OsmAndu.<br/><br/>Aplikacija koristi Telegram API, pa vam je potreban Telegram nalog.</string>
+    <string name="shared_string_second_short">sek</string>
+    <string name="shared_string_minute_short">min</string>
+    <string name="shared_string_hour_short">č</string>
+    <string name="si_nm_h">Nautičkih milja na sat (čvorovi)</string>
+    <string name="nm_h">nmi/č</string>
+    <string name="shared_string_welcome">Dobrodošli</string>
+    <string name="shared_string_authorization_descr">Unesite vaš telefonski broj Telegrama u međunarodnom formatu</string>
+    <string name="shared_string_authorization">Autorizacija</string>
+    <string name="active_chats">Aktivna ćaskanja</string>
+    <string name="show_users_on_map">Prikažite korisnike na mapi</string>
+    <string name="install_osmand">Instalirajte OsmAnd</string>
+    <string name="install_osmand_dialog_message">Prvo morate instalirati besplatnu ili plaćenu verziju OsmAnda</string>
+    <string name="osmand_logo">Logo OsmAnda</string>
+    <string name="process_service">Usluga OsmAnd Pratioca</string>
+    <string name="sharing_location">Deljenje lokacije</string>
+    <string name="share_location">Deli lokaciju</string>
+    <string name="shared_string_distance">Rastojanje</string>
+    <string name="osmand_service_descr">OsmAnd Pratioc radi u pozadini sa isključenim ekranom.</string>
+    <string name="location_service_no_gps_available">Izaberite jednog od dobavljača lokacije da bi deliti vašu lokaciju.</string>
+    <string name="gps_not_available">Uključite „Lokaciju“ u sistemskim podešavanjima</string>
+    <string name="no_location_permission">Aplikaciji nedostaje dozvola za pristup podacima o lokaciji.</string>
+    <string name="not_logged_in">Niste prijavljeni</string>
+    <string name="gps_network_not_enabled">Uključiti „Lokaciju“\?</string>
+    <string name="closing">Zatvaranje</string>
+    <string name="logging_out">Odjavljivanje</string>
+    <string name="initialization">Pokretanje</string>
+    <string name="shared_string_logout">Odjaviti se</string>
+    <string name="shared_string_login">Prijavite se</string>
+    <string name="password_descr">Telegram lozinka</string>
+    <string name="enter_password">Unesite lozinku</string>
+    <string name="authentication_code_descr">Telegram vam je poslao kod za OsmAnd radi prijave na vaš nalog.</string>
+    <string name="authentication_code">Validacioni kod</string>
+    <string name="enter_code">Unesite kod</string>
+    <string name="shared_string_password">Lozinka</string>
+    <string name="phone_number_descr">Broj telefona u međunarodnom formatu</string>
+    <string name="phone_number_title">Broj telefona</string>
+    <string name="app_name">OsmAnd Onlajn GPS Pratioc</string>
+    <string name="show_on_map">Prikaži na mapi</string>
+    <string name="start_location_sharing">Deli lokaciju</string>
+    <string name="my_location_search_hint">Pretražite: Grupu ili kontakt</string>
+    <string name="location_sharing_description">Izaberite kontakte i grupe sa kojima želite da delite lokaciju.</string>
+    <string name="set_time">Podesite vreme</string>
+    <string name="set_time_description">Podesite vreme za koji će izabrani kontakti i grupe videti vašu lokaciju u realnom vremenu.</string>
+    <string name="visible_time_for_all">Vidljivo vreme za sve</string>
+    <string name="hours_format">%1$ č</string>
+    <string name="minutes_format">%1$ m</string>
+    <string name="hours_and_minutes_format">%1$ č %2$ m</string>
+    <string name="set_visible_time_for_all">Podesite vidljivo vreme za sve</string>
+    <string name="enter_authentication_code">Unesite kod za validaciju</string>
+    <string name="enter_phone_number">Unesite broj telefona</string>
+    <string name="do_not_have_telegram">Nemam Telegram nalog</string>
+    <string name="already_registered_in_telegram">Potreban vam je registrovani Telegram nalog i broj telefona</string>
+    <string name="get_telegram_after_creating_account">Tada možete da koristite ovu aplikaciju.</string>
+    <string name="get_telegram_description_continue">Instalirajte Telegram i otvorite nalog.</string>
+    <string name="get_telegram_account_first">Za deljenje lokacije potreban vam je Telegram nalog.</string>
+    <string name="get_telegram_title">Registracija u Telegramu</string>
+    <string name="shared_string_bot">Bot</string>
+    <string name="shared_string_live">Uživo</string>
+    <string name="open_osmand">Otvori OsmAnd</string>
+    <string name="turn_off_location_sharing">Isključite deljenje lokacije</string>
+    <string name="stop_sharing_all">Deljenje je uključeno (isključite)</string>
+    <string name="expire_at">Ističe</string>
+    <string name="sharing_time">Vreme deljenja</string>
+    <string name="gps_and_location">Pozicija</string>
+    <string name="send_my_location">Pošalji moju lokaciju</string>
+    <string name="send_my_location_desc">Podesite minimalni interval za deljenje lokacije.</string>
+    <string name="stale_location">Nepomičan</string>
+    <string name="stale_location_desc">Poslednji put kada se kontakt pomerio.</string>
+    <string name="location_history">Istorija lokacije</string>
+    <string name="location_history_desc">Sakrijte kontakte koji se nisu pomerili u datom vremenu.</string>
+    <string name="osmand_connect">Osmand veza</string>
+    <string name="osmand_connect_desc">Odaberite verziju OsmAnda koju OsmAnd pratioc koristi za prikazivanje pozicija.</string>
+    <string name="in_time">u %1$</string>
+    <string name="shared_string_account">Nalog</string>
+    <string name="connected_account">Povezani nalog</string>
+    <string name="logout_help_desc">Kako isključiti OsmAnd pratioca iz Telegrama</string>
+    <string name="disconnect_from_telegram">Kako isključiti OsmAnd pratioca iz Telegrama</string>
+    <string name="disconnect_from_telegram_desc">Da biste opozvali pristup deljenju lokacije. Otvorite Telegram, idite na Podešavanja → Privatnost i bezbednost → Sesije i prekinete sesiju OsmAnd pratioca.</string>
+    <string name="logout_no_internet_msg">Povežite se na Internet kako biste se pravilno odjavili iz Telegrama.</string>
+    <string name="shared_string_group">Grupa</string>
+    <string name="last_response">Poslednji odgovor</string>
+    <string name="time_ago">pre</string>
+    <string name="turn_off_all">Isključi sve</string>
+    <string name="disable_all_sharing">Onemogući svako deljenje</string>
+    <string name="disable_all_sharing_desc">Isključuje deljenje lokacije prema svim izabranim čatovima (%1$).</string>
+    <string name="choose_osmand">Izaberite verziju OsmAnda koju želite da koristite</string>
+    <string name="choose_osmand_desc">Izaberite verziju OsmAnda gde će se kontakti prikazati na mapi.</string>
+    <string name="shared_string_sort_by">Sortiraj po</string>
+    <string name="by_group">Po grupi</string>
+    <string name="by_name">Po imenu</string>
+    <string name="by_distance">Po udaljenosti</string>
+    <string name="logout_from_osmand_telegram">Odjaviti se sa OsmAnd pratioca\?</string>
+    <string name="logout_from_osmand_telegram_descr">Jeste li sigurni da se želite odjaviti sa OsmAnd pratioca tako da ne možete da delite lokaciju ili vidite lokaciju drugih\?</string>
+    <string name="live_now_description">Kontakti i grupe dele lokaciju vama.</string>
+    <string name="share_location_as">Deljenje lokacije kao</string>
+    <string name="add_device">Dodajte uređaj</string>
+    <string name="no_internet_connection">Nema internet konekcije</string>
+    <string name="no_gps_connection">Nema GPS veze</string>
+    <string name="location_sharing_status">Deljenje: %1$</string>
+    <string name="sharing_status">Deljenje statusa</string>
+    <string name="last_available_location">Poslednja dostupna lokacija</string>
+    <string name="re_send_location">Ponovo pošalji lokaciju</string>
+    <string name="not_found_yet">Još nije pronađeno</string>
+    <string name="not_sent_yet">Još nije poslato</string>
+    <string name="shared_string_later">Kasnije</string>
+    <string name="go_to_settings">Idi na Podešavanja</string>
+    <string name="sharing_in_background">Deljenje u pozadini</string>
+    <string name="battery_optimization_description">Isključite optimizaciju baterije za OsmAnd pratilac tako da se ne isključi iznenada kad je u pozadini.</string>
+    <string name="background_work">Rad u pozadini</string>
+    <string name="background_work_description">Promenite podešavanja za optimizaciju baterije da biste stabilizovali deljenje lokacije.</string>
+    <string name="connecting_to_the_internet">Povezivanje sa Internetom</string>
+    <string name="searching_for_gps">Pozicioniranje…</string>
+    <string name="initializing">Pokretanje</string>
+    <string name="sending_location_messages">Lokacija se šalje</string>
+    <string name="waiting_for_response_from_telegram">Čeka se odgovor iz Telegrama</string>
+    <string name="not_possible_to_send_to_telegram_chats">Nije moguće poslati u Telegram četove:</string>
+    <string name="successfully_sent_and_updated">Uspešno poslato i ažurirano</string>
+    <string name="last_updated_location">Poslednja ažurirana lokacija:</string>
+    <string name="share_location_as_description">Ako želite da povežete više uređaja sa jednim nalogom telegrama, trebate koristiti drugi uređaj da bi delili vašu lokaciju.</string>
+    <string name="share_location_as_description_second_line">Možete da kreirate i vidite ID uređaja u telegram klijentu koristeći %1$ čat bot. %2$</string>
+    <string name="device_name">Ime uređaja</string>
+    <string name="device_name_cannot_be_empty">Ime uređaja ne može biti prazno</string>
+    <string name="device_name_is_too_long">Ime uređaja predugo</string>
+    <string name="enter_device_name_description">Imenujte vaš novi uređaj sa maksimalno 200 simbola.</string>
+    <string name="error_adding_new_device">Nije moguće dodati novi uređaj</string>
+    <string name="device_added_successfully">%1$ dodato.</string>
+    <string name="enter_another_device_name">Izaberite ime koje niste već koristili</string>
+    <string name="last_update_from_telegram">Poslednje ažuriranje od Telegrama</string>
+    <string name="map_and_text">Mapa i tekst</string>
+    <string name="shared_string_text">Tekst</string>
+    <string name="send_location_as_descr">Odaberite kako će izgledati poruke sa vašom lokacijom.</string>
+    <string name="send_location_as">Pošalji lokaciju kao</string>
+    <string name="start_date">Početni datum</string>
+    <string name="end_date">Krajnji datum</string>
+    <string name="open_in_osmand">Prikaži u OsmAndu</string>
+    <string name="time_on_the_move">Vreme kretanja</string>
+    <string name="monitoring_is_disabled">Praćenje je onemogućeno</string>
+    <string name="monitoring_is_enabled">Praćenje je omogućeno</string>
+    <string name="shared_string_sent">Poslato</string>
+    <string name="gps_points">GPS tačke</string>
+    <string name="shared_string_collected">Prikupljeno</string>
+    <string name="shared_string_date">Datum</string>
+    <string name="points_size">%1$ tačaka</string>
+    <string name="gps_points_in_buffer">poslato (%1$ u baferu)</string>
+    <string name="please_update_osmand">Ažurirajte OsmAnd da biste videli podatke na mapi</string>
+    <string name="show_gps_points_descr">Prikaži količinu prikupljenih i poslatih GPS tačaka.</string>
+    <string name="show_gps_points">Pokaži GPS tačke</string>
+    <string name="received_gps_points">Primljene GPKS tačke: %1$</string>
+    <string name="how_it_works">Kako radi</string>
+    <string name="osmand_privacy_policy">OsmAnd politika privatnosti</string>
+    <string name="telegram_privacy_policy">Politika privatnosti Telegrama</string>
+    <string name="shared_string_accept">Prihvati</string>
+    <string name="privacy_policy_agree">Klikom na „Nastavi“ prihvatate uslove politike privatnosti Telegrama i OsmAnda.</string>
+    <string name="privacy_policy_telegram_client">OsmAnd pratilac je jedan od klijenata koji koriste otvorenu platformu Telegram. Vaši kontakti mogu da koriste bilo koji drugi Telegram klijent.</string>
+    <string name="privacy_policy_use_telegram">Telegram (aplikacija za razmenu poruka) koristi se za povezivanje i komunikaciju sa ljudima.</string>
+    <string name="shared_string_telegram">Telegram</string>
+    <string name="app_name_short">OsmAnd pratilac</string>
+    <string name="timeline_description">Omogućite praćenje da biste sačuvali sve lokacije u istoriji.</string>
+    <string name="location_recording_enabled">Snimanje lokacije omogućeno</string>
+    <string name="disable_monitoring">Onemogućite praćenje</string>
+    <string name="timeline_available_for_free_now">Vremenska linija je funkcija koja je sada dostupna besplatno.</string>
+    <string name="type_contact_or_group_name">Unesite ime kontakta ili grupe</string>
+    <string name="search_contacts_descr">Pretraga po svim vašim grupama i kontaktima.</string>
+    <string name="search_contacts">Pretraga kontakta</string>
+    <string name="bearing">Usmerenje</string>
+    <string name="precision">Preciznost</string>
+    <string name="direction">Smer</string>
+    <string name="privacy">Privatnost</string>
+    <string name="proxy">Proksi</string>
+    <string name="proxy_settings">Podešavanja proksija</string>
+    <string name="proxy_disconnected">Prekinut</string>
+    <string name="proxy_connected">Povezan</string>
+    <string name="proxy_type">Tip proksija</string>
+    <string name="shared_string_connection">Veza</string>
+    <string name="proxy_server">Server</string>
+    <string name="proxy_port">Port</string>
+    <string name="proxy_credentials">Akreditivi</string>
+    <string name="proxy_username">Korisničko ime</string>
+    <string name="proxy_password">Lozinka</string>
+    <string name="proxy_key">Ključ</string>
+    <string name="gpx_settings">GPX podešavanja</string>
+    <string name="min_logging_speed_descr">Filter: nema zapisivanja ispod odabrane brzine</string>
+    <string name="min_logging_speed">Minimalna brzina zapisivanja</string>
+    <string name="min_logging_accuracy_descr">Filter: Nema zapisa dok se ne dostigne ova tačnost</string>
+    <string name="min_logging_accuracy">Minimalna tačnost evidentiranja</string>
+    <string name="min_logging_distance_descr">Filter: minimalna udaljenost za evidentiranje nove tačke</string>
+    <string name="min_logging_distance">Minimalna udaljenost evidentiranja</string>
+    <string name="timeline_no_data">Nema podataka</string>
+    <string name="timeline_no_data_descr">Nemamo prikupljene podatke za izabrani dan</string>
+    <string name="start_end_date">Početni — Krajnji datum</string>
+    <string name="set_time_timeline_descr">Izaberite vreme za prikaz</string>
+    <string name="shared_string_start">Početak</string>
+    <string name="shared_string_end">Kraj</string>
+    <string name="saved_messages">Sačuvane poruke</string>
+    <string name="unit_of_speed_system">Jedinica brzine</string>
+    <string name="unit_of_speed_system_descr">Definišite jedinicu brzine.</string>
+    <string name="time_zone">Vremenska zona</string>
+    <string name="time_zone_descr">Izaberite vremensku zonu koja će se prikazati u porukama lokacije.</string>
+    <string name="buffer_time">Vreme isteka bafera</string>
+    <string name="buffer_time_descr">Maksimalno vreme za skladištenje tačaka u bafer</string>
+    <string name="status_widget_title">Status Tragača OsmAnda</string>
+    <string name="shared_string_suggested">Predloženo</string>
+    <string name="back_to_osmand">Povratak na OsmAnd</string>
+    <string name="duration_ago">Pre %1$</string>
+    <string name="last_response_duration">Poslednji odgovor: pre %1$</string>
+    <string name="last_update_from_telegram_duration">Poslednje ažuriranje iz Telegrama: pre %1$</string>
+    <string name="last_response_date">Poslednji odgovor: %1$</string>
+    <string name="last_update_from_telegram_date">Poslednje ažuriranje iz Telegrama: %1$</string>
+    <string name="shared_string_error_short">Greška</string>
+    <string name="shared_string_export">Izvezi</string>
+    <string name="logcat_buffer">Logcat bafer</string>
+    <string name="logcat_buffer_descr">Proverite i podelite detaljne zapise aplikacije</string>
+    <string name="send_report">Pošalji izveštaj</string>
+</resources>

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

@@ -53,4 +53,5 @@
     <string name="si_km_m">Χιλιόμετρα/μέτρα</string>
     <string name="unit_of_length_descr">Αλλαγή απόστασης που μετριέται.</string>
     <string name="unit_of_length">Μονάδες μήκους</string>
+    <string name="shared_string_sort_by">Ταξινόμηση κατά</string>
 </resources>

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

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="average_altitude">Mezuma altitudo</string>
+    <string name="how_it_works">Kiel ĝi funkcias</string>
+    <string name="proxy_disconnected">Ne konektita</string>
+    <string name="proxy_connected">Konektita</string>
+    <string name="altitude">Altitudo</string>
+    <string name="precision">Precizeco</string>
+    <string name="privacy">Privateco</string>
+    <string name="shared_string_settings">Agordoj</string>
+    <string name="shared_string_cancel">Nuligi</string>
+    <string name="shared_string_continue">Daŭrigi</string>
+    <string name="osmand_logo">emblemo de OsmAnd</string>
+    <string name="saved_messages">Konservitaj mesaĝoj</string>
+    <string name="shared_string_second_short">s</string>
+    <string name="shared_string_minute_short">min</string>
+    <string name="shared_string_hour_short">h</string>
+    <string name="si_mi_meters">Mejloj/metroj</string>
+    <string name="si_min_m">Minutoj en mejlo</string>
+    <string name="si_min_km">Minutoj en kilometro</string>
+    <string name="si_m_s">Metroj en sekundo</string>
+    <string name="si_mph">Mejloj en horo</string>
+    <string name="si_kmh">Kilometroj en horo</string>
+    <string name="km_h">km/h</string>
+    <string name="m_s">m/s</string>
+    <string name="si_nm">Marmejloj</string>
+    <string name="si_km_m">Kilometroj/metroj</string>
+    <string name="si_mi_yard">Mejloj/jardoj</string>
+    <string name="si_mi_feet">Mejloj/futoj</string>
+    <string name="share_location">Kunhavigi lokon</string>
+    <string name="shared_string_distance">Distanco</string>
+    <string name="shared_string_welcome">Bonvenon</string>
+    <string name="m">m</string>
+    <string name="km">km</string>
+    <string name="nm">nmi</string>
+    <string name="min_mile">min/m</string>
+    <string name="min_km">min/km</string>
+    <string name="my_location">Mia loko</string>
+    <string name="start_date">Komenca dato</string>
+    <string name="end_date">Fina dato</string>
+    <string name="send_location_as">Sendi lokon kiel</string>
+    <string name="shared_string_hide">Kaŝi</string>
+    <string name="device_name">Nomo de aparato</string>
+    <string name="shared_string_add">Aldoni</string>
+    <string name="map_and_text">Mapo kaj teksto</string>
+    <string name="shared_string_text">Teksto</string>
+    <string name="shared_string_map">Mapo</string>
+    <string name="shared_string_date">Dato</string>
+    <string name="shared_string_accept">Akcepti</string>
+    <string name="shared_string_telegram">Telegram</string>
+    <string name="shared_string_ok">Bone</string>
+    <string name="shared_string_search">Serĉi</string>
+    <string name="direction">Direkto</string>
+    <string name="shared_string_enable">Ŝalti</string>
+    <string name="shared_string_connection">Konekto</string>
+    <string name="timeline_no_data">Neniu dateno</string>
+    <string name="proxy_server">Servilo</string>
+    <string name="proxy_port">Pordo</string>
+    <string name="proxy_username">Salutnomo</string>
+    <string name="proxy_password">Pasvorto</string>
+    <string name="proxy_key">Ŝlosilo</string>
+    <string name="shared_string_select">Elekti</string>
+    <string name="shared_string_start">Komenco</string>
+    <string name="shared_string_end">Fino</string>
+    <string name="time_zone">Horzono</string>
+    <string name="send_report">Sendi raporton</string>
+    <string name="search_contacts">Serĉi kontaktojn</string>
+    <string name="bearing">Direkto</string>
+    <string name="proxy_settings">Agordoj pri la Retperanto</string>
+    <string name="proxy_type">Tipo de retperanto</string>
+    <string name="units_and_formats">Mezurunuoj &amp; formoj</string>
+    <string name="shared_string_export">Elporti</string>
+    <string name="points_size">%1$d punktoj</string>
+    <string name="shared_string_appearance">Aspekto</string>
+    <string name="telegram_privacy_policy">Reguloj pri Privateco de Telegram</string>
+    <string name="osmand_privacy_policy">Reguloj pri Privateco de OsmAnd</string>
+    <string name="shared_string_update">Ĝisdatigi</string>
+    <string name="shared_string_collected">Kolektita</string>
+    <string name="open_in_osmand">Montri per OsmAnd</string>
+    <string name="background_work">Fona laboro</string>
+    <string name="no_internet_connection">Sen interreta konekto</string>
+    <string name="shared_string_status">Stato</string>
+    <string name="proxy">Retperanto</string>
+    <string name="gpx_settings">Agordoj pri GPX</string>
+    <string name="start_end_date">Komenca – Fina datoj</string>
+    <string name="unit_of_speed_system_descr">Difinu la mezurunuon de rapido.</string>
+    <string name="unit_of_length">Mezurunuoj de longo</string>
+    <string name="unit_of_speed_system">Mezurunuo de rapido</string>
+    <string name="shared_string_error_short">ERARO</string>
+    <string name="back_to_osmand">Reen al OsmAnd</string>
+    <string name="duration_ago">antaŭ %1$s</string>
+    <string name="last_response_duration">Lasta respondo: antaŭ %1$s</string>
+    <string name="last_update_from_telegram_duration">Lasta ĝisdatigo de Telegram: antaŭ %1$s</string>
+    <string name="last_update_from_telegram_date">Lasta ĝisdatigo de Telegram: %1$s</string>
+    <string name="last_response_date">Lasta respondo: %1$s</string>
+    <string name="show_users_on_map">Montri uzantojn sur la mapo</string>
+    <string name="install_osmand">Instali OsmAnd</string>
+    <string name="shared_string_suggested">Sugestataj</string>
+    <string name="average_speed">Mezuma rapido</string>
+    <string name="shared_string_back">Reen</string>
+    <string name="shared_string_share">Kunhavigi</string>
+    <string name="shared_string_install">Instali</string>
+    <string name="phone_number_descr">Telefonnumero en internacia formo</string>
+    <string name="phone_number_title">Telefonnumero</string>
+    <string name="shared_string_password">Pasvorto</string>
+    <string name="nm_h">kn</string>
+    <string name="mile">mi</string>
+    <string name="foot">ft</string>
+    <string name="yard">yd</string>
+    <string name="mile_per_hour">mi/h</string>
+    <string name="si_nm_h">Marmejloj en horo (nodoj)</string>
+    <string name="shared_string_sort_by">Ordigi laŭ</string>
+    <string name="shared_string_sort">Ordigi</string>
+    <string name="by_group">Laŭ grupo</string>
+    <string name="by_name">Laŭ nomo</string>
+    <string name="by_distance">Laŭ distanco</string>
+    <string name="shared_string_name">Nomo</string>
+    <string name="shared_string_enabled">Aktiva</string>
+    <string name="connecting_to_the_internet">Konektante al Interreto</string>
+    <string name="initializing">Komencante</string>
+    <string name="sending_location_messages">Sendante lokon</string>
+    <string name="password_descr">Pasvorto de Telegram</string>
+    <string name="enter_password">Tajpu pasvorton</string>
+    <string name="show_on_map">Montri sur mapo</string>
+    <string name="hours_format">%1$d h</string>
+    <string name="minutes_format">%1$d min</string>
+    <string name="hours_and_minutes_format">%1$d h %2$d min</string>
+    <string name="shared_string_sent">Sendita</string>
+    <string name="not_logged_in">Vi ne estas salutinta</string>
+    <string name="closing">Fermante</string>
+    <string name="logging_out">Adiaŭante</string>
+    <string name="initialization">Lanĉante</string>
+    <string name="shared_string_logout">Adiaŭi</string>
+    <string name="shared_string_login">Saluti</string>
+    <string name="osmand_service">Fona reĝimo</string>
+    <string name="shared_string_off">Malaktiva</string>
+    <string name="shared_string_all">Ĉiuj</string>
+    <string name="shared_string_close">Fermi</string>
+    <string name="shared_string_exit">Eliri</string>
+    <string name="shared_string_save">Konservi</string>
+    <string name="shared_string_disable">Malaktivigi</string>
+    <string name="shared_string_apply">Apliki</string>
+    <string name="unit_of_length_descr">Ŝanĝi unuojn por reprezenti distancoj.</string>
+    <string name="logcat_buffer">Bufro logcat</string>
+    <string name="logcat_buffer_descr">Legi kaj kunhavigi detalajn protokolojn de la aplikaĵo</string>
+</resources>

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

@@ -237,7 +237,7 @@
     <string name="not_possible_to_send_to_telegram_chats">Impossible d\'envoyer dans les discussions Telegram :</string>
     <string name="successfully_sent_and_updated">Envoyé et mis à jour avec succès</string>
     <string name="last_updated_location">Dernière position mise à jour :</string>
-    <string name="share_location_as_description">Si vous voulez connecter plusieurs appareils à un même compte Telegram, vous devez utiliser un appareil différent pour partager votre position.</string>
+    <string name="share_location_as_description">Si vous souhaitez connecter plusieurs appareils à un même compte Telegram, vous devez partager votre position depuis chaque appareil.</string>
     <string name="share_location_as_description_second_line">Vous pouvez créer et visualiser l\'identifiant du périphérique dans le client Telegram en utilisant le chat-bot %1$s. %2$s</string>
     <string name="enter_device_name_description">Nommez votre nouveau périphérique en max 200 symboles.</string>
     <string name="enter_another_device_name">Choisissez un nom que vous n\'avez pas encore utilisé</string>
@@ -266,7 +266,7 @@
     <string name="location_history_desc">Cacher les contacts qui ne se sont pas déplacés depuis un temps donné.</string>
     <string name="set_time_description">Définissez l\'heure à laquelle les contacts et groupes sélectionnés verront votre position en temps réel.</string>
     <string name="osmand_connect">OsmAnd connect</string>
-    <string name="time_ago">depuis</string>
+    <string name="time_ago">il y a</string>
     <string name="logcat_buffer">Buffer Logcat</string>
     <string name="logcat_buffer_descr">Vérifier et partager les logs détaillés de l\'application</string>
     <string name="shared_string_export">Exporter</string>

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

@@ -109,7 +109,7 @@
     <string name="get_telegram_description_continue">Kérjük, telepítse a Telegramot és hozzon létre egy fiókot.</string>
     <string name="get_telegram_after_creating_account">Utána használhatja ezt az alkalmazást.</string>
     <string name="shared_string_all">Minden</string>
-    <string name="shared_string_off">Kikapcsolás</string>
+    <string name="shared_string_off">Kikapcsolva</string>
     <string name="hours_and_minutes_format">%1$d óra %2$d perc</string>
     <string name="minutes_format">%1$d perc</string>
     <string name="shared_string_install">Telepítés</string>

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

@@ -22,7 +22,7 @@
     <string name="proxy_port">ポート</string>
     <string name="proxy_server">サーバー</string>
     <string name="shared_string_connection">接続</string>
-    <string name="shared_string_enable">有効</string>
+    <string name="shared_string_enable">有効化</string>
     <string name="proxy_type">プロキシタイプ</string>
     <string name="proxy_connected">接続しました</string>
     <string name="proxy_disconnected">切断しました</string>

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

@@ -2,12 +2,12 @@
 <resources>
     <string name="timeline_no_data">Sem dados</string>
     <string name="shared_string_select">Selecionar</string>
-    <string name="min_logging_distance">Distância mínima de registro</string>
-    <string name="min_logging_distance_descr">Filtro: distância mínima para registrar um novo ponto</string>
-    <string name="min_logging_accuracy">Precisão mínima de registro</string>
-    <string name="min_logging_accuracy_descr">Filtro: sem registro, a menos que a precisão seja atingida</string>
-    <string name="min_logging_speed">Velocidade mínima de registro</string>
-    <string name="min_logging_speed_descr">Filtro: sem registro abaixo da velocidade selecionada</string>
+    <string name="min_logging_distance">Distância mínima de registo</string>
+    <string name="min_logging_distance_descr">Filtro: distância mínima para registar um novo ponto</string>
+    <string name="min_logging_accuracy">Precisão mínima de registo</string>
+    <string name="min_logging_accuracy_descr">Filtro: sem registo, a não ser que seja atingida a precisão</string>
+    <string name="min_logging_speed">Velocidade mínima de registo</string>
+    <string name="min_logging_speed_descr">Filtro: sem registo abaixo da velocidade selecionada</string>
     <string name="proxy_password">Palavra-passe</string>
     <string name="proxy_username">Nome de utilizador</string>
     <string name="shared_string_enable">Ativar</string>
@@ -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">Rastreador OsmAnd</string>
+    <string name="app_name_short">OsmAnd Tracker</string>
     <string name="shared_string_telegram">Telegram</string>
     <string name="shared_string_appearance">Aparência</string>
     <string name="shared_string_update">Atualizar</string>
@@ -35,13 +35,13 @@
     <string name="shared_string_end">Fim</string>
     <string name="shared_string_start">Iniciar</string>
     <string name="shared_string_apply">Aplicar</string>
-    <string name="set_time_timeline_descr">Selecionar a hora para exibir</string>
+    <string name="set_time_timeline_descr">Selecionar a hora de visualização</string>
     <string name="start_end_date">Data de início - fim</string>
-    <string name="timeline_no_data_descr">Não coletamos dados para o dia selecionado</string>
+    <string name="timeline_no_data_descr">Não temos dados recolhidos para o dia selecionado</string>
     <string name="gpx_settings">Configurações de GPX</string>
     <string name="proxy_key">Chave</string>
     <string name="proxy_credentials">Credenciais</string>
-    <string name="proxy_port">Port</string>
+    <string name="proxy_port">Porta</string>
     <string name="proxy_server">Servidor</string>
     <string name="shared_string_connection">Conexão</string>
     <string name="proxy_type">Tipo de proxy</string>
@@ -50,16 +50,16 @@
     <string name="proxy_settings">Configurações de proxy</string>
     <string name="proxy">Proxy</string>
     <string name="precision">Precisão</string>
-    <string name="bearing">Rolamento</string>
-    <string name="search_contacts">Pesquisar contatos</string>
-    <string name="search_contacts_descr">Pesquise em todos os seus grupos e contatos.</string>
-    <string name="type_contact_or_group_name">Digite o nome do contato ou do grupo</string>
+    <string name="bearing">Rumo</string>
+    <string name="search_contacts">Pesquisar contactos</string>
+    <string name="search_contacts_descr">Pesquise em todos os seus grupos e contactos.</string>
+    <string name="type_contact_or_group_name">Digite o nome do contacto ou do grupo</string>
     <string name="timeline_available_for_free_now">Linha do tempo é um recurso disponível agora gratuitamente.</string>
-    <string name="disable_monitoring">Desativar monitoramento</string>
+    <string name="disable_monitoring">Desativar monitorização</string>
     <string name="location_recording_enabled">Gravação de localização ativada</string>
-    <string name="timeline_description">Ative o monitoramento para gravar todos os locais no histórico.</string>
-    <string name="privacy_policy_use_telegram">Telegram (a app de mensagens) é usado para conectar e comunicar com as pessoas.</string>
-    <string name="privacy_policy_telegram_client">OsmAnd tracker é um dos clientes que usam a Plataforma aberta do Telegram . Seus contatos podem usar qualquer outro cliente Telegram.</string>
+    <string name="timeline_description">Ative a monitorização para gravar todos os locais no histórico.</string>
+    <string name="privacy_policy_use_telegram">O Telegram (a aplicação de mensagens) é usado para conectar e comunicar com outras pessoas.</string>
+    <string name="privacy_policy_telegram_client">OsmAnd Tracker é um dos clientes que usam a Plataforma aberta do Telegram. Os seus contactos podem usar qualquer outro cliente Telegram.</string>
     <string name="privacy_policy_agree">Ao clicar em \"Continuar\" concorda com as condições da política de privacidade do Telegram e OsmAnd.</string>
     <string name="shared_string_accept">Aceitar</string>
     <string name="telegram_privacy_policy">Política de privacidade do Telegram</string>
@@ -67,68 +67,68 @@
     <string name="how_it_works">Como funciona</string>
     <string name="received_gps_points">Pontos GPX recebidos: %1$s</string>
     <string name="show_gps_points">Mostrar pontos de GPS</string>
-    <string name="show_gps_points_descr">Mostrar quantidade de pontos de GPS coletados e enviados.</string>
+    <string name="show_gps_points_descr">Mostrar quantidade de pontos de GPS recolhidos e enviados.</string>
     <string name="please_update_osmand">Por favor, atualize o OsmAnd para ver os dados no mapa</string>
     <string name="gps_points_in_buffer">enviado (%1$d em buffer)</string>
     <string name="points_size">%1$d pontos</string>
-    <string name="shared_string_collected">Coletado</string>
+    <string name="shared_string_collected">Recolhidos</string>
     <string name="gps_points">Pontos de GPS</string>
     <string name="shared_string_sent">Enviado</string>
-    <string name="monitoring_is_enabled">Monitoramento está ativado</string>
-    <string name="monitoring_is_disabled">Monitoramento está desativado</string>
+    <string name="monitoring_is_enabled">A monitorização está ativada</string>
+    <string name="monitoring_is_disabled">A monitorização está desativada</string>
     <string name="open_in_osmand">Mostrar no OsmAnd</string>
-    <string name="end_date">Data final</string>
+    <string name="end_date">Data de fim</string>
     <string name="send_location_as">Enviar localização como</string>
-    <string name="send_location_as_descr">Escolha como as mensagens com sua localização serão exibidas.</string>
+    <string name="send_location_as_descr">Escolha a forma como as mensagens com a sua localização serão mostradas.</string>
     <string name="map_and_text">Mapa e texto</string>
     <string name="last_update_from_telegram">Última atualização do Telegram</string>
     <string name="enter_another_device_name">Escolha um nome que ainda não usou</string>
     <string name="device_added_successfully">%1$s adicionado.</string>
-    <string name="error_adding_new_device">Não foi possível adicionar novo aparelho</string>
-    <string name="enter_device_name_description">Nomeie seu novo aparelho no máximo 200 símbolos.</string>
-    <string name="device_name_is_too_long">Nome do aparelho muito longo</string>
-    <string name="device_name_cannot_be_empty">O nome do aparelho não pode estar vazio</string>
-    <string name="device_name">Nome do aparelho</string>
-    <string name="share_location_as_description_second_line">Pode criar e visualizar o ID do aparelho no cliente de telegrama usando o bot de bate-papo %1$s. %2$s</string>
-    <string name="share_location_as_description">Se deseja conectar vários aparelhos a uma conta de telegrama, é necessário usar um aparelho diferente para compartilhar a sua localização.</string>
+    <string name="error_adding_new_device">Não foi possível adicionar o novo dispositivo</string>
+    <string name="enter_device_name_description">Atribua um nome a seu novo dispositivo com o máximo de 200 caracteres.</string>
+    <string name="device_name_is_too_long">Nome do dispositivo muito longo</string>
+    <string name="device_name_cannot_be_empty">O nome do dispositivo não pode estar vazio</string>
+    <string name="device_name">Nome do dispositivo</string>
+    <string name="share_location_as_description_second_line">Pode criar e visualizar o ID do dispositivo no cliente de Telegram usando o robô de bate-papo %1$s. %2$s</string>
+    <string name="share_location_as_description">Se quer conectar vários dispositivos a uma conta no Telegram, é necessário usar um dispositivo diferente para partilhar a sua localização.</string>
     <string name="last_updated_location">Última localização atualizada:</string>
     <string name="successfully_sent_and_updated">Enviado e atualizado com sucesso</string>
     <string name="not_possible_to_send_to_telegram_chats">Não é possível enviar para bate-papo do Telegram:</string>
-    <string name="waiting_for_response_from_telegram">Aguardando resposta do Telegram</string>
-    <string name="sending_location_messages">enviando localização</string>
-    <string name="initializing">Iniciando</string>
-    <string name="searching_for_gps">Posicionando…</string>
+    <string name="waiting_for_response_from_telegram">A aguardar a resposta do Telegram</string>
+    <string name="sending_location_messages">A enviar a localização</string>
+    <string name="initializing">A iniciar</string>
+    <string name="searching_for_gps">A posicionar…</string>
     <string name="connecting_to_the_internet">Conectando-se à Internet</string>
-    <string name="background_work_description">Altere as configurações de otimização da bateria para estabilizar o compartilhamento de local.</string>
+    <string name="background_work_description">Altere as configurações de otimização da bateria para estabilizar a partilha da localização.</string>
     <string name="background_work">Funcionamento em segundo plano</string>
     <string name="battery_optimization_description">Desative a otimização da bateria do OsmAnd Tracker para que ele não seja desligado repentinamente quando estiver em segundo plano.</string>
-    <string name="sharing_in_background">Compartilhando em segundo plano</string>
-    <string name="go_to_settings">Vá para as configurações</string>
+    <string name="sharing_in_background">Partilha em segundo plano</string>
+    <string name="go_to_settings">Ir às configurações</string>
     <string name="not_sent_yet">Ainda não enviado</string>
     <string name="not_found_yet">Ainda não encontrado</string>
     <string name="re_send_location">Reenvie o local</string>
     <string name="last_available_location">Última localização disponível</string>
-    <string name="sharing_status">Estado de compartilhamento</string>
-    <string name="location_sharing_status">Compartilhamento: %1$s</string>
+    <string name="sharing_status">Estado da partilha</string>
+    <string name="location_sharing_status">Partilha: %1$s</string>
     <string name="shared_string_enabled">Ativado</string>
     <string name="no_gps_connection">Sem conexão GPS</string>
-    <string name="no_internet_connection">Sem conexão com a internet</string>
+    <string name="no_internet_connection">Sem ligação à Internet</string>
     <string name="shared_string_disable">Desativar</string>
-    <string name="shared_string_save">Gravar</string>
-    <string name="add_device">Adicionar aparelho</string>
-    <string name="share_location_as">Compartilhar localização como</string>
-    <string name="live_now_description">Contatos e grupos compartilhando o local consigo.</string>
-    <string name="logout_from_osmand_telegram_descr">Tem certeza de que deseja sair do OsmAnd Tracker para que não possa compartilhar o local ou ver a localização de outras pessoas\?</string>
+    <string name="shared_string_save">Guardar</string>
+    <string name="add_device">Adicionar dispositivo</string>
+    <string name="share_location_as">Partilhar localização como</string>
+    <string name="live_now_description">Contactos e grupos partilhando a localização consigo.</string>
+    <string name="logout_from_osmand_telegram_descr">Tem a certeza de que quer sair do OsmAnd Tracker para que não possa partilhar a localização ou ver a localização de outras pessoas\?</string>
     <string name="logout_from_osmand_telegram">Sair do OsmAnd Tracker\?</string>
     <string name="shared_string_name">Nome</string>
     <string name="by_distance">Pela distância</string>
     <string name="by_name">Por nome</string>
     <string name="by_group">Por grupo</string>
     <string name="shared_string_sort">Ordenar</string>
-    <string name="choose_osmand_desc">Selecione a versão OsmAnd, onde os contatos serão exibidos no mapa.</string>
+    <string name="choose_osmand_desc">Selecione a versão OsmAnd onde os contactos serão mostrados no mapa.</string>
     <string name="choose_osmand">Selecione a versão do OsmAnd para usar</string>
-    <string name="disable_all_sharing_desc">Desativa o compartilhamento de local para todos os bate-papos selecionados (%1$d).</string>
-    <string name="disable_all_sharing">Desativar todo o compartilhamento</string>
+    <string name="disable_all_sharing_desc">Desativa a partilha da localização para todos os bate-papos selecionados (%1$d).</string>
+    <string name="disable_all_sharing">Desativar todas as partilhas</string>
     <string name="turn_off_all">Desligue todos</string>
     <string name="shared_string_exit">Sair</string>
     <string name="time_ago">atrás</string>
@@ -136,34 +136,34 @@
     <string name="shared_string_group">Grupo</string>
     <string name="logout_no_internet_msg">Conecte-se à Internet para efetuar a saída do Telegram corretamente.</string>
     <string name="shared_string_close">Fechar</string>
-    <string name="disconnect_from_telegram_desc">Para revogar o acesso ao compartilhamento de local. Abra o Telegram, vá para Configurações → Privacidade e Segurança → Sessões e termine a sessão do OsmAnd Tracker.</string>
+    <string name="disconnect_from_telegram_desc">Para revogar o acesso à partilha da localização. Abra o Telegram, vá para Configurações → Privacidade e Segurança → Sessões e termine a sessão do OsmAnd Tracker.</string>
     <string name="disconnect_from_telegram">Como desativar o OsmAnd Tracker para Telegram</string>
     <string name="logout_help_desc">Como desativar o OsmAnd Tracker para Telegram</string>
     <string name="connected_account">Conta conectada</string>
     <string name="shared_string_account">Conta</string>
     <string name="in_time">no %1$s</string>
-    <string name="osmand_connect_desc">Escolha a versão OsmAnd que OsmAnd Tracker usa para exibir posições.</string>
+    <string name="osmand_connect_desc">Escolha a versão OsmAnd que OsmAnd Tracker usa para mostrar posições.</string>
     <string name="osmand_connect">Conectar OsmAnd</string>
     <string name="location_history_desc">Ocultar contactos que não foram movidos num determinado momento.</string>
     <string name="location_history">Histórico de localização</string>
-    <string name="stale_location_desc">A última vez que um contato foi movido.</string>
+    <string name="stale_location_desc">A última vez que um contacto foi movido.</string>
     <string name="stale_location">Parado</string>
-    <string name="send_my_location_desc">Defina o intervalo mínimo para o compartilhamento de local.</string>
-    <string name="send_my_location">Enviar minha localização</string>
+    <string name="send_my_location_desc">Defina o intervalo mínimo para a partilha da localização.</string>
+    <string name="send_my_location">Enviar a minha localização</string>
     <string name="gps_and_location">Posição</string>
-    <string name="sharing_time">Tempo de compartilhamento</string>
+    <string name="sharing_time">Tempo de partilha</string>
     <string name="expire_at">Expira</string>
-    <string name="stop_sharing_all">O compartilhamento está ativado (desativado)</string>
-    <string name="turn_off_location_sharing">Desativar o compartilhamento de local</string>
+    <string name="stop_sharing_all">A partilha está ativada (desativar)</string>
+    <string name="turn_off_location_sharing">Desativar a partilha da localização</string>
     <string name="open_osmand">Abrir OsmAnd</string>
-    <string name="shared_string_live">Vivo</string>
+    <string name="shared_string_live">Tempo real</string>
     <string name="shared_string_bot">Robô</string>
-    <string name="get_telegram_title">Registro no Telegram</string>
-    <string name="get_telegram_account_first">Precisa de uma conta do Telegram para usar o compartilhamento de local.</string>
+    <string name="get_telegram_title">Registo no Telegram</string>
+    <string name="get_telegram_account_first">Precisa de uma conta do Telegram para usar a partilha de localização.</string>
     <string name="get_telegram_description_continue">Por favor, instale o Telegram e configure uma conta.</string>
-    <string name="get_telegram_after_creating_account">Então pode usar esta app.</string>
-    <string name="shared_string_all">Todos</string>
-    <string name="shared_string_off">Desligado</string>
+    <string name="get_telegram_after_creating_account">Depois pode usar esta aplicação.</string>
+    <string name="shared_string_all">Tudo</string>
+    <string name="shared_string_off">Desativado</string>
     <string name="already_registered_in_telegram">Precisa de uma conta e número de telefone registados no Telegram</string>
     <string name="do_not_have_telegram">Não tenho uma conta do Telegram</string>
     <string name="enter_phone_number">Digite o número de telefone</string>
@@ -173,42 +173,42 @@
     <string name="minutes_format">%1$d m</string>
     <string name="hours_format">%1$d h</string>
     <string name="shared_string_install">Instalar</string>
-    <string name="shared_string_share">Compartilhar</string>
+    <string name="shared_string_share">Partilhar</string>
     <string name="shared_string_back">Voltar</string>
     <string name="visible_time_for_all">Hora visível para todos</string>
-    <string name="set_time_description">Defina a hora em que seus contatos e grupos selecionados verão sua localização em tempo real.</string>
-    <string name="set_time">Definir tempo</string>
-    <string name="location_sharing_description">Selecione os contactos e grupos com os quais deseja compartilhar sua localização.</string>
-    <string name="my_location_search_hint">Pesquisa: Grupo ou contato</string>
-    <string name="start_location_sharing">Compartilhar localização</string>
+    <string name="set_time_description">Defina a hora em que os seus contactos e grupos selecionados verão a sua localização em tempo real.</string>
+    <string name="set_time">Definir hora</string>
+    <string name="location_sharing_description">Selecione os contactos e grupos com os quais deseja partilhar a sua localização.</string>
+    <string name="my_location_search_hint">Pesquisa: grupo ou contacto</string>
+    <string name="start_location_sharing">Partilhar localização</string>
     <string name="show_on_map">Mostrar no mapa</string>
     <string name="app_name">OsmAnd Online GPS Tracker</string>
     <string name="phone_number_title">Número de telefone</string>
     <string name="phone_number_descr">Número de telefone no formato internacional</string>
     <string name="shared_string_password">Palavra-passe</string>
     <string name="enter_code">Digite o código</string>
-    <string name="authentication_code">Código de Autenticação</string>
-    <string name="authentication_code_descr">Uma faixa GPX é salva automaticamente durante a navegação.</string>
+    <string name="authentication_code">Código de autenticação</string>
+    <string name="authentication_code_descr">O Telegram enviou-lhe um código para o OsmAnd para iniciar sessão na sua conta.</string>
     <string name="enter_password">Digite a palavra-passe</string>
-    <string name="password_descr">Palavra-passe do telegrama</string>
+    <string name="password_descr">Palavra-passe do Telegram</string>
     <string name="shared_string_login">Entrar</string>
     <string name="shared_string_logout">Sair</string>
-    <string name="initialization">Iniciando</string>
-    <string name="logging_out">Saindo</string>
-    <string name="closing">Fechando</string>
+    <string name="initialization">A iniciar</string>
+    <string name="logging_out">A terminar sessão</string>
+    <string name="closing">A fechar</string>
     <string name="gps_network_not_enabled">Ativar \"Localização\"\?</string>
-    <string name="not_logged_in">você não está logado no</string>
+    <string name="not_logged_in">Não tem a sessão iniciada</string>
     <string name="shared_string_continue">Continuar</string>
     <string name="shared_string_cancel">Cancelar</string>
     <string name="shared_string_settings">Configurações</string>
-    <string name="no_location_permission">A app não tem permissão para acessar os dados de localização.</string>
-    <string name="gps_not_available">Por favor, ligue \"Localização\" nas configurações do sistema</string>
-    <string name="location_service_no_gps_available">Selecione um dos provedores de localização para compartilhar sua localização.</string>
-    <string name="osmand_service">Modo de fundo</string>
-    <string name="osmand_service_descr">OsmAnd Tracker é executado em segundo plano com o ecrã desligado.</string>
+    <string name="no_location_permission">A aplicação não tem permissão para aceder aos dados de localização.</string>
+    <string name="gps_not_available">Por favor, ative a \"Localização\" nas configurações do sistema</string>
+    <string name="location_service_no_gps_available">Selecione um dos fornecedores de localização para partilhar a sua localização.</string>
+    <string name="osmand_service">Modo em segundo plano</string>
+    <string name="osmand_service_descr">O OsmAnd Tracker é executado em segundo plano com o ecrã desligado.</string>
     <string name="shared_string_distance">Distância</string>
-    <string name="share_location">Compartilhar localização</string>
-    <string name="sharing_location">Compartilhando localização</string>
+    <string name="share_location">Partilhar localização</string>
+    <string name="sharing_location">A partilhar a localização</string>
     <string name="process_service">Serviço OsmAnd Tracker</string>
     <string name="osmand_logo">Logotipo do OsmAnd</string>
     <string name="install_osmand_dialog_message">Precisa instalar a versão gratuita ou paga do OsmAnd primeiro</string>
@@ -229,13 +229,13 @@
     <string name="nm_h">mn/h</string>
     <string name="m_s">m/s</string>
     <string name="km_h">km/h</string>
-    <string name="mile_per_hour">mph</string>
+    <string name="mile_per_hour">mi/h</string>
     <string name="si_kmh">Quilómetros por hora</string>
     <string name="si_mph">Milhas por hora</string>
     <string name="si_m_s">Metros por segundo</string>
     <string name="si_min_km">Minutos por quilómetro</string>
     <string name="si_min_m">Minutos por milha</string>
-    <string name="si_nm_h">Milhas náuticas por hora (nó)</string>
+    <string name="si_nm_h">Milhas náuticas por hora (nós)</string>
     <string name="si_mi_feet">Milhas/pés</string>
     <string name="si_mi_yard">Milhas/jardas</string>
     <string name="si_km_m">Quilómetros/metros</string>
@@ -244,8 +244,8 @@
     <string name="shared_string_hour_short">h</string>
     <string name="shared_string_minute_short">min</string>
     <string name="shared_string_second_short">seg</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 precisa de uma conta do Telegram.</string>
-    <string name="my_location">Minha localização</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/>A aplicação usa a API do Telegram e é necessário ter uma conta no Telegram.</string>
+    <string name="my_location">A minha posição</string>
     <string name="live_now">Ao vivo agora</string>
     <string name="timeline">Cronologia</string>
     <string name="saved_messages">Mensagens gravadas</string>
@@ -259,7 +259,7 @@
     <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>
     <string name="shared_string_suggested">Sugerido</string>
-    <string name="status_widget_title">Estado do Rastreador de OsmAnd</string>
+    <string name="status_widget_title">Estado do OsmAnd Tracker</string>
     <string name="back_to_osmand">Voltar para OsmAnd</string>
     <string name="duration_ago">%1$s atrás</string>
     <string name="last_response_duration">Última resposta: %1$s atrás</string>
@@ -270,5 +270,5 @@
     <string name="send_report">Enviar o relatório</string>
     <string name="shared_string_export">Exportar</string>
     <string name="logcat_buffer">Buffer de logcat</string>
-    <string name="logcat_buffer_descr">Verifique e compartilhe registos detalhados da app</string>
+    <string name="logcat_buffer_descr">Verifique e partilhe registos detalhados da aplicação</string>
 </resources>

OsmAnd/AndroidManifest.xml

@@ -1026,6 +1026,7 @@
 		</activity>
 
 		<activity android:name="net.osmand.plus.development.TestVoiceActivity" />
+		<activity android:name="net.osmand.plus.development.TestBackupActivity" />
 		<activity android:name="net.osmand.plus.development.LogcatActivity" />
 		<activity android:name="net.osmand.plus.download.DownloadActivity" android:label="" />
 

OsmAnd/res/drawable/ic_action_alert_circle.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22ZM11,14V7H13V14H11ZM11,18V16H13V18H11Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/drawable/ic_action_cellular.xml

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,12C20,15.4738 17.7859,18.4304 14.692,19.5358L14.9449,21.5593C19.0304,20.3022 22,16.4979 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,16.4979 4.9696,20.3022 9.0551,21.5593L9.308,19.5358C6.2141,18.4304 4,15.4738 4,12C4,7.5817 7.5817,4 12,4C16.4183,4 20,7.5817 20,12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,12C18,14.4466 16.5357,16.5511 14.4356,17.485L14.1701,15.3607C15.2713,14.6482 16,13.4092 16,12C16,9.7909 14.2091,8 12,8C9.7909,8 8,9.7909 8,12C8,13.4092 8.7287,14.6482 9.8299,15.3607L9.5644,17.485C7.4643,16.5511 6,14.4466 6,12C6,8.6863 8.6863,6 12,6C15.3137,6 18,8.6863 18,12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,12C14,13.1046 13.1046,14 12,14C10.8954,14 10,13.1046 10,12C10,10.8954 10.8954,10 12,10C13.1046,10 14,10.8954 14,12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,15V22H13V15H11Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/drawable/ic_action_cellular_disable.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22.0001,12C22.0001,13.9623 21.4349,15.7926 20.4583,17.337L18.9991,15.8777C19.6369,14.7291 20.0001,13.407 20.0001,12C20.0001,7.5817 16.4183,4 12.0001,4C10.5931,4 9.271,4.3632 8.1223,5.0009L6.6631,3.5417C8.2075,2.5652 10.0378,2 12.0001,2C17.5229,2 22.0001,6.4771 22.0001,12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18.0001,12C18.0001,12.8478 17.8242,13.6545 17.507,14.3857L15.9203,12.7989C15.9726,12.5407 16.0001,12.2736 16.0001,12C16.0001,9.7909 14.2092,8 12.0001,8C11.7265,8 11.4593,8.0275 11.2012,8.0798L9.6144,6.493C10.3456,6.1758 11.1523,6 12.0001,6C15.3138,6 18.0001,8.6863 18.0001,12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14.3449,16.759L14.4357,17.485C14.5806,17.4206 14.7225,17.3506 14.8611,17.2752L16.3203,18.7344C15.8138,19.0599 15.2682,19.33 14.692,19.5358L14.945,21.5593C15.9623,21.2463 16.9105,20.7753 17.7609,20.1749L21.293,23.7071L22.7072,22.2928L2.7072,2.2929L1.293,3.7071L3.8251,6.2392C2.6754,7.8677 2.0001,9.855 2.0001,12C2.0001,16.4979 4.9696,20.3022 9.0552,21.5593L9.3081,19.5358C6.2141,18.4304 4.0001,15.4738 4.0001,12C4.0001,10.4087 4.4647,8.9258 5.2657,7.6798L6.7248,9.1389C6.2626,9.9894 6.0001,10.964 6.0001,12C6.0001,14.4466 7.4644,16.5511 9.5644,17.485L9.83,15.3607C8.7288,14.6482 8.0001,13.4092 8.0001,12C8.0001,11.5256 8.0826,11.0705 8.2342,10.6483L10.0555,12.4696C10.2305,13.197 10.8031,13.7695 11.5305,13.9446L12.5859,15H11.0001V22H13.0001V15.4142L14.3449,16.759Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/drawable/ic_action_cloud.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,18V17.9725C3.75,17.7238 2,15.8163 2,13.5C2,11.0147 4.0147,9 6.5,9C6.5998,9 6.6989,9.0033 6.7971,9.0097C7.8332,7.2109 9.7752,6 12,6C15.3137,6 18,8.6863 18,12C18,12.0574 17.9992,12.1146 17.9976,12.1716C18.3111,12.0605 18.6485,12 19,12C20.6569,12 22,13.3431 22,15C22,16.6569 20.6569,18 19,18H6Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/drawable/ic_action_cloud_alert.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,17.9725V18H19C20.6569,18 22,16.6569 22,15C22,13.3431 20.6569,12 19,12C18.6485,12 18.3111,12.0605 17.9976,12.1716C17.9992,12.1146 18,12.0574 18,12C18,8.6863 15.3137,6 12,6C9.7752,6 7.8332,7.2109 6.7971,9.0097C6.6989,9.0033 6.5998,9 6.5,9C4.0147,9 2,11.0147 2,13.5C2,15.8163 3.75,17.7238 6,17.9725ZM11,13V8H13V13H11ZM11,17V15H13V17H11Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/drawable/ic_action_cloud_upload.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14,18V15H16.5L12.5,10L8.5,15H11V18H6V17.9725C3.75,17.7238 2,15.8163 2,13.5C2,11.0147 4.0147,9 6.5,9C6.5998,9 6.6989,9.0033 6.7971,9.0097C7.8332,7.2109 9.7752,6 12,6C15.3137,6 18,8.6863 18,12C18,12.0574 17.9992,12.1146 17.9976,12.1716C18.3111,12.0605 18.6485,12 19,12C20.6569,12 22,13.3431 22,15C22,16.6569 20.6569,18 19,18H14Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/drawable/ic_action_cloud_upload_colored.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,18V17.9725C3.75,17.7238 2,15.8163 2,13.5C2,11.0147 4.0147,9 6.5,9C6.5998,9 6.6989,9.0033 6.7971,9.0097C7.8332,7.2109 9.7752,6 12,6C15.3137,6 18,8.6863 18,12C18,12.0574 17.9992,12.1146 17.9976,12.1716C18.3111,12.0605 18.6485,12 19,12C20.6569,12 22,13.3431 22,15C22,16.6569 20.6569,18 19,18H6Z"
+      android:fillColor="#6C19FF"/>
+  <path
+      android:pathData="M11,15H8.5L12.5,9.5L16.5,15H14V20H11V15Z"
+      android:fillColor="#FFC30D"/>
+</vector>

OsmAnd/res/drawable/ic_action_read_from_file.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14,2L20,8H16C14.8954,8 14,7.1046 14,6V2Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M4,4C4,2.8954 4.8954,2 6,2H14V6C14,7.1046 14.8954,8 16,8H20V20C20,21.1046 19.1046,22 18,22H6C4.8954,22 4,21.1046 4,20V4ZM11,18H13V13H15L12,9L9,13H11V18Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/drawable/ic_action_restore.xml

@@ -0,0 +1,37 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,5C12.5523,5 13,4.5523 13,4H17V8.0549C16.6717,8.0186 16.338,8 16,8C11.0294,8 7,12.0294 7,17V4H11C11,4.5523 11.4477,5 12,5Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M7,17C7,18.0519 7.1805,19.0617 7.5121,20H7V17Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M17,2.01L7,2C5.9,2 5,2.9 5,4V20C5,21.1 5.9,22 7,22H8.5155C8.1025,21.383 7.7638,20.7121 7.5121,20H7V4H11C11,4.5523 11.4477,5 12,5C12.5523,5 13,4.5523 13,4H17V8.0549C17.6935,8.1316 18.3632,8.287 19,8.5121V4C19,2.9 18.1,2.01 17,2.01Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M16,21C18.2091,21 20,19.2091 20,17C20,14.7909 18.2091,13 16,13C13.7909,13 12,14.7909 12,17H14L11,20L8,17H10C10,13.6863 12.6863,11 16,11C19.3137,11 22,13.6863 22,17C22,20.3137 19.3137,23 16,23C14.598,23 13.3082,22.5191 12.2868,21.7132L13.7159,20.2841C14.3635,20.7354 15.1508,21 16,21Z"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:gradientRadius="6.36396"
+          android:centerX="16"
+          android:centerY="17"
+          android:type="radial">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="0.8125" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#00FFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>

OsmAnd/res/drawable/ic_action_user_folder.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,3C4.8954,3 4,3.8954 4,5V7H20C20,5.8954 19.1046,5 18,5H13L11.4,3H6Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M2,7C2,5.8954 2.8954,5 4,5H10L12,7H20C21.1046,7 22,7.8954 22,9V19C22,20.1046 21.1046,21 20,21H4C2.8954,21 2,20.1046 2,19V7ZM17,12C17,13.1046 16.1046,14 15,14C13.8954,14 13,13.1046 13,12C13,10.8954 13.8954,10 15,10C16.1046,10 17,10.8954 17,12ZM10,17.5V19H20V17.5C20,15.5 17,15 15,15C13,15 10,15.5 10,17.5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/drawable/rectangle_rounded_left.xml

@@ -0,0 +1,7 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:bottomLeftRadius="@dimen/list_item_button_padding"
+        android:topLeftRadius="@dimen/list_item_button_padding" />
+    <solid android:color="@color/list_background_color_dark" />
+</shape>

OsmAnd/res/drawable/ripple_rectangle_rounded_left.xml

@@ -0,0 +1,11 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/active_buttons_and_links_trans_light">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <corners
+                android:bottomLeftRadius="@dimen/list_item_button_padding"
+                android:topLeftRadius="@dimen/list_item_button_padding" />
+            <solid android:color="@color/active_color_primary_light" />
+        </shape>
+    </item>
+</ripple>

OsmAnd/res/drawable/seekbar_progress_announcement_time.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@+id/background">
-		<shape android:shape="rectangle">
-			<solid android:color="#4d007eb3" />
-			<corners android:radius="30dp" />
-		</shape>
-	</item>
-	<item android:id="@+id/progress">
-		<shape android:shape="rectangle">
-			<solid android:color="@color/color_white" />
-			<corners android:radius="30dp" />
-		</shape>
-	</item>
-</layer-list>

OsmAnd/res/drawable/seekbar_thumb_announcement_time.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-	<item android:id="@+id/thump">
-		<shape android:shape="oval">
-			<size
-				android:width="12dp"
-				android:height="12dp" />
-			<solid android:color="@color/profile_icon_color_blue_light" />
-		</shape>
-	</item>
-</layer-list>

OsmAnd/res/drawable/seekbar_tickmark_announcement_time.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <size
-        android:width="2dp"
-        android:height="2dp" />
-    <solid android:color="#17181A" />
-</shape>

OsmAnd/res/layout-land/fragment_measurement_tool.xml

@@ -16,20 +16,34 @@
         android:focusable="true"
         android:orientation="vertical"
         android:clickable="true"
-        tools:background="@drawable/bg_bottom_menu_dark">
+        tools:ignore="UselessParent">
 
-        <ProgressBar
-            android:id="@+id/snap_to_road_progress_bar"
-            style="?android:attr/progressBarStyleHorizontal"
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="0dp"
-            android:visibility="gone"
-            tools:visibility="visible" />
+            android:layout_height="wrap_content">
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:background="@drawable/bg_contextmenu_shadow_top_light" />
+
+            <ProgressBar
+                android:id="@+id/snap_to_road_progress_bar"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="0dp"
+                android:background="?attr/list_background_color"
+                android:visibility="invisible"
+                tools:visibility="visible" />
+
+        </FrameLayout>
 
         <LinearLayout
+            android:id="@+id/main_content"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:background="?attr/list_background_color">
 
             <RelativeLayout
                 android:id="@+id/up_down_row"
@@ -53,6 +67,19 @@
                     android:background="@null"
                     tools:src="@drawable/ic_action_ruler"/>
 
+                <include
+                    layout="@layout/custom_icon_radio_buttons"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="@dimen/content_padding_half"
+                    android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
+                    android:layout_marginRight="@dimen/content_padding_half"
+                    android:layout_marginStart="@dimen/bottom_sheet_content_margin"
+                    android:background="@null" />
+
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/up_down_button"
                     android:layout_width="wrap_content"
@@ -65,6 +92,7 @@
                     android:layout_marginRight="@dimen/bottom_sheet_content_margin"
                     android:layout_marginStart="@dimen/bottom_sheet_content_margin"
                     android:background="@null"
+                    android:visibility="gone"
                     tools:src="@drawable/ic_action_arrow_down"/>
 
                 <TextView

OsmAnd/res/layout-land/map_hud_top.xml

@@ -659,6 +659,7 @@
         <!-- CENTER -->
 
         <FrameLayout
+            android:id="@+id/top_controls_container"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content">
 

OsmAnd/res/layout/bottom_sheet_announcement_time.xml

@@ -62,18 +62,12 @@
 		osmand:typeface="@string/font_roboto_medium"
 		tools:text="Normal" />
 
-	<SeekBar
-		android:id="@+id/seek_bar_arrival"
-		style="@style/Widget.AppCompat.SeekBar.Discrete"
+	<com.google.android.material.slider.Slider
+		android:id="@+id/arrival_slider"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginTop="@dimen/pages_item_margin"
-		android:maxHeight="2dp"
-		android:paddingTop="11dp"
-		android:paddingBottom="11dp"
-		osmand:tickMark="@drawable/seekbar_tickmark_announcement_time"
-		tools:max="3"
-		tools:progress="1" />
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding" />
 
 	<View
 		android:id="@+id/divider"

OsmAnd/res/layout/custom_icon_radio_buttons.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/custom_radio_buttons"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="?attr/btn_bg_border_inactive"
+    android:baselineAligned="false"
+    android:minHeight="@dimen/dialog_button_height"
+    android:orientation="horizontal">
+
+    <include
+        layout="@layout/custom_radio_btn_icon_item"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1" />
+
+    <include
+        layout="@layout/custom_radio_btn_icon_item"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1" />
+
+</LinearLayout>

OsmAnd/res/layout/custom_radio_btn_icon_item.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:background="?attr/selectableItemBackground"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/content_padding_small_half"
+    android:paddingBottom="@dimen/content_padding_small_half"
+    android:paddingLeft="@dimen/content_padding_small"
+    android:paddingRight="@dimen/content_padding_small">
+    
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/icon"
+        android:layout_width="@dimen/standard_icon_size"
+        android:layout_height="@dimen/standard_icon_size"
+        android:layout_gravity="center"
+        tools:src="@drawable/ic_action_info_dark"/>
+
+</FrameLayout>

OsmAnd/res/layout/dialog_list_item_with_compound_button.xml

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_height="wrap_content"
 	android:layout_width="match_parent"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:orientation="vertical">
 
 	<View
@@ -58,7 +59,7 @@
 			android:layout_gravity="center_vertical|start"
 			android:textColor="?android:textColorPrimary"
 			android:textSize="@dimen/default_list_text_size_large"
-			android:text="Item title"/>
+			tools:text="Item title"/>
 		
 	</LinearLayout>
 

OsmAnd/res/layout/drawer_list_radius_ex.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:paddingLeft="16dp"
-              android:paddingRight="16dp"
-              android:minHeight="50dp"
-              android:layout_marginBottom="5dp"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="horizontal"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:paddingLeft="16dp"
+	android:paddingRight="16dp"
+	android:minHeight="50dp"
+	android:layout_marginBottom="5dp"
 	android:paddingStart="16dp"
 	android:paddingEnd="16dp">
 
@@ -69,7 +70,7 @@
             android:textColor="@color/color_myloc_distance"
             android:layout_gravity="center_vertical"
             android:layout_marginTop="2dp"
-            android:text="Cinema"
+            tools:text="Cinema"
             android:layout_marginRight="16dp"
 	        android:layout_marginEnd="16dp" />
 

OsmAnd/res/layout/fragment_measurement_tool.xml

@@ -13,293 +13,314 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:background="@drawable/bg_bottom_menu_dark"
         android:orientation="vertical"
         android:clickable="true"
-        android:focusable="true">
-
-        <ProgressBar
-            android:id="@+id/snap_to_road_progress_bar"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="0dp"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-        <RelativeLayout
-            android:id="@+id/up_down_row"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/measurement_tool_up_down_row_height"
-            android:background="?attr/selectableItemBackground">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/main_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="@dimen/measurement_tool_text_button_padding"
-                android:layout_marginLeft="@dimen/measurement_tool_text_button_padding"
-                android:layout_marginRight="@dimen/measurement_tool_text_button_padding"
-                android:layout_marginStart="@dimen/measurement_tool_text_button_padding"
-                android:background="@null"
-                tools:src="@drawable/ic_action_ruler"/>
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/up_down_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="@dimen/bottom_sheet_content_margin"
-                android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
-                android:layout_marginRight="@dimen/bottom_sheet_content_margin"
-                android:layout_marginStart="@dimen/bottom_sheet_content_margin"
-                android:background="@null"
-                tools:src="@drawable/ic_action_arrow_down"/>
-
-            <TextView
-                android:id="@+id/measurement_distance_text_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/measurement_tool_button_padding"
-                android:layout_marginEnd="@dimen/text_margin_small"
-                android:layout_marginLeft="@dimen/measurement_tool_text_button_padding"
-                android:layout_marginRight="@dimen/text_margin_small"
-                android:layout_marginStart="@dimen/measurement_tool_text_button_padding"
-                android:layout_toEndOf="@id/main_icon"
-                android:layout_toRightOf="@id/main_icon"
-                android:textAppearance="@style/TextAppearance.ListItemCategoryTitle"
-                tools:text="724 m,"/>
-
-            <TextView
-                android:id="@+id/measurement_points_text_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/measurement_tool_button_padding"
-                android:layout_toEndOf="@id/measurement_distance_text_view"
-                android:layout_toRightOf="@id/measurement_distance_text_view"
-                android:layout_alignEnd="@id/up_down_button"
-                android:layout_alignRight="@id/up_down_button"
-                android:textAppearance="@style/TextAppearance.ListItemCategoryTitle"
-                tools:text="points: 3" />
-
-            <TextView
-                android:id="@+id/distance_to_center_text_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/measurement_points_text_view"
-                android:layout_alignStart="@+id/measurement_distance_text_view"
-                android:layout_alignLeft="@+id/measurement_distance_text_view"
-                android:maxLines="1"
-                android:textColor="?android:textColorSecondary"
-                android:textSize="@dimen/default_desc_text_size"
-                tools:text=" – 700 m" />
-
-            <TextView
-                android:id="@+id/move_point_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="@dimen/text_margin_small"
-                android:layout_marginLeft="@dimen/measurement_tool_text_margin"
-                android:layout_marginRight="@dimen/text_margin_small"
-                android:layout_marginStart="@dimen/measurement_tool_text_margin"
-                android:layout_toEndOf="@id/main_icon"
-                android:layout_toRightOf="@id/main_icon"
-                android:text="@string/move_point"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"
-                android:visibility="gone"/>
-
-            <TextView
-                android:id="@+id/add_point_before_after_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="@dimen/text_margin_small"
-                android:layout_marginLeft="@dimen/measurement_tool_text_margin"
-                android:layout_marginRight="@dimen/text_margin_small"
-                android:layout_marginStart="@dimen/measurement_tool_text_margin"
-                android:layout_toEndOf="@id/main_icon"
-                android:layout_toRightOf="@id/main_icon"
-                android:textAppearance="@style/TextAppearance.ListItemTitle"
-                android:visibility="gone"
-                tools:text="@string/add_point_after"/>
-        </RelativeLayout>
+        android:focusable="true"
+        tools:ignore="UselessParent">
 
         <FrameLayout
-            android:id="@+id/info_type_buttons_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <include
-                layout="@layout/custom_radio_buttons"
+            <View
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/measurement_tool_button_height"
-                android:layout_marginStart="@dimen/content_padding"
-                android:layout_marginEnd="@dimen/content_padding"
-                android:layout_marginBottom="@dimen/measurement_tool_content_padding_medium" />
+                android:layout_height="0dp"
+                android:background="@drawable/bg_contextmenu_shadow_top_light" />
+
+            <ProgressBar
+                android:id="@+id/snap_to_road_progress_bar"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="0dp"
+                android:background="?attr/list_background_color"
+                android:visibility="invisible"
+                tools:visibility="visible" />
 
         </FrameLayout>
 
-        <FrameLayout
-            android:id="@+id/cards_container"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/measurement_tool_info_cards_container_height"
-            android:visibility="gone" />
-
-        <View
-            android:id="@+id/bottom_panel_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dashboard_divider" />
-
         <LinearLayout
-            android:id="@+id/measure_mode_controls"
+            android:id="@+id/main_content"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/measurement_tool_controls_height"
-            android:paddingTop="@dimen/measurement_tool_button_margin"
-            android:paddingBottom="@dimen/measurement_tool_button_margin"
-            android:paddingLeft="@dimen/measurement_tool_button_margin"
-            android:paddingRight="@dimen/measurement_tool_button_margin"
-			android:paddingStart="@dimen/measurement_tool_button_margin"
-			android:paddingEnd="@dimen/measurement_tool_button_margin">
+            android:layout_height="wrap_content"
+            android:background="?attr/list_background_color"
+            android:orientation="vertical">
 
-            <FrameLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
+            <RelativeLayout
+                android:id="@+id/up_down_row"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/measurement_tool_up_down_row_height"
+                android:background="?attr/selectableItemBackground">
 
-                <net.osmand.plus.widgets.TextViewEx
-                    android:id="@+id/options_button"
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/main_icon"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackground"
-                    android:ellipsize="end"
-                    android:gravity="center_vertical"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="@dimen/measurement_tool_text_button_padding"
+                    android:layout_marginLeft="@dimen/measurement_tool_text_button_padding"
+                    android:layout_marginRight="@dimen/measurement_tool_text_button_padding"
+                    android:layout_marginStart="@dimen/measurement_tool_text_button_padding"
+                    android:background="@null"
+                    tools:src="@drawable/ic_action_ruler"/>
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/up_down_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="@dimen/bottom_sheet_content_margin"
+                    android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
+                    android:layout_marginRight="@dimen/bottom_sheet_content_margin"
+                    android:layout_marginStart="@dimen/bottom_sheet_content_margin"
+                    android:background="@null"
+                    tools:src="@drawable/ic_action_arrow_down"/>
+
+                <TextView
+                    android:id="@+id/measurement_distance_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/measurement_tool_button_padding"
+                    android:layout_marginEnd="@dimen/text_margin_small"
+                    android:layout_marginLeft="@dimen/measurement_tool_text_button_padding"
+                    android:layout_marginRight="@dimen/text_margin_small"
+                    android:layout_marginStart="@dimen/measurement_tool_text_button_padding"
+                    android:layout_toEndOf="@id/main_icon"
+                    android:layout_toRightOf="@id/main_icon"
+                    android:textAppearance="@style/TextAppearance.ListItemCategoryTitle"
+                    tools:text="724 m,"/>
+
+                <TextView
+                    android:id="@+id/measurement_points_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/measurement_tool_button_padding"
+                    android:layout_toEndOf="@id/measurement_distance_text_view"
+                    android:layout_toRightOf="@id/measurement_distance_text_view"
+                    android:layout_alignEnd="@id/up_down_button"
+                    android:layout_alignRight="@id/up_down_button"
+                    android:textAppearance="@style/TextAppearance.ListItemCategoryTitle"
+                    tools:text="points: 3" />
+
+                <TextView
+                    android:id="@+id/distance_to_center_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/measurement_points_text_view"
+                    android:layout_alignStart="@+id/measurement_distance_text_view"
+                    android:layout_alignLeft="@+id/measurement_distance_text_view"
                     android:maxLines="1"
-                    android:paddingStart="@dimen/measurement_tool_text_button_padding_small"
-                    android:paddingLeft="@dimen/measurement_tool_text_button_padding_small"
-                    android:paddingEnd="@dimen/measurement_tool_text_button_padding_small"
-                    android:paddingRight="@dimen/measurement_tool_text_button_padding_small"
-                    android:text="@string/shared_string_options"
-                    android:textColor="?attr/color_dialog_buttons"
-                    osmand:typeface="@string/font_roboto_medium"/>
-            </FrameLayout>
+                    android:textColor="?android:textColorSecondary"
+                    android:textSize="@dimen/default_desc_text_size"
+                    tools:text=" – 700 m" />
 
-            <ImageButton
-                android:id="@+id/undo_point_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
-                android:padding="@dimen/measurement_tool_undo_redo_padding_small"
-                android:contentDescription="@string/shared_string_undo"
-                tools:src="@drawable/ic_action_undo_dark"/>
+                <TextView
+                    android:id="@+id/move_point_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="@dimen/text_margin_small"
+                    android:layout_marginLeft="@dimen/measurement_tool_text_margin"
+                    android:layout_marginRight="@dimen/text_margin_small"
+                    android:layout_marginStart="@dimen/measurement_tool_text_margin"
+                    android:layout_toEndOf="@id/main_icon"
+                    android:layout_toRightOf="@id/main_icon"
+                    android:text="@string/move_point"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"
+                    android:visibility="gone"/>
 
-            <ImageButton
-                android:id="@+id/redo_point_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/measurement_tool_button_padding"
-                android:layout_marginStart="@dimen/measurement_tool_button_padding"
-                android:background="?attr/selectableItemBackground"
-                android:padding="@dimen/measurement_tool_undo_redo_padding_small"
-                android:contentDescription="@string/shared_string_redo"
-                tools:src="@drawable/ic_action_redo_dark"/>
+                <TextView
+                    android:id="@+id/add_point_before_after_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="@dimen/text_margin_small"
+                    android:layout_marginLeft="@dimen/measurement_tool_text_margin"
+                    android:layout_marginRight="@dimen/text_margin_small"
+                    android:layout_marginStart="@dimen/measurement_tool_text_margin"
+                    android:layout_toEndOf="@id/main_icon"
+                    android:layout_toRightOf="@id/main_icon"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"
+                    android:visibility="gone"
+                    tools:text="@string/add_point_after"/>
+            </RelativeLayout>
 
             <FrameLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:id="@+id/info_type_buttons_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
                 <include
-                    android:id="@+id/add_point_button"
-                    layout="@layout/bottom_sheet_dialog_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="end"
-                    android:minWidth="@dimen/measurement_tool_button_width" />
+                    layout="@layout/custom_radio_buttons"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/measurement_tool_button_height"
+                    android:layout_marginStart="@dimen/content_padding"
+                    android:layout_marginEnd="@dimen/content_padding"
+                    android:layout_marginBottom="@dimen/measurement_tool_content_padding_medium" />
 
             </FrameLayout>
 
-        </LinearLayout>
-
-        <RelativeLayout
-            android:id="@+id/move_point_controls"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/measurement_tool_controls_height"
-            android:visibility="gone">
-
-            <include
-                android:id="@+id/apply_move_point_button"
-                layout="@layout/bottom_sheet_dialog_button"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/measurement_tool_button_height"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="@dimen/measurement_tool_button_margin"
-                android:layout_marginRight="@dimen/measurement_tool_button_margin"
-                android:minWidth="@dimen/measurement_tool_button_width" />
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/cancel_move_point_button"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_margin="@dimen/measurement_tool_button_margin"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center_vertical"
-                android:padding="@dimen/measurement_tool_text_button_padding_small"
-                android:text="@string/shared_string_cancel"
-                android:textColor="?attr/color_dialog_buttons"
-                osmand:typeface="@string/font_roboto_medium"/>
-        </RelativeLayout>
-
-        <LinearLayout
-            android:id="@+id/add_point_before_after_controls"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/measurement_tool_controls_height"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:visibility="gone">
-
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/cancel_point_before_after_button"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_margin="@dimen/measurement_tool_button_margin"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center_vertical"
-                android:padding="@dimen/measurement_tool_text_button_padding_small"
-                android:text="@string/shared_string_cancel"
-                android:textColor="?attr/color_dialog_buttons"
-                osmand:typeface="@string/font_roboto_medium"/>
+            <FrameLayout
+                android:id="@+id/cards_container"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/measurement_tool_info_cards_container_height"
+                android:visibility="gone" />
 
             <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"/>
+                android:id="@+id/bottom_panel_divider"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="?attr/dashboard_divider" />
 
-            <include
-                android:id="@+id/apply_point_before_after_point_button"
-                android:layout_height="@dimen/measurement_tool_button_height"
-                android:layout_gravity="center_vertical"
-                android:layout_width="@dimen/measurement_tool_button_width"
-                android:layout_marginEnd="@dimen/measurement_tool_button_margin"
-                android:layout_marginRight="@dimen/measurement_tool_button_margin"
-                layout="@layout/bottom_sheet_dialog_button" />
+            <LinearLayout
+                android:id="@+id/measure_mode_controls"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/measurement_tool_controls_height"
+                android:paddingTop="@dimen/measurement_tool_button_margin"
+                android:paddingBottom="@dimen/measurement_tool_button_margin"
+                android:paddingLeft="@dimen/measurement_tool_button_margin"
+                android:paddingRight="@dimen/measurement_tool_button_margin"
+                android:paddingStart="@dimen/measurement_tool_button_margin"
+                android:paddingEnd="@dimen/measurement_tool_button_margin">
 
-            <include
-                android:id="@+id/add_point_before_after_button"
-                android:layout_height="@dimen/measurement_tool_button_height"
-                android:layout_gravity="center_vertical"
-                android:layout_width="@dimen/measurement_tool_button_width"
-                android:layout_marginEnd="@dimen/measurement_tool_button_margin"
-                android:layout_marginRight="@dimen/measurement_tool_button_margin"
-                layout="@layout/bottom_sheet_dialog_button" />
+                <FrameLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1">
+
+                    <net.osmand.plus.widgets.TextViewEx
+                        android:id="@+id/options_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:background="?attr/selectableItemBackground"
+                        android:ellipsize="end"
+                        android:gravity="center_vertical"
+                        android:maxLines="1"
+                        android:paddingStart="@dimen/measurement_tool_text_button_padding_small"
+                        android:paddingLeft="@dimen/measurement_tool_text_button_padding_small"
+                        android:paddingEnd="@dimen/measurement_tool_text_button_padding_small"
+                        android:paddingRight="@dimen/measurement_tool_text_button_padding_small"
+                        android:text="@string/shared_string_options"
+                        android:textColor="?attr/color_dialog_buttons"
+                        osmand:typeface="@string/font_roboto_medium"/>
+                </FrameLayout>
+
+                <ImageButton
+                    android:id="@+id/undo_point_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:padding="@dimen/measurement_tool_undo_redo_padding_small"
+                    android:contentDescription="@string/shared_string_undo"
+                    tools:src="@drawable/ic_action_undo_dark"/>
+
+                <ImageButton
+                    android:id="@+id/redo_point_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/measurement_tool_button_padding"
+                    android:layout_marginStart="@dimen/measurement_tool_button_padding"
+                    android:background="?attr/selectableItemBackground"
+                    android:padding="@dimen/measurement_tool_undo_redo_padding_small"
+                    android:contentDescription="@string/shared_string_redo"
+                    tools:src="@drawable/ic_action_redo_dark"/>
+
+                <FrameLayout
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1">
+
+                    <include
+                        android:id="@+id/add_point_button"
+                        layout="@layout/bottom_sheet_dialog_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="end"
+                        android:minWidth="@dimen/measurement_tool_button_width" />
+
+                </FrameLayout>
+
+            </LinearLayout>
+
+            <RelativeLayout
+                android:id="@+id/move_point_controls"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/measurement_tool_controls_height"
+                android:visibility="gone">
+
+                <include
+                    android:id="@+id/apply_move_point_button"
+                    layout="@layout/bottom_sheet_dialog_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/measurement_tool_button_height"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="@dimen/measurement_tool_button_margin"
+                    android:layout_marginRight="@dimen/measurement_tool_button_margin"
+                    android:minWidth="@dimen/measurement_tool_button_width" />
+
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/cancel_move_point_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_margin="@dimen/measurement_tool_button_margin"
+                    android:background="?attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:padding="@dimen/measurement_tool_text_button_padding_small"
+                    android:text="@string/shared_string_cancel"
+                    android:textColor="?attr/color_dialog_buttons"
+                    osmand:typeface="@string/font_roboto_medium"/>
+            </RelativeLayout>
+
+            <LinearLayout
+                android:id="@+id/add_point_before_after_controls"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/measurement_tool_controls_height"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:visibility="gone">
+
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/cancel_point_before_after_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_margin="@dimen/measurement_tool_button_margin"
+                    android:background="?attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:padding="@dimen/measurement_tool_text_button_padding_small"
+                    android:text="@string/shared_string_cancel"
+                    android:textColor="?attr/color_dialog_buttons"
+                    osmand:typeface="@string/font_roboto_medium"/>
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"/>
+
+                <include
+                    android:id="@+id/apply_point_before_after_point_button"
+                    android:layout_height="@dimen/measurement_tool_button_height"
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="@dimen/measurement_tool_button_width"
+                    android:layout_marginEnd="@dimen/measurement_tool_button_margin"
+                    android:layout_marginRight="@dimen/measurement_tool_button_margin"
+                    layout="@layout/bottom_sheet_dialog_button" />
+
+                <include
+                    android:id="@+id/add_point_before_after_button"
+                    android:layout_height="@dimen/measurement_tool_button_height"
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="@dimen/measurement_tool_button_width"
+                    android:layout_marginEnd="@dimen/measurement_tool_button_margin"
+                    android:layout_marginRight="@dimen/measurement_tool_button_margin"
+                    layout="@layout/bottom_sheet_dialog_button" />
+
+            </LinearLayout>
 
         </LinearLayout>
 

OsmAnd/res/layout/gradient_card.xml

@@ -5,8 +5,10 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical"
-	android:padding="@dimen/content_padding"
 	android:paddingStart="@dimen/content_padding"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingTop="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding"
 	android:paddingEnd="@dimen/content_padding">
 
 	<View
@@ -43,4 +45,9 @@
 
 	</LinearLayout>
 
+	<View
+		android:id="@+id/space"
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/content_padding" />
+
 </LinearLayout>

OsmAnd/res/layout/measurement_tool_graph_card.xml

@@ -4,6 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/list_background_color"
+    android:clickable="true"
+    android:focusable="true"
     android:orientation="vertical">
 
     <androidx.recyclerview.widget.RecyclerView

OsmAnd/res/layout/open_bug.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:orientation="vertical"
-              android:paddingLeft="?dialogPreferredPadding"
-              android:paddingRight="?dialogPreferredPadding"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="vertical"
+	android:paddingLeft="?dialogPreferredPadding"
+	android:paddingRight="?dialogPreferredPadding"
 	android:paddingStart="?dialogPreferredPadding"
 	android:paddingEnd="?dialogPreferredPadding">
 
@@ -32,7 +33,7 @@
         android:id="@+id/user_name_field"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:text="NoName"/>
+        tools:text="NoName"/>
 
 
     <TextView

OsmAnd/res/layout/search_poi_filter.xml

@@ -1,10 +1,11 @@
 <?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"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              xmlns:osmand="http://schemas.android.com/apk/res-auto"
-              android:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -51,7 +52,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
                         android:background="@null"
-                        android:text="Filling station"
+                        tools:text="Filling station"
                         android:textColor="@color/color_white"
                         android:textSize="@dimen/default_desc_text_size"/>
 

OsmAnd/res/layout/settings_group_title.xml

@@ -31,7 +31,7 @@
 			tools:text="Some title" />
 
 		<net.osmand.plus.widgets.TextViewEx
-			android:id="@+id/description"
+			android:id="@+id/title_description"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_below="@+id/title"
@@ -60,6 +60,54 @@
 
 	</RelativeLayout>
 
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/primary_description"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="@dimen/dialog_content_margin"
+		android:letterSpacing="@dimen/description_letter_spacing"
+		android:orientation="vertical"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		android:textColor="?android:textColorPrimary"
+		android:textSize="@dimen/default_list_text_size"
+		android:visibility="gone"
+		app:typeface="@string/font_roboto_regular"
+		tools:text="@string/srtm_download_single_help_message"
+		tools:visibility="visible" />
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/secondary_description"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="@dimen/content_padding_small"
+		android:letterSpacing="@dimen/description_letter_spacing"
+		android:orientation="vertical"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		android:textColor="?android:textColorSecondary"
+		android:textSize="@dimen/default_desc_text_size"
+		android:visibility="gone"
+		app:typeface="@string/font_roboto_regular"
+		tools:text="@string/srtm_download_list_help_message"
+		tools:visibility="visible" />
+
+	<include
+		layout="@layout/custom_radio_buttons"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:layout_marginBottom="@dimen/content_padding_half"
+		android:visibility="gone"
+		tools:visibility="visible" />
+
 	<LinearLayout
 		android:id="@+id/select_all_button"
 		android:layout_width="match_parent"
@@ -67,12 +115,12 @@
 		android:background="?attr/selectableItemBackground"
 		android:gravity="center_vertical"
 		android:minHeight="@dimen/bottom_sheet_list_item_height"
+		android:paddingStart="@dimen/content_padding"
 		android:paddingLeft="@dimen/content_padding"
 		android:paddingTop="@dimen/content_padding_small"
+		android:paddingEnd="@dimen/content_padding"
 		android:paddingRight="@dimen/content_padding"
-		android:paddingBottom="@dimen/content_padding_small"
-		android:paddingStart="@dimen/content_padding"
-		android:paddingEnd="@dimen/content_padding">
+		android:paddingBottom="@dimen/content_padding_small">
 
 		<net.osmand.plus.widgets.TextViewEx
 			android:id="@+id/check_box_title"

OsmAnd/res/layout/split_segments_layout.xml

@@ -94,7 +94,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:background="@null"
-                        android:text="Split interval:"
+                        tools:text="Split interval:"
                         android:textColor="?android:attr/textColorPrimary"
                         android:textSize="@dimen/default_desc_text_size"
                         osmand:typeface="@string/font_roboto_medium" />

OsmAnd/res/layout/subscription_fragment.xml

@@ -2,6 +2,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="?attr/spinnerListBackground"
     android:orientation="vertical">
 
@@ -212,7 +213,7 @@
                                     android:paddingLeft="2dp"
                                     android:paddingEnd="0dp"
                                     android:paddingRight="0dp"
-                                    android:text="Ukraine"
+                                    tools:text="Ukraine"
                                     app:drawableEndCompat="@drawable/ic_action_arrow_drop_down"
                                     app:drawableRightCompat="@drawable/ic_action_arrow_drop_down" />
 

OsmAnd/res/layout/subscription_layout.xml

@@ -64,7 +64,6 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="@dimen/content_padding_small"
-			android:layout_gravity="center_vertical"
 			android:paddingStart="@dimen/content_padding_small"
 			android:paddingLeft="@dimen/content_padding_small"
 			android:paddingTop="@dimen/content_padding_small_half"

OsmAnd/res/layout/subscriptions_card.xml

@@ -1,8 +1,6 @@
 <?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: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/bg_color"
@@ -13,78 +11,13 @@
 		android:layout_height="@dimen/list_content_padding"
 		android:background="?attr/activity_background_color" />
 
-	<include
-		layout="@layout/divider" />
+	<include layout="@layout/divider" />
 
 	<FrameLayout
 		android:id="@+id/subscriptions_list_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content" />
 
-	<LinearLayout
-		android:id="@+id/support_region_container"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal"
-		android:background="?android:attr/selectableItemBackground"
-		android:paddingStart="@dimen/content_padding"
-		android:paddingLeft="@dimen/content_padding"
-		android:paddingRight="@dimen/content_padding"
-		android:paddingEnd="@dimen/content_padding">
-
-		<androidx.appcompat.widget.AppCompatImageView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:minHeight="@dimen/setting_list_item_group_height"
-			android:layout_gravity="center_vertical"
-			android:layout_marginEnd="@dimen/map_widget_height"
-			android:layout_marginRight="@dimen/map_widget_height"
-			app:srcCompat="@drawable/ic_world_globe_dark"
-			app:tint="?attr/default_icon_color" />
-
-		<LinearLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:layout_marginTop="@dimen/content_padding_small"
-			android:layout_marginBottom="@dimen/content_padding_small"
-			android:layout_gravity="center_vertical"
-			android:orientation="vertical">
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/support_region_header"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:textColor="?android:attr/textColorPrimary"
-				android:textSize="@dimen/default_list_text_size"
-				osmand:typeface="@string/font_roboto_regular"
-				tools:text="@string/osm_live_support_region"/>
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/support_region"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginEnd="@dimen/content_padding"
-				android:layout_marginRight="@dimen/content_padding"
-				android:text="@string/osm_live_support_region"
-				android:textColor="?android:attr/textColorSecondary"
-				android:textSize="@dimen/default_desc_text_size"
-				osmand:typeface="@string/font_roboto_regular"
-				tools:text="@string/clear_updates_proposition_message"/>
-
-		</LinearLayout>
-
-		<androidx.appcompat.widget.AppCompatImageView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
-			app:srcCompat="@drawable/ic_action_settings"
-			app:tint="?attr/default_icon_color" />
-
-	</LinearLayout>
-
-	<include layout="@layout/simple_divider_item" />
-
 	<LinearLayout
 		android:id="@+id/report_container"
 		android:layout_width="match_parent"
@@ -206,8 +139,7 @@
 		android:layout_height="wrap_content"
 		android:background="?attr/activity_background_color">
 
-		<include
-			layout="@layout/card_bottom_divider" />
+		<include layout="@layout/card_bottom_divider" />
 
 	</FrameLayout>
 

OsmAnd/res/layout/switch_select_list_item.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:osmand="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:minHeight="48dp"
-    android:orientation="horizontal"
-    android:paddingLeft="@dimen/list_content_padding"
-    android:paddingRight="@dimen/list_content_padding"
+<LinearLayout xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:gravity="center_vertical"
+	android:minHeight="48dp"
+	android:orientation="horizontal"
+	android:paddingLeft="@dimen/list_content_padding"
+	android:paddingRight="@dimen/list_content_padding"
 	android:paddingEnd="@dimen/list_content_padding"
 	android:paddingStart="@dimen/list_content_padding">
 
@@ -36,7 +36,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:text="Avoid selected roads"
+            tools:text="Avoid selected roads"
             android:textSize="@dimen/default_list_text_size"/>
 
         <TextView
@@ -44,7 +44,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:text="Select roads you want to avoid during navigation"
+            tools:text="Select roads you want to avoid during navigation"
             android:textSize="@dimen/default_desc_text_size"/>
 
     </LinearLayout>

OsmAnd/res/layout/test_backup_layout.xml

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="?attr/activity_background_basic"
+	android:orientation="vertical">
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/appbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:background="?attr/colorPrimary"
+			android:minHeight="?attr/actionBarSize"
+			android:theme="?attr/toolbar_theme">
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="right"
+				android:paddingStart="@dimen/content_padding"
+				android:paddingLeft="@dimen/content_padding"
+				android:paddingEnd="@dimen/content_padding"
+				android:paddingRight="@dimen/content_padding">
+
+				<ProgressBar
+					android:id="@+id/progress_bar"
+					android:layout_width="@dimen/card_button_progress_size"
+					android:layout_height="@dimen/card_button_progress_size"
+					android:visibility="gone" />
+
+			</LinearLayout>
+
+		</androidx.appcompat.widget.Toolbar>
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<ScrollView
+		android:id="@+id/main_view"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/content_padding"
+			android:orientation="vertical"
+			android:paddingBottom="@dimen/content_padding">
+
+			<net.osmand.plus.widgets.OsmandTextFieldBoxes
+				android:id="@+id/edit_email_label"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:focusable="true"
+				android:focusableInTouchMode="true"
+				android:paddingBottom="@dimen/content_padding_small"
+				app:errorColor="@color/color_invalid"
+				app:hasClearButton="true"
+				app:labelText="Email"
+				app:primaryColor="@color/active_color_primary_dark"
+				app:secondaryColor="?android:textColorSecondary">
+
+				<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+					android:id="@+id/edit_email"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:imeOptions="actionNext"
+					android:inputType="textEmailAddress"
+					android:maxLines="1"
+					tools:text="test@test.com" />
+
+			</net.osmand.plus.widgets.OsmandTextFieldBoxes>
+
+			<include
+				android:id="@+id/btn_register"
+				layout="@layout/bottom_sheet_dialog_button"
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/dialog_button_height" />
+
+			<net.osmand.plus.widgets.OsmandTextFieldBoxes
+				android:id="@+id/edit_token_label"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:focusable="true"
+				android:focusableInTouchMode="true"
+				android:paddingTop="@dimen/content_padding_small"
+				android:paddingBottom="@dimen/content_padding_small"
+				app:errorColor="@color/color_invalid"
+				app:hasClearButton="true"
+				app:labelText="Token"
+				app:primaryColor="@color/active_color_primary_dark"
+				app:secondaryColor="?android:textColorSecondary">
+
+				<studio.carbonylgroup.textfieldboxes.ExtendedEditText
+					android:id="@+id/edit_token"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:imeOptions="actionNext"
+					android:inputType="numberDecimal"
+					android:maxLines="1"
+					tools:text="123456" />
+
+			</net.osmand.plus.widgets.OsmandTextFieldBoxes>
+
+			<include
+				android:id="@+id/btn_verify"
+				layout="@layout/bottom_sheet_dialog_button"
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/dialog_button_height" />
+
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/content_padding"
+				tools:text="Actions"
+				android:textColor="?android:textColorPrimary"
+				android:textSize="@dimen/default_list_text_size" />
+
+			<include
+				android:id="@+id/btn_refresh"
+				layout="@layout/bottom_sheet_dialog_button"
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/dialog_button_height"
+				android:layout_marginTop="@dimen/content_padding_half" />
+
+			<include
+				android:id="@+id/btn_backup"
+				layout="@layout/bottom_sheet_dialog_button"
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/dialog_button_height"
+				android:layout_marginTop="@dimen/content_padding_half" />
+
+			<include
+				android:id="@+id/btn_restore"
+				layout="@layout/bottom_sheet_dialog_button"
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/dialog_button_height"
+				android:layout_marginTop="@dimen/content_padding_half" />
+
+			<TextView
+				android:id="@+id/text_info"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="@dimen/content_padding"
+				android:textColor="?android:textColorPrimary"
+				android:textSize="@dimen/default_list_text_size"
+				tools:text="Last backup time: 2021-04-01 10:10:00\nModified files: 3" />
+
+		</LinearLayout>
+
+	</ScrollView>
+
+</LinearLayout>

OsmAnd/res/layout/troubleshooting_card.xml

@@ -32,7 +32,6 @@
 			android:id="@+id/troubleshooting_icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
 			android:layout_marginEnd="@dimen/map_widget_height"
 			android:layout_marginRight="@dimen/map_widget_height"
 			android:paddingBottom="@dimen/dialog_content_bottom_margin"

OsmAnd/res/layout/undo_popup.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:background="@drawable/popup_bg"
-              android:gravity="center"
-              android:orientation="horizontal">
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:background="@drawable/popup_bg"
+	android:gravity="center"
+	android:orientation="horizontal">
 
     <TextView
         android:id="@+id/text"
@@ -37,6 +38,6 @@
         android:layout_height="wrap_content"
         android:layout_weight="0"
         android:background="?attr/selectableItemBackground"
-        android:text="UNDO"
+        tools:text="UNDO"
         android:textColor="@color/popup_text_color"/>
 </LinearLayout>

OsmAnd/res/values-ar/phrases.xml

@@ -1964,7 +1964,7 @@
     <string name="poi_outdoor_seating_no">لا توجد أماكن جلوس في الخارج</string>
     <string name="poi_delivery_no">لا توصيل</string>
     <string name="poi_takeaway_no">الطلب الخارجي:لا</string>
-    <string name="poi_microbrewery_yes"/>
+    <string name="poi_microbrewery_yes">نعم</string>
     <string name="poi_drive_in_no">الشراء من السيارة: لا</string>
     <string name="poi_drive_through_no">الشراء من السيارة: لا</string>
     <string name="poi_diet_pescetarian_yes">نباتيو الأسماك</string>
@@ -3717,4 +3717,114 @@
     <string name="poi_piste_sleigh">مضمار خاص بالمنزلقة</string>
     <string name="poi_piste_hike">طريق تنزه</string>
     <string name="poi_piste_skitour">مضمار جولة تزلج</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_no">لا</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_yes">نعم</string>
+    <string name="poi_liaison_representative_office">مكتب تمثيلي</string>
+    <string name="poi_liaison_liaison_office">مكتب</string>
+    <string name="poi_consulate_consulate_general">القنصلية العامة</string>
+    <string name="poi_consulate_consular_office">مكتب قنصلي</string>
+    <string name="poi_consulate_consular_agency">وكالة قنصلية</string>
+    <string name="poi_consulate_yes">برئاسة قنصل</string>
+    <string name="poi_embassy_residence">إقامة</string>
+    <string name="poi_embassy_mission">مهمة</string>
+    <string name="poi_embassy_high_commission">لجنة عليا</string>
+    <string name="poi_embassy_delegation">تفويض</string>
+    <string name="poi_embassy_branch_embassy">فرع</string>
+    <string name="poi_embassy_yes">برئاسة سفير</string>
+    <string name="poi_diplomatic_embassy">سفارة</string>
+    <string name="poi_internet_access_fee_customers">الوصول إلى الإنترنت: العملاء</string>
+    <string name="poi_dive_centre">مركز غوص السكوبا</string>
+    <string name="poi_tourist_camp">مخيم سياحي</string>
+    <string name="poi_monastery_type_monastics">نوع الدير: رهبنة</string>
+    <string name="poi_craft_distillery">مقطرة</string>
+    <string name="poi_hookah_lounge">صالة الشيشة</string>
+    <string name="poi_service_vehicle_insurance_yes">التأمين</string>
+    <string name="poi_adult_gaming_centre">مركز ألعاب الكبار</string>
+    <string name="poi_amusement_arcade">مكان ألعاب التسلية</string>
+    <string name="poi_cannabis">متجر قنب</string>
+    <string name="poi_couloir">رواق</string>
+    <string name="poi_vhf">قناة تردد عال جدا VHF</string>
+    <string name="poi_government_legislative">مؤسسة تشريعية</string>
+    <string name="poi_government_transportation">مؤسسة النقل</string>
+    <string name="poi_government_treasury">خزينة</string>
+    <string name="poi_government_public_service">خدمة عامة</string>
+    <string name="poi_government_ministry">وزارة</string>
+    <string name="poi_music_school">مدرسة موسيقى</string>
+    <string name="poi_electronics_repair_tv">إصلاح الالكترونيات: التلفزيون</string>
+    <string name="poi_drink_wine_served">النبيذ: تقديم</string>
+    <string name="poi_drink_wine_retail">النبيذ: البيع بالتجزئة</string>
+    <string name="poi_drink_wine_yes">النبيذ: نعم</string>
+    <string name="poi_gambling_bingo">البنغو</string>
+    <string name="poi_gambling_betting">الرهان</string>
+    <string name="poi_gambling_slot_machines">ماكينات القمار</string>
+    <string name="poi_gambling_pachinko">باتشينكو</string>
+    <string name="poi_gambling_lottery">اليانصيب</string>
+    <string name="poi_gambling">مكان القمار</string>
+    <string name="poi_lottery">تذاكر اليانصيب</string>
+    <string name="poi_party">لوازم الحفلات</string>
+    <string name="poi_cuisine_brunch">غداء</string>
+    <string name="poi_cuisine_wine">نبيذ</string>
+    <string name="poi_cuisine_bistro">حانه صغيرة</string>
+    <string name="poi_cuisine_gastropub">حانة</string>
+    <string name="poi_xmas_url">عيد الإكسات: الموقع الشبكي</string>
+    <string name="poi_xmas_location">عيد الإكسماس: الموقع</string>
+    <string name="poi_xmas_opening_hours">عيد الإكسماس: ساعات العمل</string>
+    <string name="poi_xmas_note">عيد الإكسماس: ملاحظة</string>
+    <string name="poi_xmas_day_date">عيد الإكسماس: فترة الحدث</string>
+    <string name="poi_xmas_shop_christmas_tree">متجر أشجار</string>
+    <string name="poi_xmas_pyramid">هرم عيد الميلاد</string>
+    <string name="poi_xmas_event">حدث عيد الميلاد</string>
+    <string name="poi_recreation_center">مركز ترفيهي</string>
+    <string name="poi_street_cabinet_cable_tv">نوع الخزانة: تلفزيون الكابل</string>
+    <string name="poi_tanning_salon">بيت شمسي</string>
+    <string name="poi_concentration_camp_gulag">النوع: غولاغ</string>
+    <string name="poi_concentration_camp_nazism">النوع: نازي</string>
+    <string name="poi_pow_camp">النوع: معسكر أسرى حرب</string>
+    <string name="poi_concentration_camp">النوع: معسكر اعتقال</string>
+    <string name="poi_prison_camp">معسكر سجن سابق</string>
+    <string name="poi_cross">صليب</string>
+    <string name="poi_building_type_shrine">نوع المبنى: ضريح</string>
+    <string name="poi_building_type_synagogue">نوع المبنى: معبد يهودي</string>
+    <string name="poi_building_type_basilica">نوع المبنى: كاتدرائية بازيليكا</string>
+    <string name="poi_building_type_monastery">نوع المبنى: دير</string>
+    <string name="poi_building_type_cathedral">نوع المبنى: كاتدرائية</string>
+    <string name="poi_building_type_temple">نوع المبنى: معبد</string>
+    <string name="poi_building_type_chapel">نوع المبنى: معبد نصراني</string>
+    <string name="poi_building_type_church">نوع المبنى: كنيسة</string>
+    <string name="poi_industrial_intermodal_freight_terminal">النوع: محطة الشحن متعددة الوسائط</string>
+    <string name="poi_industrial_brewery">النوع: مصنع جعة</string>
+    <string name="poi_monument_yes">موضوع تذكاري</string>
+    <string name="poi_training_dance">التدريب: رقص</string>
+    <string name="poi_training_music">التدريب: موسيقى</string>
+    <string name="poi_historic_yes">موضوع تاريخي</string>
+    <string name="poi_artwork_type_relief">نوع العمل الفني : عمود تذكاري</string>
+    <string name="poi_artwork_type_installation">نوع العمل الفني: تثبيت</string>
+    <string name="poi_artwork_type_stone">نوع العمل الفني: حجر</string>
+    <string name="poi_artwork_type_painting">نوع العمل الفني: لوحة</string>
+    <string name="poi_artwork_type_architecture">نوع العمل الفني: هندسة المعمارية</string>
+    <string name="poi_internet_access_type_no">لا يوجد وصول إلى الإنترنت</string>
+    <string name="poi_internet_access_type_service">نوع الوصول إلى الإنترنت: خدمة</string>
+    <string name="poi_internet_access_type_public">نوع الوصول إلى الإنترنت: عام</string>
+    <string name="poi_internet_access_type_terminal">محطة نهائية</string>
+    <string name="poi_bench_no">بدون مقاعد</string>
+    <string name="poi_resource_asbestos">الاسبستوس</string>
+    <string name="poi_resource_antimony">الأنتيمون</string>
+    <string name="poi_resource_aggregate">تجميع</string>
+    <string name="poi_historic_quarry">مقلع تاريخي</string>
+    <string name="poi_memorial_fassade_decoration">زخرفة الواجهة</string>
+    <string name="poi_memorial_prasat">براسات</string>
+    <string name="poi_memorial_column">عمود</string>
+    <string name="poi_memorial_stolperstein">ستولبرشتاين</string>
+    <string name="poi_memorial_jizo">جيزو</string>
+    <string name="poi_memorial_koshinto">كوشينتو</string>
+    <string name="poi_memorial_stone">حجر</string>
+    <string name="poi_microbrewery_no">لا يوجد مصانع الجعة مصغر</string>
+    <string name="poi_brewery_additional">اسم مصنع الجعة</string>
+    <string name="poi_diet_vegetarian_few">نباتي (بعض)</string>
+    <string name="poi_events_venue">مكان الفعاليات</string>
+    <string name="poi_love_hotel">فندق الحب</string>
+    <string name="poi_content_beer">المحتوى: بيرة</string>
+    <string name="poi_content_wine">المحتوى: نبيذ</string>
+    <string name="poi_pawnbroker">مقرض مال</string>
+    <string name="poi_bay_filter">نوع الخليج</string>
 </resources>

OsmAnd/res/values-ar/strings.xml

@@ -998,7 +998,7 @@
     <string name="get_directions">التوجيه مع الطرق</string>
     <string name="show_point_options">استخدام الموقع…</string>
     <string name="favorite">مفضلة</string>
-    <string name="speak_favorites">نقاط مفضلة مجاورة</string>
+    <string name="speak_favorites">مفضلة مجاورة</string>
     <string name="save_as_favorites_points">حفظ كمجموعة مفضلة</string>
     <string name="add_favorite_dialog_top_text">أدخل اسم المفضلة</string>
     <string name="add_favorite_dialog_favourite_added_template">تم إضافة إحداثية المفضلة \'\'{0}\'\' بنجاح.</string>
@@ -3921,7 +3921,7 @@
     <string name="login_account">الحساب</string>
     <string name="user_login">تسجيل الدخول</string>
     <string name="gpx_upload_trackable_visibility_descr">\"إمكانية التتبع\" تعني أن التتبع لا يظهر في أي قوائم عامة ولكن نقاط التتبع المعالجة مع طوابع زمنية صادرة عنها(التي لا يمكن أن تكون مرتبطة بك مباشرة) ستظهر خلال التنزيلات من واجهة برمجة التطبيقات GPS API العامة.</string>
-    <string name="markers_history">سجل تاريخ العلامات</string>
+    <string name="markers_history">سجل التوجيه المباشر</string>
     <string name="send_files_to_openstreetmap">أرسل ملف GPX إلى OpenStreetMap</string>
     <string name="enter_text_separated">أدخل العلامات مفصولة بفاصلة.</string>
     <string name="gpx_upload_private_visibility_descr">\"خاص\"يعني أن التتبع لن يظهر في أي قوائم عامة ، ولكن نقاط التتبع الصادرة عنه ستظل متاحة من خلال واجهة برمجة تطبيقات GPS API العامة بدون طوابع زمنية ولكن لن يتم ترتيبها ترتيبًا زمنيًا.</string>
@@ -4075,7 +4075,7 @@
     <string name="activity_type_car_name">سيارة</string>
     <string name="copy_poi_name">نسخ اسم POI</string>
     <string name="select_another_colorization">الرجاء اختيار أنواع أخرى من التلوين.</string>
-    <string name="snap_to_road_descr">سيتم التقاط الرمز إلى مسار التنقل الحالي</string>
+    <string name="snap_to_road_descr">سيتم سحب أيقونة المكان الحالي إلى مسار التنقل الحالي</string>
     <string name="select_segments">حدد الجزء</string>
     <string name="select_segments_description">%1$s يحتوي على أكثر من مقطع ، تحتاج إلى تحديد الجزء المطلوب للتنقل.</string>
     <string name="segments_count">الجزء %1$d</string>
@@ -4094,7 +4094,7 @@
     <string name="on_pause">عند الإيقاف المؤقت</string>
     <string name="app_restart_required">يلزم إعادة تشغيل التطبيق لتطبيق بعض الإعدادات.</string>
     <string name="routing_attr_height_obstacles_description">التوجيه يمكن أن يتجنب المرتفعات القوية.</string>
-    <string name="quick_action_coordinates_widget_descr">تبديل لإظهار أو إخفاء أداة الإحداثيات على الخريطة.</string>
+    <string name="quick_action_coordinates_widget_descr">مقبس لإظهار أو إخفاء أداة الإحداثيات على الخريطة.</string>
     <string name="map_widget_distance_by_tap">المسافة عن طريق الضغط</string>
     <string name="latest_openstreetmap_update">آخر تحديث خريطة الشارع المفتوح المتاحة:</string>
     <string name="updated">تحديث: %s</string>
@@ -4123,7 +4123,11 @@
     <string name="shared_string_route_line">خط المسار</string>
     <string name="route_line_use_map_style_appearance">سيستخدم خط الطريق %1$s المحدد في نمط الخريطة المحدد: %2$s.</string>
     <string name="specify_color_for_map_mode">حدد لونًا لوضع الخريطة: %1$s.</string>
-    <string name="release_4_0_beta">• تم نقل تحديثات OsmAnd Live إلى \"التنزيلات&gt; التحديثات\"
+    <string name="release_4_0_beta">• خيار مضاف لتنزيل خطوط الكنتور بالقدم
+\n
+\n• مخطط الطريق الأفقي: علامات تبويب tabs مضافة للتبديل بين النقاط أو الرسوم البيانية
+\n
+\n• تم نقل تحديثات OsmAnd Live إلى \"التنزيلات&gt; التحديثات\"
 \n
 \n • يمكن تلوين المسارات الآن حسب الارتفاع، السرعة أو المنحدر.
 \n
@@ -4150,4 +4154,12 @@
     <string name="on_hold">في الانتظار</string>
     <string name="expired">منتهي الصلاحية</string>
     <string name="update_all_maps_added">تحديث كافة الخرائط المضافة إلى %1$s؟</string>
+    <string name="exit_number">رقم الخروج</string>
+    <string name="announce_when_exceeded">الإعلان عند التجاوز</string>
+    <string name="user_points">نقاط المستخدم</string>
+    <string name="output">الإخراج</string>
+    <string name="srtm_unit_format">تنسيق وحدة خطوط الكنتور</string>
+    <string name="srtm_download_list_help_message">OsmAnd يوفر بيانات الخطوط الكنتورية بالأمتار والقدم. ستحتاج إلى إعادة تنزيل الملف لتغيير التنسيق.</string>
+    <string name="srtm_download_single_help_message">الرجاء تحديد التنسيق المطلوب. ستحتاج إلى إعادة تنزيل الملف لتغيير التنسيق.</string>
+    <string name="shared_string_feet">قدم</string>
 </resources>

OsmAnd/res/values-be/strings.xml

@@ -1088,7 +1088,7 @@
     <string name="lang_ja">Японская</string>
     <string name="lang_ko">Карэйская</string>
     <string name="lang_lv">Латышская</string>
-    <string name="lang_lt">Летувісская</string>
+    <string name="lang_lt">Летувіская</string>
     <string name="lang_mr">Маратхі</string>
     <string name="lang_no">Нарвежская (Bokmål)</string>
     <string name="lang_pl">Польская</string>

OsmAnd/res/values-da/strings.xml

@@ -3837,4 +3837,8 @@
     <string name="track_has_no_altitude">Sporet indeholder ikke højdedata.</string>
     <string name="track_has_no_speed">Sporet indeholder ikke hastighedsdata.</string>
     <string name="select_another_colorization">Vælg en anden type farvelægning.</string>
+    <string name="exit_number">Udgangsnummer</string>
+    <string name="announce_when_exceeded">Meddelelse ved overskridelse</string>
+    <string name="user_points">Bruger points</string>
+    <string name="output">Resultat</string>
 </resources>

OsmAnd/res/values-de/phrases.xml

@@ -570,7 +570,7 @@
     <string name="poi_watermill">Wassermühle</string>
     <string name="poi_water_park">Wasserpark</string>
     <string name="poi_water_tower">Wasserturm</string>
-    <string name="poi_water_well">Wasserbrunnen</string>
+    <string name="poi_water_well">Ziehbrunnen</string>
     <string name="poi_water_works">Wasserwerk</string>
     <string name="poi_waterfall">Wasserfall</string>
     <string name="poi_waterway_turning_point">Wasserwendepunkt</string>
@@ -686,7 +686,7 @@
     <string name="poi_residential">Wohngebiet</string>
     <string name="poi_field_hockey">Feldhockey</string>
     <string name="poi_sailing">Segeln</string>
-    <string name="poi_apartment">Apartment</string>
+    <string name="poi_apartment">Ferienwohnung</string>
     <string name="poi_internet_access_wlan">Internetzugang: WLAN</string>
     <string name="poi_internet_access_wired">Internetzugang: kabelgebunden</string>
     <string name="poi_internet_access_public">Internetzugang: öffentlich</string>
@@ -1278,7 +1278,7 @@
     <string name="poi_bicycle_parking_stands">Fahrradständer</string>
     <string name="poi_bicycle_parking_wall_loops">Vorderradständer</string>
     <string name="poi_leaf_type_mixed">Gemischt</string>
-    <string name="poi_trees_persimmon">Persimmon</string>
+    <string name="poi_trees_persimmon">Dattelpflaume</string>
     <string name="poi_generator_source_coal">Energiequelle: Kohle</string>
     <string name="poi_generator_source_gas">Energiequelle: Gas</string>
     <string name="poi_generator_source_nuclear">Energiequelle: nuklear</string>
@@ -1569,7 +1569,7 @@
     <string name="poi_resource_slate_iron_ore_copper">Schiefer; Eisenerz; Kupfer</string>
     <string name="poi_resource_slate">Schiefer</string>
     <string name="poi_resource_tin">Zinn</string>
-    <string name="poi_resource_tuff">Tuff</string>
+    <string name="poi_resource_tuff">Tuffstein</string>
     <string name="poi_resource_uranium">Uran</string>
     <string name="poi_resource_vanadium">Vanadium</string>
     <string name="poi_resource_zinc">Zink</string>
@@ -1634,7 +1634,7 @@
     <string name="poi_payment_electronic_purses_yes">Elektronische Geldbörsen</string>
     <string name="poi_payment_uta_yes">UTA</string>
     <string name="poi_payment_uta_no">UTA-Karten nicht akzeptiert</string>
-    <string name="poi_payment_efectivo_yes">Efectivo</string>
+    <string name="poi_payment_efectivo_yes">Bargeld</string>
     <string name="poi_payment_efectivo_no">Efectivo nicht akzeptiert</string>
     <string name="poi_payment_girocard_yes">Girokarte</string>
     <string name="poi_payment_girocard_no">Girokarte nicht akzeptiert</string>
@@ -1908,7 +1908,7 @@
     <string name="poi_artwork_type_relief">Kunstart: Relief</string>
     <string name="poi_artwork_type_graffiti">Kunstart: Graffiti</string>
     <string name="poi_artwork_type_stele">Kunstart: Stele</string>
-    <string name="poi_artwork_type_fountain">Kunstart: Brunnen</string>
+    <string name="poi_artwork_type_fountain">Kunstart: Springbrunnen</string>
     <string name="poi_architecture_stalinist_neoclassicism">Architektur: stalinistischer Neoklassizismus</string>
     <string name="poi_architecture_eclectic">Architektur: eklektisch</string>
     <string name="poi_architecture_new_objectivity">Architektur: Neue Sachlichkeit</string>
@@ -3895,4 +3895,37 @@
     <string name="poi_geodesist">Geodät</string>
     <string name="poi_conference_centre">Konferenzzentrum</string>
     <string name="poi_camp_pitch">Lagerplatz</string>
+    <string name="poi_hoops">Basketballkörbe</string>
+    <string name="poi_kickboxing">Kickboxen</string>
+    <string name="poi_horseshoes">Hufeisenspiel</string>
+    <string name="poi_fencing">Fechten</string>
+    <string name="poi_cycle_polo">Fahrradpolo</string>
+    <string name="poi_curling">Eisstockschießen</string>
+    <string name="poi_crossfit">Crossfit</string>
+    <string name="poi_cockfighting">Hahnenkampf</string>
+    <string name="poi_cliff_diving">Klippenspringen</string>
+    <string name="poi_bullfighting">Stierkampf</string>
+    <string name="poi_bobsleigh">Bobfahren</string>
+    <string name="poi_biathlon">Biathlon</string>
+    <string name="poi_aikido">Aikidō</string>
+    <string name="poi_water_ski">Wasserski</string>
+    <string name="poi_water_polo">Wasserball</string>
+    <string name="poi_zurkhaneh_sport">Zurchaneh Sport</string>
+    <string name="poi_wrestling">Ringen</string>
+    <string name="poi_weightlifting">Gewichtheben</string>
+    <string name="poi_wakeboarding">Wakeboarding</string>
+    <string name="poi_ultimate">Ultimate Frisbee</string>
+    <string name="poi_taekwondo">Taekwondo</string>
+    <string name="poi_table_soccer">Tischfußball</string>
+    <string name="poi_sumo">Sumo</string>
+    <string name="poi_speedway">Speedway</string>
+    <string name="poi_snooker">Snooker</string>
+    <string name="poi_shot_put">Kugelstoßen</string>
+    <string name="poi_pilates">Pilates</string>
+    <string name="poi_jiu_jitsu">Jiu-Jitsu</string>
+    <string name="poi_karate">Karate</string>
+    <string name="poi_office_diplomatic">Diplomatische Vertretung</string>
+    <string name="poi_bay_filter">Art der Bucht</string>
+    <string name="poi_plateau">Plateau</string>
+    <string name="poi_club_social">Freizeitclub</string>
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -25,7 +25,7 @@
     <string name="traffic_warning_calming">Verkehrsberuhigung</string>
     <string name="traffic_warning_speed_camera">Blitzer</string>
     <string name="traffic_warning">Verkehrswarnung</string>
-    <string name="speak_favorites">Favoriten in der Nähe</string>
+    <string name="speak_favorites">Nahegelegene Favoriten</string>
     <string name="speak_poi">Nahegelegene POI</string>
     <string name="confirm_every_run">Immer fragen</string>
     <string name="save_global_track_interval">Intervall für generelle Aufzeichnung</string>
@@ -3856,7 +3856,7 @@
 \nSie können sich mit der sicheren OAuth-Methode anmelden oder Ihren Benutzernamen und Ihr Passwort verwenden.</string>
     <string name="use_login_password">Benutzername und Passwort verwenden</string>
     <string name="login_account">Konto</string>
-    <string name="user_login">Benutzername</string>
+    <string name="user_login">Anmelden</string>
     <string name="markers_history">Historie der Marker</string>
     <string name="send_files_to_openstreetmap">GPX-Datei an OpenStreetMap senden</string>
     <string name="enter_text_separated">Geben Sie durch Komma getrennte Tags ein.</string>
@@ -4057,7 +4057,11 @@
     <string name="customize_route_line">Routenlinie anpassen</string>
     <string name="shared_string_route_line">Routenlinie</string>
     <string name="specify_color_for_map_mode">Legen Sie die Farbe für den Kartenmodus fest: %1$s.</string>
-    <string name="release_4_0_beta">• OsmAnd Live-Updates nach \"Downloads &gt; Updates\" verschoben
+    <string name="release_4_0_beta">• Option zum Herunterladen von Höhenlinien in Fuß zugefügt
+\n
+\n• Routenplanung im Querformat: Registerkarten zum Umschalten zwischen Punkten oder Diagrammen hinzugefügt
+\n
+\n• OsmAnd Live-Updates nach \"Downloads &gt; Updates\" verschoben
 \n
 \n• Tracks können nun nach Höhe, Geschwindigkeit oder Steigung eingefärbt werden.
 \n
@@ -4083,5 +4087,14 @@
     <string name="renew_subscription">Abonnement erneuern</string>
     <string name="on_hold">In der Warteschleife</string>
     <string name="expired">Abgelaufen</string>
-    <string name="update_all_maps_added">Alle zu %1$s hinzugefügten Maps aktualisieren\?</string>
+    <string name="update_all_maps_added">Alle zu %1$s hinzugefügten Karten aktualisieren\?</string>
+    <string name="trip_recording_logging_interval_info">Das Protokollierungsintervall legt den Zeitraum fest, in dem OsmAnd nach den aktuellen Positionsdaten des Standorts fragt.</string>
+    <string name="exit_number">Ausfahrtnummer</string>
+    <string name="announce_when_exceeded">Meldung bei Überschreitung</string>
+    <string name="user_points">Anwenderpunkte</string>
+    <string name="output">Leistung</string>
+    <string name="shared_string_feet">Fuß</string>
+    <string name="srtm_unit_format">Einheit der Höhenlinien</string>
+    <string name="srtm_download_list_help_message">OsmAnd liefert Höhenlinien-Daten in Metern und Fuß. Sie müssen die Datei erneut herunterladen, um das Format zu ändern.</string>
+    <string name="srtm_download_single_help_message">Bitte wählen Sie das gewünschte Format. Sie müssen die Datei erneut herunterladen, um das Format zu ändern.</string>
 </resources>

OsmAnd/res/values-el/phrases.xml

@@ -2990,7 +2990,7 @@
     <string name="poi_cuisine_asian">Ασιατικό</string>
     <string name="poi_cuisine_french">Γαλλικό</string>
     <string name="poi_cuisine_greek">Ελληνικό</string>
-    <string name="poi_cuisine_thai">Τάι</string>
+    <string name="poi_cuisine_thai">Ταϊλανδικό</string>
     <string name="poi_cuisine_international">Διεθνές</string>
     <string name="poi_cuisine_turkish">Τούρκικο</string>
     <string name="poi_cuisine_spanish">Ισπανικό</string>

OsmAnd/res/values-el/strings.xml

@@ -1435,14 +1435,14 @@
     <string name="lang_ga">Ιρλανδικά</string>
     <string name="lang_la">Λατινικά</string>
     <string name="lang_ku">Κουρδικά</string>
-    <string name="lang_ta">Ταμιλικά</string>
+    <string name="lang_ta">Ταμίλ</string>
     <string name="lang_lb">Λουξεμβουργιανά</string>
     <string name="lang_os">Οσσετιανικά</string>
     <string name="lang_eo">Εσπεράντο</string>
     <string name="lang_es_ar">Ισπανικά (Αργεντινής)</string>
     <string name="lang_nb">Νορβηγικά Bokmål</string>
     <string name="lang_th">Ταϊλανδικά</string>
-    <string name="lang_te">τελούγκου</string>
+    <string name="lang_te">Τελούγκου</string>
     <string name="lang_nn">Νορβηγικά Nynorsk</string>
     <string name="lang_et">Εσθονικά</string>
     <string name="archive_wikipedia_data">Έχετε παλιά ασύμβατα δεδομένα της βικιπαίδειας. Να αρχειοθετηθούν;</string>
@@ -1709,7 +1709,7 @@
     <string name="today">Σήμερα</string>
     <string name="yesterday">Χθές</string>
     <string name="last_seven_days">Τις τελευταίες 7 ημέρες</string>
-    <string name="this_year">Εφέτος</string>
+    <string name="this_year">Αυτό το έτος</string>
     <string name="move_all_to_history">Μετακίνηση όλων στο ιστορικό</string>
     <string name="show_direction">Ένδειξη απόστασης</string>
     <string name="sort_by">Ταξινόμηση κατά</string>
@@ -2205,7 +2205,7 @@
     <string name="lang_bn">Βεγγαλέζικα</string>
     <string name="lang_tl">Ταγκαλόγκ</string>
     <string name="lang_br">Βρετονικά</string>
-    <string name="lang_ml">Μαλαγιαλαμικά</string>
+    <string name="lang_ml">Μαλαγιάλαμ</string>
     <string name="lang_lo">Λαοϊκά</string>
     <string name="share_geo">γεω:</string>
     <string name="routing_attr_avoid_shuttle_train_name">Αποφυγή τρένου κλειστής διαδρομής</string>
@@ -2582,9 +2582,9 @@
     <string name="update_time">Χρόνος ενημέρωσης</string>
     <string name="updates_size">Μέγεθος ενημέρωσης</string>
     <string name="last_map_change">Τελευταία αλλαγή χάρτη: %s</string>
-    <string name="hourly">Ανά ώρα</string>
-    <string name="daily">Ανά ημέρα</string>
-    <string name="weekly">Ανά εβδομάδα</string>
+    <string name="hourly">Ωριαία</string>
+    <string name="daily">Ημερήσια</string>
+    <string name="weekly">Εβδομαδιαία</string>
     <string name="morning">Πρωί</string>
     <string name="night">Βράδυ</string>
     <string name="select_month_and_country">Μήνας και χώρα:</string>

OsmAnd/res/values-eo/phrases.xml

@@ -3895,4 +3895,37 @@
     <string name="poi_geodesist">Oficejo de geodeziisto</string>
     <string name="poi_conference_centre">Konferenca centro</string>
     <string name="poi_camp_pitch">Loko por kampadveturilo/tendo</string>
+    <string name="poi_kickboxing">Piedbato-bokso</string>
+    <string name="poi_horseshoes">Hufumludo</string>
+    <string name="poi_fencing">Skermo</string>
+    <string name="poi_cycle_polo">Bicikla pilkado</string>
+    <string name="poi_curling">Glitŝtonludo</string>
+    <string name="poi_crossfit">CrossFit</string>
+    <string name="poi_cockfighting">Kokluktado</string>
+    <string name="poi_cliff_diving">Saltado el klifoj</string>
+    <string name="poi_bullfighting">Bovbatalludo</string>
+    <string name="poi_bobsleigh">Bobsledo</string>
+    <string name="poi_biathlon">Biatlono</string>
+    <string name="poi_aikido">Aikido</string>
+    <string name="poi_water_ski">Akvoskiado</string>
+    <string name="poi_water_polo">Akvopilkado</string>
+    <string name="poi_zurkhaneh_sport">Zurkhaneh (persa luktado)</string>
+    <string name="poi_wrestling">Spektakla luktado</string>
+    <string name="poi_weightlifting">Halterlevado</string>
+    <string name="poi_wakeboarding">Wakeboarding</string>
+    <string name="poi_ultimate">Ekstrema flugdisko (Ultimate)</string>
+    <string name="poi_taekwondo">Tekvondo</string>
+    <string name="poi_table_soccer">Tablofutbalo</string>
+    <string name="poi_sumo">Sumoo</string>
+    <string name="poi_speedway">Spidvejo</string>
+    <string name="poi_snooker">Snukero</string>
+    <string name="poi_shot_put">Globoĵetado</string>
+    <string name="poi_pilates">Pilates</string>
+    <string name="poi_jiu_jitsu">Ĵuĵicuo</string>
+    <string name="poi_karate">Karateo</string>
+    <string name="poi_hoops">Korboj</string>
+    <string name="poi_bay_filter">Tipo de golfo</string>
+    <string name="poi_office_diplomatic">Diplomatia oficejo</string>
+    <string name="poi_plateau">Altebenaĵo</string>
+    <string name="poi_club_social">Socia klubejo</string>
 </resources>

OsmAnd/res/values-eo/strings.xml

@@ -219,7 +219,7 @@
     <string name="favorite_category_select">Elekti kategorion</string>
     <string name="default_speed_system_descr">Difini unuon de rapido.</string>
     <string name="default_speed_system">Unuo de rapido</string>
-    <string name="nm">nm</string>
+    <string name="nm">nmi</string>
     <string name="si_nm">Marmejloj</string>
     <string name="si_kmh">Kilometroj en horo</string>
     <string name="si_mph">Mejloj en horo</string>
@@ -340,7 +340,7 @@
     <string name="shared_string_off">Malaktiva</string>
     <string name="shared_string_previous">Antaŭa</string>
     <string name="shared_string_next">Sekva</string>
-    <string name="shared_string_enable">Aktivigi</string>
+    <string name="shared_string_enable">Ŝalti</string>
     <string name="shared_string_disable">Malaktivigi</string>
     <string name="shared_string_enabled">Aktiva</string>
     <string name="shared_string_disabled">Malaktiva</string>
@@ -642,7 +642,7 @@
     <string name="rendering_attr_showSurfaces_name">Pavimo de vojoj</string>
     <string name="rendering_attr_showCycleRoutes_name">Biciklovojoj</string>
     <string name="srtm_paid_version_title">Nivelkurba kromprogramo</string>
-    <string name="osmand_srtm_short_description_80_chars">OsmAnd-kromprogramo por desegni nivelkurbojn eksterrete</string>
+    <string name="osmand_srtm_short_description_80_chars">OsmAnd-kromprogramo por desegni nivelkurbojn malkonekte</string>
     <string name="srtm_plugin_name">Nivelkurboj</string>
     <string name="osmand_srtm_long_description_1000_chars">Tiu ĉi kromprogramo ebligas vidigi kaj tavolon de nivelkurboj kaj tavolon de nivelombrumo (reliefon) supre normaj OsmAnd‑mapoj. Tiu ĉi eblo estas dezirata de atletoj, migrantoj, turistoj kaj de ĉiuj scivolaj pri reliefa strukturo de tero. 
 \n 
@@ -814,7 +814,7 @@
     <string name="copying_osmand_one_file_descr">Kopiado de dosiero (%s) al la nova loko…</string>
     <string name="copying_osmand_files_descr">Kopiado de datum-dosieroj de OsmAnd al la nova dosierujo (%s)…</string>
     <string name="copying_osmand_files">Kopiado de datum-dosieroj de OsmAnd…</string>
-    <string name="calculate_osmand_route_gpx">Kalkuli kurson eksterrete en OsmAnd</string>
+    <string name="calculate_osmand_route_gpx">Kalkuli kurson malkonekte en OsmAnd</string>
     <string name="app_mode_truck">Kamiono</string>
     <string name="guidance_preferences_descr">Navigadaj agordoj</string>
     <string name="routing_preferences_descr">Difinado de vojo</string>
@@ -1310,7 +1310,7 @@
     <string name="index_name_wiki">Tutmondaj Vikipediaj interesejoj</string>
     <string name="index_name_voice">Voĉaj anoncoj (antaŭregistritaj, limigitaj ebloj)</string>
     <string name="index_name_tts_voice">Voĉaj anoncoj (parolsintezitaj, konsilindaj)</string>
-    <string name="amenity_type_osmwiki">Vikipedio (eksterrete)</string>
+    <string name="amenity_type_osmwiki">Vikipedio (malkonekte)</string>
     <string name="amenity_type_user_defined">Propra</string>
     <string name="fav_export_confirmation">Dosiero enhavanta antaŭelportitajn ŝatatajn punktojn jam ekzistas. Ĉu anstataŭigi ĝin?</string>
     <string name="routing_settings">Navigado</string>
@@ -1481,7 +1481,7 @@
     <string name="search_nothing_found">Trovis nenion</string>
     <string name="searching">Serĉado…</string>
     <string name="searching_address">Determinado de adreso…</string>
-    <string name="search_offline_address">Serĉi eksterrete</string>
+    <string name="search_offline_address">Serĉi malkonekte</string>
     <string name="search_online_address">Serĉi enrete</string>
     <string name="address">Adreso</string>
     <string name="poi">Interesejo</string>
@@ -1523,10 +1523,10 @@
     <string name="level_to_switch_vector_raster_descr">Uzi kahelajn mapojn de tiu ĉi pligrandigo.</string>
     <string name="level_to_switch_vector_raster">Minimuma vektora skal-nivelo</string>
     <string name="create_poi_link_to_osm_doc"><u>Enreta OSM</u> map-klasigo kun bildoj.</string>
-    <string name="error_doing_search">Ne povas serĉi eksterrete.</string>
+    <string name="error_doing_search">Okazis eraro dum malkonekta serĉado.</string>
     <string name="search_osm_offline">Serĉi per pozici-trova servo</string>
     <string name="preferred_locale_descr">Elekti lingvon de fasado (post ŝanĝi necesas restarti la aplikaĵon).</string>
-    <string name="unit_of_length">Unuoj de longo</string>
+    <string name="unit_of_length">Mezurunuoj de longo</string>
     <string name="unit_of_length_descr">Ŝanĝi unuojn por reprezenti distancoj.</string>
     <string name="si_mi_feet">Mejloj/futoj</string>
     <string name="si_mi_yard">Mejloj/jardoj</string>
@@ -2047,7 +2047,7 @@
     <string name="christmas_poi">Kristnaskaj interesejoj</string>
     <string name="christmas_desc">Atendante Kristnaskon kaj la novan jaron, vi povas aktivigi vidigadon de interesejoj rilataj al Kristnasko: kristnaskaj arbetoj, foiroj, ktp.</string>
     <string name="christmas_desc_q">Ĉu montri Kristnaskajn interesejojn\?</string>
-    <string name="shared_string_continue">Pluigi</string>
+    <string name="shared_string_continue">Daŭrigi</string>
     <string name="shared_string_pause">Paŭzigi</string>
     <string name="shared_string_trip">Spuro</string>
     <string name="shared_string_recorded">Registrita</string>
@@ -2245,10 +2245,10 @@
 \n • GPS-navigado en piedirada reĝimo kalkulas kursojn uzante piediradajn kursojn 
 \n • Alŝuti kaj postsekvi GPX-spuron aŭ registri kaj diskonigi vian propran
 \n</string>
-    <string name="osmand_extended_description_part7">Kontribui al OSM 
-\n • Raporti erarojn pri datumoj 
-\n • Alŝuti GPX-spurojn al OSM senpere de la aplikaĵo 
-\n • Aldoni interesejojn kaj senpere alŝuti ilin al OSM (aŭ poste se eksterrete)
+    <string name="osmand_extended_description_part7">Kontribui al OSM
+\n • Raporti erarojn pri datumoj
+\n • Alŝuti GPX-spurojn al OSM senpere de la aplikaĵo
+\n • Aldoni interesejojn kaj senpere alŝuti ilin al OSM (aŭ poste se malkonekte)
 \n</string>
     <string name="osmand_extended_description_part8">OsmAnd estas malfermkoda kaj daŭre evoluigata programaro. Ĉiu povas kontribui al la aplikaĵo per raporti erarojn, plibonigi tradukojn aŭ programi novajn funkciojn. La projekto baziĝas sur monaj donacoj por fondi kodumadon kaj testi novajn funkciojn. 
 \n Proksimuma map-atingo kaj kvalito: 
@@ -2307,10 +2307,10 @@
 \n • malnepra vidigo de rapido kaj altitudo 
 \n • vidigado de nivelkurboj kaj nivel‑ombrumo (reliefo) (per kromprogramo)</string>
     <string name="osmand_plus_extended_description_part7">Senpere kontribui al OSM:
-\n • raporti erarojn pri datumoj 
-\n • alŝuti GPX-spurojn al OSM senpere de la aplikaĵo 
-\n • aldoni interesejojn kaj senpere alŝuti ilin al OSM (aŭ poste se eksterrete) 
-\n • malnepre registri kurson ankaŭ en fona reĝimo (kiam la aparato dormetas) 
+\n • raporti erarojn pri datumoj
+\n • alŝuti GPX-spurojn al OSM senpere de la aplikaĵo
+\n • aldoni interesejojn kaj senpere alŝuti ilin al OSM (aŭ poste se malkonekte)
+\n • malnepre registri kurson ankaŭ en fona reĝimo (kiam la aparato dormetas)
 \n OsmAnd estas malfermkoda kaj daŭre evoluigata programaro. Ĉiu povas kontribui al la aplikaĵo per raporti erarojn, plibonigi tradukojn aŭ programi novajn funkciojn. La projekto baziĝas sur monaj donacoj por fondi kodumadon kaj testi novajn funkciojn.
 \n</string>
     <string name="osmand_plus_extended_description_part8">Proksimuma map‑atingo kaj kvalito: 
@@ -2685,9 +2685,9 @@
     <string name="in_app_purchase_desc">Unufoja pago</string>
     <string name="in_app_purchase_desc_ex">Kiam aĉetita, por ĉiam estos disponebla por vi.</string>
     <string name="purchase_unlim_title">Aĉeti - %1$s</string>
-    <string name="wikivoyage_offline">Vikivojaĝo eksterrete</string>
+    <string name="wikivoyage_offline">Vikivojaĝo malkonekte</string>
     <string name="unlimited_downloads">Senlimaj elŝutoj</string>
-    <string name="wikipedia_offline">Vikipedio eksterrete</string>
+    <string name="wikipedia_offline">Vikipedio malkonekte</string>
     <string name="unlock_all_features">Malŝlosi ĉiujn eblojn de OsmAnd</string>
     <string name="monthly_map_updates">Ĉiumonataj map‑ĝisdatigoj</string>
     <string name="daily_map_updates">Ĉiuhoraj map‑ĝisdatigoj</string>
@@ -2706,7 +2706,7 @@
     <string name="get_unlimited_access">Akiri senliman atingon</string>
     <string name="welcome_to_open_beta">Bonvenon al malfermita beta-testado!</string>
     <string name="contour_lines_hillshade_maps">Nivelkurbaj kaj nivelombrumaj mapoj</string>
-    <string name="download_wikipedia_description">Elŝutu Vikipediajn artikolojn por %1$s, por legi ilin eksterrete.</string>
+    <string name="download_wikipedia_description">Elŝutu Vikipediajn artikolojn por %1$s, por legi ilin malkonekte.</string>
     <string name="download_wikipedia_label">Elŝuti datumojn de Vikipedio</string>
     <string name="open_in_browser_wiki">Malfermi artikolon enrete</string>
     <string name="open_in_browser_wiki_description">Vidigi artikolon en foliumilo.</string>
@@ -2729,9 +2729,9 @@
     <string name="default_render_descr">Ĝenerala map-stilo. Legebla en dense loĝataj urboj. Nivel-kurboj, vojoj, kvalito de vojoj, aliraj limigoj, ŝoseaj numeroj, turismaj kursoj laŭ SAC-skalo, objektoj por rapid-akvaj sportoj.</string>
     <string name="open_wikipedia_link_online">Malfermi Vikipedian ligilon enrete</string>
     <string name="open_wikipedia_link_online_description">La ligilo estos malfermita per ret-foliumilo.</string>
-    <string name="read_wikipedia_offline_description">Akiru abonon al OsmAnd-Live por legi artikolojn de Vikipedio kaj Vikivojaĝo eksterrete.</string>
+    <string name="read_wikipedia_offline_description">Akiru abonon al OsmAnd Live por legi artikolojn de Vikipedio kaj Vikivojaĝo malkonekte.</string>
     <string name="how_to_open_link">Kiel malfermi la ligilon?</string>
-    <string name="read_wikipedia_offline">Legi Vikipedion eksterrete</string>
+    <string name="read_wikipedia_offline">Legi Vikipedion malkonekte</string>
     <string name="download_all">Elŝuti ĉiujn</string>
     <string name="shared_string_bookmark">Al legosignoj</string>
     <string name="off_road_render_descr">Por ekstervoja veturado, bazita sur la stilo “Topo”, por uzi kun verdaj satelitaj fotoj kiel subtavola mapo. Malpliigita larĝo de ĉefaj vojoj, pliigita larĝo de kampaj vojoj, vojetoj, biciklaj kaj aliaj vojoj.</string>
@@ -3137,7 +3137,7 @@
     <string name="turn_screen_on_info">Montri mapon sur la ŝlos‑ekrano dum navigado.</string>
     <string name="route_parameters_info">Agordoj pri kurs‑difinado por la elektita profilo: “%1$s”.</string>
     <string name="wake_time">Aktiveca periodo de ekrano</string>
-    <string name="units_and_formats">Unuoj kaj formoj</string>
+    <string name="units_and_formats">Mezurunuoj &amp; formoj</string>
     <string name="map_look_descr">Alĝustigi mapon</string>
     <string name="map_look">Map‑aspekto</string>
     <string name="list_of_installed_plugins">Instalitaj kromprogramoj</string>
@@ -3163,7 +3163,7 @@
     <string name="voice_announces_descr">Navigaj gvidiloj kaj anoncoj</string>
     <string name="voice_announces">Voĉaj anoncoj</string>
     <string name="screen_alerts">Ekranaj avertoj</string>
-    <string name="route_parameters_descr">Agordi parametroj de navigo</string>
+    <string name="route_parameters_descr">Agordi parametrojn de navigo</string>
     <string name="route_parameters">Parametroj de navigo</string>
     <string name="application_profile_changed">Profilo de aplikaĵo ŝanĝita al “%s”</string>
     <string name="logcat_buffer">Bufro logcat</string>
@@ -3551,9 +3551,9 @@
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
     <string name="osm_live_payment_subscription_management">La pago estos prenita el via konto Google Play post konfirmi aĉeton.
 \n
-\n La abono aŭtomate renoviĝos escepte se ĝi estos nuligita antaŭ la dato de renoviĝo. La pago estos prenita por la renoviĝa periodo (monato/tri monatoj/jaro) nur je la dato de renoviĝo.
+\nLa abono aŭtomate renoviĝos escepte se ĝi estos nuligita antaŭ la dato de renoviĝo. La pago estos prenita por la renoviĝa periodo (monato/tri monatoj/jaro) nur je la dato de renoviĝo.
 \n
-\n Vi povas administri kaj rezigni viajn abonojn per agordoj de Google Play.</string>
+\nVi povas administri kaj rezigni viajn abonojn per agordoj de Google Play.</string>
     <string name="search_poi_types_descr">Miksi specojn de interesejoj el diversaj kategorioj. Frapetu ŝaltilon por elekti la tutan kategorion, frapetu ĉe maldekstre por elekti detala(j)n objekto(j)n el la kategorio.</string>
     <string name="search_poi_types">Serĉi specojn de interesejoj</string>
     <string name="favorites_item">Ŝatataj ejoj</string>
@@ -3798,9 +3798,9 @@
     <string name="what_is_new">Kio estas nova</string>
     <string name="osm_live_payment_subscription_management_hw">La pago estos prenita el via konto AppGallery post konfirmi aĉeton.
 \n
-\n La abono aŭtomate renoviĝos escepte se ĝi estos nuligita antaŭ la dato de renoviĝo. La pago estos prenita por la renoviĝa periodo (monato/tri monatoj/jaro) nur je la dato de renoviĝo.
+\nLa abono aŭtomate renoviĝos escepte se ĝi estos nuligita antaŭ la dato de renoviĝo. La pago estos prenita por la renoviĝa periodo (monato/tri monatoj/jaro) nur je la dato de renoviĝo.
 \n
-\n Vi povas administri kaj rezigni viajn abonojn per la agordoj de AppGallery.</string>
+\nVi povas administri kaj rezigni viajn abonojn per la agordoj de AppGallery.</string>
     <string name="start_finish_icons">Emblemoj de komenco kaj fino</string>
     <string name="contour_lines_thanks">Dankon al vi por aĉeti la kromprogramon “nivelkurboj”</string>
     <string name="osm_live_payment_desc_hw">La abonpago estas prenita por la elektita periodo. VI ĉiam povas rezigni abonon ĉe AppGallery.</string>
@@ -4054,7 +4054,11 @@
     <string name="customize_route_line">Alĝustigi linion de kurso</string>
     <string name="shared_string_route_line">Linio de kurso</string>
     <string name="route_line_use_map_style_appearance">Por la linio de kurso estos uzata %1$s difinita por la map‑stilo: %2$s.</string>
-    <string name="release_4_0_beta">• ĝisdatigoj OsmAnd Live movitaj al “elŝutoj” → “ĝisdatigoj”
+    <string name="release_4_0_beta">• eblo elŝuti nivelkurbojn en futoj
+\n
+\n• horizontala vido por “plani kurson”: aldonitaj langetoj por baskuli inter punktoj kaj diagramoj
+\n
+\n• ĝisdatigoj OsmAnd Live movitaj al “elŝutoj” → “ĝisdatigoj”
 \n
 \n• eblo kolorigi spurojn laŭ altitudo, rapido aŭ dekliveco
 \n
@@ -4081,4 +4085,12 @@
     <string name="annual_subscription">Jara abono</string>
     <string name="monthly_subscription">Monata abono</string>
     <string name="update_all_maps_added">Ĉu ĝisdatigi ĉiujn mapojn aldonitajn al %1$s\?</string>
+    <string name="announce_when_exceeded">Anonci kiam superita</string>
+    <string name="exit_number">Numero de elirejo</string>
+    <string name="user_points">Poentoj de uzanto</string>
+    <string name="output">Eligo</string>
+    <string name="shared_string_feet">futoj</string>
+    <string name="srtm_unit_format">Unuo por nivelkurboj</string>
+    <string name="srtm_download_list_help_message">OsmAnd liveras nivelkurbojn en metroj kaj en futoj. Ve devos reelŝuti la dosieron por ŝanĝi la formon.</string>
+    <string name="srtm_download_single_help_message">Elektu la deziratan formon. Vi devos reelŝuti la dosieron por ŝanĝi la formon.</string>
 </resources>

OsmAnd/res/values-es-rAR/phrases.xml

@@ -3895,4 +3895,37 @@
     <string name="poi_geodesist">Geodésico</string>
     <string name="poi_conference_centre">Centro de conferencias</string>
     <string name="poi_camp_pitch">Parcela de campamento</string>
+    <string name="poi_kickboxing">Kickboxing</string>
+    <string name="poi_horseshoes">Herraduras</string>
+    <string name="poi_fencing">Esgrima</string>
+    <string name="poi_cycle_polo">Polo ciclista</string>
+    <string name="poi_curling">Curling</string>
+    <string name="poi_crossfit">Crossfit;Entrenamiento de alta intensidad</string>
+    <string name="poi_cockfighting">Pelea de gallos</string>
+    <string name="poi_cliff_diving">Salto de acantilado</string>
+    <string name="poi_bullfighting">Tauromaquia</string>
+    <string name="poi_bobsleigh">Bobsleigh</string>
+    <string name="poi_biathlon">Biatlón</string>
+    <string name="poi_aikido">Aikido</string>
+    <string name="poi_water_ski">Esquí acuático</string>
+    <string name="poi_water_polo">Polo acuático</string>
+    <string name="poi_zurkhaneh_sport">Deporte zurkhaneh</string>
+    <string name="poi_wrestling">Lucha libre</string>
+    <string name="poi_weightlifting">Levantamiento de pesas</string>
+    <string name="poi_wakeboarding">Esquí acuático sobre tabla</string>
+    <string name="poi_ultimate">Disco volador (Ultimate);Ultimate Frisbee</string>
+    <string name="poi_taekwondo">Taekwondo</string>
+    <string name="poi_table_soccer">Fútbol de mesa;Metegol;Futbolín</string>
+    <string name="poi_sumo">Sumo</string>
+    <string name="poi_speedway">Pista de carreras</string>
+    <string name="poi_snooker">Snooker</string>
+    <string name="poi_shot_put">Lanzamiento de peso;Lanzamiento de bala</string>
+    <string name="poi_pilates">Pilates</string>
+    <string name="poi_jiu_jitsu">Jiu-jitsu</string>
+    <string name="poi_karate">Kárate</string>
+    <string name="poi_hoops">Aros</string>
+    <string name="poi_office_diplomatic">Oficina diplomática</string>
+    <string name="poi_bay_filter">Tipo de bahía</string>
+    <string name="poi_plateau">Meseta (altiplano)</string>
+    <string name="poi_club_social">Club social</string>
 </resources>

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

@@ -209,7 +209,7 @@
     <string name="traffic_warning_calming">Reductor de velocidad</string>
     <string name="traffic_warning_speed_camera">Radar de velocidad</string>
     <string name="traffic_warning">Aviso de tráfico</string>
-    <string name="speak_favorites">Favoritos cerca</string>
+    <string name="speak_favorites">Favoritos cercanos</string>
     <string name="speak_poi">PDI cercanos</string>
     <string name="way_alarms">Advertencias de tráfico</string>
     <string name="stop_navigation_service">Parar</string>
@@ -3126,7 +3126,7 @@
     <string name="cancel_subscription">Cancelar suscripción</string>
     <string name="price_and_discount">%1$s • Ahorra %2$s</string>
     <string name="configure_profile_info">Ajustes para el perfil:</string>
-    <string name="utm_format_descr">OsmAnd utiliza el formato UTM Estándar, similar pero no idéntico al formato UTM NATO.</string>
+    <string name="utm_format_descr">OsmAnd usa el formato UTM Estándar, similar pero no idéntico al formato UTM de la OTAN.</string>
     <string name="shared_string_example">Ejemplo</string>
     <string name="navigate_point_format_utm">UTM Estándar</string>
     <string name="navigate_point_format_olc">Código de Ubicación Abierto</string>
@@ -4054,22 +4054,22 @@
     <string name="trip_recording_show_start_dialog_setting">Si se desactiva, la grabación será iniciada al pulsar el widget o el elemento del menú, saltándose el diálogo de confirmación.</string>
     <string name="customize_route_line">Personalizar línea de ruta</string>
     <string name="shared_string_route_line">Línea de ruta</string>
-    <string name="route_line_use_map_style_appearance">La línea de la ruta sería el uso %1$s especificado en el estilo de mapa seleccionado: %2$s.</string>
+    <string name="route_line_use_map_style_appearance">La línea de ruta usará el %1$s definido en el estilo de mapa elegido: %2$s.</string>
     <string name="specify_color_for_map_mode">Define el color para el modo de mapa: %1$s.</string>
-    <string name="release_4_0_beta">• Las actualizaciones de OsmAnd Live se movieron a «Descargas &gt; Actualizaciones»
+    <string name="release_4_0_beta">• Las actualizaciones de OsmAnd Live se han movido a «Descargas &gt; Actualizaciones».
 \n
-\n • Las trazas ahora se pueden colorear por altitud, velocidad o pendiente.
+\n• Las trazas ahora pueden colorearse por altitud, velocidad o pendiente.
 \n
-\n • Se añade opción para cambiar la apariencia de la línea de ruta de navegación
+\n• Se ha añadido la opción de cambiar el aspecto a la línea de ruta de la navegación
 \n
-\n • Se actualiza el cuadro de diálogo «Grabación de viaje»
+\n• Se ha actualizado el cuadro de diálogo «Grabación de viaje»
 \n
 \n</string>
     <string name="no_purchases">No tienes compras</string>
     <string name="new_device_account">Nuevo dispositivo / nueva cuenta</string>
     <string name="contact_support_description">Si tienes alguna duda, ponte en contacto con nosotros en %1$s.</string>
     <string name="empty_purchases_description">Si tus compras no aparecen aquí, pulsa sobre «%1$s», o ponte en contacto con nuestro equipo de asistencia.</string>
-    <string name="contact_support">Soporte de contacto</string>
+    <string name="contact_support">Contacto con soporte</string>
     <string name="troubleshooting">Solución de problemas</string>
     <string name="troubleshooting_description">Sigue este enlace si tienes algún problema con las compras.</string>
     <string name="osmand_live">OsmAnd Live</string>
@@ -4083,4 +4083,8 @@
     <string name="on_hold">En espera</string>
     <string name="expired">Expirado</string>
     <string name="update_all_maps_added">¿Actualizar todos los mapas añadidos a %1$s\?</string>
+    <string name="exit_number">Número de salida</string>
+    <string name="announce_when_exceeded">Anunciar al excederse</string>
+    <string name="user_points">Puntos de usuario</string>
+    <string name="output">Salida</string>
 </resources>

OsmAnd/res/values-es-rUS/phrases.xml

@@ -3894,4 +3894,36 @@
     <string name="poi_local_ref">Referencia local</string>
     <string name="poi_geodesist">Geodésico</string>
     <string name="poi_conference_centre">Centro de conferencias</string>
+    <string name="poi_kickboxing">Kickboxing</string>
+    <string name="poi_horseshoes">Herraduras</string>
+    <string name="poi_fencing">Esgrima</string>
+    <string name="poi_cycle_polo">Polo ciclista</string>
+    <string name="poi_curling">Curling</string>
+    <string name="poi_crossfit">Crossfit;Entrenamiento de alta intensidad</string>
+    <string name="poi_cockfighting">Pelea de gallos</string>
+    <string name="poi_cliff_diving">Salto de acantilado</string>
+    <string name="poi_bullfighting">Tauromaquia</string>
+    <string name="poi_bobsleigh">Bobsleigh</string>
+    <string name="poi_biathlon">Biatlón</string>
+    <string name="poi_aikido">Aikido</string>
+    <string name="poi_water_ski">Esquí acuático</string>
+    <string name="poi_water_polo">Polo acuático</string>
+    <string name="poi_zurkhaneh_sport">Deporte zurkhaneh</string>
+    <string name="poi_wrestling">Lucha libre</string>
+    <string name="poi_weightlifting">Levantamiento de pesas</string>
+    <string name="poi_wakeboarding">Esquí acuático sobre tabla</string>
+    <string name="poi_ultimate">Disco volador (Ultimate);Ultimate Frisbee</string>
+    <string name="poi_taekwondo">Taekwondo</string>
+    <string name="poi_table_soccer">Fútbol de mesa;Metegol;Futbolín</string>
+    <string name="poi_sumo">Sumo</string>
+    <string name="poi_speedway">Pista de carreras</string>
+    <string name="poi_snooker">Snooker</string>
+    <string name="poi_shot_put">Lanzamiento de peso;Lanzamiento de bala</string>
+    <string name="poi_pilates">Pilates</string>
+    <string name="poi_jiu_jitsu">Jiu-jitsu</string>
+    <string name="poi_karate">Kárate</string>
+    <string name="poi_hoops">Aros</string>
+    <string name="poi_camp_pitch">Parcela de campamento</string>
+    <string name="poi_office_diplomatic">Oficina diplomática</string>
+    <string name="poi_bay_filter">Tipo de bahía</string>
 </resources>

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

@@ -209,7 +209,7 @@
     <string name="traffic_warning_calming">Reductor de velocidad</string>
     <string name="traffic_warning_speed_camera">Radar de velocidad</string>
     <string name="traffic_warning">Aviso de tráfico</string>
-    <string name="speak_favorites">Favoritos cerca</string>
+    <string name="speak_favorites">Favoritos cercanos</string>
     <string name="speak_poi">PDI cercanos</string>
     <string name="way_alarms">Advertencias de tráfico</string>
     <string name="stop_navigation_service">Parar</string>
@@ -3125,7 +3125,7 @@
     <string name="cancel_subscription">Cancelar suscripción</string>
     <string name="price_and_discount">%1$s • Ahorra %2$s</string>
     <string name="configure_profile_info">Ajustes para el perfil:</string>
-    <string name="utm_format_descr">OsmAnd utiliza el formato UTM Estándar, similar pero no idéntico al formato UTM NATO.</string>
+    <string name="utm_format_descr">OsmAnd usa el formato UTM Estándar, similar pero no idéntico al formato UTM de la OTAN.</string>
     <string name="shared_string_example">Ejemplo</string>
     <string name="navigate_point_format_utm">UTM Estándar</string>
     <string name="navigate_point_format_olc">Código de Ubicación Abierto</string>
@@ -4052,4 +4052,40 @@
     <string name="lost_data_warning">Se perderán todos los datos no guardados.</string>
     <string name="show_start_dialog">Mostrar el diálogo inicial</string>
     <string name="trip_recording_show_start_dialog_setting">Si se desactiva, la grabación será iniciada al pulsar el widget o el elemento del menú, saltándose el diálogo de confirmación.</string>
+    <string name="customize_route_line">Personalizar línea de ruta</string>
+    <string name="shared_string_route_line">Línea de ruta</string>
+    <string name="route_line_use_map_style_appearance">La línea de ruta usará el %1$s definido en el estilo de mapa elegido: %2$s.</string>
+    <string name="specify_color_for_map_mode">Define el color para el modo de mapa: %1$s.</string>
+    <string name="no_purchases">No tienes compras</string>
+    <string name="new_device_account">Nuevo dispositivo / nueva cuenta</string>
+    <string name="contact_support_description">Si tienes alguna duda, ponte en contacto con nosotros en %1$s.</string>
+    <string name="empty_purchases_description">Si tus compras no aparecen aquí, pulsa sobre «%1$s», o ponte en contacto con nuestro equipo de asistencia.</string>
+    <string name="contact_support">Contacto con soporte</string>
+    <string name="troubleshooting">Solución de problemas</string>
+    <string name="troubleshooting_description">Sigue este enlace si tienes algún problema con las compras.</string>
+    <string name="osmand_live">OsmAnd Live</string>
+    <string name="annual_subscription">Suscripción anual</string>
+    <string name="monthly_subscription">Suscripción mensual</string>
+    <string name="three_months_subscription">Suscripción trimestral</string>
+    <string name="next_billing_date">Próxima facturación: %1$s</string>
+    <string name="osmand_live_cancelled">Cancelado</string>
+    <string name="renew_subscription">Renovar suscripción</string>
+    <string name="in_grace_period">En período de gracia</string>
+    <string name="on_hold">En espera</string>
+    <string name="expired">Expirado</string>
+    <string name="release_4_0_beta">• Las actualizaciones de OsmAnd Live se han movido a «Descargas &gt; Actualizaciones».
+\n
+\n• Las trazas ahora pueden colorearse por altitud, velocidad o pendiente.
+\n
+\n• Se ha añadido la opción de cambiar el aspecto a la línea de ruta de la navegación
+\n
+\n• Se ha actualizado el cuadro de diálogo «Grabación de viaje»
+\n
+\n</string>
+    <string name="update_all_maps_added">¿Actualizar todos los mapas añadidos a %1$s\?</string>
+    <string name="exit_number">Número de salida</string>
+    <string name="announce_when_exceeded">Anunciar al excederse</string>
+    <string name="user_points">Puntos de usuario</string>
+    <string name="output">Salida</string>
+    <string name="map_quick_action_pattern">%1$s → …</string>
 </resources>

OsmAnd/res/values-es/phrases.xml

@@ -3891,4 +3891,39 @@
     <string name="poi_gladed_yes">Arbolado: sí</string>
     <string name="poi_piste_name">Nombre de la pista</string>
     <string name="poi_piste_ski_jump">Salto con esquís</string>
+    <string name="poi_office_diplomatic">Oficina diplomática</string>
+    <string name="poi_kickboxing">Kickboxing</string>
+    <string name="poi_horseshoes">Herradura</string>
+    <string name="poi_fencing">Esgrima</string>
+    <string name="poi_cycle_polo">Ciclopolo</string>
+    <string name="poi_curling">Curling</string>
+    <string name="poi_crossfit">Crossfit</string>
+    <string name="poi_cockfighting">Pelea de gallos</string>
+    <string name="poi_cliff_diving">Salto de gran altura</string>
+    <string name="poi_bullfighting">Toreo</string>
+    <string name="poi_bobsleigh">Bobsleigh</string>
+    <string name="poi_biathlon">Biatlón</string>
+    <string name="poi_aikido">Aikido</string>
+    <string name="poi_water_ski">Esquí acuático</string>
+    <string name="poi_water_polo">Waterpolo</string>
+    <string name="poi_zurkhaneh_sport">Zurkhaneh</string>
+    <string name="poi_wrestling">Lucha libre</string>
+    <string name="poi_weightlifting">Halterofilia</string>
+    <string name="poi_wakeboarding">Wakeboarding</string>
+    <string name="poi_ultimate">Disco Volador</string>
+    <string name="poi_taekwondo">Taekwondo</string>
+    <string name="poi_table_soccer">Futbolín</string>
+    <string name="poi_sumo">Sumo</string>
+    <string name="poi_speedway">Pista de carreras</string>
+    <string name="poi_snooker">Snooker</string>
+    <string name="poi_shot_put">Lanzamiento de peso</string>
+    <string name="poi_pilates">Pilates</string>
+    <string name="poi_jiu_jitsu">Jiu-jitsu</string>
+    <string name="poi_karate">Kárate</string>
+    <string name="poi_hoops">Canastas</string>
+    <string name="poi_camp_pitch">Parcela de acampada</string>
+    <string name="poi_local_ref">Referencia local</string>
+    <string name="poi_geodesist">Geodésico</string>
+    <string name="poi_conference_centre">Centro de conferencia</string>
+    <string name="poi_bay_filter">Tipo de bahía</string>
 </resources>

OsmAnd/res/values-es/strings.xml

@@ -1294,7 +1294,7 @@
     <string name="download_additional_maps">¿Descargar los %1$s mapas que faltan (%2$d MB)?</string>
     <string name="shared_string_waypoints">Puntos de referencia</string>
     <string name="way_alarms">Advertencias de tráfico</string>
-    <string name="speak_favorites">Favoritos cerca</string>
+    <string name="speak_favorites">Favoritos cercanos</string>
     <string name="speak_poi">PDI cercanos</string>
     <string name="shared_string_all">Todos</string>
     <string name="index_tours">Excursiones</string>
@@ -1988,7 +1988,7 @@
     <string name="update_all_maps_now">¿Actualizar todos los mapas ahora?</string>
     <string name="clear_tile_data">Limpiar todas las teselas</string>
     <string name="routing_attr_short_way_name">Ruta de bajo consumo (corta)</string>
-    <string name="replace_favorite_confirmation">¿Reemplazar el Favorito «%1$s»?</string>
+    <string name="replace_favorite_confirmation">¿Seguro que quieres reemplazar el favorito «%1$s»\?</string>
     <string name="rendering_attr_hideOverground_name">Objetos en superficie</string>
     <string name="shared_string_change">Cambiar</string>
     <string name="get_started">Empezar</string>
@@ -2000,12 +2000,12 @@
     <string name="location_not_found">Ubicación no encontrada</string>
     <string name="no_inet_connection">Sin conexión a Internet</string>
     <string name="no_inet_connection_desc_map">Necesario para descargar mapas.</string>
-    <string name="search_location">Buscando la ubicación…</string>
+    <string name="search_location">Buscando ubicación…</string>
     <string name="storage_free_space">Espacio libre</string>
     <string name="storage_place_description">Almacenamiento de datos de OsmAnd (para mapas, trazas, etc.): %1$s.</string>
     <string name="give_permission">Conceder permiso</string>
     <string name="allow_access_location">Permitir el acceso a la ubicación</string>
-    <string name="first_usage_greeting">Obtén direcciones y descubre sitios nuevos sin una conexión a Internet</string>
+    <string name="first_usage_greeting">Obtén indicaciones y descubre lugares nuevos sin conexión a Internet</string>
     <string name="search_my_location">Encontrar mi ubicación</string>
     <string name="osm_live_payment_desc">La suscripción se cobra por el período elegido. Puedes cancelarlo en cualquier momento en Google Play.</string>
     <string name="donation_to_osm">Donaciones a la comunidad de OSM</string>
@@ -2066,7 +2066,7 @@
     <string name="save_filter">Guardar filtro</string>
     <string name="delete_filter">Borrar filtro</string>
     <string name="new_filter">Nuevo filtro</string>
-    <string name="new_filter_desc">Ingresa el nombre del nuevo filtro, que se añadirá en tu pestaña «Categorías».</string>
+    <string name="new_filter_desc">Escribe el nombre del nuevo filtro, que se añadirá en tu pestaña «Categorías».</string>
     <string name="rendering_value_fine_name">Muy fino</string>
     <string name="lang_sr_latn">Serbio (latino)</string>
     <string name="lang_zh_hk">Chino (Hong Kong)</string>
@@ -2385,12 +2385,12 @@
     <string name="restart_search">Reiniciar búsqueda</string>
     <string name="increase_search_radius">Aumentar radio de búsqueda</string>
     <string name="nothing_found">Nada encontrado</string>
-    <string name="nothing_found_descr">Cambiar la búsqueda o aumentar su radio.</string>
+    <string name="nothing_found_descr">Cambia la búsqueda o aumenta su radio.</string>
     <string name="hillshade_menu_download_descr">Descarga la capa superpuesta del mapa «Sombreado» para mostrar el sombreado vertical.</string>
     <string name="hillshade_purchase_header">Instala el complemento «Curvas de nivel» para mostrar las áreas verticales graduadas.</string>
     <string name="private_access_routing_req">El destino se ubica en un área de acceso privado. ¿Permitir el uso de caminos privados para este viaje\?</string>
     <string name="mapillary_widget">Widget de Mapillary</string>
-    <string name="mapillary_descr">Fotos a nivel de calle en línea para todos. Descubre sitios, colabora, captura el mundo.</string>
+    <string name="mapillary_descr">Fotos a nivel de calle en línea para todos. Descubre lugares, colabora, captura el mundo.</string>
     <string name="mapillary">Mapillary</string>
     <string name="shared_string_add_photos">Añadir fotos</string>
     <string name="mapillary_action_descr">Comparte tus imágenes a nivel de calle a través de Mapillary.</string>
@@ -2858,7 +2858,7 @@
     <string name="rendering_attr_surface_concrete_name">Hormigón</string>
     <string name="rendering_attr_surface_sett_name">Adoquín</string>
     <string name="rendering_attr_surface_cobblestone_name">Empedrado (adoquín)</string>
-    <string name="rendering_attr_surface_paving_stones_name">Pavimento intertrabado / Adoquín prefabricado</string>
+    <string name="rendering_attr_surface_paving_stones_name">Adoquinado</string>
     <string name="rendering_attr_surface_pebblestone_name">Canto rodado</string>
     <string name="rendering_attr_surface_stone_name">Piedra</string>
     <string name="rendering_attr_surface_metal_name">Metal</string>
@@ -2875,7 +2875,7 @@
     <string name="rendering_attr_smoothness_very_horrible_name">Muy horrible</string>
     <string name="rendering_attr_smoothness_impassable_name">Intransitable</string>
     <string name="rendering_attr_highway_class_motorway_name">Autopista</string>
-    <string name="rendering_attr_highway_class_state_road_name">Carretera/ruta estatal</string>
+    <string name="rendering_attr_highway_class_state_road_name">Carretera estatal</string>
     <string name="rendering_attr_highway_class_road_name">Carretera principal</string>
     <string name="rendering_attr_highway_class_street_name">Calle</string>
     <string name="rendering_attr_highway_class_service_name">Vía de servicio</string>
@@ -2884,7 +2884,7 @@
     <string name="rendering_attr_highway_class_bridleway_name">Camino ecuestre</string>
     <string name="rendering_attr_highway_class_steps_name">Escalera</string>
     <string name="rendering_attr_highway_class_path_name">Sendero</string>
-    <string name="rendering_attr_highway_class_cycleway_name">Ciclovía/Bicisenda</string>
+    <string name="rendering_attr_highway_class_cycleway_name">Ciclovía</string>
     <string name="rendering_attr_undefined_name">Indefinido</string>
     <string name="public_transport_warning_descr_blog">Lea más sobre el cálculo de las rutas de OsmAnd en nuestro blog.</string>
     <string name="public_transport_warning_title">La navegación en transporte público se encuentra actualmente en fase de pruebas beta, se esperan errores e imprecisiones.</string>
@@ -2898,7 +2898,7 @@
     <string name="routing_attr_avoid_sett_name">Sin empedrado y adoquinado</string>
     <string name="routing_attr_avoid_sett_description">Evitar las calles empedradas y adoquinadas</string>
     <string name="shared_string_degrees">Grados</string>
-    <string name="shared_string_milliradians">Milésimas angulares</string>
+    <string name="shared_string_milliradians">Milirradianes</string>
     <string name="angular_measeurement">Unidad angular</string>
     <string name="angular_measeurement_descr">Cambiar el acimut en el que se mide.</string>
     <string name="routing_attr_avoid_tram_name">Sin tranvías</string>
@@ -2927,7 +2927,7 @@
     <string name="public_transport_calc_pedestrian">Calcular la ruta a pie</string>
     <string name="public_transport_type">Tipo de transporte</string>
     <string name="searching_gps">Buscando GPS</string>
-    <string name="coordinates_widget">Widget de coordenadas</string>
+    <string name="coordinates_widget">Control de coordenadas</string>
     <string name="app_mode_ufo">OVNI</string>
     <string name="release_3_4">• Perfiles de aplicación: crea un perfil personalizado según tus necesidades, con un icono y color personalizado.
 \n
@@ -3414,7 +3414,7 @@
     <string name="shared_string_profiles">Perfiles</string>
     <string name="shared_string_quick_actions">Acciones rápidas</string>
     <string name="shared_string_nothing_selected">No hay nada seleccionado</string>
-    <string name="shared_string_poi_types">Tipo de PDI</string>
+    <string name="shared_string_poi_types">Tipos de PDI</string>
     <string name="shared_string_preparing">Preparando</string>
     <string name="recalc_angle_dialog_title">Ángulo mínimo entre mi ubicación y ruta</string>
     <string name="recalc_angle_dialog_descr">Se mostrará un segmento recto adicional entre mi ubicación y la ruta calculada hasta que se vuelva a calcular la ruta</string>
@@ -3496,7 +3496,7 @@
     <string name="navigation_profiles_item">Perfiles de navegación</string>
     <string name="create_edit_poi">Crear o editar PDI</string>
     <string name="add_edit_favorite">Añadir o editar favorito</string>
-    <string name="shared_string_add_profile">Agregar perfil</string>
+    <string name="shared_string_add_profile">Añadir perfil</string>
     <string name="lang_an">Aragonés</string>
     <string name="custom_color">Color personalizado</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
@@ -3668,8 +3668,8 @@
     <string name="clear_tiles_warning">Al aplicar estos cambios, los datos almacenados serán borrados para este repositorio de teselas</string>
     <string name="vessel_height_warning_link">Fijar la altura del navío</string>
     <string name="vessel_height_warning">Puedes establecer la altura del navío para evitar los puentes bajos. Ten en cuenta que si el puente es móvil, usaremos su altura en estado abierto.</string>
-    <string name="vessel_height_limit_description">Fija la altura del navío para evitar los puentes bajos. Ten en cuenta que si el puente es móvil, usaremos su altura en estado abierto.</string>
-    <string name="vessel_width_limit_description">Fija el ancho del navío para evitar puentes estrechos</string>
+    <string name="vessel_height_limit_description">Define la altura de la embarcación para evitar los puentes bajos. Ten en cuenta que si el puente es móvil, usaremos su altura en estado abierto.</string>
+    <string name="vessel_width_limit_description">Define el ancho de la embarcación para evitar puentes estrechos</string>
     <string name="quick_action_showhide_mapillary_descr">Un botón que alterna la capa de Mapillary en el mapa.</string>
     <string name="routing_attr_length_description">Especifica la longitud del vehículo que se permitirá en las rutas.</string>
     <string name="routing_attr_length_name">Límite de longitud</string>
@@ -3695,11 +3695,11 @@
     <string name="access_hint_enter_address">Ingresar dirección</string>
     <string name="shared_string_done">Hecho</string>
     <string name="simplified_track">Traza simplificada</string>
-    <string name="simplified_track_description">Sólo se grabará la línea de la ruta, los puntos intermedios (waypoints) se borrarán.</string>
+    <string name="simplified_track_description">Sólo se grabará la línea de la ruta, los puntos intermedios se borrarán.</string>
     <string name="shared_string_file_name">Nombre de archivo</string>
     <string name="number_of_gpx_files_selected_pattern">%s archivos de trazas marcados</string>
     <string name="monitoring_control_start">Grabar</string>
-    <string name="save_global_track_interval_descr">Especifica el intervalo de grabación general para trazas (activado a través del widget de grabación en el mapa).</string>
+    <string name="save_global_track_interval_descr">Especifica el intervalo de registro para la grabación general de trazas (activado a través del control \'Grabación de viaje\' en el mapa).</string>
     <string name="gpx_monitoring_stop">Pausar grabación del viaje</string>
     <string name="gpx_monitoring_start">Reanudar grabación del viaje</string>
     <string name="system_default_theme">Predeterminado del sistema</string>
@@ -3765,7 +3765,7 @@
     <string name="follow_track">Seguir traza</string>
     <string name="follow_track_descr">Elige el archivo de la traza a seguir</string>
     <string name="import_track_descr">Elige el archivo de la traza a seguir o impórtala desde el dispositivo.</string>
-    <string name="select_another_track">Selecciona otra traza</string>
+    <string name="select_another_track">Seleccionar otra traza</string>
     <string name="navigate_to_track_descr">Navegar desde mi ubicación a la traza</string>
     <string name="pass_whole_track_descr">Apuntar a la traza para navegar</string>
     <string name="start_of_the_track">Inicio de la traza</string>
@@ -3924,15 +3924,15 @@
 \nPuedes leer más en: https://openplacereviews.org</string>
     <string name="open_place_reviews">OpenPlaceReviews</string>
     <string name="online_routing_example_hint">La URL con todos los parámetros se verá así:</string>
-    <string name="online_routing_engines">Motores de navegación en línea</string>
-    <string name="online_routing_engine">Motor de navegación en línea</string>
+    <string name="online_routing_engines">Enrutadores en línea</string>
+    <string name="online_routing_engine">Enrutadores en línea</string>
     <string name="message_server_error">Error de servidor: %1$s</string>
     <string name="message_name_is_already_exists">El nombre ya existe</string>
     <string name="login_open_place_reviews">Acceder a OpenPlaceReviews</string>
-    <string name="keep_it_empty_if_not">Si no, mantenerlo vacío</string>
+    <string name="keep_it_empty_if_not">Mantenerlo vación si no</string>
     <string name="hillshade_slope_contour_lines">Sombreado / Pendiente / Curvas de nivel</string>
     <string name="edit_track">Editar traza</string>
-    <string name="edit_online_routing_engine">Editar motor de navegación en línea</string>
+    <string name="edit_online_routing_engine">Editar enrutador en linea</string>
     <string name="delete_waypoints">Borrar puntos de referencia</string>
     <string name="delete_online_routing_engine">¿Borrar este motor de navegación en línea\?</string>
     <string name="copy_to_map_markers">Copiar a «Marcadores del mapa»</string>
@@ -3951,7 +3951,7 @@
     <string name="announcement_time_arrive">Has llegado al destino</string>
     <string name="announcement_time_approach">Acercarse</string>
     <string name="analyze_by_intervals">Analizar intervalos divididos</string>
-    <string name="add_online_routing_engine">Añadir motor de navegación en línea</string>
+    <string name="add_online_routing_engine">Agregar enrutador en linea</string>
     <string name="activity_type_winter_name">Invierno</string>
     <string name="activity_type_water_name">Agua</string>
     <string name="activity_type_walking_name">Peatón</string>
@@ -3965,4 +3965,124 @@
     <string name="activity_type_hiking_name">Senderismo</string>
     <string name="activity_type_cycling_name">Bicicleta</string>
     <string name="activity_type_car_name">Automóvil</string>
+    <string name="shared_string_api_key">Clave API</string>
+    <string name="uploaded_count">Subido %1$d de %2$d</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Límites de reservas naturales</string>
+    <string name="map_quick_action_pattern">%1$s → …</string>
+    <string name="shared_string_subtype">Subtipo</string>
+    <string name="shared_string_vehicle">Vehículo</string>
+    <string name="shared_string_server_url">URL del servidor</string>
+    <string name="shared_string_enter_param">Introduce parámetro</string>
+    <string name="test_route_calculation">Cálculo de la ruta de prueba</string>
+    <string name="routing_engine_vehicle_type_driving">Conduciendo</string>
+    <string name="routing_engine_vehicle_type_foot">A pie</string>
+    <string name="routing_engine_vehicle_type_bike">Bicicleta</string>
+    <string name="routing_engine_vehicle_type_car">Coche</string>
+    <string name="shared_string_folders">Carpetas</string>
+    <string name="select_folder">Seleccionar carpeta</string>
+    <string name="select_folder_descr">Selecciona carpeta o agrega una nueva</string>
+    <string name="shared_string_empty">Vacío</string>
+    <string name="upload_to_openstreetmap">Subir a OpenStreetMap</string>
+    <string name="rename_track">Renombrar traza</string>
+    <string name="shared_string_sec">seg</string>
+    <string name="shared_string_turn">Giro</string>
+    <string name="start_recording">Iniciar grabación</string>
+    <string name="show_track_on_map">Mostrar pista en el mapa</string>
+    <string name="routing_engine_vehicle_type_wheelchair">Silla de ruedas</string>
+    <string name="routing_engine_vehicle_type_hiking">Senderismo</string>
+    <string name="routing_engine_vehicle_type_walking">Andando</string>
+    <string name="routing_engine_vehicle_type_cycling_electric">Ciclismo eléctrico</string>
+    <string name="routing_engine_vehicle_type_cycling_mountain">Ciclismo de montaña</string>
+    <string name="routing_engine_vehicle_type_cycling_road">Ciclismo de carretera</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">Ciclismo normal</string>
+    <string name="routing_engine_vehicle_type_hgv">Vehículo pesado</string>
+    <string name="routing_engine_vehicle_type_small_truck">Camión pequeño</string>
+    <string name="routing_engine_vehicle_type_truck">Camión</string>
+    <string name="routing_engine_vehicle_type_scooter">Escúter</string>
+    <string name="routing_engine_vehicle_type_racingbike">Bicicleta de carreras</string>
+    <string name="routing_engine_vehicle_type_mtb">MTB</string>
+    <string name="upload_photo">Subiendo</string>
+    <string name="upload_photo_completed">Subida completa</string>
+    <string name="uploading_count">Subiendo %1$d de %2$d</string>
+    <string name="select_segments">Seleccionar segmentos</string>
+    <string name="select_segments_description">%1$s contiene más de un segmento, necesitas seleccionar la parte necesaria para la navegación.</string>
+    <string name="segments_count">Segmento %1$d</string>
+    <string name="toast_select_edits_for_upload">Seleccionar ediciones a subir</string>
+    <string name="temporary_conditional_routing_descr">Utiliza las restricciones viales que están activas ahora en el mapa</string>
+    <string name="routing_attr_short_way_description">Ruta más corta optimizada (ahorro de energía)</string>
+    <string name="routing_attr_driving_style_description">Selecciona el propósito de conducción para obtener una ruta más corta, más rápida o más segura</string>
+    <string name="snap_to_road_descr">El icono de ubicación actual seguirá la ruta de navegación actual</string>
+    <string name="map_orientation_threshold_descr">No gira la vista del mapa si la velocidad es inferior a un umbral</string>
+    <string name="restart">Reiniciar</string>
+    <string name="shared_strings_all_regions">Todas las regiones</string>
+    <string name="delete_number_files_question">¿Borrar %1$d archivos\?</string>
+    <string name="track_recording_stop_without_saving">Parar sin guardar</string>
+    <string name="track_recording_save_and_stop">Guardar y detener la grabación</string>
+    <string name="track_recording_title">Grabación de traza detenida</string>
+    <string name="track_recording_description">¿Seguro que quieres dejar de grabar\?
+\nSe perderán todos los datos no guardados.</string>
+    <string name="on_pause">En pausa</string>
+    <string name="app_restart_required">Es necesario reiniciar la aplicación para aplicar algunos ajustes.</string>
+    <string name="routing_attr_height_obstacles_description">El enrutamiento podría evitar fuertes subidas.</string>
+    <string name="quick_action_coordinates_widget_descr">Un conmutador para mostrar u ocultar el control de coordenadas en el mapa.</string>
+    <string name="map_widget_distance_by_tap">Distancia por toque</string>
+    <string name="latest_openstreetmap_update">Última actualización de OpenStreetMap disponible:</string>
+    <string name="updated">Actualizado: %s</string>
+    <string name="last_time_checked">Última verificación: %s</string>
+    <string name="update_frequency">Frecuencia de actualización</string>
+    <string name="live_update_frequency_week_variant">Las actualizaciones de los mapas se revisarán cada semana. La próxima vez %1$s en %2$s.</string>
+    <string name="live_update_frequency_day_variant">Las actualizaciones del mapa se comprobarán cada día. La próxima vez %1$s en %2$s.</string>
+    <string name="live_update_frequency_hour_variant">Las actualizaciones del mapa se comprobarán cada hora. La próxima vez %1$s en %2$s.</string>
+    <string name="delete_updates">Borrar las actualizaciones</string>
+    <string name="live_update_delete_updates_msg">¿Seguro que deseas eliminar todas las %s actualizaciones en vivo\?</string>
+    <string name="purchases">Compras</string>
+    <string name="select_category_descr">Selecciona una categoría o añada una nueva</string>
+    <string name="track_recording_will_be_continued">La grabación continuará.</string>
+    <string name="copy_poi_name">Copiar nombre de PDI</string>
+    <string name="quick_action_show_hide_title">Mostrar/Ocultar</string>
+    <string name="shared_string_interval">Intervalo</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Ocultar los límites de las reservas naturales, las áreas protegidas y los parques nacionales</string>
+    <string name="track_has_no_altitude">La traza no contiene dato de altitud.</string>
+    <string name="track_has_no_speed">La traza no contiene datos de velocidad.</string>
+    <string name="select_another_colorization">Selecciona otro tipo de coloración.</string>
+    <string name="trip_recording_logging_interval_info">El intervalo de registro establece el periodo de tiempo en el que OsmAnd pedirá los datos de la posición actual.</string>
+    <string name="trip_recording_save_and_continue">Guardar y continuar</string>
+    <string name="lost_data_warning">Todos los datos no guardados se perderán.</string>
+    <string name="show_start_dialog">Mostrar cuadro de diálogo de inicio</string>
+    <string name="trip_recording_show_start_dialog_setting">Si se desactiva, la grabación se iniciará justo después de tocar el control o el elemento de menú, saltándose el diálogo de confirmación.</string>
+    <string name="customize_route_line">Personalizar la línea de ruta</string>
+    <string name="shared_string_route_line">Línea de ruta</string>
+    <string name="route_line_use_map_style_appearance">La línea de ruta usará el %1$s definido en el estilo de mapa elegido: %2$s.</string>
+    <string name="specify_color_for_map_mode">Especifica el color para el modo de mapa: %1$s.</string>
+    <string name="no_purchases">No tienes compras</string>
+    <string name="new_device_account">Nuevo dispositivo / nueva cuenta</string>
+    <string name="contact_support_description">Si tienes alguna duda, ponte en contacto con nosotros en %1$s.</string>
+    <string name="troubleshooting_description">Por favor, sigue este enlace si tiense algún problema con las compras.</string>
+    <string name="contact_support">Contacta con asistencia</string>
+    <string name="empty_purchases_description">Si tus compras no aparecen aquí, pulsa sobre \"%1$s\", o ponte en contacto con nuestro equipo de asistencia.</string>
+    <string name="troubleshooting">Solución de problemas</string>
+    <string name="osmand_live">OsmAnd En vivo</string>
+    <string name="annual_subscription">Suscripción anual</string>
+    <string name="monthly_subscription">Suscripción mensual</string>
+    <string name="three_months_subscription">Suscripción de tres meses</string>
+    <string name="next_billing_date">Próxima fecha de facturación: %1$s</string>
+    <string name="osmand_live_cancelled">Cancelado</string>
+    <string name="renew_subscription">Renovar la suscripción</string>
+    <string name="in_grace_period">En periodo de gracia</string>
+    <string name="on_hold">En espera</string>
+    <string name="expired">Expirado</string>
+    <string name="release_4_0_beta">- Las actualizaciones de OsmAnd Live se han movido a \"Descargas &gt; Actualizaciones\".
+\n
+\n - Los tracks ahora pueden ser coloreados por altitud, velocidad o pendiente.
+\n
+\n - Añadida la opción de cambiar la apariencia de la línea de la ruta de navegación
+\n
+\n - Actualizado el cuadro de diálogo \"Grabación del viaje\".
+\n
+\n</string>
+    <string name="update_all_maps_added">¿Actualizar todos los mapas añadidos a %1$s\?</string>
+    <string name="exit_number">Número de salida</string>
+    <string name="announce_when_exceeded">Anunciar cuando se excede</string>
+    <string name="user_points">Puntos de usuario</string>
+    <string name="output">Salida</string>
 </resources>

OsmAnd/res/values-et/phrases.xml

@@ -3895,4 +3895,33 @@
     <string name="poi_piste_name">Nõlva nimi</string>
     <string name="poi_piste_ski_jump">Suusahüpped</string>
     <string name="poi_camp_pitch">Telkimisplats</string>
+    <string name="poi_cliff_diving">vettehüpped kaljult</string>
+    <string name="poi_snooker">snuuker</string>
+    <string name="poi_speedway">speedway</string>
+    <string name="poi_ultimate">võistkondlik taldrikulennutamine</string>
+    <string name="poi_wakeboarding">veelauasõit</string>
+    <string name="poi_weightlifting">tõstesport</string>
+    <string name="poi_zurkhaneh_sport">zurkhaneh</string>
+    <string name="poi_water_polo">veepall</string>
+    <string name="poi_water_ski">veesuusatamine</string>
+    <string name="poi_biathlon">laskesuusatamine</string>
+    <string name="poi_bobsleigh">bobisõit</string>
+    <string name="poi_bullfighting">härjavõitlus</string>
+    <string name="poi_cockfighting">kukevõitlus</string>
+    <string name="poi_crossfit">crossfit</string>
+    <string name="poi_curling">jääkeegel</string>
+    <string name="poi_cycle_polo">jalgrattapolo</string>
+    <string name="poi_horseshoes">hobuseraua heitmine</string>
+    <string name="poi_kickboxing">kikkpoks</string>
+    <string name="poi_fencing">vehklemine</string>
+    <string name="poi_aikido">aikido</string>
+    <string name="poi_wrestling">maadlus</string>
+    <string name="poi_taekwondo">taekwondo</string>
+    <string name="poi_table_soccer">lauajalgpall</string>
+    <string name="poi_sumo">sumo</string>
+    <string name="poi_shot_put">kuulitõuge</string>
+    <string name="poi_pilates">pilates</string>
+    <string name="poi_jiu_jitsu">džudžitsu</string>
+    <string name="poi_karate">Karate</string>
+    <string name="poi_hoops">Korvpallirõngad</string>
 </resources>

OsmAnd/res/values-fa/phrases.xml

@@ -1452,4 +1452,13 @@
     <string name="poi_substation_type">نوع</string>
     <string name="poi_mini_roundabout">فلکهٔ کوچک</string>
     <string name="poi_square">میدان</string>
+    <string name="poi_second_hand_no">کالای دست دو: خیر</string>
+    <string name="poi_second_hand_only">فقط کالای دست دو</string>
+    <string name="poi_second_hand_yes">کالای دست دو</string>
+    <string name="poi_provided_for_woman_no">برای بانوان: خیر</string>
+    <string name="poi_provided_for_woman_yes">برای بانوان: بله</string>
+    <string name="poi_shoes_women">بانوان</string>
+    <string name="poi_clothes_women">بانوان</string>
+    <string name="poi_clothes_workwear">لباس کار</string>
+    <string name="poi_greenhouse_horticulture">باغداری گلخانه‌ای</string>
 </resources>

OsmAnd/res/values-fa/strings.xml

@@ -4094,7 +4094,7 @@
     <string name="empty_purchases_description">اگر خریدهای شما اینجا نمایش داده نمی‌شود، روی «%1$s» بزنید یا با تیم پشتیبانی ما تماس بگیرید.</string>
     <string name="contact_support">تماس با پشتیبانی</string>
     <string name="troubleshooting">عیب‌یابی</string>
-    <string name="troubleshooting_description">اگر با مسئله‌ای در خرید مواجه شدید این پیوند را دنبال کنید.</string>
+    <string name="troubleshooting_description">اگر در خرید با مسئله‌ای مواجه هستید این پیوند را دنبال کنید.</string>
     <string name="osmand_live">OsmAnd Live</string>
     <string name="annual_subscription">اشتراک سالانه</string>
     <string name="monthly_subscription">اشتراک ماهانه</string>
@@ -4105,4 +4105,6 @@
     <string name="in_grace_period">در مهلت اضافه</string>
     <string name="expired">منقضی شده</string>
     <string name="update_all_maps_added">همهٔ نقشه‌های اضافه‌شده به %1$s روزآمد شود؟</string>
+    <string name="exit_number">شمارهٔ خروج</string>
+    <string name="output">خروجی</string>
 </resources>

OsmAnd/res/values-fr/phrases.xml

@@ -3892,4 +3892,40 @@
     <string name="poi_patrolled_yes">Surveillé : oui</string>
     <string name="poi_local_ref">Référence locale</string>
     <string name="poi_geodesist">Géodésien</string>
+    <string name="poi_bobsleigh">Bobsleigh</string>
+    <string name="poi_water_polo">Water polo</string>
+    <string name="poi_ultimate">Ultimate</string>
+    <string name="poi_taekwondo">Taekwondo</string>
+    <string name="poi_kickboxing">Kick-boxing</string>
+    <string name="poi_fencing">Escrime</string>
+    <string name="poi_curling">Curling</string>
+    <string name="poi_crossfit">Crossfit</string>
+    <string name="poi_cockfighting">Combats de coqs</string>
+    <string name="poi_bullfighting">Corrida</string>
+    <string name="poi_biathlon">Biathlon</string>
+    <string name="poi_aikido">Aïkido</string>
+    <string name="poi_water_ski">Ski nautique</string>
+    <string name="poi_wrestling">Lutte</string>
+    <string name="poi_weightlifting">Haltérophilie</string>
+    <string name="poi_wakeboarding">Wakeboard</string>
+    <string name="poi_table_soccer">Babyfoot</string>
+    <string name="poi_sumo">Sumo</string>
+    <string name="poi_snooker">Billard</string>
+    <string name="poi_shot_put">Lancer de poids</string>
+    <string name="poi_pilates">Pilates</string>
+    <string name="poi_jiu_jitsu">Ju-jitsu</string>
+    <string name="poi_karate">Karaté</string>
+    <string name="poi_zurkhaneh_sport">Gymnase Zurkhaneh</string>
+    <string name="poi_cliff_diving">Plongeon du haut d\'une falaise</string>
+    <string name="poi_hoops">Anneaux</string>
+    <string name="poi_club_social">Club social</string>
+    <string name="poi_plateau">Plateau</string>
+    <string name="poi_speedway">Voie express</string>
+    <string name="poi_gladed_yes">Satisfait : oui</string>
+    <string name="poi_camp_pitch">Emplacement de camping</string>
+    <string name="poi_mobile_library">Arrêt pour la bibliothèque mobile</string>
+    <string name="poi_office_diplomatic">Bureau diplomatique</string>
+    <string name="poi_horseshoes">Fers à cheval</string>
+    <string name="poi_cycle_polo">Polo-vélo</string>
+    <string name="poi_bay_filter">Type de baie</string>
 </resources>

OsmAnd/res/values-fr/strings.xml

@@ -301,8 +301,8 @@
     <string name="error_reading_gpx">Impossible de lire les données GPX.</string>
     <string name="vector_data">Cartes vectorielles OSM</string>
     <string name="transport_context_menu">Recherche de transport pour cet arrêt</string>
-    <string name="poi_context_menu_modify">Modifier point d\'intérêt</string>
-    <string name="poi_context_menu_delete">Supprimer point d\'intérêt</string>
+    <string name="poi_context_menu_modify">Modifier le point d\'intérêt</string>
+    <string name="poi_context_menu_delete">Supprimer le point d\'intérêt</string>
     <string name="rotate_map_compass_opt">D\'après la boussole</string>
     <string name="rotate_map_bearing_opt">Dans la direction du déplacement</string>
     <string name="rotate_map_none_opt">Aucune rotation (nord toujours en haut)</string>
@@ -951,7 +951,7 @@
     <string name="osmand_plus_play_title_30_chars">Cartes et navigation OsmAnd+</string>
     <string name="street_name">Nom de la rue</string>
     <string name="hno">Numéro de bâtiment</string>
-    <string name="monitoring_settings">Enregistrement de traces</string>
+    <string name="monitoring_settings">Enregistrer le parcours</string>
     <string name="monitoring_settings_descr">Configurez comment enregistrer vos itinéraires.</string>
     <string name="choose_osmand_theme_descr">Personnalisez l\'apparence de l\'application.</string>
     <string name="choose_osmand_theme">Thème de l\'application</string>
@@ -1388,7 +1388,7 @@
     <string name="speak_pedestrian">Passages piétons</string>
     <string name="avoid_roads_msg">Générez un itinéraire alternatif en sélectionnant les routes à éviter</string>
     <string name="navigation_over_track">Démarrer la navigation en suivant cette trace ?</string>
-    <string name="save_track_to_gpx_globally_headline">Enregistrement de traces à la demande</string>
+    <string name="save_track_to_gpx_globally_headline">Enregistrement de parcours à la demande</string>
     <string name="proxy_pref_title">Proxy</string>
     <string name="enable_proxy_descr">Configurer le mandataire HTTP (Proxy) pour toutes les requêtes réseau</string>
     <string name="proxy_host_title">Serveur mandataire (Proxy)</string>
@@ -3275,7 +3275,7 @@
     <string name="add_new_profile_q">Ajouter le profil \'%1$s\' \?</string>
     <string name="save_heading">Inclure la direction</string>
     <string name="save_heading_descr">Inclure la direction de chaque point lors de l\'enregistrement d\'une trace.</string>
-    <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Afficher le réseau de nœuds de pistes cyclables</string>
+    <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Afficher les itinéraires cyclables du réseau de nœuds</string>
     <string name="rendering_value_walkingRoutesOSMCNodes_name">Nœuds de transport</string>
     <string name="personal_category_name">Personnel</string>
     <string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
@@ -3696,7 +3696,7 @@
     <string name="track_show_start_finish_icons">Afficher les icônes de départ et d\'arrivée</string>
     <string name="select_track_width">Sélectionner la largeur</string>
     <string name="gpx_direction_arrows">Flèches de direction</string>
-    <string name="plan_route_last_edited">Dernière modification</string>
+    <string name="plan_route_last_edited">Dernières modifications</string>
     <string name="plan_route_import_track">Importer une trace</string>
     <string name="plan_route_open_existing_track">Ouvrir une trace existante</string>
     <string name="plan_route_create_new_route">Créer un nouvel itinéraire</string>
@@ -3715,7 +3715,7 @@
     <string name="threshold_distance">Seuil de distance</string>
     <string name="navigation_profile">Profil de navigation</string>
     <string name="street_level_imagery">Photos des rues</string>
-    <string name="plan_route_exit_dialog_descr">Souhaitez-vous vraiment ignorer toutes les modifications apportées à l\'itinéraire planifié \?</string>
+    <string name="plan_route_exit_dialog_descr">Souhaitez-vous vraiment ignorer toutes les modifications apportées à cet itinéraire \?</string>
     <string name="in_case_of_reverse_direction">Si inversion du sens</string>
     <string name="pass_whole_track_descr">Point de la trace vers lequel naviguer</string>
     <string name="shared_string_gpx_route">Enregistrer le parcours</string>
@@ -3733,7 +3733,7 @@
     <string name="show_gpx">Traces</string>
     <string name="monitoring_control_start">ENR</string>
     <string name="save_track_to_gpx_globally">Enregistrer le parcours dans un fichier GPX</string>
-    <string name="map_widget_monitoring">Enregistrement du parcours</string>
+    <string name="map_widget_monitoring">Enregistrer le parcours</string>
     <string name="marker_save_as_track">Enregistrer comme fichier de trace</string>
     <string name="follow_track">Suivre la trace</string>
     <string name="follow_track_descr">Sélectionner un fichier de trace à suivre</string>
@@ -3782,7 +3782,7 @@
     <string name="plan_route_change_route_type_after">Modifier le type d’itinéraire après</string>
     <string name="simplified_track_description">Seule la ligne d\'itinéraire sera enregistrée, les points de passage seront supprimés.</string>
     <string name="shared_string_redo">Rétablir</string>
-    <string name="sort_last_modified">Dernière modification</string>
+    <string name="sort_last_modified">Dernières modifications</string>
     <string name="sort_name_descending">Nom : Z – A</string>
     <string name="sort_name_ascending">Nom : A – Z</string>
     <string name="start_finish_icons">Icônes de départ et d\'arrivée</string>
@@ -3833,7 +3833,7 @@
     <string name="subscription_paused_title">L\'abonnement OsmAnd Live a été suspendu</string>
     <string name="login_open_street_map">Se connecter à OpenStreetMap</string>
     <string name="login_open_street_map_org">Se connecter à OpenStreetMap.org</string>
-    <string name="user_login">Identifiant</string>
+    <string name="user_login">Se connecter</string>
     <string name="use_login_password">Utiliser un identifiant et un mot de passe</string>
     <string name="login_account">Compte</string>
     <string name="manage_subscription">Gérer l\'abonnement</string>
@@ -3893,7 +3893,7 @@
     <string name="plan_route_split_before">Couper avant</string>
     <string name="plan_route_split_after">Couper après</string>
     <string name="plan_route_add_new_segment">Ajouter un nouveau segment</string>
-    <string name="gpx_upload_identifiable_visibility_descr">« Identifiable » siginifie que la trace sera affichée publiquement dans « Mes traces GPS » ainsi que dans les listes de traces GPS publiques. Ainsi les autres utilisateurs peuvent télécharger la trace brute et l\'associer avec votre nom d\'utilisateur. Les données de points de passage horodatés fournis par l\'API GPS publique feront référence à la page d\'origine de votre trace.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">« Identifiable » signifie que la trace sera affichée publiquement dans « Mes traces GPS » ainsi que dans les listes de traces GPS publiques. Ainsi les autres utilisateurs pourront télécharger la trace brute et l\'associer avec votre nom d\'utilisateur. Les données de points de passage horodatés fournis par l\'API GPS publique feront référence à la page d\'origine de votre trace.</string>
     <string name="gpx_upload_public_visibility_descr">« Public » signifie que la trace est affichée publiquement dans vos traces GPS et dans les listes de traces GPS publiques. Les données diffusées via l\'API ne font pas référence à votre page de traces. Les horodatages des points de trace ne sont pas disponibles via l\'API GPS publique et les points de trace ne sont pas classés par ordre chronologique.</string>
     <string name="profile_type_osmand_string">Profil OsmAnd</string>
     <string name="profile_type_user_string">Profil utilisateur</string>
@@ -4015,9 +4015,9 @@
     <string name="track_recording_title">Enregistrement de la trace arrêté</string>
     <string name="select_segments">Sélectionnez les segments</string>
     <string name="update_frequency">Fréquence de mise à jour</string>
-    <string name="live_update_frequency_week_variant">Les cartes seront vérifiées chaque semaine. La prochaine vérification de mise à jour s\'effectuera à %1$s dans %2$s.</string>
-    <string name="live_update_frequency_day_variant">Les cartes seront vérifiées tous les jours. La prochaine vérification de mise à jour s\'effectuera à %1$s dans %2$s.</string>
-    <string name="live_update_frequency_hour_variant">Les cartes seront vérifiées toutes les heures. La prochaine vérification de mise à jour s\'effectuera à %1$s dans %2$s.</string>
+    <string name="live_update_frequency_week_variant">Les cartes seront vérifiées chaque semaine. La prochaine vérification de mise à jour s\'effectuera le %1$s dans %2$s.</string>
+    <string name="live_update_frequency_day_variant">Les cartes seront vérifiées tous les jours. La prochaine vérification de mise à jour s\'effectuera le %1$s dans %2$s.</string>
+    <string name="live_update_frequency_hour_variant">Les cartes seront vérifiées toutes les heures. La prochaine vérification de mise à jour s\'effectuera le %1$s dans %2$s.</string>
     <string name="delete_updates">Supprimer les mises à jour</string>
     <string name="purchases">Achats</string>
     <string name="select_category_descr">Sélectionnez la catégorie ou ajoutez-en une nouvelle</string>
@@ -4040,9 +4040,13 @@
     <string name="lost_data_warning">Toutes les données non enregistrées seront perdues.</string>
     <string name="show_start_dialog">Afficher la boîte de dialogue de démarrage</string>
     <string name="trip_recording_show_start_dialog_setting">Si désactivé, l\'enregistrement débutera dès appui sur le gadget ou dans le menu (sans demande de confirmation).</string>
-    <string name="release_4_0_beta">- Les mises à jour d\'OsmAnd Live ont été déplacées vers \"Téléchargements &gt; Mises à jour\"
+    <string name="release_4_0_beta">- Ajout d\'une option pour télécharger les Courbes de niveau en pieds
 \n
-\n - Les traces peuvent maintenant être colorées par altitude, vitesse ou pente.
+\n- Planification d\'itinéraires en paysage : ajout d’onglets pour basculer entre Points et Graphs 
+\n
+\n- Les mises à jour d\'OsmAnd Live ont été déplacées vers \"Téléchargements &gt; Mises à jour\"
+\n
+\n - Les traces peuvent maintenant être colorées par altitude, vitesse ou pente
 \n
 \n - Ajout d\'une option pour modifier l\'apparence de la ligne d\'itinéraire en navigation
 \n
@@ -4071,4 +4075,12 @@
     <string name="renew_subscription">Renouveler l’abonnement</string>
     <string name="on_hold">En attente</string>
     <string name="expired">Expiré</string>
+    <string name="user_points">Points utilisateur</string>
+    <string name="exit_number">Numéro de sortie</string>
+    <string name="announce_when_exceeded">Annoncer en cas de dépassement</string>
+    <string name="output">Sortie</string>
+    <string name="srtm_download_list_help_message">OsmAnd fournit des données sur les courbes de niveau en mètres et en pieds. Vous devrez à nouveau télécharger le fichier pour modifier le format.</string>
+    <string name="srtm_download_single_help_message">Veuillez sélectionner le format souhaité. Vous devrez à nouveau télécharger le fichier pour modifier le format.</string>
+    <string name="srtm_unit_format">Format d\'unité pour les courbes de niveau</string>
+    <string name="shared_string_feet">pieds</string>
 </resources>

OsmAnd/res/values-hu/phrases.xml

@@ -3893,4 +3893,36 @@
     <string name="poi_geodesist">Földmérő</string>
     <string name="poi_conference_centre">Konferencia-központ</string>
     <string name="poi_camp_pitch">Sátorhely</string>
+    <string name="poi_kickboxing">Kick-box</string>
+    <string name="poi_horseshoes">Patkóhajítás</string>
+    <string name="poi_fencing">Vívás</string>
+    <string name="poi_cycle_polo">Kerékpárospóló</string>
+    <string name="poi_curling">Curling</string>
+    <string name="poi_crossfit">Crossfit</string>
+    <string name="poi_cockfighting">Kakasviadal</string>
+    <string name="poi_cliff_diving">Sziklaugrás</string>
+    <string name="poi_bullfighting">Bikaviadal</string>
+    <string name="poi_bobsleigh">Bob</string>
+    <string name="poi_biathlon">Biatlon (sílövészet)</string>
+    <string name="poi_aikido">Aikidó</string>
+    <string name="poi_water_ski">Vízisí</string>
+    <string name="poi_water_polo">Vízilabda</string>
+    <string name="poi_zurkhaneh_sport">Zurkhaneh</string>
+    <string name="poi_wrestling">Birkózás</string>
+    <string name="poi_weightlifting">Súlyemelés</string>
+    <string name="poi_wakeboarding">Wakeboard</string>
+    <string name="poi_ultimate">Ultimate frizbi</string>
+    <string name="poi_taekwondo">Taekwondo</string>
+    <string name="poi_table_soccer">Csocsó</string>
+    <string name="poi_sumo">Szumó</string>
+    <string name="poi_speedway">Salakmotorozás</string>
+    <string name="poi_snooker">Snooker</string>
+    <string name="poi_shot_put">Súlylökés</string>
+    <string name="poi_pilates">Pilates</string>
+    <string name="poi_jiu_jitsu">Dzsúdzsucu</string>
+    <string name="poi_karate">Karate</string>
+    <string name="poi_hoops">Kosárlabdapalánkok</string>
+    <string name="poi_office_diplomatic">Diplomáciai iroda</string>
+    <string name="poi_bay_filter">Öböl típusa</string>
+    <string name="poi_plateau">Fennsík</string>
 </resources>

OsmAnd/res/values-hu/strings.xml

@@ -13,8 +13,8 @@
     <string name="shared_string_help">Súgó</string>
     <string name="accessibility_mode">Akadálymentes mód</string>
     <string name="accessibility_mode_descr">Bekapcsolja a fogyatékkal élőknek szóló funkciókat.</string>
-    <string name="shared_string_on">Be</string>
-    <string name="shared_string_off">Kikapcsolás</string>
+    <string name="shared_string_on">Bekapcsolva</string>
+    <string name="shared_string_off">Kikapcsolva</string>
     <string name="accessibility_default">Android rendszerbeállítások szerint</string>
     <string name="backToMenu">Vissza a menübe</string>
     <string name="zoomOut">Kicsinyít</string>
@@ -321,7 +321,7 @@
     <string name="select_build_to_install">A telepítendő OsmAnd build kijelölése</string>
     <string name="contribution_activity">Verzió telepítése</string>
     <string name="gps_status_app_not_found">A GPS státusz alkalmazás nincs telepítve. Megkeresi a piactéren?</string>
-    <string name="voice_is_not_available_msg">A hangalapú navigáció nem érhető el. A „Beállítások” → „Navigációs beállítások”, profil kijelölése → „Hangutasítás” menüben választhatsz ki vagy tölthetsz le hangutasítás-csomagokat.</string>
+    <string name="voice_is_not_available_msg">A hangalapú navigáció nem érhető el. A „Beállítások” → „Navigációs beállítások”, profil kijelölése → „Hangutasítás” menüben választhat ki vagy tölthet le hangutasítás-csomagokat.</string>
     <string name="voice_is_not_available_title">Hangutasítás-csomag kijelölése</string>
     <string name="daynight_mode_day">Nappal</string>
     <string name="daynight_mode_night">Éjjel</string>
@@ -530,7 +530,7 @@
     <string name="shared_string_close">Bezárás</string>
     <string name="loading_data">Adatok betöltése…</string>
     <string name="reading_indexes">Helyi adatok olvasása…</string>
-    <string name="previous_run_crashed">Az OsmAnd legutóbb összeomlott. Naplófájl: {0}. Kérlek jelentsd a hibát és csatold hozzá a naplófájlt.</string>
+    <string name="previous_run_crashed">Az OsmAnd legutóbb összeomlott. Naplófájl: {0}. Kérjük jelentse be a hibát, és csatolja hozzá a naplófájlt.</string>
     <string name="saving_gpx_tracks">GPX fájl mentése…</string>
     <string name="finished_task">Befejezve</string>
     <string name="use_online_routing_descr">Internet használata útvonaltervezéshez.</string>
@@ -849,7 +849,7 @@
     <string name="no_route">Nincs út</string>
     <string name="delete_target_point">Célpont törlése</string>
     <string name="intermediate_point">%1$s köztes célpont</string>
-    <string name="gps_not_available">Kérlek engedélyezd a GPS-t a beállításokban</string>
+    <string name="gps_not_available">Kérjük, engedélyezze a GPS-t a beállításokban</string>
     <string name="map_widget_show_destination_arrow">Célpont irányának megjelenítése</string>
     <string name="enable_plugin_monitoring_services">A pozíciónaplózási szolgáltatások (GPX naplózás, online útvonalrögzítés) használatához engedélyed az „Utazás felvétele” bővítményt</string>
     <string name="non_optimal_route_calculation">Esetleg nem optimális útvonal kiszámítása nagyobb távolságokra</string>
@@ -919,7 +919,7 @@
     <string name="av_widget_action_descr">Alapértelmezett widgetművelet:</string>
     <string name="av_widget_action">Alapértelmezett widgetmód</string>
     <string name="recording_description">Felvétel %1$s %3$s %2$s</string>
-    <string name="srtm_paid_version_msg">Kérem, fontolja meg a „Szintvonalak” bővítmény megvásárlását, ezzel is támogatva a további fejlesztéseket.</string>
+    <string name="srtm_paid_version_msg">Kérjük, fontolja meg a „Szintvonalak” bővítmény megvásárlását, ezzel is támogatva a további fejlesztéseket.</string>
     <string name="srtm_paid_version_title">Szintvonal bővítmény</string>
     <string name="intermediate_points_change_order">Más sorrend</string>
     <string name="dropbox_plugin_description">Szinkronizálja a hang/videó jegyzeteket a Dropbox fiókjával.</string>
@@ -975,7 +975,7 @@
     <string name="use_kalman_filter_compass_descr">Csökkenti a zajt az iránytű olvasásakor, de hozzáadja a tehetetlenséget.</string>
     <string name="use_kalman_filter_compass">Kálmán-szűrő használata</string>
     <string name="local_indexes_cat_srtm">Szintvonalak</string>
-    <string name="wait_current_task_finished">Kérlek várd meg, amíg a jelenlegi feladat befejeződik</string>
+    <string name="wait_current_task_finished">Kérjük, várja meg, amíg a jelenlegi feladat befejeződik</string>
     <string name="shared_string_downloading">Letöltés…</string>
     <string name="plugin_distance_point_time">idő</string>
     <string name="plugin_distance_point_hdop">pontosság</string>
@@ -1060,7 +1060,7 @@
     <string name="maps_define_edit">Megad/Szerkeszt…</string>
     <string name="base_world_map">Föld alaptérkép</string>
     <string name="map_magnifier">Térképnagyító</string>
-    <string name="animate_routing_route_not_calculated">Előbb tervezz útvonalat</string>
+    <string name="animate_routing_route_not_calculated">Kérjük, először számolja ki az útvonalat</string>
     <string name="animate_routing_route">Szimuláció a tervezett útvonalon </string>
     <string name="animate_routing_gpx">Szimuláció GPX nyomvonalon</string>
     <string name="shared_string_remember_my_choice">Emlékezzen a választásra</string>
@@ -1285,7 +1285,7 @@
     <string name="shared_string_all">Minden</string>
     <string name="shared_string_waypoints">Útpontok</string>
     <string name="way_alarms">Forgalmi figyelmeztetések</string>
-    <string name="speak_favorites">Kedvencek a közelben</string>
+    <string name="speak_favorites">Közeli kedvencek</string>
     <string name="speak_poi">Közeli érdekes helyek (POI)</string>
     <string name="download_additional_maps">Letöltöd a hiányzó térképeket %1$s (%2$d MB)?</string>
     <string name="rendering_value_browse_map_name">Térképböngészés</string>
@@ -1318,7 +1318,7 @@
     <string name="shared_string_more">Bővebben…</string>
     <string name="route_descr_destination">Célpont</string>
     <string name="local_index_description">Egy meglévő elem adatainak megtekintéséhez koppintson rá, inaktiváláshoz vagy törléshez nyomja meg hosszan. Jelenlegi adatok az eszközön (%1$s szabad):</string>
-    <string name="speed_limit_exceed">Sebességkorlátozás-tolerancia</string>
+    <string name="speed_limit_exceed">Sebességkorlátozás túllépésének tűréshatára</string>
     <string name="speed_limit_exceed_message">Válassza ki a sebességkorlátozás tűréshatárát, amely fölött hangos figyelmeztetést fog kapni.</string>
     <string name="fav_point_emoticons_message">A Kedvenc hely át lett nevezve erre: %1$s, hogy a hangulatjeleket tartalmazó szöveget fájlba lehessen menteni.</string>
     <string name="print_route">Útvonal nyomtatása</string>
@@ -1470,7 +1470,7 @@
     <string name="shared_string_release">Megjelent</string>
     <string name="days_behind">napos</string>
     <string name="welmode_download_maps">Térképek letöltése</string>
-    <string name="confirm_usage_speed_cameras">Néhány országban (Németország, Franciaország, Olaszország és még néhány) tilos a traffipax figyelmeztetés használata! Az OsmAnd nem vállal felelősséget a szabályok megsértéséért. Koppints az Igen gombra, ha jogosult vagy a funkció használatára.</string>
+    <string name="confirm_usage_speed_cameras">Néhány országban (Németország, Franciaország, Olaszország stb.) tilos traffipax-riasztást használni! Az OsmAnd nem vállal felelősséget a szabályok megsértéséért. Koppintson az Igen gombra, ha jogosult a funkció használatára.</string>
     <string name="welcome_select_region">A jelzőtáblák és szabályok helyes értelmezéséhez jelölje ki a vezetési régiót:</string>
     <string name="welcome_text">Az OsmAnd lehetővé teszi a térképek és a navigáció offline használatát az egész világon.</string>
     <string name="current_route">Jelenlegi útvonal</string>
@@ -1604,7 +1604,7 @@
     <string name="rate_this_app">Értékeld az alkalmazást</string>
     <string name="user_hates_app_get_feedback">Mondd el, hogy miért.</string>
     <string name="user_hates_app_get_feedback_long">Mondja el javaslatait.</string>
-    <string name="rate_this_app_long">Pontozd az OsmAndot a Google Play áruházban</string>
+    <string name="rate_this_app_long">Kérjük, adjon pontszámot az OsmAndnak a Google Playen</string>
     <string name="download_live_updates">Élő frissítések</string>
     <string name="no_updates_available">Nem érhetők el frissítések</string>
     <string name="we_really_care_about_your_opinion">Véleménye és visszajelzése fontos számunkra.</string>
@@ -1685,7 +1685,7 @@
     <string name="get_full_version">Teljes verzió</string>
     <string name="downloads">Letöltések</string>
     <string name="downloading_number_of_files">Letöltés - %1$d fájl</string>
-    <string name="favorite_category_dublicate_message">Válassz olyan kategória nevet, ami még nem létezik.</string>
+    <string name="favorite_category_dublicate_message">Kérjük, olyan kategórianevet válasszon, amely még nem létezik.</string>
     <string name="favorite_category_name">Kategórianév</string>
     <string name="favorite_category_add_new_title">Új kategória hozzáadása</string>
     <string name="confirm_download_roadmaps">A csak utakat tartalmazó térkép nem szükséges, mert le van töltve a teljes térkép. Letöltöd ennek ellenére?</string>
@@ -2886,7 +2886,7 @@
     <string name="searching_gps">Műholdak keresése</string>
     <string name="coordinates_widget">Koordináta-widget</string>
     <string name="keep_passed_markers_descr">Az Kedvencek vagy GPX-útpontok csoportjaként hozzáadott és elhagyottként megjelölt jelölők a térképen maradnak. A jelölők akkor tűnnek el a térképről, ha a csoport nem aktív (ki van kapcsolva).</string>
-    <string name="rate_dialog_descr">Kérlek, adj visszajelzést vagy értékelést a Google Play-en.</string>
+    <string name="rate_dialog_descr">Kérjük, ossza meg visszajelzését, és értékelje munkánkat a Google Playen.</string>
     <string name="shared_string_privacy_policy">Adatvédelmi irányelvek</string>
     <string name="help_us_make_osmand_better">Segítsen, hogy jobbá tehessük az OsmAndot</string>
     <string name="make_osmand_better_descr">Engedélyezze, hogy az OsmAnd névtelen alkalmazáshasználati adatokat gyűjtsön és dolgozzon fel. Nem gyűjtünk vagy tárolunk adatokat a helyzetéről vagy az Ön által a térképen megtekintett helyekről. 
@@ -3304,7 +3304,7 @@
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
     <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
     <string name="button_rate">Értékelés</string>
-    <string name="file_does_not_contain_routing_rules">\'%1$s\': ez a fájl nem tartalmaz úttervezési szabályokat. Kérem, válasszon másik fájlt.</string>
+    <string name="file_does_not_contain_routing_rules">\'%1$s\': ez a fájl nem tartalmaz úttervezési szabályokat. Kérjük, válasszon másik fájlt.</string>
     <string name="not_support_file_type_with_ext">Válasszon egy támogatott, %1$s kiterjesztésű fájlt.</string>
     <string name="import_from_file">Importálás fájlból</string>
     <string name="import_routing_file">Úttervezési fájl importálása</string>
@@ -3376,7 +3376,7 @@
     <string name="plugin_disabled">Bővítmény kikapcsolva</string>
     <string name="open_settings">Beállítások megnyitása</string>
     <string name="no_recalculation_setting">Nincs újraszámítás</string>
-    <string name="please_provide_profile_name_message">Kérem, adjon nevet a profilnak</string>
+    <string name="please_provide_profile_name_message">Kérjük, adjon nevet a profilnak</string>
     <string name="select_data_to_import">Válassza ki az importálandó adatot.</string>
     <string name="keep_both">Mindkettő megtartása</string>
     <string name="replace_all">Az összes cseréje</string>
@@ -3559,7 +3559,7 @@
     <string name="width_limit_description">Adja meg a járműve szélességét (a széles járművekre útvonalkorlátozások vonatkozhatnak).</string>
     <string name="height_limit_description">Adja meg a járműve magasságát (a magas járművekre útvonalkorlátozások vonatkozhatnak).</string>
     <string name="weight_limit_description">Adja meg a járműve tömegét (a nehéz járművekre útvonalkorlátozások vonatkozhatnak).</string>
-    <string name="gpx_parse_error">Az OsmAnd GPX formázása helytelen, további vizsgálatért kérem, lépjen kapcsolatba a támogató csapattal.</string>
+    <string name="gpx_parse_error">Az OsmAnd GPX formázása helytelen. További vizsgálatért kérjük, lépjen kapcsolatba a támogató csapattal.</string>
     <string name="export_import_quick_actions_with_profiles_promo">Az alkalmazásprofilokkal exportálhat és importálhat gyorsműveleteket.</string>
     <string name="shared_string_delete_all_q">Összes törlése\?</string>
     <string name="delete_all_actions_message_q">Biztosan véglegesen törölni szeretne %d gyorsműveletet\?</string>
@@ -3583,7 +3583,7 @@
     <string name="uninstall_speed_cameras">Traffipaxok eltávolítása</string>
     <string name="shared_string_legal">Jogi</string>
     <string name="speed_camera_pois">Traffipax POI-k</string>
-    <string name="speed_cameras_legal_descr">Bizonyos országokban és régiókban a traffipaxra figyelmeztető alkalmazások törvényileg tiltottak.
+    <string name="speed_cameras_legal_descr">Bizonyos országokban és régiókban jogszabály tiltja a traffipaxra figyelmeztető alkalmazások használatát.
 \n
 \nDöntsön az ön országának törvényei alapján.
 \n
@@ -3592,14 +3592,14 @@
 \nVálassza az %2$s lehetőséget, hogy az összes traffipax-szal kapcsolatos adat: riasztások, értesítések, POI-k törlésre kerüljenek az OsmAnd teljes újratelepítéséig.</string>
     <string name="keep_active">Maradjanak</string>
     <string name="shared_string_uninstall">Eltávolít</string>
-    <string name="speed_cameras_alert">Bizonyos országokban a traffipax riasztások törvényileg tiltottak.</string>
+    <string name="speed_cameras_alert">Bizonyos országokban a törvény tiltja a traffipaxriasztást.</string>
     <string name="shared_string_bearing">Tájolás</string>
     <string name="item_deleted">%1$s törölve</string>
     <string name="speed_cameras_restart_descr">A traffipaxadatok végleges törléséhez indítsa újra az alkalmazást.</string>
     <string name="shared_string_uninstall_and_restart">Eltávolítás és Újraindítás</string>
     <string name="routing_attr_length_description">Adja meg az útvonalakon a járművekre vonatkozó hosszkorlátozást.</string>
     <string name="routing_attr_length_name">Hosszkorlátozás</string>
-    <string name="speed_cameras_removed_descr">Az eszköz nem tartalmaz traffipax adatokat.</string>
+    <string name="speed_cameras_removed_descr">Az eszköz nem tartalmaz traffipaxadatokat.</string>
     <string name="replace_all_desc">Az jelenlegi elemek lecserélésre kerülnek a fájlban lévőkre</string>
     <string name="keep_both_desc">Az importált elemek előtaggal lesznek hozzáadva</string>
     <string name="import_duplicates_description">Az OsmAnd már tartalmaz az importálttal megegyező nevű elemeket.
@@ -3624,7 +3624,7 @@
     <string name="use_volume_buttons_as_zoom_descr">A térképnagyítás szintjének vezérlése a készülék hangerőgombjaival.</string>
     <string name="use_volume_buttons_as_zoom">Hangerőgombok használata nagyításhoz</string>
     <string name="app_mode_inline_skates">Görkorcsolya</string>
-    <string name="please_provide_point_name_error">Kérem, adjon nevet a pontnak</string>
+    <string name="please_provide_point_name_error">Kérjük, adjon nevet a pontnak</string>
     <string name="lenght_limit_description">Adja meg a járműve hosszát (a hosszú járművekre útvonalkorlátozások vonatkozhatnak).</string>
     <string name="quick_action_remove_next_destination">Legközelebbi célpont törlése</string>
     <string name="search_download_wikipedia_maps">Wikipédia-térképek letöltése</string>
@@ -4044,7 +4044,11 @@
     <string name="lost_data_warning">Minden nem mentett adat törlődni fog.</string>
     <string name="show_start_dialog">Kezdő párbeszéd megjelenítése</string>
     <string name="trip_recording_show_start_dialog_setting">Ha le van tiltva, akkor a felvétel közvetlenül a widget vagy a menüelem megérintése után elindul, kihagyva a megerősítő párbeszédpanelt.</string>
-    <string name="release_4_0_beta">• Az OsmAnd Live frissítések átköltöztek a „Letöltések&gt; Frissítések” helyre
+    <string name="release_4_0_beta">• Új lehetőség: szinvonalak letöltése (méter mellett) lábban
+\n
+\n• Útvonaltervezési környezet: hozzáadott fülek a pontok és grafikonok közötti váltáshoz
+\n
+\n• Az OsmAnd Live frissítések átköltöztek a „Letöltések&gt; Frissítések” helyre
 \n
 \n• A nyomvonalak színezhetők magasság, sebesség vagy lejtés szerint.
 \n
@@ -4062,7 +4066,7 @@
     <string name="empty_purchases_description">Ha a vásárlásai nem jelennek meg itt, lépjen kapcsolatba az ügyfélszolgálatunkkal, vagy koppintson ide: „%1$s”.</string>
     <string name="contact_support">Kapcsolatfelvétel az ügyfélszolgálattal</string>
     <string name="troubleshooting">Hibaelhárítás</string>
-    <string name="troubleshooting_description">Ha problémája akadt a vásrlással, kattintson erre a linkre.</string>
+    <string name="troubleshooting_description">Ha problémája akad a vásrlással, kattintson erre a linkre.</string>
     <string name="osmand_live">OsmAnd Live</string>
     <string name="annual_subscription">Éves előfizetés</string>
     <string name="monthly_subscription">Havi előfizetés</string>
@@ -4074,4 +4078,12 @@
     <string name="on_hold">Várakoztatva</string>
     <string name="expired">Lejárt</string>
     <string name="update_all_maps_added">Frissüljön minden térkép, amely hozzá lett adva ehhez: %1$s\?</string>
+    <string name="exit_number">Kijárat száma</string>
+    <string name="announce_when_exceeded">Értesítés túllépéskor</string>
+    <string name="user_points">Felhasználói pontok</string>
+    <string name="output">Teljesítmény</string>
+    <string name="srtm_download_single_help_message">Kérjük, válassza ki a kívánt mértékegységet. A mértékegység módosításához újra le kell töltenie a fájlt.</string>
+    <string name="srtm_download_list_help_message">Az OsmAnd méterben és lábban adja meg a szintvonalak magasságát. A mértékegység módosításához újra le kell töltenie a fájlt.</string>
+    <string name="shared_string_feet">láb</string>
+    <string name="srtm_unit_format">Szintvonalak mértékegysége</string>
 </resources>

OsmAnd/res/values-is/phrases.xml

@@ -3895,4 +3895,37 @@
     <string name="poi_conference_centre">Ráðstefnumiðstöð</string>
     <string name="poi_geodesist">Landmælingar</string>
     <string name="poi_camp_pitch">Tjaldstæði</string>
+    <string name="poi_cycle_polo">Hjólapóló</string>
+    <string name="poi_biathlon">Skíðaskotfimi</string>
+    <string name="poi_zurkhaneh_sport">Zurkhaneh-íþróttir</string>
+    <string name="poi_wakeboarding">Vatnabretti</string>
+    <string name="poi_ultimate">Ultimate</string>
+    <string name="poi_table_soccer">Fótboltaborð</string>
+    <string name="poi_speedway">Keppnisbraut</string>
+    <string name="poi_shot_put">Kúluvarp</string>
+    <string name="poi_hoops">Körfur</string>
+    <string name="poi_kickboxing">Sparkhnefaleikar</string>
+    <string name="poi_horseshoes">Skeifukast</string>
+    <string name="poi_fencing">Skilmingar</string>
+    <string name="poi_curling">Krulla</string>
+    <string name="poi_crossfit">Krossfitt</string>
+    <string name="poi_cockfighting">Hanaat</string>
+    <string name="poi_cliff_diving">Klettadýfingar</string>
+    <string name="poi_bullfighting">Nautaat</string>
+    <string name="poi_bobsleigh">Bobbsleðar</string>
+    <string name="poi_aikido">Aikido</string>
+    <string name="poi_water_ski">Vatnaskíði</string>
+    <string name="poi_water_polo">Vatnapóló</string>
+    <string name="poi_wrestling">Fjölbragðaglíma</string>
+    <string name="poi_weightlifting">Lyftingar</string>
+    <string name="poi_taekwondo">Tækvondo</string>
+    <string name="poi_sumo">Sumo</string>
+    <string name="poi_snooker">Snóker</string>
+    <string name="poi_pilates">Pilates</string>
+    <string name="poi_jiu_jitsu">Jiu-jitsu</string>
+    <string name="poi_karate">Karate</string>
+    <string name="poi_office_diplomatic">Sendiskrifstofa</string>
+    <string name="poi_bay_filter">Gerð flóa</string>
+    <string name="poi_plateau">Háslétta</string>
+    <string name="poi_club_social">Félagsstarf</string>
 </resources>

OsmAnd/res/values-is/strings.xml

@@ -3853,7 +3853,7 @@
     <string name="subscription_on_hold_title">Áskrift að OsmAnd Live er í biðstöðu</string>
     <string name="login_account">Notandaaðgangur</string>
     <string name="login_open_street_map_org">Skrá inn á OpenStreetMap.org</string>
-    <string name="markers_history">Vinnsluferill kortamerkja</string>
+    <string name="markers_history">Ferill kortamerkja</string>
     <string name="message_you_need_add_two_points_to_show_graphs">Bættu við a.m.k. tveimur punktum</string>
     <string name="navigate_point_mgrs">MGRS</string>
     <string name="subscription_paused_title">Áskrift að OsmAnd Live hefur verið sett í bið</string>
@@ -4052,7 +4052,11 @@
     <string name="rendering_attr_noNatureReserveBoundaries_name">Mörk náttúru</string>
     <string name="trip_recording_logging_interval_info">Millibil skráninga stillir tímabilið milli þess sem OsmAnd biður um staðsetningargögn.</string>
     <string name="trip_recording_show_start_dialog_setting">Ef þetta er óvirkt, mun upptaka hefjast strax eftir að ýtt er á hnappinn eða valmyndarfærsluna og staðfestingarglugga er þá sleppt.</string>
-    <string name="release_4_0_beta">• Uppfærslur OsmAnd Live færðar í \"Sótt gögn &gt; Uppfærslur\"
+    <string name="release_4_0_beta">• Bætt við möguleika á að sækja hæðarlínur í fetum
+\n
+\n• Landslag í leiðaskipulagi: bætt við flipum til að skipta á milli punkta eða grafs
+\n
+\n• Uppfærslur OsmAnd Live færðar í \"Sótt gögn &gt; Uppfærslur\"
 \n
 \n • Ferla er nú hægt að lita eftir hæð, hraða eða halla.
 \n
@@ -4086,4 +4090,13 @@
     <string name="on_hold">Í bið</string>
     <string name="expired">Útrunnið</string>
     <string name="update_all_maps_added">Uppfæra öll kort sem bætt hefur verið við %1$s\?</string>
+    <string name="exit_number">Númer útkeyrslu</string>
+    <string name="output">Útkeyrsla</string>
+    <string name="announce_when_exceeded">Tilkynna þegar farið er yfir</string>
+    <string name="user_points">Punktar notanda</string>
+    <string name="map_quick_action_pattern">%1$s → …</string>
+    <string name="shared_string_feet">fet</string>
+    <string name="srtm_unit_format">Snið eininga hæðarlína</string>
+    <string name="srtm_download_list_help_message">OsmAnd býður upp á hæðalínugögn í metrum og fetum. Þú þarft að sækja skrána aftur til að breyta sniðinu.</string>
+    <string name="srtm_download_single_help_message">Veldu rétt snið eininga. Þú þarft að sækja skrána aftur til að breyta sniðinu.</string>
 </resources>

OsmAnd/res/values-it/strings.xml

@@ -38,7 +38,7 @@
     <string name="global_app_settings">Impostazioni globali dell\'applicazione</string>
     <string name="user_name">il tuo nome utente in OSM</string>
     <string name="open_street_map_login_descr">Necessario per inviare contributi a openstreetmap.org.</string>
-    <string name="user_password">Password in OSM</string>
+    <string name="user_password">Password</string>
     <string name="osmand_service">In secondo piano</string>
     <string name="osmand_service_descr">OsmAnd funziona in backgroung con lo schermo spento.</string>
     <string name="switch_to_raster_map_to_see">Scarica una mappa vettoriale offline per questa regione da \'Impostazioni\' (\'Scarica mappe\'), o passa al componente aggiuntivo \'Mappe online\'.</string>
@@ -1528,7 +1528,7 @@
     <string name="routing_attr_height_name">Limite di altezza</string>
     <string name="routing_attr_height_description">Specifica l\'altezza del veicolo permessa nei percorsi.</string>
     <string name="use_fast_recalculation">Ricalcolo percorso intelligente</string>
-    <string name="use_fast_recalculation_desc">Ricalcola solo la prima parte del percorso per i viaggi lunghi.</string>
+    <string name="use_fast_recalculation_desc">Ricalcola solo la prima parte del percorso, utile per i viaggi lunghi.</string>
     <string name="shared_string_logoff">Esci</string>
     <string name="rendering_value_disabled_name">Disabilitato</string>
     <string name="rendering_value_walkingRoutesScopeOSMC_name">Colora per rete di appartenenza</string>
@@ -3321,19 +3321,19 @@
     <string name="login_and_pass">Nome utente e password</string>
     <string name="plugin_global_prefs_info">Queste impostazioni del plugin sono globali e si applicano a tutti i profili</string>
     <string name="osm_editing">Modifica di OpenStreetMap</string>
-    <string name="osm_edits_view_descr">È possibile visualizzare tutte le modifiche non caricate o le note OSM in %1$s. I punti caricati non vengono visualizzati in OsmAnd.</string>
+    <string name="osm_edits_view_descr">Visualizza tutte le modifiche non caricate o le note OSM in %1$s. I punti caricati non verranno più visualizzati.</string>
     <string name="app_mode_osm">OSM</string>
     <string name="select_nav_icon_descr">L\'icona viene visualizzata solo durante la navigazione o in movimento.</string>
     <string name="logcat_buffer_descr">Controlla e condividi i log dettagliati dell\'applicazione</string>
     <string name="permission_is_required">Un permesso è richiesto per usare questa opzione.</string>
     <string name="rearrange_categories">Sistema categorie</string>
     <string name="create_custom_categories_list_promo">Cambia l\'ordinamento della lista, nasconde le categoria non necessarie. Puoi importare o esportare tutti i cambiamenti con i profili.</string>
-    <string name="add_new_custom_category_button_promo">Puoi aggiugere una nuova categoria personalizzata selezionandone una o alcune altre.</string>
+    <string name="add_new_custom_category_button_promo">Puoi aggiungere una nuova categoria personalizzata selezionandone una o più.</string>
     <string name="shared_string_available">Disponibile</string>
     <string name="add_custom_category">Aggiungi categoria personalizzata</string>
     <string name="rendering_attr_streetLightingNight_name">Mostra solo di notte</string>
-    <string name="plugin_prefs_reset_successful">Tutte le impostazioni dei plugin sono state riportate allo stato predefinito.</string>
-    <string name="profile_prefs_reset_successful">Tutte le impostazioni dei profili sono state riportate allo stato iniziale.</string>
+    <string name="plugin_prefs_reset_successful">Tutte le impostazioni dei plugin sono state riportate ai predefiniti.</string>
+    <string name="profile_prefs_reset_successful">Tutte le impostazioni dei profili sono state riportate ai predefiniti.</string>
     <string name="ltr_or_rtl_combine_via_slash">%1$s/%2$s</string>
     <string name="sunset_at">Tramonto alle %1$s</string>
     <string name="sunrise_at">Alba alle %1$s</string>
@@ -3366,11 +3366,11 @@
     <string name="multimedia_use_system_camera">Usa l\'app di sistema</string>
     <string name="multimedia_photo_play_sound">Sono otturatore fotocamera</string>
     <string name="osm_authorization_success">L\'autorizzazione è andata a buon fine</string>
-    <string name="reset_to_default_category_button_promo">Il ripristino dei valori preimpostati ripristinerà l\'ordine di visualizzazione preimpostato dopo l\'installazione.</string>
-    <string name="accessibility_mode_disabled">La modalità accessibile è disabilitata nel tuo sistema.</string>
-    <string name="use_system_screen_timeout">Utilizza il salvaschermo di sistema</string>
-    <string name="use_system_screen_timeout_promo">Disabilitato per preimpostazione, se OsmAnd è eseguito in primo piano, lo schermo non andrà in sospensione. 
-\n 
+    <string name="reset_to_default_category_button_promo">\'Ripristina i predefiniti\' ripristinerà l\'ordine di visualizzazione preimpostato dell\'installazione.</string>
+    <string name="accessibility_mode_disabled">La modalità accessibile è disabilitata nel tuo sistema Android.</string>
+    <string name="use_system_screen_timeout">Utilizza il tempo del salvaschermo di sistema</string>
+    <string name="use_system_screen_timeout_promo">Disabilitato per preimpostazione, quando OsmAnd è eseguito in primo piano, lo schermo non andrà in sospensione.
+\n
 \nSe abilitato OsmAnd userà le impostazioni di sospensione del sistema.</string>
     <string name="clear_recorded_data">Elimina i dati registrati</string>
     <string name="release_3_6">• Profili: ora puoi cambiare l\'ordine, impostare l\'icona per le mappe, cambiare tutte le impostazioni dei profili di base e reimpostarle a quelle preimpostate 
@@ -3403,12 +3403,12 @@
     <string name="please_provide_profile_name_message">Dai un nome a questo profilo</string>
     <string name="open_settings">Apri le impostazioni</string>
     <string name="plugin_disabled">Plugin disabilitato</string>
-    <string name="plugin_disabled_descr">Questo plugin è stato aggiunto tramite un\' applicazione separata. Se non vuoi più utilizzarlo, rimuovi l\' applicazione separatamente.
+    <string name="plugin_disabled_descr">Questo plugin è un\' applicazione separata, se non vuoi più utilizzarlo, rimuovi l\' applicazione separatamente.
 \n
-\nSe rimuovi OsmAnd, il plugin resterà sul dispositivo.</string>
+\nIl plugin resterà sul dispositivo dopo la rimozione di OsmAnd.</string>
     <string name="shared_string_menu">Menu</string>
     <string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
-    <string name="no_recalculation_setting">Disattiva ricalcolo percorso</string>
+    <string name="no_recalculation_setting">Disattiva ricalcolo</string>
     <string name="route_recalculation_dist_title">Distanza minima per il ricalcolo del percorso</string>
     <string name="route_recalculation_dist_descr">Il percorso viene ricalcolato quando la distanza dal percorso è maggiore di quella specificata</string>
     <string name="routing_profile_direct_to">Dritto-al-punto</string>
@@ -3468,9 +3468,9 @@
     <string name="shared_string_rendering_style">Stile di rappresentazione</string>
     <string name="shared_string_terrain">Terreno</string>
     <string name="hillshade_description">La mappa Ombreggiamento dei rilievi utilizza le ombre per visualizzare le pendenze, i picchi e i bassipiani.</string>
-    <string name="slope_description">La Pendenza è visualizzata sul terreno tramite colorazione.</string>
+    <string name="slope_description">La pendenza è visualizzata sul terreno tramite colorazione.</string>
     <string name="terrain_slider_description">Imposta lo zoom minimo e massimo a cui lo strato sarà visualizzato.</string>
-    <string name="hillshade_download_description">Sono necessarie mappe addizionali per visualizzare l\'Ombreggiatura dei rilievi sulla mappa.</string>
+    <string name="hillshade_download_description">Sono necessarie mappe addizionali per visualizzare l\'ombreggiatura dei rilievi sulla mappa.</string>
     <string name="slope_download_description">Mappe addizionali sono necessarie per visualizzare le Pendenze sulla mappa.</string>
     <string name="shared_string_transparency">Trasparenza</string>
     <string name="shared_string_zoom_levels">Livello di zoom</string>
@@ -3495,9 +3495,9 @@
     <string name="developer_plugin">Plugin sviluppatore</string>
     <string name="shared_string_items">Oggetti</string>
     <string name="quick_action_transport_descr">Il pulsante mostra o nasconde nella mappa i trasporti pubblici.</string>
-    <string name="create_edit_poi">Crea/Modifica PDI</string>
+    <string name="create_edit_poi">Crea o modifica PDI</string>
     <string name="parking_positions">Posizione di parcheggio</string>
-    <string name="add_edit_favorite">Aggiungi/Modifica Preferito</string>
+    <string name="add_edit_favorite">Aggiungi o modifica preferito</string>
     <string name="reset_deafult_order">Ripristina l\'ordine preimpostato degli oggetti</string>
     <string name="back_to_editing">Ritorna alla modifica</string>
     <string name="quick_action_switch_profile_descr">Il pulsante azione cambia fra i profili selezionati.</string>
@@ -3511,7 +3511,7 @@
     <string name="mapillary_item">OsmAnd + Mapillary</string>
     <string name="quick_action_item">Azione veloce</string>
     <string name="radius_ruler_item">Righello radiale</string>
-    <string name="measure_distance_item">Misuratore della distanza</string>
+    <string name="measure_distance_item">Misura distanza</string>
     <string name="travel_item">Viaggi (Wikivoyage e Wikipedia)</string>
     <string name="map_markers_item">Marcatori mappa</string>
     <string name="favorites_item">Preferiti</string>
@@ -3534,7 +3534,7 @@
     <string name="turn_screen_on_wake_time_descr">Scegli il tempo di spegnimento dopo l\'accensione dello schermo. (\"%1$s\" imposta nessun tempo di attesa.)</string>
     <string name="keep_screen_on">Mantieni lo schermo acceso</string>
     <string name="keep_screen_off">Mantieni lo schermo spento</string>
-    <string name="screen_timeout_descr">Limitata a \"%1$s\", se abilitata.</string>
+    <string name="screen_timeout_descr">Si \"%1$s\" è accesa, il tempo dell\'attività dipenderà da essa.</string>
     <string name="pseudo_mercator_projection">Proiezione pseudo-Mercatore</string>
     <string name="one_image_per_tile">Un file immagine per mattonella</string>
     <string name="sqlite_db_file">File SQLiteDB</string>
@@ -3545,26 +3545,26 @@
     <string name="mercator_projection">Proiezione Mercatore</string>
     <string name="storage_format">Formato dell\'archivio</string>
     <string name="map_source_zoom_levels">Imposta il livello minimo e massimo a cui saranno caricate o visualizzate le mappe online.</string>
-    <string name="map_source_zoom_levels_descr">Questi parametri avranno effetto sullo schermo quando è utilizzato come mappa o sfondo/sovrapposizione. 
+    <string name="map_source_zoom_levels_descr">Questi parametri avranno effetto sullo schermo quando è utilizzato come mappa o sfondo/sovrapposizione.
 \n
-\n%1$s: La mappa sarà limitata ai livelli di zoom selezionati. 
+\n%1$s: La mappa sarà limitata ai livelli di zoom selezionati.
 \n
-\n%2$s: Livelli di zoom a cui le mattonelle originali saranno visibili. Al di fuori di questi valori avverrà un\'interpolazione.</string>
-    <string name="expire_time_descr">Tempo di scadenza in minuti. Le mattonelle salvate nella cache saranno ricaricate dopo l\'intervallo specificato. Lascia vuoto il campo per non ricaricare mai le mattonelle per questa sorgente. 
+\n%2$s: livelli di zoom a cui le mattonelle originali saranno visibili. Al di fuori di questi valori avverrà un\'interpolazione.</string>
+    <string name="expire_time_descr">Le mattonelle salvate nella cache saranno ricaricate dopo l\'intervallo specificato in minuti. Lascia vuoto il campo per non ricaricare mai le mattonelle per questa sorgente.
 \n
 \nUn giorno corrisponde a 1440 minuti.
 \nUna settimana corrisponde a 10080 minuti.
 \nUn mese corrisponde a 43829 minuti.</string>
-    <string name="tiles_storage_descr">Scegli come le mattonelle scaricate saranno conservate.</string>
+    <string name="tiles_storage_descr">Scegli come le mattonelle scaricate saranno archiviate.</string>
     <string name="default_screen_timeout">Tempo di sistema attivazione salvaschermo</string>
     <string name="main_actions_descr">Ha solo 4 pulsanti.</string>
     <string name="lang_zhminnan">Min meridionale</string>
     <string name="lang_war">Wáray</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
-    <string name="osm_live_payment_subscription_management">Il tuo account Google Play viene addebitato al momento dell\'acquisto di una sottoscrizione. 
-\n 
-\n La sottoscrizione si rinnova automaticamente finché non viene cancellata prima del rinnovo. Il tuo account verrà addebitato per il rinnovo periodico (mensile, trimestrale, annuale) solo alla data di rinnovo. 
-\n 
+    <string name="osm_live_payment_subscription_management">Il tuo account Google Play viene addebitato al momento della conferma dell\'acquisto.
+\n
+\n La sottoscrizione si rinnova automaticamente finché non viene cancellata prima del rinnovo. Il tuo account verrà addebitato per il rinnovo periodico (mensile, trimestrale, annuale) solo alla data di rinnovo.
+\n
 \n Puoi gestire e cancellare la tua sottoscrizione dalle impostazioni del tuo account Google Play.</string>
     <string name="search_poi_types_descr">Combina PDI di più categorie. Tappa il pulsante per selezionarle tutte, oppure sul lato sinistro per una selezione puntuale.</string>
     <string name="lang_gu">Gujarati</string>
@@ -3606,7 +3606,7 @@
     <string name="main_actions">Azioni principali</string>
     <string name="additional_actions_descr">Puoi accedere a queste azioni toccando il pulsante “%1$s”.</string>
     <string name="move_inside_category">Puoi spostare gli elementi solo all\'interno di questa categoria.</string>
-    <string name="select_wikipedia_article_langs">Seleziona i linguaggi in cui gli articoli di Wikipedia appariranno sulla mappa. Puoi cambiare fra tutte le lingue disponibili mentre leggi questo articolo.</string>
+    <string name="select_wikipedia_article_langs">Seleziona i linguaggi in cui gli articoli di Wikipedia appariranno sulla mappa. Puoi cambiare fra tutte le lingue disponibili mentre leggi l\'articolo.</string>
     <string name="some_articles_may_not_available_in_lang">Alcuni articoli di Wikipedia potrebbero non essere disponibili nella tua lingua.</string>
     <string name="lang_zhyue">Cantonese</string>
     <string name="lang_yo">Yoruba</string>
@@ -3649,16 +3649,16 @@
     <string name="vessel_height_warning">Puoi mpostare l\'altezza dell\'imbarcazione per evitare ponti bassi. Ricorda che, se il ponte è mobile, useremo la sua altezza da aperto.</string>
     <string name="vessel_height_limit_description">Imposta l\'altezza dell\'imbarcazione per evitare ponti bassi. Ricorda che, se il ponte è mobile, useremo la sua altezza da aperto.</string>
     <string name="vessel_width_limit_description">Imposta la larghezza della\"imbarcazione per evitare i ponti stretti</string>
-    <string name="quick_action_showhide_mapillary_descr">Un pulsante per visualizzare nella mappa o nascondere il livello Mapillary .</string>
-    <string name="lenght_limit_description">Fornisci la lunghezza del tuo veicolo, alcune restrizioni di percorso potrebbero essere applicate per veicoli.</string>
+    <string name="quick_action_showhide_mapillary_descr">Un pulsante per visualizzare o nascondere nella mappa il livello Mapillary .</string>
+    <string name="lenght_limit_description">Fornisci la lunghezza del tuo veicolo, alcune restrizioni di percorso potrebbero essere applicate per veicoli lunghi.</string>
     <string name="uninstall_speed_cameras">Disinstalla autovelox</string>
     <string name="shared_string_legal">Legale</string>
     <string name="speed_camera_pois">PDI autovelox</string>
-    <string name="speed_cameras_legal_descr">In alcuni paesi o regioni, gli avvisi di presenza di autovelox sono proibiti dalla legge. 
+    <string name="speed_cameras_legal_descr">In alcuni paesi o regioni, gli avvisi di presenza di autovelox sono proibiti dalla legge.
 \n
-\nDevi scegliere in base alle leggi del tuo paese. 
+\nDevi scegliere in base alle leggi del tuo paese.
 \n
-\nScegliendo %1$s e riceverai gli avvisi della presenza di autovelox. 
+\nScegliendo %1$s e riceverai gli avvisi della presenza di autovelox.
 \n
 \nScegliendo %2$s. Tutti i dati relativi agli autovelox: avvisi, notifiche, PDI saranno cancellati fino a che OsmAnd non sarà completamente reinstallato.</string>
     <string name="keep_active">Mantieni attivo</string>
@@ -3668,17 +3668,17 @@
     <string name="routing_attr_length_name">Lunghezza massima</string>
     <string name="shared_string_bearing">Direzione</string>
     <string name="item_deleted">%1$s cancellato</string>
-    <string name="speed_cameras_restart_descr">Il riavvio è necessario per cancellare completamente i dati degli autovelox.</string>
+    <string name="speed_cameras_restart_descr">Riavvia l\'app per cancellare tutti i dati degli autovelox.</string>
     <string name="shared_string_uninstall_and_restart">Disinstalla e Riavvia</string>
     <string name="speed_cameras_removed_descr">Questo dispositivo non ha autovelox.</string>
     <string name="app_mode_inline_skates">Pattini in linea</string>
-    <string name="quick_action_remove_next_destination">Cancella il prossimo punto di destinazione</string>
-    <string name="use_volume_buttons_as_zoom_descr">Abilita per controllare il livello di zoom della mappa con i pulsanti del volume del dispositivo.</string>
+    <string name="quick_action_remove_next_destination">Cancella il punto di destinazione più vicino</string>
+    <string name="use_volume_buttons_as_zoom_descr">Controllare il livello di zoom della mappa con i pulsanti del volume del dispositivo.</string>
     <string name="use_volume_buttons_as_zoom">Pulsanti volume come zoom</string>
     <string name="please_provide_point_name_error">Per favore indica un nome per il punto</string>
     <string name="quick_action_remove_next_destination_descr">Elimina la destinazione successiva nel percorso. Se questa è la destinazione finale, la navigazione si fermerà.</string>
     <string name="search_download_wikipedia_maps">Scarica mappe Wikipedia</string>
-    <string name="plugin_wikipedia_description">Ottieni informazioni sui punti di interesse da Wikipedia. È la tua guida tascabile offline - basta abilitare il plugin Wikipedia e goderti gli articoli sugli oggetti intorno a te.</string>
+    <string name="plugin_wikipedia_description">Ottieni informazioni sui punti di interesse da Wikipedia. una guida tascabile offline di articoli sui luoghi e destinazioni.</string>
     <string name="app_mode_enduro_motorcycle">Moto da enduro</string>
     <string name="app_mode_motor_scooter">Moto scooter</string>
     <string name="app_mode_wheelchair">Sedia a rotelle</string>
@@ -3690,9 +3690,9 @@
     <string name="track_show_start_finish_icons">Mostra le icone di inizio e fine</string>
     <string name="shared_string_custom">Personalizzato</string>
     <string name="track_coloring_solid">Solido</string>
-    <string name="set_working_days_to_continue">Devi impostare i giorni lavorativi per continuare</string>
+    <string name="set_working_days_to_continue">Imposta i giorni lavorativi per continuare</string>
     <string name="plan_a_route">Pianifica un percorso</string>
-    <string name="add_to_a_track">Aggiungi ad una Traccia</string>
+    <string name="add_to_a_track">Aggiungi ad una traccia</string>
     <string name="gpx_split_interval_descr">Seleziona l\'intervallo a cui i segnaposti con distanza o orario sulla traccia verranno mostrati.</string>
     <string name="gpx_split_interval_none_descr">Seleziona l\'opzione desiderata per la divisione: per tempo o per distanza.</string>
     <string name="gpx_direction_arrows">Frecce della direzione</string>
@@ -3716,7 +3716,7 @@
     <string name="threshold_distance">Soglia distanza</string>
     <string name="route_between_points_add_track_desc">Seleziona un file traccia a cui verrà aggiunto un nuovo segmento.</string>
     <string name="street_level_imagery">Immagini stradali</string>
-    <string name="plan_route_exit_dialog_descr">Sei sicuro di voler chiudere la Pianificazione del percorso perdendo così le modifiche effettuate\?</string>
+    <string name="plan_route_exit_dialog_descr">Sei sicuro di voler scartare tutte le modifiche nel percorso pianificato\?</string>
     <string name="in_case_of_reverse_direction">In caso di direzione inversa</string>
     <string name="save_track_to_gpx">Registra automaticamente la traccia durante la navigazione</string>
     <string name="shared_string_save_as_gpx">Salva come un nuovo file traccia</string>
@@ -3753,7 +3753,7 @@
     <string name="shared_string_file_name">Nome del file</string>
     <string name="number_of_gpx_files_selected_pattern">%s file traccia selezionati</string>
     <string name="disable_recording_once_app_killed_descrp">Metterà in pausa la registrazione della traccia quando l\'applicazione viene terminata (attraverso le app recenti). (L\'indicazione di OsmAnd in background scomparirà dalla barra delle notifiche di Android.)</string>
-    <string name="save_global_track_interval_descr">Specifica l\'intervallo per la registrazione delle tracce (abilitata attraverso il pulsante di Registrazione del viaggio sulla mappa).</string>
+    <string name="save_global_track_interval_descr">Specifica l\'intervallo per la registrazione delle tracce (avviata attraverso il pulsante di \'Registrazione del viaggio\' sulla mappa).</string>
     <string name="gpx_monitoring_stop">Sospendi la registrazione del viaggio</string>
     <string name="gpx_monitoring_start">Riprendi la registrazione del viaggio</string>
     <string name="system_default_theme">Preimpostazioni di sistema</string>
@@ -3786,7 +3786,7 @@
     <string name="sort_last_modified">Cronologico</string>
     <string name="sort_name_descending">Nome: Z – A</string>
     <string name="sort_name_ascending">Nome: A – Z</string>
-    <string name="start_finish_icons">Icona Partenza/Arrivo</string>
+    <string name="start_finish_icons">Icone Partenza e Arrivo</string>
     <string name="contour_lines_thanks">Grazie per l\'acquisto del \'Plugin delle curve di livello\'</string>
     <string name="what_is_new">Novità</string>
     <string name="snowmobile_render_descr">Per slitte a motore con strade e sentieri dedicati.</string>
@@ -3795,7 +3795,7 @@
 \n
 \nLe sottoscrizioni si rinnovano automaticamente finché non vengono cancellate prima della date del rinnovo. Il tuo account sarà addebitato per i rinnovi periodici solo (mensile/trimestrale/annuale) solo alla data di rinnovo.
 \n
-\nPuoi gestire le tue sottoscrizioni nelle impostazioni della tua AppGallery.</string>
+\nPuoi gestire e cancellare le tue sottoscrizioni nelle impostazioni della tua AppGallery.</string>
     <string name="routing_attr_avoid_footways_description">Evita i marciapiedi</string>
     <string name="routing_attr_avoid_footways_name">Evita i marciapiedi</string>
     <string name="development">Sviluppo</string>
@@ -3804,16 +3804,16 @@
     <string name="complex_routing_descr">Calcolo del percorso in due fasi per la navigazione in auto.</string>
     <string name="use_native_pt">Sviluppo Trasporto Pubblico nativo</string>
     <string name="use_native_pt_desc">Cambia a Java (safe) calcolo del percorso su Trasporto Pubblico</string>
-    <string name="perform_oauth_authorization_description">Effettua una connessione OAuth per usare le funzionalità osmedit</string>
+    <string name="perform_oauth_authorization_description">Entra con OAuth per usare le funzionalità osmedit</string>
     <string name="perform_oauth_authorization">Connettiti via OAuth</string>
     <string name="clear_osm_token">Cancella il token OAuth OpenStreetMap</string>
     <string name="osm_edit_logout_success">Disconnessione effettuata</string>
     <string name="file_already_imported">Il file è già importato in OsmAnd</string>
     <string name="use_two_phase_routing">Utilizza l\'algoritmo di calcolo a 2-fasi A*</string>
     <string name="shared_string_graph">Grafico</string>
-    <string name="message_need_calculate_route_before_show_graph">%1$s dati disponibili solo per le strade, necessiti di calcolare un percorso utilizzando \"Percorso fra punti\" per ottenerlo.</string>
-    <string name="message_graph_will_be_available_after_recalculation">Attendi per il ricalcolo del percorso.
-\nIl grafico sarà disponibile dopo il ricalcolo.</string>
+    <string name="message_need_calculate_route_before_show_graph">%1$s dati disponibili solo sulle strade, calcola un percorso utilizzando \"Percorso tra punti\" per visualizzare il grafico.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Attendi.
+\nIl grafico sarà disponibile dopo il ricalcolo del percorso.</string>
     <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="app_mode_gap">Buco</string>
     <string name="navigate_point_mgrs">MGRS</string>
@@ -3828,7 +3828,7 @@
     <string name="icon_group_sport">Sport</string>
     <string name="icon_group_emergency">Emergenza</string>
     <string name="icon_group_travel">Viaggio</string>
-    <string name="message_you_need_add_two_points_to_show_graphs">Devi aggiungere almeno due punti</string>
+    <string name="message_you_need_add_two_points_to_show_graphs">Aggiungi almeno due punti</string>
     <string name="osm_edit_close_note">Chiudi la nota OSM</string>
     <string name="osm_edit_comment_note">Commenta la nota OSM</string>
     <string name="osm_login_descr">Puoi autenticarti con il metodo sicuro OAuth o utilizzare le tue credenziali.</string>
@@ -3851,7 +3851,7 @@
     <string name="login_account">Account</string>
     <string name="user_login">Entra</string>
     <string name="manage_subscription">Gestisci la sottoscrizione</string>
-    <string name="subscription_payment_issue_title">C\'è un problema con la tua sottoscrizione. Clicca sul pulsante per andare alle impostazioni di sottoscrizione di Google Play per correggere il tuo metodo di pagamento.</string>
+    <string name="subscription_payment_issue_title">Tappa sul pulsante per impostare un metodo di pagamento in Google Play per correggere la tua sottoscrizione.</string>
     <string name="subscription_expired_title">La sottoscrizione di OsmAnd Live è terminata</string>
     <string name="subscription_paused_title">La sottoscrizione di OsmAnd Live è stata messa in pausa</string>
     <string name="subscription_on_hold_title">La sottoscrizione di OsmAnd Live è in sospeso</string>
@@ -3860,14 +3860,14 @@
     <string name="enter_text_separated">Immetti le etichette separate dalla virgola.</string>
     <string name="gpx_upload_public_visibility_descr">\"Pubblico\" significa che la traccia è visualizzata pubblicamente nelle tue tracce GPS, nelle liste pubbliche di tracce GPS con le informazioni temporali in forma grezza. I dati forniti attraverso le API non conducono alla tua pagina delle tracce. Le informazioni temporali dei punti traccia non sono disponibili attraverso le API GPS pubbliche, e i punti della traccia non sono ordinati cronologicamente.</string>
     <string name="gpx_upload_private_visibility_descr">\"Privato\" significa che la traccia non è visualizzabile in alcuna lista pubblica ma i suoi punti, in ordine non cronologico, sono disponibili attraverso le API GPS senza le informazioni temporali.</string>
-    <string name="gpx_upload_identifiable_visibility_descr">\"Identificabile\" significa che la traccia è visualizzabile nelle Mie tracce GPS e nelle liste pubbliche, ad es. gli altri utenti potranno scaricare la traccia grezza e associarla con il tuo nome utente. I punti della traccia, con le loro informazioni temporali, saranno riconducibili, attraverso le API GPS, alla tua traccia originale.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">\"Identificabile\" significa che la traccia è visualizzabile nelle mie tracce GPS e nelle liste pubbliche, ad es. gli altri utenti potranno scaricare la traccia grezza e associarla con il tuo nome utente. I punti della traccia, con le loro informazioni temporali, saranno riconducibili, attraverso le API GPS, alla tua traccia originale.</string>
     <string name="gpx_upload_trackable_visibility_descr">\"Tracciabile\" significa che la traccia non è visualizzabile in alcuna lista pubblica, ma solo i suoi punti, processati, con le informazioni temporali (che non possono essere direttamente associati a te) attraverso le API GPS pubbliche.</string>
     <string name="add_to_mapillary">Aggiungi a Mapillary</string>
     <string name="add_to_opr">Aggiungi a OpenPlaceReviews</string>
     <string name="add_photos_descr">OsmAnd mostra foto da diverse fonti:
-\nOpenPlaceReviews - foto POI;
+\nOpenPlaceReviews - foto PDI;
 \nMapillary - immagini stradali;
-\nWeb / Wikimedia - foto POI specificate nei dati di OpenStreetMap.</string>
+\nWeb / Wikimedia - foto PDI di dati OpenStreetMap.</string>
     <string name="shared_string_resources">Risorse</string>
     <string name="approximate_file_size">Dimesione approssimativa del file</string>
     <string name="select_data_to_export">Seleziona i dati da esportare nel file.</string>
@@ -3945,7 +3945,7 @@
     <string name="shared_string_server_url">URL del server</string>
     <string name="shared_string_enter_param">Immetti un parametro</string>
     <string name="keep_it_empty_if_not">Mantienilo vuoto se non lo fosse</string>
-    <string name="online_routing_example_hint">URL con tutti i parametri saranno come questo:</string>
+    <string name="online_routing_example_hint">Gli URL con tutti i parametri saranno come questo:</string>
     <string name="test_route_calculation">Prova il calcolo del percorso</string>
     <string name="routing_engine_vehicle_type_driving">Driving</string>
     <string name="routing_engine_vehicle_type_foot">A piedi</string>
@@ -3964,11 +3964,11 @@
     <string name="rename_track">Rinomina la traccia</string>
     <string name="change_folder">Cambia cartella</string>
     <string name="shared_string_sec">sec</string>
-    <string name="announcement_time_passing">Passing</string>
+    <string name="announcement_time_passing">Sorpasso</string>
     <string name="announcement_time_approach">Approach</string>
     <string name="announcement_time_prepare_long">Long prepare</string>
     <string name="announcement_time_prepare">Preparazione</string>
-    <string name="announcement_time_off_route">Fuoristrada</string>
+    <string name="announcement_time_off_route">Fuori dal percorso</string>
     <string name="announcement_time_intervals">Intervalli di tempo e distanza</string>
     <string name="announcement_time_descr">Il tempo dell\'annuncio per i diversi avvisi dipende dal tipo di avviso, la velocità attuale e la velocità preimpostata.</string>
     <string name="announcement_time_title">Tempo dell\'annuncio</string>
@@ -4010,7 +4010,7 @@
     <string name="on_pause">In pausa</string>
     <string name="app_restart_required">Il riavvio dell\'app è richiesto per applicare alcune impostazioni.</string>
     <string name="routing_attr_height_obstacles_description">Il calcolo del percorso può evitare le salite ripide.</string>
-    <string name="quick_action_coordinates_widget_descr">Un interruttore per mostrare o nascondere il widget delle coordinate sulla mappa.</string>
+    <string name="quick_action_coordinates_widget_descr">Un interruttore per mostrare o nascondere il widget delle Coordinate sulla mappa.</string>
     <string name="map_widget_distance_by_tap">Distanza dal tocco</string>
     <string name="latest_openstreetmap_update">Ultimo aggiornamento OpenStreetMap disponibile:</string>
     <string name="updated">Aggiornata: %s</string>
@@ -4036,7 +4036,7 @@
     <string name="trip_recording_save_and_continue">Salva e continua</string>
     <string name="lost_data_warning">Tutti i dati non salvati andranno persi.</string>
     <string name="show_start_dialog">Mostra la finestra di avvio</string>
-    <string name="trip_recording_show_start_dialog_setting">Se disabilitato, la registrazione inizierà appena tappato sul widget o sul menu, saltando la finestra di configurazione.</string>
+    <string name="trip_recording_show_start_dialog_setting">Se disabilitato, la registrazione inizierà appena tappato sul widget o sul menu, saltando la finestra di conferma.</string>
     <string name="specify_color_for_map_mode">Specifica il colore per il tipo di mappa: %1$s.</string>
     <string name="new_device_account">Nuovo dispositivo / nuovo account</string>
     <string name="contact_support_description">Se hai delle domande, per favore contattaci al %1$s.</string>
@@ -4056,7 +4056,7 @@
     <string name="routing_attr_allow_intermittent_name">Permetti le vie d\'acqua intermittenti</string>
     <string name="customize_route_line">Personalizza la linea del percorso</string>
     <string name="shared_string_route_line">Linea del percorso</string>
-    <string name="route_line_use_map_style_appearance">Per la linea del percorso sarà utilizzato %1$s specificato nello stile della mappa selezionato %2$s.</string>
+    <string name="route_line_use_map_style_appearance">Per la linea del percorso sarà utilizzato %1$s specificato nello stile della mappa selezionato: %2$s.</string>
     <string name="no_purchases">Non hai alcun acquisto</string>
     <string name="empty_purchases_description">Se l\'acquisto non viene visualizzato qui, tappa su “%1$s”, o contatta il supporto.</string>
     <string name="contact_support">Contatta il supporto</string>
@@ -4071,4 +4071,9 @@
     <string name="on_hold">In attesa</string>
     <string name="expired">Scaduto</string>
     <string name="update_all_maps_added">Aggiornare tutte le mappe aggiunte a %1$s\?</string>
+    <string name="exit_number">Numero uscita</string>
+    <string name="announce_when_exceeded">Annuncia quando si supera</string>
+    <string name="user_points">Punti utente</string>
+    <string name="output">Output</string>
+    <string name="map_quick_action_pattern">%1$s → …</string>
 </resources>

OsmAnd/res/values-iw/strings.xml

@@ -4056,13 +4056,17 @@
     <string name="customize_route_line">להתאים קו מסלול אישית</string>
     <string name="shared_string_route_line">קו מסלול</string>
     <string name="specify_color_for_map_mode">לציין צבע למצב מפה: %1$s.</string>
-    <string name="release_4_0_beta">• העדכונים החיים של OsmAnd הועברו אל „הורדות &gt; עדכונים”
+    <string name="release_4_0_beta">• נוספה אפשרות להוריד קווי מתאר ברגל
 \n
-\n • אפשר לצבוע מסלולים לפי גובה, מהירות או שיפוע.
+\n• תכנון מסלול אופקית: נוספו לשוניות למעבר בין נקודות לתרשימים
 \n
-\n • נוספה אפשרות לשנות את מראה קו מסלול הניווט
+\n• העדכונים החיים של OsmAnd הועברו אל „הורדות &gt; עדכונים”
 \n
-\n • החלונית „הקלטת מסלול” עודכנה
+\n• אפשר לצבוע מסלולים לפי גובה, מהירות או שיפוע.
+\n
+\n• נוספה אפשרות לשנות את מראה קו מסלול הניווט
+\n
+\n• החלונית „הקלטת מסלול” עודכנה
 \n
 \n</string>
     <string name="osmand_live">OsmAnd חי</string>
@@ -4083,4 +4087,12 @@
     <string name="troubleshooting_description">נא לעקוב אחר הקישור אם נתקלת בבעיות ברכישות.</string>
     <string name="no_purchases">אין לך רכישות</string>
     <string name="update_all_maps_added">לעדכן את כל המפות שנוספו אל %1$s\?</string>
+    <string name="exit_number">יציאה מספר</string>
+    <string name="announce_when_exceeded">להכריז בחריגה</string>
+    <string name="user_points">נקודות משתמש</string>
+    <string name="output">פלט</string>
+    <string name="shared_string_feet">רגל</string>
+    <string name="srtm_unit_format">תצורת יחידת קווי מתאר</string>
+    <string name="srtm_download_list_help_message">OsmAnd מספק נתוני קווי מתאר במטרים וברגל. יהיה עליך להוריד את הקובץ מחדש כדי לשנות את התצורה.</string>
+    <string name="srtm_download_single_help_message">נא לבחור את התצורה הרצויה. יהיה עליך להוריד את הקובץ מחדש כדי לשנות את התצורה.</string>
 </resources>

OsmAnd/res/values-ja/strings.xml

@@ -322,7 +322,7 @@ POIの更新は利用できません</string>
     <string name="select_index_file_to_download">何も見つかりませんでした。自分の地域が見つからない場合、
 自分で作ることができます。 http://osmand.net を参照してください。</string>
     <string name="fav_points_edited">お気に入り地点が編集されました</string>
-    <string name="fav_points_not_exist">お気に入り地点はありません</string>
+    <string name="fav_points_not_exist">お気に入りはありません</string>
     <string name="update_existing">登録済みと置き換え</string>
     <string name="only_show">表示のみ</string>
     <string name="follow">ナビゲーション開始</string>
@@ -996,7 +996,7 @@ POIの更新は利用できません</string>
     <string name="favourites_delete_multiple_succesful">お気に入り地点は正常に削除されました。</string>
     <string name="favorite_delete_multiple">%1$d個のお気に入りと、%2$d個のお気に入りグループを削除してもよろしいですか？</string>
     <string name="favorite_home_category">自宅</string>
-    <string name="favorite_friends_category">友人宅</string>
+    <string name="favorite_friends_category">友人</string>
     <string name="favorite_places_category">場所</string>
     <string name="shared_string_others">その他</string>
     <string name="shared_string_name">名前</string>
@@ -1173,7 +1173,7 @@ POIの更新は利用できません</string>
     <string name="save_as_favorites_points">お気に入りのグループとして保存</string>
     <string name="select_destination_and_intermediate_points">目的地の設定</string>
     <string name="layer_amenity_label">施設の名称</string>
-    <string name="loading_smth">ロード中 %1$s …</string>
+    <string name="loading_smth">%1$sをロード中…</string>
     <string name="map_widget_plain_time">現在時刻</string>
     <string name="shared_string_waypoint">経由地点</string>
     <string name="selected_gpx_info_show">"
@@ -1339,7 +1339,7 @@ POIの更新は利用できません</string>
     <string name="speed_limit_exceed_message">制限速度超過による警告音声の許容値を選択します</string>
     <string name="fav_point_emoticons_message">絵文字を含んだその名前は、ファイル保存時に『%1$s』という名前に変更されました。</string>
     <string name="print_route">経路印刷</string>
-    <string name="fav_point_dublicate">お気に入り地点名の重複</string>
+    <string name="fav_point_dublicate">指定したお気に入り名は重複しています</string>
     <string name="fav_point_dublicate_message">そのお気に入りは、重複を避けるために%1$sという名前に変更されました。</string>
     <string name="text_size_descr">マップ上の文字サイズを設定します。</string>
     <string name="text_size">文字サイズ</string>
@@ -1446,7 +1446,7 @@ POIの更新は利用できません</string>
     <string name="routing_settings_2">ナビゲーション設定</string>
     <string name="general_settings_2">全般設定</string>
     <string name="shared_string_ellipsis">…</string>
-    <string name="shared_string_enable">有効</string>
+    <string name="shared_string_enable">有効化</string>
     <string name="shared_string_disable">無効化</string>
     <string name="shared_string_selected">選択済み</string>
     <string name="shared_string_deselect">選択解除</string>
@@ -2818,9 +2818,9 @@ POIの更新は利用できません</string>
     <string name="osm_live_subscriptions">サブスクリプション</string>
     <string name="powered_by_osmand">By OsmAnd</string>
     <string name="osm_live_plan_pricing">プランと料金</string>
-    <string name="osm_live_payment_monthly_title">月間</string>
+    <string name="osm_live_payment_monthly_title">月毎</string>
     <string name="osm_live_payment_3_months_title">3ヶ月毎</string>
-    <string name="osm_live_payment_annual_title">年間</string>
+    <string name="osm_live_payment_annual_title">年毎</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / 月</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / 月</string>
     <string name="osm_live_payment_discount_descr">%1$s割引</string>
@@ -3172,7 +3172,7 @@ POIの更新は利用できません</string>
     <string name="app_mode_utv">横並び(サイドバイサイド)形式</string>
     <string name="rendering_attr_piste_difficulty_aerialway_name">索道(リフトやロープウェイなど)</string>
     <string name="rendering_attr_piste_difficulty_connection_name">リフト間接続</string>
-    <string name="shared_string_calculate">計算</string>
+    <string name="shared_string_calculate">計算する</string>
     <string name="shared_string_osmand_usage">OsmAndの合計使用容量</string>
     <string name="shared_sting_tiles">タイル</string>
     <string name="shared_string_maps">マップ</string>
@@ -3703,9 +3703,9 @@ POIの更新は利用できません</string>
 \n
 \n国の法律に基づいて、使用を望むかどうかを決定する必要があります。
 \n
-\n%1$sを選択すると、スピードカメラに関するアラートと警告機能を使用できます。
+\n『%1$s』を選択すると、スピードカメラに関するアラートと警告機能を使用できます。
 \n
-\n%2$sを選択すると、スピードカメラに関するすべてのデータ(警告、通知、POI)が、OsmAndの再インストールを行うまで削除されます。</string>
+\n『%2$s』を選択すると、スピードカメラに関するすべてのデータ(警告、通知、POI)が、OsmAndの再インストールを行うまで削除されます。</string>
     <string name="keep_active">機能を維持</string>
     <string name="shared_string_uninstall">アンインストール</string>
     <string name="speed_cameras_alert">一部の国では、スピードカメラの事前警告は法律で禁止されています。</string>
@@ -3843,7 +3843,7 @@ POIの更新は利用できません</string>
     <string name="subscription_expired_title">OsmAndLiveサブスクリプションの有効期限が切れました</string>
     <string name="subscription_paused_title">OsmAndLiveサブスクリプションが一時停止されました</string>
     <string name="subscription_on_hold_title">OsmAndLiveサブスクリプションは保留中です</string>
-    <string name="markers_history">マーカーの履歴</string>
+    <string name="markers_history">マーカー履歴</string>
     <string name="send_files_to_openstreetmap">GPXファイルをOpenStreetMapに送信</string>
     <string name="enter_text_separated">タグはカンマで区切って入力してください。</string>
     <string name="gpx_upload_public_visibility_descr">\"公開 \"状態は、追跡機能にてユーザーのGPS追跡、公開GPS追跡リスト、および生データのタイムスタンプ付き公開追跡リストに公開されることを意味します。APIを介して提供されるデータはユーザーの追跡ページを参照しません。追跡ポイントのタイムスタンプはパブリックGPS APIでは利用できず、また追跡ポイントは時系列に並んでいません。</string>
@@ -4078,4 +4078,26 @@ POIの更新は利用できません</string>
     <string name="app_mode_wheelchair_forward">基本前進のみの車椅子</string>
     <string name="track_coloring_solid">通常色</string>
     <string name="in_case_of_reverse_direction">逆方向の場合</string>
+    <string name="no_purchases">購入済みの品目はありません</string>
+    <string name="new_device_account">新しい端末 / 新規アカウント</string>
+    <string name="contact_support_description">ご不明な点がございましたら、%1$sまでお問い合わせください。</string>
+    <string name="empty_purchases_description">購入した品目がここに表示されない場合は、\"%1$s\"をタップするか、サポートチームにお問い合わせください。</string>
+    <string name="contact_support">サポート問い合わせ先</string>
+    <string name="troubleshooting">トラブルシューティング</string>
+    <string name="troubleshooting_description">購入に関して問題が発生した場合は、このリンクを参照してください。</string>
+    <string name="osmand_live">OsmAnd Live</string>
+    <string name="next_billing_date">次回請求日: %1$s</string>
+    <string name="osmand_live_cancelled">キャンセル済み</string>
+    <string name="in_grace_period">猶予期間中</string>
+    <string name="on_hold">保留中</string>
+    <string name="expired">期限切れ</string>
+    <string name="update_all_maps_added">%1$sに追加された全マップを更新しますか？</string>
+    <string name="user_points">ユーザーポイント</string>
+    <string name="exit_number">出口番号</string>
+    <string name="announce_when_exceeded">超過した場合の通知</string>
+    <string name="output">出力</string>
+    <string name="annual_subscription">年毎のサブスクリプション</string>
+    <string name="monthly_subscription">月毎のサブスクリプション</string>
+    <string name="three_months_subscription">3ヶ月毎のサブスクリプション</string>
+    <string name="renew_subscription">サブスクリプションの更新</string>
 </resources>

OsmAnd/res/values-lv/strings.xml

@@ -1802,7 +1802,7 @@ failu(s)?
     <string name="first_usage_item">Sākt lietot</string>
     <string name="first_usage_item_description">Kā lejupielādēt kartes un pamatiestatījumu lietošana</string>
     <string name="navigation_item_description">Navigācija</string>
-    <string name="planning_trip_item">Ceļa plānošana</string>
+    <string name="planning_trip_item">Ceļojuma plānošana</string>
     <string name="faq_item">BUJ</string>
     <string name="faq_item_description">Biežāk uzdotie jautājumi</string>
     <string name="map_viewing_item">Kartes skatīšana</string>
@@ -2162,7 +2162,6 @@ Apraksta laukumu: %1$s x %2$s</string>
     <string name="shared_string_time">Laiks</string>
     <string name="total_distance">Maršruta garums</string>
     <string name="routing_attr_height_obstacles_name">Lietot elevācijas datus</string>
-
     <string name="relief_smoothness_factor_descr">Ieteicamais reljefs: līdzens vai kalnains.</string>
     <string name="shared_string_slope">Slīpums</string>
     <string name="lang_ber">Berberu</string>
@@ -2415,7 +2414,7 @@ No Afganistānas līdz Zimbabvei, no Austrālijas līdz ASV, Argentīna, Brazīl
     <string name="show_map">Rādīt karti</string>
     <string name="route_is_calculated">Maršruts aprēķināts</string>
     <string name="round_trip">Turp un atpakaļ</string>
-    <string name="plan_route_no_markers_toast">Jums vajag pievienot vismaz vienu marķieri, lai lietotu šo funkciju.</string>
+    <string name="plan_route_no_markers_toast">Lai lietotu šo funkciju, vajag pievienot vismaz vienu marķieri.</string>
     <string name="osn_modify_dialog_error">Piezīmei nevarēja veikt izmaiņas</string>
     <string name="osn_modify_dialog_title">Labot piezīmi</string>
     <string name="context_menu_item_modify_note">!abot OSM piezīmi</string>
@@ -2429,7 +2428,7 @@ No Afganistānas līdz Zimbabvei, no Austrālijas līdz ASV, Argentīna, Brazīl
     <string name="routing_attr_avoid_ice_roads_fords_name">No ledus ceļiem un brasla</string>
     <string name="routing_attr_avoid_ice_roads_fords_description">Izvairīties no ledus ceļiem un brasliem.</string>
     <string name="use_location">Lietot pozīciju</string>
-    <string name="add_location_as_first_point_descr">Pievienot jūsu atrašanās vietu kā sākuma punktu maršrutam.</string>
+    <string name="add_location_as_first_point_descr">Pievienot patreizējo atrašanās vietu kā sākuma punktu ideālā maršruta izveidei.</string>
     <string name="my_location">Mana pozīcija</string>
     <string name="shared_string_finish">Finišs</string>
     <string name="plan_route">Plānot maršrutu</string>
@@ -3333,4 +3332,19 @@ No Afganistānas līdz Zimbabvei, no Austrālijas līdz ASV, Argentīna, Brazīl
     <string name="select_items_for_import">Izvēlieties lietas, ko importēt.</string>
     <string name="use_dev_url_descr">Lietot dev.openstreetmap.org nevis openstreetmap.org OSM piezīmju/ POI / GPX augšuielādei un testēšanai.</string>
     <string name="use_dev_url">Lietot dev.openstreetmap.org</string>
+    <string name="plan_a_route">Plānot maršrutu</string>
+    <string name="plan_route_last_edited">Pēdējo reizi labots</string>
+    <string name="plan_route_import_track">Importēt treku</string>
+    <string name="plan_route_open_existing_track">Atvērt saglabāto treku</string>
+    <string name="plan_route_create_new_route">Veidot jaunu maršrutu</string>
+    <string name="plan_route_select_track_file_for_open">Izvēlieties treka failu atvēršanai.</string>
+    <string name="plan_route_exit_dialog_descr">Vai tiešām gribat atmest visas izmaiņas ieplānotajā maršrutā\?</string>
+    <string name="plan_route_trim_before">Griezt pirms</string>
+    <string name="plan_route_trim_after">Griezt pēc</string>
+    <string name="plan_route_change_route_type_before">Mainīt maršruta veidu pirms</string>
+    <string name="plan_route_change_route_type_after">Mainīt maršruta veidu pēc</string>
+    <string name="plan_route_join_segments">Pievienot segmentus</string>
+    <string name="plan_route_split_before">Sadalīt pirms</string>
+    <string name="plan_route_split_after">Sadalīt pēc</string>
+    <string name="plan_route_add_new_segment">Pievienot jaunu segmentu</string>
 </resources>

OsmAnd/res/values-pl/strings.xml

@@ -1303,7 +1303,7 @@
     <string name="shared_string_all">Wszystkie</string>
     <string name="shared_string_waypoints">Punkty trasy</string>
     <string name="way_alarms">Ostrzeżenia ruchu drogowego</string>
-    <string name="speak_favorites">Najbliższe ulubione miejsca</string>
+    <string name="speak_favorites">Ulubione w pobliżu</string>
     <string name="speak_poi">Pobliskie użyteczne miejsca</string>
     <string name="save_track_to_gpx_globally_descr">Ogólne rejestrowanie pozycji do pliku GPX można włączyć lub wyłączyć za pomocą widgetu rejestrowania GPX na mapie.</string>
     <string name="save_track_interval_globally">Częstość rejestrowania</string>
@@ -3738,7 +3738,7 @@
     <string name="layer_gpx_layer">Ślady</string>
     <string name="monitoring_control_start">REC</string>
     <string name="save_track_to_gpx_globally">Rejestrowanie śladu do pliku GPX</string>
-    <string name="shared_string_gpx_route">Trasa szlaku</string>
+    <string name="shared_string_gpx_route">Śledź trasę</string>
     <string name="empty_state_my_tracks">Dodaj pliki śladów</string>
     <string name="empty_state_my_tracks_desc">Importowanie lub rejestrowanie plików śladu</string>
     <string name="context_menu_item_add_waypoint">Dodaj punkt trasy</string>
@@ -3989,7 +3989,7 @@
     <string name="login_open_place_reviews">Zaloguj się do OpenPlaceReviews</string>
     <string name="activity_type_water_name">Woda</string>
     <string name="activity_type_winter_name">Zima</string>
-    <string name="activity_type_snowmobile_name">Skuter</string>
+    <string name="activity_type_snowmobile_name">Skuter śnieżny</string>
     <string name="activity_type_riding_name">Jazda konna</string>
     <string name="activity_type_racing_name">Wyścigi</string>
     <string name="activity_type_mountainbike_name">Kolarstwo górskie</string>
@@ -4035,7 +4035,7 @@
     <string name="new_device_account">Nowe urządzenie / nowe konto</string>
     <string name="contact_support">Kontakt z pomocą techniczną</string>
     <string name="troubleshooting">Rozwiązywanie problemów</string>
-    <string name="troubleshooting_description">Jeśli masz jakiekolwiek problemy z zakupami, skorzystaj z tego linku.</string>
+    <string name="troubleshooting_description">Jeśli masz jakiekolwiek problemy z zakupami, kliknij ten link.</string>
     <string name="osmand_live">OsmAnd na żywo</string>
     <string name="annual_subscription">Roczna subskrypcja</string>
     <string name="monthly_subscription">Subskrypcja miesięczna</string>
@@ -4044,4 +4044,43 @@
     <string name="osmand_live_cancelled">Anulowano</string>
     <string name="renew_subscription">Odnów subskrypcję</string>
     <string name="update_all_maps_added">Zaktualizować wszystkie mapy dodane do %1$s\?</string>
+    <string name="routing_attr_height_obstacles_description">Trasa mogłaby unikać silnych podjazdów.</string>
+    <string name="select_another_colorization">Proszę wybrać inny typ barwy.</string>
+    <string name="shared_string_interval">Interwał</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Naturalne granice</string>
+    <string name="track_has_no_altitude">Ślady nie zawierają danych o wysokości.</string>
+    <string name="track_has_no_speed">Ślady nie zawierają informacji o prędkości.</string>
+    <string name="trip_recording_logging_interval_info">Interwały logowania ustala okres czasu, w któtym OsmAnd będzie prosił o dane obecnej lokalizacji pozycji.</string>
+    <string name="show_start_dialog">Pokaż okno rozpocznij</string>
+    <string name="trip_recording_show_start_dialog_setting">Gdy wyłączone, nagrywanie rozpocznie się niezwłocznie po naciśnięciu w widżet lub w menu, pomijając okno potwierdzenia.</string>
+    <string name="customize_route_line">Zmień trasę nawigacji</string>
+    <string name="shared_string_route_line">Trasa nawigacji</string>
+    <string name="expired">Wygasł</string>
+    <string name="release_4_0_beta">• Aktualizacje OsmAnd Live przeniesiono do \"Pobrane &gt; Aktualizacje\"
+\n
+\n •Ślady mogą być pokolorowane względem wysokości, prędkości, wzniesień.
+\n
+\n • Dodano opcję zmiany wyglądu trasy nawigacji
+\n
+\n • Zaktualizowano okno \"Nagrywanie Trasy\"
+\n
+\n</string>
+    <string name="map_quick_action_pattern">%1$s → …</string>
+    <string name="edit_online_routing_engine">Edytuj silnik routingu online</string>
+    <string name="select_segments_description">%1$s zawiera więcej niż jeden segment, musisz wybrać wymagany element nawigacji.</string>
+    <string name="segments_count">Segment %1$d</string>
+    <string name="track_recording_save_and_stop">Zapisz i zatrzymaj nagrywanie</string>
+    <string name="track_recording_title">Zapis ścieżki zatrzymany</string>
+    <string name="track_recording_description">Czy na pewno chcesz zakończyć nagrywanie\?
+\nWszystkie niezapisane dane zostaną utracone.</string>
+    <string name="on_pause">Pauza</string>
+    <string name="map_widget_distance_by_tap">Odległość po dotknięciu</string>
+    <string name="track_recording_will_be_continued">Nagrywanie będzie kontynuowane.</string>
+    <string name="route_line_use_map_style_appearance">Linia trasy będzie używana %1$s określona w wybranym stylu mapy: %2$s.</string>
+    <string name="in_grace_period">W okresie karencji</string>
+    <string name="on_hold">Wstrzymane</string>
+    <string name="exit_number">Numer wyjścia</string>
+    <string name="announce_when_exceeded">Ogłoś, gdy zostanie przekroczony</string>
+    <string name="user_points">Punkty użytkownika</string>
+    <string name="output">Wyjście</string>
 </resources>

OsmAnd/res/values-pt-rBR/phrases.xml

@@ -3895,4 +3895,37 @@
     <string name="poi_local_ref">Geodesia</string>
     <string name="poi_geodesist">Geodesia</string>
     <string name="poi_camp_pitch">Campo de acampamento</string>
+    <string name="poi_horseshoes">Ferradura</string>
+    <string name="poi_fencing">Esgrima</string>
+    <string name="poi_crossfit">Crossfit</string>
+    <string name="poi_cockfighting">Luta de galos</string>
+    <string name="poi_bullfighting">Tourada</string>
+    <string name="poi_bobsleigh">Bobsleigh</string>
+    <string name="poi_weightlifting">Halterofilismo</string>
+    <string name="poi_wakeboarding">Wakeboarding</string>
+    <string name="poi_biathlon">Biatlo</string>
+    <string name="poi_aikido">Aikido</string>
+    <string name="poi_water_ski">Polo aquático</string>
+    <string name="poi_water_polo">Polo aquático</string>
+    <string name="poi_wrestling">Luta profissional</string>
+    <string name="poi_taekwondo">Taekwondo</string>
+    <string name="poi_table_soccer">Futebol de mesa</string>
+    <string name="poi_sumo">Sumo</string>
+    <string name="poi_speedway">Pista de corrida</string>
+    <string name="poi_snooker">Snooker</string>
+    <string name="poi_shot_put">Arremesso de peso</string>
+    <string name="poi_pilates">Pilates</string>
+    <string name="poi_jiu_jitsu">Jiu-jitsu</string>
+    <string name="poi_karate">Karatê</string>
+    <string name="poi_hoops">Aros</string>
+    <string name="poi_club_social">Clube social</string>
+    <string name="poi_plateau">Planalto</string>
+    <string name="poi_office_diplomatic">Escritório diplomático</string>
+    <string name="poi_kickboxing">Kickboxe</string>
+    <string name="poi_cycle_polo">Polo de bicicleta</string>
+    <string name="poi_curling">Curling</string>
+    <string name="poi_cliff_diving">Mergulho de falésia</string>
+    <string name="poi_zurkhaneh_sport">Zurkhaneh</string>
+    <string name="poi_bay_filter">Tipo de baía</string>
+    <string name="poi_ultimate">Ultimate</string>
 </resources>

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

@@ -3758,7 +3758,7 @@
     <string name="shared_string_file_name">Nome do arquivo</string>
     <string name="number_of_gpx_files_selected_pattern">%s arquivos de trilha selecionados</string>
     <string name="disable_recording_once_app_killed_descrp">O registro de trilhas fará uma pausa quando o aplicativo for encerrado (por meio de aplicativos recentes). (A indicação de segundo plano do OsmAnd desaparece da barra de notificação do Android.)</string>
-    <string name="save_global_track_interval_descr">Especifique o intervalo de registro para a gravação geral da trilha (ligado por meio do widget de \'gravação de viagem\' no mapa).</string>
+    <string name="save_global_track_interval_descr">Especifique o intervalo de registro para o registro geral da trilha (ativado por meio do widget de \'gravação de viagem\' no mapa).</string>
     <string name="gpx_monitoring_stop">Pausar gravação de viagem</string>
     <string name="gpx_monitoring_start">Retomar a gravação da viagem</string>
     <string name="system_default_theme">Padrão do sistema</string>
@@ -4049,9 +4049,13 @@
     <string name="shared_string_route_line">Linha de rota</string>
     <string name="route_line_use_map_style_appearance">A linha de rota seria usada %1$s especificado no estilo de mapa selecionado: %2$s.</string>
     <string name="specify_color_for_map_mode">Especifique a cor para o modo de mapa: %1$s.</string>
-    <string name="release_4_0_beta">"• As atualizações do OsmAnd Live foram movidas para \"Downloads &gt; Atualizações\"
+    <string name="release_4_0_beta">"• Adicionada opção para baixar curvas de nível em pés
 \n
-\n • As trilhas agora podem ser coloridas por altitude, velocidade ou inclinação.
+\n  • Plano de paisagem da rota: guias adicionadas para alternar entre pontos ou gráficos
+\n
+\n  • As atualizações do OsmAnd Live foram movidas para \"Downloads&gt; Atualizações\"
+\n
+\n  • As trilhas agora podem ser coloridas por altitude, velocidade ou inclinação.
 \n
 \n  • Adicionada opção para alterar a aparência da linha da rota de navegação
 \n
@@ -4064,7 +4068,7 @@
     <string name="empty_purchases_description">Se suas compras não aparecerem aqui, toque em \"%1$s\", ou entre em contato com nossa equipe de suporte.</string>
     <string name="contact_support">Contato com o suporte</string>
     <string name="troubleshooting">Solução de problemas</string>
-    <string name="troubleshooting_description">Por favor, siga este link se você tiver algum problema com compras.</string>
+    <string name="troubleshooting_description">Por favor, siga este link se tiver problemas com as compras.</string>
     <string name="osmand_live">OsmAnd Live</string>
     <string name="annual_subscription">Assinatura anual</string>
     <string name="monthly_subscription">Assinatura mensal</string>
@@ -4076,4 +4080,13 @@
     <string name="on_hold">Em espera</string>
     <string name="expired">Expirado</string>
     <string name="update_all_maps_added">Atualizar todos os mapas adicionados a %1$s\?</string>
+    <string name="exit_number">Número de saída</string>
+    <string name="announce_when_exceeded">Anunciar quando ultrapassado</string>
+    <string name="user_points">Pontos do usuário</string>
+    <string name="output">Saída</string>
+    <string name="map_quick_action_pattern">%1$s → …</string>
+    <string name="shared_string_feet">pés</string>
+    <string name="srtm_unit_format">Formato da unidade de curvas de nível</string>
+    <string name="srtm_download_list_help_message">OsmAnd fornece dados de linhas de contorno em metros e pés. Você precisará baixar novamente o arquivo para alterar o formato.</string>
+    <string name="srtm_download_single_help_message">Selecione o formato necessário. Você precisará baixar novamente o arquivo para alterar o formato.</string>
 </resources>

OsmAnd/res/values-ru/phrases.xml

@@ -3889,4 +3889,24 @@
     <string name="poi_wildlife_crossing_bat_tunnel">Туннель летучих мышей</string>
     <string name="poi_wildlife_crossing_bat_bridge">Мост летучих мышей</string>
     <string name="poi_conference_centre">Конференц-центр</string>
+    <string name="poi_kickboxing">Кикбоксинг</string>
+    <string name="poi_fencing">Фехтование</string>
+    <string name="poi_cycle_polo">Велосипедное поло</string>
+    <string name="poi_cockfighting">Петушиные бои</string>
+    <string name="poi_bullfighting">Коррида</string>
+    <string name="poi_bobsleigh">Бобслей</string>
+    <string name="poi_biathlon">Биатлон</string>
+    <string name="poi_aikido">Айкидо</string>
+    <string name="poi_water_ski">Водные лыжи</string>
+    <string name="poi_water_polo">Водное поло</string>
+    <string name="poi_wrestling">Борьба</string>
+    <string name="poi_weightlifting">Тяжёлая атлетика</string>
+    <string name="poi_taekwondo">Тхэквондо</string>
+    <string name="poi_table_soccer">Настольный футбол</string>
+    <string name="poi_sumo">Сумо</string>
+    <string name="poi_shot_put">Толкание ядра</string>
+    <string name="poi_pilates">Пилатес</string>
+    <string name="poi_karate">Каратэ</string>
+    <string name="poi_jiu_jitsu">Джиу-джитсу</string>
+    <string name="poi_mobile_library">Место остановки передвижной библиотеки</string>
 </resources>

OsmAnd/res/values-ru/strings.xml

@@ -141,8 +141,8 @@
     <string name="routing_attr_height_obstacles_name">Использовать данные о высотах</string>
     <string name="quick_action_duplicates">Действие переименовано в %1$s, чтобы избежать дублирования.</string>
     <string name="quick_action_duplicate">Обнаружен дубликат имени</string>
-    <string name="quick_action_showhide_favorites_descr">Переключатель, чтобы показать или скрыть избранные точки на карте.</string>
-    <string name="quick_action_showhide_poi_descr">Переключатель, чтобы показать или скрыть POI на карте.</string>
+    <string name="quick_action_showhide_favorites_descr">Переключатель для отображения или скрытия избранных точек на карте.</string>
+    <string name="quick_action_showhide_poi_descr">Переключатель для отображения или скрытия POI на карте.</string>
     <string name="quick_action_add_category">Категория</string>
     <string name="quick_action_add_create_items">Действия</string>
     <string name="quick_action_fav_name_descr">Если оставить это поле пустым, то оно будет автоматически заполнено адресом или названием места.</string>
@@ -234,9 +234,9 @@
     <string name="map_widget_magnetic_bearing">Магнитный пеленг</string>
     <string name="map_widget_bearing">Курсовой угол</string>
     <string name="map_mode">Режим карты</string>
-    <string name="rendering_value_thin_name">Тонко</string>
-    <string name="rendering_value_medium_name">Средне</string>
-    <string name="rendering_value_bold_name">Жирно</string>
+    <string name="rendering_value_thin_name">Тонкая</string>
+    <string name="rendering_value_medium_name">Средняя</string>
+    <string name="rendering_value_bold_name">Толстая</string>
     <string name="select_map_markers">Выберите маркеры</string>
     <string name="shared_string_topbar">Верхняя панель</string>
     <string name="osm_user_stat">Правок: %1$s, ранг: %2$s, всего правок: %3$s</string>
@@ -406,7 +406,7 @@
     <string name="live_monitoring_url">Web адрес онлайн-слежения</string>
     <string name="gpx_monitoring_disabled_warn">Записать трек можно с помощью виджета GPX или выбрав «Запись поездки» в настройках.</string>
     <string name="show_current_gpx_title">Показывать текущий путь</string>
-    <string name="free_version_message">Вы можете скачать или обновить карты %1$s.</string>
+    <string name="free_version_message">Вы можете скачать или обновить карт: %1$s шт.</string>
     <string name="free_version_title">Бесплатная версия</string>
     <string name="poi_context_menu_showdescription">Показать описание POI.</string>
     <string name="index_name_us">Северная Америка — США</string>
@@ -827,7 +827,7 @@
     <string name="osm_settings_descr">Укажите настройки для загрузки данных в Openstreetmap.org (OSM).</string>
     <string name="data_settings_descr">Настройка данных: язык, обновление данных.</string>
     <string name="data_settings">Данные</string>
-    <string name="osm_settings">Редактирование OSM</string>
+    <string name="osm_settings">Правки OSM</string>
     <string name="auto_zoom_map_descr">Масштабирование по скорости (при отображении позиции на карте).</string>
     <string name="auto_zoom_map">Автомасштаб</string>
     <string name="additional_settings">Дополнительные настройки</string>
@@ -1545,7 +1545,7 @@
     <string name="download_additional_maps">Скачать недостающие карты %1$s (%2$d МБ)\?</string>
     <string name="shared_string_waypoints">Путевые точки</string>
     <string name="way_alarms">Дорожные предупреждения</string>
-    <string name="speak_favorites">Мои места рядом</string>
+    <string name="speak_favorites">Ближайшие избранные</string>
     <string name="speak_poi">Ближайшие POI</string>
     <string name="index_tours">Туры</string>
     <string name="shared_string_all">Все</string>
@@ -2456,7 +2456,7 @@
     <string name="mark_passed">Отметить пройденным</string>
     <string name="import_track_desc">Файл %1$s не содержит путевых точек, импортировать его как трек?</string>
     <string name="add_track_to_markers_descr">Выберите трек, чтобы добавить в маркеры его точки.</string>
-    <string name="shared_string_gpx_waypoints">Трек путевых точек</string>
+    <string name="shared_string_gpx_waypoints">Путевые точки трека</string>
     <string name="shared_string_right">Направо</string>
     <string name="shared_string_left">Налево</string>
     <string name="show_number_pad">Показать цифровую панель</string>
@@ -2768,14 +2768,14 @@
     <string name="default_render_descr">Стиль общего назначения. Густонаселённые города показаны упрощённо. Выделяет контурные линии, маршруты, качество поверхности, ограничения доступа, дорожные щиты, визуализация пешеходных маршрутов по шкале SAC, объекты спортивных сплавов.</string>
     <string name="open_wikipedia_link_online">Открыть ссылку Википедии в онлайн</string>
     <string name="open_wikipedia_link_online_description">Ссылка будет открыта в веб-браузере.</string>
-    <string name="read_wikipedia_offline_description">Получите подписку на OsmAnd Live, чтобы читать статьи в Википедии и Викигиде в автономном режиме.</string>
+    <string name="read_wikipedia_offline_description">Подпишитесь на OsmAnd Live и читайте Википедию и Викигид в режиме офлайн.</string>
     <string name="how_to_open_link">Как открыть ссылку?</string>
     <string name="read_wikipedia_offline">Читать Википедию в автономном режиме</string>
     <string name="touring_view_render_descr">Туристический стиль с высоким контрастом и максимальной детализацией. Включает все функции стиля OsmAnd по умолчанию, отображая максимальное количество деталей, в частности дороги, тропы и другие пути передвижения. Чёткое различие между типами дорог (как в туристических атласах). Подходит для использования днём, ночью и при ярком освещении.</string>
     <string name="shared_string_bookmark">Сохранить</string>
     <string name="off_road_render_descr">Для езды по бездорожью, основано на топографическом стиле (англ. «Topo»), можно использовать с зелёными спутниковыми снимками в качестве подложки. Уменьшенная толщина основных дорог, увеличенная толщина путей, дорожек, велосипедных и других маршрутов.</string>
     <string name="unirs_render_descr">Модификация стиля по умолчанию для увеличения контраста пешеходных и велосипедных дорог. Использует старые цвета Mapnik.</string>
-    <string name="get_osmand_live">Получите OsmAnd Live, чтобы разблокировать все функции: ежедневные обновления карт с неограниченной загрузкой, все платные и бесплатные плагины, Википедия, Викигид и многое другое.</string>
+    <string name="get_osmand_live">Подпишитесь на OsmAnd Live и разблокируйте все функции: ежедневные обновления карт с неограниченной загрузкой, все платные и бесплатные плагины, Википедия, Викигид и многое другое.</string>
     <string name="access_intermediate_arrival_time">Промежуточное время прибытия</string>
     <string name="map_widget_intermediate_time">Прибытие в промежуточный пункт</string>
     <string name="quick_action_edit_actions">Редактировать действие</string>
@@ -2872,7 +2872,7 @@
     <string name="sit_on_the_stop">Посадка на остановке</string>
     <string name="use_osm_live_public_transport_description">Включить общественный транспорт с учётом автообновлений OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Общественный транспорт OsmAnd Live</string>
-    <string name="transfers_size">%1$d пересадки</string>
+    <string name="transfers_size">пересадки: %1$d</string>
     <string name="rendering_attr_surface_unpaved_name">Грунтовая</string>
     <string name="rendering_attr_surface_sand_name">Песок</string>
     <string name="rendering_attr_surface_grass_name">Трава</string>
@@ -3263,7 +3263,7 @@
     <string name="selected_profile">Выбранный профиль</string>
     <string name="personal_category_name">Персональный</string>
     <string name="shared_string_downloading_formatted">Скачивание %s</string>
-    <string name="rendering_value_thick_name">Толсто</string>
+    <string name="rendering_value_thick_name">Толстая</string>
     <string name="default_speed_dialog_msg">Используется для оценки времени прибытия для неизвестного типа дорог и ограничения скорости для всех дорог (может изменить маршрут)</string>
     <string name="routing_attr_allow_intermediate_name">Разрешить промежуточные маршруты</string>
     <string name="routing_attr_allow_advanced_name">Разрешить расширенные маршруты</string>
@@ -3302,7 +3302,7 @@
     <string name="rendering_attr_piste_difficulty_connection_name">Соединение</string>
     <string name="simulate_your_location_gpx_descr">Симулировать свою позицию используя записанный GPX трек.</string>
     <string name="route_start_point">Начало маршрута</string>
-    <string name="shared_string_revert">Вернуться</string>
+    <string name="shared_string_revert">Сброс</string>
     <string name="suggested_maps_descr">Эти карты необходимо использовать с плагином.</string>
     <string name="added_profiles">Добавленные профили</string>
     <string name="added_profiles_descr">Профили, добавленные плагином</string>
@@ -3480,7 +3480,7 @@
     <string name="select_shape">Выберите форму</string>
     <string name="shared_string_circle">Круг</string>
     <string name="shared_string_octagon">Восьмиугольник</string>
-    <string name="accessibility_announce">Сообщение о доступности</string>
+    <string name="accessibility_announce">Объявлять</string>
     <string name="monitoring_min_speed_descr_remark">Примечание: проверка скорости &gt; 0: большинство модулей GPS сообщают значение скорости только в том случае, если алгоритм определяет, что вы движетесь, и ничего, если вы не перемещаетесь. Следовательно, использование параметра &gt; 0 в этом фильтре в некотором смысле приводит к обнаружению факта перемещения модуля GPS. Но даже если мы не производим данную фильтрацию во время записи, то всё равно эта функция используется при анализе GPX для определения скорректированного расстояния, то есть значение, отображаемое в этом поле, является расстоянием, записанным во время движения.</string>
     <string name="multimedia_rec_split_title">Разделение записи</string>
     <string name="live_monitoring_adress_descr">Укажите веб-адрес со следующими параметрами: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
@@ -3502,14 +3502,14 @@
     <string name="shared_string_language">Язык</string>
     <string name="shared_string_all_languages">Все языки</string>
     <string name="wiki_menu_download_descr">Для просмотра POI Википедии на карте необходимы дополнительные карты.</string>
-    <string name="ui_customization_description">Настройка элементов в разделах «Панель», «Настройка карты» и контекстном меню.
+    <string name="ui_customization_description">Настройка элементов в разделах «Боковая панель», «Настройки карты» и «Действия контекстного меню».
 \n
 \nОтключите неиспользуемые плагины, чтобы скрыть их элементы управления. %1$s.</string>
     <string name="ui_customization_short_descr">Элементы панели, контекстное меню</string>
     <string name="shared_string_drawer">Боковое меню</string>
     <string name="divider_descr">Элементы ниже разделённые делителем.</string>
     <string name="shared_string_items">Элементы</string>
-    <string name="ui_customization">Настройка интерфейса</string>
+    <string name="ui_customization">Настройки интерфейса</string>
     <string name="context_menu_actions">Действия контекстного меню</string>
     <string name="reorder_or_hide_from">Изменить порядок или скрыть элементы из %1$s.</string>
     <string name="shared_string_divider">Разделитель</string>
@@ -3607,7 +3607,7 @@
     <string name="unsupported_type_error">Неподдерживаемый тип</string>
     <string name="gpx_parse_error">OsmAnd сформировал GPX не совсем правильно, пожалуйста, свяжитесь со службой поддержки для выяснения причин.</string>
     <string name="turn_screen_on_navigation_instructions_descr">Каждая навигационная инструкция включает экран.</string>
-    <string name="turn_screen_on_navigation_instructions">Инструкции по навигации</string>
+    <string name="turn_screen_on_navigation_instructions">Навигационные инструкции</string>
     <string name="screen_timeout_descr">Если функция «%1$s» включена, время работы будет зависеть от неё.</string>
     <string name="turn_screen_on_wake_time_descr">Время работы экрана после включения. («%1$s» отключает выключение экрана.)</string>
     <string name="turn_screen_on_power_button_descr">Нажатие кнопки питания устройства включит экран с OsmAnd на переднем плане экрана блокировки.</string>
@@ -3660,7 +3660,7 @@
     <string name="vessel_height_warning">Вы можете указать высоту судна, чтобы избегать низких мостов. Имейте в виду, что если мост раздвижной, будет использована его высота в открытом состоянии.</string>
     <string name="vessel_height_limit_description">Укажите высоту судна, чтобы избежать низких мостов. Имейте в виду, что если мост раздвижной, будет использована его высота в открытом состоянии.</string>
     <string name="vessel_width_limit_description">Укажите ширину судна, чтобы избежать узких мостов</string>
-    <string name="quick_action_showhide_mapillary_descr">Переключатель, чтобы показать или скрыть слой Mapillary на карте.</string>
+    <string name="quick_action_showhide_mapillary_descr">Переключатель для отображения или скрытия слоя Mapillary на карте.</string>
     <string name="shared_string_legal">Законодательство</string>
     <string name="speed_cameras_legal_descr">В некоторых странах и регионах использование предупреждений о камерах контроля скорости запрещено законом. 
 \n 
@@ -3702,10 +3702,10 @@
     <string name="plan_a_route">Составление маршрута</string>
     <string name="gpx_split_interval_none_descr">Выберите способ разбиения: по времени или по расстоянию.</string>
     <string name="gpx_split_interval_descr">Интервал между метками расстояния или времени на треке.</string>
-    <string name="shared_string_custom">Своё</string>
+    <string name="shared_string_custom">Своё знач.</string>
     <string name="add_hidden_group_info">Добавленная точка не будет видна на карте, так как выбранная группа скрыта, найти её можно в «%s».</string>
     <string name="track_show_start_finish_icons">Показывать значки старта и финиша</string>
-    <string name="select_track_width">Выберите ширину</string>
+    <string name="select_track_width">Выберите толщину линии</string>
     <string name="gpx_direction_arrows">Стрелки направления</string>
     <string name="track_coloring_solid">Сплошной</string>
     <string name="plan_route_last_edited">Последнее изменение</string>
@@ -3879,7 +3879,7 @@
     <string name="select_items_for_import">Выберите импортируемые элементы.</string>
     <string name="use_dev_url">Использовать dev.openstreetmap.org</string>
     <string name="osm_login_descr">Можно войти в систему с помощью безопасного метода OAuth или используя свои имя пользователя и пароль.</string>
-    <string name="subscription_payment_issue_title">Нажмите кнопку, чтобы перейти к настройкам подписки Google Play и исправить способ оплаты.</string>
+    <string name="subscription_payment_issue_title">Нажмите кнопку, чтобы перейти к настройкам подписки Google Play и исправить вашу подписку.</string>
     <string name="osm_edit_comment_note">Комментировать заметку OSM</string>
     <string name="use_dev_url_descr">Переключиться на использование dev.openstreetmap.org вместо openstreetmap.org для тестирования отправки заметок OSM / POI / GPX.</string>
     <string name="register_on_openplacereviews_desc">Фотографии предоставлены проектом открытых данных OpenPlaceReviews.org. Чтобы отправить свои фотографии, необходимо зарегистрироваться на этом сайте.</string>
@@ -4056,7 +4056,11 @@
     <string name="next_billing_date">Следующая дата оплаты: %1$s</string>
     <string name="osmand_live">OsmAnd Live</string>
     <string name="annual_subscription">Годовая подписка</string>
-    <string name="release_4_0_beta">• Обновления OsmAnd Live перемещены в «Загрузка карт» → «Обновления».
+    <string name="release_4_0_beta">• Добавлена возможность скачать контурные линии в футах.
+\n
+\n• Планирование маршрута: добавлены вкладки для переключения между точками и графиками.
+\n
+\n• Обновления OsmAnd Live перемещены в «Загрузка карт» → «Обновления».
 \n
 \n• Теперь треки можно раскрашивать по высоте, скорости или уклону.
 \n
@@ -4065,4 +4069,30 @@
 \n• Обновлен диалог «Запись поездки».
 \n
 \n</string>
+    <string name="empty_purchases_description">Если ваши покупки не отображаются здесь, нажмите на \"%1$s\" или свяжитесь с нашей службой поддержки.</string>
+    <string name="contact_support">Служба поддержки</string>
+    <string name="troubleshooting">Устранение неполадок</string>
+    <string name="troubleshooting_description">Перейдите по этой ссылке, если у вас есть какие-либо проблемы с покупками.</string>
+    <string name="osmand_live_cancelled">Отменено</string>
+    <string name="update_all_maps_added">Обновить все карты, добавленные в %1$s\?</string>
+    <string name="customize_route_line">Настройка линии маршрута</string>
+    <string name="shared_string_route_line">Линия маршрута</string>
+    <string name="route_line_use_map_style_appearance">Линия маршрута будет использовать %1$s из выбранного стиля карты: %2$s.</string>
+    <string name="specify_color_for_map_mode">Укажите цвет для режима карты: %1$s.</string>
+    <string name="no_purchases">У вас нет покупок</string>
+    <string name="new_device_account">Новое устройство / новый аккаунт</string>
+    <string name="contact_support_description">Если у вас есть вопросы, свяжитесь с нами: %1$s.</string>
+    <string name="in_grace_period">В льготный период</string>
+    <string name="expired">Срок истёк</string>
+    <string name="on_hold">Приостановлено</string>
+    <string name="renew_subscription">Продление подписки</string>
+    <string name="announce_when_exceeded">Объявлять о превышении</string>
+    <string name="user_points">Точки пользователя</string>
+    <string name="output">Вывод</string>
+    <string name="map_quick_action_pattern">%1$s → …</string>
+    <string name="exit_number">Номер съезда</string>
+    <string name="srtm_unit_format">Формат единиц на контурных линиях</string>
+    <string name="srtm_download_single_help_message">Выберите необходимый формат. Для изменения формата потребуется повторно загрузить файл.</string>
+    <string name="shared_string_feet">футы</string>
+    <string name="srtm_download_list_help_message">OsmAnd предоставляет данные изолиний в метрах и футах. Вам нужно будет повторно загрузить файл, чтобы изменить формат.</string>
 </resources>

OsmAnd/res/values-sc/phrases.xml

@@ -3894,4 +3894,38 @@
     <string name="poi_local_ref">Riferimentu locale</string>
     <string name="poi_geodesist">Geodesista</string>
     <string name="poi_conference_centre">Tzentru pro cunferèntzias</string>
+    <string name="poi_wakeboarding">Wakeboard</string>
+    <string name="poi_ultimate">Ultimate</string>
+    <string name="poi_speedway">Pista pro mototziclismu</string>
+    <string name="poi_horseshoes">Tiru de ferros de caddu</string>
+    <string name="poi_cycle_polo">Polo in bitzicleta</string>
+    <string name="poi_curling">Curling</string>
+    <string name="poi_crossfit">Crossfit</string>
+    <string name="poi_cockfighting">Lutas de puddos</string>
+    <string name="poi_cliff_diving">Imbèrghidas dae sos iscameddos</string>
+    <string name="poi_bobsleigh">Bob</string>
+    <string name="poi_biathlon">Biathlon</string>
+    <string name="poi_water_ski">Iscì de abba</string>
+    <string name="poi_water_polo">Polo de abba</string>
+    <string name="poi_zurkhaneh_sport">Zurkhaneh</string>
+    <string name="poi_wrestling">Luta</string>
+    <string name="poi_weightlifting">Artziada de pesos</string>
+    <string name="poi_office_diplomatic">Ufìtziu diplomàticu</string>
+    <string name="poi_kickboxing">Kickboxing</string>
+    <string name="poi_fencing">Ischerma</string>
+    <string name="poi_bullfighting">Corrida</string>
+    <string name="poi_aikido">Aikido</string>
+    <string name="poi_taekwondo">Taekwondo</string>
+    <string name="poi_table_soccer">Biliardinu</string>
+    <string name="poi_sumo">Sumo</string>
+    <string name="poi_snooker">Snooker</string>
+    <string name="poi_shot_put">Tiru de su pesu</string>
+    <string name="poi_pilates">Pilates</string>
+    <string name="poi_jiu_jitsu">Jiu-jitsu</string>
+    <string name="poi_karate">Karatè</string>
+    <string name="poi_hoops">Canisteddos</string>
+    <string name="poi_camp_pitch">Pratzola de acampamentu</string>
+    <string name="poi_bay_filter">Casta de baia</string>
+    <string name="poi_club_social">Tzìrculu sotziale</string>
+    <string name="poi_plateau">Artipranu</string>
 </resources>

OsmAnd/res/values-sc/strings.xml

@@ -1769,7 +1769,7 @@
     <string name="shared_string_commit">Imbia</string>
     <string name="osm_edit_modified_poi">PDI OSM modificadu</string>
     <string name="osm_edit_deleted_poi">PDI OSM iscantzelladu</string>
-    <string name="copied_to_clipboard">Copiadu in sos apuntos</string>
+    <string name="copied_to_clipboard">Copiadu in punta de billete</string>
     <string name="osm_save_offline">Sarva in sa memòria (impreu chene lìnia)</string>
     <string name="rendering_attr_currentTrackColor_description">Colore GPX</string>
     <string name="rendering_attr_currentTrackWidth_description">Largària GPX</string>
@@ -4046,4 +4046,41 @@
     <string name="lost_data_warning">Totu sos datos non sarvados s\'ant a pèrdere.</string>
     <string name="show_start_dialog">Ammustra su diàlogu de incumintzu</string>
     <string name="specify_color_for_map_mode">Dislinda unu colore pro sa modalidade pro sa mapa: %1$s.</string>
+    <string name="release_4_0_beta">• Agiornamentos de OsmAnd Live (OSmAnd in direta) tramudados cara a \"Iscarrigamentos &gt; Agiornamentos\"
+\n
+\n • Sas rastas como si podent colorizare pro artària, lestresa, o pendèntzia.
+\n
+\n • Annanghidura de s\'optzione pro mudare s\'aparèntzia de sa lìnia de navigatzione de s\'àndala
+\n
+\n • Agiornamentu de sa ventanedda de diàlogu \"Registratzione de su biàgiu\"
+\n
+\n</string>
+    <string name="in_grace_period">In perìodu de gràtzia</string>
+    <string name="osmand_live">OsmAnd in direta</string>
+    <string name="app_mode_gap">Divàriu</string>
+    <string name="trip_recording_logging_interval_info">S\'intervallu de registratzione impostat sa frecuèntzia cun sa cale OsmAnd at a pedire sos datos de sa positzione atuale.</string>
+    <string name="trip_recording_show_start_dialog_setting">Si est disabilitadu sa registratzione at a incumintzare a pustis de su tocu in subra de su widget o de s\'elementu de su menù, brinchende sa ventanedda de diàlogu de cunfirma.</string>
+    <string name="customize_route_line">Personaliza sa lìnia de s\'àndala</string>
+    <string name="shared_string_route_line">Lìnia de s\'àndala</string>
+    <string name="route_line_use_map_style_appearance">Pro sa lìnia de s\'àndala s\'at a impreare su %1$s dislindadu in s\'istile de sa mapa ischertadu: %2$s.</string>
+    <string name="no_purchases">Non tenes còmpora peruna</string>
+    <string name="new_device_account">Dispositivu nou / contu nou</string>
+    <string name="contact_support_description">Si tenes preguntas cuntata·nos a su %1$s.</string>
+    <string name="empty_purchases_description">Si sa còmpora tua non benit ammustrada inoghe toca in “%1$s” o cuntata su grupu de suportu nostru.</string>
+    <string name="contact_support">Cuntata su suportu</string>
+    <string name="troubleshooting">Risolutzione de problemas</string>
+    <string name="troubleshooting_description">Si tenes problemas cun sa còmpora sighi custu ligàmene, pro praghere.</string>
+    <string name="annual_subscription">Abbonamentu annuale</string>
+    <string name="monthly_subscription">Abbonamentu mensile</string>
+    <string name="three_months_subscription">Abbonamentu trimestrale</string>
+    <string name="next_billing_date">Data de addèbitu imbeniente: %1$s</string>
+    <string name="osmand_live_cancelled">Annulladu</string>
+    <string name="renew_subscription">Rinnova s\'abbonamentu</string>
+    <string name="on_hold">In isetu</string>
+    <string name="expired">Iscadidu</string>
+    <string name="update_all_maps_added">Agiornare totu sas mapas annànghidas a %1$s\?</string>
+    <string name="exit_number">Nùmeru de essida</string>
+    <string name="announce_when_exceeded">Avisa in casu de barigamentu</string>
+    <string name="user_points">Puntos de s\'impreadore</string>
+    <string name="output">Essida</string>
 </resources>

OsmAnd/res/values-sk/strings.xml

@@ -1494,7 +1494,7 @@
     <string name="local_osm_changes_upload_all_confirm">Naozaj chcete odoslať %1$d zmien do OSM\?</string>
     <string name="confirmation_to_clear_history">Vymazať históriu?</string>
     <string name="osmand_parking_overdue">prekročený čas</string>
-    <string name="confirm_usage_speed_cameras">Vo viacerých krajinách (ako Nemecko, Francúzsko, Taliansko) je použitie varovaní pred rýchlostnými radarmi/kamerami zakázané zákonom (nelegálne). OsmAnd nepreberá žiadnu zodpovednosť ak porušíte zákon. Stlačte \"Áno\" len ak ste na to oprávnený použiť túto funkciu.</string>
+    <string name="confirm_usage_speed_cameras">Vo viacerých krajinách (ako Nemecko, Francúzsko, Taliansko) je použitie varovaní pred rýchlostnými radarmi/kamerami zakázané zákonom. OsmAnd nepreberá žiadnu zodpovednosť ak porušíte zákon. Stlačte \"Áno\" len ak ste oprávnený použiť túto funkciu.</string>
     <string name="welmode_download_maps">Stiahnuť mapy</string>
     <string name="welcome_select_region">Vyberte svoj región, aby bolo možné správne nastaviť dopravné predpisy:</string>
     <string name="welcome_text">OsmAnd poskytuje celosvetové offline mapy a offline navigáciu.</string>
@@ -2729,7 +2729,7 @@
     <string name="wikipedia_offline">Wikipédia offline</string>
     <string name="contour_lines_hillshade_maps">Vrstevnice &amp; tieňované svahy</string>
     <string name="unlock_all_features">Odomknite všetky funkcie OsmAnd</string>
-    <string name="download_wikipedia_description">Stiahnite články Wikipédie pre %1$s pre ich čítanie offline.</string>
+    <string name="download_wikipedia_description">Stiahnite články Wikipédie pre %1$s na ich čítanie offline.</string>
     <string name="download_wikipedia_label">Stiahnuť údaje Wikipédie</string>
     <string name="open_in_browser_wiki">Otvoriť článok online</string>
     <string name="open_in_browser_wiki_description">Zobraziť článok vo webovom prehliadači.</string>
@@ -4006,7 +4006,7 @@
     <string name="routing_attr_driving_style_description">Zvoľte účel jazdy pre získanie kratšej, rýchlejšej alebo bezpečnejšej trasy</string>
     <string name="map_orientation_threshold_descr">Neotáčať mapu, ak je rýchlosť nižšia ako hranica</string>
     <string name="restart">Reštartovať</string>
-    <string name="shared_strings_all_regions">Všetky regióny</string>
+    <string name="shared_strings_all_regions">Všetky oblasti</string>
     <string name="delete_number_files_question">Zmazať %1$d súborov\?</string>
     <string name="track_recording_stop_without_saving">Zastaviť bez uloženia</string>
     <string name="track_recording_save_and_stop">Uložiť a zastaviť záznam</string>
@@ -4045,7 +4045,11 @@
     <string name="lost_data_warning">Všetky neuložené údaje budú stratené.</string>
     <string name="show_start_dialog">Zobraziť úvodné okno</string>
     <string name="trip_recording_show_start_dialog_setting">Ak je vypnuté, záznam začne hneď po stlačení nástroja alebo položky v menu a preskočí okno nastavenia.</string>
-    <string name="release_4_0_beta">• Aktualizácie OsmAnd Live presunuté do \"Sťahovania &gt; Aktualizácie\"
+    <string name="release_4_0_beta">• Pridaná možnosť stiahnutia Vrstevníc v stopách
+\n
+\n• Plánovať trasy: pridané prepínače medzi bodmi a grafmi
+\n
+\n• Aktualizácie OsmAnd Live presunuté do \"Sťahovania &gt; Aktualizácie\"
 \n
 \n • Stopy je teraz možné vyfarbiť podľa nadmorskej výšky, rýchlosti alebo sklonu svahu.
 \n
@@ -4058,4 +4062,31 @@
     <string name="shared_string_route_line">Navigačná trasa</string>
     <string name="route_line_use_map_style_appearance">Navigačná trasa použije %1$s, zadané na zvolenom štýle mapy: %2$s.</string>
     <string name="specify_color_for_map_mode">Zadajte farbu pre režim mapy: %1$s.</string>
+    <string name="no_purchases">Nemáte žiadne nákupy</string>
+    <string name="new_device_account">Nové zariadenie / nový účet</string>
+    <string name="contact_support_description">Ak máte nejaké otázky, kontaktujte nás na %1$s.</string>
+    <string name="empty_purchases_description">Ak sa tu vaše nákupy nezobrazujú, stlačte “%1$s” alebo kontaktujte tím podpory.</string>
+    <string name="contact_support">Kontaktovať podporu</string>
+    <string name="troubleshooting">Riešenie problémov</string>
+    <string name="troubleshooting_description">Prosím nasledujte tento odkaz ak máte problémy s nákupom.</string>
+    <string name="osmand_live">OsmAnd Live</string>
+    <string name="annual_subscription">Ročné predplatné</string>
+    <string name="monthly_subscription">Mesačné predplatné</string>
+    <string name="three_months_subscription">3-mesačné predplatné</string>
+    <string name="next_billing_date">Nasledujúci dátum platby: %1$s</string>
+    <string name="osmand_live_cancelled">Zrušené</string>
+    <string name="renew_subscription">Obnoviť predplatné</string>
+    <string name="in_grace_period">V období tolerancie</string>
+    <string name="on_hold">Pozdržané</string>
+    <string name="expired">Expirované</string>
+    <string name="update_all_maps_added">Aktualizovať všetky mapy pridané do %1$s\?</string>
+    <string name="exit_number">Číslo výjazdu</string>
+    <string name="announce_when_exceeded">Hlásiť keď je prekročené</string>
+    <string name="user_points">Body používateľa</string>
+    <string name="output">Výstup</string>
+    <string name="map_quick_action_pattern">%1$s → …</string>
+    <string name="shared_string_feet">stopy</string>
+    <string name="srtm_unit_format">Formát jednotiek vrstevníc</string>
+    <string name="srtm_download_list_help_message">OsmAnd poskytuje údaje vrstevníc v metroch a stopách. Budete musieť znovu stiahnuť súbor pre zmenu formátu.</string>
+    <string name="srtm_download_single_help_message">Prosím zvoľte požadovaný formát. Budete musieť znovu stiahnuť súbor pre zmenu formátu.</string>
 </resources>

OsmAnd/res/values-sr/phrases.xml

@@ -3867,4 +3867,45 @@
     <string name="poi_water_source_river">Река</string>
     <string name="poi_vaccination_covid19">Цепљење: Ковид 19</string>
     <string name="poi_health_specialty_vaccination_yes">Цепљење</string>
+    <string name="poi_club_social">Друштвени клуб</string>
+    <string name="poi_plateau">Плато</string>
+    <string name="poi_office_diplomatic">Дипломатско представништво</string>
+    <string name="poi_kickboxing">Кик-бокс</string>
+    <string name="poi_fencing">Мачевање</string>
+    <string name="poi_curling">Курлинг</string>
+    <string name="poi_crossfit">Кросфит</string>
+    <string name="poi_cockfighting">Туча петлова</string>
+    <string name="poi_bullfighting">Борба са биковима</string>
+    <string name="poi_bobsleigh">Боб</string>
+    <string name="poi_biathlon">Биатлон</string>
+    <string name="poi_aikido">Аикидо</string>
+    <string name="poi_water_ski">Водено скијање</string>
+    <string name="poi_water_polo">Ватерполо</string>
+    <string name="poi_wrestling">Рвање</string>
+    <string name="poi_weightlifting">Дизање тегова</string>
+    <string name="poi_wakeboarding">Вејкбординг</string>
+    <string name="poi_ultimate">Ултимат</string>
+    <string name="poi_taekwondo">Таеквондо</string>
+    <string name="poi_table_soccer">Футсал</string>
+    <string name="poi_sumo">Сумо</string>
+    <string name="poi_snooker">Снукер</string>
+    <string name="poi_piste_status_open">Стање стазе: отворена</string>
+    <string name="poi_patrolled_no">Обилажена: не</string>
+    <string name="poi_patrolled_yes">Обилажена: да</string>
+    <string name="poi_piste_name">Име стазе</string>
+    <string name="poi_piste_ski_jump">Ски скок</string>
+    <string name="poi_wildlife_crossing_bat_tunnel">Тунел за слепе мишеве</string>
+    <string name="poi_wildlife_crossing_bat_bridge">Мост за слепе мишеве</string>
+    <string name="poi_wildlife_crossing">Прелаз за дивљач</string>
+    <string name="poi_swimming_area">Део за пливање</string>
+    <string name="poi_lavoir">Појило</string>
+    <string name="poi_waste_transfer_station">Станица за пренос отпада</string>
+    <string name="poi_weightbridge">Колска вага</string>
+    <string name="poi_ranger_station">Шумарска станица</string>
+    <string name="poi_water_source_tube_well">Цевни бунар</string>
+    <string name="poi_water_source_well">Бунар</string>
+    <string name="poi_water_source_powered_pump">Електрична пумпа</string>
+    <string name="poi_water_source_water_tank">Танк са водом</string>
+    <string name="poi_water_source_tap">Чесма</string>
+    <string name="poi_bay_filter">Тип залива</string>
 </resources>

OsmAnd/res/values-sr/strings.xml

@@ -662,7 +662,7 @@
     <string name="share_osm_edits_subject">ОСМ измене дељене преко OsmAnd-а</string>
     <string name="osm_edit_created_poi">OSM тачка од интереса је направљена</string>
     <string name="nm">nmi</string>
-    <string name="nm_h">kn</string>
+    <string name="nm_h">чв</string>
     <string name="min_mile">min/m</string>
     <string name="min_km">min/km</string>
     <string name="m_s">m/s</string>
@@ -922,7 +922,7 @@
     <string name="rendering_attr_roadColors_name">Образац боја путева</string>
     <string name="enable_plugin_monitoring_services">Омогућите додатак за „снимање путовања“ ради коришћења услуга бележења (GPX бележење, праћење положаја на мрежи)</string>
     <string name="non_optimal_route_calculation">Рачунај могућу приближну путању за велике раздаљине</string>
-    <string name="gps_not_available">Омогућите GPS у поставкама</string>
+    <string name="gps_not_available">Омогућите GPS у подешавањима</string>
     <string name="map_widget_monitoring_services">Услуге бележења путање</string>
     <string name="no_route">Нема пута</string>
     <string name="arrived_at_intermediate_point">Стигли сте на пролазно одредиште</string>
@@ -1005,7 +1005,7 @@
     <string name="new_filter_desc">Молимо, унесите име новог филтера који ће бити придодат језичку „Категорије“.</string>
     <string name="osm_live_payment_desc">Чланарина се наплаћује по одабраном периоду. Можете је отказати на Гугл плеју кад год пожелите.</string>
     <string name="donation_to_osm">Прилог ОСМ заједници</string>
-    <string name="donation_to_osm_desc">Део Вашег прилога ће бити послат корисницима ОСМ-а. Чланарина остаје иста.</string>
+    <string name="donation_to_osm_desc">Део Ваше чланарине ће бити послат корисницима ОСМ-а. Чланарина остаје иста.</string>
     <string name="osm_live_subscription_desc">Чланарина омогућава часовне, дневне и седмичне надоградње, и неограничена преузимања свих карата.</string>
     <string name="get_it">Добавите је</string>
     <string name="get_for">Добавите за %1$s</string>
@@ -1062,9 +1062,9 @@
     <string name="access_direction_audio_feedback_descr">Указуј на правац циљне тачке звуком.</string>
     <string name="access_direction_haptic_feedback">Упутства трешењем</string>
     <string name="access_direction_haptic_feedback_descr">Указуј на правац циљне тачке трешњом.</string>
-    <string name="use_osm_live_routing_description">Омогући навођење живих измена ОСМ-а.</string>
+    <string name="use_osm_live_routing_description">Омогући навођење измена ОСМ-а уживо.</string>
     <string name="use_osm_live_routing">Навођење уживо ОСМ-а</string>
-    <string name="access_no_destination">Одредиште није подешено</string>
+    <string name="access_no_destination">Додатак за приступачност: Одредиште није подешено</string>
     <string name="access_category_choice">Изаберите категорију</string>
     <string name="storage_directory_readonly_desc">Пребачено на интерну меморију пошто је означено складиште за податке заштићено од писања. Изаберите фасциклу за складиште у коју може да се пише.</string>
     <string name="save_track_interval_descr">Наведите интервал логовања снимања путање приликом навођења</string>
@@ -1221,7 +1221,7 @@
     <string name="rendering_attr_horseRoutes_name">Коњске стазе</string>
     <string name="share_geo">положај:</string>
     <string name="lang_br">Бретонски</string>
-    <string name="hillshade_menu_download_descr">Преузмите слој са сенчењем да бисте видели рељеф на карти.</string>
+    <string name="hillshade_menu_download_descr">Преузмите карту слоја са сенчењем да бисте видели рељеф на карти.</string>
     <string name="hillshade_purchase_header">Инсталирајте додатак \"Изохипсе\" да прикажете нагиб вертикалних области.</string>
     <string name="shared_string_plugin">Додатак</string>
     <string name="display_zoom_level">Приказ нивоа увеличања: %1$s</string>
@@ -1234,11 +1234,11 @@
     <string name="shared_string_add_photos">Додај слике</string>
     <string name="no_photos_descr">Нема слика овде.</string>
     <string name="mapillary_action_descr">Поделите Ваш поглед са улице преко Мапилара.</string>
-    <string name="mapillary_widget">Справица Мапилара</string>
-    <string name="mapillary_widget_descr">Омогућава брзи допринос Мапилару.</string>
-    <string name="open_mapillary">Отвори Мапилар</string>
+    <string name="mapillary_widget">Mapillary справица</string>
+    <string name="mapillary_widget_descr">Омогућава брзи допринос Mapillary-ју.</string>
+    <string name="open_mapillary">Отвори Mapillary</string>
     <string name="mapillary_descr">Мрежне слике улица за све. Откријте места, сарађујте, освојите свет.</string>
-    <string name="mapillary">Мапилари</string>
+    <string name="mapillary">Mapillary</string>
     <string name="plugin_mapillary_descr">Мрежне слике улица за све. Откријте места, сарађујте, освојите свет.</string>
     <string name="private_access_routing_req">Ваше одредиште се налази на приватном поседу. Дозволити коришћење приватних путева на овом путовању\?</string>
     <string name="restart_search">Препокрени претрагу</string>
@@ -1512,8 +1512,8 @@
     <string name="import_gpx_failed_descr">Не могу да увезем фајл. Проверите да ли OsmAnd има дозволе за читање фајла.</string>
     <string name="distance_moving">Растојање је исправљено</string>
     <string name="mapillary_image">Слика са Мапилара</string>
-    <string name="improve_coverage_mapillary">Побољшајте покривеност слика користећи Мапилар</string>
-    <string name="improve_coverage_install_mapillary_desc">Инсталирајте програм Мапилар (Mapillary) да додате слике на ову локацију на карти.</string>
+    <string name="improve_coverage_mapillary">Побољшајте покривеност слика користећи Mapillary</string>
+    <string name="improve_coverage_install_mapillary_desc">Инсталирајте програм Mapillary да додате слике на ову локацију на карти.</string>
     <string name="subscribe_email_desc">Претплатите се на нашу дописну листу за попуст и добијте још 3 преузимања карти!</string>
     <string name="depth_contour_descr">Изобате мора (изохипсе дубине) и карте поморских ознака.</string>
     <string name="sea_depth_thanks">Хвала Вам на куповини „Поморских изобата“</string>
@@ -1861,7 +1861,7 @@
     <string name="quick_action_btn_tutorial_title">Помери дугме</string>
     <string name="quick_action_btn_tutorial_descr">Дуго држање и превлачење дугмета га помера по екрану.</string>
     <string name="shared_string_action_name">Име радње</string>
-    <string name="mappilary_no_internet_desc">Слике са Мапилара је могуће видети само ако сте повезани на интернет.</string>
+    <string name="mappilary_no_internet_desc">Слике са Mapillary-ја је могуће видети само ако сте повезани на интернет.</string>
     <string name="retry">Покушај поново</string>
     <string name="empty_state_favourites">Додај омиљене</string>
     <string name="empty_state_favourites_desc">Увезите Омиљене тачке или их додајте означавајући их као ознаке на карти.</string>
@@ -2134,7 +2134,7 @@
     <string name="plugin_install_needs_network">Морате имати интернет да бисте инсталирали овај додатак.</string>
     <string name="get_plugin">Преузми</string>
     <string name="use_fast_recalculation">Пмаетно прерачунавање пута</string>
-    <string name="use_fast_recalculation_desc">Прерачунава само почетни део руте. Може се користити за дуга путовања.</string>
+    <string name="use_fast_recalculation_desc">Прерачунава само почетни део руте, корисно за дуга путовања.</string>
     <string name="do_you_like_osmand">Да ли Вам се OsmAnd свиђа?</string>
     <string name="we_really_care_about_your_opinion">Важно нам је да чујемо Ваше мишљење.</string>
     <string name="rate_this_app">Оцените ову апликацију</string>
@@ -2543,7 +2543,7 @@
     <string name="update_poi_error_local">Не могу да ажурирам локални списак тачака од интереса.</string>
     <string name="quick_action_add_gpx_descr">Дугме за додавање GPX пролазне тачке на средину екрана.</string>
     <string name="show_images">Прикажи слике</string>
-    <string name="purchase_cancelled_dialog_title">Укинули сте чланарину за OsmAnd Live</string>
+    <string name="purchase_cancelled_dialog_title">Отказали сте чланарину за OsmAnd уживо</string>
     <string name="purchase_cancelled_dialog_descr">Обновите чланарину да наставите да користите све ове функционалности:</string>
     <string name="gpxup_identifiable">Може да се користи за идентификацију</string>
     <string name="gpxup_trackable">Може да се користи за праћење</string>
@@ -2581,7 +2581,7 @@
     <string name="default_render_descr">Стил опште намене. Густи градови су приказани јасно. Приказује изохипсе, путање, квалитет подлоге, забране приступа, блокаде путева, исцртавање путева по SAC алпској скали, објекти за спортове на брзацима.</string>
     <string name="open_wikipedia_link_online">Отвори Википедија везу са интернетом</string>
     <string name="open_wikipedia_link_online_description">Веза ће бити отворена у веб читачу.</string>
-    <string name="read_wikipedia_offline_description">Да бисте читали чланке са Википедије и Wikivoyage-а, претплатите се на OsmAnd Live.</string>
+    <string name="read_wikipedia_offline_description">Да бисте читали чланке са Википедије и Wikivoyage-а, купите чланарину на OsmAnd уживо.</string>
     <string name="how_to_open_link">Како да отворим везу?</string>
     <string name="read_wikipedia_offline">Читај Википедију ван мреже</string>
     <string name="download_all">Преузми све</string>
@@ -2703,7 +2703,7 @@
 \n - Окретањем мапе према компасу или правцу кретања
 \n - Навођењем у праву траку, приказ ограничења брзине, снимљени и синтетизовани гласови за навођење
 \n</string>
-    <string name="get_osmand_live">Набавите OsmAnd Live да откључате ове могућности: дневна ажурирања карти са неограниченим бројем скидања, сви и плаћени и бесплатни додаци, Википедија, Wikivoyage и још много тога.</string>
+    <string name="get_osmand_live">Набавите OsmAnd уживо да откључате ове могућности: дневна ажурирања карти са неограниченим бројем скидања, сви и плаћени и бесплатни додаци, Википедија, Wikivoyage и још много тога.</string>
     <string name="osmand_extended_description_part3">Карта
 \n • Приказ тачака од интереса око Вас
 \n • Подешавање карте према правцу кретања (или компасу)
@@ -2777,14 +2777,14 @@
     <string name="osm_live_payment_month_cost_descr">%1$s / месечно</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / месечно</string>
     <string name="osm_live_payment_discount_descr">Уштедите %1$s</string>
-    <string name="osm_live_payment_current_subscription">Тренутна претплата</string>
+    <string name="osm_live_payment_current_subscription">Тренутна чланарина</string>
     <string name="osm_live_payment_renews_monthly">Месечно обнављање</string>
     <string name="osm_live_payment_renews_quarterly">Квартално обнављање</string>
     <string name="osm_live_payment_renews_annually">Годишње обнављање</string>
     <string name="default_price_currency_format">%1$.2f %2$s</string>
     <string name="osm_live_payment_header">Период плаћања:</string>
     <string name="osm_live_payment_contribute_descr">Донације помажу финансирање OSM картографа.</string>
-    <string name="osm_live_subscriptions">Претплате</string>
+    <string name="osm_live_subscriptions">Чланарине</string>
     <string name="mapillary_menu_title_pano">Прикажи само слике од 360°</string>
     <string name="shared_string_launch">Покрени</string>
     <string name="lang_gn_py">Гварани</string>
@@ -2894,8 +2894,8 @@
     <string name="tracks_on_map">Приказане путање</string>
     <string name="sit_on_the_stop">Укрцавање на стајању</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Дугме које приказује или сакрива одабране путање са карте.</string>
-    <string name="use_osm_live_public_transport_description">Омогући јавни превоз на OsmAnd Live изменама.</string>
-    <string name="use_osm_live_public_transport">OsmAnd Live јавни превоз</string>
+    <string name="use_osm_live_public_transport_description">Омогући јавни превоз на OsmAnd уживо изменама.</string>
+    <string name="use_osm_live_public_transport">OsmAnd уживо јавни превоз</string>
     <string name="rendering_attr_surface_sett_name">Калдрма</string>
     <string name="rendering_attr_surface_paving_stones_name">Поплочано камење</string>
     <string name="rendering_attr_highway_class_motorway_name">Ауто-пут</string>
@@ -3119,7 +3119,7 @@
     <string name="get_discount_first_part">%1$s првих %2$s</string>
     <string name="get_discount_first_few_part">%1$s првих %2$s</string>
     <string name="get_discount_second_part">онда %1$s</string>
-    <string name="cancel_subscription">Поништи претплату</string>
+    <string name="cancel_subscription">Поништи чланарину</string>
     <string name="price_and_discount">%1$s • Уштеди %2$s</string>
     <string name="configure_profile_info">Поставке за профил:</string>
     <string name="utm_format_descr">OsmAnd користи UTM Standard format који је сличан, али није истоветан као UTM NATO format.</string>
@@ -3330,7 +3330,7 @@
     <string name="login_and_pass">Корисничко име и лозинка</string>
     <string name="plugin_global_prefs_info">Ова подешавања додатака су глобална и примењују се на све профиле</string>
     <string name="osm_editing">OSM уређивање</string>
-    <string name="osm_edits_view_descr">Све своје још увек не отпремљене измене или ОСМ белешке можете погледати у %1$s. Отпремљене тачке се не приказују у ОсмАнду.</string>
+    <string name="osm_edits_view_descr">Погледајте све Ваше још увек неотпремљене измене или ОСМ белешке у %1$s. Отпремљене тачке се не више приказују.</string>
     <string name="app_mode_osm">OSM</string>
     <string name="select_nav_icon_descr">Иконица која се приказује за време навођења или померања.</string>
     <string name="select_map_icon_descr">Иконица која се приказује у мировању.</string>
@@ -3484,7 +3484,7 @@
     <string name="measure_distance_item">Измери удаљеност</string>
     <string name="travel_item">Путовање (Wikivoyage и Википедија)</string>
     <string name="favorites_item">Омиљени</string>
-    <string name="subscription_osmandlive_item">Претплата - OsmAnd уживо</string>
+    <string name="subscription_osmandlive_item">Чланарина - OsmAnd уживо</string>
     <string name="osmand_purchases_item">OsmAnd куповине</string>
     <string name="legend_item_description">Упутство за легенду карте.</string>
     <string name="navigation_profiles_item">Профили навођења</string>
@@ -3650,9 +3650,9 @@
     <string name="context_menu_actions">Акције Контекст менија</string>
     <string name="osm_live_payment_subscription_management">Наплатом ће бити оптерећен ваш Гугл Плеј налог при потврди куповине.
 \n
-\n Претплата се аутоматски обнавља уколико није отказана пре датума обнове. Ваш налог биће задужен периодом обнове (месец / три месеца / годину дана) само на дан обнове.
+\nЧланарина се аутоматски обнавља уколико није отказана пре датума обнове. Ваш налог биће задужен периодом обнове (месец / три месеца / годину дана) само на дан обнове.
 \n
-\n Претплатама можете управљати и отказати их тако што ћете отићи на ваша Гугл Плеј подешавања.</string>
+\nЧланаринама можете управљати и отказати их тако што ћете отићи на ваша Гугл Плеј подешавања.</string>
     <string name="release_3_7">• Нове офлајн мапе нагиба
 \n
 \n • Пуно прилагођавање Фаворита и ГПКС тачака – прилагођавање боја, икона, облика
@@ -3683,9 +3683,9 @@
     <string name="lenght_limit_description">Унесите дужину возила, нека ограничења пута могу бити примењена за дужа возила.</string>
     <string name="quick_action_remove_next_destination">Обриши најближу одредишну тачку</string>
     <string name="please_provide_point_name_error">Молимо одредите име тачке</string>
-    <string name="quick_action_remove_next_destination_descr">Тренутна одредишна тачка биће уклоњена. Ако је она одредишна, стопираће се навигација.</string>
+    <string name="quick_action_remove_next_destination_descr">Уклања тренутну одредишну тачку. Ако је она и завршна тачка, навођење ће се зауставити.</string>
     <string name="search_download_wikipedia_maps">Преузмите мапе Википедије</string>
-    <string name="plugin_wikipedia_description">Информације о тачкама од интереса потражите на Википедији. То је ваш џепни ванмрежни водич - само укључите додатак Википедија и уживајте у чланцима о објектима око вас.</string>
+    <string name="plugin_wikipedia_description">Информације о тачкама од интереса потражите на Википедији, џепном ванмрежном водичу који има чланке о местима и одредиштима.</string>
     <string name="app_mode_enduro_motorcycle">Ендуро скутер</string>
     <string name="app_mode_motor_scooter">Скутер</string>
     <string name="app_mode_wheelchair">Инвалидска колица</string>
@@ -3723,7 +3723,7 @@
     <string name="navigation_profile">Навигацијски профил</string>
     <string name="route_between_points_add_track_desc">Изаберите датотеку записа којој ће се додати нови сегмент.</string>
     <string name="street_level_imagery">Слике на нивоу улице</string>
-    <string name="plan_route_exit_dialog_descr">Да ли сте сигурни да желите да одбаците све промене на планираној рути затварањем\?</string>
+    <string name="plan_route_exit_dialog_descr">Да ли сте сигурни да желите да одбаците све промене на планираној рути\?</string>
     <string name="in_case_of_reverse_direction">У случају обрнутог правца</string>
     <string name="shared_string_save_as_gpx">Сачувај као нову датотеку стазе</string>
     <string name="add_segment_to_the_track">Додај у датотеку стазе</string>
@@ -3761,9 +3761,9 @@
     <string name="gpx_monitoring_stop">Паузирај снимање пута</string>
     <string name="one_point_error">Додајте бар две тачке.</string>
     <string name="osm_edit_logout_success">Одјављен</string>
-    <string name="gpx_upload_private_visibility_descr">„Приватно“ значи да се траг не појављује ни на једној јавној листи, али су тачке праћења у њему у нехронолошком редоследу доступне путем јавног ГПС АПИ-ја без временских ознака.</string>
-    <string name="gpx_upload_identifiable_visibility_descr">„Могуће је идентификовати“ значи да ће се траг јавно приказати у вашим ГПС траговима и у јавним списковима ГПС трагова, тј. други корисници ће моћи да преузму необрађени траг и повежу га са вашим корисничким именом. Јавни подаци о временским тачкама трага из ГПС АПИ-ја који се сервирају путем АПИ-ја за тачке праћења имаће референцу на вашу оригиналну страницу праћења.</string>
-    <string name="gpx_upload_trackable_visibility_descr">„Следљиво“ значи да се траг не приказује нигде на јавним листама, али обрађене тачке праћења са временским ознакама у њима (које не могу бити директно повезане са вама) иду кроз преузимања са јавног ГПС АПИ-ја.</string>
+    <string name="gpx_upload_private_visibility_descr">„Приватно“ значи да се траг не појављује ни на једној јавној листи, али су тачке праћења у њему у нехронолошком редоследу доступне путем јавног GPS API-ја без временских ознака.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">„Могуће је идентификовати“ значи да ће се траг јавно приказати у Вашим GPS траговима и у јавним списковима GPS трагова, тј. други корисници ће моћи да преузму необрађени траг и повежу га са Вашим корисничким именом. Јавни подаци о временским тачкама трага из GPS API-ја који се сервирају путем API-ја за тачке праћења имаће референцу на вашу оригиналну страницу праћења.</string>
+    <string name="gpx_upload_trackable_visibility_descr">„Следљиво“ значи да се траг не приказује нигде на јавним листама, али обрађене тачке праћења са временским ознакама у њима (које не могу бити директно повезане са вама) иду кроз преузимања са јавног GPS API-ја.</string>
     <string name="osm_edit_close_note">Затвори ОСМ белешку</string>
     <string name="osm_edit_comment_note">Коментар ОСМ напомене</string>
     <string name="osm_login_descr">Можете се пријавити користећи безбедан ОАут метод или користити своје корисничко име и лозинку.</string>
@@ -3776,12 +3776,12 @@
     <string name="shared_string_search_history">Претрага</string>
     <string name="app_mode_kayak">Кајак</string>
     <string name="app_mode_motorboat">Моторни чамац</string>
-    <string name="add_to_mapillary">Додај у Мапилари</string>
-    <string name="add_to_opr">Додај у ОпенПлејсРевјуз</string>
-    <string name="add_photos_descr">ОсмАнд приказује фотографије из неколико извора:
-\nОпенПлејсРевјуз - ПОИ фотографије;
-\nМапилари - слике на нивоу улице;
-\nВеб / Викимедиа - ПОИ фотографије наведене у подацима ОпенСтритМап.</string>
+    <string name="add_to_mapillary">Додај у Mapillary</string>
+    <string name="add_to_opr">Додај у OpenPlaceReviews</string>
+    <string name="add_photos_descr">OsmAnd приказује фотографије из неколико извора:
+\nOpenPlaceReviews - фотографије тачака од интереса;
+\nMapillary - слике на нивоу улице;
+\nВеб / Викимедија - фотографије тачака од интереса наведене у OpenStreetMap подацима.</string>
     <string name="shared_string_resources">Ресурси</string>
     <string name="approximate_file_size">Приближна величина датотеке</string>
     <string name="select_data_to_export">Изаберите податке за извоз у датотеку.</string>
@@ -3795,7 +3795,7 @@
     <string name="mgrs_format_descr">ОсмАнд користи МГРС, који је сличан УТМ НАТО формату.</string>
     <string name="simplified_track">Поједностављена стаза</string>
     <string name="simplified_track_description">Само линија руте ће бити сачувана, а путне тачке ће бити избрисане.</string>
-    <string name="disable_recording_once_app_killed_descrp">Паузираће евидентирање стазе када се апликација убије (преко скорашњих програма). (Индикатор рада OsmAnd-а у позадини тада нестаје из обавештајне траке.)</string>
+    <string name="disable_recording_once_app_killed_descrp">Евидентирање стазе ће бити паузирано када се апликација убије (преко скорашњих програма). (Индикатор рада OsmAnd-а у позадини тада нестаје из обавештајне траке.)</string>
     <string name="save_global_track_interval_descr">Наведите интервал евидентирања за опште снимање стаза (укључено помоћу виџета „Снимање путовања“ на мапи).</string>
     <string name="gpx_monitoring_start">Наставите снимање путовања</string>
     <string name="system_default_theme">Системско подразумевана</string>
@@ -3827,17 +3827,17 @@
     <string name="sort_name_descending">Име: З - А</string>
     <string name="sort_name_ascending">Име: А - З</string>
     <string name="contour_lines_thanks">Хвала вам што сте купили „Контурне линије“</string>
-    <string name="osm_live_payment_desc_hw">Претплата се наплаћује по изабраном периоду. Откажите га у АппГалери у било ком тренутку.</string>
-    <string name="osm_live_payment_subscription_management_hw">Уплата ће бити наплаћена са вашег рачуна АппГалери при потврди куповине.
+    <string name="osm_live_payment_desc_hw">Чланарина се наплаћује по изабраном периоду. Откажите је у AppGallery у било ком тренутку.</string>
+    <string name="osm_live_payment_subscription_management_hw">Уплата ће бити наплаћена са вашег рачуна AppGallery при потврди куповине.
 \n
-\nПретплата се аутоматски обнавља уколико није отказана пре датума обнове. Ваш рачун ће бити задужен за период обнове (месец / три месеца / година) само на датум обнове.
+\nЧланарина се аутоматски обнавља уколико није отказана пре датума обнове. Ваш рачун ће бити задужен за период обнове (месец / три месеца / година) само на датум обнове.
 \n
-\nПретплатама можете управљати и отказати их тако што ћете отићи у подешавања апликације АппГалери.</string>
+\nЧланаринама можете управљати и отказати их тако што ћете отићи у подешавања апликације AppGallery.</string>
     <string name="routing_attr_avoid_footways_description">Избегавајте пешачке стазе</string>
     <string name="routing_attr_avoid_footways_name">Избегавајте пешачке стазе</string>
     <string name="development">Развој</string>
-    <string name="use_live_public_transport">ОсмАнд лајв подаци</string>
-    <string name="use_live_routing">ОсмАнд лајв подаци</string>
+    <string name="use_live_public_transport">OsmAnd уживо подаци</string>
+    <string name="use_live_routing">OsmAnd уживо подаци</string>
     <string name="complex_routing_descr">Двофазно усмеравање за аутомобилску навигацију.</string>
     <string name="use_native_pt">Развој матичног јавног превоза</string>
     <string name="use_native_pt_desc">Пребаците се на Јава (безбедан) прорачун рутирања јавног превоза</string>
@@ -3847,9 +3847,9 @@
     <string name="file_already_imported">Датотека је већ увезена у ОсмАнд</string>
     <string name="use_two_phase_routing">Користите двофазни алгоритам усмеравања А*</string>
     <string name="shared_string_graph">Графикон</string>
-    <string name="message_need_calculate_route_before_show_graph">%1$s подаци доступни само на путевима, морате израчунати руту користећи „Рута између тачака“ да бисте је добили.</string>
-    <string name="message_graph_will_be_available_after_recalculation">Сачекајте поновно израчунавање руте.
-\nГрафикон ће бити доступан након поновног израчунавања.</string>
+    <string name="message_need_calculate_route_before_show_graph">%1$s подаци доступни само на путевима, израчунајте руту користећи „Рута између тачака“ да бисте видели графике.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Молимо сачекајте.
+\nГрафикон ће бити доступан након поновног израчунавања путање.</string>
     <string name="shared_string_local_maps">Локалне мапе</string>
     <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="app_mode_gap">Размак</string>
@@ -3871,15 +3871,15 @@
     <string name="use_login_password">Користите корисничко име и лозинку</string>
     <string name="login_account">Налог</string>
     <string name="user_login">Пријавите се</string>
-    <string name="manage_subscription">Управљајте претплатом</string>
-    <string name="subscription_payment_issue_title">Постоји проблем са вашом претплатом. Кликните на дугме да бисте отворили подешавања претплате за Гугле Плеј и да бисте поправили начин плаћања.</string>
-    <string name="subscription_expired_title">Претплата на ОсмАнд лајв је истекла</string>
-    <string name="subscription_paused_title">Претплата на ОсмАнд лајв је паузирана</string>
-    <string name="subscription_on_hold_title">Претплата на ОсмАнд лајв је на чекању</string>
+    <string name="manage_subscription">Управљајте чланарином</string>
+    <string name="subscription_payment_issue_title">Постоји проблем са Вашом чланарином. Кликните на дугме да бисте отворили подешавања претплате за Гугле Плеј и да бисте поправили начин плаћања.</string>
+    <string name="subscription_expired_title">Чланарина за OsmAnd уживо је истекла</string>
+    <string name="subscription_paused_title">Чланарина на OsmAnd уживо је паузирана</string>
+    <string name="subscription_on_hold_title">Чланарина на OsmAnd уживо је на чекању</string>
     <string name="markers_history">Историја маркера</string>
     <string name="send_files_to_openstreetmap">Пошаљите ГПКС датотеку на ОпенСтритМап</string>
     <string name="enter_text_separated">Унесите ознаке одвојене зарезом.</string>
-    <string name="gpx_upload_public_visibility_descr">„Јавно“ значи да је траг јавно приказан у вашим ГПС траговима и на јавним ГПС траговима, као и на јавном списку трагова са временским ознакама у сировом облику. Подаци који се приказују путем АПИ-ја не упућују на вашу страницу трагова. Временске ознаке праћења нису доступне путем јавног ГПС АПИ-ја и тачке праћења нису хронолошки поређане.</string>
+    <string name="gpx_upload_public_visibility_descr">„Јавно“ значи да је траг јавно приказан у вашим GPS траговима и на јавним GPS траговима, као и на јавном списку трагова са временским ознакама у сировом облику. Подаци који се приказују путем API-ја не упућују на вашу страницу трагова. Временске ознаке праћења нису доступне путем јавног GPS API-ја и тачке праћења нису хронолошки поређане.</string>
     <string name="cannot_upload_image">Није могуће отпремити слику, покушајте поново касније</string>
     <string name="select_picture">Изаберите слику</string>
     <string name="select_groups_for_import">Изаберите групе које ће бити увезене.</string>
@@ -3895,11 +3895,11 @@
     <string name="plan_route_add_new_segment">Додајте нови сегмент</string>
     <string name="release_3_9">• Додата је опција за извоз и увоз свих података, укључујући подешавања, ресурсе, моја места
 \n
-\n • Планирање руте: графикони за сегменте са рутом, додата је могућност креирања и уређивања вишеструких сегмената стаза
+\n • Планирање руте: графикони за сегменте са рутом, и додата је могућност креирања и уређивања вишеструких сегмената стаза
 \n
 \n • Додан је метод аутентификације ОАут за ОпенСтритМап, побољшан кориснички интерфејс ОСМ дијалога
 \n
-\n • Прилагођене боје за омиљене и путне тачаке стаза
+\n • Подршка за прилагођене боје за омиљене и пролазне тачке путања
 \n
 \n</string>
     <string name="activity_type_water_name">Вода</string>
@@ -3959,7 +3959,7 @@
     <string name="routing_engine_vehicle_type_cycling_electric">Екетрични бициклизам</string>
     <string name="routing_engine_vehicle_type_cycling_mountain">Планински бициклизам</string>
     <string name="routing_engine_vehicle_type_cycling_road">Друмски бициклизам</string>
-    <string name="routing_engine_vehicle_type_cycling_regular">Стаднардни бициклизам</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">Стандардни бициклизам</string>
     <string name="routing_engine_vehicle_type_hgv">Теретни камион</string>
     <string name="routing_engine_vehicle_type_small_truck">Камионет</string>
     <string name="routing_engine_vehicle_type_truck">Камион</string>
@@ -3988,4 +3988,98 @@
     <string name="rename_track">Преименуј путању</string>
     <string name="trip_recording_save_and_continue">Сачувај и настави</string>
     <string name="lost_data_warning">Сви несачувани подаци ће бити изгубљени.</string>
+    <string name="routing_attr_prefer_hiking_routes_description">Преферира планинске пешачке путеве</string>
+    <string name="routing_attr_prefer_hiking_routes_name">Преферирај планинске пешачке путеве</string>
+    <string name="routing_attr_allow_intermittent_description">Дозвољава водене токове који некад пресуше</string>
+    <string name="routing_attr_allow_streams_description">Дозвољава потоке и одвоје</string>
+    <string name="routing_attr_allow_streams_name">Дозволи потоке и одводе</string>
+    <string name="routing_attr_allow_intermittent_name">Дозволи несталне водене токове</string>
+    <string name="shared_string_api_key">Кључ API-ја</string>
+    <string name="shared_string_server_url">Адреса сервера</string>
+    <string name="shared_string_enter_param">Унесите параметар</string>
+    <string name="keep_it_empty_if_not">Задржи је празном ако није</string>
+    <string name="online_routing_example_hint">Адреса са свим параметрима ће изгледати овако:</string>
+    <string name="test_route_calculation">Тестирај израчунавање пута</string>
+    <string name="shared_string_folders">Фасцикле</string>
+    <string name="select_folder">Одаберите фасциклу</string>
+    <string name="select_folder_descr">Одаберите фасциклу или додајте нову</string>
+    <string name="analyze_by_intervals">Анализирај интервале поделе</string>
+    <string name="upload_to_openstreetmap">Отпреми на OpenStreetMap</string>
+    <string name="change_folder">Измени фасциклу</string>
+    <string name="shared_string_sec">сек</string>
+    <string name="announcement_time_passing">Пролажење</string>
+    <string name="announcement_time_approach">Прилазак</string>
+    <string name="announcement_time_prepare_long">Припрема унапред</string>
+    <string name="announcement_time_prepare">Припрема</string>
+    <string name="announcement_time_off_route">Ван пута</string>
+    <string name="announcement_time_arrive">Долазак на одредиште</string>
+    <string name="shared_string_turn">Скретање</string>
+    <string name="announcement_time_intervals">Интервали времена и удаљености</string>
+    <string name="announcement_time_descr">Времена објава различитих гласовних навођења зависе од типа објаве, као и тренутне и подразумеване брзине навођења.</string>
+    <string name="online_routing_engines">Мрежни усмеривачи</string>
+    <string name="routing_engine_vehicle_type_foot">Пешке</string>
+    <string name="routing_engine_vehicle_type_driving">Вожња аутомобила</string>
+    <string name="edit_online_routing_engine">Измени мрежни усмеривач</string>
+    <string name="add_online_routing_engine">Додај мрежни усмеривач</string>
+    <string name="online_routing_engine">Мрежни усмеривач</string>
+    <string name="delete_online_routing_engine">Обриши овај мрежни усмеривач\?</string>
+    <string name="delete_waypoints">Обриши пролазну тачку</string>
+    <string name="copy_to_map_markers">Копирај у ознаке карте</string>
+    <string name="hillshade_slope_contour_lines">Рељеф / Нагиб / Контурне линије</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="login_open_place_reviews">Пријавите се за OpenPlaceReviews</string>
+    <string name="activity_type_offroad_name">Вожња ван пута</string>
+    <string name="quick_action_coordinates_widget_descr">Прекидач да на карти покаже или сакрије справицу са координатама.</string>
+    <string name="map_widget_distance_by_tap">Удаљеност по кликтању</string>
+    <string name="latest_openstreetmap_update">Последње OpenStreetMap ажурирање доступно:</string>
+    <string name="trip_recording_logging_interval_info">Временски интервал бележења на који ће OsmAnd да пита за податке о тренутној позицији.</string>
+    <string name="show_start_dialog">Прикажи почетни дијалог</string>
+    <string name="trip_recording_show_start_dialog_setting">Ако се искључи, снимање ће почети одмах после кликтања на справицу или на ставку менија, прескакајући дијалог потврде.</string>
+    <string name="customize_route_line">Прилагоди линију руте</string>
+    <string name="route_line_use_map_style_appearance">Линија руте ће користити %1$s одабран на означеном стилу карте: %2$s.</string>
+    <string name="shared_string_route_line">Линија руте</string>
+    <string name="specify_color_for_map_mode">Одаберите боју за режим карте: %1$s.</string>
+    <string name="no_purchases">Немате ниједну куповину</string>
+    <string name="new_device_account">Нови уређај / нови налог</string>
+    <string name="contact_support_description">Ако имате икаквих питања, контактирајте нас на %1$s.</string>
+    <string name="empty_purchases_description">Ако се Ваша куповина не појави овде, кликните на „%1$s” или контактирајте нашу подршку.</string>
+    <string name="contact_support">Контактирајте подршку</string>
+    <string name="troubleshooting">Решавање проблема</string>
+    <string name="troubleshooting_description">Пратите ову везу ако имате икаквих проблема са куповином.</string>
+    <string name="osmand_live">OsmAnd уживо</string>
+    <string name="renew_subscription">Обнови чланарину</string>
+    <string name="annual_subscription">Годишња чланарина</string>
+    <string name="monthly_subscription">Месечна чланарина</string>
+    <string name="three_months_subscription">Тромесечна чланарина</string>
+    <string name="next_billing_date">Следећи датум наплате: %1$s</string>
+    <string name="osmand_live_cancelled">Отказано</string>
+    <string name="in_grace_period">У грејс периоду</string>
+    <string name="on_hold">На чекању</string>
+    <string name="expired">Истекло</string>
+    <string name="update_all_maps_added">Ажурирај све карте додате на %1$s\?</string>
+    <string name="exit_number">Број излаза</string>
+    <string name="announce_when_exceeded">Објави када се премаши</string>
+    <string name="user_points">Кориснички поени</string>
+    <string name="output">Излаз</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews је пројакат покретан од стране заједнице о јавним местима, као што су ресторани, хотели, пролазне тачке. Пројекат сакупља јавне информације о њима, као што су слике, рецензије, везе ка другим местима као OpenStreetMap или Википедија.
+\n
+\nСви подаци на OpenPlaceReview су отворени и доступни свима: http://openplacereviews.org/data.
+\n
+\nМожете прочитати више на: http://openplacereviews.org</string>
+    <string name="release_4_0_beta">• Ажурирања OsmAnd уживо су премештена у „Преузимања &gt; Ажурирања”
+\n
+\n • Путање се сада могу обојити по висини, брзини или нагибу.
+\n
+\n • Додата опција да се измени изглед линије која се приказује приликом навођења
+\n
+\n • Ажуриран дијалог за „Снимање пута”
+\n
+\n</string>
+    <string name="copy_address">Копирај адресу</string>
+    <string name="voice_prompts_timetable">Времена гласовних навођења</string>
+    <string name="profile_type_osmand_string">OsmAnd профил</string>
+    <string name="profile_type_user_string">Кориснички профил</string>
+    <string name="reverse_all_points">Обрни све тачке</string>
+    <string name="profile_by_default_description">Одаберите профил које ће се користити по покретању апликације.</string>
+    <string name="shared_string_last_used">Последње коришћено</string>
 </resources>

OsmAnd/res/values-sv/phrases.xml

@@ -3895,4 +3895,37 @@
     <string name="poi_climbing_length">Klättringslängd</string>
     <string name="poi_climbing_deepwater_no">Djupvatten solo: nej</string>
     <string name="poi_climbing_deepwater_yes">Djupvatten solo: ja</string>
+    <string name="poi_kickboxing">Kickboxning</string>
+    <string name="poi_horseshoes">Hästskor</string>
+    <string name="poi_fencing">Fäktning</string>
+    <string name="poi_cycle_polo">Cykelpolo</string>
+    <string name="poi_curling">Curling</string>
+    <string name="poi_crossfit">Crossfit</string>
+    <string name="poi_cockfighting">Tuppfäktning</string>
+    <string name="poi_cliff_diving">Klippdykning</string>
+    <string name="poi_bullfighting">Tjurfäktning</string>
+    <string name="poi_bobsleigh">Bob</string>
+    <string name="poi_biathlon">SKidskytte</string>
+    <string name="poi_aikido">Aikido</string>
+    <string name="poi_water_ski">Vattenskidor</string>
+    <string name="poi_water_polo">Vattenpolo</string>
+    <string name="poi_zurkhaneh_sport">Zurkhaneh sport</string>
+    <string name="poi_wrestling">Brottning</string>
+    <string name="poi_weightlifting">Tyngdlyftning</string>
+    <string name="poi_wakeboarding">Wakeboard</string>
+    <string name="poi_ultimate">Ultimate</string>
+    <string name="poi_taekwondo">Taekwondo</string>
+    <string name="poi_table_soccer">Bordfotboll</string>
+    <string name="poi_sumo">Sumo</string>
+    <string name="poi_speedway">Speedway</string>
+    <string name="poi_snooker">Snooker</string>
+    <string name="poi_shot_put">Kulstötning</string>
+    <string name="poi_pilates">Pilates</string>
+    <string name="poi_jiu_jitsu">Jiujitsu</string>
+    <string name="poi_karate">Karate</string>
+    <string name="poi_hoops">Ringar</string>
+    <string name="poi_office_diplomatic">Diplomatiskt kontor</string>
+    <string name="poi_bay_filter">Typ av vik</string>
+    <string name="poi_plateau">Platå</string>
+    <string name="poi_club_social">Social klubb</string>
 </resources>

OsmAnd/res/values-sv/strings.xml

@@ -24,7 +24,7 @@
     <string name="snap_to_road">Fäst på vägen</string>
     <string name="filterpoi_activity">Skapa POI-filter</string>
     <string name="recalculate_route_to_your_location">Transportsätt:</string>
-    <string name="select_navigation_mode">Välj transportsätt</string>
+    <string name="select_navigation_mode">Transportsätt:</string>
     <string name="day_night_info_description">Soluppgång: %1$s
 \nSolnedgång: %2$s</string>
     <string name="day_night_info">Dag-/nattinformation</string>
@@ -81,7 +81,7 @@
     <string name="osmand_parking_hours">timmar</string>
     <string name="osmand_parking_minutes">minuter</string>
     <string name="osmand_parking_position_description_add_time">Bilen är parkerad vid</string>
-    <string name="select_animate_speedup">Välj animerad ruttacceleration</string>
+    <string name="select_animate_speedup">Ruttsimuleringshastighet:</string>
     <string name="global_app_allocated_memory_descr">Allokerat minne %1$s MB (Android-gräns %2$s MB, Dalvik %3$s MB).</string>
     <string name="global_app_allocated_memory">Allokerat minne</string>
     <string name="native_app_allocated_memory_descr">Totalt inbyggt minne allokerat av appen %1$s MB (Dalvik %2$s MB, övrigt %3$s MB).
@@ -112,8 +112,8 @@
     <string name="offline_navigation_not_available">OsmAnd offlinenavigering är inte tillgänglig för tillfället.</string>
     <string name="left_side_navigation">Vänstertrafik</string>
     <string name="left_side_navigation_descr">Välj för länder med vänstertrafik.</string>
-    <string name="unknown_from_location">Startpunkten är ännu inte bestämd</string>
-    <string name="unknown_location">Positionen är ännu inte känd</string>
+    <string name="unknown_from_location">Avgångspunkten är ännu inte fastställd.</string>
+    <string name="unknown_location">Positionen är ännu inte känd.</string>
     <string name="confirm_interrupt_download">Avbryt filhämtningen?</string>
     <string name="local_indexes_cat_tile">Online-kartor och mellanlagrade kartrutor</string>
     <string name="local_indexes_cat_map">Standardkartor (vektor)</string>
@@ -210,7 +210,7 @@
     <string name="prefs_plugins">Insticksmoduler</string>
     <string name="osm_editing_plugin_description">Ge OSM-bidrag som att skapa eller modifiera OSM POI-objekt, öppna eller kommentera OSM-anteckningar och bidra med inspelade GPX-filer i OsmAnd genom att ange ditt användarnamn och lösenord. OpenStreetMap.org är ett community-driven, globalt kartläggningsprojekt för allmän domän.</string>
     <string name="vector_maps_may_display_faster_on_some_devices">Vektorkartor ritas sannolikt upp snabbare. Fungerar kanske inte så bra på vissa enheter.</string>
-    <string name="play_commands_of_currently_selected_voice">Spela upp kommandon med vald röst</string>
+    <string name="play_commands_of_currently_selected_voice">Välj en röst och testa genom att spela meddelanden:</string>
     <string name="test_voice_prompts">Test av röstmeddelanden</string>
     <string name="switch_to_raster_map_to_see">Det finns ingen offline vektorkarta för den här platsen. Du kan hämta en i Inställningar (Hantera kartfiler) eller byta till online-kartor (aktivera modulen för online-kartor för detta).</string>
     <string name="osmand_long_description_1000_chars">OsmAnd (OSM Automated Navigation Directions)
@@ -247,7 +247,7 @@
     <string name="direction_style_sidewise">Sidled (8 sektorer)</string>
     <string name="direction_style_clockwise">Medurs (12 sektorer)</string>
     <string name="settings_direction_style">Riktningsstil</string>
-    <string name="settings_direction_style_descr">Välj sätt att uttrycka relativa riktningar under rörelse.</string>
+    <string name="settings_direction_style_descr">Välj sätt att uttrycka relativa riktningar under rörelse</string>
     <string name="auto_announce_on">Börja meddela automatiskt</string>
     <string name="auto_announce_off">Sluta meddela automatiskt</string>
     <string name="i_am_here">Jag är här</string>
@@ -335,7 +335,7 @@
     <string name="animate_route">Starta simuleringen</string>
     <string name="file_can_not_be_renamed">Filen kan inte döpas om.</string>
     <string name="file_with_name_already_exists">En fil med det namnet finns redan.</string>
-    <string name="poi_query_by_name_matches_categories">Hittade flera POI-kategorier som matchar frågan:</string>
+    <string name="poi_query_by_name_matches_categories">Hittade flera relaterade IP-kategorier.</string>
     <string name="data_to_search_poi_not_available">Lokala data för att söka POI är inte tillgängliga.</string>
     <string name="poi_filter_by_name">Sök efter namn</string>
     <string name="old_poi_file_should_be_deleted">POI-datafilen \'%1$s\' är överflödig och kan tas bort.</string>
@@ -388,7 +388,7 @@
     <string name="local_indexes_cat_poi">Intressepunktsdata</string>
     <string name="ttsvoice">TTS-röst</string>
     <string name="search_offline_clear_search">Ny sökning</string>
-    <string name="map_text_size_descr">Välj textstorlek för namn på kartan.</string>
+    <string name="map_text_size_descr">Textstorlek för namn på kartan:</string>
     <string name="map_text_size">Teckenstorlek på karta</string>
     <string name="trace_rendering">Renderingsfelsökningsinformation</string>
     <string name="trace_rendering_descr">Visa renderingsprestanda.</string>
@@ -415,10 +415,10 @@
     <string name="map_transparency">Transparens för baskartan</string>
     <string name="layer_underlay">Underläggskarta …</string>
     <string name="map_underlay">Underläggskarta</string>
-    <string name="map_underlay_descr">Välj underläggskarta.</string>
+    <string name="map_underlay_descr">Välj underläggskarta</string>
     <string name="layer_overlay">Överläggskarta …</string>
     <string name="map_overlay">Överläggskarta</string>
-    <string name="map_overlay_descr">Välj överläggskarta.</string>
+    <string name="map_overlay_descr">Välj överläggskarta</string>
     <string name="tile_source_already_installed">Kartan är redan installerad; inställningarna kommer att uppdateras.</string>
     <string name="select_tile_source_to_install">Välj kartor/kartrutor att installera eller uppdatera.</string>
     <string name="internet_not_available">En anslutning till Internet krävs för denna åtgärd men någon sådan är inte tillgänglig.</string>
@@ -470,7 +470,7 @@
     <string name="indexing_map">Indexerar kartan …</string>
     <string name="indexing_poi">Indexerar Intressepunkter …</string>
     <string name="indexing_transport">Indexerar transport …</string>
-    <string name="shared_string_io_error">Ett I/O-fel har inträffat</string>
+    <string name="shared_string_io_error">I/O-fel</string>
     <string name="km">km</string>
     <string name="km_h">km/h</string>
     <string name="m">m</string>
@@ -538,12 +538,12 @@
     <string name="maps_could_not_be_downloaded">Denna karta kunde inte laddas ner</string>
     <string name="continuous_rendering">Kontinuerlig rendering</string>
     <string name="continuous_rendering_descr">Visa kontinuerlig rendering istället för direkt-bild.</string>
-    <string name="rendering_exception">Ett fel uppstod vid renderingen av valt område</string>
+    <string name="rendering_exception">Det gick inte att rita valt område.</string>
     <string name="show_point_options">Använd platsen …</string>
     <string name="renderer_load_sucess">Renderaren lästes in</string>
-    <string name="renderer_load_exception">Kunde inte läsa in renderaren</string>
+    <string name="renderer_load_exception">Kunde inte ladda renderaren.</string>
     <string name="renderers">Vektorrenderare</string>
-    <string name="renderers_descr">Välj renderingsutseende.</string>
+    <string name="renderers_descr">Välj renderingsutseende</string>
     <string name="poi_context_menu_website">Visa POI-webbplats</string>
     <string name="poi_context_menu_call">Visa POI-telefon</string>
     <string name="osmand_routing_experimental">OsmAnd offline-navigering är en experimentell funktion och den fungerar inte för sträckor över c:a 20 km.\n\nNavigeringstjänsten är tillfälligt kopplad till online CloudMade.</string>
@@ -559,7 +559,7 @@
     <string name="voice">Inspelad röst</string>
     <string name="no_vector_map_loaded">Vektorkartorna lästes inte in</string>
     <string name="gpx_files_not_found">Hittar inga GPX-filer i spårmappen</string>
-    <string name="error_reading_gpx">Kunde inte läsa GPX-data</string>
+    <string name="error_reading_gpx">Kunde inte läsa GPX-data.</string>
     <string name="vector_data">Offline vektorkartor</string>
     <string name="transport_context_menu">Sök transport vid stopp</string>
     <string name="poi_context_menu_modify">Ändra Intressepunkt</string>
@@ -567,14 +567,14 @@
     <string name="rotate_map_compass_opt">Till kompass</string>
     <string name="rotate_map_bearing_opt">I färdriktningen</string>
     <string name="rotate_map_none_opt">Vrid inte (norr är uppåt)</string>
-    <string name="rotate_map_to_bearing_descr">Välj justering av kartskärmen.</string>
+    <string name="rotate_map_to_bearing_descr">Kartjustering:</string>
     <string name="rotate_map_to_bearing">Kartorientering</string>
     <string name="show_route">Ruttdetaljer</string>
     <string name="fav_imported_sucessfully">Favoriterna importerades utan problem</string>
     <string name="fav_file_to_load_not_found">GPX-fil med favoriter finns inte på {0}</string>
     <string name="fav_saved_sucessfully">Favoriterna sparade utan problem i {0}</string>
     <string name="no_fav_to_save">Inga favoritpunkter att spara</string>
-    <string name="error_occurred_loading_gpx">Kunde inte läsa in GPX</string>
+    <string name="error_occurred_loading_gpx">Kunde inte läsa in GPX.</string>
     <string name="send_report">Skicka rapport</string>
     <string name="none_region_found">Det gick inte att hitta några hämtade kartor på minneskortet.</string>
     <string name="poi_namefinder_query_empty">Ange sökfråga för att hitta POI</string>
@@ -596,9 +596,9 @@
     <string name="network_provider">Nätverk</string>
     <string name="gps_provider">GPS</string>
     <string name="int_seconds">sekunder</string>
-    <string name="background_service_int_descr">Ange väckningsintervall som används av bakgrundstjänsten.</string>
+    <string name="background_service_int_descr">Väckningsintervall som används av bakgrundstjänsten:</string>
     <string name="background_service_int">GPS-väckningsintervall</string>
-    <string name="background_service_provider_descr">Välj platsleverantör för bakgrundstjänsten.</string>
+    <string name="background_service_provider_descr">Platsmetod som används av bakgrundstjänsten:</string>
     <string name="background_service_provider">Platsleverantör</string>
     <string name="background_router_service_descr">Kör OsmAnd i bakgrunden för att spåra din position medan skärmen är avstängd.</string>
     <string name="background_router_service">Kör OsmAnd i bakgrunden</string>
@@ -635,7 +635,7 @@
     <string name="map_orientation_landscape">Liggande</string>
     <string name="map_screen_orientation">Skärmorientering</string>
     <string name="map_screen_orientation_descr">Stående, liggande eller som enheten.</string>
-    <string name="opening_hours_not_supported">Öppettider format stöds inte för redigering</string>
+    <string name="opening_hours_not_supported">Det går inte att ändra format för öppettider.</string>
     <string name="add_new_rule">Lägg till en ny regel</string>
     <string name="transport_Routes">Rutter</string>
     <string name="transport_Stop">Hållplats</string>
@@ -654,8 +654,8 @@
     <string name="show_transport_over_map">Visa hållplatser</string>
     <string name="hello">Navigationsappen OsmAnd</string>
     <string name="update_poi_success">POI-data uppdaterades ({0} lästes in)</string>
-    <string name="update_poi_error_local">Fel vid uppdatering av lokal POI-lista</string>
-    <string name="update_poi_error_loading">Kunde inte läsa in data från servern</string>
+    <string name="update_poi_error_local">Det gick inte att uppdatera den lokala POI-listan.</string>
+    <string name="update_poi_error_loading">Kunde inte läsa in data från servern.</string>
     <string name="update_poi_no_offline_poi_index">Inga offline POI-data tillgängliga för detta område</string>
     <string name="update_poi_is_not_available_for_zoom">Det går inte att uppdatera POI för små zoomnivåer</string>
     <string name="context_menu_item_update_poi">Uppdatera intressepunkt</string>
@@ -699,7 +699,7 @@
     <string name="loading_streets">Läser in gator…</string>
     <string name="loading_cities">Läser in städer…</string>
     <string name="poi">POI</string>
-    <string name="arrived_at_destination">Du har anlänt till din destination</string>
+    <string name="arrived_at_destination">Du har anlänt.</string>
     <string name="loading_data">Läser in data…</string>
     <string name="reading_indexes">Läser lokala data …</string>
     <string name="zxing_barcode_scanner_not_found">Appen ZXing Barcode Scanner är inte installerad. Vill du söka på Google Play?</string>
@@ -736,8 +736,8 @@
     <string name="favourites_remove_dialog_success">Favoritpunkten {0} togs bort utan problem.</string>
     <string name="osb_comment_dialog_message">Meddelande</string>
     <string name="osb_comment_dialog_author">Författarnamn</string>
-    <string name="osb_comment_dialog_success">Kommentaren lades till utan problem</string>
-    <string name="osb_comment_dialog_error">Ett undantagsfel inträffade: kommentaren lades inte till</string>
+    <string name="osb_comment_dialog_success">Kommentaren tillagd</string>
+    <string name="osb_comment_dialog_error">Det gick inte att lägga till kommentar.</string>
     <string name="poi_edit_title">Redigera POI</string>
     <string name="poi_create_title">Skapa POI</string>
     <string name="poi_remove_confirm_template">Ta bort {0} (ange kommentar)?</string>
@@ -750,7 +750,7 @@
     <string name="recording_context_menu_arecord">Gör en ljudanteckning</string>
     <string name="recording_context_menu_vrecord">Gör en videoanteckning</string>
     <string name="layer_recordings">Inspelningsskikt</string>
-    <string name="recording_can_not_be_played">Inspelningen kan inte spelas upp</string>
+    <string name="recording_can_not_be_played">Det gick inte att spela upp inspelningen.</string>
     <string name="recording_context_menu_delete">Ta bort inspelningen</string>
     <string name="recording_context_menu_play">Spela upp</string>
     <string name="recording_description">Inspelning %1$s %3$s %2$s</string>
@@ -759,7 +759,7 @@
     <string name="osmand_srtm_short_description_80_chars">OsmAnd-modul för höjdkurvor offline</string>
     <string name="map_widget_distancemeasurement">Avståndsmätning</string>
     <string name="map_widget_audionotes">Ljudanteckningar</string>
-    <string name="audionotes_plugin_description">Denna modul för ljud- och videoanteckningar erbjuder möjlighet att skapa ljud-/foto-/videoanteckningar under en resa, antingen med hjälp av en knapp på kartskärmen eller direkt i kontextmenyn för en position på kartan.</string>
+    <string name="audionotes_plugin_description">Gör ljud-/foto-/videoanteckningar under en resa, med antingen en kartknapp eller platsens snabbmeny.</string>
     <string name="audionotes_plugin_name">Ljud-/Videoanteckningar</string>
     <string name="index_srtm_parts">delar</string>
     <string name="index_srtm_ele">Höjdkurvor</string>
@@ -786,9 +786,9 @@
     <string name="dropbox_plugin_description">Dropbox-modulen låter dig synkronisera spår och ljud-/videoanteckningar med ditt Dropbox-konto.</string>
     <string name="srtm_paid_version_msg">Köp gärna pluginen Höjdkurvor på Market för att stödja fortsatt utveckling.</string>
     <string name="av_def_action_audio">Spela in ljud</string>
-    <string name="av_widget_action_descr">Välj standardåtgärd för widget.</string>
+    <string name="av_widget_action_descr">Standardåtgärd för widget:</string>
     <string name="av_widget_action">Standardåtgärd för widget</string>
-    <string name="av_video_format_descr">Välj videoformat.</string>
+    <string name="av_video_format_descr">Videoformat:</string>
     <string name="av_video_format">Videoformat</string>
     <string name="av_use_external_recorder_descr">Använd systemets inspelare för video.</string>
     <string name="av_use_external_recorder">Använd systemets inspelare</string>
@@ -811,10 +811,10 @@
     <string name="auth_failed">Åtkomst nekades</string>
     <string name="failed_op">misslyckades</string>
     <string name="converting_names">Konverterar inhemska/engelska namn…</string>
-    <string name="error_occurred_saving_gpx">Ett fel uppstod när GPX sparades</string>
-    <string name="error_calculating_route">Fel vid ruttberäkningen</string>
-    <string name="error_calculating_route_occured">Ett fel uppstod vid ruttberäkningen</string>
-    <string name="empty_route_calculated">Fel: Den beräknade rutten är tom</string>
+    <string name="error_occurred_saving_gpx">Det gick inte att spara GPX-filen.</string>
+    <string name="error_calculating_route">Det gick inte att beräkna rutten.</string>
+    <string name="error_calculating_route_occured">Det gick inte att beräkna rutten.</string>
+    <string name="empty_route_calculated">Den beräknade rutten är tom.</string>
     <string name="invalid_locations">Ogiltiga koordinater</string>
     <string name="go_back_to_osmand">Tillbaka till OsmAnd-kartan</string>
     <string name="previous_run_crashed">Den senaste körningen av OsmAnd kraschade. Loggen finns i {0}. Rapportera felet och bifoga gärna loggfilen.</string>
@@ -830,7 +830,7 @@
     <string name="save_current_track_descr">Spara aktuellt spår till SD-kortet nu.</string>
     <string name="save_current_track">Spara aktuellt GPX-spår</string>
     <string name="save_track_interval">Loggningsintervall under navigering</string>
-    <string name="save_track_interval_descr">Välj loggningsintervall för inspelning av spår under navigering.</string>
+    <string name="save_track_interval_descr">Ange loggningsintervallet för spårinspelning under navigering</string>
     <string name="save_track_to_gpx_descrp">Ett GPX-spår sparas automatiskt i spårmappen under navigering.</string>
     <string name="save_track_to_gpx">Spela in spår automatiskt under navigering</string>
     <string name="update_tile">Uppdatera kartan</string>
@@ -928,7 +928,7 @@
     <string name="search_street_in_neighborhood_cities">Sök gator i grannstäder</string>
     <string name="intermediate_items_sort_return">Mellanliggande mål ordnade för att optimera deras ordning från aktuell position till destinationen.</string>
     <string name="intermediate_items_sort_by_distance">Sortera dörr-till-dörr</string>
-    <string name="local_osm_changes_backup_failed">Säkerhetskopieringen av OSM-ändringar misslyckades</string>
+    <string name="local_osm_changes_backup_failed">Det gick inte att säkerhetskopiera OSM-ändringar.</string>
     <string name="local_osm_changes_backup">Säkerhetskopiera som OSM-förändring</string>
     <string name="delete_point">Ta bort punkt</string>
     <string name="plugin_distance_point_time">tid</string>
@@ -996,7 +996,7 @@
     <string name="maps_define_edit">Definiera/Redigera …</string>
     <string name="base_world_map">Baskarta (världen)</string>
     <string name="av_camera_focus">Typ av kamerafokus</string>
-    <string name="av_camera_focus_descr">Välj läge för intern kamerafokus.</string>
+    <string name="av_camera_focus_descr">Kamerafokusläge:</string>
     <string name="av_camera_focus_auto">Autofokus</string>
     <string name="av_camera_focus_hiperfocal">Hyperfokal fokus</string>
     <string name="av_camera_focus_edof">Utökat skärpedjup (EDOF)</string>
@@ -1038,11 +1038,11 @@
     <string name="calculate_osmand_route_gpx">Beräkna OsmAnd offline-rutt</string>
     <string name="app_mode_truck">Lastbil</string>
     <string name="routing_attr_prefer_motorway_name">Föredra motorvägar</string>
-    <string name="routing_attr_prefer_motorway_description">Föredra motorvägar.</string>
+    <string name="routing_attr_prefer_motorway_description">Föredra motorvägar</string>
     <string name="routing_attr_avoid_toll_name">Undvik vägtullar</string>
     <string name="routing_attr_avoid_toll_description">Undvik vägtullar</string>
     <string name="routing_attr_avoid_unpaved_name">Undvik oasfalterade vägar</string>
-    <string name="routing_attr_avoid_unpaved_description">Undvik oasfalterade vägar.</string>
+    <string name="routing_attr_avoid_unpaved_description">Undvik oasfalterade vägar</string>
     <string name="routing_attr_avoid_ferries_name">Undvik färjor</string>
     <string name="routing_attr_avoid_ferries_description">Undvik färjor</string>
     <string name="routing_attr_avoid_motorway_name">Undvik motorvägar</string>
@@ -1219,7 +1219,7 @@
     <string name="arrival_distance_factor_late">Sent</string>
     <string name="arrival_distance_factor_at_last">De sista metrarna</string>
     <string name="av_camera_pic_size">Fotostorlek</string>
-    <string name="av_camera_pic_size_descr">Välj fotostorlek för den interna kameran.</string>
+    <string name="av_camera_pic_size_descr">Ställ in kamerans bildstorlek</string>
     <string name="rendering_value_car_name">Bil</string>
     <string name="rendering_value_bicycle_name">Cykel</string>
     <string name="rendering_value_pedestrian_name">Fotgängare</string>
@@ -1259,7 +1259,10 @@
     <string name="fav_point_emoticons_message">Vi ändrade namnet på din favoritpunkt till %1$s för att underlätta din smiley i filnamnet.</string>
     <string name="speed_limit_exceed_message">Välj hur mycket hastighetsgränsen måste överskridas för att du ska få ett röstmeddelande.</string>
     <string name="speed_limit_exceed">Tolerans för hastighetsgräns</string>
-    <string name="anonymous_user_hint">En anonym användare kan inte:\n- skapa grupper;\n- synkronisera grupper och enheter med servern;\n- hantera grupper och enheter på ett personligt ställe på webbplatsen.</string>
+    <string name="anonymous_user_hint">Anonyma användare kan inte:
+\n- Skapa grupper;
+\n- Synkronisera grupper och enheter med servern;
+\n- Hantera grupper och enheter i en personlig instrumentpanel på webbplatsen.</string>
     <string name="anonymous_user">Anonym användare</string>
     <string name="logged_as">Inloggad som %1$s</string>
     <string name="configure_map">Konfigurera kartan</string>
@@ -1347,8 +1350,8 @@
     <string name="get_plugin">Hämta</string>
     <string name="plugin_ski_name">Skidkartsvy</string>
     <string name="plugin_nautical_name">Sjökortsvy</string>
-    <string name="world_ski_missing">För att kunna visa skidkartor måste den speciella offline-kartan hämtas</string>
-    <string name="nautical_maps_missing">För att kunna visa sjökort måste den speciella offline-kartan hämtas</string>
+    <string name="world_ski_missing">Ladda ner den speciella offline-kartan för att visa skidåkning.</string>
+    <string name="nautical_maps_missing">Ladda ner den speciella offline-kartan för att visa nautiska detaljer.</string>
     <string name="rendering_attr_pisteGrooming_name">Pist- och spårpreparering</string>
     <string name="free">Ledigt %1$s</string>
     <string name="device_memory">Intern lagring</string>
@@ -1357,11 +1360,11 @@
     <string name="notes">Anteckningar</string>
     <string name="online_map">Online-karta</string>
     <string name="share_note">Dela anteckning</string>
-    <string name="plugin_nautical_descr">Om du aktiverar denna vy ändras kartstilen till Nautisk och visar alla sjömärken och sjökortssymboler. 
+    <string name="plugin_nautical_descr">Detta plugin berikar OsmAnds kart- och navigationsapp för att också producera nautiska kartor för båtliv, segling och andra typer av vattensporter.
 \n
-\nEn kartfil som innehåller alla nautiska symboler globalt finns tillgänglig som en enda nedladdning med namnet \'World seamarks\'. 
+\nEtt speciellt karttillägg för OsmAnd kommer att tillhandahålla alla nautiska navigationsmärken och kartsymboler, både för inland och för närliggande navigering. Beskrivningen av varje navigeringsmärke innehåller de detaljer som behövs för att identifiera dem och deras betydelse (kategori, form, färg, sekvens, referens etc.).
 \n
-\nDenna vy kan ändras genom att antingen inaktivera den här igen eller genom att ändra kartstilen under Konfigurera kartor.</string>
+\nFör att återgå till en av OsmAnds konventionella kartstilar, helt enkelt avaktivera detta plugin igen, eller ändra \'Kartstil\' under \'Konfigurera karta\' efter önskemål.</string>
     <string name="plugin_ski_descr">Detta plugin för OsmAnd ger dig detaljer om globala utförsåkning, längdskidspår, alpina skidvägar, linbanor och skidliftar. Rutter och pister visas färgkodade av svårigheter och avbildas i en speciell \"vinter\" -stil som liknar ett snöfärgat vinterlandskap.
 \n
 \nOm du aktiverar den här vyn ändras kartstilen till \"Vinter och skidor\" och visar alla landskapsfunktioner under vinterförhållanden. Denna vy kan återställas genom att antingen avaktivera den igen här, eller genom att ändra \'Kartstil\' under \'Konfigurera karta\' efter önskemål.</string>
@@ -1415,12 +1418,12 @@
     <string name="shared_string_more">Mer…</string>
     <string name="shared_string_more_actions">Fler åtgärder</string>
     <string name="shared_string_do_not_show_again">Visa inte nästa gång</string>
-    <string name="shared_string_remember_my_choice">Kom ihåg mitt val</string>
+    <string name="shared_string_remember_my_choice">Kom ihåg valet</string>
     <string name="shared_string_refresh">Uppdatera</string>
     <string name="shared_string_download">Hämta</string>
     <string name="shared_string_downloading">Laddar ner…</string>
-    <string name="shared_string_download_successful">Hämtningen lyckades</string>
-    <string name="shared_string_unexpected_error">Ett oväntat fel uppstod</string>
+    <string name="shared_string_download_successful">Nedladdat</string>
+    <string name="shared_string_unexpected_error">Oväntat fel</string>
     <string name="shared_string_action_template">Åtgärd {0}</string>
     <string name="shared_string_close">Stäng</string>
     <string name="shared_string_exit">Utgång</string>
@@ -1430,10 +1433,10 @@
     <string name="shared_string_map">Karta</string>
     <string name="shared_string_favorite">Favorit</string>
     <string name="shared_string_favorites">Favoriter</string>
-    <string name="shared_string_add_to_favorites">Lägg till i Favoriter</string>
+    <string name="shared_string_add_to_favorites">Lägg till i \'Favoriter\'</string>
     <string name="shared_string_my_location">Min position</string>
     <string name="shared_string_my_places">Mina platser</string>
-    <string name="shared_string_my_favorites">Mina favoriter</string>
+    <string name="shared_string_my_favorites">Favoriter</string>
     <string name="shared_string_tracks">Mina spår</string>
     <string name="shared_string_currently_recording_track">Spelar för tillfället in spår</string>
     <string name="shared_string_audio">Ljud</string>
@@ -1459,21 +1462,21 @@
     <string name="your_edits">Dina redigeringar</string>
     <string name="osmand_parking_overdue">över tiden</string>
     <string name="delay_to_start_navigation_descr">Ange väntetid att stanna kvar på ruttplaneringsskärmen.</string>
-    <string name="delay_to_start_navigation">Börja sväng-efter-sväng-navigering efter …</string>
+    <string name="delay_to_start_navigation">Starta sväng-för-sväng-vägledning efter …</string>
     <string name="shared_string_go">Kör</string>
-    <string name="local_osm_changes_upload_all_confirm">Du håller på att skicka %1$d ändring(ar) till OSM. Är du säker?</string>
-    <string name="confirmation_to_clear_history">Vill du tömma historiken?</string>
+    <string name="local_osm_changes_upload_all_confirm">Är du säker på att du vill ladda upp %1$d ändringar till OSM\?</string>
+    <string name="confirmation_to_clear_history">Rensa historik\?</string>
     <string name="current_route">Aktuell rutt</string>
     <string name="osm_changes_added_to_local_edits">OSM-ändringar lades till i lokala ändringar</string>
     <string name="mark_to_delete">Markera för att ta bort</string>
-    <string name="confirm_usage_speed_cameras">I många länder (Tyskland, Frankrike, Italien och andra) är det inte tillåtet att använda varningar för hastighetskameror. OsmAnd tar inget ansvar om du bryter mot lagen. Tryck på Ja endast om du får använda denna funktion.</string>
+    <string name="confirm_usage_speed_cameras">I många länder (Tyskland, Frankrike, Italien och andra) är användning av hastighetskameravarningar olaglig. OsmAnd tar inget ansvar om du bryter mot lagen. Klicka bara på \'Ja\' om du är berättigad att använda den här funktionen.</string>
     <string name="welmode_download_maps">Hämta kartor</string>
     <string name="welcome_select_region">För att avspegla dina trafiksignaler och -förordningar på ett korrekt sätt, välj den region du kör i:</string>
     <string name="welcome_text">OsmAnd erbjuder global frånkopplad kartsurfning och frånkopplad navigering.</string>
     <string name="welcome_header">Välkommen</string>
     <string name="agps_info">A-GPS-info</string>
     <string name="shared_string_message">Meddelande</string>
-    <string name="agps_data_last_downloaded">A-GPS-data senast nedladdade: %1$s</string>
+    <string name="agps_data_last_downloaded">A-GPS-data har laddats ner: %1$s</string>
     <string name="shared_string_do_not_use">Använd inte</string>
     <string name="shared_string_address">Adress</string>
     <string name="shared_string_show_description">Visa beskrivning.</string>
@@ -1488,9 +1491,9 @@
     <string name="index_name_netherlands">Europa - Nederländerna</string>
     <string name="rendering_value_highContrastRoads_name">Högkontrastvägar</string>
     <string name="rendering_value__name">Standard</string>
-    <string name="application_dir_change_warning3">Kopiera OsmAnds datafiler till den nya destinationen?</string>
+    <string name="application_dir_change_warning3">Flytta OsmAnds datafiler till den nya destinationen\?</string>
     <string name="specified_directiory_not_writeable">Kunde inte skapa kartor i den angivna mappen</string>
-    <string name="copying_osmand_file_failed">Kopieringen misslyckades</string>
+    <string name="copying_osmand_file_failed">Det gick inte att flytta filer</string>
     <string name="storage_directory_external">Extern lagring</string>
     <string name="storage_directory_multiuser">Lagring för flera användare</string>
     <string name="storage_directory_internal_app">Internt appminne</string>
@@ -1512,16 +1515,16 @@
     <string name="shared_string_wikipedia">Wikipedia</string>
     <string name="local_indexes_cat_wiki">Wikipedia</string>
     <string name="shared_string_show_details">Visa detaljer</string>
-    <string name="local_recordings_delete_all_confirm">Du håller på att ta bort %1$d anteckningar. Är du säker?</string>
+    <string name="local_recordings_delete_all_confirm">Är du säker på att du vill ta bort %1$d anteckningar\?</string>
     <string name="download_wikipedia_maps">Wikipedia</string>
     <string name="shared_string_import2osmand">Importera till OsmAnd</string>
     <string name="gps_network_not_enabled">Platstjänsten är av. Vill du slå på den\?</string>
     <string name="archive_wikipedia_data">Du har gamla och inkompatibla data från Wikipedia. Vill du arkivera dem?</string>
-    <string name="download_wikipedia_files">Hämta ytterligare data från Wikipedia (%1$s MB)?</string>
+    <string name="download_wikipedia_files">Hämta ytterligare data från Wikipedia (%1$s MB)\?</string>
     <string name="lang_vo">Volapük</string>
     <string name="lang_th">Thai</string>
     <string name="lang_te">Telugu</string>
-    <string name="lang_nn">Norska (nynorska)</string>
+    <string name="lang_nn">Norska (Nynorska)</string>
     <string name="lang_new">Newar/Nepal Bhasa</string>
     <string name="lang_ms">Malajiska</string>
     <string name="lang_ht">Haitiska</string>
@@ -1565,7 +1568,7 @@
     <string name="rendering_value_translucent_blue_name">Genomskinlig blå</string>
     <string name="rendering_value_purple_name">Purpur</string>
     <string name="rendering_value_translucent_purple_name">Genomskinlig purpur</string>
-    <string name="restart_is_required">Starta om appen manuellt för att ändringarna ska börja gälla.</string>
+    <string name="restart_is_required">En omstart krävs för att tillämpa ändringen.</string>
     <string name="rendering_attr_currentTrackColor_name">GPX-färg</string>
     <string name="rendering_value_yellow_name">Gul</string>
     <string name="rendering_value_default13_name">Standard (13)</string>
@@ -1589,8 +1592,8 @@
     <string name="shared_string_undo">ÅNGRA</string>
     <string name="shared_string_skip">Hoppa över</string>
     <string name="app_name_osmand">OsmAnd</string>
-    <string name="routing_attr_avoid_shuttle_train_name">Undvik pendeltåg</string>
-    <string name="routing_attr_avoid_shuttle_train_description">Undvik att använda pendeltåg</string>
+    <string name="routing_attr_avoid_shuttle_train_name">Inget pendeltåg</string>
+    <string name="routing_attr_avoid_shuttle_train_description">Undviker att använda pendeltåg</string>
     <string name="plugin_settings">Insticksprogram</string>
     <string name="traffic_warning_hazard">Varning</string>
     <string name="tab_title_basic">Grundläggande</string>
@@ -1600,7 +1603,7 @@
     <string name="opening_at">Öppnar</string>
     <string name="closing_at">Stänger</string>
     <string name="av_locations">Platser</string>
-    <string name="av_locations_descr">GPX-fil med anteckningar om platser.</string>
+    <string name="av_locations_descr">GPX-fil med platser.</string>
     <string name="poi_dialog_poi_type">Typ av POI</string>
     <string name="add_opening_hours">Lägg till öppettider</string>
     <string name="contact_info">Kontaktinformation</string>
@@ -1620,7 +1623,7 @@
     <string name="simulate_your_location_stop_descr">Sluta simulera din plats.</string>
     <string name="simulate_your_location_descr">Simulera din plats med en beräknad rutt eller med ett inspelat GPX-spår.</string>
     <string name="downloads_left_template">%1$s nedladdningar kvar</string>
-    <string name="favourites_edit_dialog_title">Information om favoriter</string>
+    <string name="favourites_edit_dialog_title">Favoritinformation</string>
     <string name="roads">Vägar</string>
     <string name="favourites_context_menu_add">Lägg till favorit</string>
     <string name="default_speed_system_descr">Ange enhet för hastighet.</string>
@@ -1634,12 +1637,12 @@
     <string name="si_nm_h">Sjömil per timme (knop)</string>
     <string name="shared_string_trip_recording">Inspelning av resa</string>
     <string name="shared_string_navigation">Navigering</string>
-    <string name="osmand_running_in_background">Körs i bakgrunden</string>
+    <string name="osmand_running_in_background">Kör i bakgrunden</string>
     <string name="favorite_category_add_new">Lägg till ny</string>
     <string name="favorite_category_select">Välj kategori</string>
     <string name="count_of_lines">Antal rader</string>
     <string name="nm">di</string>
-    <string name="nm_h">M</string>
+    <string name="nm_h">knop</string>
     <string name="min_mile">min/mi</string>
     <string name="min_km">min/km</string>
     <string name="m_s">m/s</string>
@@ -1653,7 +1656,7 @@
     <string name="activate_srtm_plugin">Aktivera modulen SRTM</string>
     <string name="later">Senare</string>
     <string name="get_full_version">Fullversionen</string>
-    <string name="favorite_category_dublicate_message">Det angivna kategorinamnet finns redan. Ange ett annat namn.</string>
+    <string name="favorite_category_dublicate_message">Använd ett kategorinamn som inte redan finns.</string>
     <string name="favorite_category_name">Kategorinamn</string>
     <string name="favorite_category_add_new_title">Lägg till en ny kategori</string>
     <string name="file_size_in_mb">%.1f MB</string>
@@ -1668,9 +1671,9 @@
     <string name="share_menu_location">Dela platsen</string>
     <string name="shared_string_send">Sänd</string>
     <string name="hillshade_layer_disabled">Skuggad relief-lager inaktiverat</string>
-    <string name="show_on_start_description">\'Av\' startar kartskärmen direkt.</string>
+    <string name="show_on_start_description">\'Av\' startar kartan direkt.</string>
     <string name="map_downloaded">Karta hämtad</string>
-    <string name="map_downloaded_descr">Kartan över %1$s har hämtats, och du kan nu börja använda den.</string>
+    <string name="map_downloaded_descr">%1$s -kartan är redo att användas.</string>
     <string name="go_to_map">Visa kartan</string>
     <string name="shared_string_qr_code">QR-kod</string>
     <string name="enter_country_name">Ange land</string>
@@ -1693,7 +1696,7 @@
     <string name="versions_item">Versioner</string>
     <string name="contact_us">Kontakta oss</string>
     <string name="osm_edit_created_poi">Skapat en OSM POI</string>
-    <string name="world_map_download_descr">Baskarta över världen (täcker hela världen med låg zoomningsgrad) saknas eller är gammal. Hämta gärna denna karta för en global översikt.</string>
+    <string name="world_map_download_descr">Världskarta (täcker hela världen vid låg zoomnivå) saknas eller är föråldrad. Överväg att ladda ner den för en global översikt.</string>
     <string name="shared_string_upload">Skicka</string>
     <string name="map_legend">Teckenförklaring</string>
     <string name="shared_string_update">Uppdatering</string>
@@ -1721,13 +1724,13 @@
     <string name="osn_comment_dialog_title">Lägg till kommentar</string>
     <string name="osn_reopen_dialog_title">Öppna anteckning igen</string>
     <string name="osn_close_dialog_title">Stäng anteckning</string>
-    <string name="osn_add_dialog_success">En anteckning har skapats utan problem</string>
-    <string name="osn_add_dialog_error">Ett undantag uppstod: anteckningen skapades inte</string>
-    <string name="osn_close_dialog_success">Anteckningen stängdes utan problem</string>
-    <string name="osn_close_dialog_error">Ett undantag uppstod: anteckningen stängdes inte</string>
+    <string name="osn_add_dialog_success">Anteckningen har skapats</string>
+    <string name="osn_add_dialog_error">Det gick inte att skapa anteckningen.</string>
+    <string name="osn_close_dialog_success">Anteckningen stängd</string>
+    <string name="osn_close_dialog_error">Det gick inte att stänga anteckningen.</string>
     <string name="context_menu_item_delete_waypoint">Ta bort GPX-waypoint?</string>
     <string name="context_menu_item_edit_waypoint">Redigera GPX-waypoint</string>
-    <string name="access_from_map_description">Menyknapp visar panelen och inte menyn.</string>
+    <string name="access_from_map_description">Menyknappen startar instrumentpanelen snarare än menyn</string>
     <string name="access_from_map">Tillgång från kartan</string>
     <string name="rendering_attr_currentTrackColor_description">GPX-färg</string>
     <string name="rendering_attr_currentTrackWidth_description">GPX-bredd</string>
@@ -1766,9 +1769,9 @@
     <string name="route_distance">Avstånd:</string>
     <string name="route_duration">Tid:</string>
     <string name="missing_write_external_storage_permission">Appen har inte tillåtelse att använda SD-kortet</string>
-    <string name="no_location_permission">Appen saknar behörigheter för att komma åt platsdata.</string>
-    <string name="no_camera_permission">Appen har inte tillräckliga behörigheter för att komma åt kameran.</string>
-    <string name="no_microphone_permission">Appen har inte tillräckliga behörigheter för att komma åt mikrofonen.</string>
+    <string name="no_location_permission">Ge platsåtkomst.</string>
+    <string name="no_camera_permission">Ge kameraåtkomst.</string>
+    <string name="no_microphone_permission">Ge mikrofonåtkomst.</string>
     <string name="select_voice_provider">Välj röstvägledning</string>
     <string name="select_voice_provider_descr">Välj eller hämta röstvägledning för ditt språk.</string>
     <string name="impassable_road_desc">Välj de vägar du vill undvika under navigering.</string>
@@ -1785,12 +1788,12 @@
     <string name="weekly">Varje vecka</string>
     <string name="morning">Morgon</string>
     <string name="shared_string_not_selected">Inte markerad</string>
-    <string name="select_month_and_country">Välj månad och land</string>
+    <string name="select_month_and_country">Månad och land:</string>
     <string name="shared_string_type">Typ</string>
     <string name="starting_point">Startpunkt</string>
     <string name="item_removed">Post borttagen</string>
     <string name="n_items_removed">poster raderade</string>
-    <string name="shared_string_undo_all">ÅNGRA ALLA</string>
+    <string name="shared_string_undo_all">Ångra allt</string>
     <string name="rendering_attr_hideIcons_name">POI-ikoner</string>
     <string name="switch_start_finish">Skifta startpunkt och destination</string>
     <string name="number_of_contributors">Antal bidragsgivare</string>
@@ -1798,10 +1801,10 @@
     <string name="reports_for">Rapport för</string>
     <string name="shared_string_select">Välj</string>
     <string name="shared_string_remove">Ta bort</string>
-    <string name="clear_updates_proposition_message">Du kan ta bort hämtade uppdateringar och få tillbaka originalkartan</string>
+    <string name="clear_updates_proposition_message">Ta bort hämtade uppdateringar och få tillbaka originalkartan</string>
     <string name="add_time_span">Lägg till tidsspann</string>
     <string name="road_blocked">Blockerad väg</string>
-    <string name="data_is_not_available">Inga data tillgängliga</string>
+    <string name="data_is_not_available">Ingen data tillgänglig</string>
     <string name="rendering_attr_hideUnderground_name">Underjordiska objekt</string>
     <string name="shared_string_read_more">Läs mer</string>
     <string name="rec_split_storage_size">Lagringsutrymme</string>
@@ -1810,18 +1813,18 @@
     <string name="shared_string_save_changes">Spara ändringar</string>
     <string name="find_parking">Hitta en parkeringsplats</string>
     <string name="show_polygons">Visa polygoner</string>
-    <string name="rendering_attr_showMtbRoutes_name">Visa MTB-rutter</string>
+    <string name="rendering_attr_showMtbRoutes_name">Visa mountainbike spår</string>
     <string name="select_map_markers">Välj kartmarkörer</string>
     <string name="shared_string_reverse_order">Omvänd ordning</string>
     <string name="show_map_markers_description">Aktivera kartmarkörerna.</string>
-    <string name="clear_active_markers_q">Vill du ta bort alla aktiva markörer?</string>
-    <string name="clear_markers_history_q">Vill du radera kartmarkörshistoriken?</string>
+    <string name="clear_active_markers_q">Ta bort alla aktiva markörer\?</string>
+    <string name="clear_markers_history_q">Radera kartmarkörshistoriken\?</string>
     <string name="active_markers">Aktiva markörer</string>
     <string name="map_markers">Kartmarkörer</string>
     <string name="map_marker">Kartmarkör</string>
-    <string name="add_points_to_map_markers_q">Vill du lägga till alla punkter i Kartmarkörer?</string>
+    <string name="add_points_to_map_markers_q">Lägg till alla punkter som kartmarkörer\?</string>
     <string name="shared_string_add_to_map_markers">Lägg till i Kartmarkörer</string>
-    <string name="consider_turning_polygons_off">Rekommendationen är att slå av rendering av polygoner.</string>
+    <string name="consider_turning_polygons_off">Det är rekommenderat att slå av rendering av polygoner.</string>
     <string name="map_marker_1st">Första kartmarkör</string>
     <string name="map_marker_2nd">Andra kartmarkör</string>
     <string name="shared_string_toolbar">Verktygsfält</string>
@@ -1839,34 +1842,34 @@
     <string name="donations">Donationer</string>
     <string name="number_of_recipients">Antal mottagare</string>
     <string name="osm_user_stat">Redigeringar %1$s, rang %2$s, redigeringar totalt %3$s</string>
-    <string name="osm_editors_ranking">Ranglista OSM-redigerare</string>
+    <string name="osm_editors_ranking">OSM Editor rankning</string>
     <string name="osm_live_subscription">OsmAnd Live-prenumeration</string>
     <string name="osm_live_subscribe_btn">Prenumerera</string>
-    <string name="osm_live_email_desc">Krävs för att ge er information om bidrag.</string>
-    <string name="osm_live_user_public_name">Publikt namn</string>
+    <string name="osm_live_email_desc">Behövs för att uppdatera dig om dina bidrag.</string>
+    <string name="osm_live_user_public_name">Offentligt namn</string>
     <string name="osm_live_hide_user_name">Visa inte mitt namn i rapporter</string>
-    <string name="osm_live_month_cost">Månadskostnad</string>
-    <string name="osm_live_month_cost_desc">Månadsbetalning.</string>
+    <string name="osm_live_month_cost">Kostnad per månad</string>
+    <string name="osm_live_month_cost_desc">Månadsbetalning</string>
     <string name="osm_live_active">Aktiv</string>
     <string name="osm_live_not_active">Inaktiv</string>
     <string name="osm_live_enter_email">Ange en giltig e-postadress</string>
-    <string name="osm_live_enter_user_name">Ange publikt namn</string>
+    <string name="osm_live_enter_user_name">Ange ett offentligt namn</string>
     <string name="osm_live_thanks">Tack för att du stödjer OsmAnd!
 \nFör att aktivera alla nya funktioner behöver du starta om OsmAnd.</string>
     <string name="osm_live_region_desc">Delar av din donation kommer att skickas till OSM-användare som skickar in kartändringar i det området.</string>
     <string name="osm_live_subscription_settings">Prenumerationsinställningar</string>
-    <string name="osm_live_ask_for_purchase">Köp en OsmAnd Live-prenumeration först</string>
+    <string name="osm_live_ask_for_purchase">Köp först ett abonnemang på OsmAnd Live</string>
     <string name="show_transparency_seekbar">Visa transparent sökfält</string>
     <string name="recalculate_route">Beräkna om rutten</string>
     <string name="shared_string_topbar">Toppfält</string>
     <string name="storage_directory_shared">Delat minne</string>
     <string name="avoid_road">Undvik väg</string>
-    <string name="storage_directory_readonly_desc">Den för tillfället valda datalagringsmappen är skrivskyddad. Lagringsmappen har tillfälligt ändrats till internminnet. Välj en giltig datalagringsmapp.</string>
-    <string name="shared_string_move_up">Flytta upp</string>
-    <string name="shared_string_move_down">Flytta ned</string>
+    <string name="storage_directory_readonly_desc">Växlade till internminnet eftersom den valda datalagringsmappen är skrivskyddad. Välj en skrivbar lagringskatalog.</string>
+    <string name="shared_string_move_up">Flytta ↑</string>
+    <string name="shared_string_move_down">Flytta ↓</string>
     <string name="finish_navigation">Avsluta navigeringen</string>
     <string name="full_report">Fullständig rapport</string>
-    <string name="open_street_map_login_and_pass">OpenStreetMap inloggning och lösenord</string>
+    <string name="open_street_map_login_and_pass">OSM-användarnamn och lösenord</string>
     <string name="no_map_markers_found">Lägg till kartmarkörer via kartan</string>
     <string name="no_waypoints_found">Hittar inga waypoints</string>
     <string name="map_widget_bearing">Relativ bäring</string>
@@ -1897,12 +1900,12 @@
     <string name="rendering_value_medium_name">Mellan</string>
     <string name="rendering_value_bold_name">Tjock</string>
     <string name="report">Rapporter</string>
-    <string name="storage_permission_restart_is_required">Nu har appen tillåtelse att skriva till extern lagringsplats. En manuell omstart av appen krävs.</string>
+    <string name="storage_permission_restart_is_required">Appen får nu skriva till extern lagring, men måste startas igen för att göra det.</string>
     <string name="osm_live_support_region">Stödregion</string>
     <string name="osm_live_header">Denna prenumeration aktiverar uppdateringar varje timme av kartor runt omkring i världen.
 \nEn del av inkomsterna går tillbaka till OSM-gemenskapen och betalas ut för varje OSM-bidrag.
 \nOm du tycker om OsmAnd och OSM och vill stödja och stödjas av dem så är detta ett utmärkt sätt att göra det på.</string>
-    <string name="access_no_destination">Destinationen är inte fastställd</string>
+    <string name="access_no_destination">Tillgänglighetsplugin: Ingen destination inställd</string>
     <string name="map_widget_magnetic_bearing">Magnetisk bäring</string>
     <string name="rec_split_clip_length">Klipplängd</string>
     <string name="file_name_containes_illegal_char">Filnamnet innehåller ogiltiga tecken</string>
@@ -1968,7 +1971,7 @@
     <string name="no_inet_connection_desc_map">Krävs för att hämta kartor.</string>
     <string name="search_location">Söker efter plats…</string>
     <string name="storage_free_space">Oanvänt utrymme</string>
-    <string name="storage_place_description">OsmAnds lagringsplats för data (för kartor, GPX-filer med mera): %1$s.</string>
+    <string name="storage_place_description">OsmAnds lagringsplats för data (för kartor, spårfiler med mera): %1$s.</string>
     <string name="give_permission">Bevilja tillstånd</string>
     <string name="allow_access_location">Tillåt platsåtkomst</string>
     <string name="update_all_maps_now">Uppdatera alla kartor nu\?</string>
@@ -1978,7 +1981,7 @@
     <string name="replace_favorite_confirmation">Är du säker på att du vill ersätta favoriten %1$s?</string>
     <string name="clear_tile_data">Rensa alla rutor</string>
     <string name="search_hint">Ange stad, adress och POI-namn</string>
-    <string name="donation_to_osm">Donation till OpenStreetMap-gemenskapen</string>
+    <string name="donation_to_osm">Donation till OSM-communityn</string>
     <string name="get_it">Skaffa det</string>
     <string name="get_for">Skaffa för %1$s</string>
     <string name="skip_map_downloading_desc">Du har inte några offline-kartor installerade. Du kan välja en karta från listan eller hämta kartor senare via \'Meny - %1$s\'.</string>
@@ -1993,7 +1996,7 @@
     <string name="save_track_precision">Minsta loggningsprecision</string>
     <string name="save_track_precision_descr">Filter: Ingen loggning om inte denna noggrannhet uppnås.</string>
     <string name="christmas_poi">Jul-POI</string>
-    <string name="christmas_desc_q">Visa Jul-POI?</string>
+    <string name="christmas_desc_q">Visa POI:er för julhelgen\?</string>
     <string name="rendering_value_light_brown_name">Ljusbrun</string>
     <string name="rendering_value_dark_brown_name">Mörkbrun</string>
     <string name="rendering_attr_contourColorScheme_name">Färgschema för konturer</string>
@@ -2004,26 +2007,26 @@
     <string name="shared_string_recorded">Inspelat</string>
     <string name="shared_string_record">Spela in</string>
     <string name="gpx_logging_no_data">Inga data</string>
-    <string name="trip_rec_notification_settings_desc">Visa en systemavisering som gör att du kan starta trippinspelning.</string>
-    <string name="routing_attr_allow_motorway_name">Tillåt motorvägar</string>
-    <string name="routing_attr_allow_motorway_description">Tillåt motorvägar.</string>
+    <string name="trip_rec_notification_settings_desc">Visa ett systemmeddelande som gör det möjligt att starta trippinspelning.</string>
+    <string name="routing_attr_allow_motorway_name">Använd motorvägar</string>
+    <string name="routing_attr_allow_motorway_description">Tillåter motorvägar.</string>
     <string name="wiki_around">Närliggande Wikipedia-artiklar</string>
-    <string name="search_map_hint">Sök stad eller region</string>
+    <string name="search_map_hint">Stad eller region</string>
     <string name="route_roundabout_short">Tag den %1$d avfarten och kör</string>
     <string name="upload_poi">Ladda upp POI</string>
     <string name="route_calculation">Ruttberäkning</string>
-    <string name="gpx_no_tracks_title">Du har inga GPX-filer ännu</string>
-    <string name="gpx_no_tracks_title_folder">Du kan också lägga till GPX-filer i mappen</string>
+    <string name="gpx_no_tracks_title">Du har inga spårfiler än</string>
+    <string name="gpx_no_tracks_title_folder">Du kan också lägga till spårfiler i mappen</string>
     <string name="gpx_add_track">Lägg till mer…</string>
     <string name="shared_string_appearance">Utseende</string>
-    <string name="trip_rec_notification_settings">Aktivera snabbstart av inspelning</string>
-    <string name="christmas_desc">Med tanke på den kommande julen och nyåret så kan du välja att visa POI som har med julen att göra: julgranar, julmarknader med mera.</string>
+    <string name="trip_rec_notification_settings">Aktivera snabbinspelning</string>
+    <string name="christmas_desc">Förutse jul- och nyårsferier kan du välja att visa tillhörande intressepunkter som julgranar och marknader etc.</string>
     <string name="rendering_attr_contourWidth_name">Bredd på konturlinjen</string>
     <string name="rendering_attr_hideWaterPolygons_description">Vatten</string>
-    <string name="osm_live_payment_desc">Prenumerationsavgiften faktureras varje månad. Avbryt den när som helst i Google Play.</string>
-    <string name="donation_to_osm_desc">En del av din donation skickas till OSM-användare som skickar in ändringar till OpenStreetMap. Kostnaden för abonnemanget förblir densamma.</string>
+    <string name="osm_live_payment_desc">Prenumerationen debiteras per vald period. Avbryt det på Google Play när som helst.</string>
+    <string name="donation_to_osm_desc">En del av din donation skickas till OSM-bidragsgivare. Prenumerationskostnaden förblir densamma.</string>
     <string name="osm_live_subscription_desc">En prenumeration aktiverar uppdateringar varje timme, dag eller vecka och obegränsade nedladdningar av alla kartor globalt.</string>
-    <string name="osm_live_banner_desc">Erhåll obegränsade karthämtningar och kartuppdateringar oftare än en gång i månaden: varje vecka, dagligen eller varje timme.</string>
+    <string name="osm_live_banner_desc">Få obegränsad nedladdning av kartor, lägg till uppdateringar varje vecka, dagligen eller till och med varje timme.</string>
     <string name="rendering_value_low_name">Låg</string>
     <string name="rendering_attr_contourWidth_description">Bredd på konturlinjen</string>
     <string name="rendering_value_high_name">Hög</string>
@@ -2069,7 +2072,7 @@
 \n</string>
     <string name="navigate_point_olc_info_short">Kort OLC
 \nVänligen tillhandahåll fullständig kod</string>
-    <string name="file_can_not_be_moved">Filen kan inte flyttas.</string>
+    <string name="file_can_not_be_moved">Det gick inte att flytta filen.</string>
     <string name="shared_string_move">Flytta</string>
     <string name="shared_string_gpx_tracks">Spår</string>
     <string name="routing_attr_driving_style_name">Körstil</string>
@@ -2104,7 +2107,7 @@
     <string name="quick_action_add_marker_descr">Tryck på åtgärdsknappen sätter en kartmarkör i centrum av skärmen.</string>
     <string name="add_new_folder">Lägg till ny mapp</string>
     <string name="points_delete_multiple_succesful">Punkt(er) togs bort.</string>
-    <string name="points_delete_multiple">Du håller på att ta bort %1$d punkt(er). Är du säker?</string>
+    <string name="points_delete_multiple">Är du säker på att du vill ta bort %1$d punkt(er)\?</string>
     <string name="route_points_category_name">Kurvor att passera längs rutten</string>
     <string name="track_points_category_name">Vägpunkter, sevärdheter, namngivna funktioner</string>
     <string name="shared_string_gpx_track">Spår</string>
@@ -2135,25 +2138,25 @@
     <string name="select_street">Välj gator</string>
     <string name="shared_string_in_name">i %1$s</string>
     <string name="type_address">Ange adress</string>
-    <string name="type_city_town">Ange stad</string>
+    <string name="type_city_town">Skriv stad/samhälle/ort</string>
     <string name="type_postcode">Ange postnummer</string>
     <string name="nearest_cities">Närmaste städer</string>
     <string name="select_city">Välj stad</string>
-    <string name="select_postcode">Välj postnummer</string>
+    <string name="select_postcode">Postnummer sökning</string>
     <string name="quick_action_auto_zoom">Autozoomning på/av</string>
-    <string name="quick_action_showhide_osmbugs_descr">Ett tryck på denna åtgärdsknapp visar eller döljer OSM-anteckningar på kartan.</string>
+    <string name="quick_action_showhide_osmbugs_descr">Knapp för att visa eller dölja OSM-anteckningar på kartan.</string>
     <string name="restart_search">Starta om sökningen</string>
     <string name="increase_search_radius">Utöka sökradien</string>
     <string name="nothing_found">Hittade ingenting</string>
-    <string name="nothing_found_descr">Ändra sökord eller utöka sökradien.</string>
+    <string name="nothing_found_descr">Ändra sökningen eller utöka sökradien.</string>
     <string name="sorted_by_distance">Sorterat efter avstånd</string>
-    <string name="search_favorites">Sök Favoriter</string>
+    <string name="search_favorites">Sök i Favoriter</string>
     <string name="shared_string_plugin">Insticksmodul</string>
     <string name="srtm_color_scheme">Färgschema</string>
     <string name="favorite_group_name">Gruppnamn</string>
     <string name="change_color">Ändra färg</string>
     <string name="edit_name">Redigera namn</string>
-    <string name="quick_action_add_destination">Lägg till destination</string>
+    <string name="quick_action_add_destination">Ange destination</string>
     <string name="quick_action_replace_destination">Ersätt destination</string>
     <string name="no_overlay">Inget överlägg</string>
     <string name="no_underlay">Inget underlägg</string>
@@ -2162,12 +2165,12 @@
     <string name="shared_string_visible">Synlig</string>
     <string name="online_photos">Online-foton</string>
     <string name="shared_string_add_photos">Lägg till foton</string>
-    <string name="no_photos_descr">Vi har inga foton från denna plats.</string>
+    <string name="no_photos_descr">Inga foton här.</string>
     <string name="mapillary_widget">Mapillary-widget</string>
     <string name="mapillary">Mapillary</string>
     <string name="shared_string_install">Installera</string>
     <string name="shared_string_permissions">Tillstånd</string>
-    <string name="import_gpx_failed_descr">OsmAnd kan inte importera filen. Kolla om OsmAnd har tillåtelse att läsa filen från sin plats.</string>
+    <string name="import_gpx_failed_descr">Kan inte importera filen. Kolla om OsmAnd har tillåtelse att läsa filen.</string>
     <string name="distance_moving">Distansen korrigerad</string>
     <string name="enter_new_name">Ange nytt namn</string>
     <string name="shared_string_back">Bakåt</string>
@@ -2179,15 +2182,15 @@
     <string name="round_trip">Rundtur</string>
     <string name="make_round_trip">Gör en rundtur</string>
     <string name="shared_string_markers">Markörer</string>
-    <string name="routing_attr_avoid_ice_roads_fords_name">Undvik isvägar och vadställen</string>
-    <string name="routing_attr_avoid_ice_roads_fords_description">Undvik isvägar och vadställen.</string>
+    <string name="routing_attr_avoid_ice_roads_fords_name">Inga isvägar eller vadställen</string>
+    <string name="routing_attr_avoid_ice_roads_fords_description">Undviker isvägar och vadställen.</string>
     <string name="my_location">Min plats</string>
     <string name="shared_string_sort">Sortera</string>
     <string name="move_to_history">Flytta till historiken</string>
     <string name="show_arrows_on_the_map">Visa pilar på kartan</string>
     <string name="show_passed">Visa passerade</string>
     <string name="hide_passed">Dölj passerade</string>
-    <string name="remove_from_map_markers">Tag bort från kartmarkörer\'</string>
+    <string name="remove_from_map_markers">Tag bort från \'Kartmarkörer\'</string>
     <string name="shared_string_list">Lista</string>
     <string name="shared_string_groups">Grupper</string>
     <string name="passed">Senast använt: %1$s</string>
@@ -2212,7 +2215,7 @@
     <string name="mapillary_menu_title_dates">Datum</string>
     <string name="mapillary_menu_edit_text_hint">Ange användarnamn</string>
     <string name="mapillary_menu_title_username">Användarnamn</string>
-    <string name="animate_my_location">Animera min plats</string>
+    <string name="animate_my_location">Animera din egen position</string>
     <string name="analyze_on_map">Analysera på kartan</string>
     <string name="restore_purchases">Återställ köp</string>
     <string name="shared_string_paused">Pausad</string>
@@ -2229,12 +2232,12 @@
     <string name="plan_route">Planera rutt</string>
     <string name="marker_save_as_track_descr">Exportera dina markörer till följande GPX-fil:</string>
     <string name="group_will_be_removed_after_restart">Gruppen kommer att försvinna nästa gång du startar appen.</string>
-    <string name="date_added">Datum tillagd</string>
+    <string name="date_added">Tillagd</string>
     <string name="order_by">Ordna efter:</string>
     <string name="all_markers_moved_to_history">Alla kartmarkörer har flyttats till historiken</string>
     <string name="marker_moved_to_history">Kartmarkören har flyttats till historiken</string>
     <string name="do_not_use_animations">Inga animeringar</string>
-    <string name="do_not_use_animations_descr">Inaktiverar animeringar i appen.</string>
+    <string name="do_not_use_animations_descr">Stänger av kartanimationer.</string>
     <string name="line">Linje</string>
     <string name="save_as_route_point">Spara som ruttpunkter</string>
     <string name="save_as_line">Spara som linje</string>
@@ -2245,14 +2248,14 @@
     <string name="measurement_tool_save_as_new_track_descr">Spara punkterna antingen som ruttpunkter eller som en linje.</string>
     <string name="none_point_error">Lägg till minst en punkt.</string>
     <string name="show_on_map_after_saving">Visa på kartan när den sparats</string>
-    <string name="quick_action_resume_pause_navigation_descr">Peta på denna knapp för att pausa eller fortsätta med navigeringen.</string>
-    <string name="quick_action_start_stop_navigation_descr">Peta på denna knapp för att starta eller avsluta navigeringen.</string>
+    <string name="quick_action_resume_pause_navigation_descr">Knapp för att pausa eller fortsätta med navigeringen.</string>
+    <string name="quick_action_start_stop_navigation_descr">Knapp för att starta eller avsluta navigeringen.</string>
     <string name="mapillary_image">Mapillary-bild</string>
     <string name="open_mapillary">Öppna Mapillary</string>
     <string name="improve_coverage_mapillary">Förbättra fototäckning med Mapillary</string>
     <string name="mapillary_widget_descr">Möjliggör snabba bidrag till Mapillary.</string>
-    <string name="descendingly">nedåt</string>
-    <string name="ascendingly">uppåt</string>
+    <string name="descendingly">Z-A</string>
+    <string name="ascendingly">A-Z</string>
     <string name="marker_moved_to_active">Kartmarkören flyttad till aktiva</string>
     <string name="move_all_to_history">Flytta alla till historiken</string>
     <string name="keep_showing_on_map">Fortsätt att visa på kartan</string>
@@ -2268,9 +2271,9 @@
     <string name="import_file">Importera fil</string>
     <string name="wrong_input">Felaktig inmatning</string>
     <string name="waypoints_added_to_map_markers">Waypoints tillagda i kartmarkörer</string>
-    <string name="make_round_trip_descr">Lägg till kopia av startpunkten som destination.</string>
+    <string name="make_round_trip_descr">Lägg till kopia av avgångspunkten som destination.</string>
     <string name="fast_coordinates_input">Snabbinmatning av koordinater</string>
-    <string name="add_location_as_first_point_descr">Lägg till din position som första punkt för att planera den perfekta rutten.</string>
+    <string name="add_location_as_first_point_descr">Lägg till din position som avgångspunkt för att planera den perfekta rutten.</string>
     <string name="coordinate_input">Koordinatinmatning</string>
     <string name="modify_the_search_query">Ändra sökningen.</string>
     <string name="empty_state_osm_edits">Skapa eller ändra OSM-objekt</string>
@@ -2380,31 +2383,31 @@
     <string name="measurement_tool_snap_to_road_descr">Charlott ansluter punkter med vägar för den valda profilen.</string>
     <string name="mapillary_menu_descr_tile_cache">Uppdatera rutor för att se aktuell data.</string>
     <string name="mapillary_menu_title_tile_cache">Tile-cache</string>
-    <string name="mapillary_menu_filter_description">Filtrera bilderna enligt inlämnare eller datum. Filter tillämpas endast för närbildszoom.</string>
+    <string name="mapillary_menu_filter_description">Filtrera bilder efter avsändare, efter datum eller typ. Endast aktiv i närbildszoom.</string>
     <string name="map_widget_ruler_control">Radielinjal</string>
-    <string name="improve_coverage_install_mapillary_desc">Installera Mapillary för att lägga till en eller flera bilder till denna plats på kartan.</string>
-    <string name="mapillary_action_descr">Bidra med din egen gatnivåvy på denna plats via Mapillary.</string>
+    <string name="improve_coverage_install_mapillary_desc">Installera Mapillary för att lägga till bilder till denna plats på kartan.</string>
+    <string name="mapillary_action_descr">Dela din vy på gatunivå via Mapillary.</string>
     <string name="mapillary_descr">Online gatunivåbilder för alla. Upptäck platser, samarbeta, fånga världen.</string>
     <string name="plugin_mapillary_descr">Gatunivå bilder för alla. Upptäck platser, samarbeta, fånga världen.</string>
-    <string name="private_access_routing_req">Din destination är belägen i ett område med privat tillträde. Tillåt tillgång till privata vägar för denna resa?</string>
-    <string name="hillshade_menu_download_descr">För att se relief-höjdskuggning på kartan, hämta höjdskuggskartan för denna region.</string>
-    <string name="hillshade_purchase_header">För att se höjdskuggningsrelief på kartan, behöver du köpa och installera insticksmodulen \'Konturlinjer\'</string>
-    <string name="hide_from_zoom_level">Dölja från zoom-nivå</string>
-    <string name="srtm_menu_download_descr">Hämta \'konturlinjekarta\' över denna region.</string>
-    <string name="srtm_purchase_header">För att se höjdkurvor på kartan, behöver du köpa och installera insticksmodulen \'Konturlinjer\'</string>
+    <string name="private_access_routing_req">Din destination är belägen i ett område med privat tillträde. Tillåt anvädning av privata vägar för denna resa\?</string>
+    <string name="hillshade_menu_download_descr">Ladda ner \'Hillshade\' överläggskartan för att visa vertikal skuggning.</string>
+    <string name="hillshade_purchase_header">Installera plugin-programmet \'Contour lines\' för att visa graderade vertikala områden.</string>
+    <string name="hide_from_zoom_level">Dölj start från zoomnivå</string>
+    <string name="srtm_menu_download_descr">Ladda ner kartan \"Konturlinje\" för användning i denna region.</string>
+    <string name="srtm_purchase_header">Köp och installera pluginprogrammet \'Contour lines\' för att visa graderade vertikala områden.</string>
     <string name="show_from_zoom_level">Visa från zoom-nivå</string>
     <string name="routing_attr_allow_private_name">Tillåt privat åtkomst</string>
     <string name="routing_attr_allow_private_description">Tillåta åtkomst till privata områden.</string>
     <string name="display_zoom_level">Visa zoom-nivå: %1$s</string>
-    <string name="animate_my_location_desc">Aktivera kartpanoreringsanimation av \'Min Position\' under navigering.</string>
+    <string name="animate_my_location_desc">Aktivera animerad kartpanning av \"Min position\" under navigering.</string>
     <string name="shared_string_overview">Översikt</string>
-    <string name="quick_action_auto_zoom_desc">Ett tryck på den här åtgärdsknappen kommer att slå på/av automatisk zoomkarta enligt din hastighet.</string>
-    <string name="quick_action_auto_zoom_on">Aktivera autozoom karta</string>
-    <string name="quick_action_auto_zoom_off">Inaktivera autozoom karta</string>
+    <string name="quick_action_auto_zoom_desc">Knapp för att slå på eller av hastighetsstyrd automatisk zoom.</string>
+    <string name="quick_action_auto_zoom_on">Aktivera autozoom</string>
+    <string name="quick_action_auto_zoom_off">Inaktivera autozoom</string>
     <string name="quick_action_add_first_intermediate">Lägg till första mellanliggande</string>
-    <string name="quick_action_add_destination_desc">Genom att trycka på den här åtgärdsknappen blir skärmens mittpunkt resmålet, alla tidigare valda mål blir den senaste mellanliggande destinationen.</string>
-    <string name="quick_action_replace_destination_desc">Genom att trycka på den här åtgärdsknappen kan skärmen centrera den nya ruttdestinationen och ersätta den tidigare valda destinationen (om någon).</string>
-    <string name="quick_action_add_first_intermediate_desc">Genom att trycka på denna åtgärdsknapp kommer skärmens mittpunkt att bli den första mellanliggande destinationen.</string>
+    <string name="quick_action_add_destination_desc">En knapp för att göra skärmen centrerad till ruttdestinationen, en tidigare vald destination skulle bli den sista mellandestinationen.</string>
+    <string name="quick_action_replace_destination_desc">En knapp för att göra skärmen centrerad till den nya ruttdestinationen och ersätta den tidigare valda destinationen (om någon).</string>
+    <string name="quick_action_add_first_intermediate_desc">En knapp för att göra skärmens centrum till den första mellanliggande destinationen.</string>
     <string name="subscribe_email_desc">Anmäl dig till vår e-postlista om apprabatter och få 3 extra kartnedladdningar!</string>
     <string name="depth_contour_descr">Havsdjupskonturer och sjömärken.</string>
     <string name="sea_depth_thanks">Tack för att du köpt \"Nautiska djupkonturer\"</string>
@@ -2692,7 +2695,7 @@
 \nFrån Afghanistan till Zimbabwe, från Australien till USA. Argentina, Brasilien, Kanada, Frankrike, Tyskland, Mexiko, Storbritannien, Spanien, ...
 \n</string>
     <string name="quick_action_bug_descr">Detta meddelande ingår i kommentarsfältet.</string>
-    <string name="quick_action_category_descr">Välj kategorin du vill spara favoriten i.</string>
+    <string name="quick_action_category_descr">Kategori för att spara favoriten i:</string>
     <string name="quick_action_gpx_category_descr">Välj en valfri kategori.</string>
     <string name="quick_action_poi_list">POI-lista</string>
     <string name="quick_action_sh_poi_descr">Lägga till en eller flera POI-kategorier som ska visas på kartan.</string>
@@ -3341,4 +3344,67 @@
     <string name="trip_recording_logging_interval_info">Loggningsintervall ställde in den tidsperiod under vilken OsmAnd kommer att be om aktuell positionspositionsdata.</string>
     <string name="trip_recording_save_and_continue">Spara och fortsätt</string>
     <string name="lost_data_warning">All osparad data kommer att försvinna.</string>
+    <string name="specify_color_for_map_mode">Ange färg för kartläget: %1$s.</string>
+    <string name="no_purchases">Du har inga inköp</string>
+    <string name="new_device_account">Ny enhet / nytt konto</string>
+    <string name="contact_support_description">Om du har några frågor kan du kontakta oss på %1$s.</string>
+    <string name="empty_purchases_description">Om dina inköp inte visas här, tryck på \"%1$s\" eller kontakta vår support.</string>
+    <string name="contact_support">Kontakta supporten</string>
+    <string name="troubleshooting">Felsökning</string>
+    <string name="troubleshooting_description">Följ den här länken om du har problem med köpet.</string>
+    <string name="osmand_live">OsmAnd Live</string>
+    <string name="annual_subscription">Årlig prenumeration</string>
+    <string name="monthly_subscription">Månadspernumeration</string>
+    <string name="three_months_subscription">Tre månaders prenumeration</string>
+    <string name="next_billing_date">Nästa faktureringsdatum: %1$s</string>
+    <string name="osmand_live_cancelled">Avbruten</string>
+    <string name="renew_subscription">Förnya prenumerationen</string>
+    <string name="in_grace_period">I nådeperioden</string>
+    <string name="on_hold">Pausad</string>
+    <string name="shared_string_night_map">Nattkarta</string>
+    <string name="add_online_source">Lägg till onlinekälla</string>
+    <string name="clear_tiles_warning">Om du använder dessa ändringar raderas cachade data för denna kakelkälla</string>
+    <string name="vessel_height_warning_link">Ställ in fartygets höjd</string>
+    <string name="vessel_height_warning">Du kan ställa in fartygets höjd för att undvika låga broar. Tänk på att om bron är rörlig kommer vi att använda dess höjd i öppet tillstånd.</string>
+    <string name="vessel_height_limit_description">Ställ in fartygets höjd för att undvika låga broar. Tänk på att om bron är rörlig kommer vi att använda dess höjd i öppet tillstånd.</string>
+    <string name="vessel_width_limit_description">Ställ in fartygets bredd för att undvika smala broar</string>
+    <string name="quick_action_showhide_mapillary_descr">En växling för att visa eller dölja Mapillary-lagret på kartan.</string>
+    <string name="routing_attr_length_description">Ange tillåten fordonslängd på rutter.</string>
+    <string name="routing_attr_length_name">Längdsgräns</string>
+    <string name="shared_string_bearing">Bäring</string>
+    <string name="item_deleted">%1$s har tagits bort</string>
+    <string name="speed_cameras_restart_descr">Starta om appen för att radera all hastighetskameradata.</string>
+    <string name="shared_string_uninstall_and_restart">Avinstallera och starta om</string>
+    <string name="speed_cameras_removed_descr">Den här enheten har inte hastighetskameror.</string>
+    <string name="app_mode_inline_skates">Rullskridskor</string>
+    <string name="quick_action_remove_next_destination">Ta bort närmaste destination</string>
+    <string name="use_volume_buttons_as_zoom_descr">Kontrollera zoomningsnivån för kartan med volymknapparna på enheten.</string>
+    <string name="use_volume_buttons_as_zoom">Volymknappar som zoom</string>
+    <string name="please_provide_point_name_error">Ange ett namn för punkten</string>
+    <string name="quick_action_remove_next_destination_descr">Raderar nästa destination på din rutt. Om det är den slutliga destinationen kommer navigationen att stoppas.</string>
+    <string name="add_hidden_group_info">Den tillagda punkten kommer inte att synas på kartan, eftersom den valda gruppen är dold kan du hitta den i \"%s\".</string>
+    <string name="app_mode_enduro_motorcycle">Enduro motorcykel</string>
+    <string name="app_mode_motor_scooter">Skoter</string>
+    <string name="app_mode_wheelchair">Rullstol</string>
+    <string name="app_mode_wheelchair_forward">Rullstol framåt</string>
+    <string name="show_start_dialog">Visa startdialogrutan</string>
+    <string name="trip_recording_show_start_dialog_setting">Om den är inaktiverad startar inspelningen direkt efter att du har tryckt på widgeten eller menyalternativet och hoppat över bekräftelsedialogrutan.</string>
+    <string name="customize_route_line">Anpassa ruttlinjen</string>
+    <string name="shared_string_route_line">Ruttlinje</string>
+    <string name="route_line_use_map_style_appearance">Ruttlinje skulle användas %1$s som anges i vald kartstil: %2$s.</string>
+    <string name="expired">Upphörd</string>
+    <string name="release_4_0_beta">• OsmAnd Live-uppdateringar flyttade till \"Nedladdningar&gt; Uppdateringar\"
+\n
+\n• Spår kan nu färga efter höjd, hastighet eller lutning.
+\n
+\n• Lagt till alternativ för att ändra utseendet på navigeringslinjen
+\n
+\n• Uppdaterad \"Trip recording\" -dialog
+\n
+\n</string>
+    <string name="update_all_maps_added">Uppdatera alla kartor som lagts till i %1$s\?</string>
+    <string name="exit_number">Utgångsnummer</string>
+    <string name="announce_when_exceeded">Meddela när den överskrids</string>
+    <string name="user_points">Användarpunkter</string>
+    <string name="output">Utgång</string>
 </resources>

OsmAnd/res/values-tr/strings.xml

@@ -141,7 +141,7 @@
     <string name="download_select_map_types">Diğer haritalar</string>
     <string name="download_roads_only_item">Sadece yollar</string>
     <string name="download_srtm_maps">Eş yükselti eğrileri</string>
-    <string name="download_regular_maps">Standart Harita</string>
+    <string name="download_regular_maps">Standart harita</string>
     <string name="download_roads_only_maps">Yalnızca yolları gösteren harita</string>
     <string name="rendering_attr_noAdminboundaries_name">Sınırlar</string>
     <string name="rendering_attr_noAdminboundaries_description">Bölgesel sınırların gösterilmesini önle (yönetici seviyesi 5-9).</string>
@@ -824,7 +824,7 @@
     <string name="rotate_map_none_opt">Dönme yok (kuzey her zaman yukarı doğru)</string>
     <string name="rotate_map_to_bearing_descr">Harita hizalaması:</string>
     <string name="show_route">Güzergah ayrıntıları</string>
-    <string name="shared_string_import">İçe Aktar</string>
+    <string name="shared_string_import">İçe aktar</string>
     <string name="error_occurred_loading_gpx">GPX yüklenemedi.</string>
     <string name="none_region_found">Hafıza kartında herhangi bir indirilen harita bulunamadı.</string>
     <string name="poi_namefinder_query_empty">POI bulmak için yazın</string>
@@ -939,7 +939,7 @@
     <string name="switch_to_vector_map_to_see">Bu konum için çevrim dışı vektör haritası. 
 \n\t
 \n\tKullanmak için \'Menü\' → \'Harita Katmanları\' → \'Harita Kaynağı…\' → \'Çevrim dışı vektör haritalar\'.</string>
-    <string name="choose_audio_stream">Sesli yönlendirme çıktısı</string>
+    <string name="choose_audio_stream">Sesli yönlendirme çıkışı</string>
     <string name="choose_audio_stream_descr">Sesli yönlendirme için hoparlörü seçin.</string>
     <string name="voice_stream_voice_call">Telefon görüşmesi sesi (araç Bluetooth stereolarını kesmek için)</string>
     <string name="map_transparency_descr">Temel harita şeffaflığını ayarlayın.</string>
@@ -1153,7 +1153,7 @@
     <string name="plugin_ski_name">Kayak haritası görünümü</string>
     <string name="text_size">Yazı boyutu</string>
     <string name="text_size_descr">Haritadaki yazı boyutunu ayarla.</string>
-    <string name="speak_favorites">Yakınlardaki Sık Kullanılanlar</string>
+    <string name="speak_favorites">Yakındaki sık kullanılanlar</string>
     <string name="speak_poi">Yakınlardaki POI</string>
     <string name="duration">Süre</string>
     <string name="distance">Mesafe</string>
@@ -1432,7 +1432,7 @@
     <string name="max_level_download_tile">En fazla çevrim içi yakınlaştırma</string>
     <string name="max_level_download_tile_descr">Bunun ötesinde yakınlaştırma seviyeleri için çevrim içi haritalara göz atma.</string>
     <string name="fav_points_edited">En sevdiğim nokta düzenlendi</string>
-    <string name="fav_points_not_exist">Sık Kullanılanlara eklenen nokta bulunmuyor</string>
+    <string name="fav_points_not_exist">Sık kullanılanlara eklenen nokta yok</string>
     <string name="opening_changeset">Değişiklik listesi açılıyor…</string>
     <string name="closing_changeset">Değişiklik listesi kapatılıyor…</string>
     <string name="commiting_node">Düğüm işleniyor …</string>
@@ -1766,7 +1766,7 @@
     <string name="save_track_to_gpx">Navigasyon sırasında rotayı otomatik kaydet</string>
     <string name="save_track_to_gpx_descrp">Navigasyon sırasında GPX rotası otomatik olarak rotalar klasörüne kaydedilir.</string>
     <string name="save_track_interval_globally">Günlük aralığı</string>
-    <string name="save_track_interval">Navigasyon sırasında aralığı Günlüğü</string>
+    <string name="save_track_interval">Navigasyon sırasında kayıt aralığı</string>
     <string name="save_track_interval_descr">Navigasyon sırasında izlenen yol kaydı için kayıt aralığını belirtin</string>
     <string name="voice_provider_descr">Navigasyon için sesli yönlendirme seç.</string>
     <string name="enable_proxy_title">HTTP proxy\'sini etkinleştir</string>
@@ -2000,7 +2000,7 @@
     <string name="routing_attr_allow_private_name">Özel-arazi erişimine izin ver</string>
     <string name="routing_attr_allow_private_description">Özel-arazi alanlarına erişime izin ver.</string>
     <string name="display_zoom_level">Görüntü yakınlaştırma seviyesi: %1$s</string>
-    <string name="favorite_group_name">Grup ismi</string>
+    <string name="favorite_group_name">Grup adı</string>
     <string name="change_color">Renk değiştir</string>
     <string name="edit_name">Adı düzenle</string>
     <string name="animate_my_location">Kendi pozisyonunu canlandır</string>
@@ -2304,7 +2304,6 @@
     <string name="average_altitude">Ortalama yükseklik</string>
     <string name="routing_attr_relief_smoothness_factor_name">Yükseklikte dalgalanma seçin</string>
     <string name="routing_attr_height_obstacles_name">Yükseklik verisi kullan</string>
-
     <string name="search_map_hint">Şehir veya bölge</string>
     <string name="route_roundabout_short">%1$d çıkışa gir ve ilerle</string>
     <string name="gpx_no_tracks_title">Henüz yol dosyanız yok</string>
@@ -4006,4 +4005,94 @@
     <string name="activity_type_offroad_name">Arazi</string>
     <string name="activity_type_motorbike_name">Motosiklet</string>
     <string name="activity_type_car_name">Araba</string>
+    <string name="select_segments">Bölümleri seç</string>
+    <string name="select_segments_description">%1$s birden fazla bölüm içeriyor, navigasyon için gerekli kısmı seçmeniz gerekiyor.</string>
+    <string name="segments_count">Bölüm %1$d</string>
+    <string name="temporary_conditional_routing_descr">Şu anda haritada etkin olan yol kısıtlamalarını kullan</string>
+    <string name="routing_attr_short_way_description">Optimize edilmiş daha kısa güzergah (enerji tasarrufu)</string>
+    <string name="routing_attr_driving_style_description">Daha kısa, daha hızlı veya daha güvenli bir güzergah elde etmek için sürüş amacını seçin</string>
+    <string name="snap_to_road_descr">Geçerli konum simgesi, geçerli navigasyon güzergahına tutturulacaktır</string>
+    <string name="map_orientation_threshold_descr">Hız belli bir eşikten düşükse harita görünümünü döndürme</string>
+    <string name="restart">Yeniden başlat</string>
+    <string name="shared_strings_all_regions">Tüm bölgeler</string>
+    <string name="delete_number_files_question">%1$d dosya silinsin mi\?</string>
+    <string name="track_recording_stop_without_saving">Kaydetmeden durdur</string>
+    <string name="track_recording_save_and_stop">Kaydet ve kaydı durdur</string>
+    <string name="track_recording_title">Yol kaydı durduruldu</string>
+    <string name="track_recording_description">Kaydı durdurmak istediğinizden emin misiniz\?
+\nKaydedilmemiş tüm veriler kaybolacak.</string>
+    <string name="on_pause">Duraklatıldığında</string>
+    <string name="app_restart_required">Bazı ayarların uygulanması için uygulamanın yeniden başlatılması gerekiyor.</string>
+    <string name="routing_attr_height_obstacles_description">Yönlendirme, dik yokuşlardan kaçınabilir.</string>
+    <string name="quick_action_coordinates_widget_descr">Harita üzerinde koordinatlar widget\'ını göstermek veya gizlemek için bir geçiş.</string>
+    <string name="map_widget_distance_by_tap">Dokunma mesafesi</string>
+    <string name="latest_openstreetmap_update">En son OpenStreetMap güncellemesi:</string>
+    <string name="updated">Güncellendi: %s</string>
+    <string name="last_time_checked">Son denetleme: %s</string>
+    <string name="update_frequency">Güncelleme sıklığı</string>
+    <string name="live_update_frequency_week_variant">Harita güncellemeleri her hafta denetlenecek. Bir sonraki: %1$s, %2$s.</string>
+    <string name="live_update_frequency_day_variant">Harita güncellemeleri her gün denetlenecek. Bir sonraki: %1$s, %2$s.</string>
+    <string name="live_update_frequency_hour_variant">Harita güncellemeleri her saat denetlenecek. Bir sonraki: %1$s, %2$s.</string>
+    <string name="delete_updates">Güncellemeleri sil</string>
+    <string name="live_update_delete_updates_msg">%s canlı güncellemenin hepsini silmek istediğinizden emin misiniz\?</string>
+    <string name="purchases">Satın almalar</string>
+    <string name="select_category_descr">Kategori seçin veya yenisini ekleyin</string>
+    <string name="track_recording_will_be_continued">Kayıt devam edecek.</string>
+    <string name="copy_poi_name">POI adını kopyala</string>
+    <string name="quick_action_show_hide_title">Göster/gizle</string>
+    <string name="shared_string_interval">Aralık</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Doğa koruma bölgelerini, korunan alanları ve milli park sınırlarını gizleyin</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Doğa sınırları</string>
+    <string name="track_has_no_altitude">Yol, yükseklik verileri içermiyor.</string>
+    <string name="track_has_no_speed">Yol, hız verileri içermiyor.</string>
+    <string name="select_another_colorization">Lütfen başka bir renklendirme türü seçin.</string>
+    <string name="trip_recording_logging_interval_info">Kayıt aralığı, OsmAnd\'ın geçerli konum verilerini isteyeceği zaman aralığını ayarlar.</string>
+    <string name="trip_recording_save_and_continue">Kaydet ve devam et</string>
+    <string name="lost_data_warning">Kaydedilmemiş tüm veriler kaybolacak.</string>
+    <string name="show_start_dialog">Başlat iletişim kutusunu göster</string>
+    <string name="trip_recording_show_start_dialog_setting">Devre dışı bırakılırsa onay diyaloğu atlanarak, widget veya menü ögesine dokunduktan hemen sonra kayıt başlayacaktır.</string>
+    <string name="customize_route_line">Güzergah hattını özelleştir</string>
+    <string name="shared_string_route_line">Güzergah hattı</string>
+    <string name="route_line_use_map_style_appearance">Güzergah hattı, seçilen harita tarzında belirtilen %1$s seçeneğini kullanacaktır: %2$s.</string>
+    <string name="specify_color_for_map_mode">Harita modu için renk belirt: %1$s.</string>
+    <string name="no_purchases">Herhangi bir satın alma işleminiz yok</string>
+    <string name="new_device_account">Yeni aygıt / yeni hesap</string>
+    <string name="contact_support_description">Herhangi bir sorunuz varsa, lütfen %1$s üzerinden bizimle iletişime geçin.</string>
+    <string name="empty_purchases_description">Satın almalarınız burada görünmezse, “%1$s” seçeneğine dokunun veya destek ekibimizle iletişime geçin.</string>
+    <string name="contact_support">Destek hattına başvurun</string>
+    <string name="troubleshooting">Sorun giderme</string>
+    <string name="troubleshooting_description">Satın alma işlemleriyle ilgili herhangi bir sorununuz varsa lütfen bu bağlantıyı takip edin.</string>
+    <string name="osmand_live">OsmAnd Live</string>
+    <string name="annual_subscription">Yıllık abonelik</string>
+    <string name="monthly_subscription">Aylık abonelik</string>
+    <string name="three_months_subscription">Üç aylık abonelik</string>
+    <string name="next_billing_date">Sonraki faturalandırma tarihi: %1$s</string>
+    <string name="osmand_live_cancelled">İptal edildi</string>
+    <string name="renew_subscription">Aboneliği yenile</string>
+    <string name="in_grace_period">Ek süre içinde</string>
+    <string name="on_hold">Beklemede</string>
+    <string name="expired">Süresi doldu</string>
+    <string name="release_4_0_beta">• Eş yükselti eğrilerini fit cinsinden indirme seçeneği eklendi
+\n
+\n • Güzergah Planla görünümü: noktalar veya grafikler arasında geçiş yapmak için sekmeler eklendi
+\n
+\n • OsmAnd Live güncellemeleri \"İndirmeler &gt; Güncellemeler\" bölümüne taşındı
+\n
+\n • Yollar artık rakım, hız veya eğime göre renklendirilebilir
+\n
+\n • Navigasyon güzergah çizgisinin görünümünü değiştirme seçeneği eklendi
+\n
+\n • \"Seyahat kaydetme\" iletişim kutusu güncellendi
+\n
+\n</string>
+    <string name="update_all_maps_added">%1$s için eklenen tüm haritalar güncellensin mi\?</string>
+    <string name="exit_number">Çıkış numarası</string>
+    <string name="announce_when_exceeded">Aşıldığında duyur</string>
+    <string name="user_points">Kullanıcı puanları</string>
+    <string name="output">Çıkış</string>
+    <string name="map_quick_action_pattern">%1$s → …</string>
+    <string name="shared_string_feet">fit</string>
+    <string name="srtm_unit_format">Eş yükselti eğrileri birimi biçimi</string>
+    <string name="srtm_download_list_help_message">OsmAnd, metre ve fit cinsinden eş yükselti eğrileri verileri sağlar. Biçimi değiştirmek için dosyayı yeniden indirmeniz gerekecek.</string>
+    <string name="srtm_download_single_help_message">Lütfen gerekli biçimi seçin. Biçimi değiştirmek için dosyayı yeniden indirmeniz gerekecek.</string>
 </resources>

OsmAnd/res/values-tt/strings.xml

@@ -1 +1,142 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources/>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="mapillary_menu_edit_text_hint">Кулланучының исемен языгыз</string>
+    <string name="shared_string_move_up">Күчерү ↑</string>
+    <string name="shared_string_move_down">Күчерү ↓</string>
+    <string name="postcode">Почта индексы</string>
+    <string name="shared_string_is_open_24_7">24/7 ачык</string>
+    <string name="map_widget_search">Эзләү</string>
+    <string name="back_to_search">Эзләүгә кире кайту</string>
+    <string name="shared_string_move">Күчерү</string>
+    <string name="max_speed">Максималь тизлек</string>
+    <string name="mapillary">Mapillary</string>
+    <string name="open_mapillary">Mapillary ачу</string>
+    <string name="enter_gpx_name">GPX файл исеме:</string>
+    <string name="last_seven_days">Соңгы 7 көн</string>
+    <string name="yesterday">Кичә</string>
+    <string name="today">Бүген</string>
+    <string name="date_added">Өстәлде</string>
+    <string name="ascendingly">А-Я</string>
+    <string name="descendingly">Я-А</string>
+    <string name="shared_string_left">Сулда</string>
+    <string name="shared_string_right">Дөрес</string>
+    <string name="shared_string_two">Ике</string>
+    <string name="shared_string_one">Бер</string>
+    <string name="shared_string_added">Өстәлде</string>
+    <string name="shared_string_deleted">Бетерелде</string>
+    <string name="context_menu_read_full_article">Тулы мәкаләне уку</string>
+    <string name="context_menu_read_article">Мәкаләне уку</string>
+    <string name="osc_file">ОSС файл</string>
+    <string name="shared_string_gpx_file">GPX файл</string>
+    <string name="dd_mm_mmm_format">DD°MM.MMM′</string>
+    <string name="dd_mm_mmmm_format">DD°MM.MMMM′</string>
+    <string name="dd_ddddd_format">DD.DDDDD°</string>
+    <string name="dd_dddddd_format">DD.DDDDDD°</string>
+    <string name="dd_mm_ss_format">DD°MM′SS″</string>
+    <string name="delete_search_history">Эзләү тарихын бетерү</string>
+    <string name="download_images">Рәсемнәрне йөкләү</string>
+    <string name="shared_string_wikivoyage">Wikivoyage</string>
+    <string name="shared_string_read">Уку</string>
+    <string name="wikivoyage_download_pics">Рәсемнәрне йөкләү</string>
+    <string name="wikipedia_offline">Wikipedia оффлайн</string>
+    <string name="wikivoyage_offline">Wikivoyage оффлайн</string>
+    <string name="purchase_unlim_title">Сатып алу - %1$s</string>
+    <string name="download_file">Файлны йөкләү</string>
+    <string name="download_all">Барысын да йөкләү</string>
+    <string name="shared_string_bookmark">Кыстыргыч</string>
+    <string name="shared_string_world">Дөнья</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
+    <string name="osm_live_payment_discount_descr">%1$s саклау</string>
+    <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / ай</string>
+    <string name="osm_live_payment_month_cost_descr">%1$s / ай</string>
+    <string name="metric_ton">т</string>
+    <string name="cubic_m">м³</string>
+    <string name="rendering_attr_smoothness_very_bad_name">Бик начар</string>
+    <string name="rendering_attr_smoothness_bad_name">Начар</string>
+    <string name="rendering_attr_smoothness_good_name">Яхшы</string>
+    <string name="quick_action_day_night_mode">%s режим</string>
+    <string name="settings_routing_mode_string">Режим: %s</string>
+    <string name="app_mode_horse">Ат</string>
+    <string name="app_mode_taxi">Такси</string>
+    <string name="shared_string_no_thank_you">Юк, рәхмәт</string>
+    <string name="shared_string_file_is_saved">%s сакланган</string>
+    <string name="shared_string_default">Килешү</string>
+    <string name="price_and_discount">%1$s • %2$s саклау</string>
+    <string name="months_3">Өч ай</string>
+    <string name="month">Ай</string>
+    <string name="week">Атна</string>
+    <string name="day">Көн</string>
+    <string name="shared_string_other">Башка</string>
+    <string name="shared_string_select_folder">Папка…</string>
+    <string name="data_storage_preference_summary">%1$s • %2$s</string>
+    <string name="rendering_attr_piste_difficulty_connection_name">Бәйләнеш</string>
+    <string name="shared_string_osmand_usage">OsmAnd куллану</string>
+    <string name="shared_string_turn_off">Сүндерү</string>
+    <string name="selected_profile">Сайланган профиль</string>
+    <string name="select_color">Төсне сайлау</string>
+    <string name="login_and_pass">Кулланучы исеме һәм парол</string>
+    <string name="ltr_or_rtl_combine_via_slash">%1$s/%2$s</string>
+    <string name="shared_string_angle">Почмак</string>
+    <string name="n_items_of_z">%1$s / %2$s</string>
+    <string name="lang_tt">Татар</string>
+    <string name="lang_yo">Йоруба</string>
+    <string name="shared_string_all_languages">Барлык телләр</string>
+    <string name="lang_ba">Башкир</string>
+    <string name="lang_an">Арагон</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="shared_string_uninstall">Бетерү</string>
+    <string name="shared_string_meters">метр</string>
+    <string name="item_deleted">%1$s бетерелде</string>
+    <string name="shared_string_file_name">Файл исеме</string>
+    <string name="monitoring_control_start">REC</string>
+    <string name="use_live_routing">OsmAnd Live мәгълүматы</string>
+    <string name="use_live_public_transport">OsmAnd Live мәгълүматы</string>
+    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
+    <string name="icon_group_sport">Спорт</string>
+    <string name="use_login_password">Логин һәм парол куллану</string>
+    <string name="login_account">Хисап язмасы</string>
+    <string name="user_password">Парол</string>
+    <string name="user_login">Логин</string>
+    <string name="shared_string_last_used">Соңгы кулланылган</string>
+    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
+    <string name="shared_string_api_key">API ачкычы</string>
+    <string name="change_folder">Папканы үзгәртү</string>
+    <string name="shared_string_sec">сек</string>
+    <string name="upload_photo">Йөкләү</string>
+    <string name="activity_type_water_name">Су</string>
+    <string name="activity_type_winter_name">Кыш</string>
+    <string name="sort_last_modified">Соңгы үзгәртелде</string>
+    <string name="sort_name_descending">Исем: Я - A</string>
+    <string name="sort_name_ascending">Исем: А - Я</string>
+    <string name="routing_engine_vehicle_type_car">Машина</string>
+    <string name="activity_type_car_name">Машина</string>
+    <string name="shared_string_done">Булды</string>
+    <string name="osmand_live">OsmAnd Live</string>
+    <string name="other_menu_group">Бүтәннәр</string>
+    <string name="new_version">Яңа версия</string>
+    <string name="downloads">Йөкләүләр</string>
+    <string name="app_name_osmand">OsmAnd</string>
+    <string name="poi_dialog_poi_type">POI тибы</string>
+    <string name="rendering_value_white_name">Ак</string>
+    <string name="app_mode_osm">OSM</string>
+    <string name="live_monitoring_adress">Веб адрес</string>
+    <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
+    <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
+    <string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
+    <string name="shared_string_menu">Меню</string>
+    <string name="shared_string_languages">Телләр</string>
+    <string name="shared_string_language">Тел</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="sqlite_db_file">SQLiteDB файл</string>
+    <string name="shared_string_resume">Дәвам итү</string>
+    <string name="rendering_attr_hideWaterPolygons_description">Су</string>
+    <string name="shared_string_time">Вакыт</string>
+    <string name="shared_string_color">Төс</string>
+    <string name="driving_region_automatic">Автоматик</string>
+    <string name="subscribe_email_error">Хата</string>
+    <string name="edit_name">Исемне үзгәртү</string>
+    <string name="shared_string_reset">Бетерү</string>
+    <string name="mapillary_menu_title_username">Кулланучы исеме</string>
+    <string name="mapillary_menu_title_dates">Дата</string>
+    <string name="shared_string_install">Урнаштыру</string>
+</resources>