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

OsmAnd/res/values-be/strings.xml

@@ -1897,12 +1897,12 @@
 	<string name="osmand_parking_overdue">Састарэлі</string>
 	<string name="osmand_parking_hour">г</string>
 	<string name="osmand_parking_minute">хв</string>
-	<string name="osmand_parking_time_left">Засталося</string>
+	<string name="osmand_parking_time_left">засталося</string>
 	<string name="action_create">Стварыць дзеяньне</string>
 	<string name="action_modify">Зьмяніць дзеяньне</string>
 	<string name="action_delete">Выдаліць дзеяньне</string>
 	<string name="osm_edits">Праўкі OSM</string>
-	<string name="parking_place_limited">Абмежаванае па часе парковачнае месца</string>
+	<string name="parking_place_limited">Час паркоўкі абмежаваны</string>
 	<string name="your_edits">Вашы праўкі</string>
     <string name="waypoint_visit_after">Наведаць пасьля</string>
     <string name="waypoint_visit_before">Наведаць, перш чым</string>
@@ -1922,20 +1922,20 @@
 	<string name="days_behind">дзён таму</string>
 	<string name="shared_string_release">Выдана</string>
 	<string name="shared_string_my_favorites">Мае ўлюбёныя</string>
-	<string name="confirmation_to_clear_history">Вы хочаце вычысьціць усю гісторыю?</string>
+	<string name="confirmation_to_clear_history">Вы хочаце вычысьціць гісторыю?</string>
     <string name="delay_to_start_navigation_descr">Задайце час затрымкі на экране плянаваньня маршруту</string>
-    <string name="delay_to_start_navigation">Пачаць пакрокавую навігацыю праз</string>
+    <string name="delay_to_start_navigation">Пачаць пакрокавую навігацыю праз…</string>
     <string name="shared_string_go">Паехалі</string>
 	<string name="shared_string_not_use">Не выкарыстоўваць</string>
 	<string name="local_osm_changes_upload_all_confirm">Вы зьбіраецеся адаслаць %1$d зьменаў у OSM. Вы ўпэўненыя?</string>
     <string name="plugin_ski_descr">"Модуль для OsmAnd дае вам доступ да дадзеных аб гарналыжных трасах, маршрутах для бегавых лыж, альпійскіх спусках, фунікулёрах і гарналыжных пад\'ёмніках. Маршруты і спускі адзначаны рознымі колерамі ў залежнасьці ад іх складанасьці і намаляваныя з выкарыстаньнем адмысловага \"зімовага\" стылю мапы, які заключаецца ў тым, што выкарыстоўваюцца \"сьнежныя\" колеры зімовага пэйзажу.↵\n\nУ выпадку актывацыі гэтага віду, стыль мапы мяняецца на \"Winter and ski\", паказваючы ўсё дэталі пэйзажу так, як яны выглядаюць зімой. Такі (зімовы) выгляд можа быць адменены альбо шляхам дэактывацыі тут, альбо калі вы памяняеце \"Стыль мапы\" у мэню \"Налада мапы\" на жаданы выгляд. "</string>
 	<string name="osmo_grop_name_length_alert">Імя групы павінна быць мінімум 3 сімвала!</string>
 	<string name="current_route">Бягучы маршрут</string>
-    <string name="osm_changes_added_to_local_edits">Зьмены OSM дададзеныя да лякальных зьменаў</string>
+    <string name="osm_changes_added_to_local_edits">Зьмены OSM дададзеныя да лякальнага набору зьменаў</string>
    	<string name="mark_to_delete">Пазначыць для выдаленьня</string>
 	<string name="welmode_download_maps">Сьцягнуць мапы</string>
-	<string name="welcome_select_region">Каб правільна адлюстроўваць дарожныя знакі, калі ласка, абярыце рэгіён кіраваньня:</string>
-	<string name="welcome_text">OsmAnd дазваляе вам аўтаномна карыстацца мапамі і аўтаномнай навігацыяй!</string>
+	<string name="welcome_select_region">Каб правільна адлюстроўваць дарожныя знакі і правілы, калі ласка, абярыце рэгіён кіраваньня:</string>
+	<string name="welcome_text">OsmAnd дазваляе вам аўтаномна карыстацца мапамі ўсяго сьвету і аўтаномнай навігацыяй!</string>
 	<string name="welcome_header">Вітаем</string>
     <string name="plugin_touringview_descr">"Актывацыя гэтага стылю мяняе стыль мапы OsmAnd на \"Турыстычную мапу\", гэта адмысловы высока дэталяваны выгляд для падарожнікаў і прафесійных кіроўцаў. ↵\n↵\nГэты стыль на любым маштабе мапы паказвае максімальную колькасць падрабязнасьцяў для паездкі, наяўных у картаграфічных дадзеных (у прыватнасьці, дарогі, дарожкі, сьцяжынкі, і арыенціры). ↵\n↵\nЁн таксама ясна паказвае ўсе віды дарог праз колеравае кадаваньне, што карысна, для, напрыклад, кіраваньня вялікімі транспартнымі сродкамі. ↵\n↵\nІ ён дадае спецыяльныя турыстычныя налады, такія як веласіпедныя маршруты або альпійскія горныя маршруты. ↵\n↵\nДадатковае сьцягваньне не патрабуецца, выгляд ствараецца з нашых стандартных мапаў. ↵\n↵\nГэты выгляд можа быць дэактываваны тут, або шляхам зьмены \"Стылю мапы\" у разьдзеле \"Налады мапы\" па жаданьні. "</string>
 	<string name="confirm_usage_speed_cameras">У многіх краінах (Германія, Францыя, Італія ды іншыя) выкарыстаньне дэтэктараў камер кантролю хуткасьці не дазволена законам. OsmAnd не нясе ніякай адказнасьці, калі вы парушыце закон. Калі ласка, націсніце кнопку \"Так\", толькі калі вы маеце права выкарыстоўваць гэтую функцыю.</string>

OsmAnd/res/values-cs/strings.xml

@@ -1887,23 +1887,33 @@ s často kladenými otázkami.</string>
     <string name="tips_and_tricks_descr">Často pokládané dotazy, nedávné změny a další</string>
     <string name="days_behind">dnů po</string>
 	<string name="shared_string_release">Vydáno</string>
-	<string name="delay_to_start_navigation_descr">Automaticky spustit navigaci po určeném intervalu</string>
-    <string name="delay_to_start_navigation">Přeskočit plánování trasy</string>
+	<string name="delay_to_start_navigation_descr">Zadejte dobu setrvání na obrazovce plánování trasy</string>
+    <string name="delay_to_start_navigation">Spustit navigaci krok za krokem za…</string>
     <string name="shared_string_go">Start</string>
 	<string name="action_create">Vytvořit akci</string>
 	<string name="action_modify">Změnit akci</string>
 	<string name="action_delete">Odstranit akci</string>
 	<string name="osm_edits">Editace OSM</string>
-	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">min</string><string name="parking_place_limited">Čas parkovacího místa vymezen do</string>
+	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">min</string><string name="parking_place_limited">Čas parkování vymezen do</string>
 	<string name="osmand_parking_overdue">vypršel</string>
-	<string name="osmand_parking_time_left">Zbývá</string>
+	<string name="osmand_parking_time_left">zbývá</string>
 	<string name="your_edits">Vaše změny</string>
     <string name="waypoint_visit_after">Navštívit po</string>
     <string name="waypoint_visit_before">Navštívit před</string>
     <string name="shared_string_not_use">Nepoužívat</string>
-	<string name="confirmation_to_clear_history">Chcete vyčistit celou historii?</string>
+	<string name="confirmation_to_clear_history">Chcete vyčistit historii?</string>
     <string name="local_osm_changes_upload_all_confirm">Požadujete nahrát %1$d změn do OSM. Jste si jist?</string>
     <string name="shared_string_collapse">Sbalit</string>
 	<string name="agps_info">Info o A-GPS</string>
 	<string name="agps_data_last_downloaded">Datum posledního stažení A-GPS dat: %1$s</string>
-    </resources>
+    <string name="shared_string_message">Zpráva</string>
+	<string name="welmode_download_maps">Stáhnout mapy</string>
+	<string name="welcome_header">Vítejte</string>
+    <string name="current_route">Současná trasa</string>
+    <string name="osm_changes_added_to_local_edits">OSM změny přidány do lokální změnové sady</string>
+   	<string name="mark_to_delete">Označit pro smazání</string>
+	<string name="osmo_grop_name_length_alert">Název skupiny by měl být minimálně 3 znaky dlouhý!</string>
+	<string name="welcome_select_region">Pro správné promítnutí vašich dopravních značek a předpisů, prosím vyberte váš dopravní region:</string>
+	<string name="welcome_text">OsmAnd poskytuje celosvětové prohlížení map a celosvětovou offline navigaci!</string>
+	<string name="confirm_usage_speed_cameras">V mnoha zemích (Německo, Francie, Itálie a dalších) je použití varování před rychlostními kamerami zakázané zákonem. OsmAnd nepřebírá žádnou zodpovědnost pokud porušíte zákon. Prosím označte Ano pouze v případě, pokud máte oprávnění používat tuto vlastnost.</string>
+	</resources>

OsmAnd/res/values-da/phrases.xml

@@ -725,7 +725,7 @@
 	<string name="poi_craft">Håndværk</string>
 	<string name="poi_medical_supply">Medicinsk forsyning</string>
 	<string name="poi_training">Træningsanlæg</string>
-	<string name="poi_field_hockey">Felt hockey</string>
+	<string name="poi_field_hockey">Hockey</string>
 	<string name="poi_smoking_area">Ryge område</string>
 	<string name="poi_quarter">Kvarter</string>
 	</resources>

OsmAnd/res/values-da/strings.xml

@@ -512,7 +512,7 @@
 	<string name="init_native_library">Initialisere indbygget bibliotek…</string>
 	<string name="choose_auto_follow_route">Autocentrer kortvisning</string>
 	<string name="choose_auto_follow_route_descr">Tid indtil kortvisning synkroniseres med aktuel position</string>
