Merge branch 'master' of https://github.com/osmandapp/Osmand

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

@@ -77,20 +77,26 @@ public class MapPoiTypes {
 		return otherCategory;
 	}
 	
-	public Map<String, PoiType> getAllTranslatedNames() {
+	public Map<String, PoiType> getAllTranslatedNames(boolean onlyTranslation) {
 		Map<String, PoiType> translation = new TreeMap<String, PoiType>(); 
 		for(PoiCategory pc : categories) {
 			for(PoiType pt :  pc.getPoiTypes()) {
 				translation.put(pt.getTranslation(), pt);
+				if (!onlyTranslation) {
+					translation.put(Algorithms.capitalizeFirstLetterAndLowercase(pt.getKeyName().replace('_', ' ')), pt);
+				}
 			}
 		}
 		return translation;
 	}
 	
-	public Map<String, PoiType> getAllTranslatedNames(PoiCategory pc) {
+	public Map<String, PoiType> getAllTranslatedNames(PoiCategory pc, boolean onlyTranslation) {
 		Map<String, PoiType> translation = new TreeMap<String, PoiType>();
 		for (PoiType pt : pc.getPoiTypes()) {
 			translation.put(pt.getTranslation(), pt);
+			if (!onlyTranslation) {
+				translation.put(pt.getKeyName(), pt);
+			}
 		}
 		return translation;
 	}

OsmAnd/res/values-da/strings.xml

@@ -42,7 +42,7 @@
     <string name="audionotes_location_not_defined">Placering der skal tilknyttes til noten er ikke defineret endnu. \'Brug placering ...\' for at tildele en note til den angivne placering</string>
     
     <string name="map_widget_audionotes">Audionoter</string>
-    <string name="audionotes_plugin_description">Udvidelsen giver funktionalitet og knapper til at tage audio-/foto-/videonoter under en tur</string>
+    <string name="audionotes_plugin_description">Audio-/videonoter udvidelse giver funktionalitet til at tage audio-/foto-/videonoter under en tur, enten ved hjælp en knap på skærmen, eller direkte fra kontekstmenuen for en position på kortet.</string>
     <string name="audionotes_plugin_name">Audio-/videonoter</string>
     <string name="index_srtm_parts">dele</string>
     <string name="index_srtm_ele">Højdekurver</string>
@@ -294,7 +294,7 @@
 	<string name="osmand_parking_time_limit">Tidsbegrænset parkering</string>
 	<string name="osmand_parking_time_no_limit">Tidsubegrænset parkering</string>
 	<string name="osmand_parking_position_description">Den parkerede bils position. %1$s</string>
-	<string name="osmand_parking_position_description_add">Afhent bilen på:</string>
+	<string name="osmand_parking_position_description_add">Afhent bilen:</string>
 	<string name="osmand_parking_am">AM</string>
 	<string name="osmand_parking_position_name">Parkeringssted</string>
 	<string name="osmand_parking_plugin_description">Udvidelsen er udviklet til at anvende OsmAnd til nemt huske placeringen af den parkerede bil.</string>
@@ -354,18 +354,18 @@
 	
 	
 	<string name="osmand_background_plugin_description">Viser indstillinger til at aktivere sporing og navigation i dvale (slukket skærm) tilstand via periodisk at vække GPS-enheden.</string>
-	<string name="osmand_accessibility_description">"Viser indstillinger til at aktivere særlige  tilgængelighedsfunktioner."</string>
+	<string name="osmand_accessibility_description">"Viser indstillinger til at aktivere særlige  tilgængelighedsfunktioner.\n\nDette plugin gør at en enhed er tilgængelighedsfunktioner til rådighed direkte i OsmAnd, og letter bl.a. justere talen sats for TTSstemmerne, konfiguration retningsbestemt-pad skærm navigation ved hjælp af en trackball til zoomknappen, eller ved hjælp af tekst-til-tale feedback."</string>
 	<string name="extra_settings">Avancerede indstillinger</string>
 	<string name="osmand_monitoring_description">Viser knappen og indstillinger som muliggør optagelse af dine ture til en lokal GPX-fil eller til en online webtjeneste.</string>
 	<string name="osmand_rastermaps_plugin_description">"Udvidelsen giver adgang til mange typer af online (såkaldte del eller raster) kort, fra foruddefinerede OpenStreetMap delkort (som Mapnik) til satellitbilleder og lag til særlig anvendelse som vejr-, klima- eller geologiskekort og relief lag osv.\n\nEnhver af disse kort kan enten bruges som det vigtigste (primær) kort, der skal vises på kortskærmen, eller som en over- eller underlejring til et andet basiskort (såsom OsmAnd offline kort). For at gøre underlejringskortet mere synlig, kan visse elementer af OsmAnd vektorkort nemt skjules via \'Konfigurer kort\' menuen som ønsket.
 \n\nDelkort kan hentes direkte via online-kilder, eller kan fremstilles til offline brug (og manuelt kopieres til OsmAnd datamappen) som en SQLite database. Kort kan fremstilles ved hjælp af en række 3. parts kortværktøjer. "</string>
 	
-	<string name="osmand_development_plugin_description">Viser indstillinger for udviklings- og fejlretningsfunktioner som rutesimulering eller optegningsydeevne indikation.</string>
+	<string name="osmand_development_plugin_description">Viser indstillinger for udviklings- og fejlretningsfunktioner som rutesimulering eller optegningsydeevne indikation, eller stemmevejledning.\nIndstillinger er beregnet til udviklere og er ikke nødvendig for den almindelige bruger.</string>
 	<string name="plugins_screen">Udvidelser</string>
 	
 	<string name="prefs_plugins_descr">Udvidelser aktiverer avancerede indstillinger og ekstra funktionalitet</string>
 	<string name="prefs_plugins">Udvidelser</string>
-	<string name="osm_editing_plugin_description">Udvidelsen giver OsmAnd mulighed for at lave OSM bidrag såsom at oprette eller ændre OSM interessepunkter (IP), åbne eller kommentere OSM fejl, og bidrage med optagede GPX-filer. Brug af funktionen kræver OSM legitimationsoplysninger.</string>
+	<string name="osm_editing_plugin_description">Udvidelsen giver OsmAnd mulighed for at lave OSM bidrag såsom at oprette eller ændre OSM interessepunkter (IP), åbne eller kommentere OSM fejl, og bidrage med optagede GPX-filer.\n\nOSM er et i fællesskab drevet, globalt offentligt domæne kortlægningsprojekt. For nærmere oplysninger henvises til http://openstreetmap.org. Aktiv deltagelse er værdsat, og bidragene kan ske direkte fra OsmAnd, hvis du angiver dine personlige OSM legitimationsoplysninger.</string>
 	<string name="vector_maps_may_display_faster_on_some_devices">Vektorkort vises sandsynligvis hurtigere. Fungerer muligvis ikke godt på nogle enheder.</string>
 	<string name="play_commands_of_currently_selected_voice">Afspil kommandoer med den valgte stemme</string>
 	<string name="debugging_and_development">OsmAnd udvikling</string>
@@ -1070,7 +1070,7 @@
 	<string name="osmand_routing_experimental">OsmAnd offline-navigation er en eksperimentel funktion og den virker ikke for afstande på mere end ca. 20 km.
 \nNavigationstjenesten skiftes midlertidig til online CloudMade.</string>
 	<string name="search_offline_address">Offline søgning</string>
-	<string name="route_general_information">Total afstand %1$s,\n rejsetid %2$d t %3$d m.</string>
+	<string name="route_general_information">Total afstand %1$s, rejsetid %2$d t %3$d m.</string>
 	<string name="router_service_descr">Vælg en online eller offline navigationstjeneste</string>
 	<string name="router_service">Navigationstjeneste</string>
 	<string name="sd_dir_not_accessible">Datalagringsmappen på SD-kortet er ikke tilgængelig!</string>
@@ -1505,7 +1505,7 @@
 	<string name="navigation_intent_invalid">Ugyldigt format: %s</string>
 <string name="osmo_settings_uuid">Unik enheds-id</string>
     <string name="osmo_settings_descr">Konfigurer indstillinger for overvågning og opsætning af personlig overvågningskanal</string>
-    <string name="osmo_plugin_description">"Viser indstillingerne til at bruge OsMo avanceret live overvågning, se http://osmo.mobi. Spor andre enheder og bliv selv sporet. Opret anonyme grupper, del hinandens placering og kommuniker. Har forskellige indstillinger for session sporing eller permanent sporing.\n\nAnonyme grupper er begrænset til et antal dage og nogle funktioner, dvs der er ingen fjernkontrol og gruppeadministrator. Fuldt funktionelle grupper bør oprettes på hjemmesiden og kun registrerede brugere har adgang til dem. "</string>
+    <string name="osmo_plugin_description">"Viser indstillingerne til at bruge OsMo avanceret live overvågning, se http://osmo.mobi.\n\nSpor andre enheder og bliv selv sporet. Opret anonyme grupper, del hinandens placering og kommuniker. Har forskellige indstillinger for session sporing eller permanent sporing.\n\nAnonyme grupper er begrænset til et antal dage og nogle funktioner, dvs der er ingen fjernkontrol og ingen gruppeadministrator. Fuldt funktionelle grupper, kan på den anden side oprettes på hjemmesiden, og kun registrerede brugere har adgang til dem. "</string>
     <string name="osmo_plugin_name">OsMo overvågning</string>
     <string name="osmo_settings">OsMo overvågning</string>
    	<string name="keep_informing_never">Kun manuelt (tryk på pilen)</string>
@@ -1860,12 +1860,11 @@
 	<string name="share_note">Del note</string>
 	
 	<string name="plugin_touringview_name">Touring</string>
-	<string name="plugin_nautical_descr">"Aktivering ændrer kortformat til maritim, som viser alle sømærker og søkortsymboler.
-\n\nEt kort, der indeholder alle maritime symboler, kan hentes som \'Sømærker (på verdensplan)\'.
-\n\nVisningen kan altid nulstilles ved enten at deaktivere den igen her, eller ved at ændre \'Kortformat\' under \'Konfigurer kort\' som ønsket. "</string>
-	<string name="plugin_ski_descr">"Aktivering ændrer kortformat til \'Vinter og ski\', som viser alle landskabstræk under vinterlige forhold.
-\n\nEt kort som viser alle skiløjper og langrendsruter, kan hentes som \'Skikort (på verdensplan)\'.
-\n\nVisningen kan altid nulstilles ved enten at deaktivere den igen her, eller ved at ændre \'Kortformat\' under \'Konfigurer kort\' som ønsket. "</string>
+	<string name="plugin_nautical_descr">"Udvidelsen beriger OsmAnd kort og navigation app til også producere maritimekort til sejlsport, sejlads og andre former for vandsport.
+\n\nEn særlig kort add-on til OsmAnd vil give alle maritime sømærker og søkortsymboler, for indre såvel som for kystnært navigation. Beskrivelsen af hvert sømærke giver oplysninger, der er nødvendige for at identificere dem og deres betydning (kategori, form, farve, sekvens, reference, etc.).
+\n\nFor at vende tilbage til en af OsmAnd konventionelle kortformat, enten simpelthen deaktivere den igen, eller ved at ændre \'Kortformat\' under \'Konfigurer kort \"som ønsket. "</string>
+	<string name="plugin_ski_descr">"Udvidelsen for OsmAnd sætter lige ved hånden detaljerne om global skiløjper, langrendsruter, alpine skiruter, svævebaner og skilifte. Ruter og pister vises farvekodede efter sværhedsgrad, og vises i et særligt \'Vinter\' kortformat, som et sne-farvet vinterlandskab.\n\nEt kort som viser alle skiløjper og langrendsruter, kan hentes som \'Skikort (på verdensplan)\'.\nAktivering ændrer kortformat til \'Vinter og ski\', som viser alle landskabstræk under vinterlige forhold.
+\nVisningen kan altid nulstilles ved enten at deaktivere den igen her, eller ved at ændre \'Kortformat\' under \'Konfigurer kort\' som ønsket. "</string>
 	<string name="plugin_touringview_descr">"Aktivering ændrer kortformat til \'Touring\', det er en særlig højdetaljevisning for rejsende og erhvervschauffører.
 \n\nVisning giver, på et givet kortzoom, den maksimale mængde rejseoplysninger til rådighed i kortdata (især veje, spor, stier, og orienteringsmærker).\n\nViser også tydeligt alle vejtyper utvetydigt med farvekoder, som er nyttigt, f.eks ved med kørsel store køretøjer.
 \n\nGiver særlige touring muligheder såsom cykelruter eller alpine bjergruter.\n\nEt særligt kort er ikke nødvendigt, visningen er skabt ud fra standardkort.
@@ -1964,9 +1963,9 @@
 	<string name="waypoint_visit_after">Besøg efter</string>
     <string name="waypoint_visit_before">Besøg før</string>
     <string name="shared_string_collapse">Fold sammen</string>
-	<string name="action_create">Med handlingen oprettet</string>
+	<string name="action_create">Handling opretter</string>
 	<string name="action_modify">Handling rediger</string>
-	<string name="action_delete">Handlingen slet</string>
+	<string name="action_delete">Handling slet</string>
 	<string name="osm_edits">OSM redigeringer</string>
 	<string name="osmand_parking_hour">t</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">Tilbage</string> <string name="parking_place_limited">Tidsbegrænset parkering</string>
 	<string name="your_edits">Dine redigeringer</string>

OsmAnd/res/values-es/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
   
   <string name="layer_map_appearance">Configura pantalla</string>
   <string name="show_lanes">Mostrar carriles</string>
@@ -166,7 +167,7 @@
   <string name="show_more_map_detail_descr">Muestra detalles del mapa vectorial (carreteras, etc.) a niveles inferiores de acercamiento</string>
   <string name="favourites_delete_multiple_succesful">Punto(s) favorito(s) correctamente borrado(s).</string>
   <string name="favorite_delete_multiple">Va a borrar %1$d favorito(s) y %2$d grupo(s) de favoritos. ¿Está seguro?</string>
-  <string name="favorite_home_category">Casa</string>
+  <string name="favorite_home_category">Inicio</string>
   <string name="favorite_friends_category">Amigos</string>
   <string name="favorite_places_category">Lugares</string>
   <string name="favorite_default_category">Otros</string>
@@ -179,7 +180,7 @@
   
   
   
-  <string name="local_index_installed">Edición</string>
+  <string name="local_index_installed">Versión local</string>
   <string name="local_index_items_backuped">%1$d de %2$d elemento(s) correctamente desactivado(s).</string>
   <string name="local_index_items_deleted">%1$d de %2$d elemento(s) correctamente borrado(s).</string>
   <string name="local_index_items_restored">%1$d de %2$d elemento(s) correctamente activado(s).</string>
@@ -371,7 +372,7 @@
   <string name="loading_builds">Cargando compilaciones OsmAnd…</string>
   <string name="select_build_to_install">Seleccione una de las compilaciones OsmAnd a instalar</string>
   <string name="contribution_activity">Actividad especial para versión de donación</string>
-  <string name="gps_status_app_not_found">La aplicación GPS Status no está instalada. ¿Buscar en G. Play?</string>
+  <string name="gps_status_app_not_found">La aplicación GPS status no está instalada. ¿Buscar en la tienda?</string>
   <string name="voice_is_not_available_msg">Las indicaciones de voz no están disponibles, vaya a \'Opciones\' → \'General\' → \'Indicaciones de voz\' y elija o descargue un paquete de mensajes de voz.</string>
   <string name="voice_is_not_available_title">No se han seleccionado indicaciones por voz</string>
   <string name="daynight_mode_day">Día</string>
@@ -500,7 +501,7 @@
   <string name="route_head">Cabecera</string>
   <string name="first_time_continue">Después</string>
   <string name="first_time_download">Descargar regiones</string>
-  <string name="first_time_msg">Gracias por usar OsmAnd. Para muchas características de la aplicación necesitas algunos datos regionales, que puedes descargar vía \'Opciones\' → \'Gestionar mapas\'. Entonces podrás ver mapas, localizar direcciones, buscar PDIs y encontrar transporte público.</string>
+  <string name="first_time_msg">Gracias por usar OsmAnd. Para muchas características de la aplicación necesita algunos datos regionales que puede descargar a través de \'Opciones\' → \'Gestionar mapas\'. Entonces podrá ver mapas, localizar direcciones, buscar PDIs y encontrar transporte público.</string>
   <string name="search_poi_location">Buscando señal…</string>
   <string name="search_near_map">Buscar cerca del centro del mapa</string>
   <string name="search_nearby">Buscar cercanos</string>
@@ -552,7 +553,7 @@
   <string name="search_online_address">Búsqueda en línea</string>
   <string name="max_level_download_tile">Máx. acercamiento con conexión</string>
   <string name="max_level_download_tile_descr">Elige el nivel de acercamiento máximo para descargar teselas de mapas con conexión</string>
-  <string name="route_general_information">Distancia total %1$s,\n tiempo de viaje %2$d h %3$d m.</string>
+  <string name="route_general_information">Distancia total %1$s,\ntiempo de viaje %2$d h %3$d m.</string>
   <string name="router_service_descr">Elige un servicio de navegación con o sin conexión</string>
   <string name="router_service">Servicio de navegación</string>
   <string name="sd_dir_not_accessible">¡No se puede acceder a la carpeta de almacenamiento en la tarjeta SD!</string>
@@ -767,11 +768,11 @@
   <string name="online_map_settings_descr">Configurar fuentes de mapas en línea o teselas guardadas</string>
   
   
-  <string name="osmand_rastermaps_plugin_description">"Con este plugin puedes acceder a muchos tipos de mapas en línea (llamados de teselas o raster), desde teselas de Openstreetmap predefinidas (como Mapnik) a imágenes de satélite y capas de propósito especial  como mapas climáticos, mapas atmosféricos, mapas geológicos, capas de sombreado, etc..
-\n\nCualquiera de estos mapas puede ser utilizado bien como el mapa principal (base) que se mostrará en la pantalla del mapa de OsmAnd, o como una capa superior o inferior a otro mapa base (como mapas en línea regulares de OsmAnd). Para hacer los mapas subyacentes más visibles, ciertos elementos de los mapas vectoriales OsmAnd se pueden ocultar fácilmente a través del menú \'Configurar mapa\' como se desee.
+  <string name="osmand_rastermaps_plugin_description">"Con este extra puede acceder a muchos tipos de mapas en línea (llamados teselas o raster), desde teselas de Openstreetmap predefinidas (como Mapnik) a imágenes satelitales y capas de propósito especial como mapas climáticos, mapas atmosféricos, mapas geológicos, capas de sombreado, etc.
+\n\nCualquiera de estos mapas puede ser utilizado como el mapa principal (base) que se mostrará en la pantalla del mapa de OsmAnd, o como una capa superior o inferior a otro mapa base (como mapas en línea regulares de OsmAnd). Para hacer los mapas subyacentes más visibles, ciertos elementos de los mapas vectoriales OsmAnd se pueden ocultar fácilmente a través del menú \'Configurar mapa\' como se desee.
 \n\nLos mapas de teselas pueden obtenerse directamente a través de fuentes en línea, o pueden ser preparados para su uso fuera de línea (y copiarse manualmente en la carpeta de datos de OsmAnd) como una base de datos sqlite que puede producirse por una variedad de herramientas de preparación de mapas de terceros. "</string>
   <string name="osmand_background_plugin_description">Muestra las configuraciones para habilitar el seguimiento y la navegación en modo suspensión (pantalla apagada) activando periódicamente el dispositivo GPS.</string>
-  <string name="osmand_accessibility_description">Muestra las opciones para activar las características especiales de accesibilidad.</string>
+  <string name="osmand_accessibility_description">Este extra habilita la característica de accesibilidad del dispositivo directamente en OsmAnd, y facilita por ejemplo, el ajuste de la velocidad de la voz para voces TTS, la configuración de navegación de pantalla direccional-pad, usando la rueda de desplazamiento para el control de acercamiento, o el uso de comentarios de conversión de texto a voz.</string>
   
   
   
@@ -862,7 +863,7 @@
   <string name="accessibility_preferences_descr">Preferencias de accesibilidad</string>
   <string name="accessibility_preferences">Accesibilidad</string>
   <string name="local_index_routing_data">Datos de enrutamiento</string>
-  <string name="navigate_point_format">Formato :</string>
+  <string name="navigate_point_format">Formato</string>
   <string name="poi_search_desc">Buscar PDI (Punto De Interes)</string>
   <string name="address_search_desc">Buscar dirección</string>
   <string name="navpoint_search_desc">Coordenadas</string>
@@ -1079,7 +1080,7 @@
     <string name="download_srtm_maps">Curvas de nivel</string>
     
 	
-<string name="audionotes_plugin_description">Este extra proporciona la funcionalidad y los botones para tomar notas de audio/fotografía/video durante un viaje</string>
+<string name="audionotes_plugin_description">El extra de notas de audio/vídeo proporciona la funcionalidad para tomar notas de audio/fotografía/vídeo durante un viaje, ya sea utilizando un botón en la pantalla del mapa, o directamente el menú contextual para cualquier posición en el mapa.</string>
     <string name="audionotes_plugin_name">Extra de notas de audio</string>
     <string name="osmand_srtm_short_description_80_chars">Extra OsmAnd para curvas de nivel sin conexión</string>
     <string name="osmand_srtm_long_description_1000_chars">"Este extra proporciona una superposición de curvas de nivel que se pueden visualizar sobre los mapas descargados de OsmAnd. Esta funcionalidad será muy apreciada por atletas, caminantes, excursionistas, y cualquiera interesado en la estructura de relieve de un paisaje.\n\nLos datos globales (entre 70 grados norte y 70 grados sur) se basan en mediciones realizadas por SRTM (Shuttle Radar Topography Mission, Misión de Topografía por Radar desde Transbordador) y ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer, Radiómetro Espacial Avanzado de Emisión Térmica y Reflexión), un instrumento de imágenes a bordo de Terra, el satélite insignia del Sistema de Observación de la Tierra de la NASA. ASTER es un esfuerzo cooperativo entre la NASA, el Ministerio de Economía, Comercio e Industria de Japón (METI) y Sistemas Espaciales de Japón (J-spacesystems). "</string>
@@ -1249,7 +1250,7 @@
     <string name="download_using_mobile_internet">El Wi-Fi no está conectado en este momento. ¿Desea usar la conexión actual a Internet para descargar?</string>
     <string name="local_indexes_cat_srtm">Datos de curvas de nivel</string>
     <string name="wait_current_task_finished">Espere hasta que termine la tarea actual</string>
-    <string name="shared_string_downloading">Descargando…</string>
+    <string name="shared_string_downloading">Descargando</string>
 	<string name="destination_point">Destino %1$s</string>
     <string name="context_menu_item_destination_point">Fijar como destino</string>
     <string name="please_select_address">Selecciona ciudad o calle primero</string>
@@ -1483,8 +1484,8 @@
     <string name="keep_and_add_destination_point">Añadir como punto de destino</string>
     <string name="select_gpx">Seleccionar GPX…</string>
     <string name="route_descr_select_destination">Seleccionar destino</string>
-    <string name="shared_string_select_on_map">Seleccionar en el mapa…</string>
-    <string name="shared_string_favorite">Favorito…</string>
+    <string name="shared_string_select_on_map">Seleccionar en el mapa</string>
+    <string name="shared_string_favorite">Favorito</string>
     <string name="route_preferences">Preferencias de la ruta</string>
     <string name="route_info">Información de la ruta</string>
     <string name="tip_recent_changes_1_7_1_t">"Cambios en 1.7:
@@ -1789,7 +1790,7 @@
     <string name="duration">Duración</string>
     <string name="distance">Distancia</string>
     <string name="record_plugin_name">Grabación de viaje</string>
-    <string name="record_plugin_description">"Este extra activa la funcionalidad para registrar y guardar tus trazas o bien manualmente tocando el control de registro GPX en la pantalla del mapa o bien automáticamente registrando todas tus rutas seguidas en un archivo GPX.\n\nLas trazas registradas puedes compartirlas con tus amigos o usarlas como contibuciones a OSM. Los atletas pueden utilizarlas para monitorizar sus entrenamientos. Algunos análisis básicos de trazas se pueden realizar directamente con OsmAnd como tiempos, velocidad media, etc., y por supuesto pueden analizarse posteriormente con herramientas de análisis de terceros. "</string>
+    <string name="record_plugin_description">"Este extra activa la funcionalidad para registrar y guardar sus trazas manualmente tocando el control de registro GPX en la pantalla del mapa, o automáticamente registrando todas tus rutas seguidas en un archivo GPX.\n\nLas trazas registradas puede compartirlas con sus amigos o usarlas como contibuciones a OSM. Los atletas pueden utilizarlas para monitorizar sus entrenamientos. Algunos análisis básicos de trazas se pueden realizar directamente con OsmAnd como tiempos, velocidad media, etc., y por supuesto pueden analizarse posteriormente con herramientas de análisis de terceros. "</string>
     <string name="rendering_attr_publicTransportMode_name">Rutas de autobús, trolebús y lanzadera</string>
 	<string name="save_track_to_gpx_globally">Guardar traza en fichero GPX</string>
 	<string name="save_track_interval_globally">Intervalo de guardado</string>
@@ -1874,7 +1875,7 @@
     <string name="rendering_attr_roadStyle_name">Estilo de carretera</string>
     <string name="rendering_value_default_name">Predeterminado</string>
     <string name="rendering_value_orange_name">Naranja</string>
-    <string name="routing_attr_no_new_routing_name">Sin reglas de ruteo de v1.9</string>
+    <string name="routing_attr_no_new_routing_name">Sin reglas de ruteo v1.9</string>
     <string name="routing_attr_no_new_routing_description">No usar reglas de ruteo introducidas en v.1.9</string>
     <string name="rendering_value_germanRoadAtlas_name">Atlas de carreteras alemanas</string>
 	<string name="traffic_warning_railways">Cruce de ferrocarril</string>
@@ -1901,7 +1902,7 @@
 	<string name="proxy_host_descr">Configura el hostname de tu proxy (p.e. 127.0.0.1)</string>
 	<string name="version_settings_descr">Descargar versiones de desarrollo (nightly builds)</string>
     <string name="version_settings">Compilaciones</string>
-    <string name="gps_status">Estado GPS</string>
+    <string name="gps_status">GPS status</string>
     <string name="rendering_attr_streetLighting_name">Alumbrado público</string>
     <string name="points">Puntos</string>
     <string name="tracks">Trazas</string>
@@ -1924,8 +1925,8 @@
 	<string name="get_plugin">Obtener</string>
 <string name="free">"Libre %1$s "</string>
 	<string name="device_memory">Memoria del dispositivo</string>
-    <string name="rendering_attr_pisteRoutes_name">Rutas de pista</string>
-	<string name="rendering_attr_pisteGrooming_name">Arreglo de pista</string>
+    <string name="rendering_attr_pisteRoutes_name">Pista de rutas</string>
+	<string name="rendering_attr_pisteGrooming_name">Pista de entrenamiento</string>
     <string name="roads_only">Sólo carreteras</string>
     <string name="share_note">Compartir nota</string>
 	
@@ -1960,4 +1961,28 @@
 	<string name="shared_string_selected">Seleccionada(s)</string>
 	<string name="track_segments">Segmentos de traza</string>
 	<string name="track_points">Puntos de traza</string>
+	<string name="action_create">Acción crear</string>
+	<string name="action_modify">Acción modificar</string>
+	<string name="action_delete">Acción borrar</string>
+	<string name="osm_edits">Ediciones OSM</string>
+	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">Izquierda</string> <string name="parking_place_limited">Aparcamiento de tiempo limitado</string>
+	<string name="your_edits">Tus ediciones</string>
+    <string name="waypoint_visit_after">Visitar después</string>
+    <string name="waypoint_visit_before">Visitar antes</string>
+    <string name="simulate_your_location">Simular tu ubicación</string>
+    <string name="drawer">Lista plana</string>
+    <string name="short_location_on_map">Lat %1$s\nLon %2$s</string>
+    <string name="tips_and_tricks_descr">Preguntas frecuentes, cambios recientes y otros</string>
+    <string name="routing_settings_2">Opciones de navegación</string>
+    <string name="general_settings_2">Opciones generales</string>
+	<string name="shared_string_ellipsis">…</string>
+	<string name="shared_string_deselect">Deseleccionar</string>
+	<string name="shared_string_deselect_all">Deseleccionar todo</string>
+	<string name="shared_string_unexpected_error">Ocurrió un error inesperado</string>
+	<string name="shared_string_action_template">Acción {0}</string>
+	<string name="shared_string_collapse">Colapsar</string>
+	<string name="shared_string_video">Vídeo</string>
+	<string name="shared_string_photo">Foto</string>
+	<string name="route_points">Puntos de la ruta</string>
+	<string name="shared_string_release">Liberado</string>
 	</resources>

OsmAnd/res/values-fr/strings.xml

@@ -564,7 +564,7 @@
   <string name="search_online_address">Internet</string>
   <string name="max_level_download_tile">Niveau de zoom maximum</string>
   <string name="max_level_download_tile_descr">Choisir un niveau de zoom maximum pour le téléchargement</string>
-  <string name="route_general_information">Distance totale : %1$s,\n durée estimée : %2$d h %3$d m.</string>
+  <string name="route_general_information">Distance totale : %1$s, temps de trajet estimé : %2$d h %3$d m.</string>
   <string name="router_service_descr">Sélectionner un service de navigation, hors-ligne ou en ligne</string>
   <string name="router_service">Service de navigation</string>
   <string name="sd_dir_not_accessible">Le dossier contenant les données sur la carte SD est inaccessible !</string>
@@ -1989,5 +1989,6 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 	<string name="action_modify">Action modifier</string>
 	<string name="action_delete">Action supprimer</string>
 	<string name="osm_edits">Éditions OSM</string>
-	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">Gauche</string> <string name="parking_place_limited">Durée de stationnement limitée</string>
-	</resources>
+	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">Restant</string> <string name="parking_place_limited">Stationnement à durée limitée</string>
+	<string name="your_edits">Vos modifications</string>
+    </resources>

OsmAnd/res/values-it/strings.xml

@@ -1903,8 +1903,8 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="save_track_interval_globally">Intervallo registrazione</string>
 	<string name="rendering_attr_publicTransportMode_name">Percorsi bus, filubus, servizi navetta</string>
 	<string name="confirm_every_run">Chiedi sempre</string>
-	<string name="save_global_track_interval_descr">Scegli l\'intervallo di tempo generale per la registrazione del percorso (abilitata attraverso il widget registrazione GPX sulla mappa)</string>
-	<string name="save_global_track_interval">Intervallo generale di registrazione</string>
+	<string name="save_global_track_interval_descr">Scegli l\'intervallo di tempo predefinito per la registrazione del percorso (abilitata attraverso il widget registrazione GPX sulla mappa)</string>
+	<string name="save_global_track_interval">Intervallo predefinito di registrazione</string>
 	<string name="traffic_warning_speed_limit">Limite di velocità</string>
     <string name="traffic_warning_payment">Casello</string>
     <string name="traffic_warning_border_control">Controllo doganale</string>

OsmAnd/res/values-ko/strings.xml

@@ -656,7 +656,7 @@
 	<string name="search_online_address">온라인 검색</string>
 	<string name="max_level_download_tile">최대 온라인 줌</string>
 	<string name="max_level_download_tile_descr">다운로드할 최대 줌 레벨을 선택하세요</string>
-	<string name="route_general_information">전체거리 %1$s,\n 여행시간 %2$d h %3$d m.</string>
+	<string name="route_general_information">전체거리 %1$s, 여행시간 %2$d h %3$d m.</string>
 	<string name="router_service_descr">온라인 또는 오프라인 라우팅 서비스를 선택합니다</string>
 	<string name="router_service">운행 서비스</string>
 	<string name="sd_dir_not_accessible">SD 카드에 있는 데이터 저장 폴더에 접근할 수 없습니다!</string>
@@ -1145,7 +1145,7 @@
     <string name="map_widget_distancemeasurement">거리 측정</string>
     
     <string name="map_widget_audionotes">소리 노트</string>
-    <string name="audionotes_plugin_description">이 플러그인은 여행하는 동안 소리/사진/영상을 찍기 위한 기능과 버튼을 제공합니다</string>
+    <string name="audionotes_plugin_description">이 플러그인은 여행하는 동안 소리/사진/영상을 찍기 위한 기능과 버튼을 제공합니다.</string>
     <string name="audionotes_plugin_name">소리/영상 노트</string>
     <string name="index_srtm_parts">부분</string>
     <string name="index_srtm_ele">등고선</string>

OsmAnd/res/values-ru/phrases.xml

@@ -59,7 +59,7 @@
 	<string name="poi_interior_decoration_shop">Декор и оформление</string>
 	<string name="poi_jewelry_shop">Ювелирный магазин</string>
 	<string name="poi_kiosk">Киоск, ларёк</string>
-	<string name="poi_kitchen_shop">Кухни</string>
+	<string name="poi_kitchen_shop">Кухонные принадлежности</string>
 	<string name="poi_mobile_phone_shop">Салон связи</string>
 	<string name="poi_motorcycle_shop">Мотоциклы</string>
 	<string name="poi_musical_instrument_shop">Музыкальные инструменты</string>
@@ -565,7 +565,7 @@
 	<string name="poi_seamark_buoy_installation">Знак изолированной опасности</string>
 	<string name="poi_seamark_buoy_isolated_danger">Буй (изолированная опасность)</string>
 	<string name="poi_seamark_buoy_lateral">Латеральный буй</string>
-	<string name="poi_seamark_buoy_safe_water"/>
+	<string name="poi_seamark_buoy_safe_water">Буй</string>
 	<string name="poi_seamark_buoy_special_purpose">Специальный буй</string>
 	<string name="poi_seamark_daymark">Дневной маяк</string>
 	<string name="poi_seamark_distance_mark">Отметка расстояния</string>
@@ -573,10 +573,10 @@
 	<string name="poi_seamark_dyke"/>
 	<string name="poi_seamark_floating_dock">Плавучий док</string>
 	<string name="poi_seamark_fog_signal">Сигнал при тумане</string>
-	<string name="poi_seamark_harbour_basin"/>
+	<string name="poi_seamark_harbour_basin">Акватория гавани</string>
 	<string name="poi_seamark_harbour">Гавань</string>
 	<string name="poi_seamark_landmark">Ориентир</string>
-	<string name="poi_seamark_light"/>
+	<string name="poi_seamark_light">Маяк</string>
 	<string name="poi_seamark_light_major"/>
 	<string name="poi_seamark_light_minor"/>
 	<string name="poi_seamark_light_float"/>
@@ -665,5 +665,21 @@
 
 	<string name="poi_car">Автомобильный магазин</string>
 	<string name="poi_car_parts">Автозапчасти</string>
-	<string name="poi_halt">Железнодорожная остановка (устаревший)</string>
+	<string name="poi_halt">Железнодорожная остановка</string>
+	<string name="poi_emergency">Экстренные службы</string>
+	<string name="poi_transportation">Транспорт</string>
+	<string name="poi_healthcare">Здоровье</string>
+	<string name="poi_sustenance">Еда</string>
+	<string name="poi_general">Универмаг</string>
+	<string name="poi_lodging">Проживание</string>
+	<string name="poi_man_made">Инфраструктура</string>
+	<string name="poi_administrative">Административные объекты</string>
+	<string name="poi_seamark">Морские объекты</string>
+	<string name="poi_internet_access_wlan">Доступ в Интернет: wlan</string>
+	<string name="poi_internet_access_terminal">Доступ в Интернет: терминал</string>
+	<string name="poi_internet_access_wired">Доступ в Интернет: проводное подключение</string>
+	<string name="poi_internet_access_public">Доступ в Интернет: общедоступный</string>
+	<string name="poi_internet_access_service">Доступ в Интернет: сервис</string>
+	
+	<string name="poi_farm">Фермерский магазин</string>
 	</resources>

OsmAnd/res/values-ru/strings.xml

@@ -1918,4 +1918,12 @@
     <string name="tips_and_tricks_descr">Часто задаваемые вопросы, последние изменения и другое</string>
     <string name="simulate_your_location">Моделировать ваше местоположение</string>
     <string name="shared_string_collapse">Свернуть</string>
-	</resources>
+	<string name="action_delete">Удалить действие</string>
+	<string name="action_modify">Изменить действие</string>
+	<string name="action_create">Создать действие</string>
+	<string name="osm_edits">OSM правки</string>
+	<string name="osmand_parking_hour">ч</string><string name="osmand_parking_minute">м</string><string name="osmand_parking_time_left">Осталось</string> <string name="parking_place_limited">Ограниченное по времени парковочное место</string>
+	<string name="your_edits">Ваши правки</string>
+    <string name="waypoint_visit_after"/>
+    <string name="waypoint_visit_before">Посетить до</string>
+    </resources>

OsmAnd/res/values-sc/phrases.xml

@@ -491,8 +491,8 @@
 	<string name="poi_occupational_therapist">Terapèuta ocupatzionale</string>
 	<string name="poi_leisure_track">Pista pro isports</string>
 	<string name="poi_raceway">Tzircùitu automobilìsticu</string>
-	<string name="poi_9pin">Nine pin bowling</string>
-	<string name="poi_10pin">Ten pin bowling</string>
+	<string name="poi_9pin">Bowling cun noe birìllos</string>
+	<string name="poi_10pin">Bowling cun deghe birìllos</string>
 	<string name="poi_base">Base jumping</string>
 	<string name="poi_bowls">Bowls</string>
 	<string name="poi_climbing">Aperrinzada</string>
@@ -626,4 +626,7 @@
 	<string name="poi_public_transport_stop_position">Firmada de su trasportu pùblicu</string>
 	<string name="poi_halt">Firmada de sa ferrovia</string>
 	<string name="poi_railway_buffer_stop">Denegante pro sos trenos</string>
+	<string name="poi_baby_hatch">Bàntzigu pro sa bida/Roda de sos espostos</string>
+	<string name="poi_apartment">Apartamentu</string>
+
 	</resources>

OsmAnd/res/values-sc/strings.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="always_center_position_on_map">Ammustra sa positzione semper a su tzentru</string>
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="always_center_position_on_map">Ammustra sa positzione semper a su tzentru</string>
     <string name="voice_pref_title">Boghe</string>
     <string name="misc_pref_title">Mistura</string>
     <string name="localization_pref_title">Localizatzione</string>
@@ -59,8 +60,8 @@
     <string name="keep_and_add_destination_point">Annànghe unu puntu de destinatzione</string>
     <string name="select_gpx">Issèbera GPX…</string>
     <string name="route_descr_select_destination">Issèbera sa destinatzione</string>
-    <string name="shared_string_select_on_map">Ischerta in sa mapa…</string>
-    <string name="shared_string_favorite">Prefèrridu…</string>
+    <string name="shared_string_select_on_map">Ischerta in sa mapa</string>
+    <string name="shared_string_favorite">Prefèrridu</string>
     <string name="route_preferences">Preferèntzias pro s’àndala</string>
     <string name="route_info">Informatziones pro s’àndala</string>
     <string name="routing_attr_prefer_motorway_name">Preferre sas autostradas</string>
@@ -237,7 +238,7 @@
     <string name="plugin_distance_point">Puntu</string>
     <string name="gpx_file_name">Nùmene de su documentu GPX</string>
     <string name="gpx_saved_sucessfully">Documentu GPX sarbadu cun sutzessu in {0}</string>
-    <string name="osmand_distance_planning_plugin_description">Ativat unu widget pro creare àndalas carcande in sa mapa (o impreare/mudare documentos GPX esistentes) pro medire sa distantzia intra \'e puntos diferentes. Sos resurtados podent èssere sarbados comente GPX, e ant a poder\'èssere impreados pro pianificare una caminera GPX.</string>
+    <string name="osmand_distance_planning_plugin_description">Custu plugin ativat unu widget in s\'ischermu de sa mapa chi permitit de creare àndalas carcande in sa mapa, o de impreare o mudare documentos GPX esistentes, pro pianificare unu biàgiu e medire sa distantzia intre puntos diferentes. Sos resurtados podent èssere sarbados comente GPX, e ant a poder\'èssere impreados prus a tardu comente ghia.</string>
     <string name="osmand_distance_planning_plugin_name">Aina calcoladore de distàntzia e pianificatzione</string>
     <string name="use_distance_measurement_help">* Toca pro sinnare unu puntu.\n 
         * Carca e tene carcau in sa mapa pro burrare sos puntos antepostos.\n
@@ -277,7 +278,9 @@
     <string name="monitoring_settings_descr">Cunfigura comente registrare sos biàgios tuos</string>
     <string name="osmo_settings_uuid">ID ùnicu de su dispositivu</string>
     <string name="osmo_settings_descr">Cunfigura sas impostaduras de compidada de su dispositivu e imposta su canale de compidada pessonale</string>
-    <string name="osmo_plugin_description">"Compidada OsMo - Compidada avantzada in dereta, bie http://osmo.mobi. Sighi àteros dispositivos  e fàghedi sighire. Crea grupos anònimos, cumpartzi sa positzione a manera retzìproca e comunica. Sunt disponìbiles meda impostaduras pro s’arrastamentu, pro sa sessione in cursu o permanentes. Sos grupos anònimos sunt limidados pro su nùmeru de dies e calicuna de sas funtziones, ad es. non b’est su controllu remotu e nemmancu s’amministradore de su grupu.Grupos cun totu sas funtzionalidades podent èssere creados in su giassu e petzi sos impitadores registrados podent atzèdere. Pro àteras informatziones: http://osmo.mobi. "</string>
+    <string name="osmo_plugin_description">"Custu plugin frunit sas funtzionalidades pro impreare sa compidada avantzada in dereta, bie http://osmo.mobi.
+\n\nSighi àteros dispositivos  e fàghedi sighire. Crea grupos anònimos, cumpartzi sa positzione a manera retzìproca e comùnica. Sunt disponìbiles meda impostaduras pro s’arrastamentu, pro sa sessione in cursu o permanentes.
+\n\nSos grupos anònimos sunt limidados pro su nùmeru de dies e calicuna de sas funtziones, es. non b’est su controllu remotu e nemmancu s’amministradore de su grupu. Grupos cun totu sas funtzionalidades podent èssere creados in su giassu e petzi sos impitadores registrados podent atzèdere. "</string>
     <string name="osmo_plugin_name">Compidada OsMo</string>
     <string name="osmo_settings">Compidada OsMo</string>
    	
@@ -382,16 +385,18 @@
     <string name="shared_string_control_start">Avia/Inghitza</string>
     <string name="map_widget_av_notes">Notas àudio/vìdeo</string>
     <string name="osmand_srtm_short_description_80_chars">Plugin OsmAndfor pro sas lìnias de livellu sena lìnia</string>
-    <string name="osmand_srtm_long_description_1000_chars">Custu plugin frunidi sas lìnias de livellu chi podent èssere bisualizatas in sas mapas sena lìnia de OsmAnd. Sos datos globales (intre sos 70 grados nord e sos 70 grados sud) sunt basados in supra de sas medidas de su SRTM (Shuttle Radar Topography Mission) e de s’ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), un’aina medidora a bordu de Terra, su satellite de su sistema di osservatzione de sa terra de sa NASA. ASTER est un’isfortzu de coperassione intre NASA, su Ministeru de s’Economia Cummèrtziu e Industria (METI) de su Giappone, e su sistema ispatziale giapponesu (J-spacesystems).</string>
+    <string name="osmand_srtm_long_description_1000_chars">"Custu plugin frunidi sas lìnias de livellu e sas umbraduras de sos rilievos, chi podent èssere visualizadas in supra de sas mapas non in lìnia de OsmAnd. Custa funtzionalidade at a èssere appretziada meda dae sos atletas, sos escursionistas, e totu sos chi sunt interessados in s\'orografia e su paesàggiu.
+\n\nSos datos globales (intre sos 70 grados nord e sos 70 grados sud) sunt basados in supra de sas medidas de su SRTM (Shuttle Radar Topography Mission) e de s’ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), un’aina medidora a bordu de Terra, su satellite de su sistema di osservatzione de sa terra de sa NASA. ASTER est un’isfortzu de coperassione intre NASA, su Ministeru de s’Economia Cummèrtziu e Industria (METI) de su Giappone, e su sistema ispatziale giapponesu (J-spacesystems). "</string>
     <string name="map_widget_distancemeasurement">Medidura de sa distantzia</string>
     <string name="audionotes_location_not_defined">Sa positzione da assotziare cun sa nota non est galu dessinida. \"Imprea positzione ...\" pro assinzare una nota a sa positzione dislindada</string>
     
     <string name="map_widget_audionotes">Notas àudio</string>
