Merge branch 'master' into select_gpx_track

# Conflicts:
#	OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java

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");
-							}
-							if (tag.equals("desc")) {
+							} else if (tag.equals("desc")) {
 								((Track) parse).desc = readText(parser, "desc");
-							}
-							if (tag.equals("trkseg")) {
+							} else 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");
-									((WptPt) parse).speed = Float.parseFloat(value);
-									parse.getExtensionsToWrite().put("speed", value);
+									if (!Algorithms.isEmpty(value)) {
+										((WptPt) parse).speed = Float.parseFloat(value);
+										parse.getExtensionsToWrite().put("speed", value);
+									}
 								} catch (NumberFormatException e) {
 								}
 							} else if (tag.equals("link")) {
@@ -2224,7 +2233,7 @@ public class GPXUtilities {
 		}
 		return bounds;
 	}
-
+	
 	public static void mergeGPXFileInto(GPXFile to, GPXFile from) {
 		if (from == null) {
 			return;

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>() {
@@ -401,7 +426,7 @@ public class MapPoiTypes {
 					} else if (name.equals("poi_type")) {
 						if (lastCategory == null) {
 							lastCategory = getOtherMapCategory();
-						} 
+						}
 						if(!Algorithms.isEmpty(parser.getAttributeValue("", "deprecated_of"))){
 							String vl = parser.getAttributeValue("", "name");
 							String target = parser.getAttributeValue("", "deprecated_of");
@@ -595,7 +620,7 @@ public class MapPoiTypes {
 		tp.setOsmValue(parser.getAttributeValue("", "value"));
 		tp.setOsmEditTagValue(parser.getAttributeValue("", "edit_tag"),
 				parser.getAttributeValue("", "edit_value"));
-		
+
 		tp.setOsmTag2(parser.getAttributeValue("", "tag2"));
 		tp.setOsmValue2(parser.getAttributeValue("", "value2"));
 		tp.setText("text".equals(parser.getAttributeValue("", "type")));
@@ -806,7 +831,7 @@ public class MapPoiTypes {
 			poiTypesByTag.put(key, p);
 		}
 	}
-	
+
 	public String replaceDeprecatedSubtype(PoiCategory type, String subtype) {
 		if(deprecatedTags.containsKey(subtype)) {
 			return deprecatedTags.get(subtype);
@@ -892,9 +917,9 @@ public class MapPoiTypes {
 	}
 
 
-	
 
 
-	
+
+
 
 }

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;
 
 
 /**
@@ -472,9 +474,25 @@ public class Algorithms {
 		return responseBody;
 	}
 
-	public static String gzipToString(byte[] gzip) throws IOException {
-		GZIPInputStream gzipIs = new GZIPInputStream(new ByteArrayInputStream(gzip));
-		return readFromInputStream(gzipIs).toString();
+	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-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

@@ -149,4 +149,9 @@
     <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>
 </resources>

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">
-        <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="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>
     <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="mile">mil</string>
+    <string name="foot">ft</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_min_m">Minutter per engelske mil</string>
-    <string name="si_mi_feet">Engelske mil/fot</string>
-    <string name="si_mi_yard">Engelske mil/yard</string>
+    <string name="si_mph">Engelsk mil i timen</string>
+    <string name="si_min_m">Minutter per engelsk mil</string>
+    <string name="si_mi_feet">Eng. mil/fot</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">Kullanılacak 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 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,8 +240,8 @@
     <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_welcome">Hoşgeldiniz</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>
     <string name="shared_string_second_short">sn</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

@@ -0,0 +1,14 @@
+{
+    "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"
+            ]
+        }
+    }
+}