-	<string name="auto_follow_route_never">Aldrig (tryk på blå pil for at starte vejledning manuelt)</string>
+	<string name="auto_follow_route_never">Aldrig (tryk \'Start\' for at starte vejledning manuelt)</string>
 	<string name="auto_follow_route_navigation">Autocentrer kun navigation</string>
 	<string name="auto_follow_route_navigation_descr">Autocentrer kun kortvisning under navigation.</string>
 	<string name="auto_follow_location_enabled">Autocentrer kort.</string>
@@ -1819,7 +1819,7 @@
     <string name="speak_pedestrian">Fodgængerovergange</string>
     
 	<string name="save_track_to_gpx_globally_headline">Sporingslogning på efterspørgsel</string>
-	<string name="navigation_over_track">Start navigation langs spor?</string>
+	<string name="navigation_over_track">Start navigation langs sporet?</string>
 	<string name="avoid_roads_msg">Generere en alternativ rute ved at vælge veje der skal undgås</string>
     
 	<string name="proxy_pref_title">Proxy</string>
@@ -1852,7 +1852,7 @@
 	<string name="rendering_attr_pisteGrooming_name">Pistepreparering</string>
     <string name="free">"Tilgængelig %1$s "</string>
 	<string name="device_memory">Lagerplads</string>
-    <string name="rendering_attr_pisteRoutes_name">Pisteruter</string>
+    <string name="rendering_attr_pisteRoutes_name">Skiløjper</string>
 	<string name="roads_only">Kun veje</string>
     <string name="notes">Noter</string>
 	<string name="online_map">Online kort</string>
@@ -1952,7 +1952,7 @@
 	<string name="simulate_your_location">Simuler position</string>
     <string name="drawer">Enkel liste</string>
     <string name="short_location_on_map">Lat %1$s\nLong %2$s</string>
-    <string name="tips_and_tricks_descr">Ofte stillede spørgsmål, de seneste ændringer og andre oplysninger</string>
+    <string name="tips_and_tricks_descr">Ofte stillede spaørgsmål, de seneste ændringer og andre oplysninger</string>
     <string name="routing_settings_2">Navigationsindstillinger</string>
     <string name="general_settings_2">Generelleindstillinger</string>
 	<string name="shared_string_clear_all">Slet alle</string>
@@ -1967,26 +1967,27 @@
 	<string name="action_modify">Handling: rediger</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">min</string><string name="osmand_parking_time_left">Tilbage</string> <string name="parking_place_limited">Parkering er tidsbegrænset til</string>
+	<string name="osmand_parking_hour">t</string><string name="osmand_parking_minute">min</string><string name="osmand_parking_time_left">tilbage</string> <string name="parking_place_limited">Parkering er tidsbegrænset til</string>
 	<string name="your_edits">Redigeringer</string>
     <string name="osmand_parking_overdue">Udløbet</string>
-	<string name="delay_to_start_navigation_descr">Start navigation automatisk efter angivne interval</string>
-    <string name="delay_to_start_navigation">Start sving-for-sving navigation efter</string>
+	<string name="delay_to_start_navigation_descr">Angiv ventetiden til at forblive på ruteplanlægning skærm</string>
+    <string name="delay_to_start_navigation">Start sving-for-sving navigation efter…</string>
     <string name="shared_string_go">Udfør</string>
 	<string name="shared_string_not_use">Ikke brugt</string>
-	<string name="confirmation_to_clear_history">Skal hele historikken slettes?</string>
+	<string name="confirmation_to_clear_history">Skal historikken slettes?</string>
     <string name="local_osm_changes_upload_all_confirm">Overfør %1$d ændringer til OSM?</string>
     <string name="osmo_grop_name_length_alert">Gruppenavn skal være på mindst 3 tegn!</string>
     <string name="osm_changes_added_to_local_edits">OSM ændringer tilføjet til lokale ændringer</string>
    	<string name="mark_to_delete">Marker for at slette</string>
 	<string name="current_route">Aktuel rute</string>
     <string name="welmode_download_maps">Hent kort</string>
-	<string name="welcome_select_region">Vælg region</string>
+	<string name="welcome_select_region">For korrekt at afspejle trafikskilte og regler, vælg region:</string>
 	<string name="welcome_header">Velkommen</string>
-    <string name="welcome_text">OsmAnd anvender offline kort og navigation!</string>
+    <string name="welcome_text">OsmAnd giver globale offline kort browsing, og global offline navigation!</string>
 	<string name="confirm_usage_speed_cameras">I mange lande (Tyskland, Frankrig, Italien og andre) er anvendelse af hastighed kamera advarsler ikke tilladt ved lov. OsmAnd påtager sig ikke ansvaret, hvis loven overtrædes. Klik på Ja, hvis du er berettiget til at bruge denne funktion.</string>
 	<string name="agps_info">A-GPS info</string>
 	<string name="agps_data_last_downloaded">A-GPS data sidst hentet: %1$s</string>
     <string name="shared_string_message">Besked</string>
 	<string name="shared_string_do_not_use">Brug ikke</string>
+	<string name="shared_string_address">Adresse</string>
 	</resources>

OsmAnd/res/values-es/strings.xml

@@ -112,7 +112,7 @@
   <string name="init_native_library">Inicializando biblioteca nativa…</string>
   <string name="choose_auto_follow_route">Auto-centrar vista de mapa</string>
   <string name="choose_auto_follow_route_descr">Tiempo hasta que la vista del mapa vuelve a sincronizarse con la posición actual</string>
-  <string name="auto_follow_route_never">Nunca (pulsa la flecha azul para iniciar manualmente el guiado)</string>
+  <string name="auto_follow_route_never">Nunca (pulsa \'Ir\' para iniciar manualmente el guiado)</string>
   <string name="auto_follow_route_navigation">Auto-centrar sólo nav</string>
   <string name="auto_follow_route_navigation_descr">Auto-centra la vista del mapa sólo durante la navegación.</string>
   <string name="auto_follow_location_enabled">Auto-centrar vista del mapa activado.</string>
@@ -1334,7 +1334,7 @@
 	<string name="driving_region_canada">Canadá</string>
 	<string name="driving_region_europe_asia">Europa y Asia</string>
 	<string name="driving_region_uk">Reino Unido, India, Australia y Otros</string>
-	<string name="driving_region_descr">Selecciona la región de conducción: EEUU, Europa, Reino Unido, Asia y Otras</string>
+	<string name="driving_region_descr">Selecciona la región de conducción: EEUU, Europa, Reino Unido, Asia, u Otras</string>
 	<string name="driving_region">Región de conducción</string>
 	<string name="edit_tilesource_minzoom">Acercamiento mínimo</string>
     <string name="edit_tilesource_expiration_time">Expirar (minutos)</string>
@@ -1888,7 +1888,7 @@
     <string name="speak_pedestrian">Anunciar pasos de peatones</string>
     
 	<string name="save_track_to_gpx_globally_headline">Registro de trazas bajo demanda</string>
-	<string name="navigation_over_track">¿Empezar navegación sobre traza?</string>
+	<string name="navigation_over_track">¿Empezar navegación a lo largo de la traza?</string>
 	<string name="avoid_roads_msg">Puedes obtener una ruta alternativa seleccionando las carreteras a evitar</string>
     <string name="proxy_pref_title">Proxy</string>
     <string name="proxy_pref_descr">Configura un proxy de acceso a Internet</string>
@@ -1925,7 +1925,7 @@
 	<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_pisteRoutes_name">Pistas de esquí</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>
@@ -1963,7 +1963,7 @@
 	<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 a</string>
+	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">m</string><string name="osmand_parking_time_left">queda(n)</string> <string name="parking_place_limited">Tiempo de aparcamiento limitado a</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>
@@ -1984,22 +1984,24 @@
 	<string name="route_points">Puntos de la ruta</string>
 	<string name="shared_string_release">Liberado</string>
 	<string name="osmand_parking_overdue">Obsoleto</string>
-	<string name="delay_to_start_navigation">Saltar la planificación de ruta</string>
+	<string name="delay_to_start_navigation">Iniciar navegación giro-a-giro después de…</string>
     <string name="shared_string_go">Ir</string>
-	<string name="delay_to_start_navigation_descr">Comienza la navegación automáticamente después de un intervalo dado</string>
+	<string name="delay_to_start_navigation_descr">Especifica el tiempo de espera para permanecer en la pantalla de planificación de ruta</string>
     <string name="shared_string_not_use">No usar</string>
 	<string name="local_osm_changes_upload_all_confirm">Estás a punto de subir %1$d cambios a OSM. ¿Estás seguro?</string>
-    <string name="confirmation_to_clear_history">¿Quieres borrar toda la historia?</string>
-    <string name="osmo_grop_name_length_alert">¡El nombre del grupo debe tener al menos 3 símbolos!</string>
-	<string name="osm_changes_added_to_local_edits">Cambios OSM añadidos a los cambios locales</string>
+    <string name="confirmation_to_clear_history">¿Quieres borrar la historia?</string>
+    <string name="osmo_grop_name_length_alert">¡El nombre del grupo debe tener al menos una longitud de 3 caracteres!</string>
+	<string name="osm_changes_added_to_local_edits">Cambios OSM añadidos al conjunto de cambios locales</string>
    	<string name="mark_to_delete">Marca para eliminar</string>
 	<string name="welmode_download_maps">Descargar mapas</string>
-	<string name="welcome_select_region">Seleccione su región</string>
+	<string name="welcome_select_region">Para reflejar correctamente las señales de tráfico y regulaciones, por favor selecciona tu región de conducción:</string>
 	<string name="welcome_header">Bienvenido</string>
     <string name="current_route">Ruta actual</string>
-    <string name="welcome_text">¡OsmAnd te permite usar mapas y navegación desconectado!</string>
+    <string name="welcome_text">¡OsmAnd proporciona visualización de mapas globales y navegación global sin conexión!</string>
 	<string name="confirm_usage_speed_cameras">En muchos países (Alemania, Francia, Italia y otros) el uso de avisadores de radares no está permitido por la ley. OsmAnd no asume ninguna responsabilidad si usted viola la ley. Por favor, haga clic en sí si usted es elegible para utilizar esta función.</string>
 	<string name="agps_info">Info A-GPS</string>
 	<string name="shared_string_message">Mensaje</string>
 	<string name="agps_data_last_downloaded">Últimos datos A-GPS descargados: %1$s</string>
-    </resources>
+    <string name="shared_string_do_not_use">No usar</string>
+	<string name="shared_string_address">Dirección</string>
+	</resources>

OsmAnd/res/values-fr/strings.xml

@@ -18,7 +18,7 @@
   
   <string name="local_openstreetmap_upload">Envoyer les modifications vers OSM</string>
   <string name="local_openstreetmap_delete">Supprimer la modification</string>
-  <string name="local_openstreetmap_descr_title">Édition asynchrone d\'OSM :</string>
+  <string name="local_openstreetmap_descr_title">Modification asynchrone d\'OSM :</string>
   <string name="local_openstreetmap_settings">PI/Notes OSM enregistrés en local</string>
   <string name="local_openstreetmap_settings_descr">Afficher et gérer les PI/Notes OSM enregistrés dans la base de données locale</string>
   
@@ -144,7 +144,7 @@
   <string name="search_position_current_location_search">Recherche de la position…</string>
   <string name="search_position_current_location_found">Position trouvée</string>
   <string name="search_position_address">Adresse…</string>
-  <string name="search_position_favorites">Favoris…</string>
+  <string name="search_position_favorites">Favori…</string>
   <string name="search_position_undefined">Non défini</string>
   
   <string name="search_position_current_location">Position actuelle</string>
@@ -571,7 +571,7 @@
   <string name="download_question">Voulez-vous télécharger {0} - {1} ?</string>
   <string name="download_question_exist">les données pour {0} existent déjà ({1}). Voulez-vous les mettre à jour ({2}) ?</string>
   <string name="address">Adresse</string>
-  <string name="shared_string_download_successful">Téléchargement de l\'index réussi</string>
+  <string name="shared_string_download_successful">Téléchargement terminé</string>
   
   
   
@@ -613,7 +613,7 @@
   <string name="shared_string_close">Fermer</string>
   <string name="loading_data">Chargement des données</string>
   <string name="reading_indexes">Lecture des index…</string>
-  <string name="previous_run_crashed">OsmAnd s\'est arrêté anormalement. Souhaitez-vous nous envoyer le fichier journal {0} ?</string>
+  <string name="previous_run_crashed">Oups ... OsmAnd a planté. Souhaitez-vous nous envoyer le fichier journal ?</string>
   <string name="saving_gpx_tracks">Enregistrement des traces GPX sur la carte SD…</string>
   <string name="finished_task">Terminé</string>
   
@@ -626,7 +626,7 @@
   <string name="data_settings_descr">Indiquez la langue, mettre à jour les données</string>
   <string name="data_settings">Données</string>
   
-  <string name="osm_settings">Édition OSM</string>
+  <string name="osm_settings">Contribuer à OSM</string>
   <string name="auto_zoom_map_descr">Zoom automatique sur la carte en fonction de la vitesse</string>
   <string name="auto_zoom_map">Zoom automatique de la carte</string>
   <string name="additional_settings">Paramètres supplémentaires</string>
@@ -780,7 +780,7 @@
   
   
   <string name="osmand_development_plugin_description">Ce greffon permet de gérer les paramètres de développement et de débogage tels que la simulation de navigation ou l\'affichage des performances du rendu. Ces paramètres sont conçus pour les développeurs et peuvent être ignorés par les autres utilisateurs.</string>
-  <string name="plugins_screen">Gestionnaire des greffons</string>
+  <string name="plugins_screen">Gestionnaire de greffons</string>
   
   <string name="prefs_plugins_descr">Les greffons fournissent à l\'application des paramètres avancés et des fonctionnalités supplémentaires.</string>
   <string name="prefs_plugins">Gestionnaire de greffons</string>
@@ -898,20 +898,20 @@
   <string name="gpxup_identifiable">Identifiable</string>
   <string name="gpxup_trackable">Suivi</string>
   <string name="gpxup_private">Privé</string>
-  <string name="osmand_parking_event">Récupérer votre véhicule du parking</string>
+  <string name="osmand_parking_event">Récupérer le véhicule au parking</string>
   <string name="osmand_parking_warning">Avertissement</string>
-  <string name="osmand_parking_warning_text">Une notification pour récupérer votre véhicule a été ajoutée dans votre agenda. Elle y restera jusqu\'à ce que vous la supprimiez manuellement.</string>
-  <string name="osmand_parking_time_limit_title">Indiquez une heure de fin de stationnement</string>
+  <string name="osmand_parking_warning_text">Un rendez-vous pour récupérer votre véhicule a été ajouté dans votre agenda. Il y restera jusqu\'à ce que vous le supprimiez manuellement.</string>
+  <string name="osmand_parking_time_limit_title">Indiquez la durée de stationnement autorisée</string>
   <string name="osmand_parking_delete_confirm">Voulez-vous supprimer l\'emplacement de stationnement du véhicule ?</string>
   <string name="osmand_parking_delete">Supprimer l\'emplacement de stationnement</string>
   <string name="osmand_parking_choose_type">Type de stationnement</string>
   <string name="osmand_parking_lim_text">Temps limité</string>
   <string name="osmand_parking_no_lim_text">Temps illimité</string>
-  <string name="osmand_parking_add_event">Ajouter une notification dans l\'agenda</string>
+  <string name="osmand_parking_add_event">Ajouter un rendez-vous dans l\'agenda</string>
   <string name="osmand_parking_time_limit">Stationnement avec limite de temps</string>
   <string name="osmand_parking_time_no_limit">Stationnement sans limite de temps</string>
   <string name="osmand_parking_position_description">La position de stationnement de votre véhicule. %1$s</string>
-  <string name="osmand_parking_position_description_add">Pour récupérer le véhicule à :</string>
+  <string name="osmand_parking_position_description_add">Vous devez récupérer votre véhicule au plus tard à :</string>
   <string name="osmand_parking_pm">PM</string>
   <string name="osmand_parking_am">AM</string>
   <string name="osmand_parking_position_name">Emplacement de stationnement</string>
@@ -929,11 +929,11 @@
   
   <string name="osmand_parking_hours">Heures</string>
   <string name="osmand_parking_minutes">Minutes</string>
-  <string name="osmand_parking_position_description_add_time">La voiture est garée à :</string>
+  <string name="osmand_parking_position_description_add_time">Le véhicule a été garé à :</string>
   <string name="use_compass_navigation_descr">Utiliser la boussole quand l\'orientation n\'est pas détectée</string>
   <string name="use_compass_navigation">Utiliser la boussole</string>
   <string name="route_updated_loc_found">L\'itinéraire sera calculé dès votre position connue</string>
-  <string name="continue_follow_previous_route_auto">La navigation précédente a été interrompue. Souhaitez-vous reprendre cette navigation ? (%1$s secondes)</string>
+  <string name="continue_follow_previous_route_auto">La navigation a été interrompue. Souhaitez-vous la reprendre ? (%1$s secondes)</string>
   
   
   
@@ -1307,8 +1307,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="access_mark_final_location_first">Mode d\'accessibilité : veuillez d\'abord définir une destination</string> 
     <string name="distance_measurement_start_editing">Démarrer la mesure sur la carte</string>
     <string name="distance_measurement_finish_editing">Terminer la mesure</string>
-    <string name="distance_measurement_save_gpx">Enregistrer comme GPX...</string>
-    <string name="distance_measurement_load_gpx">Ouvrir un fichier GPX existant...</string>
+    <string name="distance_measurement_save_gpx">Enregistrer en GPX sous...</string>
+    <string name="distance_measurement_load_gpx">Ouvrir un fichier GPX...</string>
     <string name="wait_current_task_finished">Veuillez attendre jusqu\'à ce que la tâche actuelle soit terminée</string>
     <string name="plugin_distance_point_time">temps</string>
     <string name="plugin_distance_point_hdop">précision</string>
@@ -1316,7 +1316,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="plugin_distance_point_ele">altitude</string>
     <string name="gpx_file_name">Nom du fichier GPX</string>
     <string name="gpx_saved_sucessfully">L\'enregistrement du fichier GPX {0} a réussi.</string>
-    <string name="osmand_distance_planning_plugin_description">Ce greffon permet, depuis la carte, de créer un itinéraire soit un cliquant sur la carte, soit en ouvrant soit en modifiant un fichier GPX existant; ainsi que de mesurer la distance entre des points. L\'itinéraire peut être enregistré dans un fichier GPX qui peut lui-même être utilisé plus tard pour une navigation.</string>
+    <string name="osmand_distance_planning_plugin_description">Ce greffon permet, depuis la carte, de créer un itinéraire soit un cliquant sur la carte, soit en ouvrant ou en modifiant un fichier GPX existant; ainsi que de mesurer la distance entre des points. L\'itinéraire peut être enregistré dans un fichier GPX qui peut lui-même être utilisé plus tard pour une navigation.</string>
     <string name="osmand_distance_planning_plugin_name">Mesure de distance et Outil de planification</string>
     <string name="shared_string_do_not_show_again">Ne plus afficher</string>
     <string name="local_osm_changes_backup_successful">Fichier de modifications OSM %1$s généré avec succès</string>
@@ -1567,8 +1567,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 	<string name="osmo_settings_uuid">Identifiant unique de l\'appareil</string>
 	<string name="osmo_settings_descr">Configurer les paramètres de suivi et définir votre canal de suivi personnel</string>
 	<string name="osmo_plugin_description">"Ce greffon permet un suivi temps-réel grâce à OsMo, voir http://osmo.mobi.\n\nCe système offre la possibilité de suivre d\'autres appareils ou d\'être suivi. Vous pouvez ainsi créer des groupes anonymes, partager vos positions et communiquer ensemble. Il y a différents paramètres pour le suivi de la session courante ou pour un suivi permanent.\n\nLes groupes anonymes sont limités à quelques jours et leurs fonctionnalités restreintes, ainsi, pas de contrôle à distance et pas d\'administrateur de groupe. Des groupes avec toutes les fonctionnalités peuvent être créés via le site web et seuls les utilisateurs enregistrés y ont accès. "</string>
-	<string name="osmo_plugin_name">OsMo surveillance</string>
-	<string name="osmo_settings">OsMo surveillance</string>
+	<string name="osmo_plugin_name">Suivi OsMo</string>
+	<string name="osmo_settings">Suivi OsMo</string>
 	
 	<string name="osmo_io_error">Problème de connexion OSMo : </string>
 	<string name="osmo_mode_on">Arrêter session OsMo</string>
@@ -1630,7 +1630,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="osmo_activity">Suivi OpenStreetMap</string>
     <string name="osmo_control">Accès rapide OsMo</string>
     
-	<string name="import_file_favourites">Enregistrer comme fichier GPX ou transformer en favoris ?</string>
+	<string name="import_file_favourites">Enregistrer sous fichier GPX ou transformer en favoris ?</string>
 	
 	<string name="color_red">Rouge</string>
 	<string name="color_pink">Rose</string>
@@ -1793,7 +1793,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="flat_list_waypoints">Tous</string>
     <string name="index_tours">Tours</string>
     <string name="record_plugin_description">"Ce greffon permet d\'enregistrer vos itinéraires au format GPX : soit automatiquement soit grâce à un bouton supplémentaire affiché sur la carte.\n\nLes traces ainsi enregistrées peuvent être partagées avec vos amis ou utilisées pour contribuer à OSM. Les sportifs peuvent utiliser ces enregistrements pour leurs entraînements. Certaines analyses des traces peuvent être réalisées directement dans OmsAnd (comme la vitesse moyenne, la durée de l\'itinéraire ...). Enfin les fichiers GPX locaux peuvent être exportés pour être utilisés par d\'autres applications. "</string>
-    <string name="record_plugin_name">Enregistrez votre itinéraire</string>
+    <string name="record_plugin_name">Enregistrement d\'itinéraire</string>
     <string name="int_hour">h</string>
     <string name="duration">Durée</string>
     <string name="distance">Distance</string>
@@ -1915,7 +1915,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="osm_editing_manage">Gérer</string>
     <string name="gps_status">État du GPS</string>
     <string name="parking_place">Place de stationnement</string>
-    <string name="remove_the_tag">Retirer l\'étiquette</string>
+    <string name="remove_the_tag">Supprimer l\'emplacement</string>
     <string name="shared_string_disabled">Désactivé</string>
 	<string name="shared_string_enabled">Activé</string>
 <string name="plugin_description_title">Description</string>
@@ -1935,7 +1935,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="notes">Notes</string>
 	<string name="online_map">Carte en ligne</string>
 	<string name="roads_only">Routes uniquement</string>
-    <string name="rendering_attr_pisteRoutes_name">Pistes</string>
+    <string name="rendering_attr_pisteRoutes_name">Pistes de ski</string>
 	<string name="watch">Montre</string>
 	<string name="shared_string_audio">Audio</string>
 	
@@ -1986,22 +1986,22 @@ 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">min</string><string name="osmand_parking_time_left">Restant</string> <string name="parking_place_limited">Stationnement d\'une durée limitée à</string>
+	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">min</string><string name="osmand_parking_time_left">restantes</string> <string name="parking_place_limited">Stationnement d\'une durée limitée à</string>
 	<string name="your_edits">Vos modifications</string>
     <string name="osmand_parking_overdue">Expiré</string>
 	<string name="delay_to_start_navigation_descr">Temps d\'affichage de l\'itinéraire détaillé, avant de démarrer la navigation</string>
     <string name="shared_string_go">Aller</string>
 	<string name="shared_string_not_use">Non utilisé</string>
-	<string name="confirmation_to_clear_history">Souhaitez-vous effacer tout l\'historique ?</string>
+	<string name="confirmation_to_clear_history">Souhaitez-vous effacer l\'historique ?</string>
     <string name="local_osm_changes_upload_all_confirm">%1$d modification(s) vont être envoyé(s) vers OSM. Confirmez-vous cet envoi ?</string>
-    <string name="delay_to_start_navigation">Démarrer la navigation après</string>
+    <string name="delay_to_start_navigation">Démarrer la navigation après…</string>
     <string name="osmo_grop_name_length_alert">Le nom d\'un groupe doit être de 3 caractères minimum !</string>
-	<string name="osm_changes_added_to_local_edits">Modifications OSM ajoutées localement</string>
+	<string name="osm_changes_added_to_local_edits">Modifications OSM mémorisées localement</string>
    	<string name="mark_to_delete">Marquer pour suppression</string>
 	<string name="current_route">Itinéraire actuel</string>
-    <string name="welmode_download_maps">Télécharger les cartes</string>
+    <string name="welmode_download_maps">Télécharger des cartes</string>
 	<string name="welcome_select_region">Afin de prendre en compte la signalisation routière et le code de la route, merci de sélectionner votre région :</string>
-	<string name="welcome_text">Avec OsmAnd visualisez des cartes hors-ligne et naviguez sans couverture réseau !</string>
+	<string name="welcome_text">Avec OsmAnd visualisez des cartes hors-ligne et naviguez sans couverture réseau dans le monde entier !</string>
 	<string name="welcome_header">Bienvenue</string>
     <string name="confirm_usage_speed_cameras">Dans certains pays (France, Allemagne, Italie, ...) l\'utilisation d\'alertes radars est interdite par la loi. OsmAnd décline toute responsabilité en cas de violation de la loi. Pour activer cette fonctionnalité en toute connaissance de cause, répondez \"Oui\".</string>
 	<string name="agps_info">Données A-GPS</string>

OsmAnd/res/values-it/strings.xml

@@ -2147,21 +2147,22 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">min</string><string name="osmand_parking_time_left">Mancano</string> <string name="parking_place_limited">Parcheggio a tempo limitato a</string>
 	<string name="your_edits">Le tue modifiche</string>
     <string name="osmand_parking_overdue">obsoleto</string>
-	<string name="delay_to_start_navigation_descr">Avvia automaticamente la navigazione dopo l\'intervallo specificato</string>
+	<string name="delay_to_start_navigation_descr">Specifica il tempo di permanenza nella schermata di pianificazione dell\'itinerario</string>
     <string name="delay_to_start_navigation">Salta la pianificazione del percorso</string>
     <string name="shared_string_go">Vai</string>
 	<string name="shared_string_not_use">Non usare</string>
-	<string name="confirmation_to_clear_history">Vuoi cancellare l\'intera cronologia?</string>
+	<string name="confirmation_to_clear_history">Vuoi cancellare la cronologia?</string>
     <string name="local_osm_changes_upload_all_confirm">Stai per inviare %1$d cambiamenti a OSM. Sei sicuro?</string>
     <string name="agps_info">Info A-GPS</string>
 	<string name="agps_data_last_downloaded">A-GPS ultimo aggiornamento dati: %1$s</string>
     <string name="welmode_download_maps">Scarica mappe</string>
-	<string name="welcome_select_region">Seleziona la tua regione</string>
+	<string name="welcome_select_region">Per rappresentare correttamente i segnali stradali e le restrizioni per favore seleziona la tua regione di guida:</string>
 	<string name="confirm_usage_speed_cameras">In molti paesi (Germania, Francia, Italia, e altri) l\'utilizzo degli avvertimenti di presenza di autovelox non è legale. OsmAnd non si assume alcuna responsabilità in caso di violazione della legge. Si prega di cliccare si solo in caso di utilizzo autorizzato di questa funzionalità.</string>
-	<string name="welcome_text">OsmAnd ti permette di utilizzzare mappe e navigazione offline!</string>
+	<string name="welcome_text">OsmAnd fornisce mappe consultabili e di navigazione offline globali!</string>
 	<string name="welcome_header">Benvenuto</string>
     <string name="current_route">Percorso attuale</string>
     <string name="osm_changes_added_to_local_edits">Modifiche a OsmAnd aggiunte alle modifiche locali</string>
    	<string name="mark_to_delete">Marca da eliminare</string>
-	<string name="osmo_grop_name_length_alert">I nomi dei gruppi devono essere almeno di 3 simboli!</string>
+	<string name="osmo_grop_name_length_alert">I nomi dei gruppi devono essere almeno di 3 caratteri!</string>
+	<string name="shared_string_message">Messaggio</string>
 	</resources>

OsmAnd/res/values-ja/phrases.xml

@@ -203,4 +203,39 @@
 	<string name="poi_public_transport_platform_tram">トラム停留所(Tram stop)</string>
 	<string name="poi_tram_stop">トラム停留所(Tram stop)</string>
 	<string name="poi_public_transport_station">公共交通機関駅(Public transport station)</string>
+	<string name="poi_bus_station">バスターミナル(Bus station)</string>
+	<string name="poi_railway_station">鉄道駅(Railway station)</string>
+	<string name="poi_railway_platform">鉄道プラットホーム(Railway platform)</string>
+	<string name="poi_halt">鉄道停車位置(Railway stop)</string>
+	<string name="poi_railway_subway_entrance">地下鉄入り口(Subway entrance)</string>
+	<string name="poi_subway_station">地下鉄駅(Subway station)</string>
+	<string name="poi_railway_buffer_stop">鉄道用車止め(Railway buffer stop)</string>
+	<string name="poi_helipad">ヘリポート(Helipad)</string>
+	<string name="poi_runway">滑走路(Runway)</string>
+	<string name="poi_aeroway_terminal">空港旅客ターミナル(Aeroway terminal)</string>
+	<string name="poi_aeroway_gate">飛行機搭乗ゲート(Aeroway gate)</string>
+
+	<string name="poi_slipway">進水路(Slipway)</string>
+	<string name="poi_ferry_terminal">フェリーターミナル(Ferry terminal)</string>
+	<string name="poi_lighthouse">灯台(Lighthouse)</string>
+
+	<string name="poi_bicycle_rental">自転車レンタル(Bicycle rental)</string>
+	<string name="poi_bicycle_parking">自転車駐輪場(Bicycle parking)</string>
+
+	<string name="poi_aerialway_station">リフト・ゴンドラ乗降場(Aerialway station)</string>
+	<string name="poi_aerialway_cable_car">ロープウェイ(Cable car)</string>
+	<string name="poi_aerialway_gondola">ゴンドラ(Gondola)</string>
+	<string name="poi_aerialway_chair_lift">リフト(Chair lift)</string>
+	<string name="poi_aerialway_t_bar">Tバーリフト(T-bar lift)</string>
+	<string name="poi_aerialway_j_bar">Jバーリフト(J-bar lift)</string>
+	<string name="poi_aerialway_platter">プラッターリフト(Platter lift)</string>
+	<string name="poi_aerialway_mixed_lift">高速リフト(Mixed lift)</string>
+	<string name="poi_aerialway_drag_lift">ドラッグリフト(Drag lift)</string>
+	<string name="poi_aerialway_rope_tow">ロープトゥ(Rope tow lift)</string>
+	<string name="poi_aerialway_goods">貨物用リフト(Goods lift)</string>
+	<string name="poi_aerialway_magic_carpet">マジックカーペットスキーリフト(Carpet lift)</string>
+
+	<string name="poi_tunnel">トンネル(Tunnel)</string>
+	<string name="poi_bridge">橋(Bridge)</string>
+
 	</resources>

OsmAnd/res/values-ja/strings.xml

@@ -1191,7 +1191,7 @@ POIの更新は利用できません</string>
 	<string name="auto_follow_route_never">使用しない(手動で案内を開始するには青矢印をタップ)</string>
 	<string name="auto_follow_route_navigation">ナビゲーションのみ</string>
 	<string name="auto_follow_route_navigation_descr">マップの自動中心表示はナビゲーション中のみ。</string>
-	<string name="auto_follow_location_enabled">マップの自動中心表示を使用。</string>
+	<string name="auto_follow_location_enabled">設定に従い、現在地をマップ中心に表示します。</string>
 	<string name="pref_vector_rendering">ベクターレンダラ固有のオプション</string>
 	<string name="pref_overlay">オーバーレイ/アンダーレイ</string>
 	<string name="pref_raster_map">マップソースの設定</string>
@@ -1941,7 +1941,7 @@ POIの更新は利用できません</string>
 	<string name="your_edits">あなたの編集</string>
     <string name="waypoint_visit_after">後で訪問</string>
     <string name="waypoint_visit_before">前に訪問</string>
-    <string name="simulate_your_location">自分の位置をシミュレート</string>
+    <string name="simulate_your_location">経路シミュレーション</string>
     <string name="drawer">フラットリスト</string>
     <string name="short_location_on_map">緯度 %1$s\n経度 %2$s</string>
     <string name="tips_and_tricks_descr">よくある質問(FAQ)</string>
@@ -2001,12 +2001,13 @@ POIの更新は利用できません</string>
    	<string name="mark_to_delete">削除用にマーク</string>
 	<string name="osmo_grop_name_length_alert">グループ名は、少なくとも記号3文字以上にする必要があります！</string>
 	<string name="welmode_download_maps">マップダウンロード</string>
-	<string name="welcome_select_region">お住まいの地域を選択</string>
-	<string name="welcome_text">OsmAndは、オフラインで地図の閲覧とナビゲーションを使用することができます！</string>
+	<string name="welcome_select_region">交通標識や交通法を正しく反映するために、運転地域を選択してください:</string>
+	<string name="welcome_text">OsmAndは、完全なオフラインでの地図閲覧とナビゲーションを提供しています！</string>
 	<string name="welcome_header">ようこそ</string>
     <string name="current_route">現在のルート</string>
     <string name="agps_info">A-GPS情報</string>
 	<string name="agps_data_last_downloaded">最後にダウンロードしたA-GPSデータ: %1$s</string>
     <string name="confirm_usage_speed_cameras">国によっては法律によりスピードカメラ警告の使用ができません。(ドイツ、フランス、イタリア、その他の国)。OsmAndは、法律に違反した場合の責任は一切負いません。この機能を使用する事ができる国の場合のみ、[はい]をクリックしてください。</string>
 	<string name="shared_string_message">メッセージ</string>
+	<string name="shared_string_do_not_use">使用しない</string>
 	</resources>

OsmAnd/res/values-ko/phrases.xml

@@ -709,4 +709,5 @@
 	<string name="poi_training">훈련 시설</string>
 	<string name="poi_field_hockey">필드 하키</string>
 	<string name="poi_smoking_area">흡연 구역</string>
+	<string name="poi_quarter">쿼터</string>
 	</resources>

OsmAnd/res/values-ko/strings.xml

@@ -186,7 +186,7 @@
 	<string name="init_native_library">기본 라이브러리 초기화중…</string>
 	<string name="choose_auto_follow_route">자동-센터 지도 보기</string>
 	<string name="choose_auto_follow_route_descr">지도 보기가 현재 위치와 동기화하여 복귀할 때까지 걸리는 시간입니다</string>
-	<string name="auto_follow_route_never">결코(Never : 수동으로 길안내를 시작하기 위해 파란 화살표를 누르세요)</string>
+	<string name="auto_follow_route_never">결코(Never : 수동으로 음성안내를 시작하려면 \'Go\'를 탭하세요)</string>
 	<string name="auto_follow_route_navigation">자동-센터 운행 전용</string>
 	<string name="auto_follow_route_navigation_descr">운행 중에만 자동-센터 지도 보기를 사용합니다.</string>
 	<string name="auto_follow_location_enabled">자동-센터 지도 보기 사용 중입니다.</string>
@@ -2081,7 +2081,7 @@
     <string name="world_ski_missing">스키 지도를 표시 하려면, 특정 오프라인 지도를 다운로드 해야 합니다</string>
     <string name="nautical_maps_missing">항해 지도 표시 하려면, 특정 오프라인 지도를 다운로드 해야 합니다</string>
 	<string name="rendering_attr_pisteGrooming_name">Piste grooming (손질)</string>
-    <string name="rendering_attr_pisteRoutes_name">Piste 경로</string>
+    <string name="rendering_attr_pisteRoutes_name">스키 슬로프</string>
 	<string name="free">"무료 %1$s "</string>
 	<string name="device_memory">장치 메모리</string>
     <string name="roads_only">도로 전용</string>
@@ -2199,25 +2199,27 @@
 	<string name="action_modify">액션 수정</string>
 	<string name="action_delete">액션 삭제</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="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="osmand_parking_overdue">시간 초과</string>
 	<string name="delay_to_start_navigation_descr">지정된 시간 경과후 자동으로 운행 시작</string>
-    <string name="delay_to_start_navigation">경로 계획 생략</string>
+    <string name="delay_to_start_navigation">~ 이후 턴-바이-턴 운행을 시작…</string>
     <string name="shared_string_go">실행</string>
 	<string name="shared_string_not_use">사용 하지 않음</string>
 	<string name="local_osm_changes_upload_all_confirm">OSM에 %1$d 변경 사항을 업로드 하려고 합니다. 확실합니까?</string>
     <string name="confirmation_to_clear_history">모든 기록을 삭제 하시겠습니까?</string>
     <string name="osm_changes_added_to_local_edits">OSM 변경 내용이 로컬 변경 내용에 추가</string>
    	<string name="mark_to_delete">표시하여 삭제</string>
-	<string name="osmo_grop_name_length_alert">그룹 이름이 적어도 3 심볼 이상 이어야 합니다!</string>
+	<string name="osmo_grop_name_length_alert">그룹 이름이 적어도 3 문자 이상 이어야 합니다!</string>
 	<string name="agps_info">A-GPS 정보</string>
 	<string name="shared_string_message">메세지</string>
 	<string name="agps_data_last_downloaded">최근 다운로드한 A-GPS 데이터 : %1$ s</string>
     <string name="confirm_usage_speed_cameras">(독일, 프랑스, 이탈리아, 등) 많은 국가에서 속도 카메라 경고를 사용하는 것은 법률에 의해 허용 되지 않습니다. OsmAnd은 법률을 위반할 경우 어떤 책임도 지지 않습니다. 이 기능을 이해하는 경우에 [예] 를 클릭 하십시오.</string>
 	<string name="welmode_download_maps">지도 다운로드</string>
-	<string name="welcome_select_region">해당 지역 선택</string>
-	<string name="welcome_text">OsmAnd는 지도 및 오프라인 운행을 이용할 수 있습니다!</string>
+	<string name="welcome_select_region">교통 표지판 및 규정을 제대로 반영 하기 위해 , 운전 지역을 선택 하십시오.</string>
+	<string name="welcome_text">OsmAnd는 전세계 오프라인 지도 보기 및 전세계 오프라인 운행을 제공합니다!</string>
 	<string name="welcome_header">환영 합니다</string>
     <string name="current_route">현재 루트</string>
-    </resources>
+    <string name="shared_string_do_not_use">사용 하지 마십시오</string>
+	<string name="shared_string_address">주소</string>
+	</resources>

OsmAnd/res/values-nb/strings.xml

@@ -234,7 +234,7 @@
 	 
 	<string name="choose_auto_follow_route">Auto-sentrer kartvisning</string>
 	<string name="choose_auto_follow_route_descr">Tid til kartvisning synkroniseres med gjeldende posisjon</string>
-	<string name="auto_follow_route_never">Aldri (trykk blå pil for å starte veiledning manuelt)</string>
+	<string name="auto_follow_route_never">Aldri (trykk \'Start\' for å starte veiledning manuelt)</string>
 	<string name="pref_raster_map">Kartkilde-innstillinger</string>
 	<string name="pref_vector_map">Vektorkart-innstillinger</string>
 	<string name="delete_confirmation_msg">Slette %1$s?</string>
@@ -624,7 +624,7 @@
 	<string name="driving_region_canada">Canada</string>
 	<string name="driving_region_europe_asia">Europa og Asia</string>
 	<string name="driving_region_uk">England, India, Australia og andre</string>
-	<string name="driving_region_descr">Velg region for bilkjøring: USA, Europa, Storbritannia, Asia og andre</string>
+	<string name="driving_region_descr">Velg region for bilkjøring: USA, Europa, Storbritannia, Asia, og andre</string>
 	<string name="driving_region_japan">Japan</string>
 	<string name="driving_region">Region for bilkjøring</string>
 	    
@@ -1250,10 +1250,10 @@
 	<string name="shared_string_ellipsis">…</string>
 	<string name="osmand_parking_overdue">utløpt</string>
 	<string name="osm_edits">OSM-redigeringer</string>
-	<string name="osmand_parking_time_left">Igjen</string> <string name="your_edits">Dine redigeringer</string>
+	<string name="osmand_parking_time_left">igjen</string> <string name="your_edits">Dine redigeringer</string>
     <string name="waypoint_visit_after">Besøk etter</string>
     <string name="waypoint_visit_before">Besøk før</string>
-    <string name="tips_and_tricks_descr">Ofte stilte spørsmål, siste endringer og annet</string>
+    <string name="tips_and_tricks_descr">Ofte stilte spørsmål, siste endringer, og annet</string>
     <string name="routing_settings_2">Navigeringsinnstillinger</string>
     <string name="osmand_parking_hour">t</string><string name="osmand_parking_minute">min</string><string name="parking_place_limited">Parkeringstid begrenset til</string>
 	<string name="simulate_your_location">Simuler din posisjon</string>
@@ -1265,10 +1265,20 @@
 	<string name="shared_string_action_template">Handling {0}</string>
 	<string name="watch">Se</string>
 	<string name="local_osm_changes_upload_all_confirm">Du kommer til å laste opp %1$d endringer til OSM. Er du sikker?</string>
-    <string name="confirmation_to_clear_history">Vil du slette hele historikken?</string>
-    <string name="delay_to_start_navigation">Hopp over ruteplanlegging</string>
+    <string name="confirmation_to_clear_history">Vil du slette historikken?</string>
+    <string name="delay_to_start_navigation">Start trinnvis navigering etter…</string>
     <string name="welmode_download_maps">Last ned kart</string>
-	<string name="welcome_select_region">Velg region</string>
+	<string name="welcome_select_region">For å korrekt gjenspeile trafikkskilt og trafikkregler, velg region for kjøringen:</string>
 	<string name="welcome_header">Velkommen</string>
     <string name="mark_to_delete">Merk for å slette</string>
-	</resources>
+	<string name="agps_info">A-GPS-info</string>
+	<string name="shared_string_message">Melding</string>
+	<string name="agps_data_last_downloaded">A-GPS-data sist nedlastet: %1$s</string>
+    <string name="welcome_text">OsmAnd gir global offline kartlesing, og global offline navigering!</string>
+	<string name="current_route">Gjeldende rute</string>
+    <string name="osmo_grop_name_length_alert">Gruppenavn skal være på minst 3 tegn!</string>
+	<string name="shared_string_go">Start</string>
+	<string name="shared_string_do_not_use">Ikke bruk</string>
+	<string name="shared_string_address">Adresse</string>
+	<string name="delay_navigation_start">Start trinnvis veiledning automatisk</string>
+    </resources>

OsmAnd/res/values-pl/strings.xml

@@ -10,7 +10,7 @@
   <string name="pref_vector_map">Ustawienia mapy wektorowej</string>
   <string name="choose_auto_follow_route">Autocentrowanie mapy</string>
   <string name="choose_auto_follow_route_descr">Opóźnienie, po którym mapa zacznie podążać za aktualną pozycją GPS</string>
-  <string name="auto_follow_route_never">Nigdy (dotknij niebieskiej strzałki, aby rozpocząć ręcznie)</string>
+  <string name="auto_follow_route_never">Nigdy (dotknij \'Idź\', aby rozpocząć ręcznie)</string>
   <string name="auto_follow_route_navigation">Auto-podążanie za pozycją</string>
   <string name="auto_follow_route_navigation_descr">Włącz podążanie za pozycją tylko w trybie nawigacji.</string>
   <string name="auto_follow_location_enabled">Podążanie za pozycją jest włączone.</string>
@@ -2020,8 +2020,8 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
 	<string name="action_modify">Zmodyfikuj</string>
 	<string name="action_delete">Usuń</string>
 	<string name="osm_edits">Edycje OSM</string>
-	<string name="osmand_parking_hour">godz</string><string name="osmand_parking_minute">min</string><string name="osmand_parking_time_left">Pozostało</string> <string name="parking_place_limited">Miejsce parkingowe ograniczone czasowo do</string>
-	<string name="your_edits">Twoje edycje</string>
+	<string name="osmand_parking_hour">godz</string><string name="osmand_parking_minute">min</string><string name="osmand_parking_time_left">pozostało</string> <string name="parking_place_limited">Czas parkowania ograniczony do</string>
+	<string name="your_edits">Twoje zmiany</string>
     <string name="waypoint_visit_after">Odwiedź później</string>
     <string name="waypoint_visit_before">Odwiedź wcześniej</string>
     <string name="simulate_your_location">Symuluj lokalizację</string>
@@ -2049,14 +2049,14 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
 	<string name="plugin_touringview_name">Widok mapy turystycznej</string>
 	<string name="plugin_touringview_descr">"Włączenie tego widoku zmienia styl mapy OsmAnd na \'turystyczny\', który jest specjalnym trybem wysokiej rozdzielczości dla turystów i kierowców zawodowych.\n\nTen widok dostarcza w danych mapy przy każdym poziomie przybliżenia maksymalną ilość dostępnych detali (w szczególności dróg, szlaków, ścieżek oraz znaków orientacyjnych).\n\nW sposób jasny i jednoznaczny szereguje typy dróg wg przypisanych kolorów, co jest przydatne, np. podczas prowadzenia dużych pojazdów.\n\nUdostępnia specjalne opcje turystyczne, jak np. trasy rowerowe lub alpejskie szlaki górskie.\n\nNie potrzeba ściągać specjalnej mapy, ten widok jest tworzony z map standardowych.\n\nMożna go wyłączyć używając obecnej tutaj opcji lub zmieniając styl mapy w menu konfiguracji mapy. "</string>
 	<string name="watch">Oglądaj</string>
-	<string name="rendering_attr_pisteRoutes_name">Trasy narciarskie</string>
+	<string name="rendering_attr_pisteRoutes_name">Stoki narciarskie</string>
 	<string name="rendering_attr_pisteGrooming_name">Ratrakowanie</string>
     <string name="world_ski_missing">Trzeba pobrać specjalną mapę offline, aby wyświetlać mapy narciarskie</string>
     <string name="nautical_maps_missing">Trzeba pobrać specjalną mapę offline, aby wyświetlać mapy żeglugowe</string>
 	<string name="remove_the_tag">Usuń tag</string>
     <string name="version_settings">Kompilacja</string>
     <string name="points">Punkty</string>
-    <string name="navigation_over_track">Rozpocząć nawigację na trasie?</string>
+    <string name="navigation_over_track">Rozpocząć nawigację wzdłuż trasy?</string>
 	<string name="save_track_to_gpx_globally_headline">Zapis trasy na żądanie</string>
 	<string name="enable_proxy_descr">Skonfiguruj proxy HTTP dla wszystkich zapytań sieciowych</string>
 	<string name="proxy_host_descr">Skonfiguruj nazwę hosta proxy (np. 127.0.0.1)</string>
@@ -2064,24 +2064,27 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
 	<string name="shared_string_release">Wypuszczony</string>
 	<string name="get_plugin">Pobierz</string>
 <string name="local_osm_changes_upload_all_confirm">Zamierzasz wysłać %1$d zmian na OSM. Czy jesteś pewien?</string>
-    <string name="confirmation_to_clear_history">Czy chcesz wyczyścić całą historię?</string>
-    <string name="delay_to_start_navigation_descr">Automatycznie rozpocznij nawigację po upłynięciu określonego czasu</string>
-    <string name="delay_to_start_navigation">Pomiń planowanie trasy</string>
+    <string name="confirmation_to_clear_history">Czy chcesz wyczyścić historię?</string>
+    <string name="delay_to_start_navigation_descr">Określ czas pozostawania na ekranie planowania trasy</string>
+    <string name="delay_to_start_navigation">Rozpocznij nawigację turn-by-turn za…</string>
     <string name="drawer">Płaska lista</string>
     <string name="days_behind">dni za najnowszą wersją</string>
 	<string name="agps_info">Informacje A-GPS</string>
 	<string name="agps_data_last_downloaded">Dane A-GPS pobrano ostatnio: %1$s</string>
     <string name="confirm_usage_speed_cameras">W wielu krajach (Niemcy, Francja, Włochy i inne) prawo zabrania korzystania z ostrzeżeń o fotoradarach. OsmAnd nie bierze żadnej odpowiedzialności, jeśli złamiesz prawo. Kliknij \"Tak\", jeśli wolno używać tej funkcji.</string>
 	<string name="welmode_download_maps">Pobierz mapy</string>
-	<string name="welcome_select_region">Wybierz region</string>
-	<string name="welcome_text">OsmAnd pozwala używać map oraz nawigacji offline!</string>
+	<string name="welcome_select_region">Wybierz region, w którym się poruszasz, aby właściwie przedstawiać znaki i inne reguły ruchu:</string>
+	<string name="welcome_text">OsmAnd pozwala używać map oraz nawigacji offline na całym świecie!</string>
 	<string name="welcome_header">Witaj</string>
     <string name="current_route">Bieżąca trasa</string>
-    <string name="osm_changes_added_to_local_edits">Zmiany OSM dodane do zmian lokalnych</string>
+    <string name="osm_changes_added_to_local_edits">Zmiany OSM dodane do zestawu zmian lokalnych</string>
    	<string name="mark_to_delete">Zaznacz, aby usunąć</string>
 	<string name="osmo_grop_name_length_alert">Nazwa grupy powinna mieć co najmniej 3 znaki długości!</string>
 	<string name="shared_string_go">Idź</string>
 	<string name="shared_string_not_use">Nie używaj</string>
 	<string name="plugin_nautical_descr">"Ta wtyczka wzbogaca aplikację OsmAnd, by tworzyć mapy nawigacyjne dla łodzi, żaglówek oraz innych sportów wodnych.\n\nSpecjalny dodatek do Osm And wstawia znaki nawigacyjne i oznaczenia map morskich dla nawigacji śródlądowej oraz przybrzeżnej. Opis każdego znaku dostarcza szczegółów potrzebnych do ich identyfikacji oraz ich przeznaczenia (kategoria, kształt, kolor, kolejność, odniesienie itd.).\n\nW razie potrzeby wyłącz tę wtyczkę lub zmień styl w opcjach \'Styl mapy\' w menu \'Konfiguracja mapy\', aby powrócić do jednego z typowych stylów map OsmAnd. "</string>
 	<string name="plugin_ski_descr">"Ta wtyczka dodaje do OsmAnd szczegóły dotyczące stoków narciarskich, tras biegowych, tras skitour, kolejek linowych i wyciągów narciarskich na świecie. Trasy i szlaki są pokolorowane według trudności i przedstawione w specjalnym zimowym stylu mapy, imitującym krajobraz pokryty śniegiem.\n\nWłączenie tego widoku zmienia styl mapy na \'Zima i narty\', ukazujący teren pokryty śniegiem. Widok można wyłączyć przez wyłączenie wtyczki lub zmianę stylu w menu \'Styl mapy\' w \'Konfiguracji mapy\'. "</string>
+	<string name="shared_string_message">Wiadomość</string>
+	<string name="shared_string_do_not_use">Nie używaj</string>
+	<string name="shared_string_address">Adres</string>
 	</resources>

OsmAnd/res/values-ru/phrases.xml

@@ -682,4 +682,13 @@
 		<string name="poi_internet_access">Доступ в Интернет</string>
 	<string name="poi_club">Клуб</string>
 	<string name="poi_cafe_and_restaurant">Кафе и ресторан</string>
+	<string name="poi_shop_food">Продовольственный магазин</string>
+	<string name="poi_filling_station">Заправочная станция</string>
+		<string name="poi_aerialway_transport">Канатный транспорт</string>
+	<string name="poi_transport_construction">Транспортное сооружение</string>
+		<string name="poi_water_supply">Водоснабжение</string>
+		<string name="poi_communication">Коммуникации</string>
+		<string name="poi_trash_disposal">Утилизация мусора</string>
+	<string name="poi_accomodation">Проживание</string>
+		<string name="poi_child_clothes">Детская одежда</string>
 	</resources>

OsmAnd/res/values-ru/strings.xml

@@ -1923,20 +1923,20 @@
 	<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="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>
     <string name="waypoint_visit_before">Посетить до</string>
     <string name="plugin_touringview_name">Туристическая карта</string>
-	<string name="osmand_parking_overdue">Просрочено</string>
-	<string name="delay_to_start_navigation_descr">Автоматический запуск навигации после заданного интервала\n\nУкажите время задержки на экране планирования маршрута</string>
-    <string name="delay_to_start_navigation">Старт навигации после</string>
+	<string name="osmand_parking_overdue">просрочено</string>
+	<string name="delay_to_start_navigation_descr">Укажите время задержки на экране планирования маршрута</string>
+    <string name="delay_to_start_navigation">Задержка начала навигации…</string>
     <string name="shared_string_go">Поехали</string>
 	<string name="shared_string_not_use">Не использовать</string>
 	<string name="plugin_nautical_descr">"Плагин обогащает карты и навигацию OsmAnd, а также делает доступными морские карты для катания на лодках, парусного спорта, и других видов спорта.
 \n\nСпециальная карта дополнение для OsmAnd добавляет морские навигационные и условные знаки, для внутренней, так и для прибрежной навигации. Описание каждой навигационной отметки содержит информацию, необходимую для идентификации, а также её значение (категория, форма, цвет, последовательность, ссылка и т.д.).\n\nЧтобы вернуться к одному из традиционных стилей карт в OsmAnd, просто деактивируйте этот плагин или измените на желаемый \"Стиль карты\" в разделе \"Настройка карты\". "</string>
 	<string name="local_osm_changes_upload_all_confirm">Вы собираетесь загрузить %1$d изменений OSM. Вы уверены?</string>
-    <string name="confirmation_to_clear_history">Вы хотите очистить всю историю?</string>
+    <string name="confirmation_to_clear_history">Вы хотите очистить историю?</string>
     <string name="plugin_ski_descr">"Плагин обеспечивает вам доступ к данным о горнолыжных трассах, маршрутах для беговых лыж, альпийских спусках, фуникулерах и горнолыжных подъемниках. Маршруты и спуски отмечены разными цветами в зависимости от их сложности и изображены с использованием специального \"зимнего\" стиля карты, который заключается в том, что используются \"снежные\" цвета зимнего пейзажа.\n\nВ случае активации этого вида, стиль карты меняется на \"Winter and ski\", показывая все детали пейзажа так, как они выглядят зимой. Такой (зимний) вид может быть отменен либо путем деактивации здесь, либо если вы поменяете \"Стиль карты\" в меню \"Настройка карты\" на желаемый вид. "</string>
 	<string name="osmo_grop_name_length_alert">Имя группы должно быть минимум 3 символа!</string>
 	<string name="current_route">Текущий маршрут</string>
@@ -1951,4 +1951,5 @@
 	<string name="agps_data_last_downloaded">Последние загруженные данные A-GPS от: %1$s</string>
     <string name="shared_string_message">Сообщение</string>
 	<string name="shared_string_do_not_use">Не использовать</string>
+	<string name="shared_string_address">Адрес</string>
 	</resources>

OsmAnd/res/values-sc/strings.xml

@@ -915,7 +915,7 @@
 	<string name="tip_day_night_mode">Modalidade die/note</string>
 	<string name="tip_osm_improve">Megiora sos datos OSM</string>
 	<string name="tip_navigation">Nàvigu</string>
-	<string name="auto_follow_route_never">Mai (carca sa fritza biaita pro aviare manualmente sa ghia)</string>
+	<string name="auto_follow_route_never">Mai (carca \'Bae\' pro aviare manualmente sa ghia)</string>
 	<string name="keep_informing_never">Manualmente ebbia (carca sa fritza)</string>
     <string name="keep_informing">Torra a repìtere sas istrutziones de nàvigu</string>
 	<string name="pref_raster_map">Impostaduras de sa mitza de sa mapa</string>
@@ -1857,7 +1857,7 @@
 	<string name="rendering_attr_pisteGrooming_name">Pista abbatigada</string>
     <string name="free">"Lìbera %1$s "</string>
 	<string name="device_memory">Memòria dispositivu</string>
-    <string name="rendering_attr_pisteRoutes_name">Àndalas in pista</string>
+    <string name="rendering_attr_pisteRoutes_name">Pistas de iscì</string>
 	<string name="roads_only">Istradas ebbia</string>
     <string name="watch">Relògiu</string>
 	<string name="notes">Notas</string>
@@ -1896,7 +1896,7 @@
 	<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">min</string><string name="osmand_parking_time_left">Galu</string> <string name="parking_place_limited">Parchègiu cun tempus limitadu a</string>
+	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">min</string><string name="osmand_parking_time_left">galu</string> <string name="parking_place_limited">Parchègiu cun tempus limitadu a</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>
@@ -1917,17 +1917,17 @@
 	<string name="route_points">Puntos de s\'àndala</string>
 	<string name="shared_string_release">Essidu</string>
 	<string name="osmand_parking_overdue">Iscadidu</string>
-	<string name="delay_to_start_navigation_descr">Incumentza automaticamente su nàvigu a pustis de s\'intervallu dislindadu</string>
+	<string name="delay_to_start_navigation_descr">Dislinda su tempus de permanèntzia in s\'ischermu de pianificatzione de s\'àndala, in antis de su cumintzu de su nàvigu</string>
     <string name="shared_string_not_use">No impreare</string>
 	<string name="shared_string_go">Bae</string>
-	<string name="delay_to_start_navigation">Brinca sa pianificatzione de s\'àndala</string>
-    <string name="confirmation_to_clear_history">Boles burrare totu s’istòria?</string>
+	<string name="delay_to_start_navigation">Brinca sa pianificatzione de s\'àndala…</string>
+    <string name="confirmation_to_clear_history">Boles burrare s’istòria?</string>
     <string name="local_osm_changes_upload_all_confirm">As a carrigare %1$d modìficas in OSM. Seguru ses?</string>
-    <string name="osmo_grop_name_length_alert">Sa longària de su nùmene de su grupu depet èssere de a su mancu 3 sìmbulos!</string>
+    <string name="osmo_grop_name_length_alert">Sa longària de su nùmene de su grupu depet èssere de a su mancu 3 caràteres!</string>
 	<string name="osm_changes_added_to_local_edits">Mòdificas OSM annantas a sas modìficas locales</string>
    	<string name="welmode_download_maps">Iscàrriga mapas</string>
-	<string name="welcome_select_region">Pro ammustrare mègius sos cartellos e sas leges locales tuas, pro piaghere ischerta sa regione tua:</string>
-	<string name="welcome_text">OsmAnd ti cunsentit de impreare mapas e nàvigu sena lìnia!</string>
+	<string name="welcome_select_region">Pro ammustrare mègius sos cartellos e sas restritziones locales tuas, pro piaghere ischerta sa regione tua:</string>
+	<string name="welcome_text">OsmAnd frunit e ti cunsentit de impreare mapas globales e nàvigu sena lìnia!</string>
 	<string name="welcome_header">Benènnidu</string>
     <string name="current_route">Àndala atuale</string>
     <string name="mark_to_delete">Marca pro burrare</string>
@@ -1935,4 +1935,6 @@
 	<string name="agps_info">Informatziones A-GPS</string>
 	<string name="agps_data_last_downloaded">Ùrtimu agiornamentu datos A-GPS: %1$s</string>
     <string name="shared_string_message">Messàgiu</string>
+	<string name="shared_string_do_not_use">No impreare</string>
+	<string name="shared_string_address">Indiritzu</string>
 	</resources>

OsmAnd/res/values-sk/strings.xml

@@ -1967,7 +1967,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="speak_pedestrian">Oznamovať priechody pre chodcov</string>
     
 	<string name="save_track_to_gpx_globally_headline">Záznam trasy v prípade potreby</string>
-	<string name="navigation_over_track">Spustiť navigáciu po stope?</string>
+	<string name="navigation_over_track">Spustiť navigáciu pozdĺž stopy?</string>
 	<string name="avoid_roads_msg">Môžete vynútiť inú trasu zvolením ciest, ktorým je nutné sa vyhnúť</string>
     
 	<string name="rendering_attr_streetLighting_name">Pouličné osvetlenie</string>
@@ -2000,7 +2000,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 	<string name="rendering_attr_pisteGrooming_name">Úprava zjazdovky</string>
     <string name="free">"%1$s voľných "</string>
 	<string name="device_memory">Pamäť zariadenia</string>
-    <string name="rendering_attr_pisteRoutes_name">Lyžiarske trate</string>
+    <string name="rendering_attr_pisteRoutes_name">Lyžiarske svahy</string>
 	<string name="share_note">Zdieľať poznámku</string>
 	
 	<string name="notes">Poznámky</string>
@@ -2112,14 +2112,14 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 	<string name="shared_string_my_tracks">Moje stopy</string>
 	<string name="shared_string_currently_recording_track">Stopa sa nahráva</string>
 	<string name="delay_to_start_navigation_descr">Zadajte dobu zotrvania na obrazovke plánovania trasy</string>
-    <string name="delay_to_start_navigation">Spustiť navigačné pokyny po</string>
+    <string name="delay_to_start_navigation">Spustiť navigačné pokyny po…</string>
     <string name="shared_string_go">Ísť</string>
 	
 	<string name="action_create">Vytvoriť akciu</string>
 	<string name="action_modify">Zmeniť akciu</string>
 	<string name="action_delete">Odstrániť akciu</string>
 	<string name="osm_edits">Zmeny v OSM</string>
-	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">min</string><string name="osmand_parking_time_left">Zostáva</string> <string name="parking_place_limited">Čas parkovacieho miesta obmedzený na</string>
+	<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">min</string><string name="osmand_parking_time_left">zostáva</string> <string name="parking_place_limited">Čas parkovania obmedzený na</string>
 	<string name="your_edits">Vaše zmeny</string>
     <string name="waypoint_visit_after">Navštíviť po</string>
     <string name="waypoint_visit_before">Navštíviť pred</string>
@@ -2131,11 +2131,11 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 	<string name="osmo_grop_name_length_alert">Názov skupiny by mal mať aspoň 3 písmená!</string>
 	<string name="confirm_usage_speed_cameras">Vo viacerých krajinách (ako Nemecko, Francúzsko, Taliansko) je použitie varovaní pred rýchlostnými radarmi/kamerami zakázané zákonom. OsmAnd nepreberá žiadnu zodpovednosť ak porušíte zákon. Povoľte funkciu oznamovania len ak ste na to oprávnený.</string>
 	<string name="welmode_download_maps">Stiahnuť mapy</string>
-	<string name="welcome_select_region">Vyberte svoj región, aby bolo možné správne nastaviť dopravné predpisy a zákony:</string>
-	<string name="welcome_text">OsmAnd poskytuje offline mapy a offline navigáciu!</string>
+	<string name="welcome_select_region">Vyberte svoj región, aby bolo možné správne nastaviť dopravné predpisy:</string>
+	<string name="welcome_text">OsmAnd poskytuje celosvetové offline mapy a offline navigáciu!</string>
 	<string name="welcome_header">Vitajte</string>
     <string name="current_route">Súčasná trasa</string>
-    <string name="osm_changes_added_to_local_edits">Zmeny OSM pridané do lokálnych zmien</string>
+    <string name="osm_changes_added_to_local_edits">Zmeny OSM pridané do lokálnej sady zmien</string>
    	<string name="mark_to_delete">Označte pre výmaz</string>
 	<string name="agps_info">Informácie o A-GPS</string>
 	<string name="agps_data_last_downloaded">A-GPS dáta boli naposledy stiahnuté: %1$s</string>

OsmAnd/res/values-sv/strings.xml

@@ -1735,7 +1735,7 @@
 	<string name="rendering_attr_pisteGrooming_name">Pist- och spårpreparering</string>
     <string name="free">"Ledigt %1$s "</string>
 	<string name="device_memory">Intern lagring</string>
-    <string name="rendering_attr_pisteRoutes_name">Pister och spår</string>
+    <string name="rendering_attr_pisteRoutes_name">Skidbackar</string>
 	<string name="roads_only">Endast vägar</string>
     <string name="notes">Anteckningar</string>
 	<string name="online_map">Online-karta</string>
@@ -1835,18 +1835,18 @@
 	<string name="your_edits">Dina redigeringar</string>
     <string name="osmand_parking_overdue">Föråldrad</string>
 	<string name="delay_to_start_navigation_descr">Ange väntetid att bli kvar på ruttplaneringsskärmen</string>
-    <string name="delay_to_start_navigation">Börja sväng-efter-sväng-navigering efter</string>
+    <string name="delay_to_start_navigation">Börja sväng-efter-sväng-navigering efter …</string>
     <string name="shared_string_go">Kör</string>
 	<string name="local_osm_changes_upload_all_confirm">Du håller på att skicka %1$d ändringar till OSM. Är du säker?</string>
-    <string name="confirmation_to_clear_history">Vill du ta bort hela historiken?</string>
+    <string name="confirmation_to_clear_history">Vill du ta bort historiken?</string>
     <string name="osmo_grop_name_length_alert">Gruppnamn bör vara minst tre tecken långa!</string>
 	<string name="current_route">Aktuell rutt</string>
     <string name="osm_changes_added_to_local_edits">OSM-ändringar lades till i lokala ändringar</string>
    	<string name="mark_to_delete">Markera för att ta bort</string>
 	<string name="confirm_usage_speed_cameras">I många länder (Tyskland, Frankrike, Italien och andra) är det inte tillåtet att använda varningar om hastighetskameror. OsmAnd tar inget ansvar om du bryter mot lagen. Klicka på Ja endast om du får använda denna funktion.</string>
 	<string name="welmode_download_maps">Hämta kartor</string>
-	<string name="welcome_select_region">För att avspegla dina trafiksignaler och lagar på ett korrekt sätt, välj den region du kör i:</string>
-	<string name="welcome_text">OsmAnd erbjuder offline-kartor och fullständig navigering offline!</string>
+	<string name="welcome_select_region">För att avspegla dina trafiksignaler och -förordningar på ett korrekt sätt, välj den region du kör i:</string>
+	<string name="welcome_text">OsmAnd erbjuder bläddring i globala offline-kartor och fullständig global navigering offline!</string>
 	<string name="welcome_header">Välkommen</string>
     <string name="agps_info">A-GPS-info</string>
 	<string name="shared_string_message">Meddelande</string>

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

@@ -376,7 +376,7 @@
 	<string name="init_native_library">初始化原生函式庫…</string>
 	<string name="choose_auto_follow_route">地圖檢視自動置中</string>
 	<string name="choose_auto_follow_route_descr">一段時間後地圖會移到目前位置</string>
-	<string name="auto_follow_route_never">永不（輕點藍色箭頭可啟動手動引導）</string>
+	<string name="auto_follow_route_never">永不（輕點 \'執行\' 手動開始引導）</string>
 	<string name="auto_follow_route_navigation">只有導航時自動置中</string>
 	<string name="auto_follow_route_navigation_descr">只有在導航時，地圖檢視自動置中。</string>
 	<string name="auto_follow_location_enabled">使用地圖檢視自動置中。</string>
@@ -715,7 +715,7 @@
 	<string name="menu_mute_off">語音已開啟</string>
 	<string name="menu_mute_on">語音已關閉</string>
 	<string name="voice_provider_descr">選擇導航語音導引</string>
-	<string name="voice_provider">語音導航</string>
+	<string name="voice_provider">語音指引</string>
 	<string name="voice_data_initializing">初始化語音資料…</string>
 	<string name="voice_data_not_supported">不支援的語音資料版本</string>
 	<string name="voice_data_corrupted">指定的語音已損毀</string>
@@ -1311,7 +1311,7 @@
 	<string name="speak_street_names">通報街道名稱 (TTS)</string>
         
     
-    <string name="driving_region_descr">選擇駕駛區域：美國、歐洲、英國、亞洲和其他</string>
+    <string name="driving_region_descr">選擇駕駛區域：美國、歐洲、英國、亞洲和其它</string>
 	<string name="driving_region_japan">日本</string>
 	<string name="driving_region_us">美國</string>
 	<string name="driving_region_canada">加拿大</string>
@@ -1608,7 +1608,7 @@
     <string name="loading_smth">正在載入 %1$s …</string>
     <string name="map_widget_plain_time">目前時間</string>
     <string name="selected_gpx_info_show">\n\n長按在地圖上查看</string>
-    <string name="delay_navigation_start">自動啟動轉向建議指引</string>
+    <string name="delay_navigation_start">自動開始轉向建議指引</string>
     <string name="gpx_split_interval">分割的間隔</string>
     <string name="gpx_info_subtracks">子軌跡：%1$s </string>
 	<string name="gpx_info_maximum_speed">"最高速度：%1$s "</string>
@@ -1809,7 +1809,7 @@
 	<string name="show_pedestrian_warnings">顯示行人穿越道</string>
     <string name="speak_pedestrian">通報行人穿越道</string>
     
-	<string name="navigation_over_track">開始導航覆蓋在軌跡上嗎？</string>
+	<string name="navigation_over_track">沿著軌跡開始導航嗎？</string>
 	<string name="avoid_roads_msg">您可以觸發一條替代線路，經由選擇道路去避免</string>
     <string name="save_track_to_gpx_globally_headline">要求軌跡日誌</string>
 	
@@ -1847,7 +1847,7 @@
 	<string name="rendering_attr_pisteGrooming_name">滑雪道修整</string>
     <string name="free">"%1$s 可用 "</string>
 	<string name="device_memory">裝置記憶體</string>
-    <string name="rendering_attr_pisteRoutes_name">滑雪道路線</string>
+    <string name="rendering_attr_pisteRoutes_name">滑雪斜坡</string>
 	<string name="roads_only">僅道路</string>
     <string name="watch">觀看</string>
 	<string name="notes">備註</string>
@@ -1927,7 +1927,7 @@
 
 	<string name="simulate_your_location">模擬您的位置</string>
     <string name="short_location_on_map">緯度 %1$s\n 經度 %2$s</string>
-    <string name="tips_and_tricks_descr">常見的問題，最近的更改以及其他</string>
+    <string name="tips_and_tricks_descr">常見的問題，最近的更改以及其它</string>
     <string name="routing_settings_2">導航設定</string>
     <string name="general_settings_2">一般設定</string>
 	<string name="waypoint_visit_after">隨後造訪</string>
@@ -1942,22 +1942,24 @@
 	<string name="action_modify">行動修改</string>
 	<string name="action_delete">行動刪除</string>
 	<string name="osmand_parking_overdue">已過時</string>
-	<string name="delay_to_start_navigation_descr">指定的時間間隔後自動開始導航</string>
-    <string name="delay_to_start_navigation">跳過航路規劃</string>
+	<string name="delay_to_start_navigation_descr">在導航規劃螢幕上，指示剩餘等待時間</string>
+    <string name="delay_to_start_navigation">導航後開始轉向建議…</string>
     <string name="shared_string_go">執行</string>
 	<string name="shared_string_not_use">不使用</string>
-	<string name="confirmation_to_clear_history">您想要清除所有過去的記錄嗎？</string>
+	<string name="confirmation_to_clear_history">您想要清除過去的記錄嗎？</string>
     <string name="local_osm_changes_upload_all_confirm">您要上載 %1$d 更改到 OSM。您確定嗎？</string>
-    <string name="osmo_grop_name_length_alert">群組名稱至少須要 3 個字符長！</string>
-    <string name="osm_changes_added_to_local_edits">OSM 變更已加到本機更改</string>
+    <string name="osmo_grop_name_length_alert">群組名稱至少須要有 3 個字元長！</string>
+    <string name="osm_changes_added_to_local_edits">OSM 的變更已加到本機更改設定</string>
    	<string name="mark_to_delete">刪除標記</string>
 	<string name="current_route">目前的路線</string>
     <string name="welmode_download_maps">下載地圖</string>
-	<string name="welcome_select_region">選擇您所在的地區</string>
-	<string name="welcome_text">OsmAnd 允許您使用地圖和離線導航！</string>
+	<string name="welcome_select_region">為了正確的反映您所在的交通號誌和規則，請選擇您的駕駛區域：</string>
+	<string name="welcome_text">OsmAnd 提供全球離線地圖瀏覽和全球離線導航！</string>
 	<string name="welcome_header">歡迎</string>
     <string name="confirm_usage_speed_cameras">在許多國家（德國、法國、義大利和其它）法律上不容許使用測速照相警示。如果您違反了法律，OsmAnd 並不承擔任何的責任。請您只在有資格時，才按下 \"是\" 使用此一功能。</string>
 	<string name="agps_info">A-GPS 資訊</string>
 	<string name="agps_data_last_downloaded">A-GPS 資料上次下載：%1$s</string>
     <string name="shared_string_message">訊息</string>
+	<string name="shared_string_do_not_use">不使用</string>
+	<string name="shared_string_address">地址</string>
 	</resources>

OsmAnd/res/values/strings.xml

@@ -14,17 +14,17 @@
 	<string name="agps_data_last_downloaded">A-GPS data last downloaded: %1$s</string>
     <string name="confirm_usage_speed_cameras">In many countries (Germany, France, Italy, and others) the use of speed camera warnings is not permitted by law. OsmAnd does assume any liability if you violate the law. Please click yes only if you are eligible to use this feature.</string>
 	<string name="welmode_download_maps">Download maps</string>
-	<string name="welcome_select_region">To correctly reflect your traffic signs and laws, please select your driving region:</string>
-	<string name="welcome_text">OsmAnd provides fully offline map browsing, and fully offline navigation!</string>
+	<string name="welcome_select_region">To correctly reflect your traffic signs and regulations, please select your driving region:</string>
+	<string name="welcome_text">OsmAnd provides global offline map browsing, and global offline navigation!</string>
 	<string name="welcome_header">Welcome</string>
     <string name="current_route">Current route</string>
-    <string name="osm_changes_added_to_local_edits">OSM changes added to local changes</string>
+    <string name="osm_changes_added_to_local_edits">OSM changes added to local changeset</string>
    	<string name="mark_to_delete">Mark to delete</string>
-	<string name="osmo_grop_name_length_alert">Group name should be at least 3 symbols long!</string>
+	<string name="osmo_grop_name_length_alert">Group name should be at least 3 characters long!</string>
 	<string name="local_osm_changes_upload_all_confirm">You are going to upload %1$d changes to OSM. Are you sure?</string>
-    <string name="confirmation_to_clear_history">Do you want to clear the whole history?</string>
+    <string name="confirmation_to_clear_history">Do you want to clear the history?</string>
     <string name="delay_to_start_navigation_descr">Specify wait time to remain on the route planning screen</string>
-    <string name="delay_to_start_navigation">Start turn-by-turn navigation after</string>
+    <string name="delay_to_start_navigation">Start turn-by-turn navigation after…</string>
     <string name="shared_string_go">Go</string>
 	<string name="osmand_parking_overdue">overdue</string>
 	<string name="action_create">Action create</string>
@@ -35,16 +35,16 @@
 	<string name="osmand_parking_hour">h</string>
 	<!-- means first letter of word *minute*-->
 	<string name="osmand_parking_minute">min</string>
-	<string name="parking_place_limited">Parking place time limited to</string>
+	<string name="parking_place_limited">Parking time limited to</string>
 	<!-- used to describe time left, not left direction -->
-	<string name="osmand_parking_time_left">Left</string>
-	<string name="your_edits">Your Edits</string>
+	<string name="osmand_parking_time_left">left</string>
+	<string name="your_edits">Your edits</string>
     <string name="waypoint_visit_after">Visit after</string>
     <string name="waypoint_visit_before">Visit before</string>
     <string name="simulate_your_location">Simulate your position</string>
     <string name="drawer">Flat list</string>
     <string name="short_location_on_map">Lat %1$s\n Lon %2$s</string>
-    <string name="tips_and_tricks_descr">Frequently asked questions, recent changes and others</string>
+    <string name="tips_and_tricks_descr">Frequently asked questions, recent changes, and others</string>
     <string name="routing_settings_2">Navigation settings</string>
     <string name="general_settings_2">General settings</string>
 	<string name="shared_string_ellipsis">…</string>
@@ -184,7 +184,7 @@
 	<string name="notes">Notes</string>
 	<string name="online_map">Online map</string>
 	<string name="roads_only">Roads only</string>
-    <string name="rendering_attr_pisteRoutes_name">Piste routes</string>
+    <string name="rendering_attr_pisteRoutes_name">Ski slopes</string>
 	<string name="free">Free %1$s </string>
 	<string name="device_memory">Device memory</string>
     <string name="rendering_attr_pisteGrooming_name">Piste grooming</string>
@@ -202,7 +202,7 @@
     <string name="settings_privacy">Privacy</string>
     <string name="points">Points</string>
     <string name="osm_editing_manage">Manage</string>
-	<string name="navigation_over_track">Start navigation over track?</string>
+	<string name="navigation_over_track">Start navigation along track?</string>
 	<string name="avoid_roads_msg">You can trigger an alternative route by selecting roads to avoid</string>
 	<string name="speak_pedestrian">Announce pedestrian crosswalks</string>
     <string name="rendering_attr_roadStyle_name">Road style</string>

OsmAnd/src/net/osmand/plus/AppInitializer.java

@@ -392,7 +392,6 @@ public class AppInitializer implements IProgress {
 			initNativeCore();
 			notifyEvent(InitEvents.NATIVE_INITIALIZED);
 
-			
 			app.poiFilters.reloadAllPoiFilters();
 			notifyEvent(InitEvents.POI_TYPES_INITIALIZED);			
 			indexRegionsBoundaries(warnings);

OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java

@@ -208,14 +208,17 @@ public class PoiFiltersHelper {
 	public List<PoiLegacyFilter> getTopStandardFilters() {
 		if (cacheTopStandardFilters == null) {
 			cacheTopStandardFilters = new ArrayList<PoiLegacyFilter>();
-			PoiLegacyFilter filter = new PoiLegacyFilter(application.getString(R.string.poi_filter_custom_filter),
+
+			PoiLegacyFilter filter = new SearchByNameFilter(application);
+			filter.setStandardFilter(true);
+			cacheTopStandardFilters.add(filter);
+
+			filter = new PoiLegacyFilter(application.getString(R.string.poi_filter_custom_filter),
 					PoiLegacyFilter.CUSTOM_FILTER_ID, new LinkedHashMap<PoiCategory, LinkedHashSet<String>>(), application); //$NON-NLS-1$
 			filter.setStandardFilter(true);
 			cacheTopStandardFilters.add(filter);
+
 			cacheTopStandardFilters.add(new PoiLegacyFilter(null, application));
-			filter = new SearchByNameFilter(application);
-			filter.setStandardFilter(true);
-			cacheTopStandardFilters.add(filter);
 		}
 		return Collections.unmodifiableList(cacheTopStandardFilters);
 	}