-    <string name="audionotes_plugin_description">Registra notas àudio/vìdeo durante su biàgiu</string>
+    <string name="audionotes_plugin_description">Su plugin pro sas notas àudio/vìdeo frunit sas funtzionalidades pro registrare notas àudio/foto/vìdeo durante su biàgiu, impreande su butone in s\'ischermu de sa mapa o su menù de cuntestu pro calechisiat positzione in sa mapa.</string>
     <string name="audionotes_plugin_name">Plugin notas àudio/vìdeo</string>
     <string name="index_srtm_parts">partes</string>
     <string name="index_srtm_ele">Lìnias de livellu</string>
-    <string name="srtm_plugin_description">Plugin esternu (iscarrigamentu a banda) chi fatzìlitat s’isgarrigamentu de sas lìnias de livellu e s’umbradura de sos rilievos (\'Impostaduras\' → \'Gestione documentos mapa\' → \'Isgarrigamentu\' → Issèbera su tipu de mapa disigiatu). Custos podent èssere ammustrados in cumbinatzione cun sas mapas OsmAnd non in lìnia.</string>
+    <string name="srtm_plugin_description">"Custu plugin frunidi sas lìnias de livellu e sas umbraduras de sos rilievos, chi podent èssere visualizadas in supra de sas mapas non in lìnia de OsmAnd. Custa funtzionalidade at a èssere appretziada meda dae sos atletas, sos escursionistas, e totu sos chi sunt interessados in s\'orografia e su paesàggiu.
+\n\nSos datos globales (intre sos 70 grados nord e sos 70 grados sud) sunt basados in supra de sas medidas de su SRTM (Shuttle Radar Topography Mission) e de s’ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), un’aina medidora a bordu de Terra, su satellite de su sistema di osservatzione de sa terra de sa NASA. ASTER est un’isfortzu de coperassione intre NASA, su Ministeru de s’Economia Cummèrtziu e Industria (METI) de su Giappone, e su sistema ispatziale giapponesu (J-spacesystems). "</string>
     <string name="srtm_plugin_name">Plugin lìnias de livellu</string>
     <string name="download_select_map_types">Àteras mapas</string>
     <string name="download_roads_only_item">Petzi istradas</string>
