Merge branch 'master' into tp_to_native

OsmAnd-api/src/net/osmand/aidlapi/OsmAndCustomizationConstants.java

@@ -35,6 +35,7 @@ public interface OsmAndCustomizationConstants {
 	String POI_OVERLAY_LABELS_ID = SHOW_ITEMS_ID_SCHEME + "poi_overlay_labels";
 	String TRANSPORT_ID = SHOW_ITEMS_ID_SCHEME + "transport";
 	String GPX_FILES_ID = SHOW_ITEMS_ID_SCHEME + "gpx_files";
+	String WIKIPEDIA_ID = SHOW_ITEMS_ID_SCHEME + "wikipedia";
 	String MAP_MARKERS_ID = SHOW_ITEMS_ID_SCHEME + "map_markers";
 	String MAP_SOURCE_ID = SHOW_ITEMS_ID_SCHEME + "map_source";
 	String RECORDING_LAYER = SHOW_ITEMS_ID_SCHEME + "recording_layer";
@@ -71,6 +72,10 @@ public interface OsmAndCustomizationConstants {
 
 	//Map Context Menu Actions:
 	String MAP_CONTEXT_MENU_ACTIONS = "point.actions.";
+	String MAP_CONTEXT_MENU_ADD_ID = MAP_CONTEXT_MENU_ACTIONS + "add";
+	String MAP_CONTEXT_MENU_MARKER_ID = MAP_CONTEXT_MENU_ACTIONS + "marker";
+	String MAP_CONTEXT_MENU_SHARE_ID = MAP_CONTEXT_MENU_ACTIONS + "share";
+	String MAP_CONTEXT_MENU_MORE_ID = MAP_CONTEXT_MENU_ACTIONS + "more";
 	String MAP_CONTEXT_MENU_DIRECTIONS_FROM_ID = MAP_CONTEXT_MENU_ACTIONS + "directions_from";
 	String MAP_CONTEXT_MENU_SEARCH_NEARBY = MAP_CONTEXT_MENU_ACTIONS + "search_nearby";
 	String MAP_CONTEXT_MENU_CHANGE_MARKER_POSITION = MAP_CONTEXT_MENU_ACTIONS + "change_m_position";

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

@@ -2015,14 +2015,21 @@ public class GPXUtilities {
 						} else if (parse instanceof Track) {
 							if (tag.equals("name")) {
 								((Track) parse).name = readText(parser, "name");
-							}
+							} else if (tag.equals("desc")) {
-							if (tag.equals("desc")) {
 								((Track) parse).desc = readText(parser, "desc");
-							}
+							} else if (tag.equals("trkseg")) {
-							if (tag.equals("trkseg")) {
 								TrkSegment trkSeg = new TrkSegment();
 								((Track) parse).segments.add(trkSeg);
 								parserState.push(trkSeg);
+							} else if (tag.equals("trkpt") || tag.equals("rpt")) {
+								WptPt wptPt = parseWptAttributes(parser);
+								int size = ((Track) parse).segments.size();
+								if (size == 0) {
+									((Track) parse).segments.add(new TrkSegment());
+									size++;
+								}
+								((Track) parse).segments.get(size - 1).points.add(wptPt);
+								parserState.push(wptPt);
 							}
 						} else if (parse instanceof TrkSegment) {
 							if (tag.equals("trkpt") || tag.equals("rpt")) {
@@ -2061,8 +2068,10 @@ public class GPXUtilities {
 							} else if (tag.equals("speed")) {
 								try {
 									String value = readText(parser, "speed");
+									if (!Algorithms.isEmpty(value)) {
 										((WptPt) parse).speed = Float.parseFloat(value);
 										parse.getExtensionsToWrite().put("speed", value);
+									}
 								} catch (NumberFormatException e) {
 								}
 							} else if (tag.equals("link")) {

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

@@ -42,7 +42,7 @@ public class IndexConstants {
 
 	public static final String OSMAND_SETTINGS_FILE_EXT = ".osf";
 	
-	public static final String ROUTING_AND_RENDERING_FILE_EXT = ".xml";
+	public static final String ROUTING_FILE_EXT = ".xml";
 
 	public static final String RENDERER_INDEX_EXT = ".render.xml"; //$NON-NLS-1$
 	
@@ -73,4 +73,5 @@ public class IndexConstants {
 	public static final String SETTINGS_DIR = "settings/"; //$NON-NLS-1$
 	public static final String TEMP_DIR = "temp/";
 	public static final String ROUTING_PROFILES_DIR = "routing/";
+	public static final String PLUGINS_DIR = "plugins/";
 }

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

@@ -19,6 +19,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
 import java.util.zip.GZIPInputStream;
 
 import gnu.trove.list.array.TIntArrayList;
@@ -218,6 +220,13 @@ public class Amenity extends MapObject {
 		return lng;
 	}
 
+	public Set<String> getSupportedContentLocales() {
+		Set<String> supported = new TreeSet<>();
+		supported.addAll(getNames("content", "en"));
+		supported.addAll(getNames("description", "en"));
+		return supported;
+	}
+
 	public List<String> getNames(String tag, String defTag) {
 		List<String> l = new ArrayList<String>();
 		for (String nm : getAdditionalInfo().keySet()) {

OsmAnd-java/src/main/java/net/osmand/osm/MapPoiTypes.java

@@ -36,7 +36,10 @@ public class MapPoiTypes {
 	private PoiCategory otherCategory;
 	private PoiCategory otherMapCategory;
 
-	static final String OSM_WIKI_CATEGORY = "osmwiki";
+	public static final String WIKI_LANG = "wiki_lang";
+	public static final String WIKI_PLACE = "wiki_place";
+	public static final String OSM_WIKI_CATEGORY = "osmwiki";
+
 	private PoiTranslator poiTranslator = null;
 	private boolean init;
 	Map<String, PoiType> poiTypesByTag = new LinkedHashMap<String, PoiType>();
@@ -127,6 +130,28 @@ public class MapPoiTypes {
 		return lf;
 	}
 
+	public PoiCategory getOsmwiki() {
+		for (PoiCategory category : categories) {
+			if (category.isWiki()) {
+				return category;
+			}
+		}
+		return null;
+	}
+
+	public List<String> getAllAvailableWikiLocales() {
+		List<String> availableWikiLocales = new ArrayList<>();
+		for (PoiType type : getOsmwiki().getPoiTypeByKeyName(WIKI_PLACE).getPoiAdditionals()) {
+			String name = type.getKeyName();
+			String wikiLang = WIKI_LANG + ":";
+			if (name != null && name.startsWith(wikiLang)) {
+				String locale = name.substring(wikiLang.length());
+				availableWikiLocales.add(locale);
+			}
+		}
+		return availableWikiLocales;
+	}
+
 	private void sortList(List<? extends AbstractPoiType> lf) {
 		final Collator instance = Collator.getInstance();
 		Collections.sort(lf, new Comparator<AbstractPoiType>() {

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

@@ -119,7 +119,7 @@ public class BinaryRoutePlanner {
 				printMemoryConsumption("Memory occupied before exception : ");
 			}
 			if (ctx.memoryOverhead > ctx.config.memoryLimitation * 0.95) {
-				throw new IllegalStateException("There is no enough memory " + ctx.config.memoryLimitation / (1 << 20) + " Mb");
+				throw new IllegalStateException("There is not enough memory " + ctx.config.memoryLimitation / (1 << 20) + " Mb");
 			}
 			ctx.visitedSegments ++;
 			if (forwardSearch) {

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

@@ -173,7 +173,7 @@ public class RouteSegmentResult implements StringExternalizable<RouteDataBundle>
 		return res;
 	}
 
-	private int[][] convertPointNames(int[][] nameTypes, Map<RouteTypeRule, Integer> rules) {
+	private int[][] convertPointNames(int[][] nameTypes, String[][] pointNames, Map<RouteTypeRule, Integer> rules) {
 		if (nameTypes == null || nameTypes.length == 0) {
 			return null;
 		}
@@ -185,7 +185,7 @@ public class RouteSegmentResult implements StringExternalizable<RouteDataBundle>
 				for (int k = 0; k < types.length; k++) {
 					int type = types[k];
 					String tag = object.region.quickGetEncodingRule(type).getTag();
-					String name = object.pointNames[i][k];
+					String name = pointNames[i][k];
 					RouteTypeRule rule = new RouteTypeRule(tag, name);
 					Integer ruleId = rules.get(rule);
 					if (ruleId == null) {
@@ -281,7 +281,8 @@ public class RouteSegmentResult implements StringExternalizable<RouteDataBundle>
 		if (object.pointNameTypes != null && start < object.pointNameTypes.length) {
 			int[][] types = Arrays.copyOfRange(object.pointNameTypes, start, Math.min(end, object.pointNameTypes.length));
 			if (object.pointNames != null) {
-				bundle.putArray("pointNames", convertPointNames(types, rules));
+				String[][] names = Arrays.copyOfRange(object.pointNames, start, Math.min(end, object.pointNames.length));
+				bundle.putArray("pointNames", convertPointNames(types, names, rules));
 			}
 		}
 	}

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

@@ -29,7 +29,7 @@ public class RoutingConfiguration {
 	
 	// 1.1 tile load parameters (should not affect routing)
 	public int ZOOM_TO_LOAD_TILES = 16;
-	public int memoryLimitation;
+	public long memoryLimitation;
 
 	// 1.2 Build A* graph in backward/forward direction (can affect results)
 	// 0 - 2 ways, 1 - direct way, -1 - reverse way
@@ -98,12 +98,12 @@ public class RoutingConfiguration {
 			i.ZOOM_TO_LOAD_TILES = parseSilentInt(getAttribute(i.router, "zoomToLoadTiles"), i.ZOOM_TO_LOAD_TILES);
 			int desirable = parseSilentInt(getAttribute(i.router, "memoryLimitInMB"), 0);
 			if(desirable != 0) {
-				i.memoryLimitation = desirable * (1 << 20); 
+				i.memoryLimitation = desirable * (1l << 20);
 			} else {
 				if(memoryLimitMB == 0) {
 					memoryLimitMB = DEFAULT_MEMORY_LIMIT;
 				}
-				i.memoryLimitation = memoryLimitMB * (1 << 20);
+				i.memoryLimitation = memoryLimitMB * (1l << 20);
 			}
 			i.planRoadDirection = parseSilentInt(getAttribute(i.router, "planRoadDirection"), i.planRoadDirection);
 //			i.planRoadDirection = 1;

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

@@ -265,7 +265,7 @@ public class RoutingContext {
 	
 
 	
-	public RouteSegment loadRouteSegment(int x31, int y31, int memoryLimit) {
+	public RouteSegment loadRouteSegment(int x31, int y31, long memoryLimit) {
 		long tileId = getRoutingTile(x31, y31, memoryLimit);
 		TLongObjectHashMap<RouteDataObject> excludeDuplications = new TLongObjectHashMap<RouteDataObject>();
 		RouteSegment original = null;
@@ -443,7 +443,7 @@ public class RoutingContext {
 	}
 	
 	@SuppressWarnings("unused")
-	private long getRoutingTile(int x31, int y31, int memoryLimit) {
+	private long getRoutingTile(int x31, int y31, long memoryLimit) {
 		// long now = System.nanoTime();
 		long xloc = x31 >> (31 - config.ZOOM_TO_LOAD_TILES);
 		long yloc = y31 >> (31 - config.ZOOM_TO_LOAD_TILES);
@@ -515,11 +515,11 @@ public class RoutingContext {
 
 	
 	
-	public boolean checkIfMemoryLimitCritical(int memoryLimit) {
+	public boolean checkIfMemoryLimitCritical(long memoryLimit) {
 		return getCurrentEstimatedSize() > 0.9 * memoryLimit;
 	}
 	
-	public void unloadUnusedTiles(int memoryLimit) {
+	public void unloadUnusedTiles(long memoryLimit) {
 		float desirableSize = memoryLimit * 0.7f;
 		List<RoutingSubregionTile> list = new ArrayList<RoutingSubregionTile>(subregionTiles.size() / 2);
 		int loaded = 0;

OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java

@@ -39,7 +39,6 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -346,7 +345,7 @@ public class SearchUICore {
 		}
 	}
 	
-	public void setFilterOrders(Map<String, Integer> filterOrders) {
+	public void setFilterOrders(List<String> filterOrders) {
 		for (SearchCoreAPI capi : apis) {
 			if (capi instanceof SearchAmenityTypesAPI) {
 				((SearchAmenityTypesAPI) capi).setFilterOrders(filterOrders);

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

@@ -639,7 +639,7 @@ public class SearchCoreFactory {
 		private List<CustomSearchPoiFilter> customPoiFilters = new ArrayList<>();
 		private TIntArrayList customPoiFiltersPriorites = new TIntArrayList();
 		private MapPoiTypes types;
-		private Map<String, Integer> filterOrders = new HashMap<>();
+		private List<String> filterOrders = new ArrayList<>();
 
 		public SearchAmenityTypesAPI(MapPoiTypes types) {
 			super(ObjectType.POI_TYPE);
@@ -656,7 +656,7 @@ public class SearchCoreFactory {
 			this.customPoiFiltersPriorites.add(priority);
 		}
 
-		public void setFilterOrders(Map<String, Integer> filterOrders) {
+		public void setFilterOrders(List<String> filterOrders) {
 			this.filterOrders = filterOrders;
 		}
 
@@ -737,8 +737,8 @@ public class SearchCoreFactory {
 					res.firstUnknownWordMatches = startMatch.matches(res.localeName);
 					if (showTopFiltersOnly) {
 						String stdFilterId = getStandardFilterId(pt);
-						if (filterOrders.containsKey(stdFilterId)) {
+						if (filterOrders.contains(stdFilterId)) {
-							res.priority = SEARCH_AMENITY_TYPE_PRIORITY + filterOrders.get(stdFilterId);
+							res.priority = SEARCH_AMENITY_TYPE_PRIORITY + filterOrders.indexOf(stdFilterId);
 							resultMatcher.publish(res);
 						}
 					} else {
@@ -754,8 +754,8 @@ public class SearchCoreFactory {
 						res.object = csf;
 						res.objectType = ObjectType.POI_TYPE;
 						if (showTopFiltersOnly) {
-							if (filterOrders.containsKey(csf.getFilterId())) {
+							if (filterOrders.contains(csf.getFilterId())) {
-								res.priority = SEARCH_AMENITY_TYPE_PRIORITY + filterOrders.get(csf.getFilterId());
+								res.priority = SEARCH_AMENITY_TYPE_PRIORITY + filterOrders.indexOf(csf.getFilterId());
 								resultMatcher.publish(res);
 							}
 						} else {

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

@@ -9,6 +9,7 @@ import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.EOFException;
 import java.io.File;
@@ -30,6 +31,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 
 
 /**
@@ -104,6 +106,14 @@ public class Algorithms {
 		return name.substring(i + 1);
 	}
 
+	public static String getFileWithoutDirs(String name) {
+		int i = name.lastIndexOf(File.separator);
+		if (i != -1) {
+			return name.substring(i + 1);
+		}
+		return name;
+	}
+
 	public static File[] getSortedFilesVersions(File dir) {
 		File[] listFiles = dir.listFiles();
 		if (listFiles != null) {
@@ -464,9 +474,25 @@ public class Algorithms {
 		return responseBody;
 	}
 
-	public static String gzipToString(byte[] gzip) throws IOException {
+	public static String gzipToString(byte[] gzip) {
+		try {
 			GZIPInputStream gzipIs = new GZIPInputStream(new ByteArrayInputStream(gzip));
 			return readFromInputStream(gzipIs).toString();
+		} catch (IOException e) {
+			throw new IllegalStateException(e);
+		}
+	}
+	
+	public static byte[] stringToGzip(String str) {
+		try {
+			ByteArrayOutputStream bous = new ByteArrayOutputStream();
+			GZIPOutputStream gzout = new GZIPOutputStream(bous);
+			gzout.write(str.getBytes());
+			gzout.close();
+			return bous.toByteArray();
+		} catch (IOException e) {
+			throw new IllegalStateException(e);
+		}
 	}
 
 	public static boolean removeAllFiles(File f) {

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

@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="last_update_from_telegram_date"></string>
+</resources>

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

@@ -68,4 +68,5 @@
     <string name="timeline_no_data_descr">Nemáme nasbíraná data pro daný den</string>
     <string name="timeline_no_data">Žádná data</string>
     <string name="unit_of_length_descr">Zvolte, v čem se měří vzdálenost.</string>
+    <string name="units_and_formats">Jednotky a formáty</string>
 </resources>

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

@@ -12,7 +12,7 @@
     <string name="last_available_location">Sidste tilgængelige placering</string>
     <string name="sharing_status">Delingsstatus</string>
     <string name="location_sharing_status">Deling: %1$s</string>
-    <string name="shared_string_enabled">aktiveret</string>
+    <string name="shared_string_enabled">Aktiveret</string>
     <string name="shared_string_status">Status</string>
     <string name="no_gps_connection">Ingen GPX-forbindelse</string>
     <string name="no_internet_connection">Ingen internetforbindelse</string>
@@ -243,7 +243,7 @@
     <string name="min_logging_speed">Minimum logningshastighed</string>
     <string name="min_logging_speed_descr">Filter: ingen logning under den valgte hastighed</string>
     <string name="gpx_settings">GPX-indstillinger</string>
-    <string name="timeline_no_data_descr">Vi har ikke indsamlet data for den valgte dag</string>
+    <string name="timeline_no_data_descr">Der er ikke indsamlet data for den valgte dag</string>
     <string name="timeline_no_data">Ingen data</string>
     <string name="shared_string_end">Slut</string>
     <string name="shared_string_start">Start</string>

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

@@ -169,8 +169,8 @@
     <string name="stop_sharing_all">Die Freigabe ist eingeschaltet (ausschalten)</string>
     <string name="initialization">Startet</string>
     <string name="logging_out">Abmeldevorgang</string>
-    <string name="closing">Schliesst</string>
+    <string name="closing">Schließt</string>
-    <string name="gps_network_not_enabled">\"Standort\" einschalten\?</string>
+    <string name="gps_network_not_enabled">„Standort“ einschalten\?</string>
     <string name="live_now">Jetzt live</string>
     <string name="last_update_from_telegram">Letzte Aktualisierung von Telegram</string>
     <string name="send_location_as">Senden Standort als</string>

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

@@ -257,7 +257,7 @@
     <string name="unit_of_length">Unidades de longitud</string>
     <string name="unit_of_speed_system_descr">Definir la unidad de velocidad.</string>
     <string name="unit_of_speed_system">Unidad de velocidad</string>
-    <string name="buffer_time_descr">Tiempo después del cual se eliminarán los mensajes de ubicación almacenados en búfer</string>
+    <string name="buffer_time_descr">Tiempo máximo para almacenar puntos en el búfer</string>
     <string name="buffer_time">Tiempo de expiración del búfer</string>
     <string name="shared_string_suggested">Sugerido</string>
     <string name="status_widget_title">Estado de OsmAnd Tracker</string>
@@ -267,4 +267,5 @@
     <string name="last_update_from_telegram_duration">Última actualización desde Telegram: hace %1$s</string>
     <string name="last_response_duration">Última respuesta: hace %1$s</string>
     <string name="duration_ago">hace %1$s</string>
+    <string name="shared_string_error_short">ERR</string>
 </resources>

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

@@ -266,4 +266,5 @@
     <string name="last_update_from_telegram_duration">Viimane Telegram uuendus: %1$s tagasi</string>
     <string name="last_response_duration">Viimane vastus: %1$s tagasi</string>
     <string name="duration_ago">%1$s tagasi</string>
+    <string name="shared_string_error_short">ERR</string>
 </resources>

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

@@ -202,7 +202,69 @@
     <string name="status_widget_title">OsmAnd Tracker-en egoera</string>
     <string name="back_to_osmand">Atzera OsmAnd-era</string>
     <string name="last_response_date">Azken erantzuna: %1$s</string>
-    <string name="last_update_from_telegram_duration">"Telegram-en azken eguneraketa duela  %1$s"</string>
+    <string name="last_update_from_telegram_duration">Telegram-en azken eguneraketa duela %1$s</string>
     <string name="last_response_duration">Azken erantzuna duela %1$s</string>
     <string name="duration_ago">duela %1$s</string>
+    <string name="welcome_descr"><b>OsmAnd Tracker</b>-ri esker, kokapena partekatu dezakezu eta besteena OsmAnd-en ikus. <br/> <br/> Aplikazioak Telegram APIa erabiltzen du eta, beraz, Telegram kontua behar duzu.</string>
+    <string name="shared_string_authorization_descr">Sartu zure Telegram-eko telefono zenbakia nazioarteko formatuan</string>
+    <string name="osmand_service_descr">OsmAnd Tracker atzeko planoan exekutatzen da pantaila itzalita dagoenean.</string>
+    <string name="location_service_no_gps_available">Hautatu kokapen-hornitzaileetako bat zure kokapena partekatzeko.</string>
+    <string name="no_location_permission">Aplikazioak ez du kokapena atzitzeko baimenik.</string>
+    <string name="authentication_code_descr">"Telegramek kode bat bidali dizu OsmAnd-ek  zure kontuan saioa hasteko."</string>
+    <string name="my_location_search_hint">Bilaketa: Taldea edo kontaktua</string>
+    <string name="location_sharing_description">Hautatu kokapena partekatzeko kontaktuak eta taldeak.</string>
+    <string name="set_time">Ezarri denbora</string>
+    <string name="set_time_description">Ezarri aukeratutako kontaktu eta taldeek zure kokapena denbora errealean ikusiko duten denbora.</string>
+    <string name="visible_time_for_all">Guztientzako ikusgai dagoen denbora</string>
+    <string name="hours_format">%1$d h</string>
+    <string name="minutes_format">%1$d m</string>
+    <string name="hours_and_minutes_format">%1$d h %2$d m</string>
+    <string name="set_visible_time_for_all">Ezarri guztientzako ikusgai dagoen denbora</string>
+    <string name="enter_authentication_code">Sartu autentifikazio kodea</string>
+    <string name="do_not_have_telegram">Ez daukat Telegram kontua</string>
+    <string name="already_registered_in_telegram">Erregistratutako Telegram kontua eta telefono zenbakia behar dituzu</string>
+    <string name="get_telegram_after_creating_account">Ondoren aplikazio hau erabil dezakezu.</string>
+    <string name="get_telegram_account_first">Telegram kontua behar duzu kokapen-partekatzea erabiltzeko.</string>
+    <string name="get_telegram_title">Telegramen izena ematea</string>
+    <string name="stop_sharing_all">Partekatzea aktibatuta dago (desaktibatu)</string>
+    <string name="expire_at">Iraungitzea</string>
+    <string name="sharing_time">Partekatze-denbora</string>
+    <string name="send_my_location_desc">Ezarri kokapena partekatzeko gutxieneko tartea.</string>
+    <string name="stale_location">Ez da mugitzen</string>
+    <string name="stale_location_desc">Kontaktu bat mugitu zen azken aldia.</string>
+    <string name="location_history_desc">Ezkutatu denbora jakin batean mugitu ez diren kontaktuak</string>
+    <string name="osmand_connect">OsmAnd konexioa</string>
+    <string name="osmand_connect_desc">Aukeratu OsmAnd Tracker-ek posizioak bistaratzeko erabiliko duen OsmAnd bertsioa.</string>
+    <string name="in_time">%1$s-n</string>
+    <string name="logout_help_desc">Nola itzali OsmAnd Tracker Telegram-etik</string>
+    <string name="disconnect_from_telegram">Nola itzali OsmAnd Tracker Telegram-etik</string>
+    <string name="disconnect_from_telegram_desc">Kokapena partekatzeko sarbidea baliogabetzeko. Ireki Telegram, joan Ezarpenak → Pribatutasuna eta segurtasuna → Saioak eta amaitu OsmAnd Tracker saioa atalera.</string>
+    <string name="logout_no_internet_msg">"Konektatu Internetera Telegram saioa behar bezala  amaiatzeko."</string>
+    <string name="last_response">Azken erantzuna</string>
+    <string name="disable_all_sharing_desc">Kokapena partekatzea itzaltzen du hautatutako txat guztietan (%1$d).</string>
+    <string name="choose_osmand_desc">Hautatu kontaktuak mapan bistaratzeko OsmAnd bertsioa.</string>
+    <string name="by_group">Taldearen arabera</string>
+    <string name="by_name">Izenaren arabera</string>
+    <string name="by_distance">Distantziaren arabera</string>
+    <string name="logout_from_osmand_telegram">Amaitu OsmAnd Tracker saioa\?</string>
+    <string name="logout_from_osmand_telegram_descr">Ziur zaude OsmAnd Tracker saioa amaitu nahi duzula\? Ezingo duzu kokapena partekatu edo besteen kokapena ikusi</string>
+    <string name="live_now_description">Zurekin kokapena partekatzen duten kontaktuak eta taldeak.</string>
+    <string name="location_sharing_status">Partekatzen:% 1 $ s</string>
+    <string name="sharing_status">Partekatze egoera</string>
+    <string name="last_available_location">Azken kokapen eskuragarria</string>
+    <string name="not_found_yet">Oraindik ez da aurkitu</string>
+    <string name="not_sent_yet">Oraindik ez da bidali</string>
+    <string name="sharing_in_background">Atzeko planoan partekatzea</string>
+    <string name="battery_optimization_description">Itzali bateriaren optimizazioa OsmAnd Trackerrentzat, bat-batean itzali ez dadin bigarren planoan dagoela.</string>
+    <string name="background_work">Bigarren planoko lana</string>
+    <string name="background_work_description">Aldatu bateriaren optimizazio ezarpenak kokapena partekatzea egonkortzeko.</string>
+    <string name="waiting_for_response_from_telegram">Telegram-en erantzunaren zain</string>
+    <string name="not_possible_to_send_to_telegram_chats">Ezin da Telegrameko txatetara bidali:</string>
+    <string name="successfully_sent_and_updated">Ondo bidali eta eguneratua</string>
+    <string name="last_updated_location">Eguneratutako azken kokapena:</string>
+    <string name="share_location_as_description">Hainbat gailu Telegram kontu bakarrera konektatu nahi badituzu, gailu desberdinak erabili behar dituzu kokapena partekatzeko.</string>
+    <string name="share_location_as_description_second_line">Telegrama bezeroan gailuaren IDa sortu eta ikusi dezakezu %1$s txat bota erabiliz. % 2 $ s</string>
+    <string name="privacy_policy_agree">\"Jarraitu\" sakatuz, Telegram eta OsmAnd pribatutasun-politiken baldintzak onartzen dituzu.</string>
+    <string name="privacy_policy_telegram_client">OsmAnd tracker-ek Telegram plataforma irekia erabiltzen duten bezeroetako bat da. Zure kontaktuek Telegram-eko beste edozein bezero erabil dezakete.</string>
+    <string name="last_update_from_telegram_date">Telegram-eko azken eguneratzea: %1$s</string>
 </resources>

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

@@ -100,7 +100,7 @@
     <string name="app_name_short">OsmAnd Tracker</string>
     <string name="privacy_policy_use_telegram">Telegram (l\'application de messagerie) est utilisée pour se connecter et communiquer avec d\'autres personnes.</string>
     <string name="privacy_policy_telegram_client">OsmAnd tracker est l\'un des clients qui utilise la plateforme ouverte Telegram. Vos contacts peuvent utiliser n\'importe quel autre client Telegram.</string>
-    <string name="privacy_policy_agree">En appuyant sur « Continuer » vous acceptez les conditions des politiques de confidentialité de Telegram et d\'OsmAnd.</string>
+    <string name="privacy_policy_agree">En appuyant sur « Continuer » vous acceptez les conditions des politiques de confidentialité de Telegram et d\'OsmAnd.</string>
     <string name="telegram_privacy_policy">Politique de confidentialité de Telegram</string>
     <string name="osmand_privacy_policy">Politique de confidentialité d\'OsmAnd</string>
     <string name="how_it_works">Comment cela fonctionne</string>
@@ -144,4 +144,102 @@
     <string name="si_km_m">Kilomètres/mètres</string>
     <string name="si_nm">Miles nautiques</string>
     <string name="si_mi_meters">Miles / Mètres</string>
+    <string name="nm_h">nœuds</string>
+    <string name="shared_string_later">Plus tard</string>
+    <string name="shared_string_password">Mot de passe</string>
+    <string name="shared_string_distance">Distance</string>
+    <string name="si_nm_h">Miles nautiques par heure (nœuds)</string>
+    <string name="by_name">Par nom</string>
+    <string name="send_location_as_descr">Sélectionnez l\'apparence des messages contenant votre position.</string>
+    <string name="send_location_as">Envoyer la position</string>
+    <string name="open_in_osmand">Afficher dans OsmAnd</string>
+    <string name="last_update_from_telegram">Dernière mise à jour depuis Telegram</string>
+    <string name="disconnect_from_telegram">Comment désactiver OsmAnd Tracker de Telegram</string>
+    <string name="logout_help_desc">Comment désactiver OsmAnd Tracker de Telegram</string>
+    <string name="logout_no_internet_msg">Connectez-vous à Internet pour vous déconnecter correctement de Telegram.</string>
+    <string name="turn_off_all">Désactiver tout</string>
+    <string name="disable_all_sharing">Désactiver tout partage</string>
+    <string name="disable_all_sharing_desc">Désactive le partage de position pour toutes les discussions sélectionnées (%1$d).</string>
+    <string name="choose_osmand">Sélectionnez la version OsmAnd à utiliser</string>
+    <string name="choose_osmand_desc">Sélectionnez la version OsmAnd où les contacts seront affichés sur la carte.</string>
+    <string name="sharing_status">Partage de l\'état</string>
+    <string name="osmand_service">Mode arrière-plan</string>
+    <string name="timeline">Chronologie</string>
+    <string name="live_now">En direct maintenant</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="shared_string_welcome">Bienvenue</string>
+    <string name="shared_string_authorization_descr">Veuillez entrer votre numéro de téléphone Telegram au format international</string>
+    <string name="shared_string_authorization">Autorisation</string>
+    <string name="active_chats">Discussions actives</string>
+    <string name="show_users_on_map">Afficher les utilisateurs sur la carte</string>
+    <string name="install_osmand">Installer OsmAnd</string>
+    <string name="osmand_logo">Logo OsmAnd</string>
+    <string name="process_service">Service OsmAnd Tracker</string>
+    <string name="sharing_location">Partage de la position</string>
+    <string name="share_location">Partager la position</string>
+    <string name="not_logged_in">Vous n\'êtes pas connecté·e</string>
+    <string name="gps_network_not_enabled">Activer la « position » \?</string>
+    <string name="closing">Fermeture</string>
+    <string name="logging_out">Déconnexion</string>
+    <string name="initialization">Démarrage</string>
+    <string name="shared_string_logout">Se déconnecter</string>
+    <string name="shared_string_login">Se connecter</string>
+    <string name="password_descr">Mot de passe Telegram</string>
+    <string name="enter_password">Entrez le mot de passe</string>
+    <string name="authentication_code_descr">Telegram vous a envoyé un code pour que OsmAnd se connecte à votre compte.</string>
+    <string name="authentication_code">Code d\'authentification</string>
+    <string name="enter_code">Entrez le code</string>
+    <string name="hours_and_minutes_format">%1$d h %2$d min</string>
+    <string name="hours_format">%1$d h</string>
+    <string name="minutes_format">%1$d min</string>
+    <string name="enter_authentication_code">Entrez le code d\'authentification</string>
+    <string name="enter_phone_number">Entrez un numéro de téléphone</string>
+    <string name="do_not_have_telegram">Je n\'ai pas dr compte Telegram</string>
+    <string name="get_telegram_after_creating_account">Vous pourrez ensuite utiliser cette appli.</string>
+    <string name="get_telegram_description_continue">Veuillez installer Telegram et créer un compte.</string>
+    <string name="get_telegram_account_first">Vous avez besoin d\'un compte Telegram pour utiliser le partage de position.</string>
+    <string name="get_telegram_title">Inscription à Telegram</string>
+    <string name="shared_string_bot">Bot</string>
+    <string name="shared_string_live">En direct</string>
+    <string name="open_osmand">Ouvrir OsmAnd</string>
+    <string name="turn_off_location_sharing">Désactiver le partage de position</string>
+    <string name="stop_sharing_all">Le partage est activé (désactiver)</string>
+    <string name="expire_at">Expire</string>
+    <string name="sharing_time">Temps de partage</string>
+    <string name="in_time">dans %1$s</string>
+    <string name="shared_string_sort_by">Triper par</string>
+    <string name="by_group">Par groupe</string>
+    <string name="by_distance">Par distance</string>
+    <string name="logout_from_osmand_telegram">Se déconnecter d\'OsmAnd Tracker \?</string>
+    <string name="logout_from_osmand_telegram_descr">Êtes-vous sûr·e de vouloir vous déconnecter d\'OsmAnd Tracker ; vous ne pourrez pas partager votre position ni vous la position des autres \?</string>
+    <string name="live_now_description">Contacts et groupes partageant leur position avec vous.</string>
+    <string name="share_location_as">Partager la position comme</string>
+    <string name="add_device">Ajouter un périphérique</string>
+    <string name="no_internet_connection">Aucune connexion Internet</string>
+    <string name="no_gps_connection">Aucune connexion GPS</string>
+    <string name="location_sharing_status">Partage : %1$s</string>
+    <string name="last_available_location">Dernière position disponible</string>
+    <string name="re_send_location">Renvoyer la position</string>
+    <string name="not_found_yet">Pas encore trouvé</string>
+    <string name="not_sent_yet">Pas encore envoyé</string>
+    <string name="go_to_settings">Aller aux paramètres</string>
+    <string name="sharing_in_background">Partage en arrière-plan</string>
+    <string name="battery_optimization_description">Éteignez l\'optimisation de la batterie pour OsmAnd Tracker afin qu\'il ne soit pas soudainement désactivé lorsqu\'il est en arrière-plan.</string>
+    <string name="background_work">Fonctionnement en arrière-plan</string>
+    <string name="background_work_description">Changez les paramètres d\'optimisation de la batterie pour stabiliser le partage de la position.</string>
+    <string name="connecting_to_the_internet">Connexion à Internet</string>
+    <string name="searching_for_gps">Localisation…</string>
+    <string name="initializing">Démarrage</string>
+    <string name="sending_location_messages">Envoi de la position</string>
+    <string name="waiting_for_response_from_telegram">En attente de la réponse de Telegram</string>
+    <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_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>
+    <string name="monitoring_is_disabled">La surveillance est désactivée</string>
 </resources>

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

@@ -246,7 +246,7 @@
     <string name="timeline_no_data">Nincs adat</string>
     <string name="shared_string_end">Vég</string>
     <string name="shared_string_start">Kezdet</string>
-    <string name="shared_string_apply">Alkalmazás</string>
+    <string name="shared_string_apply">Alkalmaz</string>
     <string name="set_time_timeline_descr">Megjelenítendő időszak kijelölése</string>
     <string name="start_end_date">Kezdő és záró dátum</string>
     <string name="saved_messages">Mentett üzenetek</string>

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

@@ -90,8 +90,8 @@
     <string name="do_not_have_telegram">Non ho un account di Telegram</string>
     <string name="enter_phone_number">Inserisci un numero di telefono</string>
     <string name="enter_authentication_code">Inserisci il codice di autenticazione</string>
-    <string name="hours_and_minutes_format">%1$d h %2$d m</string>
+    <string name="hours_and_minutes_format">%1$d h %2$d min</string>
-    <string name="minutes_format">%1$d m</string>
+    <string name="minutes_format">%1$d min</string>
     <string name="hours_format">%1$d h</string>
     <string name="shared_string_install">Installa</string>
     <string name="shared_string_share">Condividi</string>
@@ -157,7 +157,7 @@
     <string name="si_nm">Miglia nautiche</string>
     <string name="si_mi_meters">Miglia/metri</string>
     <string name="shared_string_hour_short">h</string>
-    <string name="shared_string_minute_short">m</string>
+    <string name="shared_string_minute_short">min</string>
     <string name="shared_string_second_short">s</string>
     <string name="welcome_descr">
         <b>OsmAnd tracker</b> ti permette di condividere la tua posizione e di vedere quella di altri su OsmAnd.<br/>

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

@@ -12,11 +12,11 @@
     <string name="last_available_location">Sist tilgjengelige posisjon</string>
     <string name="sharing_status">Delingsstatus</string>
     <string name="location_sharing_status">Deling: %1$s</string>
-    <string name="shared_string_enabled">Påslått</string>
+    <string name="shared_string_enabled">Aktivert</string>
     <string name="shared_string_status">Status</string>
     <string name="no_gps_connection">Ingen GPS-tilkobling</string>
     <string name="no_internet_connection">Ingen internettilknytning</string>
-    <string name="shared_string_disable">Skru av</string>
+    <string name="shared_string_disable">Deaktiver</string>
     <string name="add_device">Legg til enhet</string>
     <string name="share_location_as">Del posisjon som</string>
     <string name="live_now_description">Kontakter og grupper som deler sin posisjon med deg.</string>
@@ -24,7 +24,7 @@
     <string name="logout_from_osmand_telegram">Logg ut av OsmAnd-sporeren\?</string>
     <string name="shared_string_name">Navn</string>
     <string name="by_distance">Etter distanse</string>
-    <string name="by_name">Etter navn</string>
+    <string name="by_name">Ved navn</string>
     <string name="by_group">Etter gruppe</string>
     <string name="shared_string_sort">Sorter</string>
     <string name="shared_string_sort_by">Sorter etter</string>
@@ -104,7 +104,7 @@
     <string name="location_service_no_gps_available">Velg en av posisjonstilbyderne for å dele din posisjon.</string>
     <string name="osmand_service">Bakgrunnsmodus</string>
     <string name="osmand_service_descr">OsmAnd-sporeren kjører som nisse med skjermen av.</string>
-    <string name="shared_string_distance">Distanse</string>
+    <string name="shared_string_distance">Avstand</string>
     <string name="share_location">Del posisjon</string>
     <string name="sharing_location">Deler posisjon</string>
     <string name="process_service">OsmAnd-sporertjeneste</string>
@@ -119,15 +119,13 @@
     <string name="km">km</string>
     <string name="m">m</string>
     <string name="si_kmh">Kilometer i timen</string>
-    <string name="si_m_s">Meter i sekunder</string>
+    <string name="si_m_s">Meter per sekund</string>
     <string name="si_min_km">Minutter per kilometer</string>
     <string name="si_nm_h">Nautiske mil i timen (knop)</string>
     <string name="shared_string_hour_short">t</string>
     <string name="shared_string_minute_short">min</string>
     <string name="shared_string_second_short">sek</string>
-    <string name="welcome_descr">
+    <string name="welcome_descr"><b>OsmAnd-sporeren</b> lar deg dele din posisjon og se andres i OsmAnd.<br/> <br/>Programmet belager seg på Telegram-API-et, så du må ha en Telegram-konto.</string>
-        <b>OsmAnd-sporeren</b> lar deg dele din posisjon og se andres i OsmAnd.<br/>
-        <br/>Programmet belager seg på Telegram-API-et, så du må ha en Telegram-konto.</string>
     <string name="my_location">Min posisjon</string>
     <string name="last_updated_location">Sist oppdaterte posisjon:</string>
     <string name="successfully_sent_and_updated">Sendt og oppdatert</string>
@@ -138,8 +136,8 @@
     <string name="searching_for_gps">Posisjonerer…</string>
     <string name="connecting_to_the_internet">Kobler til Internett</string>
     <string name="yard">yd</string>
-    <string name="foot">fot</string>
+    <string name="foot">ft</string>
-    <string name="mile">mil</string>
+    <string name="mile">mi</string>
     <string name="nm">nmi</string>
     <string name="min_mile">min/m</string>
     <string name="min_km">min/km</string>
@@ -147,10 +145,10 @@
     <string name="m_s">m/s</string>
     <string name="km_h">km/t</string>
     <string name="mile_per_hour">mph</string>
-    <string name="si_mph">Engelske mil i timen</string>
+    <string name="si_mph">Engelsk mil i timen</string>
-    <string name="si_min_m">Minutter per engelske mil</string>
+    <string name="si_min_m">Minutter per engelsk mil</string>
-    <string name="si_mi_feet">Engelske mil/fot</string>
+    <string name="si_mi_feet">Eng. mil/fot</string>
-    <string name="si_mi_yard">Engelske mil/yard</string>
+    <string name="si_mi_yard">Eng. mil/yard</string>
     <string name="si_km_m">Kilometer/meter</string>
     <string name="si_nm">Nautiske mil</string>
     <string name="si_mi_meters">Engelske mil/meter</string>
@@ -179,7 +177,7 @@
     <string name="shared_string_text">Tekst</string>
     <string name="map_and_text">Kart og tekst</string>
     <string name="monitoring_is_enabled">Oppsyn er påskrudd</string>
-    <string name="monitoring_is_disabled">Oppsyn er avskrudd</string>
+    <string name="monitoring_is_disabled">Oppsyn er ikke aktivert</string>
     <string name="time_on_the_move">Tid i bevegelse</string>
     <string name="average_altitude">Gjennomsnittlig høyde</string>
     <string name="average_speed">Gjennomsnittsfart</string>
@@ -189,7 +187,7 @@
     <string name="timeline">Tidslinje</string>
     <string name="shared_string_telegram">Telegram</string>
     <string name="privacy_policy_telegram_client">OsmAnd-sporeren er én av klientene som bruker Telegram. Dine kontakter kan bruke enhver annen Telegram-klient.</string>
-    <string name="privacy_policy_agree">Ved å klikke \"Fortsett\" samtykker du til vilkårene i Telegram-personvernspraksisen, og OsmAnd-personvernspraksisen.</string>
+    <string name="privacy_policy_agree">Du samtykker til vilkårene i personvernreglene til Telegram og OsmAnd ved å klikke «Fortsett».</string>
     <string name="shared_string_accept">Godta</string>
     <string name="telegram_privacy_policy">Telegram-personvernspraksis</string>
     <string name="how_it_works">Hvordan det virker</string>
@@ -212,7 +210,7 @@
     <string name="privacy_policy_use_telegram">Telegram (meldingsprogrammet) brukes til å komme i kontakt og snakke med folk.</string>
     <string name="osmand_privacy_policy">OsmAnd-personvernspraksis</string>
     <string name="please_update_osmand">Oppdater OsmAnd for å vise data på kartet</string>
-    <string name="timeline_description">Skru på oppsyn for å samle bevegelsesdata i historikk.</string>
+    <string name="timeline_description">Aktiver oppsyn for å samle bevegelsesdata i historikk.</string>
     <string name="search_contacts">Søk i kontaktliste</string>
     <string name="search_contacts_descr">Søk gjennom alle dine grupper og kontakter.</string>
     <string name="type_contact_or_group_name">Skriv kontakt- eller gruppenavn</string>
@@ -228,7 +226,7 @@
     <string name="proxy_port">Port</string>
     <string name="proxy_server">Tjener</string>
     <string name="shared_string_connection">Forbindelse</string>
-    <string name="shared_string_enable">Skru på</string>
+    <string name="shared_string_enable">Aktiver</string>
     <string name="proxy_type">Mellomtjenertype</string>
     <string name="proxy_connected">Tilkoblet</string>
     <string name="proxy_disconnected">Frakoblet</string>
@@ -240,10 +238,10 @@
     <string name="min_logging_distance_descr">Filter: Minimumsavstand for logging av nytt punkt</string>
     <string name="min_logging_accuracy">Minimumsnøyaktighet for logging</string>
     <string name="min_logging_accuracy_descr">Filter: Ingen logging med mindre nøyaktigheten nås</string>
-    <string name="min_logging_speed">Minimumshastighet ved logging</string>
+    <string name="min_logging_speed">Minimumshastighet for logging</string>
     <string name="min_logging_speed_descr">Filter: Ingen logging under valgt hastighet</string>
     <string name="gpx_settings">GPX-innstillinger</string>
-    <string name="timeline_no_data_descr">Data for valgt dato mangler</string>
+    <string name="timeline_no_data_descr">Det er ikke samlet inn data for valgt dato</string>
     <string name="timeline_no_data">Ingen data</string>
     <string name="shared_string_end">Slutt</string>
     <string name="shared_string_start">Start</string>
@@ -256,7 +254,7 @@
     <string name="units_and_formats">Enheter og formater</string>
     <string name="unit_of_length_descr">Endre hva lengde måles i.</string>
     <string name="unit_of_length">Lengdeenhet</string>
-    <string name="unit_of_speed_system_descr">Definer en fartsenhet</string>
+    <string name="unit_of_speed_system_descr">Definer en fartsenhet.</string>
     <string name="unit_of_speed_system">Fartsenhet</string>
     <string name="buffer_time_descr">Maksimal tid å lagre punkter i mellomlageret</string>
     <string name="buffer_time">Utløpstid for mellomlager</string>
@@ -268,4 +266,5 @@
     <string name="last_update_from_telegram_duration">Siste oppdatering fra Telegram: %1$s siden</string>
     <string name="last_response_duration">Siste respons: %1$s siden</string>
     <string name="duration_ago">%1$s siden</string>
+    <string name="shared_string_error_short">FEIL</string>
 </resources>

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

@@ -16,7 +16,7 @@
     <string name="osmand_privacy_policy">Política de privacidade do OsmAnd</string>
     <string name="minutes_format">%1$d m</string>
     <string name="last_available_location">Última localização disponível</string>
-    <string name="app_name_short">OsmAnd Tracker</string>
+    <string name="app_name_short">Rastreador OsmAnd</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="si_km_m">Quilômetros/metros</string>
     <string name="in_time">no %1$s</string>
@@ -73,7 +73,7 @@
     <string name="si_kmh">Quilômetros por hora</string>
     <string name="shared_string_password">Senha</string>
     <string name="min_logging_distance">Distância mínima de registro</string>
-    <string name="shared_string_save">Salvar</string>
+    <string name="shared_string_save">Gravar</string>
     <string name="shared_string_start">Iniciar</string>
     <string name="add_device">Adicionar aparelho</string>
     <string name="error_adding_new_device">Não foi possível adicionar novo aparelho</string>
@@ -188,7 +188,7 @@
     <string name="share_location">Compartilhar localização</string>
     <string name="shared_string_hour_short">h</string>
     <string name="disconnect_from_telegram">Como desativar o OsmAnd Tracker para Telegram</string>
-    <string name="timeline_no_data_descr">Nós não coletamos dados para o dia selecionado</string>
+    <string name="timeline_no_data_descr">Não coletamos dados para o dia selecionado</string>
     <string name="sharing_time">Tempo de compartilhamento</string>
     <string name="not_logged_in">você não está logado no</string>
     <string name="gps_network_not_enabled">Ativar \"Localização\"\?</string>
@@ -234,7 +234,7 @@
     <string name="open_in_osmand">Mostrar no OsmAnd</string>
     <string name="logging_out">Saindo</string>
     <string name="shared_string_logout">Sair</string>
-    <string name="shared_string_disable">Desabilitar</string>
+    <string name="shared_string_disable">Desativar</string>
     <string name="enter_phone_number">Digite o número de telefone</string>
     <string name="min_logging_speed">Velocidade mínima de registro</string>
     <string name="proxy_disconnected">Desconectado</string>
@@ -261,4 +261,10 @@
     <string name="shared_string_suggested">Sugerido</string>
     <string name="status_widget_title">Estado do Rastreador de OsmAnd</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>
+    <string name="last_update_from_telegram_duration">Última atualização do Telegram: 1$s atrás</string>
+    <string name="last_response_date">Última resposta: %1$s</string>
+    <string name="last_update_from_telegram_date">Última atualização do Telegram: %1$s</string>
+    <string name="shared_string_error_short">ERR</string>
 </resources>

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

@@ -37,7 +37,7 @@
     <string name="shared_string_apply">Aplicar</string>
     <string name="set_time_timeline_descr">Selecionar a hora para exibir</string>
     <string name="start_end_date">Data de início - fim</string>
-    <string name="timeline_no_data_descr">Nós não coletamos dados para o dia selecionado</string>
+    <string name="timeline_no_data_descr">Não coletamos dados 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>
@@ -262,4 +262,10 @@
     <string name="shared_string_suggested">Sugerido</string>
     <string name="status_widget_title">Estado do Rastreador de OsmAnd</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>
+    <string name="last_update_from_telegram_duration">Última atualização do Telegram: 1$s atrás</string>
+    <string name="last_response_date">Última resposta: %1$s</string>
+    <string name="last_update_from_telegram_date">Última atualização do Telegram: %1$s</string>
+    <string name="shared_string_error_short">ERR</string>
 </resources>

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

@@ -158,7 +158,7 @@
     <string name="telegram_privacy_policy">Политика конфиденциальности Telegram</string>
     <string name="osmand_privacy_policy">Политика конфиденциальности OsmAnd</string>
     <string name="received_gps_points">Получено точек GPX: %1$s</string>
-    <string name="shared_string_appearance">Внешний вид</string>
+    <string name="shared_string_appearance">Вид</string>
     <string name="show_gps_points_descr">Показать количество собранных и отправленных точек GPS.</string>
     <string name="please_update_osmand">Обновите OsmAnd для просмотра данных на карте</string>
     <string name="shared_string_update">Обновить</string>

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

@@ -93,7 +93,7 @@
     <string name="shared_string_telegram">Telegram</string>
     <string name="privacy_policy_use_telegram">Telegram (mesajlaşma uygulaması) insanlarla bağlantı ve iletişim kurmak için kullanılmaktadır.</string>
     <string name="privacy_policy_telegram_client">OsmAnd Tracker, Telegram açık platformunu kullanan istemcilerden biridir. Kişileriniz başka herhangi bir Telegram istemcisini kullanabilir.</string>
-    <string name="privacy_policy_agree">\"Devam et\" butonuna tıklayarak, Telegram ve OsmAnd Gizlilik Politikası koşullarını kabul etmiş olursunuz.</string>
+    <string name="privacy_policy_agree">\"Devam et\" düğmesine tıklayarak, Telegram ve OsmAnd Gizlilik Politikası koşullarını kabul etmiş olursunuz.</string>
     <string name="shared_string_accept">Kabul et</string>
     <string name="telegram_privacy_policy">Telegram Gizlilik Politikası</string>
     <string name="osmand_privacy_policy">OsmAnd Gizlilik Politikası</string>
@@ -160,8 +160,8 @@
     <string name="by_name">Ada göre</string>
     <string name="by_group">Gruba göre</string>
     <string name="shared_string_sort_by">Sıralama kriteri</string>
-    <string name="choose_osmand_desc">Kişilerin haritada görüntüleneceği OsmAnd versiyonunu seçin.</string>
+    <string name="choose_osmand_desc">Kişilerin haritada görüntüleneceği OsmAnd sürümünü seçin.</string>
-    <string name="choose_osmand">Kullanılacak OsmAnd versiyonunu seçin</string>
+    <string name="choose_osmand">Kullanılacak OsmAnd sürümünü seçin</string>
     <string name="disable_all_sharing_desc">Konum paylaşımını tüm seçili sohbetlere kapatır (%1$d).</string>
     <string name="disable_all_sharing">Tüm paylaşımı devre dışı bırak</string>
     <string name="turn_off_all">Hepsini kapat</string>
@@ -176,7 +176,7 @@
     <string name="connected_account">Bağlı hesap</string>
     <string name="shared_string_account">Hesap</string>
     <string name="in_time">%1$s içinde</string>
-    <string name="osmand_connect_desc">Konumları görüntülemek için OsmAnd Tracker\'ın kullandığı OsmAnd versiyonunu seçin.</string>
+    <string name="osmand_connect_desc">Konumları görüntülemek için OsmAnd Tracker\'ın kullandığı OsmAnd sürümünü seçin.</string>
     <string name="osmand_connect">OsmAnd bağlan</string>
     <string name="location_history_desc">Belirli bir süre içinde hareket etmemiş kişileri gizle.</string>
     <string name="location_history">Konum geçmişi</string>
@@ -213,7 +213,7 @@
     <string name="show_on_map">Haritada göster</string>
     <string name="app_name">OsmAnd Çevrim İçi GPS İzleyici</string>
     <string name="phone_number_title">Telefon numarası</string>
-    <string name="phone_number_descr">Uluslararası formatta telefon numarası</string>
+    <string name="phone_number_descr">Uluslararası biçimde telefon numarası</string>
     <string name="shared_string_password">Parola</string>
     <string name="enter_code">Kodu girin</string>
     <string name="authentication_code">Kimlik doğrulama kodu</string>
@@ -240,7 +240,7 @@
     <string name="show_users_on_map">Kullanıcıları haritada göster</string>
     <string name="active_chats">Aktif sohbetler</string>
     <string name="shared_string_authorization">Yetkilendirme</string>
-    <string name="shared_string_authorization_descr">Lütfen Telegram telefon numaranızı uluslararası formatta girin</string>
+    <string name="shared_string_authorization_descr">Lütfen Telegram telefon numaranızı uluslararası biçimde girin</string>
     <string name="shared_string_welcome">Hoş geldiniz</string>
     <string name="shared_string_hour_short">sa</string>
     <string name="shared_string_minute_short">dk</string>
@@ -251,7 +251,7 @@
     <string name="timeline">Zaman çizelgesi</string>
     <string name="time_zone_descr">Konum mesajlarınızda gösterilecek saat dilimini seçin.</string>
     <string name="time_zone">Saat dilimi</string>
-    <string name="units_and_formats">Birimler ve formatlar</string>
+    <string name="units_and_formats">Birimler ve biçimler</string>
     <string name="unit_of_length_descr">Mesafe ölçüm birimini değiştir.</string>
     <string name="unit_of_length">Uzunluk birimleri</string>
     <string name="unit_of_speed_system_descr">Hız birimini tanımlayın.</string>

OsmAnd/assets/poi_categories.json

@@ -1,25 +0,0 @@
-{
-  "categories": {
-    "special": {
-      "icons": [
-        "special_star",
-        "special_star_stroked",
-        "special_marker",
-        "special_flag_stroke",
-        "special_house",
-        "special_building"
-      ]
-    },
-    "amenity": {
-      "icons": [
-        "amenity_bar",
-        "amenity_cafe",
-        "amenity_atm",
-        "amenity_biergarten",
-        "amenity_cinema",
-        "amenity_fire_station",
-        "amenity_parking"
-      ]
-    }
-  }
-}

OsmAnd/build.gradle

@@ -45,10 +45,10 @@ android {
 	defaultConfig {
 		minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 15
 		targetSdkVersion 28
-		versionCode 356
+		versionCode 370
 		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
 		multiDexEnabled true
-		versionName "3.5.6"
+		versionName "3.7.0"
 		versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
 		versionName System.getenv("APK_VERSION_SUFFIX")? versionName + System.getenv("APK_VERSION_SUFFIX").toString(): versionName