@@ -785,7 +790,7 @@
 	<string name="osmand_parking_pm">PM</string>
 	<string name="osmand_parking_am">AM</string>
 	<string name="osmand_parking_position_name">Puntu de parchègiu</string>
-	<string name="osmand_parking_plugin_description">Custu plugin (de iscarrigare a banda) agiùdada ad ammentare su logu de parchègiu de sa màchina tua.</string>
+	<string name="osmand_parking_plugin_description">Custu plugin est istadu isvilupadu pro impreare OsmAnd pro ammentare su logu de parchègiu de sa màchina tua.</string>
 	<string name="osmand_parking_plugin_name">Plugin positzione parchègiu</string>
 	<string name="context_menu_item_add_parking_point">Marca comente positzione de parchègiu</string>
 	<string name="gpxup_public">Pùblicu</string>
@@ -802,7 +807,7 @@
 	<string name="rendering_attr_appMode_name">Modalidade de disinnu</string>
 	<string name="rendering_attr_contourLines_name">Ammustra curvas de livellu</string>
 	<string name="local_index_routing_data">Datos àndala</string>
-	<string name="navigate_point_format">Formatu:</string>
+	<string name="navigate_point_format">Formatu</string>
 	<string name="poi_search_desc">Chirca PDI (puntos de interesse)</string>
 	<string name="address_search_desc">Chirca de sos indiritzos</string>
 	<string name="navpoint_search_desc">Coordinatas</string>
@@ -823,7 +828,7 @@
 	<string name="online_map_settings_descr">Cunfigura sas mitzas de sas mapas in lìnia o de sos tasseddos in cache</string>
 	
 	
-	<string name="osmand_accessibility_description">Ammustra sas impostaduras pro funtzionalidades ispetziales pro s’atzessibilidade.</string>
+	<string name="osmand_accessibility_description">Custu plugin permitit de impreare sas funtzionalidades pro s\'atzessibilidade de su dispositivu detetamente in OsmAnd, e fatzilitat, pro nàrrere, sa modìfica de sa lestresa de sas boghes TTS, sa cunfiguratzione de su movimentu de s\'ischermu, s’impreu de una trackball pro su zoom o de un’interfàtzia vocale.</string>
 	
 	<string name="plugins_screen">Plugins</string>
 	
@@ -977,12 +982,14 @@
 	<string name="first_time_msg">Gratzias pro s’impreu de OsmAnd. Pro meda de sas caraterìsticas de s’àplicu tènes bisongiu de datos locales sena lìnia, chi podent èssere icarrigadas dae \'Impostaduras\'→\'Amministra sos documentos de sas mapas\'. A pustis at a èssere possìbile ammustrare mapas, chircare indirìtzos, PDI, e agatare trasportos pùblicos.</string>    
 	<string name="basemap_was_selected_to_download">Sa mapa de base est netzessària pro su funtzionamentu curretu de s’àplicu e est istada ischertada pro s’iscarrigamentu.</string>
 	
-	<string name="osmand_development_plugin_description">Ammustrat sas impostaduras pro funtzionalidades pro isvilupu e debug comente su nàvigu animadu o s’ammustrare sa prestatzione de su rèndering.</string>
+	<string name="osmand_development_plugin_description">Custu plugin ammustrat sas impostaduras pro funtzionalidades pro isvilupu e debug comente sa simulatzione de su nàvigu, sa visualizatzione de sa prestatzione de su rèndering, o s\'interfàtzia vocale. Custas impostaduras sunt pensadas pro sos isvilupadores e non sunt netzessàrias pro sos àteros impitadores.</string>
 	<string name="vector_maps_may_display_faster_on_some_devices">Sas mapas vetoriales diat dèpere apàrrere in manera prus lestra. In carchi dispositivu diat podere funtzionare male.</string>
 	<string name="osmand_parking_warning_text">Pretzdentemente est istada annangada a su tzeravallu/calendàriu tuo sa notìfica pro recuperare sa màchina. At a abarrare finas a cando non l\'as a burrare manualmente.</string>    
 	<string name="rendering_attr_noPolygons_description">Faghe divènnere transparentes totu sas caraterìsticas de sas àreas de su terrinu</string>
 	<string name="rendering_attr_hmRendered_description">Aumenta sa cantidade ammustrada de minujos de sa mapa</string>
-	<string name="osmand_rastermaps_plugin_description">Ammustrat sas impostaduras pro cunfigurare una variedade de mapas in lìnia o a tasseddos in cache comente mapa de base pro sas mapas subrapostas/de sutafondu. Custas mapas podent èssere fintzas ammaniadas sena lìnia e copiadas in sa cartella de sos datos de OsmAnd.</string>
+	<string name="osmand_rastermaps_plugin_description">"Cun custu plugin podes atzèdere a medas castas de màpas in lìnia (cussas connotas comente \"a tasseddos\" o \"raster\"), dae sas predefinidas de  Openstreetmap (comente Mapnik) a sas immàgines satellitares e a sos istratos pro punnas ispetziales comente sas mapas metereològicas, climàticas, geològicas, e umbradura de sos rilievos etc.
+\n\nTotu custas mapas podent èssere impreadas siat comente mapa printzipale (de base) de ammustrare in s\'ischermada mapa de OsmAnd siat comente un\'istratu se subrapositzione o de isfundu de un’àtera mapa de base (comente sas mapas standard non in lìnia de OsmAnd). Pro permìtere una visibilidade prus manna de sas mapas de isfundu, calicunu de sos elementos de sas mapas vetoriales podet èssere cuadu, impreande su menù \'Cunfigura sa mapa\' sighinde sas netzessidades tuas.
+\n\nSas mapas a tasseddos podent èssere iscarrigadas deretamente o ammaniadas pro s\'impreu sena lìnia (e a pustis copiadas intre sa cartella de sos datos de OsmAnd) comente unu database sqlite chi podet èssere produidu dae medas ainas pro sa creatzione de mapas esternas (third-party maps). "</string>
 	
 	<string name="tip_recent_changes_0_8_0_t">"Mudas in sa 0.8.0:
 \n\t- *Funtzionalidade a plugin*
@@ -993,7 +1000,7 @@
 \n\t- *Càlculu de s’àndala sena lìnia*
 \n\t - Su càlculu de sas àndala divènnidi prus sòlidu\n\t *Megioramentos impreabilidade e UI*
 \n\t - Megioramentos in medas àreas "</string>
-	<string name="osm_editing_plugin_description">Ammustrat sas impostaduras netzessàrias pro cuntribuire ad OSM comente sa creatzione e sa muda de sos PDI de OSM, apèrrere e cummentare errores de OSM e imbiare documentos GPX registrados (netzessitat de sas credentziales de OSM).</string>
+	<string name="osm_editing_plugin_description">Custu plugin permitit de cuntribuire ad OSM creande e modificande sos PDI de OSM, aberinde e cummentande errores de OSM e imbiande documentos GPX registrados. OSM est unu progetu pùblicu de mapadura fatu dae una comunidade globale. Pro àteras informatziones: http://openstreetmap.org. Sa partetzipatzione est apretziada, e sas cuntributziones podent èssere fatas deretamente dae OsmAnd insertande in intro de s\'aplicu sas credentziales de atzessu.</string>
 	<string name="play_commands_of_currently_selected_voice">Riprodui sos cumandos de sa boghe como seletzionada</string>
 	<string name="test_voice_prompts">Proa sos cumandos vocales</string>    
 	<string name="switch_to_raster_map_to_see">Peruna mapa vetoriale est disponìbile pro custa positzione. Ne podes iscarrigare una in Impostaduras (Amministra sos documentos de sas mapas), o colare a sas mapas in lìnia (abìlita sas mapas in lìnia pro lu fàghere).</string>
@@ -1151,7 +1158,7 @@
 	<string name="vector_map_not_needed">No, gràtzias</string>
 	<string name="basemap_missing">Fartat sa mapa de base de su mundu (totu su mundu pro zoom bassos). Podes iscarrigare World_basemap_x.obf pro unu sistema cumpridu.</string>
 	<string name="vector_data_missing">Fartant sos datos (\'non in lìnia\') in s’ischeda SD. Ti cussigiamus de los iscarrigare pro poder impreare sas mapas sena lìnia.</string>
-	<string name="local_index_installed">Editzione</string>
+	<string name="local_index_installed">Versione locale</string>
 	<string name="local_index_items_backuped">%1$d de %2$d ogetu/os deativados curretamente.</string>
 	<string name="local_index_items_deleted">%1$d de %2$d ogetu/os burradu curretamente.</string>
 	<string name="local_index_items_restored">%1$d de %2$d ogetu/os ativadu/os curretamente.</string>
@@ -1380,7 +1387,7 @@
 	<string name="old_map_index_is_not_supported">Su formadu datos mapa \'\'{0}\'\' est isputziau e no est suportadu</string>
 	<string name="osmand_routing_experimental">"Su nàvigu sena lìnia de OsmAnd est isperimentale e non funtzionada pro distàntzias prus mannas de  20 km.\n\nSu servìtziu de nàvigu benit furnidu intertantu tramite CloudMade in lìnia."</string>
 	<string name="osmand_net_previously_installed">B’est installada una versione pretzedente de OsmAnd. Totu sos datos ant a èssere suportados dae s’aplicu nou. Sos prefèrridos depent èssere esportados dae s’aplicu bètzu e importados a manuda in su nou.</string>
-	<string name="gps_status_app_not_found">Aplicu istadu GPS no installada. La boles chircare in su Market?</string>
+	<string name="gps_status_app_not_found">Aplicu istadu GPS no installadu. Lu boles chircare in su Market?</string>
 	<string name="voice_is_not_available_msg">Boghe de ghia non disponìbile. Intra in \'Impostaduras\' → \'Impostaduras generales\' → \'Ghia vocale\', issèbera su pachete prefèrridu e/o iscàrrigalu.</string>
 	<string name="daynight_descr">Issèbera sas règulas pro sa muda de sa modalidade die/note</string>
 	<string name="download_files_question">Iscarrigare {0} documentu/os ({1} MB)?</string>
@@ -1469,7 +1476,7 @@
 	<string name="search_online_address">Ìnternet</string>
 	<string name="max_level_download_tile">Max zoom in lìnia</string>
 	<string name="max_level_download_tile_descr">Issèbera su livellu màssimu da iscarrigare pro sa mapas in lìnia a tasseddos</string>
-	<string name="route_general_information">Distàntzia totale %1$s \n durada de su biàgiu %2$d h %3$d m.</string>
+	<string name="route_general_information">Distàntzia totale %1$s, longària de su biàgiu %2$d h %3$d m.</string>
 	<string name="router_service_descr">Issèbera unu servìtziu in lìnia o sena lìnia de nàvigu</string>
 	<string name="router_service">Servìtziu de nàvigu</string>
 	<string name="sd_dir_not_accessible">Sa cartella de sarbamentu in s’ischeda SD no est atzessiva!</string>
@@ -1478,7 +1485,7 @@
 	<string name="address">Indiritzu</string>
 	<string name="shared_string_download_successful">Iscarrigamentu cumpridu</string>
 	
-	<string name="shared_string_downloading">Iscarrigande …</string>
+	<string name="shared_string_downloading">Iscarrigande</string>
 	
 	<string name="downloading_list_indexes">Iscarrigamentu lista regiones disponìbiles…</string>
 	<string name="list_index_files_was_not_loaded">Sos documentos inditze non sunt istados agatados in osmand.net.</string>
@@ -1708,7 +1715,8 @@
     <string name="speak_poi">Annùntzia PDI a curtzu</string>
     <string name="flat_list_waypoints">Totus</string>
     <string name="index_tours">Itineràrios</string>
-    <string name="record_plugin_description">Ativat sa funtzionalidade de registratzione de sas rastas tuas carcande su pursante in s’ischermu de sa mapa e ammustrat sas impostaduras pro sa registratzione de sos biàgios tuos in documentos GPX localmente o in lìnia impreande unu servìtziu web.</string>
+    <string name="record_plugin_description">"Custu plugin ativat sa funtzionalidade de registratzione de sas rastas tuas carcande su pursante in s’ischermu de sa mapa e ammustrat sas impostaduras pro sa registratzione de sos biàgios tuos in documentos GPX localmente o in lìnia impreande unu servìtziu web.
+\n\nSas rastas registradas podent èssere cumpartzida cun sos amigos tuos o èssere impreadas pro cuntribuire a OSM. Sos atletas podent impreare sas rastas pro compidare sos allenamentos issoro. Carchi anàlisi de base podet èssere fata deretamente in OsmAnd, comente tempus de giru, lestresa mèdia etc., e sas rastas podent, est craru, èssere analizadas fintzas prus a tardu cun ainas estèrnas de anàlisi. "</string>
     <string name="record_plugin_name">Registratzione biàgios</string>
     <string name="int_hour">h</string>
     <string name="duration">Durada</string>
@@ -1867,11 +1875,12 @@
 		\n\nEst disponìbile una mapa cun totu sas pistas e sas àndalas pro iscì de fundu suta de \'Iscarrigàbiles\', comente \'World ski map\'.
 		\n\nCusta vista podet èssere furriada disativande•la inoghe torra o cambiande s’\'Istile mapa\' in \'Cunfigura mapa\'.
 	</string>
-	<string name="plugin_touringview_descr">Ativande custa vista s’istile de sa mapa at a colare a \'Vista turìstica\', una vista fata a sa minuda pro turistas, biagiatores e autistas professionistas.
-		\n\nCusta vista frunit, pro cada livellu de zoom, su màssimu de sas minujas de biàgiu disponìbiles in sos datos de sa mapa (in particulare minujas de de sas istradas e de sas àndalas e sinnos de orientamentu). Rapresentat fintzas totu sas castas de istrada in manera crara tramite colores diferentes, agiudande meda, pro nàrrere, sos chi ghiant veìculos mannos meda.
-		\n\nNo est netzessària una mapa ispetziale, sa vista est creada dae sas mapas istandard.
-		\n\nCusta vista podet èssere furriada disativande•la inoghe torra o cambiande s’\'Istile mapa\' in \'Cunfigura mapa\' comente boles.
-	</string>
+	<string name="plugin_touringview_descr">"Ativande custa vista s’istile de sa mapa at a colare a \'Vista turìstica\', una vista fata a sa minuda pro turistas, biagiatores e autistas professionistas.
+\n\nCusta vista frunit, pro cada livellu de zoom, su màssimu de sas minujas de biàgiu disponìbiles in sos datos de sa mapa (in particulare minujas de de sas istradas e de sas àndalas e sinnos de orientamentu).
+\n\nRapresentat fintzas totu sas castas de istrada in manera crara tramite colores diferentes, agiudande meda, pro nàrrere, sos chi ghiant veìculos mannos meda.
+\n\nE frunit optziones ispetziales de nàvigu, comente sa visualizatzione de sas àndalas pro sas bitzicletas e s\'alpinismu.
+\n\nNo est netzessàriu iscarrigare una mapa ispetziale, sa vista est creada dae sas mapas istandard.
+\n\nCusta vista podet èssere furriada disativande•la inoghe torra o cambiande s’\'Istile mapa\' in \'Cunfigura mapa\' comente boles. "</string>
 	
 	<string name="showed_on_map">Ammustradu in sa mapa</string>
 	<string name="days_behind">dies faghet</string>
@@ -1884,4 +1893,28 @@
 <string name="shared_string_selected">Ischertadu</string>
 	<string name="track_segments">Segmentos de sa rasta</string>
 	<string name="track_points">Puntos de sa rasta</string>
+	<string name="action_create">Atzione crea</string>
+	<string name="action_modify">Atzione modìfica</string>
+	<string name="action_delete">Atzione burra</string>
+	<string name="osm_edits">Modìficas OSM</string>
+	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">Galu</string> <string name="parking_place_limited">Parchègiu cun tempus limitadu</string>
+	<string name="your_edits">Modìficas tuas</string>
+    <string name="waypoint_visit_after">Vìsita a pustis</string>
+    <string name="waypoint_visit_before">Vìsita in antis</string>
+    <string name="simulate_your_location">Dispinta/Sìmula sa positzione tua</string>
+    <string name="drawer">Lista ebbia</string>
+    <string name="short_location_on_map">Lat %1$s\n Lon %2$s</string>
+    <string name="tips_and_tricks_descr">Dimandas fitianas, ùrtimas modìficas e àteru</string>
+    <string name="routing_settings_2">Impostaduras de nàvigu</string>
+    <string name="general_settings_2">Impostaduras generales</string>
+	<string name="shared_string_ellipsis">…</string>
+	<string name="shared_string_deselect">De-ischerta</string>
+	<string name="shared_string_deselect_all">De-ischerta totu</string>
+	<string name="shared_string_unexpected_error">B\'est istadu unu errore non prevididu</string>
+	<string name="shared_string_action_template">Atzione {0}</string>
+	<string name="shared_string_collapse">Mìnima</string>
+	<string name="shared_string_video">Vìdeo</string>
+	<string name="shared_string_photo">Foto</string>
+	<string name="route_points">Puntos de s\'àndala</string>
+	<string name="shared_string_release">Essidu</string>
 	</resources>

OsmAnd/res/values-sk/strings.xml

@@ -2014,11 +2014,11 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 		\n\nMapový súbor obsahujúci všetky lyžiarske svahy a bežecké trate je dostupný na stiahnutie pod názvom \"Svetová lyžiarska mapa\".
 		\n\nTento pohľad môže byť vypnutý jeho deaktivovaním tu alebo zmenou hodnoty v \"Štýl vykresľovania\" v \"Nastaviť mapu\".
 	</string>
-	<string name="plugin_touringview_descr">Aktivovaním tohto pohľadu sa zmení štýl mapy na \"Touring view\", ktorý obsahuje viac detailov pre cestovateľov a profesionálnych vodičov.
-		\n\nTento pohľad poskytuje vo všetkých priblíženiach mapy maximum cestovných detailov (napr. cesty, chodníky a orientačné značky). Taktiež zobrazuje typy ciest v jednoznačne odlišných farbách, čo je užitočné napríklad pre veľké vozidlá.
-		\n\nNie je potrebné stiahnuť samostatný súbor, tento pohľad používa štandardné mapové súbory.
-		\n\nTento pohľad môže byť vypnutý jeho deaktivovaním tu alebo zmenou hodnoty v \"Štýl vykresľovania\" v \"Nastaviť mapu\".
-	</string>
+	<string name="plugin_touringview_descr">"Aktivovaním tohto pohľadu sa zmení štýl mapy na \"Touring view\", ktorý obsahuje viac detailov pre cestovateľov a profesionálnych vodičov.
+\n\nTento pohľad poskytuje vo všetkých priblíženiach mapy maximum cestovných detailov (napr. cesty, chodníky a orientačné značky).
+\n\nTaktiež zobrazuje typy ciest v jednoznačne odlišných farbách, čo je užitočné napríklad pre veľké vozidlá.
+\n\nPoskytuje aj špeciálne možnosti pre cestovanie ako cyklotrasy a turistické značkované chodníky.\n\nNie je potrebné stiahnuť samostatný súbor, tento pohľad používa štandardné mapové súbory.
+\n\nTento pohľad môže byť vypnutý jeho deaktivovaním tu alebo zmenou hodnoty v \"Štýl vykresľovania\" v \"Nastaviť mapu\". "</string>
 	<string name="plugin_touringview_name">Cestovný mapový pohľad (Touring view)</string>
 	<string name="location_on_map">Umiestnenie:\n Šírka %1$s\n Dĺžka %2$s</string>
 	<string name="watch">Zobraziť</string>

OsmAnd/res/values-sl/strings.xml

@@ -379,7 +379,7 @@
 	<string name="rendering_attr_contourLines_description">Prikaži pod povečavo (potrebuje datoteko SRTM):</string>
 	<string name="rendering_attr_hmRendered_description">Povečaj število podrobnosti karte</string>
 	<string name="rendering_attr_hmRendered_name">Pokaži podrobnejšo karto</string>
-	<string name="navigate_point_format">Oblika:</string>
+	<string name="navigate_point_format">Oblika</string>
 	<string name="day_night_info">Informacije dan/noč</string>
 	<string name="map_widget_day_night">Zemljevid dan/noč</string>
 	<string name="map_widget_vector_attributes">Lastnosti upodabljanja</string>
@@ -402,7 +402,7 @@
 	<string name="osmand_parking_position_description">Položaj vašega parkiranega avtomobila: %1$s</string>
 	<string name="osmand_parking_position_description_add">Prevzem avtomobila ob:</string>
 	<string name="osmand_parking_position_name">Točka parkiranja</string>
-	<string name="osmand_parking_plugin_description">Ta vtičnik omogoča shranjevanje mesta vašega parkiranega avtomobila.</string>
+	<string name="osmand_parking_plugin_description">Ta vtičnik omogoča enostavno shranjevanje mesta parkiranja vašega avtomobila v OsmAnd.</string>
 	<string name="osmand_parking_plugin_name">Parkirni položaj</string>
 	<string name="context_menu_item_add_parking_point">Označi kot parkirni položaj</string>
 	<string name="context_menu_item_delete_parking_point">Brisanje oznake parkiranja</string>
@@ -439,7 +439,7 @@
 	<string name="local_index_gpx_info_show">\n\nDolg pritisk za možnosti</string>
 	<string name="search_offline_clear_search">Novo iskanje</string>
 	<string name="poi_filter_custom_filter">Filter po meri</string>
-	<string name="gps_status_app_not_found">Aplikacija GPS Status ni nameščena. Ali jo želite poiskati v Google Play trgovini?</string>
+	<string name="gps_status_app_not_found">Aplikacija GPS status ni nameščena. Ali jo želite poiskati v Google Play trgovini?</string>
 	<string name="show_point_options">Uporabi mesto …</string>
 	<string name="menu_layers">Sloji zemljevida</string>
 	<string name="where_am_i">Kje sem?</string>
@@ -455,7 +455,7 @@
 	<string name="prefs_plugins_descr">Vtičniki omogočajo napredne nastavitve in dodatne funkcionalnosti</string>
 	<string name="osmand_development_plugin_description">Prikaži nastavitve za razvoj in razhroščevanje, kot so animirana navigacija ali prikaz hitrosti izrisa.</string>
 	
-	<string name="osmand_accessibility_description">Prikaz nastavitve za posebne funkcije dostopnosti.</string>
+	<string name="osmand_accessibility_description">Prikaz nastavitev za aktivacijo posebnih funkcij dostopnosti.</string>
 	<string name="osmand_background_plugin_description">Prikaži nastavitve za sledenje in navigacijo v načinu spanja (ugasnjen ekran in občasna uporaba GPS-a).</string>
 	<string name="shared_string_close">Zapri</string>
 	<string name="opening_hours">Delovni čas</string>
@@ -778,7 +778,7 @@
 	<string name="vector_map_not_needed">Ne, hvala</string>
 	<string name="basemap_missing">Osnovni zemljevid sveta (ki pokriva cel svet pri majhnih povečavah) manjka. Razmislite o prejemu World_basemap_x.obf za celotno okolje.</string>
 	<string name="vector_data_missing">Nepovezani podatki manjkajo na SD kartici. Razmislite o njihovem prejemu, da boste lahko zemljevide uporabili tudi, ko ste nepovezani.</string>
-	<string name="local_index_installed">Izdaja</string>
+	<string name="local_index_installed">Lokalna izdaja</string>
 	<string name="map_text_size_descr">Izberite velikost besedila za imena na zemljevidu</string>
 	<string name="map_text_size">Velikost pisave zemljevida</string>
 	<string name="trace_rendering">Podatki razhroščevanja upodabljanja</string>
@@ -987,7 +987,7 @@
 	<string name="search_online_address">Iskanje v povezavi</string>
 	<string name="max_level_download_tile">Maks. povečava za spletne</string>
 	<string name="max_level_download_tile_descr">Izbira najvišje stopnje povečave za prenos spletnih zemljevidov</string>
-	<string name="route_general_information">Skupna razdalja %1$s \n čas potovanja %2$d u %3$d m.</string>
+	<string name="route_general_information">Skupna razdalja %1$s, čas potovanja %2$d u %3$d m.</string>
 	<string name="router_service_descr">Izbira spletne ali krajevne navigacijske storitve</string>
 	<string name="sd_dir_not_accessible">Shranjevalnega imenika na SD kartici ni na voljo!</string>
 	<string name="download_question">Prenesti {0} - {1}?</string>
@@ -1125,7 +1125,7 @@
     <string name="map_widget_distancemeasurement">Merjenje razdalj</string>
     
     <string name="map_widget_audionotes">Zvočni zapisi</string>
-    <string name="audionotes_plugin_description">Shrani zvočne zapise med potovanjem</string>
+    <string name="audionotes_plugin_description">Ta vtičnik omogoča snemanje avdio, fotografskih in video opomb med potovanjem</string>
     <string name="audionotes_plugin_name">Vtičnik za zvočne zapise</string>
     <string name="index_srtm_parts">deli</string>
     <string name="download_srtm_maps">Podatki izohips</string>
@@ -1268,7 +1268,7 @@
 \n\t* Podpora OSM opomb "</string>
     <string name="intermediate_items_sort_by_distance">Razvrščanje (od vrat do vrat)</string>
     <string name="osmand_distance_planning_plugin_description">Ustvarite poti (ali uporabite/spremenite obstoječe GPX datoteke) za merjenje razdalj med točkami. Shrani kot GPX se lahko uporabi za načrtovanje GPX poti.</string>
-    <string name="osmand_distance_planning_plugin_name">Računanje razdalj in Orodje za načrtovanje</string>
+    <string name="osmand_distance_planning_plugin_name">Računanje razdalj in orodje za načrtovanje</string>
     <string name="distance_measurement_finish_subtrack">Začni novo pod-sled</string>
     <string name="wait_current_task_finished">Počakajte, da je trenutna naloga končana</string>
     <string name="use_kalman_filter_compass_descr">Zmanjšuje šum pri branju kompasa, vendar dodaja inercijo</string>
@@ -1651,7 +1651,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
     <string name="keep_informing_never">Samo ročno (tapnite puščico)</string>
     <string name="keep_informing_descr">Napoveduj navigacijska navodila v rednih časovnih presledkih</string>
     <string name="keep_informing">Ponavljanje navigacijskih navodil</string>
-	<string name="osmo_settings">OpenStreetMap sledenje</string>
+	<string name="osmo_settings">OsMo sledenje</string>
    	<string name="arrival_distance_descr">Kako hitro želite napoved prihoda?</string>
     <string name="arrival_distance">Napoved prihoda</string>
     
@@ -1973,7 +1973,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
     <string name="save_track_to_gpx_globally_headline">Shranjevanje sledi na zahtevo</string>
 	<string name="parking_place">Parkirno mesto</string>
     <string name="remove_the_tag">ODSTRANJEVANJE OZNAKE</string>
-    <string name="gps_status">GPS Status</string>
+    <string name="gps_status">Stanje GPS</string>
     <string name="version_settings_descr">Prenos nočne gradnje</string>
     <string name="version_settings">Gradnje</string>
     <string name="rendering_attr_streetLighting_name">Ulična razsvetljava</string>
@@ -2014,4 +2014,32 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
 	<string name="action_delete">Brisanje dejanja</string>
 	<string name="osm_edits">OSM urejanje</string>
 	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">Ostaja</string> <string name="parking_place_limited">Parkirno mesto časovno omejeno</string>
+	<string name="your_edits">Vaše spremembe</string>
+    <string name="drawer">Seznam</string>
+    <string name="short_location_on_map">Šir %1$s\n Dol %2$s</string>
+    <string name="tips_and_tricks_descr">Pogosto zastavljena vprašanja, nedavne spremembe in ostalo</string>
+    <string name="routing_settings_2">Nastavitve navigacije</string>
+    <string name="general_settings_2">Splošne nastavitve</string>
+	<string name="shared_string_ellipsis">…</string>
+	<string name="shared_string_selected">Izbrano</string>
+	<string name="shared_string_deselect">Odstrani iz izbora</string>
+	<string name="shared_string_deselect_all">Počisti izbor</string>
+	<string name="shared_string_export">Izvozi</string>
+	<string name="shared_string_unexpected_error">Prišlo je do nepričakovane napake</string>
+	<string name="shared_string_action_template">Dejanje {0}</string>
+	<string name="shared_string_collapse">Skrči</string>
+	<string name="shared_string_currently_recording_track">Trenutno beležena sled</string>
+	<string name="shared_string_audio">Zvok</string>
+	<string name="shared_string_video">Video</string>
+	<string name="shared_string_photo">Fotografija</string>
+	<string name="route_points">Točke poti</string>
+	<string name="rename_failed">Preimenovanje ni uspelo.</string>
+	<string name="days_behind">dni star</string>
+	<string name="back_to_map">Nazaj na zemljevid</string>
+	<string name="share_note">Deli opombo</string>
+    <string name="location_on_map">Lokacija:\n Šir %1$s\n Dol %2$s</string>
+	<string name="notes">Osombe</string>
+	<string name="online_map">Spletni zemljevid</string>
+	<string name="roads_only">Le ceste</string>
+    <string name="shared_string_release">Izdano</string>
 	</resources>

OsmAnd/res/values-sv/strings.xml

@@ -141,7 +141,7 @@
 
 <string name="index_settings_descr">Ladda ner och hantera offline-kartor lagrade på din enhet</string>
 <string name="online_map_settings">Online-kartor</string>
-<string name="osmand_accessibility_description">Visar inställningarna för att aktivera speciella tillgänglighetsfunktioner.</string>
+<string name="osmand_accessibility_description">Denna modul låter inställningarna för att aktivera speciella tillgänglighetsfunktioner bli direkt åtkomliga i OsmAnd och underlättar t.ex. justering av talhastigheten för TTS-röster, konfigurering av skärmnavigering med hjälp av en trackball för zoomkontroll eller användande av återkoppling med text-till-tal.</string>
 
 
 <string name="debugging_and_development">Utveckling av OsmAnd</string>
@@ -227,7 +227,7 @@
 \n\nKartbitar (tile maps) kan hämtas direkt online eller förberedas för användning offline (och kopieras manuellt till OsmAnds datamapp) som en sqlite-databas som kan skapas med olika tredjepartsverktyg. "</string>
 <string name="osmand_background_plugin_description">Visa inställningarna för att aktivera spårning och navigering i viloläge (skärm av) genom att periodvis väcka GPS-enheten.</string>
 
-<string name="osmand_development_plugin_description">Visar inställningarna för utvecklings- och felsökningsfunktioner som ruttsimulering eller visning av renderingsprestanda.</string>
+<string name="osmand_development_plugin_description">Denna modul visar inställningarna för utvecklings- och felsökningsfunktioner som rutt-testning och -simulering eller visning av renderingsprestanda eller röststyrning. Dessa inställningar är avsedda för utvecklare och behövs inte för den vanliga användaren.</string>
 <string name="plugins_screen">Hantera insticksmoduler</string>
 <string name="tip_recent_changes_0_8_2_t">"Förändringar i 0.8.2 :\n\t* Förbättrad ruttuträkning\n\t* Widgets för dynamisk karta\n\t* Kartinställningar flyttade till kartskärmen\n\t* Lås skärm knapp med logga tjänster\n\t* Fixat arabiska, Kannada skript och RTL språk "</string>
 
@@ -250,7 +250,7 @@
 \n\t - Offline-ruttning blir mer robust↵
 \n\t *Användbarhet och UI-erfarenhet*↵
 \n\t - Förbättrats på många områden "</string>
-<string name="osm_editing_plugin_description">Med denna modul kan OsmAnd användas för att göra bidrag till OSM såsom samlande/modifierande av OSM POI-objekt, öppnande/kommenterande av OSM-buggar, och bidragande med inspelade GPX-filer. För att använda denna funktion krävs OSM-referenser.</string>
+<string name="osm_editing_plugin_description">"Med denna modul kan OsmAnd användas för att göra bidrag till OSM såsom samlande/modifierande av OSM POI-objekt, öppnande/kommenterande av OSM-buggar, och bidragande med inspelade GPX-filer. OSM är ett globalt kartprojekt inom public domain, För mer info, se  http://openstreetmap.org. Aktivt deltagande uppskattas och bidrag kan ges direkt i OsmAnd om du anger dina personiga OSM-referenser i appen."</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 aktuell röst</string>
 <string name="test_voice_prompts">Test av röstmeddelanden</string>
@@ -806,7 +806,7 @@
 	<string name="hint_search_online">Online-sökning: Husnummer, gata, stad</string>
 	<string name="search_offline_address">Offline</string>
 	<string name="max_level_download_tile_descr">Välj högsta zoomnivå att ladda ner för online-kartbitar</string>
-	<string name="route_general_information">Total sträcka %1$s \n restid %2$d h %3$d m.</string>
+	<string name="route_general_information">Total sträcka %1$s, restid %2$d h %3$d m.</string>
 	<string name="router_service_descr">Välj en online- eller offline-navigeringstjänst</string>
 	<string name="router_service">Navigeringstjänst</string>
 	<string name="sd_dir_not_accessible">Datalagringsmappen på SD-kortet är inte tillgänglig!</string>
@@ -922,7 +922,7 @@
     <string name="map_widget_distancemeasurement">Avståndsmätning</string>
     
     <string name="map_widget_audionotes">Ljudanteckningar</string>
-    <string name="audionotes_plugin_description">Denna modul visar knappar för ljud-/foto-/videoanteckningar under en resa</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_name">Ljud-/Videoanteckningar</string>
     <string name="index_srtm_parts">delar</string>
     <string name="index_srtm_ele">Höjdkurvor</string>
@@ -1380,7 +1380,7 @@
     <string name="osmo_settings_descr">Konfigurera inställningar för övervakning och ställ in personlig övervakningskanal</string>
     <string name="osmo_plugin_name">OSMo-spårning</string>
     <string name="osmo_settings">OsMo-spårning</string>
-   	<string name="osmo_plugin_description">"Visar inställningarna för OsMo - avancerad direktspårning. Se http://osmo.mobi. Spåra andra enheter och bli spårad själv. Skapa anonyma grupper, dela med er av era positioner och kommunicera med varandra.\n\nDet finns olika inställningar för sessionsspårning eller permanent spårning. Anonyma grupper är begränsade till ett antal dagar och för vissa funktioner finns ingen fjärrkontroll eller gruppadministratör. Helt fungerande grupper bör skapas på webbplatsen och endast registrerade användare har tillgång till dem. "</string>
+   	<string name="osmo_plugin_description">"Denna modul erbjuder funktioner för OsMo - avancerad direktspårning. Se http://osmo.mobi.\n\nDu kan spåra andra enheter och bli spårad själv. Du kan skapa anonyma grupper, dela med er av era positioner och kommunicera med varandra. Det finns olika alternativ för sessionsspårning eller permanent spårning.\n\nAnonyma grupper kan skapas för ett specificerat antal dagar och begränsas till bestämda funktioner, d.v.s. det finns ingen fjärrkontroll eller gruppadministratör. Helt fungerande grupper kan å andra sidan skapas på webbplatsen och endast registrerade användare har tillgång till dem. "</string>
     <string name="interrupt_music_descr">Avbryt musik vid meddelanden</string>
 	<string name="interrupt_music">Avbryt musik</string>
 	<string name="share_route_as_gpx">Dela rutt som GPX-fil</string>
@@ -1830,4 +1830,7 @@
 	<string name="waypoint_visit_after">Besök efter</string>
     <string name="waypoint_visit_before">Besök före</string>
     <string name="shared_string_collapse">Slå ihop</string>
-	</resources>
+	<string name="osm_edits">OSM-redigeringar</string>
+	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">kvar</string> <string name="parking_place_limited">Tidsbegränsad parkering</string>
+	<string name="your_edits">Dina redigeringar</string>
+    </resources>

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

@@ -203,11 +203,11 @@
 	<string name="osmand_rastermaps_plugin_description">"有了這個外掛元件，您可以存取多種類型的網絡（所謂的圖磚或網格）地圖，從預設的 Openstreetmap 圖磚（如 Mapnik）到衛星圖像和特殊用途的圖層，比如天氣地圖、氣候地圖、地質地圖、山體陰影層等。\n\n這些地圖可以被用來作為主要的（基本）地圖，以便在 OsmAnd 地圖螢幕上顯示，或作為覆疊層又或另外基本地圖的底層（如 OsmAnd 正常的離線地圖）。為了使任何的底層地圖可以看見，OsmAnd 向量地圖可以容易的根據需要透過 \'組態地圖\' 選單來隱藏某些構成。
 \n\n地圖圖磚可以直接透過線上資料來源獲得，或著可以使用準備好的離線地圖（手動複製到 OsmAnd 的資料檔案夾中） 作為一個 sqlite 資料庫，可以透過各種的第三方地圖編制工具產生。 "</string>
 	<string name="osmand_background_plugin_description">透過週期性的喚醒 GPS 裝置，在休眠模式下(螢幕關閉)顯示設定以啟用追蹤與導航。</string>
-	<string name="osmand_accessibility_description">顯示設定以啟動指定的無障礙功能。</string>
+	<string name="osmand_accessibility_description">這個外掛元件，讓裝置在 OsmAnd 可直接用無障礙功能以及便利，例如調整 TTS 語音的語音速率、組態螢幕導航方位、使用軌跡球為縮放控制，或使用文字轉語音的回應。</string>
 	
 	
 	
-	<string name="osmand_development_plugin_description">顯示開發與除錯功能的設定，如導航模擬或繪製效能表示。</string>
+	<string name="osmand_development_plugin_description">這個外掛元件顯示開發與除錯功能的設定，如測試或模擬路線、螢幕繪製效能或語音提示。這些設定適用于開發人員，普通使用者並不需要。</string>
 	<string name="plugins_screen">外掛元件管理</string>
 	
 	<string name="prefs_plugins_descr">啟動外掛元件進階的設定和更多的附加功能</string>
@@ -441,7 +441,7 @@
 	<string name="local_index_items_backuped">%2$d 項中的 %1$d 項已順利停用。</string>
 	<string name="local_index_items_deleted">%2$d 項中的 %1$d 項已順利刪除。</string>
 	<string name="local_index_items_restored">%2$d 項中的 %1$d 項已順利啟動。</string>
-	<string name="local_index_action_do">您即將 %2$s 個項目 %1$s，要繼續嗎？</string>
+	<string name="local_index_action_do">您即將到 %2$s 的 %1$s 的項目，要繼續嗎？</string>
 	<string name="local_index_descr_title">管理地圖檔案</string>
 	<string name="local_index_mi_restore">啟用</string>
 	<string name="local_index_mi_backup">停用</string>
@@ -533,12 +533,11 @@
 \n\t*興趣點（按類型或名稱）
 \n\t*透過您的查尋履歷
 \n\t*或透過您事先定義的我的最愛
-\n\n在主畫面上按\'查尋\'進行查尋的動作。所有在快顯功能表中或動作列被點選中的，都提供有例如\'導引\'或\'在地圖上顯示\'等等的選項。 "</string>
+\n\n為所有在快顯選單中或行動列被點選，都提供有例如\'導引\'或\'在地圖上顯示\'等的選項。 "</string>
 	<string name="tip_map_context_menu">\'使用位置\'選單</string>
-	<string name="tip_map_context_menu_t">地圖快顯功能表(\'使用位置\')，包含了所有操作的參考點（位置）。
-		\n\n它可長按地圖上的任何一點（然後輕點其標記），或按軌跡球的按鈕，或者選擇由\'選單\' → \'使用位置\'（最後兩種方式以地圖中心作為參考）。
-		\n\n若長按則可以再次隱藏標記對話框。
-	</string>
+	<string name="tip_map_context_menu_t">"地圖快顯功能表\'使用位置\'，包含了所有作用引到一個點（位置）。
+\n\n它可長按地圖上的任何一點（然後輕點其標記），或按軌跡球的按鈕，或者選擇由\'選單\' → \'使用位置\'（最後兩種方式以地圖中心作為參考）。
+\n\n若長按則可以再次隱藏標記對話框。 "</string>
 	
 	<string name="tip_initial_t">"OsmAnd 是一個導航應用程式，含有很多的功能。
 \n\n一些基本功能介紹、使用提示以及進階的幫助，從地圖畫面可透過\'選單\' → \'幫助\'連結。 "</string>
@@ -784,7 +783,7 @@
 	<string name="search_online_address">線上查尋</string>
 	<string name="max_level_download_tile">線上最大縮放比</string>
 	<string name="max_level_download_tile_descr">選擇線上下載地圖圖磚最大縮放級別</string>
-	<string name="route_general_information">總距離 %1$s \n 行駛時間 %2$d 小時 %3$d 分。</string>
+	<string name="route_general_information">總距離 %1$s，行駛時間 %2$d 小時 %3$d 分。</string>
 	<string name="router_service_descr">選擇線上或離線的導航服務</string>
 	<string name="router_service">導航服務</string>
 	<string name="sd_dir_not_accessible">在 SD 卡上的存儲資料夾無法存取！</string>
@@ -943,10 +942,10 @@
 	<string name="poi_remove_title">刪除興趣點</string>
 	<string name="poi_remove_success">興趣點刪除成功</string>
 	<string name="poi_action_add">新增</string>
-	<string name="poi_action_change">修改</string>
-	<string name="poi_action_succeded_template">啟動{0}動作完成。</string>
-	<string name="poi_error_unexpected_template">在進行{0}動作時發生意外錯誤。</string>
-	<string name="poi_error_io_error_template">執行{0}時發生存取錯誤。</string>
+	<string name="poi_action_change">更改</string>
+	<string name="poi_action_succeded_template">運作 {0} 成功完成。</string>
+	<string name="poi_error_unexpected_template">在進行 {0} 運作時發生意外錯誤。</string>
+	<string name="poi_error_io_error_template">當執行 {0} 運作時發生 I/O 錯誤。</string>
 	<string name="poi_error_info_not_loaded">節點的資訊未載入</string>
 	<string name="poi_dialog_name">名稱</string>
 	<string name="poi_dialog_opening_hours">營業</string>
@@ -974,10 +973,7 @@
     <string name="local_osm_changes_backup_failed">備份 OSM 的變更失敗</string>
     <string name="local_osm_changes_backup">備份 OSM 的變更</string>
     <string name="plugin_distance_point_hdop">精確度</string>
-    <string name="use_distance_measurement_help">* 點選標記一個標點。\n 
-        * 在地圖上按住去刪除先前的標點。\n
-        * 在標點上按住以檢視並附加敘述。\n
-        * 在測量小工具上點擊可看到更多作用。</string>
+    <string name="use_distance_measurement_help">* 點選標記一個標點。\n * 在地圖上按住去刪除先前的標點。\n * 在標點上按住以檢視並附加敘述。\n * 在測量小工具上點擊可看到更多的作用。</string>
     <string name="distance_measurement_start_editing">開始編輯</string>
     <string name="distance_measurement_finish_editing">結束編輯</string>
     <string name="distance_measurement_finish_subtrack">開始一個新的子軌跡</string>
@@ -1043,8 +1039,8 @@
     <string name="av_def_action_choose">應需求選取</string>
     <string name="av_def_action_video">錄取視訊</string>
     <string name="av_def_action_audio">錄取音訊</string>
-    <string name="av_widget_action_descr">選擇預設小工具的機能</string>
-    <string name="av_widget_action">預設小工具動作</string>
+    <string name="av_widget_action_descr">選擇預設小工具的作用</string>
+    <string name="av_widget_action">預設小工具作用</string>
     <string name="av_video_format_descr">選擇視訊輸出格式</string>
     <string name="av_video_format">視訊輸出格式</string>
     <string name="tip_recent_changes_1_4_t">在1.4的變更：
@@ -1084,7 +1080,7 @@
     <string name="map_widget_distancemeasurement">測量距離</string>
     
     <string name="map_widget_audionotes">音訊注解</string>
-    <string name="audionotes_plugin_description">這個外掛元件提供的功能和按鈕以在旅程中記錄音訊/攝影/視訊等注解</string>
+    <string name="audionotes_plugin_description">音訊/視訊注解外掛元件提供的功能，在旅程中取得音訊/照相/視訊注解，使用在地圖畫面上的按鈕，或地圖上任何的位置直接叫出快顯選單。</string>
     <string name="audionotes_plugin_name">音訊/視訊注解</string>
     <string name="index_srtm_parts">部件</string>
     <string name="index_srtm_ele">等高線</string>
@@ -1504,7 +1500,7 @@
     <string name="osmo_plugin_name">OsMo (監視)</string>
     <string name="osmo_settings">OsMo 監控</string>
    	<string name="osmo_settings_descr">組態監控設定值和安裝個人監控頻道</string>
-    <string name="osmo_plugin_description">"OsMo 進階即時監控，跟蹤其它裝置並進行追蹤，請參閱 http://osmo.mobi。建立匿名群組，分享彼此的位置和交流。它具有各種設定用於連線階段追蹤或持續的追蹤。\n\n匿名群組是有限制天數和一些功能，也就是沒有遠端控制和群組管理員。完整的功能需在網站上建立群組，並且只有已註冊的使用者才能進入他們。 "</string>
+    <string name="osmo_plugin_description">"這個外掛元件同時提供了 OsMo 進階即時監控，請參閱 http://osmo.mobi。\n\n您可以跟蹤其它裝置並進行追蹤。您可以自發的建立匿名群組，分享彼此的位置和交流。具有各種選項用於連線階段追蹤或持續的追蹤。\n\n為指定的天數建立匿名群組和有限制的預設功能，例如沒有遠端控制和沒有群組管理員。另一方面完整的功能可以在網站上建立群組，並且只有已註冊的使用者才能進入他們。 "</string>
     <string name="keep_informing_never">只有手動（輕點箭頭）</string>
     <string name="keep_informing_descr">按照定期間隔重新通報導航指示</string>
     <string name="keep_informing">重複導航指示</string>
@@ -1916,13 +1912,13 @@
 	<string name="shared_string_downloading">下載中</string>
 	<string name="shared_string_download_successful">下載成功</string>
 	<string name="shared_string_unexpected_error">發生意外錯誤</string>
-	<string name="shared_string_action_template">動作 {0}</string>
+	<string name="shared_string_action_template">行動 {0}</string>
 	<string name="shared_string_close">關閉</string>
 	<string name="shared_string_exit">離開</string>
 	<string name="shared_string_show">顯示</string>
 	<string name="shared_string_show_all">全部顯示</string>
 	<string name="shared_string_show_on_map">在地圖上顯示</string>
-	<string name="shared_string_more_actions">更多的動作</string>
+	<string name="shared_string_more_actions">更多的行動</string>
 	<string name="shared_string_map">地圖</string>
 	<string name="shared_string_favorites">我的最愛</string>
 	<string name="shared_string_add_to_favorites">加到我的最愛</string>

OsmAnd/res/values/strings.xml

@@ -110,10 +110,10 @@
 		\n\nRecorded tracks can be shared with your friends or be used for OSM contributions. Athletes can use recorded tracks to monitor their trainings. Some basic track analysis can be performed directly in OsmAnd, like lap times, average speed etc., and tracks can of course also later be analyzed in special 3rd party analysis tools.
 	</string>
 	<string name="osmo_plugin_name">OsMo monitoring</string>
-	<string name="osmo_plugin_description">Shows the settings to use OsMo advanced live monitoring, see http://osmo.mobi. Track other devices and be tracked. 
-		Create anonymous groups, share each other\'s location, and communicate. Has various settings for session tracking or permanent tracking.
-		\n\nAnonymous groups are limited for a number of days and for some feature, i.e. there is no remote control and group administrator. 
-		Fully functional groups should be created on the website and only registered users have access to them.
+	<string name="osmo_plugin_description">This Plugin provides the functionality for OsMo advanced live monitoring, see http://osmo.mobi.
+		\n\nYou can track other devices and be tracked. You can spontaneoulsy  create anonymous groups, share each other\'s location, and communicate. Comes with various options for session tracking or permanent tracking.
+		\n\nAnonymous groups are created for a specified number of days and limited to defined features, i.e. there is no remote control and no group administrator. 
+		Fully functional groups, on the other hand, can be created on the website and only registered users have access to them.
 	</string>
 	<string name="srtm_paid_version_title">Contour lines plugin</string>
 	<string name="osmand_srtm_short_description_80_chars">OsmAnd plugin for offline contour lines</string>
@@ -143,18 +143,17 @@
 		\n\nActivating this view changes the map style to \'Winter and ski\', showing all landscape features under wintery conditions. This view can be reverted by either de-activating it again here, or by changing the \'Map style\' under \'Configure map\' as desired.
 	</string>
 	<string name="audionotes_plugin_name">Audio/video notes</string>
-	<string name="audionotes_plugin_description">This plugin provides the functionality and buttons to take audio/photography/video notes during a trip</string>
+	<string name="audionotes_plugin_description">The Audio/video notes plugin provides the functionality to take audio/photography/video notes during a trip, using either a button on the map screen, or directly the context menu for any position on the map.</string>
 	<string name="osmand_parking_plugin_name">Parking Position</string>
 	<string name="osmand_parking_plugin_description">This plugin was developed to use OsmAnd to easily memorize the location of your parked car.</string>
 	<string name="osmand_distance_planning_plugin_name">Distance calculator &amp; planning tool</string>
 	<string name="osmand_distance_planning_plugin_description">This plugin provides a map screen widget allowing to create paths by tapping on the map, or use or modify existing GPX files, to plan a trip and measure the distance between points. The results can be saved as a GPX file, which can later be used for guidance.</string>
 	<string name="accessibility_preferences">Accessibility</string>
-	<string name="osmand_accessibility_description">Shows the settings to activate special accessibility features.</string>
+	<string name="osmand_accessibility_description">This plugin makes a device\'s acessibility features available directly in OsmAnd, and facilitates e.g. adjusting the speech rate for TTS voices, configuring directional-pad screen navigation, using a trackball for zoom control, or using text-to-speech feedback.</string>
 	<string name="osm_settings">OSM editing</string>
-	<string name="osm_editing_plugin_description">Via this plugin OsmAnd can be used to make OSM contributions like creating or modifying OSM POI objects, opening or commenting OSM bugs, and contributing recorded GPX files. Using this functionality requires personal OSM credentials.</string>
-	<string name="osmand_development_plugin_description">Shows the settings for development and debugging features like route simulation or rendering performance indication.</string>
+	<string name="osm_editing_plugin_description">Via this plugin OsmAnd can be used to make OSM contributions like creating or modifying OSM POI objects, opening or commenting OSM bugs, and contributing recorded GPX files. OSM is a community driven, global public domain mapping project. For details please refer to http://openstreetmap.org. Active participation is appreciated, and contributions can be made directly from OsmAnd, if you specify your personal OSM credentials in the app.</string>
+	<string name="osmand_development_plugin_description">This plugin displays settings for development and debugging features like to test or simulate routing, the screen rendering performance, or voice prompting. These settings are intended for developers and are not needed for the general user.</string>
 	<string name="debugging_and_development">OsmAnd development</string>
-
 	<string name="rename_failed">Rename failed.</string>
 	<string name="days_behind">days behind</string>
 	<string name="back_to_map">Back to map</string>
@@ -1939,7 +1938,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="search_online_address">Online search</string>
 	<string name="max_level_download_tile">Max. online zoom</string>
 	<string name="max_level_download_tile_descr">Choose maximum zoom level to download for online map tiles</string>
-	<string name="route_general_information">Total distance %1$s \n travelling time %2$d h %3$d m.</string>
+	<string name="route_general_information">Total distance %1$s, travelling time %2$d h %3$d m.</string>
 	<string name="router_service_descr">Choose an online or offline navigation service</string>
 	<string name="router_service">Navigation service</string>
 	<string name="sd_dir_not_accessible">The data storage folder on the SD card is not accessible!</string>

OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java

@@ -2,6 +2,7 @@ package net.osmand.plus.osmedit;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -45,6 +46,8 @@ import android.text.method.LinkMovementMethod;
 import android.view.Gravity;
 import android.view.View;
 import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
@@ -97,7 +100,7 @@ public class EditingPOIActivity implements DialogProvider {
 		this.ctx = uiContext;
 
 		poiTypes = uiContext.getMyApplication().getPoiTypes();
-		allTranslatedSubTypes = poiTypes.getAllTranslatedNames();
+		allTranslatedSubTypes = poiTypes.getAllTranslatedNames(false);
 		settings = ((OsmandApplication) uiContext.getApplication()).getSettings();
 		if (settings.OFFLINE_EDITION.get() || !settings.isInternetConnectionAvailable(true)) {
 			this.openstreetmapUtil = new OpenstreetmapLocalUtil(ctx);
@@ -462,7 +465,7 @@ public class EditingPOIActivity implements DialogProvider {
 						.getString(R.string.poi_action_change);
 				OsmPoint.Action action = n.getId() == -1 ? OsmPoint.Action.CREATE : OsmPoint.Action.MODIFY;
 				String subType = typeText.getText().toString();
-				if(allTranslatedSubTypes.get(subType) != null) {
+				if(allTranslatedSubTypes.get(subType.trim()) != null) {
 					PoiType pt = allTranslatedSubTypes.get(subType);
 					n.putTag(pt.getOsmTag()	, pt.getOsmValue());
 					if(pt.getOsmTag2() != null) {
@@ -527,14 +530,34 @@ public class EditingPOIActivity implements DialogProvider {
 	}
 
 	private void updateSubTypesAdapter(PoiCategory poiCategory) {
-		Set<String> subCategories = new LinkedHashSet<String>(poiTypes.getAllTranslatedNames(poiCategory).keySet());
-		for (String s : poiTypes.getAllTranslatedNames().keySet()) {
-			if (!subCategories.contains(s)) {
-				subCategories.add(s);
+		final Map<String, PoiType> subCategories = getSubCategoriesMap(poiCategory);
+		final ArrayAdapter<Object> adapter = new ArrayAdapter<Object>(ctx, R.layout.list_textview, subCategories.keySet().toArray());
+		typeText.setAdapter(adapter);
+		typeText.setOnItemSelectedListener(new OnItemSelectedListener() {
+
+			@Override
+			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+				Object item = parent.getAdapter().getItem(position);
+				if(subCategories.containsKey(item)) {
+					String kn = subCategories.get(item).getKeyName();
+					typeText.setText(kn);
+				}
+			}
+
+			@Override
+			public void onNothingSelected(AdapterView<?> parent) {
+			}
+		});
+	}
+
+	private Map<String, PoiType> getSubCategoriesMap(PoiCategory poiCategory) {
+		Map<String, PoiType> subCategories = new LinkedHashMap<>(poiTypes.getAllTranslatedNames(poiCategory, false));
+		for (Map.Entry<String, PoiType> s : poiTypes.getAllTranslatedNames(false).entrySet()) {
+			if (!subCategories.containsKey(s.getKey())) {
+				subCategories.put(s.getKey(), s.getValue());
 			}
 		}
-		ArrayAdapter<Object> adapter = new ArrayAdapter<Object>(ctx, R.layout.list_textview, subCategories.toArray());
-		typeText.setAdapter(adapter);
+		return subCategories;
 	}
 	
 	private void updateType(Amenity a){
@@ -627,12 +650,14 @@ public class EditingPOIActivity implements DialogProvider {
 		case DIALOG_SUB_CATEGORIES: {
 			Builder builder = new AlertDialog.Builder(ctx);
 			final Amenity a = (Amenity) args.getSerializable(KEY_AMENITY);
-			final String[] subCats = poiTypes.getAllTranslatedNames(a.getType()).keySet().toArray(new String[0]);
+			final Map<String, PoiType> allTranslatedNames = poiTypes.getAllTranslatedNames(a.getType(), true);
+			final String[] subCats = allTranslatedNames.keySet().toArray(new String[0]);
 			builder.setItems(subCats, new DialogInterface.OnClickListener() {
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
-					typeText.setText(subCats[which]);
-					a.setSubType(subCats[which]);
+					PoiType poiType = allTranslatedNames.get(subCats[which]);
+					typeText.setText(poiType.getKeyName());
+					a.setSubType(poiType.getKeyName());
 					ctx.removeDialog(DIALOG_SUB_CATEGORIES);
 				}
 			});

OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapPoint.java

@@ -2,7 +2,6 @@ package net.osmand.plus.osmedit;
 
 import java.io.Serializable;
 
-import net.osmand.data.AmenityType;
 import net.osmand.osm.edit.Node;
 import net.osmand.osm.edit.OSMSettings.OSMTagKey;