Rename strings and delete unused

2016-07-31 19:22:02 +02:00 · 2016-07-31 19:22:02 +02:00 · 80fa1cd44d
commit 80fa1cd44d
parent f30a7e7874
83 changed files with 482 additions and 534 deletions
--- a/OsmAnd/res/values-af/strings.xml
+++ b/OsmAnd/res/values-af/strings.xml
@ -227,7 +227,7 @@
  <string name="user_name">Jou OSM gebruiker naam</string>
  <string name="open_street_map_login_descr">Vereis vir openstreetmap.org voorleggings</string>
  <string name="user_password">Jou OSM wagwoord</string>
-  <string name="user_password_descr">Vereis vir openstreetmap.org voorleggings</string>
+  
  <string name="osmand_service">Sluimertoestand Funksionaliteit</string>
  <string name="osmand_service_descr">Gebruik om OsmAnd aan te hou terwyl skerm af is</string>
  
@ -248,7 +248,7 @@
  <string name="init_native_library">Besig om inheemse biblioteek gereed te maak…</string>
  <string name="choose_auto_follow_route">Outo-senter kaart uitsig</string>
  <string name="choose_auto_follow_route_descr">Tyd tot kaart sal ooreenkom met die huidige posisie</string>
-  <string name="auto_follow_route_never">Nooit</string>
+  
  <string name="auto_follow_route_navigation">Outo-senter slegs navigasie</string>
  <string name="auto_follow_route_navigation_descr">Outo-senter kaart uitsig tydens navigasie.</string>
  <string name="auto_follow_location_enabled">Outo-senter kaart uitsig in gebruik.</string>
@ -455,7 +455,7 @@
  <string name="reading_cached_tiles">Lees gekaste teëls…</string>
  <string name="version_index_is_big_for_memory">Die indeks \"{0}\" pas nie in die geheue nie</string>
  <string name="version_index_is_not_supported">Die weergawe van indeks \"{0}\'\' word nie ondersteun nie</string>
-  <string name="use_osmand_routing_service">OsmAnd navigasie &gt;20km</string>
+  
  <string name="use_osmand_routing_service_descr">Gebruik OsmAnd aflyn navigasie diens van toepassing slegs op roetes &gt; 20 km (eksperimenteel)</string>
  <string name="osmand_routing_experimental">OsmAnd aflyn navigasie diens is \'n eksperimentele funksie en dit werk nie vir afstande van meer as ongeveer 20 km nie.\n\nNavigasie diens is tydelik oorgeskakel na aanlyn CloudMade.</string>
  <string name="specified_dir_doesnt_exist">Kan nie daardie adres vind nie.</string>
@ -541,13 +541,13 @@
  <string name="none_region_found">Geen aflyn inligting vir gebiede op SD-kaart gevind nie. Laai gebiede van die Internet af.</string>
  <string name="poi_namefinder_query_empty">Inset soektog navraag om interessante plek te vind</string>
  <string name="any_poi">Enige</string>
-  <string name="layer_transport_route">Vervoer roete</string>
+  
  <string name="thanks_yandex_traffic">Dankie aan Yandex vir verkeersinligting.</string>
  <string name="layer_yandex_traffic">Yandex verkeer</string>
  <string name="layer_route">Roete</string>
  <string name="shared_string_favorites">Gunstelinge</string>
  <string name="layer_osm_bugs">OSM foute</string>
-  <string name="layer_transport">Vervoer stilhouplekke</string>
+  
  <string name="layer_poi">Interessante plek…</string>
  <string name="layer_map">Kaartbron…</string>
  <string name="menu_layers">Kaarte</string>
@ -889,7 +889,7 @@
 	<string name="filterpoi_activity">Skep PVB filter</string>
 	<string name="select_navigation_mode">Kies vervoertipe</string>
 	<string name="day_night_info">Dag/nag inligting</string>
-	<string name="map_widget_day_night">Dag/nag kaart</string>
+	
 	<string name="map_widget_vector_attributes">Kaart voorstelling eienskappe:</string>
 	<string name="map_widget_renderer">Kaartvoorstelling-styl</string>
 	<string name="layer_map_appearance">Verstel skerm</string>
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="recording_context_menu_show">اظهر</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="recording_context_menu_show">اظهر</string>
    <string name="av_def_action_picture">التقط صورة</string>
    
    <string name="av_def_action_video">تسجيل الفيديو</string>
@ -423,7 +422,7 @@
 	<string name="select_navigation_mode">اختر نمط المواصلات</string>
 	<string name="day_night_info_description">الشروق: %1$s \nالغروب: %2$s</string>
 	<string name="day_night_info">معلومات اليوم والليلة</string>
-	<string name="map_widget_day_night">خريطة النهار والليل</string>
+	
 	<string name="map_widget_vector_attributes">سمات التقديم</string>
 	<string name="map_widget_renderer">نمط الخريطة</string>
 	
@ -553,7 +552,7 @@
 	<string name="general_settings">عام</string>
 	<string name="general_settings_descr">ضبط العرض والإعدادات العامة للتطبيق</string>
 	<string name="open_street_map_login_descr">مطلوب للمساهمة في openstreetmap.org</string>
-	<string name="user_password_descr">مطلوبة للمساهمة في openstreetmap.org</string>
+	
 	<string name="local_openstreetmap_uploading">يرفع …</string>
 	<string name="local_openstreetmap_uploadall">رفع الكل</string>
 	
@ -898,7 +897,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
 	<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_navigation">مركز صناعة السيارات الوحيد</string>
 	<string name="auto_follow_route_navigation_descr">التوسيط التلقائي لعرض الخريطة فقط أثناء الملاحة.</string>
 	<string name="auto_follow_location_enabled">توسيط عرض الخريطة تلقائيا مفعل.</string>
@ -1381,7 +1380,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
    <string name="everything_up_to_date">جميع الملفات محدّثة</string>
    <string name="use_opengl_render">استخدام OpenGL للتقديم</string>
    <string name="use_opengl_render_descr">"استخدام أداء OpenGL  مسرع (قد لا تعمل على بعض الأجهزة)"</string>
-    <string name="osmo_use_https_descr">استخدام اتصال أمن إلى الخادم</string>
+    
    <string name="osmo_use_https">استخدام HTTPS</string>
 	<string name="map_update">التحديثات متوفرة لـ %1$s من الخرائط</string>
 	<string name="search_for">البحث عن</string>
@ -1649,7 +1648,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
 	<string name="where_am_i">أين أنا؟</string>
 	
 	<string name="menu_layers">طبقات الخريطة</string>
-	<string name="layer_transport">مواقف وسائل النقل</string>
+	
 	<string name="layer_route">طريق</string>
 	<string name="filter_existing_indexes">محملة</string>
 	<string name="daynight">وضع نهاري/ليلي</string>
@ -1681,7 +1680,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
 	<string name="send_report">أرسل تقرير</string>
 	<string name="none_region_found">لا توجد أي بيانات بدون اتصال للمناطق والأقاليم على الذاكرة. قم بتحميل المناطق من الإنترنت.</string>
 	<string name="any_poi">أي</string>
-	<string name="layer_transport_route">طريق وسائل النقل</string>
+	
 	<string name="background_service_int_descr">حدد الفاصل الزمني للإيقاظ لخدمة الخلفية</string>
 	<string name="background_router_service_descr">تُشغل OsmAnd في الخلفية بحيث يتتبع موقعك أثناء إغلاق الشاشة</string>
 	<string name="off_router_service_no_gps_available">خدمة الملاحة في الخلفية تتطلب تفعيل مزود مواقع.</string>
@ -2345,7 +2344,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
    <string name="shared_string_others">آخرى</string>
    <string name="local_index_action_do">أنت على وشك %1$s %2$s عنصر. تواصل؟</string>
    <string name="amenity_type_geocache">جيوكاش</string>
-    <string name="use_osmand_routing_service">ملاحة OsmAnd &gt; كم20</string>
+    
    <string name="record_plugin_description">"هذا البرنامج المساعد يفعل وظائف لتسجيل وحفظ المسارات الخاصة بك عبر النقر على نافذة GPX على شاشة الخريطة، أو كذلك تسجيل كافة طرق الملاحة الخاص بك تلقائيا إلى ملف GPX.
 

@ -2359,7 +2358,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
 قد يكون عطل مؤقت في الخدمة أو تسجيلك انتهى.

 هل تريد المتابعة بتسجيل جديد؟</string>
-    <string name="use_osmand_routing_service_descr">استخدام OsmAnd للملاحة دون نت ينطبق فقط على الطرق &gt; 20 كم (تجريبي)</string>
+    
    <string name="osmand_routing_experimental">ملاحة OsmAnd دون نت ميزة تجريبية وهي لا تعمل لمسافات تزيد عن 20 كيلومترا.

 خدمة الملاحة حولت مؤقتا إلى CloudMade على الانترنت.</string>
@ -2410,4 +2409,4 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
    <string name="commiting_node">إنشاء نقطة…</string>
    <string name="converting_names">تحويل الأسماء باللغة المحلية/ الإنجليزية…</string>
    <string name="previous_run_crashed">الاقلاع الأخير للتطبيق فشل. ملف السجل في {0}. الرجاء الإبلاغ عن هذا المشكل وإرفاق ملف السجل.</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-az/strings.xml
+++ b/OsmAnd/res/values-az/strings.xml
@ -1,2 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources/>
--- a/OsmAnd/res/values-b+ast/strings.xml
+++ b/OsmAnd/res/values-b+ast/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
 	<string name="av_locations">Allugamientos</string>
 	<string name="plugin_settings">Complementos</string>
 	<string name="no_updates_available">Nun hai anovamientos disponibles</string>
@ -419,4 +418,4 @@
    <string name="route_via">Per:</string>
    <string name="route_from">Dende:</string>

-    </resources>
+    </resources>
--- a/OsmAnd/res/values-b+hsb/strings.xml
+++ b/OsmAnd/res/values-b+hsb/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
 <string name="app_mode_bus">Bus</string>
 	<string name="app_mode_train">Ćah</string>
    <string name="map_widget_battery">Staw baterije</string>
@ -689,7 +688,7 @@
    <string name="error_occurred_loading_gpx">Zmylk occurred while loading GPX</string>
    <string name="send_report">Rozprawu pósłać</string>
    <string name="any_poi">Wšě</string>
-    <string name="layer_transport_route">Linije zjawneho transporta</string>
+    
    <string name="layer_transport">Zastanišća</string>
    <string name="layer_map">Kartowe žórło…</string>
    <string name="menu_layers">Kartowe runiny</string>
@ -906,4 +905,4 @@
    <string name="storage_directory_card">Składowanska karta</string>
    <string name="coords_format">Format koordinatow</string>
    <string name="coords_format_descr">Format za geografiske koordinaty</string>
-</resources>
+</resources>
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="speak_pedestrian">Piešachodnyja pierachody</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="speak_pedestrian">Piešachodnyja pierachody</string>
    <string name="rendering_attr_roadStyle_name">Styl aŭtadaroh</string>
    <string name="rendering_value_default_name">Pa zmoŭčańnі</string>
    <string name="rendering_value_orange_name">Aranžavy</string>
@ -31,7 +30,7 @@
    <string name="use_opengl_render_descr">Vykarystoŭvać aparatnaje paskareńnie OpenGL (moža nie pracavać na niekatorych prystasavańniach)</string>
    <string name="error_avoid_specific_road">Abjezd nie znojdzieny</string>
    <string name="home_button">Damoŭ</string>
-    <string name="osmo_use_https_descr">Vykarystoŭvać biaśpiečnaje zlučeńnie z siervieram</string>
+    
    <string name="osmo_use_https">Vykarystoŭvać HTTPS</string>
 	
 	<string name="map_update">Jość abnaŭleńnі dla %1$s mapaŭ</string>
@ -724,7 +723,7 @@
 	<string name="day_night_info_description">Uzychod: %1$s
 \nZachod: %2$s</string>
 	<string name="day_night_info">Uzychod/zachod</string>
-	<string name="map_widget_day_night">Režym dzień/noč</string>
+	
 	<string name="map_widget_renderer">Styl mapy</string>
 	<string name="layer_map_appearance">Skanfіhuravać ekran</string>
 	<string name="show_lanes">Pakazvać pałosy ruchu</string>
@ -989,7 +988,7 @@
 	<string name="user_name">Vašaje іmia karystalnіka OSM</string>
 	<string name="open_street_map_login_descr">Patrebna dla pradstaŭleńnia ŭ openstreetmap.org</string>
 	<string name="user_password">Vaš parol OSM</string>
-	<string name="user_password_descr">Patrebna dlia pradstaŭlieńnia ŭ openstreetmap.org</string>
+	
 	<string name="osmand_service">Fonavy režym</string>
 	<string name="osmand_service_descr">OsmAnd pracuje ŭ fonie padčas vyklučanaha ekranu</string>
 	
@ -1007,7 +1006,7 @@
 	<string name="init_native_library">Іnіcyalizacyja svojskіch bіblijatek…</string>
 	<string name="choose_auto_follow_route">Aŭtamatyčnaje centravańnie mapy</string>
 	<string name="choose_auto_follow_route_descr">Čas, praz jakі mapa vierniecca da biahučaha stanovіšča</string>
-	<string name="auto_follow_route_never">Nіkolі</string>
+	
 	<string name="keep_informing_never">Tolkі ŭručnuju (nacіskać na strełku)</string>
    <string name="keep_informing_descr">Paŭtarać navіhacyjnyja іnstrukcyі praz rehularnyja pramiežkі času</string>
    <string name="keep_informing">Paŭtarać navіhacyjnyja іnstrukcyі</string>
@ -1212,7 +1211,7 @@
 	<string name="reading_cached_tiles">Čytańnie zachavanych frahmentaŭ…</string>
 	<string name="version_index_is_big_for_memory">Niedastatkova pamiacі dla lakalnaj mapy \'\'{0}\'\'</string>
 	<string name="version_index_is_not_supported">Viersіja іndeksa \'\'{0}\'\' nie padtrymlivajecca</string>
-	<string name="use_osmand_routing_service">Navіhacyja OsmAnd &gt; 20 km</string>
+	
 	<string name="use_osmand_routing_service_descr">Vykarystoŭvać aŭtanomnuju OsmAnd navіhacyju na adlehłaścі &gt; 20 km (eksperymientalnaja)</string>
 	<string name="osmand_routing_experimental">Aŭtanomnaja navіhacyja OsmAnd źjaŭlajecca eksperymientalnaj і nie pracuje na adlehłaściach bolš za 20 km.\n\nU hetym vypadku dla prakładkі maršrutu vykarystoŭvajecca onłajn servіs CloudMade.</string>
 	<string name="specified_dir_doesnt_exist">Ukazany katałoh nie znojdzieny.</string>
@ -1300,13 +1299,13 @@
 	<string name="none_region_found">Na SD-karcie nie znojdziena lakalnych dadzienych dla rehіjonaŭ. Ściahnuć rehіjony z Іnternetu.</string>
 	<string name="poi_namefinder_query_empty">Uviadzіcie zapyt dla pošuku POI</string>
 	<string name="any_poi">Usie</string>
-	<string name="layer_transport_route">Maršrut transpartu</string>
+	
 	<string name="thanks_yandex_traffic">Dziakuj Jandeksu za darožnuju іnfarmacyju.</string>
 	<string name="layer_yandex_traffic">Jandeks zatory</string>
 	<string name="layer_route">Maršrut</string>
 	<string name="shared_string_favorites">Upadabanyja</string>
 	<string name="layer_osm_bugs">OSM Zaŭvahі (onłajn)</string>
-	<string name="layer_transport">Prypynkі transpartu</string>
+	
 	<string name="layer_poi">POI…</string>
 	<string name="layer_map">Krynіca mapy…</string>
 	<string name="menu_layers">Słaі mapy</string>
@ -2167,4 +2166,4 @@
    <string name="number_of_edits">Kolkaść pravak</string>
    <string name="reports_for">Paviedamіć</string>
    <string name="file_name_containes_illegal_char">Nazva fajłu źmiaščaje niedapuščalny symbal</string>
-</resources>
+</resources>
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@ -551,7 +551,7 @@
 	<string name="poi_internet_cafe">Інтэрнэт-кафэ</string>

 	<string name="poi_bank">Банк</string>
-	<string name="poi_atm">Банкамат</string>
+	<string name="poi_amenity_atm">Банкамат</string>
 	<string name="poi_money_lender">Ліхвяр</string>
 	<string name="poi_pawnbroker">Лямбард</string>
 	<string name="poi_bureau_de_change">Абмен валют</string>
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="auto_zoom_none">Без аўтаматычнага маштабаваньня</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="auto_zoom_none">Без аўтаматычнага маштабаваньня</string>
    <string name="auto_zoom_close">Буйней</string>
    <string name="auto_zoom_far">Для сярэдняга маштаба</string>
    <string name="auto_zoom_farthest">Драбней</string>
@ -274,7 +273,7 @@
 	<string name="select_navigation_mode">Выберыце від транспарту</string>
 	<string name="day_night_info_description">Узыход: %1$s \nЗаход: %2$s</string>
 	<string name="day_night_info">Узыход/заход</string>
-	<string name="map_widget_day_night">Рэжым дзень/ноч</string>
+	
 	<string name="map_widget_vector_attributes">Налады адмалёўкі</string>
 	<string name="map_widget_renderer">Стыль мапы</string>
 	
@ -542,7 +541,7 @@
 	<string name="user_name">Вашае імя карыстальніка OSM</string>
 	<string name="open_street_map_login_descr">Патрэбна для прадстаўленьня ў openstreetmap.org</string>
 	<string name="user_password">Ваш пароль OSM</string>
-	<string name="user_password_descr">Патрэбна для прадстаўленьня ў openstreetmap.org</string>
+	
 	<string name="osmand_service">Фонавы рэжым</string>
 	<string name="osmand_service_descr">OsmAnd працуе ў фоне падчас выключанага экрану</string>
 	
@ -562,7 +561,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_navigation">Аўтаматычнае цэнтраваньне толькі падчас навігацыі</string>
 	<string name="auto_follow_route_navigation_descr">Аўтаматычнае цэнтраваньне толькі падчас навігацыі.</string>
 	<string name="auto_follow_location_enabled">Аўтаматычнае цэнтраваньне падчас карыстаньня.</string>
@ -758,7 +757,7 @@
 	<string name="reading_cached_tiles">Чытаньне захаваных фрагмэнтаў…</string>
 	<string name="version_index_is_big_for_memory">Недастаткова памяці для лякальнай мапы \'\'{0}\'\'</string>
 	<string name="version_index_is_not_supported">Версія індэкса \'\'{0}\'\' не падтрымліваецца</string>
-	<string name="use_osmand_routing_service">Навігацыя OsmAnd &gt; 20 км</string>
+	
 	<string name="use_osmand_routing_service_descr">Выкарыстоўваць аўтаномную OsmAnd навігацыю на адлегласьці &gt; 20 км (экспэрыментальная)</string>
 	<string name="osmand_routing_experimental">Аўтаномная навігацыя OsmAnd зьяўляецца экспэрыментальнай і не працуе на адлегласьцях больш за 20 км.\n\nУ гэтым выпадку для пракладкі маршруту выкарыстоўваецца онлайн сэрвіс CloudMade.</string>
 	<string name="specified_dir_doesnt_exist">Указаны каталог не знойдзены.</string>
@ -837,12 +836,12 @@
 	<string name="none_region_found">На SD-карце не знойдзена лякальных дадзеных для рэгіёнаў. Сьцягнуць рэгіёны з Інтэрнэту.</string>
 	<string name="poi_namefinder_query_empty">Увядзіце запыт для пошуку POI</string>
 	<string name="any_poi">Усе</string>
-	<string name="layer_transport_route">Маршрут транспарту</string>
+	
 	<string name="thanks_yandex_traffic">Дзякуй Яндэксу за дарожную інфармацыю.</string>
 	<string name="layer_yandex_traffic">Яндэкс заторы</string>
 	<string name="layer_route">Маршрут</string>
 	<string name="layer_osm_bugs">OSM Заўвагі (онлайн)</string>
-	<string name="layer_transport">Прыпынкі транспарту</string>
+	
 	<string name="layer_poi">POI…</string>
 	<string name="layer_map">Крыніца мапы…</string>
 	<string name="menu_layers">Слаі мапы</string>
@ -1536,7 +1535,7 @@
    <string name="wake_on_voice_descr">Уключаць экран прыстасаваньня пры набліжэньні да павароту</string>
    <string name="lock_screen_request_explanation">%1$s патрабуе дазвол на выключэньне экрану для энергазберажэньня.</string>
    
-	<string name="osmo_use_https_descr">Выкарыстоўваць бясьпечнае злучэньне з серверам</string>
+	
    <string name="osmo_use_https">Выкарыстоўваць HTTPS</string>
 	<string name="home_button">Дамоў</string>
    <string name="map_update">Ёсьць абнаўленьні для %1$s мапаў</string>
@ -2234,4 +2233,4 @@
    <string name="lang_hsb">верхнелужыцкая</string>
    <string name="search_categories">Катэгорыі</string>
    <string name="postcode">Паштовы індэкс</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-bg/strings.xml
+++ b/OsmAnd/res/values-bg/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
    <string name="osb_author_or_password_not_specified">Моля, въведете потребителско име и парола за сайта на OSM</string>
    <string name="clear_intermediate_points">Изчистване на междинните точки</string>
    <string name="keep_intermediate_points">Запази междинните точки</string>
@ -250,7 +249,7 @@
    <string name="select_navigation_mode">Изберете режим на придвижване</string>
    <string name="day_night_info_description">Изгрев: %1$s \nЗалез: %2$s</string>
    <string name="day_night_info">Информация за изгрев и залез</string>
-    <string name="map_widget_day_night">Дневна/нощна карта</string>
+    
    <string name="map_widget_vector_attributes">Опции за изчертаване</string>
    <string name="map_widget_renderer">Стил на картата</string>

@ -523,7 +522,7 @@
    <string name="user_name">Вашето потребителско име в OSM</string>
    <string name="open_street_map_login_descr">Необходимо за изпращане към openstreetmap.org</string>
    <string name="user_password">Вашата парола в OSM</string>
-    <string name="user_password_descr">Необходима за изпращане на данни към openstreetmap.org</string>
+    
    <string name="osmand_service">Фонов режим</string>
    <string name="osmand_service_descr">OsmAnd работи във фонов режим, докато на екранът е изключен</string>

@ -537,7 +536,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_navigation">Автоматично центриране само при навигация</string>
    <string name="auto_follow_route_navigation_descr">Автоматично центриране само по време на навигация.</string>
    <string name="auto_follow_location_enabled">Автоматичното центриране е включено.</string>
@ -734,7 +733,7 @@
    <string name="reading_cached_tiles">Зареждане на запазените фрагменти…</string>
    <string name="version_index_is_big_for_memory">Индексът \'\'{0}\'\' не се побира в паметта</string>
    <string name="version_index_is_not_supported">Версията на индекса \'\'{0}\'\' не се поддържа</string>
-    <string name="use_osmand_routing_service">OsmAnd навигация &gt;20км</string>
+    
    <string name="use_osmand_routing_service_descr">Ползвайте офлайн навигацията OsmAnd за дистанции &gt; 20 km (пробна версия)</string>
    <string name="osmand_routing_experimental">Офлайн навигацията на OsmAnd е пробна версия и не работи пълноценно на дистанции по-големи от 20км.\n\nУслугата за навигация временно е превключена на онлайн от CloudMade.</string>
    <string name="specified_dir_doesnt_exist">Посочената папка не може да бъде намерена.</string>
@ -817,13 +816,13 @@
    <string name="none_region_found">На SD картата няма данни за този район. Свалете от интернет.</string>
    <string name="poi_namefinder_query_empty">Въведете израз за търсене на забележителност</string>
    <string name="any_poi">Всички</string>
-    <string name="layer_transport_route">Маршрут на общ.транспорт</string>
+    
    <string name="thanks_yandex_traffic">Информацията за трафика е любезно предоставена от Яндекс.</string>
    <string name="layer_yandex_traffic">Яндекс трафик</string>
    <string name="layer_route">Маршрут</string>
    <string name="shared_string_favorites">Любими места</string>
    <string name="layer_osm_bugs">OSM бележки (онлайн)</string>
-    <string name="layer_transport">Спирки на общ. транспорт</string>
+    
    <string name="layer_poi">POI…</string>
    <string name="layer_map">Източници на карти…</string>
    <string name="menu_layers">Слоеве</string>
@ -1519,7 +1518,7 @@
    <string name="use_opengl_render_descr">Използване на хардуерно ускорено OpenGL изчертаване (възможно е да не работи на някои устройства)</string>
    <string name="error_avoid_specific_road">Няма намерен заобиколен път</string>
    <string name="home_button">Начало</string>
-    <string name="osmo_use_https_descr">Използвайте защитена връзка към сървър</string>
+    
    <string name="osmo_use_https">Използване на HTTPS</string>
    <string name="coordinates">Координати</string>
    <string name="anonymous_user_hint">"Анонимен потребител не може  да:\n-създава групи;\n-синхронизира групи и устройства със сървъра;\n-управлява групи и устройства в частен режим."</string>
@ -2138,4 +2137,4 @@
    <string name="map_widget_magnetic_bearing">Посока по магнитния компас</string>
    <string name="map_widget_bearing">Относителна посока</string>
    <string name="access_disable_offroute_recalc">Маршрутът да не се променя, когато сте извън пътя</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@ -671,7 +671,7 @@
 	<string name="poi_mortuary">Dipòsit de cadàvers</string>
 	<string name="poi_crematorium">Crematori</string>
 	<string name="poi_bank">Banc</string>
-	<string name="poi_atm">Caixer automàtic</string>
+	<string name="poi_amenity_atm">Caixer automàtic</string>
 	<string name="poi_accountant">Comptable</string>
 	<string name="poi_bitcoin_yes">Pagament amb bitcoins</string>

--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>

    <string name="show_warnings_title">Mostra alertes…</string>
    <string name="map_widget_fluorescent">Rutes amb fluorescència</string>
@ -191,7 +190,7 @@ Ara mateix hi ha {2} MB d\'espai lliure."</string>
    <string name="local_openstreetmap_settings">PDIs/Notes d\'OSM desades localment</string>
    <string name="local_openstreetmap_settings_descr">Mostra i gestiona els PDI/notes d\'OSM de la base de dades local</string>
    <string name="day_night_info">Informació de dia/nit</string>
-    <string name="map_widget_day_night">Mapa dia/nit</string>
+    
    <string name="show_lanes">Carrils</string>
    <string name="avoid_ferries">Evita els ferris</string>
    <string name="avoid_in_routing_descr">Evita les carreteres de peatge, les no pavimentades i els ferris</string>
@ -210,7 +209,7 @@ Ara mateix hi ha {2} MB d\'espai lliure."</string>
    <string name="index_name_tts_voice">Indicadors de veu (sintetitzats amb TTS, recomanat)</string>
    <string name="native_library_not_supported">La llibreria nativa no està suportada en aquest dispositiu.</string>
    <string name="init_native_library">S\'està inicialitzant la llibreria nativa…</string>
-    <string name="auto_follow_route_never">Mai (premeu &lt;&lt;Anar&gt;&gt;  per iniciar la navegació manualment)</string>
+    
    <string name="pref_vector_rendering">Opcions específiques de renderització dels vectors</string>
    <string name="delete_confirmation_msg">Voleu suprimir %1$s?</string>
    <string name="city_type_town">Poble</string>
@ -253,7 +252,7 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
    <string name="switch_to_raster_map_to_see">No s\'ha trobat cap mapa de vectors fora de línia per aquesta localització. Podeu baixar-ne un a Configuració (Gestió de fitxers de mapes) o canviar per utilitzar mapes en línia (cal activar el connector de mapes en línia per fer-ho).</string>
    <string name="global_app_settings">Paràmetres globals de l\'aplicació</string>
    <string name="open_street_map_login_descr">És necessari per a les trameses a openstreetmap.org</string>
-    <string name="user_password_descr">És necessària per a les trameses a openstreetmap.org</string>
+    
    <string name="old_poi_file_should_be_deleted">El fitxer de dades de PDI «%1$s» és redundant i serà suprimit.</string>
    <string name="search_position_favorites">Preferits…</string>
    <string name="search_position_map_view">Centre del mapa actual</string>
@ -587,7 +586,7 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
    <string name="foot">peu</string>
    <string name="km">km</string>
    <string name="poi_filter_food_shop">Alimentació</string>
-    <string name="use_osmand_routing_service">Navegacio d\'OsmAnd&gt;20Km</string>
+    
    <string name="osmand_net_previously_installed">Ja hi ha una versió prèvia d\'OsmAnd instal·lada. Totes les dades locals es mantindran en la nova aplicació excepte els punts preferits, que s\'han d\'exportar des la versió vella i després importar-los a la nova.</string>
    <string name="install_selected_build">Voleu instal·lar OsmAnd - {0} de {1} {2} MB ?</string>
    <string name="gps_status_app_not_found">L\'aplicació GPS status no està instal·lada. Voleu cercar-la al Market?</string>
@ -704,7 +703,7 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
    <string name="gpxup_trackable">Seguible</string>
    <string name="search_offline_geo_error">No s\'ha pogut analitzar la geo intenció «%s»</string>
    <string name="amenity_type_geocache">Geocerca</string>
-    <string name="use_osmand_routing_service_descr">L\'us de la navagacio fora de línia d\'OsmAnd s\'aplica nomes a rutes &gt; 20km (experimental)</string>
+    
    <string name="btn_advanced_mode">Mode avançat…</string>
    <string name="poi_filter_parking">Aparcament</string>
    <string name="poi_filter_public_transport">Transport públic</string>
@ -719,7 +718,7 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
    <string name="transport_searching_transport">Resultats de transport (cap destí):</string>
    <string name="transport_searching_route">Resultats de transport ({0} al destí):</string>
    <string name="map_route_by_gpx">Navega utilitzant un GPX</string>
-    <string name="layer_transport_route">Ruta de transport</string>
+    
    <string name="layer_transport">Parades de transport</string>
    <string name="voice_data_unavailable">Les dades de veu seleccionades no estan disponibles</string>
    <string name="search_poi_location">Cercant senyal…</string>
@ -1662,7 +1661,7 @@ Les rutes enregistrades es poden compartir amb els vostres amics o aportar-les p
    <string name="wake_on_voice_descr">Activa la pantalla del dispositiu (si no ho està) en aproximar-se a un gir</string>
    <string name="lock_screen_request_explanation">"%1$s necessita  aquest permís per la funcionalitat de posar la pantalla en mode d\'estalvi d\'energia."</string>
    <string name="shared_string_never">Mai</string>
-    <string name="osmo_use_https_descr">Utilitzeu una connexió segura al servidor</string>
+    
    <string name="osmo_use_https">Utilitzeu HTTPS</string>
    <string name="home_button">Inici</string>
    <string name="search_for">Cerca per</string>
@ -2242,7 +2241,7 @@ Twitter: https://twitter.com/osmandapp Facebook: https://www.facebook.com/osmand
 Si us cal ajut per l\'aplicació OsmAnd, contacteu amb el nostre equip de suport: support@osmand.net. 
 "</string>
    <string name="show_polygons">Mostra els polígons</string>
-    <string name="underlay_transparency">Transparència de la capa inferior</string>
+    
    <string name="find_parking">Troba aparcament</string>
    <string name="rendering_attr_showMtbRoutes_name">Mostra les rutes BTT</string>
    <string name="shared_string_reverse_order">Inverteix l\'ordre</string>
@ -2370,7 +2369,7 @@ Cas que aprecieu OsmAnd  i OSM i vulgueu ajudar-los, és una via perfecta per fe
 	<string name="app_mode_train">Tren</string>
    <string name="coords_format">Format de coordenades</string>
    <string name="coords_format_descr">Format de les coordenades geogràfiques</string>
-	<string name="shared_string_open_24_7">Obert 24h/7d</string>
+	
    <string name="storage_directory_card">Tarja de memòria</string>
    <string name="shared_string_is_open">Obert ara mateix</string>
    <string name="shared_string_is_open_24_7">Obert 24h/7d</string>
@ -2408,4 +2407,4 @@ Cas que aprecieu OsmAnd  i OSM i vulgueu ajudar-los, és una via perfecta per fe
    <string name="coords_search">Cerca per coordenades</string>
    <string name="advanced_coords_search">Cerca avançada per coordenades</string>
    <string name="route_stops_before">Queden %1$s parades</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-cs/phrases.xml
+++ b/OsmAnd/res/values-cs/phrases.xml
@ -170,7 +170,7 @@
 	<string name="poi_mortuary">Márnice</string>
 	<string name="poi_crematorium">Krematorium</string>
 	<string name="poi_bank">Banka</string>
-	<string name="poi_atm">Bankomat</string>
+	<string name="poi_amenity_atm">Bankomat</string>
 	<string name="poi_accountant">Účetní</string>
 	<string name="poi_saddle">Sedlo</string>
 	<string name="poi_volcano">Vulkán</string>
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>

    <string name="switch_to_raster_map_to_see">Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Spravovat mapové soubory), nebo se přepněte na online mapy.</string>
    <string name="send_files_to_osm">Nahrát GPX soubory do OSM?</string>
@ -115,7 +114,7 @@
    <string name="user_name">Jméno uživatele</string>
    <string name="open_street_map_login_descr">Vaše uživatelské jméno na openstreetmap.org</string>
    <string name="user_password">Heslo</string>
-    <string name="user_password_descr">Vaše heslo na openstreetmap.org</string>
+    
    <string name="osmand_service">Služba na pozadí</string>
    <string name="osmand_service_descr">Umožní běh aplikace při vypnutém displeji</string>
    <string name="download_files_not_enough_space">Nedostatek místa pro stažení %1$s MB dat (volné: %2$s).</string>
@ -127,7 +126,7 @@ Nyní je k dispozici {2} MB.</string>
    <string name="init_native_library">Inicializuji Android native library…</string>
    <string name="choose_auto_follow_route">Automatické centrování</string>
    <string name="choose_auto_follow_route_descr">Zadejte interval pro automatické vrácení mapy na vaši pozici</string>
-    <string name="auto_follow_route_never">Nikdy (klepnout na \'Start\' pro spuštění pokynů)</string>
+    
    <string name="auto_follow_route_navigation">Automatické sledování pozice</string>
    <string name="auto_follow_route_navigation_descr">Zapnout automatické sledování pozice pouze v režimu navigace.</string>
    <string name="auto_follow_location_enabled">Automatické sledování pozice je zapnuto.</string>
@ -315,7 +314,7 @@ Nyní je k dispozici {2} MB.</string>
    <string name="add_waypoint_dialog_added">Cíl \'\'{0}\'\' byl přidán</string>
    <string name="add_waypoint_dialog_title">Přidat bod na zaznamenávanou GPX trasu</string>
    <string name="context_menu_item_add_waypoint">Přidat bod na GPX trasu</string>
-    <string name="use_osmand_routing_service">Navigace OsmAnd &gt;20km</string>
+    
    <string name="use_osmand_routing_service_descr">Používat offline navigaci pro dlouhé vzdálenosti (experimentální)</string>
    <string name="osmand_routing_experimental">Offline navigace je experimentální a funguje jen pro vzdálenosti do 20 km.\n\nNavigační služba je dočasně přepnuta na online CloudMade.</string>
    <string name="specified_dir_doesnt_exist">Nemohu najít zadaný adresář.</string>
@ -390,13 +389,13 @@ Nyní je k dispozici {2} MB.</string>
    <string name="none_region_found">Na SD kartě nejsou žádná offline data pro oblasti. Zkuste nějaké stáhnout z internetu.</string>
    <string name="poi_namefinder_query_empty">Zadejte dotaz na POI</string>
    <string name="any_poi">Jakýkoli</string>
-    <string name="layer_transport_route">Trasa hromadné dopravy</string>
+    
    <string name="thanks_yandex_traffic">Děkujeme Yandexu za dopravní informace.</string>
    <string name="layer_yandex_traffic">Yandex doprava</string>
    <string name="layer_route">Cesta</string>
    <string name="shared_string_favorites">Oblíbené</string>
    <string name="layer_osm_bugs">OSM Poznámky (online)</string>
-    <string name="layer_transport">Zastávky</string>
+    
    <string name="layer_poi">POI…</string>
    <string name="layer_map">Zdroj map…</string>
    <string name="menu_layers">Mapová data</string>
@ -812,7 +811,7 @@ Proporcionální paměť %4$s MB (Limit Androidu %5$s MB, Dalvik %6$s MB).</stri
    <string name="filterpoi_activity">Vytvořit filtr pro POI</string>
    <string name="select_navigation_mode">Vyberte způsob dopravy</string>
    <string name="day_night_info">Denní/noční info</string>
-    <string name="map_widget_day_night">Denní/noční režim</string>
+    
    <string name="map_widget_renderer">Vektorový vykreslovač</string>
    <string name="avoid_motorway">Vyhnout se dálnicím</string>
    <string name="snap_to_road_descr">Zachytí kurzor na nejbližší silnici/cestu během navigace</string>
@ -1480,7 +1479,7 @@ Zaznamenávané trasy můžete sdílet s vašimi přáteli nebo mohou být použ
    <string name="lock_screen_request_explanation">%1$s potřebuje tato oprávnění pro vypnutí obrazovky při režimu šetření energie.</string>
    <string name="shared_string_never">Nikdy</string>
    <string name="home_button">Domovská obrazovka</string>
-    <string name="osmo_use_https_descr">Použít zabezpečené spojení se serverem</string>
+    
    <string name="osmo_use_https">Použít HTTPS</string>
    <string name="map_update">K dispozici aktualizace pro %1$s map</string>
    <string name="search_for">Hledat</string>
@ -2160,4 +2159,4 @@ V současnosti je k dispozici {2} MB.</string>
    <string name="dist_away_from_my_location">Hledat do vzdálenosti %1$s</string>
    <string name="show_on_map">Zobrazit na mapě</string>
    <string name="share_history_subject">" sdílené přes OsmAnd"</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-cy/strings.xml
+++ b/OsmAnd/res/values-cy/strings.xml
@ -80,7 +80,7 @@

 <string name="day_night_info_description">Sunrise : %1$s \nSunset : %2$s</string>
 <string name="day_night_info">Dydd/nos info</string>
-<string name="map_widget_day_night">Dydd/nos map</string>
+
 <string name="map_widget_vector_attributes">Priodoleddau Rendro:</string>
 <string name="map_widget_renderer">Arddull rendro</string>

--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@ -507,7 +507,7 @@
        <string name="poi_internet_cafe">Internet cafe</string>

        <string name="poi_bank">Bank</string>
-        <string name="poi_atm">Hæveautomat</string>
+        <string name="poi_amenity_atm">Hæveautomat</string>
        <string name="poi_money_lender">Pengeudlåner</string>
        <string name="poi_pawnbroker">Pantelåner</string>
        <string name="poi_bureau_de_change">Vekselkontor</string>
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
    <string name="srtm_paid_version_msg">Overvej at købe Højdekurve udvidelsen (\'Contour lines\') på Google Play for at støtte den videre udvikling.</string>
    <string name="av_def_action_video">Optag video</string>
    <string name="av_def_action_audio">Optag audio</string>
@ -152,7 +151,7 @@
 	<string name="day_night_info_description">Solopgang: %1$s
 \nSolnedgang: %2$s</string>
    <string name="day_night_info">Dag/nat information</string>
-    <string name="map_widget_day_night">Dag-/natkort</string>
+    
    <string name="map_widget_vector_attributes">Optegningsattributter</string>
    <string name="map_widget_renderer">Kortformat</string>

@ -430,7 +429,7 @@ Både placering og tid er synlige på betjeningspanel samt i modul på kortskær
    <string name="user_name">OSM-brugernavn</string>
    <string name="open_street_map_login_descr">Nødvendige for ændringer i openstreetmap.org</string>
    <string name="user_password">OSM-kodeord</string>
-    <string name="user_password_descr">Nødvendig for ændringer i openstreetmap.org</string>
+    
    <string name="osmand_service">Baggrundstilstand</string>
    <string name="osmand_service_descr">OsmAnd kører i baggrunden, mens skærmen er slukket</string>

@ -449,7 +448,7 @@ I øjeblikket er {2} MB til rådighed.</string>
    <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 \'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>
@ -796,7 +795,7 @@ Nogle af de centrale funktioner:
    <string name="reading_cached_tiles">Læser cachelagrede kortfliser…</string>
    <string name="version_index_is_big_for_memory">Ikke nok hukommelse for indeks \'{0}\'</string>
    <string name="version_index_is_not_supported">Versionen af indeks \'{0}\' er ikke understøttet</string>
-    <string name="use_osmand_routing_service">OsmAnd navigation &gt;20km</string>
+    
    <string name="use_osmand_routing_service_descr">Brug af OsmAnd offline navigation gælder kun ruter &gt; 20 km (eksperimentel)</string>
    <string name="specified_dir_doesnt_exist">Kan ikke finde den angivne mappe.</string>
    <string name="application_dir">Datalagringsmappe</string>
@ -879,12 +878,12 @@ Nogle af de centrale funktioner:
    <string name="none_region_found">Ingen offline-data for regionen er fundet på SD-kortet. Hent regioner fra internettet.</string>
    <string name="poi_namefinder_query_empty">Angiv søgetekst for at finde interessepunkt</string>
    <string name="any_poi">Alle</string>
-    <string name="layer_transport_route">Transportrute</string>
+    
    <string name="thanks_yandex_traffic">Tak til Yandex for trafikinformation.</string>
    <string name="layer_yandex_traffic">Yandex trafik</string>
    <string name="layer_route">Rute</string>
    <string name="layer_osm_bugs">OSM noter (online)</string>
-    <string name="layer_transport">Stoppesteder</string>
+    
    <string name="layer_map">Vælg kortkilde…</string>
    <string name="menu_layers">Kortlag</string>
    <string name="context_menu_item_search_poi">Søg interessepunkt</string>
@ -1730,7 +1729,7 @@ Optagede spor kan deles med venner eller anvendes til OSM bidrag. Sportsfolk kan
    <string name="wake_on_voice_descr">Tænd for skærmen (hvis slukket) ved navigationsinstruktioner</string>
    <string name="lock_screen_request_explanation">%1$s behøver denne tilladelse til at slukke for skærmen for strømbesparende funktion.</string>

-    <string name="osmo_use_https_descr">Brug sikker forbindelse til server</string>
+    
    <string name="osmo_use_https">Brug HTTPS</string>
    <string name="home_button">Hjem</string>
    <string name="search_for">Søg efter</string>
@ -2371,9 +2370,9 @@ Optagede spor kan deles med venner eller anvendes til OSM bidrag. Sportsfolk kan
    <string name="shared_string_save_changes">Gem ændringer</string>
    <string name="find_parking">Find parkering</string>
    <string name="show_polygons">Vis polygoner</string>
-    <string name="underlay_transparency">Underlejringsgennemsigtighed</string>
+    
    <string name="rendering_attr_showMtbRoutes_name">Vis MTB ruter</string>
-    <string name="show_map_markers">Kortmarkører</string>
+    
    <string name="show_map_markers_description">Aktivér kortmarkører</string>
    <string name="clear_active_markers_q">Fjern alle aktive markører?</string>
    <string name="clear_markers_history_q">Slet kortmarkørhistoriken?</string>
@ -2385,7 +2384,7 @@ Optagede spor kan deles med venner eller anvendes til OSM bidrag. Sportsfolk kan
    <string name="consider_turning_polygons_off">Det anbefales at deaktivere optegning af polygoner.</string>
    <string name="add_points_to_map_markers_q">Skal alle punkter tilføjes til kortmarkører?</string>
    <string name="shared_string_add_to_map_markers">Tilføj til kortmarkører</string>
-    <string name="show_map_markers_topbar">Vis kortmarkører topbar</string>
+    
    <string name="map_marker_1st">Første kortmarkør</string>
    <string name="map_marker_2nd">Anden kortmarkør</string>
    <string name="shared_string_toolbar">Værktøjslinie</string>
@ -2515,7 +2514,7 @@ Hvis du er fan af OsmAnd og OSM og ønsker at støtte dem, er dette en perfekt m
    <string name="coords_format">Koordinatformat</string>
    <string name="coords_format_descr">Format for geografiske koordinater</string>
  	<string name="storage_directory_card">Hukommelseskort</string>
-	<string name="shared_string_open_24_7">Åben 24/7</string>
+	
    <string name="shared_string_is_open">Åben nu</string>
    <string name="shared_string_is_open_24_7">Åben 24/7</string>
    <string name="map_widget_search">Søg</string>
@ -2555,4 +2554,4 @@ Hvis du er fan af OsmAnd og OSM og ønsker at støtte dem, er dette en perfekt m
    <string name="coords_search">Søg på koordinater</string>
    <string name="advanced_coords_search">Avanceret søg på koordinater</string>
    <string name="route_stops_before">%1$s stopper inden</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@ -35,7 +35,7 @@
 	<string name="poi_artwork">Kunstwerk</string>
 	<string name="poi_astronomical_observatory">Observatorium</string>
 	<string name="poi_athletics">Sport</string>
-	<string name="poi_atm">Geldautomat</string>
+	<string name="poi_amenity_atm">Geldautomat</string>
 	<string name="poi_attraction">Attraktion</string>
 	<string name="poi_atv">Quad-Geschäft</string>
 	<string name="poi_audiologist">Gehörspezialist</string>
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
    <string name="osmand_plus_extended_description_4000_chars_v2">
 OsmAnd Maps &amp; Navigation - Orte finden und Routen berechnen ohne Interbetverbindung. Dazu einfach Landkarten für beliebuge Länder herunterladen, bevor man sich auf Reisen begibt.

@ -390,7 +389,7 @@ Karten-Kacheln können direkt online bezogen werden, und werden im OsmAnd-Untero
 	<string name="user_name">OSM-Benutzername</string>
 	<string name="open_street_map_login_descr">Benötigt für openstreetmap.org-Beiträge</string>
 	<string name="user_password">OSM-Kennwort</string>
-	<string name="user_password_descr">Benötigt für openstreetmap.org-Beiträge</string>
+	
 	<string name="osmand_service">Hintergrunddienst</string>
 	<string name="osmand_service_descr">OsmAnd läuft bei ausgeschalteter Anzeige im Hintergrund</string>

@ -403,7 +402,7 @@ Aktuell sind {2} MB verfügbar.</string>
 	<string name="init_native_library">Native Bibliothek wird initialisiert…</string>
 	<string name="choose_auto_follow_route">Kartenanzeige nachführen</string>
 	<string name="choose_auto_follow_route_descr">Wartezeit für Rückkehr zur Kartennachführung</string>
-	<string name="auto_follow_route_never">Nie (Auf \'Los\' tippen, um die Navigation manuell zu starten)</string>
+	
 	<string name="auto_follow_route_navigation">Nachführung nur bei aktiver Navigation</string>
 	<string name="auto_follow_route_navigation_descr">Kartennachführung erfolgt nur während Navigation.</string>
 	<string name="auto_follow_location_enabled">Kartennachführung aktiv.</string>
@ -600,7 +599,7 @@ Aktuell sind {2} MB verfügbar.</string>
 	<string name="reading_cached_tiles">Lese zwischengespeicherte Kacheln…</string>
 	<string name="version_index_is_big_for_memory">Nicht genügend Speicher für Index \'\'{0}\'\'</string>
 	<string name="version_index_is_not_supported">Die Index-Version \'\'{0}\'\' wird nicht unterstützt</string>
-	<string name="use_osmand_routing_service">OsmAnd-Navigation &gt; 20km</string>
+	
 	<string name="use_osmand_routing_service_descr">OsmAnd Offline-Navigation für große Entfernungen verwenden (experimentell) anstatt automatisch CloudMade zu nehmen</string>
 	<string name="osmand_routing_experimental">OsmAnd Offline-Navigation ist noch experimentell und funktioniert nicht gut für Entfernungen über 20 km.\n\nAls Navigationsdienst wird temporär online CloudMade verwendet.</string>
 	<string name="specified_dir_doesnt_exist">Angegebener Ordner kann nicht gefunden werden.</string>
@ -686,13 +685,13 @@ Aktuell sind {2} MB verfügbar.</string>
 	<string name="none_region_found">Keine Offline-Daten auf der SD-Karte gefunden. Bitte versuchen Sie, die Region über das Internet zu laden.</string>
 	<string name="poi_namefinder_query_empty">Suchbegriff eingeben</string>
 	<string name="any_poi">Alles</string>
-	<string name="layer_transport_route">ÖPNV-Linien</string>
+	
 	<string name="thanks_yandex_traffic">Danke an Yandex für die Überlassung von Verkehrsinformationen.</string>
 	<string name="layer_yandex_traffic">Yandex-Verkehr</string>
 	<string name="layer_route">Route</string>
 	<string name="shared_string_favorites">Favoriten</string>
 	<string name="layer_osm_bugs">OSM-Hinweise (online)</string>
-	<string name="layer_transport">ÖPNV-Haltestellen</string>
+	
 	<string name="layer_poi">POI…</string>
 	<string name="layer_amenity_label">POI Namen</string>
 	<string name="layer_map">Kartenquelle…</string>
@ -1046,7 +1045,7 @@ Proportionaler Speicher %4$s MB (Android Limit %5$s MB, Dalvik %6$s MB).</string
 	<string name="bg_service_screen_unlock">Bildschirm entsperren</string>
 	<string name="bg_service_screen_lock_toast">Bildschirm gesperrt</string>
 	<string name="bg_service_interval">Aufwachintervall setzen:</string>
-	<string name="map_widget_day_night">Tag/Nacht-Modus</string>
+	
 	<string name="map_widget_vector_attributes">Karten-Zusatzoptionen</string>
 	<string name="map_widget_renderer">Kartendarstellung</string>

@ -1791,7 +1790,7 @@ Aufgenommene Tracks kann man z.B. mit Bekannten teilen, oder auch zum Upload fü
    <string name="lock_screen_request_explanation">%1$s benötigt diese Berechtigung, um den Bildschirm auszuschalten (Energiesparfunktion).</string>
    
    <string name="home_button">Startseite</string>
-    <string name="osmo_use_https_descr">Sichere Server-Verbindung verwenden</string>
+    
    <string name="osmo_use_https">HTTPS nutzen</string>
    <string name="map_update">Aktualisierungen für %1$s Karten verfügbar</string>
    <string name="search_for">Suchen nach</string>
@ -2318,7 +2317,7 @@ Diese Ansicht kann zurückgestellt werden indem Sie hier wieder deaktiviert oder
    <string name="shared_string_email_address">E-Mail-Adresse speichern</string>
    <string name="find_parking">Parkplatz finden</string>
    <string name="show_polygons">Polygone anzeigen</string>
-    <string name="underlay_transparency">Underlay-Karte Transparenz</string>
+    
    <string name="rendering_attr_showMtbRoutes_name">MTB-Routen anzeigen</string>
    <string name="shared_string_reverse_order">Reihenfolge umkehren</string>
    <string name="map_marker_1st">Erste Kartenmarkierung</string>
@ -2334,7 +2333,7 @@ Diese Ansicht kann zurückgestellt werden indem Sie hier wieder deaktiviert oder
    <string name="map_markers">Kartenmarkierungen</string>
    <string name="map_marker">Kartenmarkierung</string>
    <string name="consider_turning_polygons_off">Es wird empfohlen, das Rendern von Polygonen zu deaktivieren.</string>
-    <string name="show_map_markers_topbar">Leiste mit den Kartenmarkierungen anzeigen</string>
+    
    <string name="shared_string_widgets">Widgets</string>
    <string name="download_files_error_not_enough_space">"Nicht genug Speicher!
 Es werden vorübergehend {3} MB  und {1} MB dauerhaft benötigt.
@ -2443,7 +2442,7 @@ Falls Sie OsmAnd mögen und das Projekt OpenStreetMap unterstützen wollen, so i
    <string name="coords_format_descr">Format der geographischen Koordinaten</string>
 		<string name="shared_string_is_open_24_7">Offen 7x24h</string>
  	<string name="storage_directory_card">Speicherkarte</string>
-    <string name="shared_string_open">Öffnen</string>
+    
 <string name="map_widget_search">Suche</string>
 	<string name="shared_string_from">von</string>
    <string name="city_type_district">Stadtteil</string>
@ -2473,4 +2472,4 @@ Falls Sie OsmAnd mögen und das Projekt OpenStreetMap unterstützen wollen, so i
    <string name="advanced_coords_search">Koordinatensuche (erweitert)</string>
    <string name="coords_search">Koordinatensuche</string>
    <string name="route_stops_before">%1$s Haltestellen vor</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
    <string name="add_tag">Προσθήκη Ετικέτας</string>
    <string name="btn_advanced_mode">Λειτουργία για προχωρημένους…</string>
    <string name="poi_filter_parking">Στάθμευση</string>
@ -36,7 +35,7 @@
 	
 	<string name="day_night_info_description">Ανατολή : %1$s \nΔύση : %2$s</string>
 	<string name="day_night_info">Πληρ. Ημέρας/Νύχτας</string>
-	<string name="map_widget_day_night">Χάρτης ημέρας/νύχτας</string>
+	
 	<string name="map_widget_vector_attributes">Χαρακτηριστικά απεικόνισης</string>
 	<string name="map_widget_renderer">Στυλ χάρτη</string>
 	
@ -310,7 +309,7 @@
 	<string name="user_name">Όνομα χρήστη OSM</string>
 	<string name="open_street_map_login_descr">Απαιτείται για υποβολές στο openstreetmap.org</string>
 	<string name="user_password">Κωδικός OSM</string>
-	<string name="user_password_descr">Απαιτείται για υποβολές στο openstreetmap.org</string>
+	
 	<string name="osmand_service">Κατάσταση νάρκης</string>
 	<string name="osmand_service_descr">Χρησιμοποιήστε το για να εκτελείται ο OsmAnd ενώ η οθόνη είναι απενεργοποιημένη</string>
 	
@ -330,7 +329,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_navigation">Αυτο-κεντράρισμα μόνο κατά την πλοήγηση</string>
 	<string name="auto_follow_route_navigation_descr">Αυτο-κεντραρισμένη οπτική χάρτη μόνο κατά την πλοήγηση.</string>
 	<string name="auto_follow_location_enabled">Αυτο-κεντράρισμα χάρτη σε χρήση.</string>
@ -534,7 +533,7 @@
 	<string name="reading_cached_tiles">Ανάγνωση αποθηκευμένων πλακιδίων…</string>
 	<string name="version_index_is_big_for_memory">Το ευρετήριο \'\'{0}\'\' δεν χωράει στη μνήμη</string>
 	<string name="version_index_is_not_supported">Η εκδοχή \'\'{0}\'\' του ευρετηρίου δεν υποστηρίζεται</string>
-	<string name="use_osmand_routing_service">Πλοήγηση OsmAnd &gt;20χλμ</string>
+	
 	<string name="use_osmand_routing_service_descr">Χρήση της εκτός σύνδεσης πλοήγησης του OsmAnd ισχύει μόνο για διαδρομές &gt; 20 χλμ (πειραματικό)</string>
 	<string name="osmand_routing_experimental">Η πλοήγηση εκτός δικτύου OsmAnd είναι μια πειραματική λειτουργία και δε λειτουργεί για αποστάσεις άνω των 20 χλμ.\n\nΗ υπηρεσία πλοήγησης έχει προσωρινά αλλάξει στην δικτυακή CloudMade.</string>
 	<string name="specified_dir_doesnt_exist">Δεν μπορώ να βρω τον καθορισμένο φάκελο.</string>
@ -617,12 +616,12 @@
 	<string name="none_region_found">Δεν υπάρχουν offline δεδομένα περιοχών στην κάρτα SD. Λήψη περιοχών από το Διαδίκτυο.</string>
 	<string name="poi_namefinder_query_empty">Εισάγετε ερώτημα αναζήτησης για να βρείτε ΣΕ</string>
 	<string name="any_poi">Οποιοδήποτε</string>
-	<string name="layer_transport_route">Δρομολόγιο ΜΜΜ</string>
+	
 	<string name="thanks_yandex_traffic">Ευχαριστούμε τη Yandex για τις πληροφορίες κυκλοφορίας.</string>
 	<string name="layer_yandex_traffic">Κυκλοφορία Yandex</string>
 	<string name="layer_route">Διαδρομή</string>
 	<string name="layer_osm_bugs">Σημειώσεις OSM (σε σύνδεση)</string>
-	<string name="layer_transport">Στάσεις ΜΜΜ</string>
+	
 	<string name="layer_poi">Σημ Ενδ…</string>
 	<string name="layer_map">Πηγή χάρτη…</string>
 	<string name="menu_layers">Επίπεδα χάρτη</string>
@ -1455,7 +1454,7 @@
    <string name="download_tab_local">Τοπικά</string>
 	<string name="no_internet_connection">Αδύνατη η λήψη, Παρακαλώ ελέγξτε τη σύνδεση στο Διαδίκτυο.</string>
    <string name="everything_up_to_date">Όλα τα αρχεία είναι ενημερωμένα</string>
-    <string name="osmo_use_https">Χρήση HTTPS</string>
+    
 	<string name="map_update">Υπάρχουν ενημερώσεις για %1$s χάρτες</string>
 	<string name="search_for">Αναζήτηση για</string>
 	<string name="coordinates">Συντεταγμένες</string>
@ -1480,7 +1479,7 @@
    
    <string name="navigate_point_zone">Ζώνη</string>
    <string name="error_avoid_specific_road">Δεν βρέθηκε παράκαμψη</string>
-    <string name="osmo_use_https_descr">Χρήση ασφαλούς σύνδεσης με τον διακομιστή</string>
+    
    
 	<string name="wake_on_voice">Άναμμα οθόνης</string>
    <string name="map_widget_appearance_rem">Εναπομείναντα στοιχεία</string>
@ -1722,4 +1721,4 @@
    <string name="rendering_value_medium_name">Μέτριο</string>
    <string name="rendering_value_bold_name">Παχύ</string>
    <string name="report">Αναφορά</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-en-rGB/strings.xml
+++ b/OsmAnd/res/values-en-rGB/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
 	<!--
 		Our app defaults to American English with default strings in res/values
 		This file is manually maintained in res/values-en-rGB and should ONLY contain strings where a different spelling should be used for English as used in the United Kingdom
@ -55,4 +54,4 @@
 	<string name="search_near_map">Search near current map centre</string>
 	<string name="position_on_map_center">Centre</string>
 	<string name="route_general_information">Total distance %1$s, travelling time %2$d h %3$d m.</string>
-</resources>
+</resources>
--- a/OsmAnd/res/values-eo/phrases.xml
+++ b/OsmAnd/res/values-eo/phrases.xml
@ -235,7 +235,7 @@
 	<string name="poi_car">Aŭtomobil-vendejo</string>
 	<string name="poi_car_parts">Aŭtomobil-parta vendejo</string>
 	<string name="poi_shelter">Ŝirmejo</string>
-	<string name="poi_atm">Bankaŭtomato</string>
+	<string name="poi_amenity_atm">Bankaŭtomato</string>
 	<string name="poi_bureau_de_change">Monŝanĝejo</string>
 	<string name="poi_volcano">Vulkano</string>
 	<string name="poi_tree">Arbo</string>
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="shared_string_topbar">Supra breto</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="shared_string_topbar">Supra breto</string>
    <string name="recalculate_route">Rekalkuli kurson</string>
    <string name="donations">Donacioj</string>
    <string name="number_of_recipients">Nombro da ricevontoj</string>
@ -1661,7 +1660,7 @@ Proporcia memoro %4$s MB (Limito de Android %5$s MB, Dalvik %6$s MB).</string>
    <string name="fast_route_mode_descr">"Aktivigu por kalkuli la plej rapidan kurson, aŭ malaktivigu por la plej mallongan kurson "</string>
    <string name="layer_route">Kurso</string>
    <string name="layer_osm_bugs">OSM notoj (enrete)</string>
-    <string name="layer_transport">Haltejoj</string>
+    
    <string name="layer_poi">Interesejoj…</string>
    <string name="context_menu_item_search_poi">Serĉi Interesejon</string>
    <string name="where_am_i">Kie mi estas?</string>
@ -1769,7 +1768,7 @@ Kaj la loko kaj tempo estas montrataj ĉe la OsmAnd stirpanelo, kaj ĉe la fenes
    <string name="reading_cached_tiles">Leganta konservitajn kahelojn…</string>
    <string name="version_index_is_big_for_memory">La indekso \"{0}\" ne povas esti enspacata en memorejo</string>
    <string name="version_index_is_not_supported">La indeks-versio \"{0}\" ne estas subtenata</string>
-    <string name="use_osmand_routing_service">OsmAnd navigado &gt;20km</string>
+    
    <string name="use_osmand_routing_service_descr">Uzas OsmAnd eksterretan navigadon por kursoj &gt; 20 km (iafoje malfunkcias)</string>
    <string name="osmand_routing_experimental">OsmAnd eksterreta navigado estas testa eco kaj ĝi ne funkcias por distancoj pli grandaj ol 20 km.\n\nProvizore estas uzata enreta servo CloudMade.</string>
    <string name="specified_dir_doesnt_exist">Ne povis trovi la elektitan dosierujon.</string>
@ -1861,7 +1860,7 @@ Kaj la loko kaj tempo estas montrataj ĉe la OsmAnd stirpanelo, kaj ĉe la fenes
    <string name="none_region_found">Neniaj eksterretaj datumoj de regionoj trovitaj je memorkarto. Elŝutu regionojn el la Interreto.</string>
    <string name="poi_namefinder_query_empty">Entajpu serĉmendon pri Interesejo</string>
    <string name="any_poi">Ia</string>
-    <string name="layer_transport_route">Transportaj kursoj</string>
+    
    <string name="thanks_yandex_traffic">Dankon al Yandex pro informoj pri trafiko.</string>
    <string name="layer_yandex_traffic">Yandex - informoj pri trafiko</string>
    <string name="menu_layers">Map-tavoloj</string>
@ -2204,4 +2203,4 @@ Kaj la loko kaj tempo estas montrataj ĉe la OsmAnd stirpanelo, kaj ĉe la fenes
    <string name="coords_search">Koordinat-serĉo</string>
    <string name="advanced_coords_search">Detala koordinat-serĉo</string>
    <string name="route_stops_before">%1$s haltejoj malantaŭ</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@ -694,7 +694,7 @@
 	<string name="poi_internet_cafe">Cibercafé</string>

 	<string name="poi_bank">Banco</string>
-	<string name="poi_atm">Cajero automático</string>
+	<string name="poi_amenity_atm">Cajero automático</string>
 	<string name="poi_payment_terminal">Terminal de pago</string>
 	<string name="poi_money_lender">Prestamista</string>
 	<string name="poi_pawnbroker">Casa de empeños</string>
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>

    <string name="rendering_attr_hideHouseNumbers_name">Números de casa</string>
    <string name="copying_osmand_file_failed">Falló al copiar archivos</string>
@ -182,7 +181,7 @@
    <string name="everything_up_to_date">Todos los archivos actualizados</string>
    <string name="use_opengl_render">Usar renderizado OpenGL</string>
    <string name="home_button">Inicio</string>
-    <string name="osmo_use_https_descr">Usa una conexión segura con el servidor</string>
+    
    <string name="osmo_use_https">Usar HTTPS</string>
    <string name="search_for">Buscar</string>
    <string name="coordinates">Coordenadas</string>
@ -1184,7 +1183,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
    <string name="day_night_info_description">Alba: %1$s
 \nOcaso: %2$s</string>
    <string name="day_night_info">Información día/noche</string>
-    <string name="map_widget_day_night">Mapa día/noche</string>
+    
    <string name="map_widget_renderer">Estilo del mapa</string>
    <string name="layer_map_appearance">Configurar pantalla</string>
    <string name="show_lanes">Carriles</string>
@ -1422,7 +1421,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
    <string name="user_name">Tu usuario de OSM</string>
    <string name="open_street_map_login_descr">Necesario para envíos a OpenStreetMap.org</string>
    <string name="user_password">Tu contraseña de OSM</string>
-    <string name="user_password_descr">Necesario para envíos a OpenStreetMap.org</string>
+    
    <string name="osmand_service">Modo reposo</string>
    <string name="osmand_service_descr">Ejecutar OsmAnd en segundo plano, mientras la pantalla este apagada</string>
    <string name="download_files_not_enough_space">Sin espacio suficiente para descargar %1$s MB (disponible: %2$s).</string>
@ -1434,7 +1433,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
    <string name="init_native_library">Inicializando biblioteca nativa…</string>
    <string name="choose_auto_follow_route">Auto-centrar vista del mapa</string>
    <string name="choose_auto_follow_route_descr">Tiempo hasta que la vista del mapa vuelve a sincronizarse con la ubicación actual</string>
-    <string name="auto_follow_route_never">Nunca (pulsa \'Ir\' para iniciar manualmente el guiado)</string>
+    
    <string name="keep_informing_never">Sólo manualmente (pulsa la flecha)</string>
    <string name="keep_informing_descr">Repite instrucciones de navegación a intervalos regulares</string>
    <string name="keep_informing">Repetir instrucciones de navegación</string>
@ -1610,7 +1609,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
    <string name="reading_cached_tiles">Leyendo teselas guardadas…</string>
    <string name="version_index_is_big_for_memory">La versión \'\'{0}\'\' de índices no cabe en memoria</string>
    <string name="version_index_is_not_supported">No se soporta la versión \'\'{0}\'\' de índices</string>
-    <string name="use_osmand_routing_service">Navegación OsmAnd &gt;20km</string>
+    
    <string name="use_osmand_routing_service_descr">El uso de la navegación sin conexión OsmAnd se aplica solo a rutas &gt; 20 km (experimental)</string>
    <string name="osmand_routing_experimental">La navegación sin conexión OsmAnd es una característica experimental y no funciona para distancias mayores a 20 km.\n\nEl servicio de navegación se cambia temporalmente al servicio en línea CloudMade.</string>
    <string name="specified_dir_doesnt_exist">No se puede encontrar la carpeta indicada.</string>
@ -1685,12 +1684,12 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
    <string name="none_region_found">Sin datos descargados para las regiones en la tarjeta SD. Descarga las regiones de Internet.</string>
    <string name="poi_namefinder_query_empty">Ingresa la consulta para buscar el PDI</string>
    <string name="any_poi">Cualquiera</string>
-    <string name="layer_transport_route">Ruta de transporte</string>
+    
    <string name="thanks_yandex_traffic">Gracias a Yandex por la información de tráfico.</string>
    <string name="layer_yandex_traffic">Tráfico Yandex</string>
    <string name="layer_route">Ruta</string>
    <string name="layer_osm_bugs">Informes de problemas (en línea)</string>
-    <string name="layer_transport">Paradas de transporte</string>
+    
    <string name="layer_poi">Puntos de interés…</string>
    <string name="layer_map">Fuente de mapas…</string>
    <string name="menu_layers">Capas de mapas</string>
@ -2348,10 +2347,10 @@ Si necesitas ayuda con la aplicación OsmAnd, contacte con nuestro equipo de sop
    <string name="shared_string_email_address">Correo electrónico</string>
    <string name="find_parking">Encontrar estacionamiento</string>
    <string name="show_polygons">Mostrar polígonos</string>
-    <string name="underlay_transparency">Transparencia subyacente</string>
+    
    <string name="rendering_attr_showMtbRoutes_name">Rutas de BTT</string>
    <string name="shared_string_reverse_order">Invertir orden</string>
-    <string name="show_map_markers">Marcadores del mapa</string>
+    
    <string name="show_map_markers_description">Activar función de marcadores del mapa</string>
    <string name="clear_active_markers_q">¿Quieres quitar todos los marcadores activos?</string>
    <string name="clear_markers_history_q">¿Quieres vaciar el historial de marcadores del mapa?</string>
@ -2366,7 +2365,7 @@ Si necesitas ayuda con la aplicación OsmAnd, contacte con nuestro equipo de sop
    <string name="map_marker_2nd">Segundo marcador del mapa</string>
    <string name="shared_string_toolbar">Barra de herramientas</string>
    <string name="shared_string_widgets">Controles</string>
-    <string name="show_map_markers_topbar">Mostrar barra superior de Marcadores del mapa</string>
+    
    <string name="download_files_error_not_enough_space">¡Sin espacio suficiente!
 Se necesita {3} MB temporalmente y {1} MB constantemente.
 Actualmente, hay disponible sólo {2} MB.</string>
@ -2518,4 +2517,4 @@ Si necesitas ayuda con la aplicación OsmAnd, contacte con nuestro equipo de sop
    <string name="coords_search">Búsqueda de coordenadas</string>
    <string name="advanced_coords_search">Búsqueda avanzada de coordenadas</string>
    <string name="route_stops_before">%1$s parada(s) anterior(es)</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-es-rUS/phrases.xml
+++ b/OsmAnd/res/values-es-rUS/phrases.xml
@ -657,7 +657,7 @@
 	<string name="poi_crematorium">Crematorio</string>
 	<string name="poi_internet_cafe">Cibercafé</string>
 	<string name="poi_bank">Banco</string>
-	<string name="poi_atm">Cajero automático</string>
+	<string name="poi_amenity_atm">Cajero automático</string>
 	<string name="poi_payment_terminal">Terminal de pago</string>
 	<string name="poi_money_lender">Prestamista</string>
 	<string name="poi_pawnbroker">Casa de empeños</string>
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>

    <string name="rendering_attr_hideHouseNumbers_name">Números de casa</string>
    <string name="copying_osmand_file_failed">Falló al copiar archivos</string>
@ -182,7 +181,7 @@
    <string name="everything_up_to_date">Todos los archivos actualizados</string>
    <string name="use_opengl_render">Usar renderizado OpenGL</string>
    <string name="home_button">Inicio</string>
-    <string name="osmo_use_https_descr">Usa una conexión segura con el servidor</string>
+    
    <string name="osmo_use_https">Usar HTTPS</string>
    <string name="search_for">Buscar</string>
    <string name="coordinates">Coordenadas</string>
@ -1184,7 +1183,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
    <string name="day_night_info_description">Alba: %1$s
 \nOcaso: %2$s</string>
    <string name="day_night_info">Información día/noche</string>
-    <string name="map_widget_day_night">Mapa día/noche</string>
+    
    <string name="map_widget_renderer">Estilo del mapa</string>
    <string name="layer_map_appearance">Configurar pantalla</string>
    <string name="show_lanes">Carriles</string>
@ -1422,7 +1421,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
    <string name="user_name">Tu usuario de OSM</string>
    <string name="open_street_map_login_descr">Necesario para envíos a OpenStreetMap.org</string>
    <string name="user_password">Tu contraseña de OSM</string>
-    <string name="user_password_descr">Necesario para envíos a OpenStreetMap.org</string>
+    
    <string name="osmand_service">Modo reposo</string>
    <string name="osmand_service_descr">Ejecutar OsmAnd en segundo plano, mientras la pantalla este apagada</string>
    <string name="download_files_not_enough_space">Sin espacio suficiente para descargar %1$s MB (disponible: %2$s).</string>
@ -1434,7 +1433,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
    <string name="init_native_library">Inicializando biblioteca nativa…</string>
    <string name="choose_auto_follow_route">Auto-centrar vista del mapa</string>
    <string name="choose_auto_follow_route_descr">Tiempo hasta que la vista del mapa vuelve a sincronizarse con la ubicación actual</string>
-    <string name="auto_follow_route_never">Nunca (pulsa \'Ir\' para iniciar manualmente el guiado)</string>
+    
    <string name="keep_informing_never">Sólo manualmente (pulsa la flecha)</string>
    <string name="keep_informing_descr">Repite instrucciones de navegación a intervalos regulares</string>
    <string name="keep_informing">Repetir instrucciones de navegación</string>
@ -1610,7 +1609,7 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
    <string name="reading_cached_tiles">Leyendo teselas guardadas…</string>
    <string name="version_index_is_big_for_memory">La versión \'\'{0}\'\' de índices no cabe en memoria</string>
    <string name="version_index_is_not_supported">No se soporta la versión \'\'{0}\'\' de índices</string>
-    <string name="use_osmand_routing_service">Navegación OsmAnd &gt;20km</string>
+    
    <string name="use_osmand_routing_service_descr">El uso de la navegación sin conexión OsmAnd se aplica solo a rutas &gt; 20 km (experimental)</string>
    <string name="osmand_routing_experimental">La navegación sin conexión OsmAnd es una característica experimental y no funciona para distancias mayores a 20 km.\n\nEl servicio de navegación se cambia temporalmente al servicio en línea CloudMade.</string>
    <string name="specified_dir_doesnt_exist">No se puede encontrar la carpeta indicada.</string>
@ -1685,12 +1684,12 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
    <string name="none_region_found">Sin datos descargados para las regiones en la tarjeta SD. Descarga las regiones de Internet.</string>
    <string name="poi_namefinder_query_empty">Ingresa la consulta para buscar el PDI</string>
    <string name="any_poi">Cualquiera</string>
-    <string name="layer_transport_route">Ruta de transporte</string>
+    
    <string name="thanks_yandex_traffic">Gracias a Yandex por la información de tráfico.</string>
    <string name="layer_yandex_traffic">Tráfico Yandex</string>
    <string name="layer_route">Ruta</string>
    <string name="layer_osm_bugs">Informes de problemas (en línea)</string>
-    <string name="layer_transport">Paradas de transporte</string>
+    
    <string name="layer_poi">Puntos de interés…</string>
    <string name="layer_map">Fuente de mapas…</string>
    <string name="menu_layers">Capas de mapas</string>
@ -2348,10 +2347,10 @@ Si necesitas ayuda con la aplicación OsmAnd, contacte con nuestro equipo de sop
    <string name="shared_string_email_address">Correo electrónico</string>
    <string name="find_parking">Encontrar estacionamiento</string>
    <string name="show_polygons">Mostrar polígonos</string>
-    <string name="underlay_transparency">Transparencia subyacente</string>
+    
    <string name="rendering_attr_showMtbRoutes_name">Rutas de BTT</string>
    <string name="shared_string_reverse_order">Invertir orden</string>
-    <string name="show_map_markers">Marcadores del mapa</string>
+    
    <string name="show_map_markers_description">Activar función de marcadores del mapa</string>
    <string name="clear_active_markers_q">¿Quieres quitar todos los marcadores activos?</string>
    <string name="clear_markers_history_q">¿Quieres vaciar el historial de marcadores del mapa?</string>
@ -2359,7 +2358,7 @@ Si necesitas ayuda con la aplicación OsmAnd, contacte con nuestro equipo de sop
    <string name="map_markers">Marcadores del mapa</string>
    <string name="map_marker">Marcador del mapa</string>
    <string name="select_map_markers">Elegir marcadores del mapa</string>
-    <string name="show_map_markers_topbar">Mostrar barra superior de Marcadores de mapa</string>
+    
    <string name="map_marker_1st">Primer marcador del mapa</string>
    <string name="map_marker_2nd">Segundo marcador del mapa</string>
    <string name="shared_string_toolbar">Barra de herramientas</string>
@ -2514,4 +2513,4 @@ Si necesitas ayuda con la aplicación OsmAnd, contacte con nuestro equipo de sop
    <string name="coords_search">Búsqueda de coordenadas</string>
    <string name="advanced_coords_search">Búsqueda avanzada de coordenadas</string>
    <string name="route_stops_before">%1$s parada(s) anterior(es)</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@ -364,7 +364,7 @@
 	<string name="poi_mortuary">Morgue</string>
 	<string name="poi_crematorium">Crematorio</string>
 	<string name="poi_bank">Banco</string>
-	<string name="poi_atm">Cajero automático</string>
+	<string name="poi_amenity_atm">Cajero automático</string>
 	<string name="poi_accountant">Contable</string>
 	<string name="poi_cave_entrance">Entrada a cueva</string>
 	<string name="poi_volcano">Volcán</string>
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>

    <string name="layer_map_appearance">Configurar pantalla</string>
    <string name="show_lanes">Carriles</string>
@ -67,7 +66,7 @@
    <string name="user_name">Su usuario OSM</string>
    <string name="open_street_map_login_descr">Necesario para envíos a openstreetmap.org</string>
    <string name="user_password">Su clave OSM</string>
-    <string name="user_password_descr">Necesario para envíos a openstreetmap.org</string>
+    
    <string name="osmand_service">Modo en segundo plano</string>
    <string name="osmand_service_descr">OsmAnd se ejecuta en segundo plano mientras la pantalla está apagada</string>
    <string name="switch_to_raster_map_to_see">No hay ningún mapa vectorial presente descargado para esta ubicación. Puede descargar uno en Ajustes (Gestionar mapas), o cambiar al mapa en línea (para esto active el complemento mapas en línea).</string>
@ -80,7 +79,7 @@
    <string name="init_native_library">Inicializando biblioteca nativa…</string>
    <string name="choose_auto_follow_route">Auto-centrar vista del 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 (pulse \'Ir\' para iniciar manualmente el guiado)</string>
+    
    <string name="auto_follow_route_navigation">Auto-centrar sólo navegación</string>
    <string name="auto_follow_route_navigation_descr">Auto-centrar vista del mapa, sólo durante la navegación.</string>
    <string name="auto_follow_location_enabled">Auto-centrar vista del mapa activado.</string>
@ -267,7 +266,7 @@
    <string name="reading_cached_tiles">Leyendo teselas almacenadas localmente…</string>
    <string name="version_index_is_big_for_memory">La versión \'\'{0}\'\' de índices no cabe en memoria</string>
    <string name="version_index_is_not_supported">No se soporta la versión \'\'{0}\'\' de índices</string>
-    <string name="use_osmand_routing_service">Navegación OsmAnd &gt;20km</string>
+    
    <string name="use_osmand_routing_service_descr">El uso de la navegación sin conexión de OsmAnd, se aplica solo a rutas mayores a 20 km (experimental)</string>
    <string name="osmand_routing_experimental">La navegación sin conexión de OsmAnd, es una característica experimental y no funciona para distancias mayores a 20 km.\n\nEl servicio de navegación, se cambió temporalmente al servicio en línea CloudMade.</string>
    <string name="specified_dir_doesnt_exist">No se puede encontrar la carpeta especificada.</string>
@ -347,13 +346,13 @@
    <string name="none_region_found">No hay datos de regiones descargados en la tarjeta SD. Descargue las regiones desde Internet.</string>
    <string name="poi_namefinder_query_empty">Introduzca la consulta para buscar el PDI</string>
    <string name="any_poi">Cualquiera</string>
-    <string name="layer_transport_route">Ruta de transporte</string>
+    
    <string name="thanks_yandex_traffic">Gracias a Yandex por la información de tráfico.</string>
    <string name="layer_yandex_traffic">Tráfico Yandex</string>
    <string name="layer_route">Ruta</string>
    <string name="shared_string_favorites">Favoritos</string>
    <string name="layer_osm_bugs">Notas OSM (en línea)</string>
-    <string name="layer_transport">Paradas de transporte</string>
+    
    <string name="layer_poi">Puntos de interés…</string>
    <string name="layer_map">Fuente del mapa…</string>
    <string name="menu_layers">Capas de mapas</string>
@ -796,7 +795,7 @@ Puede encontrar la localización y el tiempo de estacionamiento en la tarjeta de
    <string name="select_navigation_mode">Seleccionar modo transporte</string>
    <string name="day_night_info_description">Alba: %1$s \nOcaso: %2$s</string>
    <string name="day_night_info">Información día/noche</string>
-    <string name="map_widget_day_night">Mapa día/noche</string>
+    
    <string name="map_widget_vector_attributes">Atributos de dibujado</string>
    <string name="map_widget_renderer">Estilo del mapa</string>
    <string name="osmand_short_description_80_chars">Visor y navegador de mapas móvil global para mapas OSM fuera y en línea</string>
@ -1588,7 +1587,7 @@ Puede encontrar la localización y el tiempo de estacionamiento en la tarjeta de
    <string name="wake_on_voice_descr">Enciende la pantalla del dispositivo al aproximarse a un giro</string>
    <string name="lock_screen_request_explanation">%1$s necesita este permiso para apagar la pantalla para la característica de ahorro energético.</string>
    <string name="shared_string_never">Nunca</string>
-    <string name="osmo_use_https_descr">Utilizar conexión segura con el servidor</string>
+    
    <string name="osmo_use_https">Utilizar HTTPS</string>
    <string name="home_button">Inicio</string>
    <string name="map_update">Actualizaciones disponibles para %1$s mapa(s)</string>
@ -2134,11 +2133,11 @@ OsmAnd Mapas y Navegación - encuentra ubicaciones en el mapa y calcula rutas si
    <string name="shared_string_save_changes">Guardar los cambios</string>
    <string name="find_parking">Encontrar aparcamiento</string>
    <string name="show_polygons">Mostrar polígonos</string>
-    <string name="underlay_transparency">Transparencia de subyacente</string>
+    
    <string name="rendering_attr_showMtbRoutes_name">Mostrar rutas MTB</string>
    <string name="select_map_markers">Seleccionar marcadores de mapa</string>
    <string name="shared_string_reverse_order">Orden inverso</string>
-    <string name="show_map_markers">Marcadores de mapa</string>
+    
    <string name="show_map_markers_description">Activa la característica de marcadores de mapa</string>
    <string name="clear_active_markers_q">"¿Quieres eliminar todos los marcadores  activos?"</string>
    <string name="clear_markers_history_q">¿Quieres borrar el historial de marcadores de mapa?</string>
@ -2148,7 +2147,7 @@ OsmAnd Mapas y Navegación - encuentra ubicaciones en el mapa y calcula rutas si
    <string name="add_points_to_map_markers_q">¿Quieres añadir todos los puntos a los marcadores de mapa?</string>
    <string name="shared_string_add_to_map_markers">Añadir a marcadores de mapa</string>
    <string name="consider_turning_polygons_off">Se recomienda desactivar la reproducción de polígonos.</string>
-    <string name="show_map_markers_topbar">Mostrar la barra superior de Marcadores de mapa</string>
+    
    <string name="map_marker_1st">Primer marcador de mapa</string>
    <string name="map_marker_2nd">Segundo marcador de mapa</string>
    <string name="shared_string_toolbar">Barra de herramientas</string>
@ -2293,4 +2292,4 @@ OsmAnd Mapas y Navegación - encuentra ubicaciones en el mapa y calcula rutas si
 y más…
 "</string>
    <string name="route_stops_before">%1$s parada(s) anterior(es)</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-et/strings.xml
+++ b/OsmAnd/res/values-et/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="add_opening_hours">Lisa lahioleku ajad</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="add_opening_hours">Lisa lahioleku ajad</string>
 	<string name="description">Kirjeldus</string>
 	<string name="contact_info">Kontakti info</string>
 	
@ -144,4 +143,4 @@
    <string name="osmo_group_information_desc">" - Grupi loomisel määra selle nimi ja kirjeldus\n - Rakenduses saab luua ainult lihtsat tüüpi gruppe, loe rohkem lehelt https://osmo.mobi/g/new\n - Veebilehel saad hallata gruppe, asetada radasid ja huvipunkte\n - Me ei toeta ainult ühe kasutajaga gruppe, kui see ei ole POI grupp\n - Privaatgrupid on kuni 8 kasutajale\n - Detailsed kasutustingimused on alati saadaval lehel OsMo.mobi\n - Eritingimuste korral võta ühendust klienditoega: osmo.mobi@gmail.com "</string>
    <string name="osmo_specify_tracker_id">Täpsusta ID</string>
    <string name="osmo_no_connection_msg">Ei suuda ühenduda OsMo serveriga:\n- kontrolli internetiühendust;\n- kontrolli seadeid;\n- kontrolli meie Twitteri lehte: https://twitter.com/OsMomobi</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
  <string name="local_index_tile_data_zooms">Deskargatutako zoomak: %1$s</string>
  <string name="local_index_tile_data_expire">Iraungitze epea (minutuak): %1$s</string>
  <string name="local_index_tile_data_downloadable">Deskargagarria: %1$s</string>
@ -276,7 +275,7 @@
  <string name="select_navigation_mode">Aukeratu garraio modua</string>
  <string name="day_night_info_description">Egunsentia: %1$s ⏎\nIlunabarra: %2$s</string>
  <string name="day_night_info">Egun/gau info</string>
-  <string name="map_widget_day_night">Egun/gau mapa</string>
+  
  <string name="map_widget_vector_attributes">Errendatze atributuak</string>
  <string name="map_widget_renderer">Mapa estiloa</string>
  
@ -546,7 +545,7 @@
  <string name="user_name">Zure OSMeko erabiltzailea</string>
  <string name="open_street_map_login_descr">Beharrezkoa openstreetmap.org-eko bidalketentzat</string>
  <string name="user_password">Zure OSMeko pasahitza</string>
-  <string name="user_password_descr">Beharrezkoa openstreetmap.org-eko bidalketentzat</string>
+  
  <string name="osmand_service">Bigarren planoko modua</string>
  <string name="osmand_service_descr">OsmAnd bigarren planoan dabil pantaila itzalia dagoen bitartean</string>
  
@ -566,7 +565,7 @@
  <string name="init_native_library">Liburutegi natiboa hasieratzen…</string>
  <string name="choose_auto_follow_route">Auto-zentratu mapa ikuspegia</string>
  <string name="choose_auto_follow_route_descr">Denbora mapa ikuspegia uneko kokapenarekin sinkronizatu harte </string>
-  <string name="auto_follow_route_never">Inoiz</string>
+  
  <string name="auto_follow_route_navigation">Auto-zentratu nabigazioa bakarrik</string>
  <string name="auto_follow_route_navigation_descr">Bakarrik nabigatzean auto-zentratu maparen ikuspegia.</string>
  <string name="auto_follow_location_enabled">Auto-zentratu ikuspegia martxan.</string>
@ -776,7 +775,7 @@
  <string name="reading_cached_tiles">Katxeatutako teselak irakurtzen…</string>
  <string name="version_index_is_big_for_memory">\"{0}\" indizea ez da memorian sartzen</string>
  <string name="version_index_is_not_supported">\"{0}\" indizearen bertsioa ez da onartzen</string>
-  <string name="use_osmand_routing_service">OsmAnd nabigatzailea &gt;20km</string>
+  
  <string name="use_osmand_routing_service_descr">Erabili OsmAnd lineaz kanpoko nabigatzailea, &gt; 20 km ibilbideetan erabili daiteke (esperimentala)</string>
  <string name="osmand_routing_experimental">OsmAnden lineaz kanpoko nabigazioa ezaugarri esperimentala da eta ez du 20 km baina gehiagoko distantziekin lan egiten.⏎\n⏎\nNabigazio zerbitzuak oraingoz sarean dagoen CloudMade zerbitzua erabiltzen du.</string>
  <string name="specified_dir_doesnt_exist">Ezin izan da zehaztutako karpeta aurkitu.</string>
@ -859,13 +858,13 @@
  <string name="none_region_found">SD txartelan ez dira eskualdeentzako lineaz kanpoko daturik aurkitu. Eskualdeak Internetetik deskargatu.</string>
  <string name="poi_namefinder_query_empty">Bilaketa terminoak sartu POIak aurkitzeko</string>
  <string name="any_poi">Edozein</string>
-  <string name="layer_transport_route">Garraioaren ibilbidea</string>
+  
  <string name="thanks_yandex_traffic">Eskerrak Yandexi trafikoari buruzko informazioagatik.</string>
  <string name="layer_yandex_traffic">Yandex trafikoa</string>
  <string name="layer_route">Ibilbidea</string>
  <string name="shared_string_favorites">Gogokoenak</string>
  <string name="layer_osm_bugs">OSM Oharrak (sarean)</string>
-  <string name="layer_transport">Garraioaren geldialdiak</string>
+  
  <string name="layer_poi">POI…</string>
  <string name="layer_map">Mapa iturburua…</string>
  <string name="menu_layers">Mapa geruzak</string>
@ -2054,4 +2053,4 @@

    <string name="use_dashboard_btn">Erabili kontrol panela</string>
    <string name="dashboard_or_drawer_description">Orain aplikazioa kontrol panel aldakor batetik ala finkatutako menu estatiko batetik kudeatzeko aukera dago. Erabakia aldatzeko aukera duzu kontrol panelaren ezarpenetan.</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-fa/phrases.xml
+++ b/OsmAnd/res/values-fa/phrases.xml
@ -562,7 +562,7 @@
 <string name="poi_internet_cafe">کافی نت</string>

 <string name="poi_bank">بانک</string>
-<string name="poi_atm">ATM</string>
+<string name="poi_amenity_atm">ATM</string>
 <string name="poi_money_lender">وام دهنده پول</string>
 <string name="poi_pawnbroker">بنگاه رهنی</string>
 <string name="poi_bureau_de_change">صرافی</string>
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="local_osm_changes_backup_failed">پشتیبان‌گیری از تغییرات OsmAnd ناموفق بود</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="local_osm_changes_backup_failed">پشتیبان‌گیری از تغییرات OsmAnd ناموفق بود</string>
    <string name="plugin_distance_point_time">زمان</string>
    <string name="plugin_distance_point_hdop">دقت</string>
    <string name="plugin_distance_point_speed">سرعت</string>
@ -93,7 +92,7 @@
 	<string name="select_navigation_mode">انتخاب شیوه رفت و آمد</string>
 	<string name="day_night_info">اطلاعات روز/شب</string>
 	<string name="day_night_info_description">طلوع خورشید: %1$s\nغروب خورشید: %2$s</string>
-	<string name="map_widget_day_night">نقشه روز/شب</string>
+	
 	<string name="map_widget_renderer">سبک نقشه</string>
 	
 	<string name="map_widget_show_ruler">خط کش</string>
@ -413,7 +412,7 @@
 	<string name="user_name">نام کاربری سایت OSM شما</string>
 	<string name="open_street_map_login_descr">جهت پذیرش در سایت openstreetmap.org مورد نیاز است</string>
 	<string name="user_password">رمز عبور سایت OSM شما</string>
-	<string name="user_password_descr">جهت پذیرش در سایت openstreetmap.org مورد نیاز است</string>
+	
 	
 	<string name="west_south_west">غرب-جنوب-غرب</string>
 	<string name="west">غرب</string>
@ -737,7 +736,7 @@
 	<string name="animate_route_off">توقف شبیه سازی</string>
 	<string name="animate_route">شروع شبیه سازی</string>
 	<string name="where_am_i">من کجا هستم؟</string>
-	<string name="layer_transport">ایستگاههای حمل و نقل عمومی</string>
+	
 	<string name="transport_stops">ایستگاهها</string>
 	<string name="transport_stops_to_pass">ایستگاههای مسیر</string>
 	<string name="show_transport_over_map_description">نشان دادن ایستگاههای حمل و نقل عمومی روی نقشه</string>
@ -770,7 +769,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_navigation">ناوبری تنها با حالت خودکار-مرکز نقشه</string>
 	<string name="auto_follow_route_navigation_descr">حالت خودکار-مرکز نقشه تنها در زمان مسیریابی.</string>
 	<string name="auto_follow_location_enabled">نمای نقشه خودکار-مرکز میباشد.</string>
@ -867,7 +866,7 @@
    
    <string name="download_hillshade_maps">تپه سایه</string>
    
-    <string name="osmand_srtm_long_description_1000_chars">"این افزونه، منحنی‌های هم‌تراز را که در نقشه‌های آفلاین OsmAnd نمایش داده میشوند فراهم میکند. داده‌های جهانی (بین 70 درجه شمالی و 70 درجه جنوبی) در این زمینه براساس اندازه گیری‌های SRTM (مأموریت توپوگرافی رادار شاتل) و ASTER (رادیومتر انعکاسی و پرتویی حرارتی هوایی پیشرفته)، یک ابزار تصویربرداری پردازنده ترا و ماهواره فوق پیشرفته سیستم نظارتی زمین ناسا مییباشند. ASTER محصول تلاش مشترک میان ناسا، وزارت اقتصاد ژاپن، صنعت و تجارت (متی)، و سیستم های فضایی ژاپن (جی-اسپیس سیستم) است. "</string>
+    <string name="osmand_srtm_long_description_1000_chars">"این افزونه، منحنی‌های هم‌تراز را که در نقشه‌&#157;های آفلاین OsmAnd نمایش داده میشوند فراهم میکند. داده‌های جهانی (بین 70 درجه شمالی و 70 درجه جنوبی) در این زمینه براساس اندازه گیری‌های SRTM (مأموریت توپوگرافی رادار شاتل) و ASTER (رادیومتر انعکاسی و پرتویی حرارتی هوایی پیشرفته)، یک ابزار تصویربرداری پردازنده ترا و ماهواره فوق پیشرفته سیستم نظارتی زمین ناسا مییباشند. ASTER محصول تلاش مشترک میان ناسا، وزارت اقتصاد ژاپن، صنعت و تجارت (متی)، و سیستم های فضایی ژاپن (جی-اسپیس سیستم) است. "</string>
    <string name="srtm_plugin_description">"این افزونه هم یک لایه خطوط هم‌تراز و هم یک لایه تپه سایه بر روی نقشه‌های استاندارد OsmAnd اضافه میکند. این قابلیت بسیار به درد قهرمانان، کوهنوردان، جهانگردان و هرکسی که به ساختار زمین علاقمند است می‌خورد.\nداده‌های جهانی (بین ۷۰ درجه شمالی و ۷۰ درجه جنوبی) توسط اندازه‌گیریهای SRTM (مأموریت رادار توپوگرافی شاتل) و ASTER (تابش حرارتی فضاپایه پیشرفته و رادیومتری انعکاسی)، ایزار تصویربرداری Terra، ماهواره پرچمدار سیستم نظاره‌گر زمین ناسا انجام شده است. ASTER یک پروژه همکاری مشترک بین ناسا، وزارت اقتصاد ژاپن، وزارت صنعت و بازرگانی و سیستمهای فضایی ژاپن (J-spacesystems) می‌باشد. "</string>
    <string name="monitoring_control_start">جی پی ایکس</string>
    <string name="rendering_attr_noPolygons_description">محو کردن همه عوارض زمین روی نقشه</string>
@ -964,7 +963,7 @@
 	<string name="none_region_found">داده آفلاینی برای مناطق روی کارت SD پیدا نشد. مناطق را از اینترنت دانلود کنید.</string>
 	<string name="poi_namefinder_query_empty">درخواست جستجو را برای پیدا کردن POI وارد کنید</string>
 	<string name="any_poi">هرچه</string>
-	<string name="layer_transport_route">مسیر حمل و نقل عمومی</string>
+	
 	<string name="thanks_yandex_traffic">با تشکر از Yandex برای فراهم آوردن اطلاعات ترافیک.</string>
 	<string name="layer_yandex_traffic">ترافیک Yandex</string>
 	<string name="layer_route">مسیر</string>
@ -1011,7 +1010,7 @@
 	<string name="reading_cached_tiles">درحال خواندن کاشی های ذخیره شده…</string>
 	<string name="version_index_is_big_for_memory">ایندکس \'{0}\' در حافظه جای نگرفت</string>
 	<string name="version_index_is_not_supported">نسخه ایندکس \'{0}\' پشتیبانی نمیشود</string>
-	<string name="use_osmand_routing_service">مسیریابی OsmAnd &gt; بیست کیلومتر</string>
+	
 	<string name="use_osmand_routing_service_descr">استفاده از مسیریابی آفلاین OsmAnd تنها در مسیرهای بیش از ۲۰ کیلومتر کاربرد دارد (آزمایشی)</string>
 	<string name="osmand_routing_experimental">مسیریابی آفلاین OsmAnd یک ویژگی آزمایشی است که برای مسیرهای بیش از بیست کیلومتر کارآیی ندارد.\n\nسرویس مسیریابی موقتاْ به سرویس آنلاین CloudMade منتقل شد.</string>
 	<string name="specified_dir_doesnt_exist">پوشه مورد نظر پیدا نشد.</string>
@ -1390,7 +1389,7 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
    
    <string name="route_descr_destination">مقصد</string>
    <string name="create_poi_link_to_osm_doc">  <u>Online OSM</u> map classification with images</string>
-	<string name="app_mode_hiking">پیاده‌روی</string>
+	<string name="app_mode_hiking">پیاده‌&#157;روی</string>
    <string name="app_mode_motorcycle">موتورسیکلت</string>
    <string name="app_mode_boat">قایق</string>
    <string name="app_mode_aircraft">هواپیما</string>
@ -1780,7 +1779,7 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
 	<string name="no_internet_connection">دانلود امکانپذیر نیست، لطفا اتصال اینترنت‌تان را بررسی کنید.</string>
    <string name="everything_up_to_date">همه فایلها به روز میباشند</string>
    <string name="home_button">خانه</string>
-    <string name="osmo_use_https_descr">استفاده از اتصال امن به سرور</string>
+    
    <string name="osmo_use_https">استفاده از پروتکل HTTPS</string>
 	
 	<string name="error_avoid_specific_road">مسیر میانبر یافت نشد</string>
@ -2043,4 +2042,4 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
    <string name="rendering_attr_alpineHiking_name">مقیاس پیاده روی آلپاین (SAC)</string>
    <string name="opening_at">بازکردن در</string>
    <string name="closing_at">بستن در</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@ -41,7 +41,7 @@
 	<string name="day_night_info_description">Auringon nousu : %1$s
 \nAuringon lasku : %2$s</string>
 	<string name="day_night_info">Päivä/yö info</string>
-	<string name="map_widget_day_night">Päivä/yö kartta</string>
+	
 	
 	<string name="show_lanes">Näytä ajokaistat</string>
 	<string name="avoid_unpaved">Vältä päällystämättömiä teitä</string>
@ -183,12 +183,12 @@
 	<string name="user_name">OSM käyttäjänimesi</string>
 	<string name="open_street_map_login_descr">Tarvitaan openstreetmap.org ehdotuksia varten</string>
 	<string name="user_password">OSM salasanasi</string>
-	<string name="user_password_descr">Tarvitaan openstreetmap.org ehdotuksia varten</string>
+	
 	
 	<string name="download_files_not_enough_space">Ei ole tarpeeksi tilaa jotta voitaisiin ladata %1$s MB (vapaana: %2$s).</string>
 	<string name="download_files_question_space">Vapaata tilaa on {2} MB! Lataa {0} tiedosto(a) ({1} MB)?</string>
 	
-	<string name="auto_follow_route_never">Ei koskaan</string>
+	
 	<string name="delete_confirmation_msg">Poista %1$s?</string>
 	<string name="city_type_suburb">Lähiö</string>
 	<string name="city_type_hamlet">Kylä</string>
@ -587,7 +587,7 @@
 	<string name="context_menu_item_add_parking_point">Merkitse pysäköintipaikaksi</string>
 	<string name="context_menu_item_delete_parking_point">Poista pysäköintimerkki</string>
 	<string name="shared_string_clear">Nollaa</string>
-	<string name="use_osmand_routing_service">OsmAnd navigointi &gt;20km</string>
+	
 	<string name="specified_dir_doesnt_exist">Ei löydetty määriteltyä hakemistoa.</string>
 	<string name="voice_is_not_available_title">Ei ääniohjausta valittuna</string>
 	<string name="unknown_from_location">Aloituspistettä ei ole vielä määritelty</string>
@ -639,7 +639,7 @@
    <string name="av_def_action_picture">Ota kuva</string>
    <string name="recording_context_menu_precord">Ota kuva</string>
    <string name="recording_context_menu_show">Näytä</string>
-    <string name="use_osmand_routing_service_descr">Käytä OsmAnd offline navigointia. Koskee vain alle 20km pitkiä reittejä (kokeellinen)</string>
+    
 	<string name="application_dir">Tallennuskansio</string>
 	<string name="access_arrival_time">Saapumisaika</string>
    <string name="item_checked">valittu</string>
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@ -22,7 +22,7 @@
 	<string name="poi_arts_centre">Centre artistique</string>
 	<string name="poi_artwork">Œuvre d’art</string>
 	<string name="poi_athletics">Athlétisme</string>
-	<string name="poi_atm">Distributeur de billets</string>
+	<string name="poi_amenity_atm">Distributeur de billets</string>
 	<string name="poi_attraction">Attraction touristique</string>
 	<string name="poi_baby_hatch">Tour d\'abandon</string>
 	<string name="poi_bailiff">Huissier</string>
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
    <string name="offline_edition">Modifications hors-ligne</string>
    <string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string>

@ -60,7 +59,7 @@
    <string name="user_name">Votre identifiant OSM</string>
    <string name="open_street_map_login_descr">Nécessaire pour les contributions openstreetmap.org</string>
    <string name="user_password">Votre mot de passe OSM</string>
-    <string name="user_password_descr">Nécessaire pour les contributions openstreetmap.org</string>
+    
    <string name="osmand_service">Mode tâche de fond</string>
    <string name="osmand_service_descr">OsmAnd s\'exécute en tâche de fond lorsque l\'écran est éteint</string>

@ -78,7 +77,7 @@ Actuellement {2} Mo sont disponibles.</string>
    <string name="init_native_library">Chargement …</string>
    <string name="choose_auto_follow_route">Centrer automatiquement la carte</string>
    <string name="choose_auto_follow_route_descr">Temps avant que la carte se recentre sur la position actuelle</string>
-    <string name="auto_follow_route_never">Jamais (Utiliser \"Aller\" pour démarrer la navigation)</string>
+    
    <string name="auto_follow_route_navigation">Recentrage automatique navigation</string>
    <string name="auto_follow_route_navigation_descr">Recentrage automatique uniquement pendant la navigation.</string>
    <string name="auto_follow_location_enabled">Recentrage automatique activé.</string>
@ -282,7 +281,7 @@ Actuellement {2} Mo sont disponibles.</string>
    <string name="reading_cached_tiles">Lecture des tuiles en cache…</string>
    <string name="version_index_is_big_for_memory">L\'index \'\'{0}\'\' est trop gros pour la mémoire</string>
    <string name="version_index_is_not_supported">La version de l\'\'index \'\'{0}\'\' n\'\'est pas supporté</string>
-    <string name="use_osmand_routing_service">Navigation hors-ligne OsmAnd &gt;20km</string>
+    
    <string name="use_osmand_routing_service_descr">Utiliser la navigation hors-ligne pour les longues distances (expérimental)</string>
    <string name="osmand_routing_experimental">La navigation hors-ligne OsmAnd est une fonction expérimentale ne fonctionnant pas pour une distance de plus de 20 km.\n\nAu delà la navigation bascule automatiquement sur le service en ligne CloudMade.</string>
    <string name="specified_dir_doesnt_exist">Le dossier spécifié est introuvable.</string>
@ -370,13 +369,13 @@ Actuellement {2} Mo sont disponibles.</string>
    <string name="none_region_found">Aucune région trouvée sur la carte SD. Essayez d\'en télécharger une d\'internet.</string>
    <string name="poi_namefinder_query_empty">Paramètres de recherche pour trouver le PI</string>
    <string name="any_poi">Tout</string>
-    <string name="layer_transport_route">Itinéraires de transports publics</string>
+    
    <string name="thanks_yandex_traffic">Merci à Yandex de fournir des informations sur le trafic.</string>
    <string name="layer_yandex_traffic">Trafic Yandex</string>
    <string name="layer_route">Route</string>
    <string name="shared_string_favorites">Favoris</string>
    <string name="layer_osm_bugs">Notes OSM (en ligne)</string>
-    <string name="layer_transport">Arrêts de transports publics</string>
+    
    <string name="layer_poi">Points d\'intérêt…</string>
    <string name="layer_map">Carte en ligne…</string>
    <string name="menu_layers">Couches</string>
@ -887,7 +886,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri

    <string name="gps_wakeup_interval">Intervalle d\'activation du GPS: %s</string>
    <string name="email">courriel</string>
-    <string name="map_widget_day_night">Mode jour / nuit</string>
+    
    <string name="map_widget_vector_attributes">Attributs de rendu</string>
    <string name="select_navigation_mode">Sélectionnez le mode de transport</string>
 <string name="day_night_info_description">Lever : %1$s
@ -1594,7 +1593,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
    <string name="lock_screen_request_explanation">%1$s a besoin de cette permission pour éteindre l\'écran en mode économie d\'énergie.</string>
    <string name="shared_string_never">Jamais</string>

-    <string name="osmo_use_https_descr">Utiliser une connexion sécurisée avec le serveur</string>
+    
    <string name="osmo_use_https">Utiliser HTTPS</string>
    <string name="home_button">Accueil</string>
    <string name="search_for">Rechercher</string>
@ -2242,7 +2241,7 @@ Actuellement {2} Mo sont disponibles.</string>
    <string name="coords_format">Format des coordonnées</string>
    <string name="coords_format_descr">Format des coordonnées géographiques</string>
  	<string name="storage_directory_card">Carte mémoire</string>
-	<string name="shared_string_open_24_7">Ouvert 24/7</string>
+	
    <string name="shared_string_is_open_24_7">Ouvert 24/7</string>
    <string name="map_widget_search">Rechercher</string>
 	<string name="shared_string_from">de</string>
@ -2259,4 +2258,4 @@ Actuellement {2} Mo sont disponibles.</string>
    <string name="coords_search">Recherche de coordonnées</string>
    <string name="advanced_coords_search">Recherche avancée de coordonnées</string>
    <string name="dist_away_from_my_location">Recherche %1$s autour</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@ -343,7 +343,7 @@
 	<string name="poi_internet_cafe">Internet café</string>

 	<string name="poi_bank">Banco</string>
-	<string name="poi_atm">Caixeiro automático</string>
+	<string name="poi_amenity_atm">Caixeiro automático</string>
 	<string name="poi_money_lender">Prestamista</string>
 	<string name="poi_bureau_de_change">Oficina de cambio</string>
 	<string name="poi_accountant">Contábel</string>
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="fav_point_dublicate_message">O nome do punto favorito xa está usado; foi cambiado a %1$s para evitar os duplicados.</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="fav_point_dublicate_message">O nome do punto favorito xa está usado; foi cambiado a %1$s para evitar os duplicados.</string>
    <string name="text_size_descr">Configurar o tamaño da letra no mapa.</string>
    <string name="text_size">Tamaño da letra</string>
    <string name="traffic_warning_speed_limit">Límite de velocidade</string>
@ -653,7 +652,7 @@
 	<string name="day_night_info_description">Amencer: %1$s
 \nSolpor: %2$s</string>
 	<string name="day_night_info">Información sobre o día e a noite</string>
-	<string name="map_widget_day_night">Mapa diúrno/nocturo</string>
+	
 	<string name="map_widget_vector_attributes">Atributos de renderizado</string>
 	<string name="map_widget_renderer">Estilo de mapa</string>
 	<string name="layer_map_appearance">Configurar a pantalla</string>
@ -922,7 +921,7 @@
 	<string name="user_name">O seu nome de usuario en OSM</string>
 	<string name="open_street_map_login_descr">Precísase para os envíos a openstreetmap.org</string>
 	<string name="user_password">O seu contrasinal en OSM</string>
-	<string name="user_password_descr">Precísase para os envíos a openstreetmap.org</string>
+	
 	<string name="osmand_service">Modo de segundo plano</string>
 	<string name="osmand_service_descr">OsmAnd execútase en segundo plano cando a pantalla está apagada</string>
 	
@ -940,7 +939,7 @@
 	<string name="init_native_library">A inicializar a biblioteca nativa …</string>
 	<string name="choose_auto_follow_route">Centrar automaticamente a vista do mapa</string>
 	<string name="choose_auto_follow_route_descr">Tempo até que a vista do mapa se sincronice coa posición actual</string>
-	<string name="auto_follow_route_never">Nunca (toque en «Ir» para iniciar o guiado manualmente)</string>
+	
 	<string name="keep_informing_never">Nunca</string>
    <string name="keep_informing_descr">Anunciar de novo as instrucións de navegación a intervalos regulares</string>
    <string name="keep_informing">Repetir as instrucións de navegación</string>
@ -1145,7 +1144,7 @@
 	<string name="reading_cached_tiles">A ler as teselas gardadas temporalmente…</string>
 	<string name="version_index_is_big_for_memory">O índice «{0}» non cabe na memoria</string>
 	<string name="version_index_is_not_supported">Non se admite a versión do índice «{0}»</string>
-	<string name="use_osmand_routing_service">OsmAnd navigation &gt;20km</string>
+	
 	<string name="use_osmand_routing_service_descr">Empregar a navegación sen conexión de OsmAnd só para itinerarios &gt; 20 km (experimental)</string>
 	<string name="osmand_routing_experimental">A navegación sen conexión de OsmAnd é unha funcionalidade experimental e non funciona para distancias maiores duns 20 km.\n\nO servizo de navegación vai pasar temporalmente ao CloudMade, con conexión.</string>
 	<string name="specified_dir_doesnt_exist">Non é posíbel atopar o cartafol indicado.</string>
@ -1232,13 +1231,13 @@
 	<string name="none_region_found">Non foi posíbel atopar datos para as rexións no cartón SD. Descargue as rexións da Internet.</string>
 	<string name="poi_namefinder_query_empty">Introduza a consulta para atopar puntos de interese</string>
 	<string name="any_poi">Calquera</string>
-	<string name="layer_transport_route">Itinerario de transporte</string>
+	
 	<string name="thanks_yandex_traffic">Grazas a Yandex pola información sobre o tráfico.</string>
 	<string name="layer_yandex_traffic">Tráfico de Yandex</string>
 	<string name="layer_route">Itinerario</string>
 	<string name="shared_string_favorites">Favoritos</string>
 	<string name="layer_osm_bugs">Notas de OSM (con conexión)</string>
-	<string name="layer_transport">Paraxes de transporte</string>
+	
 	<string name="layer_poi">PdI…</string>
 	<string name="layer_map">Fonte de mapas…</string>
 	<string name="menu_layers">Capas do mapa</string>
@ -1552,7 +1551,7 @@
    <string name="use_opengl_render_descr">Empregar renderizado con OpenGL acelerado co hardware (podería non funcionar nalgúns dispositivos)</string>
    <string name="error_avoid_specific_road">Non foi posíbel atopar a estrada máis próxima</string>
    <string name="home_button">Inicio</string>
-    <string name="osmo_use_https_descr">Empregar unha conexión segura co servidor</string>
+    
    <string name="osmo_use_https">Empregar HTTPS</string>
 	
 	<string name="map_update">Hai actualizacións dispoñíbeis para %1$s mapas</string>
@ -2068,4 +2067,4 @@
    <string name="shared_string_undo_all">DESFACER TODO</string>
    <string name="rec_split_clip_length">Duración do vídeo</string>
    <string name="rec_split_clip_length_desc">A duración de cada vídeo gravado non excederá o intervalo de tempo indicado</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@ -61,7 +61,7 @@
 	<string name="day_night_info_description">זריחה : %1$s
 \nשקיעה : %2$s</string>
 	<string name="day_night_info">פרטי יום/לילה</string>
-	<string name="map_widget_day_night">מפת יום/לילה</string>
+	
 	<string name="map_widget_vector_attributes">מאפייני עיבוד תמונה:</string>
 	<string name="map_widget_renderer">סגנון עיבוד התמונה</string>
 	
@ -336,7 +336,7 @@
 	<string name="global_app_settings">הגדרות יישומים כלליות</string>
 	<string name="user_name">שם המשתמש שלך ב־OSM</string>
 	<string name="open_street_map_login_descr">נדרש לטובת שליחת נתונים אל openstreetmap.org</string>
-	<string name="user_password_descr">נדרש לטובת שליחת נתונים אל openstreetmap.org</string>
+	
 	<string name="user_password">הססמה שלך ב־OSM</string>
 	<string name="osmand_service">תכונת מצב השינה</string>
 	<string name="osmand_service_descr">יש להשתמש כדי להריץ את OsmAnd כאשר המסך כבוי</string>
@ -356,7 +356,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_navigation">מרכוז אוטומטי בעת ניווט בלבד</string>
 	<string name="auto_follow_route_navigation_descr">מרכוז אוטומטי של תצוגת המפה בעת ניווט בלבד.</string>
 	<string name="auto_follow_location_enabled">מרכוז אוטומטי של תצוגת המפה בעת שימוש.</string>
@ -657,13 +657,13 @@
 	<string name="none_region_found">לא נמצאו נתונים בלתי מקוונים לאזורים בכרטיס ה־SD. יש להוריד אזורים מהאינטרנט.</string>
 	<string name="poi_namefinder_query_empty">יש להזין שאילתת חיפוש כדי למצוא נ״ע</string>
 	<string name="any_poi">כלשהי</string>
-	<string name="layer_transport_route">מסלול תחבורה</string>
+	
 	<string name="thanks_yandex_traffic">תודות ל־Yandex על דיווחי התנועה.</string>
 	<string name="layer_yandex_traffic">תנועה מ־Yandex</string>
 	<string name="layer_route">מסלול</string>
 	<string name="shared_string_favorites">מועדפים</string>
 	<string name="layer_osm_bugs">תקלות ב־OSM</string>
-	<string name="layer_transport">תחנות תחבורה</string>
+	
 	
 	<string name="transport_Stop">תחנה</string>
 	<string name="transport_stops">תחנות</string>
@ -957,7 +957,7 @@
 <string name="search_history_street">רחוב:\n {0}, {1}</string>
 	
 	<string name="osmand_plus_long_description_1000_chars">" OsmAnd+‎ ‏(OSM הכוונת ניווט אוטומטית) OsmAnd+‎ הנו יישום ניווט בקוד פתוח עם גישה למגוון רחב של נתונים מ־OpenStreetMap‏ (OSM). ניתן לשמור את כל נתוני המפה על כרטיס הזיכרון של הטלפון לצורך שימוש ללא אינטרנט. OsmAnd מציעה גם תכונת טוויית מסלול הפועלת עם וללא אינטרנט וכוללת הנחייה קולית לכל פנייה ופנייה. OsmAnd+‎ הנה הגרסה בתשלום של היישום, רכישת גרסה זו מהווה הבעת תמיכה במיזם, מימון פיתוח של תכונות חדשות ומבטיחה קבלת עדכונים במהירות. חלק מתכונות הליבה: - אפשרות להפעלה ללא אינטרנט (איחסון וקטורים או אריחי מפות שהתקבלו לתיקייה נבחרת) - מפות וקטוריות דחוסות זמינות לכל חלקי העולם - הורדה בלתי מוגבלת של מפות לפי מדינה או אזור ישירות מהיישום - תכונת ויקיפדיה בלתי מקוונת (הורדת נ״ע מוויקיפדיה), מושלם לטיולים - ניתן להערים מספר שכבות של מפות, כמו GPX או דרכי ניווט, נקודות עניין, מועדפים, קווי מתאר, תחנות של תחבורה ציבורית, מפות נוספות עם שקיפות מותאמת - חיפוש בלתי מקוון של כתובות ומקומות (נ״ע) - תכנון מסלול לטווחים קצרים ללא חיבור לאינטרנט (ניסיוני) - מצבים לרכבים, אופניים והליכה ברגל עם: - החלפה אוטומטית בין מצבי יום/לילה - ניתן להגדיר תקריב מתכוונן בהתאם למהירות - יישור המפה בהתאם למצפן או לכיוון התנועה - ניתן להשתמש בהנחיות נתיבים, הצגת הגבלת מהירות, קולות הנחיה כטקסט לדיבור או בהקלטה "</string>
-	<string name="use_osmand_routing_service">ניווט עם OsmAnd של פחות מ־20 ק״מ</string>
+	
 	<string name="use_osmand_routing_service_descr">הניווט הבלתי מקוון של OsmAnd תקף אך ורק למסלולים של פחות מ־20 ק״מ (ניסיוני)</string>
 	<string name="osmand_long_description_1000_chars">" OsmAnd ‏(OSM הכוונת ניווט אוטומטית) OsmAnd הנו יישום ניווט בקוד פתוח עם גישה למגוון רחב של נתונים מ־OpenStreetMap‏ (OSM). ניתן לשמור את כל נתוני המפה על כרטיס הזיכרון של הטלפון לצורך שימוש ללא אינטרנט. OsmAnd מציעה גם תכונת טוויית מסלול הפועלת עם וללא אינטרנט וכוללת הנחייה קולית לכל פנייה ופנייה. חלק מתכונות הליבה: - אפשרות להפעלה ללא אינטרנט (איחסון וקטורים או אריחי מפות שהתקבלו לתיקייה נבחרת) - מפות וקטוריות דחוסות זמינות לכל חלקי העולם - הורדה בלתי מוגבלת של מפות לפי מדינה או אזור ישירות מהיישום - תכונת ויקיפדיה בלתי מקוונת (הורדת נ״ע מוויקיפדיה), מושלם לטיולים - ניתן להערים מספר שכבות של מפות, כמו GPX או דרכי ניווט, נקודות עניין, מועדפים, קווי מתאר, תחנות של תחבורה ציבורית, מפות נוספות עם שקיפות מותאמת - חיפוש בלתי מקוון של כתובות ומקומות (נ״ע) - תכנון מסלול לטווחים קצרים ללא חיבור לאינטרנט (ניסיוני) - מצבים לרכבים, אופניים והליכה ברגל עם: - החלפה אוטומטית בין מצבי יום/לילה - ניתן להגדיר תקריב מתכוונן בהתאם למהירות - יישור המפה בהתאם למצפן או לכיוון התנועה - ניתן להשתמש בהנחיות נתיבים, הצגת הגבלת מהירות, קולות הנחיה כטקסט לדיבור או בהקלטה מגבלות של גרסה חופשית זו של OsmAnd: - מספר הורדות המפה מוגבלות - אין גישה לנ״ע בוויקיפדיה באופן בלתי מקוון. התכנית OsmAnd נמצאת בפיתוח פעיל והמיזם שלנו והמשך התהליך נתמך על תרומות כלכליות למימון הפיתוח והבדיקות של התכונות החדשות. נא לשקול לקנות את OsmAnd+‎ או לממן תכונות חדשות באופן נקודתי או לתרום תרומה כללית דרך osmand.net "</string>
 	<string name="rendering_attr_showRoadMaps_description">נא לבחור מתי להציג מפות לדרכים בלבד:</string>
--- a/OsmAnd/res/values-hr/strings.xml
+++ b/OsmAnd/res/values-hr/strings.xml
@ -114,7 +114,7 @@
 	<string name="day_night_info_description">Izlazak sunca: %1$s
 \nZalazak sunca: %2$s</string>
 	<string name="day_night_info">Informacije dan/noć</string>
-	<string name="map_widget_day_night">Dnevna / noćna karta</string>
+	
 	<string name="map_widget_renderer">Stil karte</string>
 	
 	
@ -454,10 +454,10 @@
 	<string name="layer_map">Izvor karte-…</string>
 	<string name="menu_layers">Odredite prikaz</string>
 	<string name="context_menu_item_search_poi">Traži POI</string>
-	<string name="layer_transport">Postaje javnog prijevoza</string>
+	
 	<string name="layer_poi">POI…</string>
 	
-	<string name="layer_transport_route">Putovi javnoga prijevoza</string>
+	
 	<string name="layer_route">Ruta</string>
 	<string name="shared_string_favorites">Favoriti</string>
 	<string name="layer_osm_bugs">OSM bugovi</string>
@ -513,7 +513,7 @@
 	<string name="maps_could_not_be_downloaded">Ova karta se ne može preuzeti</string>
 	<string name="daynight">Dnevni/noćni način rada</string>
 	<string name="daynight_descr">Odaberite pravilo za izmjenu između dnevnog i noćnog načina rada</string>
-	<string name="use_osmand_routing_service_descr">Koristite OsmAnd offline navigaciju samo na rutama manjim od 20 km (eksperimentalno)</string>
+	
 	<string name="poi_filter_custom_filter">Prilagođeni filtar</string>
 	<string name="indexing_map">Indeksiranje karte…</string>
 	<string name="indexing_poi">Indeksiranje POI…</string>
@ -700,7 +700,7 @@
 	<string name="specified_dir_doesnt_exist">Ne mogu pronaći određenu mapu.</string>
 	<string name="osmand_routing_experimental">OsmAnd offline navigacija je eksperimentalna značajka i ne radi na udaljenosti većoj od oko 20 km.\n\nNavigacija je privremeno prebačena na online CloudMade.</string>
 	<string name="poi_filter_namefinder">Online NameFinder</string>
-	<string name="use_osmand_routing_service">OsmAnd navigacija &gt;20km</string>
+	
 	<string name="poi_filter_closest_poi">Najbliže POI</string>
 	<string name="amenity_type_sustenance">Prehrana</string>
 	<string name="amenity_type_man_made">Građevine</string>
@ -804,7 +804,7 @@
 	<string name="auto_follow_route_navigation_descr">Automatski centriraj prikaz karte samo tijekom navigacije.</string>
 	<string name="auto_follow_location_enabled">Automatsko centriranje karte je uključeno.</string>
 	<string name="auto_follow_route_navigation">Automatsko centriranje samo tijekom navigacije</string>
-	<string name="auto_follow_route_never">Nikad</string>
+	
 	<string name="choose_auto_follow_route">Automatsko centriranje karte</string>
 	<string name="choose_auto_follow_route_descr">Vrijeme dok se prikaz karte sinkronizira s trenutnom pozicijom</string>
 	<string name="use_transparent_map_theme">Prozirna tema</string>
@ -818,7 +818,7 @@
 	<string name="osmand_service">Mogućnosti stanja mirovanja</string>
 	<string name="osmand_service_descr">Koristite za pokretanje OsmAnd-a dok je zaslon isključen</string>
 	<string name="open_street_map_login_descr">To je potrebno za prijenos podataka na openstreetmap.org</string>
-	<string name="user_password_descr">To je potrebno za prijenos podataka na openstreetmap.org</string>
+	
 	<string name="user_name">Vaše OSM korisničko ime</string>
 	<string name="global_app_settings">Opće postavke aplikacije</string>
 	<string name="global_settings">Opće postavke</string>
@ -1280,7 +1280,7 @@
    
    <string name="osmo_show_group_notifications_descr">Prikaži obavjest kada se korisnik pridruži ili napusti grupu</string>
    <string name="osmo_regenerate_login_ids">Regenerirajte korisničko ime</string>
-    <string name="osmo_use_https_descr">Koristiti sigurnu vezu s poslužiteljem</string>
+    
    <string name="osmo_use_https">Koristiti HTTPS</string>
 	
 	<string name="lock_screen_request_explanation">%1$s treba dozvolu za isključivanje zaslona za značajku uštede energije.</string>
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@ -211,7 +211,7 @@
 	<string name="poi_hairdresser">Fodrász</string>
 	<string name="poi_car_rental">Autókölcsönző</string>
 	<string name="poi_bank">Bank</string>
-	<string name="poi_atm">Bankautomata</string>
+	<string name="poi_amenity_atm">Bankautomata</string>
 	<string name="poi_bureau_de_change">Pénzváltó</string>
 	<string name="poi_accountant">Könyvelő</string>
 	<string name="poi_cave_entrance">Barlangbejárat</string>
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
    <string name="send_files_to_osm">GPX fájl küldése OSM-re?</string>
    <string name="gpx_visibility_txt">Láthatóság</string>
    <string name="gpx_tags_txt">Címkék</string>
@ -125,7 +124,7 @@
    <string name="user_name">OSM felhasználóneved</string>
    <string name="open_street_map_login_descr">openstreetmap.org felé történő adatküldéshez szükséges</string>
    <string name="user_password">OSM jelszavad</string>
-    <string name="user_password_descr">openstreetmap.org felé történő adatküldéshez szükséges</string>
+    
    <string name="osmand_service">Háttér mód</string>
    <string name="osmand_service_descr">Az OsmAnd háttérben fut, ha ki van kapcsolava a képernyő</string>

@ -142,7 +141,7 @@
    <string name="init_native_library">Natív renderelő inicializálása…</string>
    <string name="choose_auto_follow_route">Automatikus követés ideje</string>
    <string name="choose_auto_follow_route_descr">Válaszd ki, mennyi idő múlva ugorjon vissza a térkép a pozíciódhoz</string>
-    <string name="auto_follow_route_never">Soha (a vezetés kézi indításához koppintson az „Indításra”)</string>
+    
    <string name="auto_follow_route_navigation">Követés csak navigáció közben</string>
    <string name="auto_follow_route_navigation_descr">Csak navigáció közben követi automatikusan a pozíciódat a térkép.</string>
    <string name="auto_follow_location_enabled">Automatikus követés.</string>
@ -349,7 +348,7 @@
    <string name="version_index_is_big_for_memory">A(z) \'\'{0}\'\' indexadat nem fér a memóriába</string>
    <string name="version_index_is_not_supported">\'\'{0}\'\' index verziója nem támogatott</string>
    <string name="osmand_net_previously_installed">Már telepítettél egy korábbi OsmAnd verziót. Minden internettől független adat használható az új alkalmazással. A Kedvenc pontokat a régi alkalmazásból érdemes kimenteni és az újba betölteni.</string>
-    <string name="use_osmand_routing_service">OsmAnd útvonaltervező &amp;gt;20km</string>
+    
    <string name="use_osmand_routing_service_descr">OsmAnd offline útvonaltervező használata nagy távolságokra is (kísérleti funkció)</string>
    <string name="osmand_routing_experimental">Az OsmAnd offline útvonaltervezője kísérleti funkció és nem működik 20 kilométernél nagyobb távolságban.\n\nÁtmenetileg átállítva online Cluodmade-re.</string>
    <string name="specified_dir_doesnt_exist">Nem található a megadott könyvtár.</string>
@ -435,13 +434,13 @@
    <string name="none_region_found">Nem található régió az SD kártyán. Próbálj az internetről letölteni régiót.</string>
    <string name="poi_namefinder_query_empty">POI kiválasztáshoz írj be keresést</string>
    <string name="any_poi">Bármely</string>
-    <string name="layer_transport_route">Közlekedési útvonal</string>
+    
    <string name="thanks_yandex_traffic">Köszönet a Yandexnek a forgalmi információkért.</string>
    <string name="layer_yandex_traffic">Yandex forgalmi információ</string>
    <string name="layer_route">Útvonal</string>
    <string name="shared_string_favorites">Kedvencek</string>
    <string name="layer_osm_bugs">OSM Jegyzetek (online)</string>
-    <string name="layer_transport">Közlekedési megállók</string>
+    
    <string name="layer_poi">POI…</string>
    <string name="layer_map">Térképforrás…</string>
    <string name="menu_layers">Térképrétegek</string>
@ -889,7 +888,7 @@
    <string name="select_navigation_mode">Közlekedési mód kiválasztása</string>
    <string name="day_night_info_description">Napkelte : %1$s \nNapnyugta : %2$s</string>
    <string name="day_night_info">Nappal/éjjel információ</string>
-    <string name="map_widget_day_night">Nappali/éjjeli térképmód</string>
+    
    <string name="map_widget_vector_attributes">Megjelenítési jellemzők</string>
    <string name="map_widget_renderer">Térkép megjelenítési stílus</string>

@ -1591,7 +1590,7 @@ A csoport nem lesz törölve néhány hónap múlva, az OsMo.mobi weboldalon lé
    <string name="shared_string_never">Soha</string>
    <string name="error_avoid_specific_road">Nem található kerülőút</string>
    <string name="home_button">Kezdőlap</string>
-    <string name="osmo_use_https_descr">Biztonságos kapcsolat használata a kiszolgálóval</string>
+    
    <string name="osmo_use_https">HTTPS használata</string>

    <string name="map_update">Frissítés érhető el %1$s térképhez</string>
@ -2237,4 +2236,4 @@ A csoport nem lesz törölve néhány hónap múlva, az OsMo.mobi weboldalon lé
    <string name="shared_string_from">innen</string>
    <string name="coords_search">Koordináta keresés</string>
    <string name="city_type_neighbourhood">Városrész</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-id/strings.xml
+++ b/OsmAnd/res/values-id/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="address_search_desc">Mencari alamat</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="address_search_desc">Mencari alamat</string>
  <string name="navpoint_search_desc">Koordinat</string>
  <string name="transport_search_desc">Mencari transportasi</string>
  <string name="favourites_search_desc">Mencari favorit</string>
@ -73,4 +72,4 @@
    <string name="osm_live_subscription_settings">Pengaturan berlangganan</string>
    <string name="osm_live_ask_for_purchase">Harap beli berlangganan OSM Live terlebih dahulu</string>

-    </resources>
+    </resources>
--- a/OsmAnd/res/values-it/phrases.xml
+++ b/OsmAnd/res/values-it/phrases.xml
@ -262,7 +262,7 @@
 	<string name="poi_cave_entrance">Entrata grotta/caverna</string>
 	<string name="poi_bitcoin_yes">Pagamento Bitcoin</string>

-	<string name="poi_atm">Bancomat</string>
+	<string name="poi_amenity_atm">Bancomat</string>
 	<string name="poi_bank">Banca</string>
 	<string name="poi_internet_cafe">Internet caffè</string>

--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
    <string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
    <string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi</string>
    <string name="offline_edition">Modifiche offline</string>
@ -47,7 +46,7 @@
    <string name="user_name">Nome utente in OSM</string>
    <string name="open_street_map_login_descr">Necessario per inviare contributi a openstreetmap.org</string>
    <string name="user_password">Password in OSM</string>
-    <string name="user_password_descr">Necessaria per inviare contributi a openstreetmap.org</string>
+    
    <string name="osmand_service">"Modalità  backgraund"</string>
    <string name="osmand_service_descr">OsmAnd, a schermo spento, è eseguito in background</string>

@ -64,7 +63,7 @@
    <string name="init_native_library">Inizializzazione libreria nativa…</string>
    <string name="choose_auto_follow_route">Centra automaticamente la mappa</string>
    <string name="choose_auto_follow_route_descr">Scegli intervallo di tempo per seguire automaticamente la posizione attuale</string>
-    <string name="auto_follow_route_never">Mai (tap \'Vai\' per avviare la navigazione manualmente)</string>
+    
    <string name="auto_follow_route_navigation">Centra automaticamente solo in navigazione</string>
    <string name="auto_follow_route_navigation_descr">Centra automaticamente la visione della mappa solo durante la navigazione.</string>
    <string name="auto_follow_location_enabled">Visualizzazione mappa centrata automaticamente.</string>
@ -259,7 +258,7 @@
    <string name="reading_cached_tiles">Lettura anteprime dalla cache…</string>
    <string name="version_index_is_big_for_memory">L\'indice \'\'{0}\'\' è troppo grande per l\'attuale memoria</string>
    <string name="version_index_is_not_supported">La versione dell\'indice \'\'{0}\'\' non è supportata</string>
-    <string name="use_osmand_routing_service">Routing OsmAnd &gt; 20km</string>
+    
    <string name="use_osmand_routing_service_descr">L\'uso della navigazione offline OsmAnd si applica solo alle rotte&gt; 20 km (sperimentale)</string>
    <string name="osmand_routing_experimental">Il routing offline di OsmAnd è sperimentale e non funziona per distanze superiori ai 20 km.\n\nIl servizio routing viene fornito temporaneamente tramite CloudMade online.</string>
    <string name="specified_dir_doesnt_exist">Impossibile trovare la cartella specificata.</string>
@ -343,12 +342,12 @@
    <string name="none_region_found">Non è stata trovato nessuna dato per la regione nella scheda SD. Scarica una regione da internet.</string>
    <string name="poi_namefinder_query_empty">Inserisci i parametri di ricerca per trovare un PDI</string>
    <string name="any_poi">Tutti</string>
-    <string name="layer_transport_route">Percorso su trasporto pubblico</string>
+    
    <string name="thanks_yandex_traffic">Grazie a Yandex per le informazioni sul traffico.</string>
    <string name="layer_yandex_traffic">Yandex (traffico)</string>
    <string name="layer_route">Percorso</string>
    <string name="layer_osm_bugs">Note OSM (online)</string>
-    <string name="layer_transport">Fermate trasporto pubblico</string>
+    
    <string name="layer_poi">PDI…</string>
    <string name="layer_map">Sorgente mappa…</string>
    <string name="menu_layers">Strati mappa</string>
@ -842,7 +841,7 @@
 <string name="day_night_info_description">Alba: %1$s
 \nTramonto: %2$s</string>
    <string name="day_night_info">Informazioni giorno/notte</string>
-    <string name="map_widget_day_night">Mappa giorno/notte</string>
+    
    <string name="map_widget_vector_attributes">Attributi del disegno</string>
    <string name="map_widget_renderer">Stile della mappa</string>

@ -1567,7 +1566,7 @@
    <string name="wake_on_voice_descr">Accendi lo schermo (se spento) all\'approssimarsi di una svolta</string>
    <string name="lock_screen_request_explanation">%1$s necessita di questa autorizzazione per spegnere lo schermo per la funzionalità di risparmio energetico.</string>

-    <string name="osmo_use_https">Usa HTTPS</string>
+    
    <string name="osmo_use_https_descr">Usa la connessione sicura al server</string>
    <string name="coordinates">Coordinate</string>
    <string name="home_button">Schermata iniziale</string>
@ -2153,7 +2152,7 @@
    <string name="rendering_attr_showMtbRoutes_name">Mostra i percorsi MTB</string>
    <string name="select_map_markers">Scegli i marcatori della mappa</string>
    <string name="shared_string_reverse_order">Inverti l\'ordine</string>
-    <string name="show_map_markers">Marcatori mappa</string>
+    
    <string name="show_map_markers_description">Attiva la funzionalità marcatori mappa</string>
    <string name="clear_active_markers_q">Vuoi eliminare tutti i marcatori attivi?</string>
    <string name="clear_markers_history_q">Vuoi eliminare la cronologia dei marcatori della mappa?</string>
@ -2163,7 +2162,7 @@
    <string name="add_points_to_map_markers_q">Vuoi aggiungere tutti i punti ai marcatori mappa?</string>
    <string name="shared_string_add_to_map_markers">Aggiungi marcatori alla mappa</string>
    <string name="consider_turning_polygons_off">È consigliato disabilitare il disegno dei poligoni.</string>
-    <string name="show_map_markers_topbar">Mostra la barra superiore dei Marcatori della Mappa</string>
+    
    <string name="map_marker_1st">Primo marcatore mappa</string>
    <string name="map_marker_2nd">Secondo marcatore mappa</string>
    <string name="shared_string_toolbar">Barra strumenti</string>
@ -2273,4 +2272,4 @@
    <string name="storage_directory_card">Scheda di memoria</string>
    <string name="coords_format">Formato coordinate</string>
    <string name="coords_format_descr">Formato per le coordinate geografiche</string>
-  	</resources>
+  	</resources>
--- a/OsmAnd/res/values-ja/phrases.xml
+++ b/OsmAnd/res/values-ja/phrases.xml
@ -677,7 +677,7 @@
 	<string name="poi_crematorium">火葬場(Crematorium)</string>
 	<string name="poi_internet_cafe">ネットカフェ(Internet cafe)</string>

-	<string name="poi_atm">ATM・CD(ATM)</string>
+	<string name="poi_amenity_atm">ATM・CD(ATM)</string>
 	<string name="poi_money_lender">消費者金融(Money lender)</string>
 	<string name="poi_pawnbroker">質屋(Pawnbroker)</string>
 	<string name="poi_bureau_de_change">両替商・両替機(Bureau de change)</string>
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="installing_new_resources">新しいデータを展開中…</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="installing_new_resources">新しいデータを展開中…</string>
     <string name="internet_connection_required_for_online_route">オンライン経路案内を使用しようとしていますが
 インターネット接続されていません。</string>
     <string name="tts_language_not_supported_title">未サポート言語</string>
@ -148,7 +147,7 @@
     <string name="version_index_is_big_for_memory">\'\'{0}\'\' の項目はメモリ内に格納できませんでした</string>
     <string name="version_index_is_not_supported">\'\'{0}\'\' は、このバージョンではサポートされていません</string>

-     <string name="use_osmand_routing_service">OsmAnd 経路案内 &gt;20km</string>
+     
     <string name="use_osmand_routing_service_descr">長距離のオフライン経路案内に OsmAndを使用します(実験版)</string>
     <string name="osmand_routing_experimental">OsmAndオフライン経路案内は実験的な機能であり
 20km以上の距離では動作しません。
@ -267,13 +266,13 @@ MB)をダウンロードしますか?</string>
     <string name="poi_namefinder_query_empty">検索クエリを入力してPOIを探す</string>
     <string name="any_poi">すべて</string>

-     <string name="layer_transport_route">交通機関ルート</string>
+     
     <string name="thanks_yandex_traffic">Yandexの交通情報に感謝します。</string>
     <string name="layer_yandex_traffic">Yandex交通情報</string>
     <string name="layer_route">ルート</string>
     <string name="shared_string_favorites">お気に入り</string>
     <string name="layer_osm_bugs">OSM bugs</string>
-     <string name="layer_transport">交通機関乗降場</string>
+     
     <string name="layer_poi">POI…</string>
     <string name="layer_map">マップソース…</string>
     <string name="menu_layers">ビュー定義</string>
@ -446,7 +445,7 @@ POIの更新は利用できません</string>
 
 <string name="use_online_routing_descr">ルート計算にインターネットを使用します</string>
 <string name="use_online_routing">オンラインルーティングを使用</string>
- <string name="user_password_descr">あなたのOSM パスワードを入力します</string>
+ 
 <string name="user_password">OSM パスワード</string>
 <string name="osm_settings_descr">Openstreetmap.org (OSM)にデータを提出する際に必要な項目の設定します</string>
 
@ -869,7 +868,7 @@ POIの更新は利用できません</string>
 	<string name="select_navigation_mode">トランスポートモードの選択</string>
 	<string name="day_night_info_description">日の出: %1$s \n日の入: %2$s</string>
 	<string name="day_night_info">昼/夜の情報</string>
-	<string name="map_widget_day_night">日中/夜間モード</string>
+	
 	<string name="map_widget_vector_attributes">描画方法の属性</string>
 	<string name="map_widget_renderer">マップスタイル</string>
 	
@ -1152,7 +1151,7 @@ POIの更新は利用できません</string>
 	<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_navigation">ナビゲーションのみ</string>
 	<string name="auto_follow_route_navigation_descr">マップの自動中心表示はナビゲーション中のみ有効です</string>
 	<string name="auto_follow_location_enabled">設定に従い、現在地をマップ中心に表示します。</string>
@ -1658,7 +1657,7 @@ POIの更新は利用できません</string>
    
    <string name="text_size_descr">マップ上の文字サイズを設定します。</string>
    <string name="text_size">文字サイズ</string>
-    <string name="osmo_use_https_descr">サーバー接続にセキュリティで保護された接続を使用します</string>
+    
    <string name="osmo_use_https">HTTPSを使用</string>
 	
 	<string name="rendering_attr_tramTrainRoutes_name">路面電車や鉄道での経路</string>
@ -2340,4 +2339,4 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
    <string name="lang_hu_formal">ハンガリー語(フォーマル)</string>
    <string name="map_widget_bearing">相対方位</string>
    <string name="map_widget_magnetic_bearing">磁方位</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="offline_navigation_not_available">OsmAnd-ით ნავიგაცია გათიშულ რეჟიმში დროებით მიუწვდომელია.</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="offline_navigation_not_available">OsmAnd-ით ნავიგაცია გათიშულ რეჟიმში დროებით მიუწვდომელია.</string>
  <string name="left_side_navigation">მარცხენა ხელით ტარება</string>
  <string name="left_side_navigation_descr">აირჩიეთ მარცხენა მხარეს საჭის გამომყენებელი ქვეყნებისათვის</string>
  
@ -167,7 +166,7 @@
  <string name="user_name">თქვენი OSM-ს მომხმარებლის სახელი</string>
  <string name="open_street_map_login_descr">საჭიროა openstreetmap.org-ზე ოპერაციებისათვის</string>
  <string name="user_password">თქვენი OSM-ს პაროლი</string>
-  <string name="user_password_descr">საჭიროა openstreetmap.org-ზე ოპერაციებისათვის</string>
+  
  <string name="osmand_service">ფონური პარამეტრები</string>
  <string name="osmand_service_descr">გამოიყენეთ OsmAnd-ის ეკრანის გათიშულობის დროს გამოსაყენებლად</string>
  
@ -188,7 +187,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_navigation">მხოლოდ ავტოცენტრირებული ნავიგაცია</string>
  <string name="auto_follow_route_navigation_descr">ავტოცენტრირებული რუკის ხედვა მხოლოდ ნავიგაციის დროს.</string>
  <string name="auto_follow_location_enabled">გამოიყენება ავტოცენტრირებული რუკის ხედი.</string>
@ -406,7 +405,7 @@
  <string name="reading_cached_tiles">მიმდინარეობს ნაწილების კითხვა…</string>
  <string name="version_index_is_big_for_memory">ინდექსი \'\'{0}\'\' არ ეტევა მეხსიერებაში</string>
  <string name="version_index_is_not_supported">ინდექსის ვერსიის \'\'{0}\'\' მხარდაჭერა არ არსებობს</string>
-  <string name="use_osmand_routing_service">OsmAnd-ის ნავიგაცია &gt;20კმ</string>
+  
  <string name="use_osmand_routing_service_descr">OsmAnd-ის გათიშული ნავიგაცია მუშაობს მხოლოდ გზებზე რომლებიც &gt; 20 კმ (საცდელი)</string>
  <string name="osmand_routing_experimental">OsmAnd-ის გათიშული ნავიგაცია არის საცდელი თვისება რომებიც არ მუშაობს 20 კმ-ზე მეტი მანძილებისათვის.\n\nნავიგაციის სერვისი დროებით გადართულია მიმდინარე სერვისზე CloudMade.</string>
  <string name="specified_dir_doesnt_exist">შეუძლებელია მითითებული დასტის პოვნა.</string>
@ -492,13 +491,13 @@
  <string name="none_region_found">გათიშული მონაცემები რაიონისათვის SD card-ზე ნაპოვნი არაა. გთხოვთ გადმოწეროთ ინტერნეტიდან.</string>
  <string name="poi_namefinder_query_empty">შეიტანეთ მონაცემები POI-ის მოსაძებნად</string>
  <string name="any_poi">ნებისმიერი</string>
-  <string name="layer_transport_route">ტრანსპორტის გზა</string>
+  
  <string name="thanks_yandex_traffic">მადლობა Yandex-ს ტრაფიკის ინფორმაციისათვის.</string>
  <string name="layer_yandex_traffic">Yandex ტრაფიკი</string>
  <string name="layer_route">გზა</string>
  <string name="shared_string_favorites">რჩეულები</string>
  <string name="layer_osm_bugs">OSM-ის ხოჭოები</string>
-  <string name="layer_transport">ტრანსპორტის გაჩერება</string>
+  
  <string name="layer_poi">POI…</string>
  <string name="layer_map">რუკის წყარო…</string>
  <string name="menu_layers">ხედის აღწერა</string>
@ -895,7 +894,7 @@
  <string name="bg_service_sleep_mode_on">ძილის რეჟიმის ჩართვა</string>
 <string name="filterpoi_activity">POI ფილტრის შექმნა</string>
 <string name="day_night_info">ინფორმაცია დღეღამის შესახებ</string>
-<string name="map_widget_day_night">დღეღამის რუკა</string>
+
 <string name="map_widget_vector_attributes">რენდერის ატრიბუტები:</string>


@ -1293,4 +1292,4 @@
    <string name="access_direction_audio_feedback">მიმართულებების აუდიოკარნახი</string>
    <string name="use_osm_live_routing">OSM ცოცხალი ნავიგაცია</string>
    <string name="access_no_destination">დანიშნულება მითითებული არაა</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-kn/strings.xml
+++ b/OsmAnd/res/values-kn/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="lang_es_ar">ಅರ್ಜಿಂಟಿನೆಯಾದ ಸ್ಪೇನಿಷ್</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="lang_es_ar">ಅರ್ಜಿಂಟಿನೆಯಾದ ಸ್ಪೇನಿಷ್</string>
    <string name="lang_th">ಥಾಯಿ</string>
    <string name="lang_te">ತೆಲುಗು</string>
    <string name="lang_nn"/>
@ -149,7 +148,7 @@
    <string name="download_tab_local">ಸ್ಥಳಿಯ</string>
 	<string name="everything_up_to_date">ಎಲ್ಲಾ ಕಡತಗಳು ಇಂದಿನವಾಗಿವೆ</string>
    <string name="home_button">ಆಗರ</string>
-    <string name="osmo_use_https">HTTPS ಅನ್ನು ಬಳಸಿ</string>
+    
 	<string name="search_for">ಇದನ್ನು ಹುಡುಕಿ</string>
 	<string name="coordinates">ನಿರ್ದೇಶಾಂಕಗಳು</string>
 	<string name="impassable_road">ರಸ್ತೆಗಳನ್ನು ತಪ್ಪಿಸಿ…</string>
@ -244,4 +243,4 @@
    <string name="lang_ta">ತಮಿಳು</string>
    <string name="lang_ml">ಮಲಯಾಳಂ</string>
    <string name="shared_string_import2osmand">ಒಸ್ಮಾಂಡ್‌ಗೆ ಆಮದುಮಾಡಿ</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-ko/phrases.xml
+++ b/OsmAnd/res/values-ko/phrases.xml
@ -547,7 +547,7 @@
 	<string name="poi_internet_cafe">인터넷 카페</string>

 	<string name="poi_bank">은행</string>
-	<string name="poi_atm">현금 지급기</string>
+	<string name="poi_amenity_atm">현금 지급기</string>
 	<string name="poi_money_lender">대부업자</string>
 	<string name="poi_pawnbroker">전당포</string>
 	<string name="poi_bureau_de_change">변경소</string>
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="vector_maps_may_display_faster_on_some_devices">벡터 맵이 더욱 빠르게 표시됩니다. 하지만, 어떤 기기에서는 잘 작동하지 않을 수 있습니다.</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="vector_maps_may_display_faster_on_some_devices">벡터 맵이 더욱 빠르게 표시됩니다. 하지만, 어떤 기기에서는 잘 작동하지 않을 수 있습니다.</string>
 	
 	<string name="play_commands_of_currently_selected_voice">현재 선택된 음성 명령을 재생합니다</string>
 	<string name="debugging_and_development">OsmAnd 개발</string>
@ -111,7 +110,7 @@
 	<string name="user_name">OSM 사용자 이름</string>
 	<string name="open_street_map_login_descr">http://openstreetmap.org 에 데이터 제출을 위해 필요합니다</string>
 	<string name="user_password">OSM 패스워드</string>
-	<string name="user_password_descr">http://openstreetmap.org 에 데이터를 제출하기 위해 필요합니다</string>
+	
 	<string name="osmand_service">절전 모드</string>
 	<string name="osmand_service_descr">화면이 꺼져 있는 동안에도 OsmAnd 를 실행하기 위해 사용합니다</string>
 	
@ -143,7 +142,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 : 수동으로 음성안내를 시작하려면 \'Go\'를 탭하세요)</string>
+	
 	<string name="auto_follow_route_navigation">자동-센터 운행 전용</string>
 	<string name="auto_follow_route_navigation_descr">운행 중에만 자동-센터 지도 보기를 사용합니다.</string>
 	<string name="auto_follow_location_enabled">자동-센터 지도 보기 사용 중입니다.</string>
@ -373,7 +372,7 @@
 	<string name="version_index_is_big_for_memory">인덱스 \'\'{0}\'\' 가 메모리에 적합하지 않습니다</string>
 	<string name="version_index_is_not_supported">인덱스 \'\'{0}\'\' 버전은 지원되지 않습니다</string>

-	<string name="use_osmand_routing_service">OsmAnd 라우팅 서비스 &gt;20km</string>
+	
 	<string name="use_osmand_routing_service_descr">20km 이상 긴 거리를 위해 CloudMade 대신에 OsmAnd 오프라인 라우팅을 사용합니다</string>
 	<string name="osmand_routing_experimental">OsmAnd 오프라인 라우팅은 실험적인 기능이며 20 km 이상의 거리에서는 동작하지 않습니다.\n\n라우팅 서비스는 일시적으로 온라인서비스인 CloudMade로 변경합니다.</string>
 	<string name="specified_dir_doesnt_exist">지정한 폴더를 찾을 수 없습니다.</string>
@ -466,12 +465,12 @@
 	<string name="poi_namefinder_query_empty">POI를 찾는 검색어를 입력하세요</string>
 	<string name="any_poi">어떤</string>
 	
-	<string name="layer_transport_route">대중교통 경로</string>
+	
 	<string name="thanks_yandex_traffic">교통 정보를 위해 Yandex 를 이용합니다.</string>
 	<string name="layer_yandex_traffic">Yandex 트래픽</string>
 	<string name="layer_route">경로</string>
 	<string name="layer_osm_bugs">OSM Notes (온라인)</string>
-	<string name="layer_transport">대중교통 정류소</string>
+	
 	<string name="layer_poi">POI…</string>
 	<string name="layer_map">맵 소스…</string>
 	<string name="menu_layers">계층 지도</string>
@ -1230,7 +1229,7 @@
 	<string name="select_navigation_mode">전송 모드 선택</string>
 	<string name="day_night_info_description">일출: %1$s \n일몰: %2$s</string>
 	<string name="day_night_info">주간/야간 정보</string>
-	<string name="map_widget_day_night">주간/야간 지도</string>
+	
 	<string name="map_widget_vector_attributes">렌더링 속성</string>
 	<string name="map_widget_renderer">지도 스타일</string>
 	
@ -1797,7 +1796,7 @@
    <string name="wake_on_voice_descr">교차로에 접근할 때 화면 켜기</string>
    <string name="lock_screen_request_explanation">%1$s 의 절전 기능에 대한 화면을 해제 하려면 이 권한이 필요 합니다.</string>
    
-	<string name="osmo_use_https">HTTPS 사용하기</string>
+	
 	<string name="osmo_use_https_descr">서버에 보안 연결 이용</string>
    <string name="home_button">홈 화면</string>
    <string name="map_update">업데이트할 %1$s 지도가 있습니다</string>
@ -2246,6 +2245,6 @@
    <string name="rendering_value_thin_name"/>
    <string name="rendering_value_medium_name"/>
    <string name="rendering_value_bold_name"/>
-    <string name="no_map_markers_found"></string>
+    <string name="no_map_markers_found"/>
    <string name="no_waypoints_found"/>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-ku/strings.xml
+++ b/OsmAnd/res/values-ku/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>    
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>    
 	
    <string name="local_indexes_cat_av">زانیاری دەنگ/ڤیدیۆ</string>
    <string name="stop_routing_confirm">دڵنیای له وەی که ئه ته وێت ناڤیگێشن راگریت</string>
@ -94,4 +93,4 @@
    <string name="reports_for">Ji bo raporkirina</string>
 <string name="update_now">Niha Rojaneyîke</string>
    <string name="update">Hemû rojanekirî</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
    <string name="starting_point_too_far">Pradžios taškas yra per toli nuo artimiausio kelio.</string>
    <string name="shared_location">Bendrinta vieta</string>
    <string name="osmand_parking_warning">Dėmesio</string>
@ -215,7 +214,7 @@
    <string name="user_name">Jūsų OSM vartotojo vardas</string>
    <string name="open_street_map_login_descr">Reikalingas norint teikti duomenis į openstreetmap.org</string>
    <string name="user_password">Jūsų OSM slaptažodis</string>
-    <string name="user_password_descr">Reikalingas norint teikti duomenis į openstreetmap.org</string>
+    
    <string name="osmand_service">Foninis režimas</string>
    <string name="osmand_service_descr">Reikalinga, jei norite naudoti OsmAnd kai ekranas yra išjungtas</string>

@ -229,7 +228,7 @@
    <string name="init_native_library">Inicializuojama aparatinė biblioteka…</string>
    <string name="choose_auto_follow_route">Automatinis žemėlapio centravimas</string>
    <string name="choose_auto_follow_route_descr">Laikas po kurio žemėlapio vaizdas bus sinchronizuotas su dabartine pozicija</string>
-    <string name="auto_follow_route_never">Niekada (spauskite \"Pradėti\", jei norite naviguoti rankiniu būdu)</string>
+    
    <string name="auto_follow_route_navigation">Automatiškai centruoti tik navigacijos metu</string>
    <string name="auto_follow_route_navigation_descr">Automatiškai centruoti žemėlapį tik, kai veikia navigacija.</string>
    <string name="auto_follow_location_enabled">Naudojamas automatinis žemėlapio centravimas.</string>
@ -433,7 +432,7 @@
    <string name="reading_cached_tiles">Skaitomi išsaugoti žemėlapiai…</string>
    <string name="version_index_is_big_for_memory">Indeksas \'\'{0}\'\' netilpo į atmintį</string>
    <string name="version_index_is_not_supported">Indekso versija \'\'{0}\'\' nepalaikoma</string>
-    <string name="use_osmand_routing_service">OsmAnd navigacija &gt;20km</string>
+    
    <string name="use_osmand_routing_service_descr">OsmAnd navigaciją be interneto taikyti tik maršrutams &gt; 20 km (ekperimentinė funkcija)</string>
    <string name="osmand_routing_experimental">OsmAnd navigacija be interneto yra eksperimentinė funkcija ir ji neveikia didesniems nei 20km atstumams.\n\nLaikinai naudojama CloudMade navigacijos paslauga.</string>
    <string name="specified_dir_doesnt_exist">Neina rasti nurodyto segtuvo.</string>
@ -519,13 +518,13 @@
    <string name="none_region_found">SD kortelėje nėra parsiųstos regionų informacijos. Parsisiųskite norimus regionus iš interneto.</string>
    <string name="poi_namefinder_query_empty">Įveskite paieškos žodžius norėdami rasti LV</string>
    <string name="any_poi">Bet kurią</string>
-    <string name="layer_transport_route">Transporto maršrutas</string>
+    
    <string name="thanks_yandex_traffic">Ačiū Yandex už kelių informaciją.</string>
    <string name="layer_yandex_traffic">Yandex kelių informacija</string>
    <string name="layer_route">Maršrutas</string>
    <string name="shared_string_favorites">Įsimintos vietos</string>
    <string name="layer_osm_bugs">OSM Pastabos (online)</string>
-    <string name="layer_transport">Transporto stotelės</string>
+    
    <string name="layer_poi">LV…</string>
    <string name="layer_map">Žemėlapių šaltiniai…</string>
    <string name="menu_layers">Žemėlapio sluoksniai</string>
@ -887,7 +886,7 @@
    <string name="select_navigation_mode">Pasirinkite judėjimo režimą</string>
    <string name="day_night_info_description">Saulėtekis : %1$s \nSaulėlydis : %2$s</string>
    <string name="day_night_info">Dienos/nakties info</string>
-    <string name="map_widget_day_night">Dieninis/naktinis žemėlapis</string>
+    
    <string name="map_widget_vector_attributes">Atvaizduojami atributai</string>
    <string name="map_widget_renderer">Atvaizdavimo stilius</string>

@ -1593,7 +1592,7 @@
    <string name="wake_on_voice_descr">Įjungti ekraną (jei išjungtas) artėjant prie posūkio</string>
    <string name="lock_screen_request_explanation">%1$s prašo leidimo išjungti ekraną tausojant energiją.</string>
    <string name="shared_string_never">Niekada</string>
-    <string name="osmo_use_https">Naudoti HTTPS</string>
+    
    <string name="osmo_use_https_descr">Prie serverio jungtis saugiu ryšiu</string>

    <string name="home_button">Namo</string>
@ -2218,4 +2217,4 @@
    <string name="osm_live_support_region">Palaikomas regionas</string>
    <string name="osm_live_thanks">Ačiū kad užsiprenumeravote tiesioginius atnaujinimus!</string>
    <string name="osm_live_region_desc">Dalis jūsų paramos bus persiųsta OSM naudotojams, kurie teikia žemėlapio pakeitimus tame regione</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-lv/strings.xml
+++ b/OsmAnd/res/values-lv/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="plugins_screen">Spraudņu pārvaldnieks</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="plugins_screen">Spraudņu pārvaldnieks</string>
  
  <string name="prefs_plugins_descr">Spraudņi papildina aplikācijas iespējas un dod papildus funkcionalitāti</string>
  <string name="prefs_plugins">Spraudņi</string>
@ -139,7 +138,7 @@
  <string name="user_name">OSM lietotāja vārds</string>
  <string name="open_street_map_login_descr">Nepieciešams, lai veiktu augšupielādes openstreetmap.org</string>
  <string name="user_password">Jūsu OSM parole</string>
-  <string name="user_password_descr">Nepieciešams, lai veiktu openstreetmap.org augšuplādi</string>
+  
  <string name="osmand_service">Fona režīms</string>
  <string name="osmand_service_descr">OsmAnd darbosies fonā, kad ekrāns būs izslēgts</string>
  
@ -160,7 +159,7 @@
  <string name="init_native_library">Iekļautās bibliotēkas inicializēšana…</string>
  <string name="choose_auto_follow_route">Automātiski centrēt karti</string>
  <string name="choose_auto_follow_route_descr">Laiks līdz karte sinhronizējas ar patreizējo pozīciju</string>
-  <string name="auto_follow_route_never">Nekad (nospiediet zilo bultu, lai sāktu vadību)</string>
+  
  <string name="auto_follow_route_navigation">Autocentrēt maršruta laikā</string>
  <string name="auto_follow_route_navigation_descr">Navigācijas laikā atrodoties kustībā, automātiski centrēt karti.</string>
  <string name="auto_follow_location_enabled">Autocentrēt karti.</string>
@ -381,7 +380,7 @@
  <string name="reading_cached_tiles">Lasa kešotās bildes…</string>
  <string name="version_index_is_big_for_memory">Indekss \'\'{0}\'\' neietilpst atmiņā</string>
  <string name="version_index_is_not_supported">Indeksa versija \'\'{0}\'\' netiek atbalstīta</string>
-  <string name="use_osmand_routing_service">OsmAnd navigācija &gt;20km</string>
+  
  <string name="use_osmand_routing_service_descr">OsmAnd bezsaistes navigācija darbojas tikai &gt; 20 km gariem maršrutiem (eksperimentāli)</string>
  <string name="osmand_routing_experimental">OsmAnd bezsaistes navigācija ir eksperimentāla funkcija un tā nestrādā attālumiem, kas ir lielāki par 20 km.\n\nNavigācijas serviss pagaidām ir pārslēgts uz tiešsaistes CloudMade.</string>
  <string name="specified_dir_doesnt_exist">Nevar atrast norādīto mapi.</string>
@ -468,13 +467,13 @@
  <string name="none_region_found">SD kartē nav atrasti reģionu dati. Lūdzu lejupielādējiet reģionus no interneta.</string>
  <string name="poi_namefinder_query_empty">Ievadiet atslēgvārdus POI meklēšanai</string>
  <string name="any_poi">Jebkurš</string>
-  <string name="layer_transport_route">Transporta maršruts</string>
+  
  <string name="thanks_yandex_traffic">Paldies Yandex par satiksmes informāciju.</string>
  <string name="layer_yandex_traffic">Yandex satiksme</string>
  <string name="layer_route">Maršruts</string>
  <string name="shared_string_favorites">Izlase</string>
  <string name="layer_osm_bugs">OSM piezīmes (onlainā)</string>
-  <string name="layer_transport">Sabiedriskā transporta pieturas</string>
+  
  <string name="layer_poi">POI…</string>
  <string name="layer_map">Kartes izcelsme…</string>
  <string name="menu_layers">Kartes klājumi</string>
@ -947,7 +946,7 @@
 	<string name="select_navigation_mode">Izvēlieties pārvietošanās veidu</string>
 	<string name="day_night_info_description">Saullēkts: %1$s\nSaulriets: %2$s</string>
 	<string name="day_night_info">Dienas/nakts info</string>
-	<string name="map_widget_day_night">Dienas/nakts karte</string>
+	
 	<string name="map_widget_vector_attributes">Renderēšanas attribūti</string>
 	<string name="map_widget_renderer">Renderēšananas veids</string>
 	<string name="int_continuosly">Nepārtraukti</string>
@ -1561,7 +1560,7 @@
    <string name="use_opengl_render_descr">Lietot iebūvēto paātrināto OpenGL renderēšanu (jābūt saderīgai ierīcei)</string>
    <string name="error_avoid_specific_road">Apvedceļš nav atrasts</string>
    <string name="home_button">Mājas</string>
-    <string name="osmo_use_https_descr">Lietot drošo savienojumu ar serveri</string>
+    
    <string name="osmo_use_https">Lietot HTTPS</string>
 	
 	<string name="map_update">Ir pieejami atjauninājumi %1$s kartēm</string>
@ -2215,4 +2214,4 @@
    <string name="lang_be_BY">Baltkrievu (latīņu)</string>
    <string name="lang_hu_formal">Hungāru (formālā)</string>
    <string name="lang_kn">Kannada</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-mn/strings.xml
+++ b/OsmAnd/res/values-mn/strings.xml
@ -1,4 +1,3 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="osmo_settings_uuid">Таны хэрэглэгчийн ID</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="osmo_settings_uuid">Таны хэрэглэгчийн ID</string>
    <string name="back_to_search">Гэр тайхар</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-mr/strings.xml
+++ b/OsmAnd/res/values-mr/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="left_side_navigation">डाव्या बाजूने ड्रायव्हिंग</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="left_side_navigation">डाव्या बाजूने ड्रायव्हिंग</string>
  <string name="unknown_location">अजून स्थान माहित नाही</string>
  <string name="modify_transparency">पारदर्शकता बदला (० - पारदर्शक, २५५ - अपारदर्शक)</string>
  <string name="confirm_interrupt_download">फाइल डाउनलोड थांबवायचे का?</string>
@ -95,7 +94,7 @@
  <string name="download_files_not_enough_space">%1$s एमबी डाउनलोड करण्यसाठी पुरेशी जागा शिल्लक नाही (शिल्लक जागा: %2$s).</string>
  <string name="download_files_question_space">{0} फाइल डाउनलोड करायच्या का? {1} एमबी जागा लागेल. सध्या शिल्लक जागा {2} एमबी.</string>
  
-  <string name="auto_follow_route_never">कधीच नाही</string>
+  
  <string name="pref_vector_map">वेक्टर नकाशाचे पर्याय</string>
  <string name="delete_confirmation_msg">%1$s काढून टाकायचे का?</string>
  <string name="city_type_suburb">उपनगर</string>
@ -334,7 +333,7 @@
 <string name="select_navigation_mode">परिवहन माध्यम निवडा</string>
 <string name="day_night_info_description">सुर्योदय : %1$s \nसूर्यास्त : %2$s</string>
 <string name="day_night_info">दिवस/रात्र माहिती</string>
-<string name="map_widget_day_night">दिवस/रात्र नकाशा</string>
+


 <string name="layer_map_appearance">स्क्रिन कॉन्फिगर करा</string>
@ -437,9 +436,9 @@
 	<string name="opening_hours">उघडण्याची वेळ</string>
 	<string name="favorite">आवडते ठिकाण</string>
 	<string name="layer_poi">पिओआय…</string>
-	<string name="layer_transport">परिवहन थांबे</string>
+	
 	<string name="layer_route">मार्ग</string>
-	<string name="layer_transport_route">परिवहन मार्ग</string>
+	
 	<string name="vector_data">ऑफलाएन वेक्टर नकाशे</string>
 	<string name="no_vector_map_loaded">वेक्टर नकाशे लोड झाले नाही</string>
 	
@ -525,4 +524,4 @@
    <string name="opening_at">उघडण्याची वेळ</string>
    <string name="closing_at">बंद होण्याची वेळ</string>
    <string name="error_calculating_route">मार्ग निवडण्यात अडथळा</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-nb/phrases.xml
+++ b/OsmAnd/res/values-nb/phrases.xml
@ -144,7 +144,7 @@
 	<string name="poi_internet_cafe">Internett-kafé</string>

 	<string name="poi_bank">Bank</string>
-	<string name="poi_atm">Minibank</string>
+	<string name="poi_amenity_atm">Minibank</string>
 	<string name="poi_payment_terminal">Betalingsterminal</string>
 	<string name="poi_bureau_de_change">Vekslingskontor</string>
 	<string name="poi_fog_signal">Tåkesignal</string>
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
    <string name="rendering_attr_roadColors_description">Velg fargeskjema for veier:</string>
    <string name="rendering_attr_roadColors_name">Veifargeskjema</string>
    <string name="map_widget_show_destination_arrow">Vis retning til målet</string>
@ -49,7 +48,7 @@
    <string name="select_navigation_mode">Velg transportmåte</string>
    <string name="day_night_info_description">Soloppgang: %1$s \nSolnedgang: %2$s</string>
    <string name="day_night_info">Dag/natt-info</string>
-    <string name="map_widget_day_night">Dag/natt-kart</string>
+    
    <string name="map_widget_vector_attributes">Opptegningsattributter</string>
    <string name="map_widget_renderer">Kartstil</string>
    <string name="layer_map_appearance">Skjerminnstilling</string>
@ -218,7 +217,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 \'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>
@ -391,7 +390,7 @@
    <string name="send_report">Send rapport</string>
    <string name="none_region_found">Ingen offline-data for regioner funnet på SD-kortet. Last ned regioner fra internett.</string>
    <string name="layer_route">Rute</string>
-    <string name="layer_transport">Stoppesteder</string>
+    
    <string name="layer_poi">Interessepunkt…</string>
    <string name="layer_map">Kartkilde…</string>
    <string name="menu_layers">Kartlag</string>
@ -961,7 +960,7 @@
    <string name="send_location">Send posisjon</string>
    <string name="amenity_type_administrative">Administrative</string>

-    <string name="layer_transport_route">Transportrute</string>
+    
    <string name="unzipping_file">Pakker ut fil…</string>
    <string name="transport_Stop">Stoppested</string>
    <string name="transport_stops">Stoppesteder</string>
@ -974,7 +973,7 @@

    <string name="first_time_msg">Takk for at du bruker OsmAnd. For mange funksjoner i dette programmet trenger du noen regionale offline-data som du kan laste ned via \'Innstillinger\' → \'Karthåndtering\'. Etterpå vil du være i stand til å se kart, finne adresser, lete etter interessepunkter og finne offentlig transport.</string>

-    <string name="osmo_use_https_descr">Bruk sikker forbindelse til server</string>
+    
    <string name="osmo_use_https">Bruk HTTPS</string>

    <string name="error_avoid_specific_road">Ingen omkjøring funnet</string>
@ -1130,7 +1129,7 @@

    <string name="anonymous_user">Anonym bruker</string>
    <string name="open_street_map_login_descr">Trengs for bidrag til openstreetmap.org</string>
-    <string name="user_password_descr">Trengs for bidrag til openstreetmap.org</string>
+    
    <string name="download_files_not_enough_space">Det er ikke nok ledig plass til å laste ned %1$s MB (ledig: %2$s).</string>
    <string name="download_files_question_space">Laste ned {0} fil(er)?
 Dette krever {1} MB permanent.
@ -1272,7 +1271,7 @@
    <string name="local_index_items_uploaded">%1$d av %2$d element(er) er vellykket lastet opp.</string>

    <string name="installing_new_resources">Pakker ut nye data…</string>
-    <string name="use_osmand_routing_service">OsmAnd-navigering &gt;20km</string>
+    
    <string name="poi_context_menu_website">Vis nettside til interessepunkt</string>
    <string name="transport_context_menu">Søk etter transport ved stoppested</string>
    <string name="use_trackball_descr">Bruk styrekule til å bevege kartet</string>
@ -1696,4 +1695,4 @@
    <string name="share_history_subject">" delt via OsmAnd"</string>
    <string name="rendering_attr_horseRoutes_name">Hesteruter</string>
    <string name="world_ski_missing">For å vise skikart må det spesielle offline-kartet lastes ned</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@ -371,7 +371,7 @@
 	<string name="poi_internet_cafe">Internetcafé</string>

 	<string name="poi_bank">Bank</string>
-	<string name="poi_atm">Geldautomaat</string>
+	<string name="poi_amenity_atm">Geldautomaat</string>
 	<string name="poi_accountant">Accountant</string>
 	<string name="poi_cave_entrance">Grot-ingang</string>
 	<string name="poi_peak">Bergtop</string>
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
  
  <string name="layer_map_appearance">Configureer scherm</string>
  <string name="show_lanes">Rijstroken</string>
@ -148,7 +147,7 @@
  <string name="user_name">OSM gebruikersnaam</string>
  <string name="open_street_map_login_descr">Nodig voor OpenStreetMap.org aanmelding</string>
  <string name="user_password">OSM wachtwoord</string>
-  <string name="user_password_descr">Nodig voor OpenStreetMap.org aanmelding</string>
+  
  <string name="osmand_service">Achtergrondmodus</string>
  <string name="osmand_service_descr">OsmAnd werkt op de achtergrond als het scherm uit is</string>
  
@ -169,7 +168,7 @@ Er is nu {2} MB beschikbaar.</string>
  <string name="init_native_library">Voorbereiden interne bibliotheek…</string>
  <string name="choose_auto_follow_route">Kaartpositie volgen</string>
  <string name="choose_auto_follow_route_descr">Tijd totdat kaartweergave wordt gesynchroniseerd met de positie</string>
-  <string name="auto_follow_route_never">Nooit (druk op \'Start\' om de begeleiding te starten)</string>
+  
  <string name="auto_follow_route_navigation">Alleen automatisch volgen tijdens navigatie</string>
  <string name="auto_follow_route_navigation_descr">Alleen automatisch volgen tijdens navigatie.</string>
  <string name="auto_follow_location_enabled">Automatisch kaart volgen in gebruik.</string>
@ -376,7 +375,7 @@ Er is nu {2} MB beschikbaar.</string>
  <string name="reading_cached_tiles">Kaartsegmenten worden gelezen…</string>
  <string name="version_index_is_big_for_memory">De index \'\'{0}\'\' past niet in het geheugen</string>
  <string name="version_index_is_not_supported">De versie van index \'\'{0}\'\' wordt niet ondersteund</string>
-  <string name="use_osmand_routing_service">OsmAnd routing &gt;20km</string>
+  
  <string name="use_osmand_routing_service_descr">Gebruik OsmAnd offline routing voor lange afstanden (&gt; 20 km, experimenteel)</string>
  <string name="osmand_routing_experimental">OsmAnd offline routing is een experimentele functie en werkt niet voor afstanden van meer dan ongeveer 20 km.\n\nRouting service is tijdelijk omgeschakeld naar online CloudMade.</string>
  <string name="specified_dir_doesnt_exist">Kan de opgegeven map niet vinden.</string>
@ -459,12 +458,12 @@ Er is nu {2} MB beschikbaar.</string>
  <string name="none_region_found">Geen offline-gegevens voor regio gevonden op de SD kaart. Download regio\'s van het internet.</string>
  <string name="poi_namefinder_query_empty">Type een zoekwoord om een interessepunt te vinden</string>
  <string name="any_poi">Alle</string>
-  <string name="layer_transport_route">Openbaar Vervoer-verbindingen</string>
+  
  <string name="thanks_yandex_traffic">Met dank aan Yandex voor de verkeersinformatie.</string>
  <string name="layer_yandex_traffic">Yandex Traffic</string>
  <string name="layer_route">Route</string>
  <string name="layer_osm_bugs">OSM-Opmerkingen (online)</string>
-  <string name="layer_transport">OV-haltes</string>
+  
  <string name="layer_poi">Interessepunt…</string>
  <string name="layer_map">Basiskaart…</string>
  <string name="menu_layers">Kaartlagen</string>
@ -894,7 +893,7 @@ Proportioneel werkgeheugen %4$s MB (Android limiet %5$s MB, Dalvik %6$s MB).</st
 <string name="select_navigation_mode">Kies soort vervoer</string>
 <string name="day_night_info_description">Zonsopgang: %1$s \nZonsondergang: %2$s</string>
 <string name="day_night_info">Dag/nacht info</string>
-<string name="map_widget_day_night">Dag/nacht kaart</string>
+
 <string name="map_widget_vector_attributes">Kaartweergave attributen</string>
 <string name="map_widget_renderer">Kaartstijl</string>

@ -1797,7 +1796,7 @@ Opgenomen tracks kunnen worden gedeeld met vrienden of worden gebruikt als OSM-b
    <string name="rendering_category_hide">Verberg</string>
    <string name="lock_screen_request_explanation">%1$s heeft toestemming nodig om het scherm uit te kunnen schakelen (als onderdeel van de stroombesparende functie).</string>
    
-	<string name="osmo_use_https_descr">Gebruik beveiligde verbinding met server</string>
+	
    <string name="osmo_use_https">Gebruik HTTPS</string>
 	<string name="home_button">Beginscherm</string>
    <string name="search_for">Zoek naar</string>
@ -2401,7 +2400,7 @@ Het activeren van deze weergave verandert de kaartstijl in \'Winter en ski\', me
    <string name="shared_string_save_changes">Wijzigingen opslaan</string>
    <string name="shared_string_email_address">E-mailadres</string>
    <string name="show_polygons">Toon vlakken</string>
-    <string name="underlay_transparency">Underlay transparantie</string>
+    
    <string name="find_parking">Zoek parkeerplaats</string>
    <string name="rendering_attr_showMtbRoutes_name">Toon MTB-routes</string>
    <string name="shared_string_reverse_order">Volgorde omdraaien</string>
@ -2613,4 +2612,4 @@ Als je hulp nodig hebt met OsmAnd: neem contact op met ons support team: support
    <string name="route_stops_before">nog %1$s haltes</string>
    <string name="coords_search">Zoeken met Coördinaten</string>
    <string name="advanced_coords_search">Zoeken met Coördinaten</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@ -423,7 +423,7 @@
 	<string name="poi_internet_cafe">Kawiarenka internetowa</string>

 	<string name="poi_bank">Bank</string>
-	<string name="poi_atm">Bankomat</string>
+	<string name="poi_amenity_atm">Bankomat</string>
 	<string name="poi_bureau_de_change">Kantor</string>
 	<string name="poi_accountant">Księgowy</string>
 	<string name="poi_bitcoin_yes">Płatność bitcoinami</string>
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>

    <string name="use_transparent_map_theme">Przezroczysty styl</string>
    <string name="native_library_not_supported">To urządzenie nie obsługuje biblioteki renderowania natywnego.</string>
@ -10,7 +9,7 @@
    <string name="pref_vector_map">Ustawienia mapy wektorowej</string>
    <string name="choose_auto_follow_route">Automatyczne środkowanie mapy</string>
    <string name="choose_auto_follow_route_descr">Ustala opóźnienie podążania mapy za aktualną lokalizacją</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>
@ -212,7 +211,7 @@
    <string name="reading_cached_tiles">Wczytywanie zachowanych kafelków…</string>
    <string name="version_index_is_big_for_memory">Index\'\'{0}\'\' nie zmieścił się w pamięci</string>
    <string name="version_index_is_not_supported">Wersja indeksu \'\'{0}\'\' nie jest wspierana</string>
-    <string name="use_osmand_routing_service">Nawigacja OsmAnd &gt;20km</string>
+    
    <string name="use_osmand_routing_service_descr">Użycie routingu offline dla długich tras działa tylko dla tras &gt; 20 km (funkcjonalność eksperymentalna)</string>
    <string name="osmand_routing_experimental">Nawigacja offline w OsmAnd jest funkcją eksperymentalną i nie działa dla odległości większych niż 20 km.\n\nUsługa nawigacji została tymczasowo przełączona na CloudMade (online).</string>
    <string name="specified_dir_doesnt_exist">Nie mogę odnaleźć wskazanego katalogu.</string>
@ -306,13 +305,13 @@
    <string name="none_region_found">Brak danych offline na karcie SD. Proszę pobrać je z sieci.</string>
    <string name="poi_namefinder_query_empty">Wprowadź zapytanie by znaleźć POI</string>
    <string name="any_poi">Jakiekolwiek</string>
-    <string name="layer_transport_route">Trasa transportu publicznego</string>
+    
    <string name="thanks_yandex_traffic">Podziękowania dla Yandex za informację o korkach.</string>
    <string name="layer_yandex_traffic">Yandex - informacje o korkach</string>
    <string name="layer_route">Trasa</string>
    <string name="shared_string_favorites">Ulubione</string>
    <string name="layer_osm_bugs">Notatki OSM (online)</string>
-    <string name="layer_transport">Przystanki</string>
+    
    <string name="layer_poi">Użyteczne miejsca…</string>
    <string name="layer_map">Zasób mapy…</string>
    <string name="menu_layers">Warstwy mapy</string>
@ -470,7 +469,7 @@

    <string name="use_online_routing_descr">Użyj Internetu do wyznaczenia trasy</string>
    <string name="use_online_routing">Użyj routingu online</string>
-    <string name="user_password_descr">Wymagane do wysyłania danych na openstreetmap.org</string>
+    
    <string name="user_password">Hasło konta OSM</string>
    <string name="osm_settings_descr">Skonfiguruj ustawienia dotyczące potrzebne do wysyłania danych do Openstreetmap.org (OSM)</string>

@ -917,7 +916,7 @@ OsmAnd jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej
    <string name="snap_to_road">Przyciąganie do drogi</string>

    <string name="day_night_info">Informacja o dniu/nocy</string>
-    <string name="map_widget_day_night">Tryb dzienny/nocny</string>
+    
    <string name="map_widget_vector_attributes">Atrybuty renderowania</string>
    <string name="show_lanes">Pasy ruchu</string>

@ -1723,7 +1722,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
    <string name="rendering_category_hide">Ukrywanie</string>
    <string name="lock_screen_request_explanation">%1$s potrzebuje uprawnień do wyłączenia ekranu dla funkcji oszczędzania energii.</string>
    <string name="shared_string_never">Nigdy</string>
-    <string name="osmo_use_https_descr">Użyj bezpiecznego połączenia z serwerem</string>
+    
    <string name="osmo_use_https">Użyj HTTPS</string>

    <string name="home_button">Ekran startowy</string>
@ -2279,7 +2278,7 @@ Włączenie tego widoku zmienia styl mapy na „Zima i narty”, ukazujący tere
    <string name="upload_osm_note_description">Można przesłać swoje notatki OSM anonimowo jeżeli użyjesz swojego profilu OpenStreetMap.org.</string>
    <string name="upload_osm_note">Prześlij notatki OSM</string>
    <string name="upload_anonymously">Wyślij anonimowo</string>
-<string name="show_map_markers_topbar">Pokaż górny pasek znaczników</string>
+
    <string name="map_marker_1st">Pierwszy znacznik mapy</string>
    <string name="map_marker_2nd">Drugi znacznik mapy</string>
    <string name="shared_string_toolbar">Pasek narzędzi</string>
@ -2460,4 +2459,4 @@ Włączenie tego widoku zmienia styl mapy na „Zima i narty”, ukazujący tere
    <string name="coords_search">Wyszukiwanie współrzędnych</string>
    <string name="advanced_coords_search">Zaawansowane wyszukiwanie współrzędnych</string>
    <string name="route_stops_before">Za %1$s przystanków</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@ -697,7 +697,7 @@
 	<string name="poi_internet_cafe">Cybercafé</string>

 	<string name="poi_bank">Agência bancária</string>
-	<string name="poi_atm">Caixa eletrônico</string>
+	<string name="poi_amenity_atm">Caixa eletrônico</string>
 	<string name="poi_payment_terminal">Terminal de pagamento</string>
 	<string name="poi_money_lender">Financeira</string>
 	<string name="poi_pawnbroker">Casa de penhores</string>
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="shared_string_my_places">Meus locais</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="shared_string_my_places">Meus locais</string>
 	<string name="days_behind">dias atrás</string>
 	<string name="watch">Ver</string>
 	<string name="rendering_attr_pisteGrooming_name">Pista de preparação</string>
@ -229,7 +228,7 @@
    <string name="use_opengl_render">Usar renderização OpenGL</string>
    <string name="use_opengl_render_descr">Usar aceleração de hardware OpenGL para renderização (talvez não funcione em alguns aparelhos)</string>
    <string name="error_avoid_specific_road">Nenhum desvio encontrado</string>
-    <string name="osmo_use_https_descr">Usar conexão segura com o servidor</string>
+    
    <string name="osmo_use_https">Usar HTTPS</string>
 	<string name="search_for">Pesquisar por</string>
 	<string name="coordinates">Coordenadas</string>
@ -820,7 +819,7 @@
 	<string name="recalculate_route_to_your_location">Meio de transporte:</string>
 	<string name="select_navigation_mode">Selecionar meio de transporte</string>
 	<string name="day_night_info">Informações dia/noite</string>
-	<string name="map_widget_day_night">Modo dia/noite</string>
+	
 	<string name="map_widget_renderer">Estilo do mapa</string>
 	<string name="layer_map_appearance">Configurar tela</string>
 	<string name="show_lanes">Mostrar faixas de rolamento</string>
@ -1117,7 +1116,7 @@
 	<string name="user_name">Seu nome de usuário OSM</string>
 	<string name="open_street_map_login_descr">Necessário para envios ao openstreetmap.org</string>
 	<string name="user_password">Sua senha do OSM</string>
-	<string name="user_password_descr">Necessária para envios ao openstreetmap.org</string>
+	
 	<string name="osmand_service">Modo em segundo plano</string>
 	<string name="osmand_service_descr">Use para executar o OsmAnd, enquanto a tela estiver desligada</string>
 	
@ -1141,7 +1140,7 @@
 	<string name="native_library_not_supported">Biblioteca nativa não é suportada neste aparelho.</string>
 	<string name="choose_auto_follow_route">Centrar visualização do mapa</string>
 	<string name="choose_auto_follow_route_descr">Tempo para o mapa ser centrado na posição atual</string>
-	<string name="auto_follow_route_never">Nunca (toque \'Ir\' para iniciar a orientação manualmente)</string>
+	
 	<string name="keep_informing_never">Apenas manualmente (toque a seta)</string>
    <string name="keep_informing_descr">Repetir as instruções de navegação em intervalos regulares</string>
    <string name="keep_informing">Repetir as instruções de navegação</string>
@ -1360,7 +1359,7 @@
 	<string name="reading_cached_tiles">Lendo quadrículas salvas…</string>
 	<string name="version_index_is_big_for_memory">O índice \'\'{0}\'\' não coube na memória</string>
 	<string name="version_index_is_not_supported">A versão do índice \'\'{0}\'\' não é suportada</string>
-	<string name="use_osmand_routing_service">Navegação OsmAnd &gt;20km</string>
+	
 	<string name="use_osmand_routing_service_descr">Navegação OsmAnd off-line aplica-se apenas a rotas &gt;20 km (experimental)</string>
 	<string name="osmand_routing_experimental">Navegação OsmAnd off-line é ainda uma função experimental e não funciona em distâncias superiores a cerca de 20 km.\n\nO serviço de navegação está temporariamente mudado para CloudMade on-line.</string>
 	<string name="specified_dir_doesnt_exist">Não se pode encontrar o diretório especificado.</string>
@ -1431,11 +1430,11 @@
 	<string name="none_region_found">Nenhum dado de região encontrado no cartão SD. Tente baixar da Internet.</string>
 	<string name="poi_namefinder_query_empty">Parâmetros de pesquisa para encontrar o POI</string>
 	<string name="any_poi">Todos</string>
-	<string name="layer_transport_route">Rota de transporte</string>
+	
 	<string name="thanks_yandex_traffic">Obrigado à Yandex por fornecer informações de trânsito.</string>
 	<string name="layer_yandex_traffic">Trânsito Yandex</string>
 	<string name="layer_route">Rota</string>
-	<string name="layer_transport">Paradas de transporte</string>
+	
 	<string name="layer_poi">POI…</string>
 	<string name="layer_map">Fonte de mapa…</string>
 	<string name="menu_layers">Camadas de mapa</string>
@ -2002,12 +2001,12 @@
    <string name="shared_string_save_changes">Salvar alterações</string>
    <string name="find_parking">Encontrar estacionamento</string>
    <string name="show_polygons">Mostrar polígonos de áreas</string>
-    <string name="underlay_transparency">Transparência da subcamada</string>
+    
    <string name="add_points_to_map_markers_q">Você quer adicionar todos os pontos aos Marcadores de Mapa?</string>
    <string name="shared_string_add_to_map_markers">Adicionar aos Marcadores de Mapa</string>
    <string name="select_map_markers">Selecionar Marcadores de Mapa</string>
    <string name="shared_string_reverse_order">Ordem inversa</string>
-    <string name="show_map_markers">Marcadores de Mapa</string>
+    
    <string name="show_map_markers_description">Ativar o recurso Marcadores de Mapa</string>
    <string name="clear_active_markers_q">Você quer apagar todos os marcadores ativos?</string>
    <string name="clear_markers_history_q">Você quer limpar o histórico de marcadores?</string>
@ -2029,4 +2028,4 @@
    <string name="access_disable_offroute_recalc_descr">Desabilitar recálculo automático de rota quando estiver muito longe do caminho correto</string>
    <string name="access_disable_wrong_direction_recalc_descr">Desabilitar recálculo automático da rota quando estiver se movendo na direção errada</string>
    <string name="follow_us">Siga-nos</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="amenity_type_administrative">Administrativo</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="amenity_type_administrative">Administrativo</string>
  <string name="amenity_type_barrier">Barreira</string>
  <string name="amenity_type_education">Educação</string>
  <string name="amenity_type_emergency">Emergência</string>
@ -122,13 +121,13 @@
  <string name="none_region_found">Nenhuma região encontrada no cartão SD. Tente fazer o download a partir da Internet.</string>
  <string name="poi_namefinder_query_empty">Parâmetros de pesquisa para encontrar o POI</string>
  <string name="any_poi">Todos</string>
-  <string name="layer_transport_route">Vias de transporte</string>
+  
  <string name="thanks_yandex_traffic">Obrigado à Yandex por fornecer informações de trânsito.</string>
  <string name="layer_yandex_traffic">Tráfego Yandex</string>
  <string name="layer_route">Rota</string>
  <string name="shared_string_favorites">Favoritos</string>
  <string name="layer_osm_bugs">Bugs OSM</string>
-  <string name="layer_transport">Paradas de transportes</string>
+  
  <string name="layer_poi">POI (Ponto de interesse)…</string>
  <string name="layer_map">Fonte dos mapas…</string>
  <string name="menu_layers">Camada de mapa</string>
@ -291,7 +290,7 @@
  
  <string name="use_online_routing_descr">Utilizar Internet para calcular a rota</string>
  <string name="use_online_routing">Utilizar navegação online</string>
-  <string name="user_password_descr">Sua senha do OpenStreetMap</string>
+  
  <string name="user_password">Senha</string>
  <string name="osm_settings_descr">Definir os parâmetros de conexão OpenStreetMap</string>
  
@ -615,7 +614,7 @@
  <string name="init_native_library">Inicializando biblioteca nativa…</string>
  <string name="choose_auto_follow_route">Auto-centrar visualização do mapa</string>
  <string name="choose_auto_follow_route_descr">Tempo para o mapa ser centrado na posição actual</string>
-  <string name="auto_follow_route_never">Nunca</string>
+  
  <string name="auto_follow_route_navigation">Auto-centrar apenas navegação</string>
  <string name="auto_follow_route_navigation_descr">Auto-centrar a posição no mapa apenas durante a navegação.</string>
  <string name="auto_follow_location_enabled">Mapa automaticamente centrado.</string>
@ -788,7 +787,7 @@
  <string name="add_waypoint_dialog_added">Ponto de trilha \'\'{0}\'\' foi adicionado com sucesso</string>
  <string name="add_waypoint_dialog_title">Acrescentar ponto à trilha GPX gravada</string>
  <string name="context_menu_item_add_waypoint">Acrescentar ponto GPX</string>
-  <string name="use_osmand_routing_service">OsmAnd navigação &gt;20km</string>
+  
  <string name="use_osmand_routing_service_descr">Navegação OsmAnd offline aplica-se apenas a rotas &gt; 20 km (experimental)</string>
  <string name="osmand_routing_experimental">Navegação offline OamAnd é ainda uma função experimental e não funciona em distâncias superiores a cerca de 20 km.\n\nO Serviço Navegação está temporariamente mudado para CloudMade online.</string>
  <string name="specified_dir_doesnt_exist">Não foi possível encontrar diretório especificado.</string>
@ -907,7 +906,7 @@
 <string name="day_night_info_description">Nascer do sol: %1$s
 \nPôr-do-sol: %2$s</string>
 <string name="day_night_info">Dia/noite Informações</string>
-<string name="map_widget_day_night">Modo Dia/noite</string>
+
 <string name="map_widget_vector_attributes">Atributos de renderização</string>
 <string name="map_widget_renderer">Estilo de renderização</string>

@ -1622,7 +1621,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
    <string name="everything_up_to_date">Todos os arquivos foram atualizados</string>
    <string name="use_opengl_render">Use o renderizador OpenGL</string>
    <string name="home_button">Início</string>
-    <string name="osmo_use_https">Usar HTTPS</string>
+    
 	
 	<string name="map_update">Atualizações disponives para %1$s mapas</string>
 	<string name="search_for">Procurar por</string>
@ -1950,7 +1949,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
    <string name="plugin_touringview_descr">"Esta opção muda o estilo de mapa do Osmand para a \"visão Touring \', uma visão especial de alto detalhe, para viajantes e motoristas profissionais.\n\nEsta exibição fornece, em qualquer zoom de mapa, a quantidade máxima de informação de viagem disponível no mapa (particularmente estradas, trilhas, caminhos, e marcas de orientação).\n\nTambém separa claramente todos os tipos de estradas de forma inequívoca com um código de cores, que se revela útil para a condução de veículos grandes (por exemplo).\n\nOferece opções especiais de turismo, como mostrar ciclovias ou rotas alpinas de montanha.\n\nNão é necessário fazer download dum mapa especial, a exibição é feita a partir dos mapas padrão.\n\nEssa visão pode ser revertida, basta desactiva-la, ou alterar o estilo de mapa em \'Configurar mapa\'. "</string>
    <string name="rendering_attr_roadStyle_description">Estilo de estrada</string>
    <string name="error_avoid_specific_road">Nenhum desvio encontrado</string>
-    <string name="osmo_use_https_descr">Usar ligação segura ao servidor</string>
+    
    <string name="wake_on_voice_descr">Acender o visor do dispositivo (se desligado) ao aproximar duma curva</string>
    <string name="map_widget_top">Barra de estado</string>
    <string name="map_widget_right">Painel direito</string>
@ -2135,4 +2134,4 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
    <string name="move_marker_bottom_sheet_title">Mova o mapa para alterar a posição do marcador</string>
    <string name="lat_lon_pattern">Lat: %1$.6f Lon: %2$.6f</string>
    <string name="follow_us">Siga-nos</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="background_service_is_enabled_question">Serviciul sleep încă rulează în background. Doriți să-l opriți?</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="background_service_is_enabled_question">Serviciul sleep încă rulează în background. Doriți să-l opriți?</string>
    
 	
    <string name="close_changeset">Închide setul de modificări</string>
@ -67,7 +66,7 @@
 	
 	<string name="day_night_info_description">Răsărit : %1$s \nApus : %2$s</string>
 	<string name="day_night_info">Info zi/noapte</string>
-	<string name="map_widget_day_night">Hartă zi/noapte</string>
+	
 	<string name="map_widget_vector_attributes">Atribute randare</string>
 	<string name="map_widget_renderer">Stil randare</string>
 	
@ -343,7 +342,7 @@
 	<string name="user_name">Numele de utilizator OSM</string>
 	<string name="open_street_map_login_descr">Necesar pentru trimiterea de date la openstreetmap.org</string>
 	<string name="user_password">Parola OSM</string>
-	<string name="user_password_descr">Necesară pentru trimiterea de date la openstreetmap.org</string>
+	
 	<string name="osmand_service">Mod standby</string>
 	<string name="osmand_service_descr">Folosit pentru ca OsmAnd să poată funcționa când telefonul este în standby</string>
 	
@ -363,7 +362,7 @@
 	<string name="init_native_library">Se inițializează librăria nativă…</string>
 	<string name="choose_auto_follow_route">Auto centrare hartă</string>
 	<string name="choose_auto_follow_route_descr">Timpul până când harta se centrează pe poziția curentă</string>
-	<string name="auto_follow_route_never">Niciodată (atinge săgeata albastră pentru a începe ghidarea manuală)</string>
+	
 	<string name="auto_follow_route_navigation">Auto centrare doar la navigare</string>
 	<string name="auto_follow_route_navigation_descr">Auto centrarea hărții doar în timp ce se navighează.</string>
 	<string name="auto_follow_location_enabled">Auto centrare harta curentă.</string>
@ -575,7 +574,7 @@
 	<string name="reading_cached_tiles">Se citesc porțiunile de hartă raster…</string>
 	<string name="version_index_is_big_for_memory">Indexul hărții \'\'{0}\'\' nu are loc în memorie</string>
 	<string name="version_index_is_not_supported">Această versiune a indexului hărții \'\'{0}\'\' nu este suportată</string>
-	<string name="use_osmand_routing_service">Navigare OsmAnd &gt; 20km</string>
+	
 	<string name="use_osmand_routing_service_descr">Folosește navigarea OsmAnd offline doar pentru rute &gt; 20 km (experimental)</string>
 	<string name="osmand_routing_experimental">Navigarea OsmAnd offline este experimentală și nu funcționează pe distanțe mai mari de circa 20 km.\n\nServiciul de navigare este momentan comutat pe CloudMade online.</string>
 	<string name="specified_dir_doesnt_exist">Nu pot găsi directorul specificat.</string>
@ -661,13 +660,13 @@
 	<string name="none_region_found">Nu s-au găsit hărți offline pe cardul SD. Descărcați hărți de pe internet.</string>
 	<string name="poi_namefinder_query_empty">Introduceți criteriul de căutare pentru a găsi POI</string>
 	<string name="any_poi">Oricare</string>
-	<string name="layer_transport_route">Rută transport</string>
+	
 	<string name="thanks_yandex_traffic">Mulțumim Yandex pentru info trafic.</string>
 	<string name="layer_yandex_traffic">Trafic info Yandex</string>
 	<string name="layer_route">Rută</string>
 	<string name="shared_string_favorites">Favorite</string>
 	<string name="layer_osm_bugs">Bug hartă OSM</string>
-	<string name="layer_transport">Stații transport</string>
+	
 	<string name="layer_poi">POI…</string>
 	<string name="layer_map">Sursă hartă…</string>
 	<string name="menu_layers">Straturi</string>
@ -1375,7 +1374,7 @@
    <string name="shared_string_dismiss">Respinge</string>
    <string name="everything_up_to_date">Toate fişierele actualizate</string>
    <string name="use_opengl_render">Utilizaţi redare OpenGL</string>
-    <string name="osmo_use_https_descr">Utilizează o conexiune securizată la server</string>
+    
    <string name="osmo_use_https">Utilizează HTTPS</string>
 	
 	<string name="map_update">Actualizări disponibile pentru %1$s hărţi</string>
@ -1858,4 +1857,4 @@
    <string name="route_points">Puncte pe traseu</string>
    <string name="track_segments">Segmente de traseu</string>
    <string name="track_points">Puncte pe traseu</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@ -628,7 +628,7 @@
 	<string name="poi_internet_cafe">Интернет-кафе</string>

 	<string name="poi_bank">Банк</string>
-	<string name="poi_atm">Банкомат</string>
+	<string name="poi_amenity_atm">Банкомат</string>
 	<string name="poi_money_lender">Ростовщик</string>
 	<string name="poi_pawnbroker">Ломбард</string>
 	<string name="poi_bureau_de_change">Обмен валют</string>
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
    <string name="number_of_gpx_files_selected_pattern">%s GPX трека(ов) выбрано</string>
    <string name="change_markers_position">Переместить курсор</string>
    <string name="current_track">Текущий путь</string>
@ -65,7 +64,7 @@
    <string name="lang_fy">Западнофризский</string>
    <string name="lang_als">Албанский (тоскский)</string>
    <string name="rendering_attr_hideProposed_name">Планируемые объекты</string>
-    <string name="osmo_use_https_descr">Использовать безопасное подключение к серверу</string>
+    
    <string name="osmo_use_https">Использовать HTTPS</string>
    <string name="srtm_plugin_description">"Этот плагин обеспечивает как наложение контурных линий, так и отображения затеняющего слоя рельефа поверх стандартных карт OsmAnd. Эта функция высоко оценится спортсменами, туристами, путешественниками и всеми, кто заинтересован в рельефной структуре ландшафта.\n\nГлобальные данные (между 70 градусами на севере и 70 градусами на юге) основываются на измерениях SRTM (Shuttle Radar Topography Mission) и ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer) — инструментом визуализации Terra, флагманского спутника Системы Наблюдения Земли NASA. ASTER является результатом совместных усилий NASA, министерства экономики Японии, торговли и промышленности (METI), а также Космических Систем Японии (J-spacesystems). "</string>
    <string name="srtm_paid_version_msg">Рассмотрите, пожалуйста, покупку плагина \"Линии высот\" в Google Play, чтобы поддержать последующую разработку.</string>
@ -212,7 +211,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_navigation">Автовозврат карты только при следовании по маршруту</string>
    <string name="auto_follow_route_navigation_descr">Возвращать карту в текущее положение только при следовании по маршруту.</string>
    <string name="auto_follow_location_enabled">Привязка карты к местоположению включена.</string>
@ -371,7 +370,7 @@
    <string name="reading_cached_tiles">Чтение кэшированных растровых карт…</string>
    <string name="version_index_is_big_for_memory">Недостаточно памяти для локальной карты \"\"{0}\"\"</string>
    <string name="version_index_is_not_supported">Версия локальной карты \"\"{0}\"\" не поддерживается</string>
-    <string name="use_osmand_routing_service">Автономная навигация OsmAnd &gt;20км</string>
+    
    <string name="use_osmand_routing_service_descr">Использовать автономную навигацию на большие расстояние (экспериментально)</string>
    <string name="osmand_routing_experimental">Автономная навигация OsmAnd является экспериментальной и не работает на расстояния более 20 километров.\n\nВ этом случае для прокладывания маршрута используется online-сервис CloudMade.</string>
    <string name="specified_dir_doesnt_exist">Невозможно найти указанную директорию.</string>
@ -453,12 +452,12 @@
    <string name="none_region_found">Не найдены локальные векторные карты высокой детализации. Загрузите их из Интернета.</string>
    <string name="poi_namefinder_query_empty">Введите запрос для поиска POI</string>
    <string name="any_poi">Все</string>
-    <string name="layer_transport_route">Маршрут на транспорте</string>
+    
    <string name="thanks_yandex_traffic">Спасибо Яндексу за предоставление информации о пробках. Установите Яндекс как домашнюю страницу.</string>
    <string name="layer_yandex_traffic">Яндекс.Пробки</string>
    <string name="layer_route">Маршрут</string>
    <string name="layer_osm_bugs">OSM заметки (онлайн)</string>
-    <string name="layer_transport">Остановки транспорта</string>
+    
    <string name="layer_poi">POI…</string>
    <string name="layer_map">Источник карты…</string>
    <string name="menu_layers">Слои</string>
@ -603,7 +602,7 @@
    <string name="finished_task">Окончен</string>
    <string name="use_online_routing_descr">Использовать Интернет-сервис для прокладки маршрута</string>
    <string name="use_online_routing">Онлайн маршрутизация</string>
-    <string name="user_password_descr">Укажите пароль (требуется для работы с OSM)</string>
+    
    <string name="user_password">Пароль</string>
    <string name="osm_settings_descr">Установка логина/пароля OpenStreetMap</string>
    <string name="data_settings_descr">Настройка данных: язык, обновление данных</string>
@ -893,7 +892,7 @@
    <string name="map_widget_transparent">Прозрачные виджеты</string>
    <string name="int_continuosly">Постоянно</string>
    <string name="gps_wakeup_interval">Интервал пробуждения GPS: %s</string>
-    <string name="map_widget_day_night">Дневной/ночной режим</string>
+    
    <string name="filterpoi_activity">Создать фильтр POI</string>
    <string name="select_navigation_mode">Выберите вид транспорта</string>
    <string name="day_night_info_description">Восход : %1$s
@ -2028,4 +2027,4 @@
    <string name="lang_hu_formal">Венгерский (официальный)</string>
    <string name="lang_kn">Каннада</string>
    <string name="file_name_containes_illegal_char">Имя файла содержит недопустимый символ</string>
-</resources>
+</resources>
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@ -436,7 +436,7 @@
 	<string name="poi_internet_cafe">Ìnternet cafè</string>

 	<string name="poi_bank">Banca</string>
-	<string name="poi_atm">Bancomat</string>
+	<string name="poi_amenity_atm">Bancomat</string>
 	<string name="poi_bitcoin_yes">Pagamentu Bitcoin</string>

 	<string name="poi_cave_entrance">Intrada gruta</string>
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?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>
    <string name="voice_pref_title">Boghe</string>
    <string name="misc_pref_title">Mistura</string>
@ -425,7 +424,7 @@
    <string name="select_navigation_mode">Sèbera de su mèdiu pro su trasportu</string>
    <string name="day_night_info_description">Arbèschida: %1$s \nIntrinada: %2$s</string>
    <string name="day_night_info">Informatziones die/note</string>
-    <string name="map_widget_day_night">Mapa die/note</string>
+    
    <string name="keep_navigation_service">Mantènne</string>
    <string name="stop_navigation_service">Firma</string>
    <string name="enable_sleep_mode">Abìlita sa modalidade GPS \"de isfundu\"</string>
@ -1005,7 +1004,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
    <string name="user_password">Crae (password) in OSM</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">Impostatziones de sa mitza de sa mapa</string>
@ -1133,7 +1132,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
    <string name="fav_export_confirmation">Esistint documentos cun preferidos esportados giai. Los boles remplasare?</string>
    <string name="index_settings">Amministra sos documentos de sas mapas</string>
    <string name="open_street_map_login_descr">Netzessàriu pro imbiare contributos a openstreetmap.org</string>
-    <string name="user_password_descr">Netzessària pro imbiare contributos a openstreetmap.org</string>
+    
    <string name="osmand_service">Modalidade de isfundu</string>
    <string name="osmand_service_descr">OsmAnd funtzionat in s’isfundu, cun s’ischermu mortu</string>

@ -1314,7 +1313,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
    <string name="reading_cached_tiles">Leghidura anteprimas dae sa cache…</string>
    <string name="version_index_is_big_for_memory">S’ìnditze \'\'{0}\'\' est tropu mannu pro sa memòria atuale</string>
    <string name="version_index_is_not_supported">Sa versione de s’ìnditze \'\'{0}\'\' no est suportada</string>
-    <string name="use_osmand_routing_service">Nàvigu OsmAnd &gt;20km</string>
+    
    <string name="use_osmand_routing_service_descr">S’impreu de su nàvigu chene lìnia OsmAnd s’aplicat petzi a sas àndalas&gt;20 km (isperimentale)</string>
    <string name="specified_dir_doesnt_exist">Impossìbile agatare sa cartella dislindada.</string>
    <string name="application_dir">Cartella datos</string>
@ -1381,13 +1380,13 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
    <string name="error_occurred_loading_gpx">Errore durante su carrigamentu de su documentu GPX</string>
    <string name="send_report">Imbia resumu</string>
    <string name="any_poi">Totus</string>
-    <string name="layer_transport_route">Àndala de trasportu pùblicu</string>
+    
    <string name="thanks_yandex_traffic">Gràtzias a Yandex pro sas informatziones pro su tràficu.</string>
    <string name="layer_yandex_traffic">Yandex (tràficu)</string>
    <string name="layer_route">Àndala</string>
    <string name="shared_string_favorites">Preferidos</string>
    <string name="layer_osm_bugs">Notas OSM (in lìnia)</string>
-    <string name="layer_transport">Firmadas trasportu pùblicu</string>
+    
    <string name="layer_map">Mitza mapa…</string>
    <string name="menu_layers">Istratos mapa</string>
    <string name="use_trackball_descr">Imprea sa trackballa pro mòere sa mapa</string>
@ -1762,7 +1761,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
    <string name="shared_string_never">Mai</string>
    <string name="lock_screen_request_explanation">%1$s tenet bisòngiu de custa autorizatzione pro istudare s’ischermu pro sa funtzionalidade de rispàrmiu energèticu.</string>

-    <string name="osmo_use_https_descr">Imprea una cunnessione segura cun su server</string>
+    
    <string name="osmo_use_https">Imprea HTTPS</string>
    <string name="home_button">Domo</string>
    <string name="search_for">Chirca pro</string>
@ -2368,7 +2367,7 @@ Si tenes bisòngiu de agiudu cun s\'aplicatzione OsmAnd, pro praghere cuntata su
 "</string>
    <string name="select_map_markers">Ischerta sos marcadores de sa mapa</string>
    <string name="shared_string_reverse_order">Fùrria s\'òrdine</string>
-    <string name="show_map_markers">Marcadores mapa</string>
+    
    <string name="show_map_markers_description">Allue sa funtzionalidade Marcadores Mapa</string>
    <string name="clear_active_markers_q">Boles burrare totu sos marcadores ativos?</string>
    <string name="clear_markers_history_q">Boles burrare sa cronologia de sos marcadores?</string>
@ -2528,4 +2527,4 @@ Como bi sunt {2} MB ebbia disponìbiles.</string>
 e àteru…
 "</string>
    <string name="route_stops_before">%1$s firmadas in antis</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@ -467,7 +467,7 @@
 	<string name="poi_internet_cafe">Internetová kaviareň</string>

 	<string name="poi_bank">Banka</string>
-	<string name="poi_atm">Bankomat</string>
+	<string name="poi_amenity_atm">Bankomat</string>
 	<string name="poi_money_lender">Požičovňa peňazí</string>
 	<string name="poi_pawnbroker">Záložňa</string>
 	<string name="poi_bureau_de_change">Zmenáreň</string>
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>

    <string name="recording_context_menu_show">Zobraziť</string>
    <string name="recording_photo_description">Fotografia %1$s %2$s</string>
@ -207,7 +206,7 @@ Dlaždicové mapy môžete získať priamo zo zdrojov na Internete, alebo ich m
    <string name="init_native_library">Inicializácia natívnej knižnice…</string>
    <string name="choose_auto_follow_route">Automatické centrovanie</string>
    <string name="choose_auto_follow_route_descr">Čas pokiaľ sa mapové zobrazenie zosynchronizuje s pozíciou</string>
-    <string name="auto_follow_route_never">Nikdy (použite \'Ísť\' pre spustenie pokynov)</string>
+    
    <string name="auto_follow_route_navigation">Automatické centrovanie iba pri navigácii</string>
    <string name="auto_follow_route_navigation_descr">Povoliť automatické centrovanie pozície iba v režime navigácie.</string>
    <string name="auto_follow_location_enabled">Automatické nasledovanie je povolené.</string>
@ -379,7 +378,7 @@ Dlaždicové mapy môžete získať priamo zo zdrojov na Internete, alebo ich m
    <string name="reading_cached_tiles">Načítavajú sa dlaždice zo zásobníka…</string>
    <string name="version_index_is_big_for_memory">Index "{0}" sa nezmestil do pamäte</string>
    <string name="version_index_is_not_supported">Verzia indexu "{0}" nie je podporovaná</string>
-    <string name="use_osmand_routing_service">OsmAnd offline navigácia &gt;20km</string>
+    
    <string name="use_osmand_routing_service_descr">Použitie offline navigácie na dlhé vzdialenosti (experimentálne) namiesto CloudMade</string>
    <string name="osmand_routing_experimental">OsmAnd offline navigácia je experimentálna funkcia a nefunguje na vzdialenosť väčšiu ako 20 km.\n\nNavigačná služba je dočasne prepnutá na online CloudMade.</string>
    <string name="specified_dir_doesnt_exist">Nedá sa nájsť zadaný priečinok.</string>
@ -462,12 +461,12 @@ Dlaždicové mapy môžete získať priamo zo zdrojov na Internete, alebo ich m
    <string name="none_region_found">Žiadne regióny neboli nájdené na SD karte. Skúste stiahnuť regióny z internetu.</string>
    <string name="poi_namefinder_query_empty">Zadajte požiadavku na nájdenie POI</string>
    <string name="any_poi">Akékoľvek</string>
-    <string name="layer_transport_route">Trasa hromadnej dopravy</string>
+    
    <string name="thanks_yandex_traffic">Vďaka Yandex-u za dopravné informácie.</string>
    <string name="layer_yandex_traffic">Doprava Yandex</string>
    <string name="layer_route">Cesta</string>
    <string name="layer_osm_bugs">OSM Poznámky (online)</string>
-    <string name="layer_transport">Dopravné zastávky</string>
+    
    <string name="layer_poi">Body záujmu (POI)…</string>
    <string name="layer_map">Zdroj mapy…</string>
    <string name="menu_layers">Zobrazenie</string>
@ -610,7 +609,7 @@ Dlaždicové mapy môžete získať priamo zo zdrojov na Internete, alebo ich m
    <string name="finished_task">Dokončené</string>
    <string name="use_online_routing_descr">Použiť Internet na výpočet trasy</string>
    <string name="use_online_routing">Použiť online navigáciu</string>
-    <string name="user_password_descr">Heslo potrebné pre prispievanie do openstreetmap.org</string>
+    
    <string name="user_password">OSM heslo</string>
    <string name="osm_settings_descr">Určenie nastavení Openstreetmap.org (OSM) pre OSM nahrávanie</string>
    <string name="data_settings_descr">Výber jazyka, stiahnutie/znovu načítanie údajov</string>
@ -810,7 +809,7 @@ Proporčná pamäť %4$s MB (Limit Androidu %5$s MB, Dalvik %6$s MB).</string>
    <string name="day_night_info_description">Východ slnka: %1$s
 \nZápad slnka: %2$s</string>
    <string name="day_night_info">Info o dni/noci</string>
-    <string name="map_widget_day_night">Denná/nočná mapa</string>
+    
    <string name="map_widget_vector_attributes">Atribúty vykresľovania</string>
    <string name="map_widget_renderer">Štýl vykresľovania</string>
    <string name="osmand_short_description_80_chars">OsmAnd je open source navigácia s offline aj online mapami</string>
@ -1592,7 +1591,7 @@ Zaznamenané stopy môžete zdieľať s priateľmi alebo odoslať ako príspevok
    <string name="rendering_attr_tramTrainRoutes_name">Linky električiek a vlakov</string>
    <string name="rendering_category_hide">Skryť</string>
    <string name="lock_screen_request_explanation">%1$s potrebuje toto oprávnenie na vypnutie obrazovky pre šetrenie energiou.</string>
-    <string name="osmo_use_https_descr">Použiť zabezpečené spojenie na server</string>
+    
    <string name="osmo_use_https">Použiť HTTPS</string>
    <string name="home_button">Domov</string>
    <string name="search_for">Hľadať</string>
@ -2183,7 +2182,7 @@ Aktivovanie tohto pohľadu zmení štýl mapy na \"Zima a lyžovanie\", ktorý z
    <string name="shared_string_read_more">Prečítať viac</string>
    <string name="find_parking">Nájsť parkovanie</string>
    <string name="show_polygons">Zobraziť polygóny</string>
-    <string name="underlay_transparency">Priehľadnosť v podkladovej vrstve</string>
+    
    <string name="rendering_attr_showMtbRoutes_name">Zobraziť trasy pre horské bicykle</string>
    <string name="select_map_marker">Zvoľte mapovú značku</string>
    <string name="map_markers_other">Iné značky</string>
@ -2195,7 +2194,7 @@ To by dočasne potrebovalo {3} MB a natrvalo {1} MB.
 V súčasnosti je voľných len {2} MB.</string>
    <string name="upload_osm_note_description">OSM poznámku môžete odoslať anonymne ak použijete svoj účet na OpenStreetMap.org.</string>
    <string name="upload_osm_note">Odoslať OSM poznámku</string>
-    <string name="show_map_markers_topbar">Zobraziť horný panel mapových značiek</string>
+    
    <string name="map_marker_1st">Prvá mapová značka</string>
    <string name="map_marker_2nd">Druhá mapová značka</string>
    <string name="shared_string_toolbar">Panel nástrojov</string>
@ -2388,4 +2387,4 @@ Ak potrebuje pomoc s aplikáciou OsmAnd, kontaktuje podporu: support@osmand.net.
    <string name="back_to_search">Späť na vyhľadávanie</string>
    <string name="coords_search">Hľadanie súradníc</string>
    <string name="advanced_coords_search">Pokročilé hľadanie súradníc</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-sl/phrases.xml
+++ b/OsmAnd/res/values-sl/phrases.xml
@ -169,7 +169,7 @@
 	<string name="poi_crematorium">Krematorij</string>
 	<string name="poi_accountant">Računovodja</string>
 	<string name="poi_bank">Banka</string>
-	<string name="poi_atm">Bankomat</string>
+	<string name="poi_amenity_atm">Bankomat</string>
 	<string name="poi_volcano">Vulkan</string>
 	<string name="poi_crater">Krater</string>
 	<string name="poi_river">Reka</string>
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
    <string name="search_button">Poišči</string>
    <string name="search_activity">Iskanje podatkov</string>

@ -281,7 +280,7 @@
    <string name="user_name">Uporabniško ime OSM</string>
    <string name="user_password">Geslo OSM</string>
    <string name="open_street_map_login_descr">Zahtevano za pošiljanje podatkov na strežnik openstreetmap.org</string>
-    <string name="user_password_descr">Zahtevano za pošiljanje podatkov na openstreetmap.org</string>
+    
    <string name="routing_settings_descr">Prilagajanje možnosti za določevanje poti in navigacijo</string>
    <string name="general_settings">Splošne nastavitve</string>
    <string name="general_settings_descr">Prilagajanje splošnih nastavitev programa</string>
@ -355,7 +354,7 @@
    <string name="rendering_attr_hmRendered_name">Pokaži podrobnejši izris</string>
    <string name="navigate_point_format">Oblika</string>
    <string name="day_night_info">Podrobnosti dneva in noči</string>
-    <string name="map_widget_day_night">Svetlobni učinek</string>
+    
    <string name="map_widget_vector_attributes">Značilnosti izrisovanja</string>
    <string name="map_widget_renderer">Slog zemljevida</string>
    <string name="native_app_allocated_memory_descr">Skupna dodeljena velikost pomnilnika je %1$s MB (Dalvik %2$s MB, drugo %3$s MB).
@ -447,7 +446,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
    <string name="voice_provider">Jezik glasovnega vodenja</string>
    <string name="settings_preset_descr">Izbor uporabniškega profila s prilagojenimi nastavitvami navigacije in izrisa zemljevida.</string>

-    <string name="use_osmand_routing_service">Navigacija OsmAnd &gt; 20 km</string>
+    

    <string name="process_navigation_service">Navigacijska storitev OsmAnd</string>
    <string name="hello">Program za navigacijo OsmAnd</string>
@ -472,7 +471,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p

    <string name="choose_auto_follow_route">Samodejno središčenje zemljevida</string>
    <string name="choose_auto_follow_route_descr">Časovni zamik, preden se položaj samodejno postavi v središče zemljevida</string>
-    <string name="auto_follow_route_never">Nikoli (pritisnite na \'Začni\' za ročni začetek navigacije)</string>
+    
    <string name="fast_route_mode">Najhitrejša pot</string>
    <string name="fast_route_mode_descr">"Izbrana možnost določa izbor najhitrejše poti, neizbrana pa po razdalji najkrajše. "</string>
    <string name="search_position_undefined">Nedoločeno</string>
@ -768,7 +767,7 @@ Na voljo je le {2} MB.</string>
    <string name="reading_cached_tiles">Nalaganje shranjenih predmetov zemljevida …</string>
    <string name="version_index_is_big_for_memory">Podatki \"{0}\" so preobsežni za razpoložljiv pomnilnik</string>
    <string name="version_index_is_not_supported">Različica kazala \"{0}\" ni podprta</string>
-    <string name="use_osmand_routing_service_descr">Uporaba navigacije OsmAnd brez povezave je smiselna le za poti &lt; 20 km (preizkusno)</string>
+    
    <string name="osmand_routing_experimental">Navigacija OsmAnd brez povezave je preizkusna zmožnost in ne deluje z razdaljami, ki so večje od 20 km.\n\nStoritev navigacije je začasno preklopljena na spletni CloudMade.</string>
    <string name="osmand_net_previously_installed">Nameščena je starejša različica programa OsmAnd. Vsi nepovezani podatki so podprti v novi različici, vendar je treba najprej izvoziti vse priljubljene točke in jih nato ponovno uvoziti v novejšo različico.</string>
    <string name="build_installed">Različica izgradnje {0} je bila uspešno nameščena ({1}).</string>
@ -860,14 +859,14 @@ Pomembnejše lastnosti:
    <string name="none_region_found">Na kartici SD ni podatkov območij za uporabo brez povezave. Datoteke lahko prejmete z interneta.</string>
    <string name="poi_namefinder_query_empty">Za iskanje točke POI je treba vpisati iskalni niz</string>
    <string name="any_poi">Katerokoli</string>
-    <string name="layer_transport_route">Pot javnega prevoza</string>
+    
    <string name="thanks_yandex_traffic">Za podatke o prometu gre zahvala spletišču Yandex.</string>
    <string name="layer_yandex_traffic">Promet Yandex</string>
    <string name="no_fav_to_save">Ni priljubljenih točk za shranjevanje</string>
    <string name="layer_route">Pot</string>
    <string name="shared_string_favorites">Pokaži priljubljene točke</string>
    <string name="layer_osm_bugs">Hrošči OSM (zahteva povezavo)</string>
-    <string name="layer_transport">Postaje prevoza</string>
+    
    <string name="layer_poi">Izbor točk POI …</string>
    <string name="layer_map">Vir zemljevida …</string>
    <string name="context_menu_item_search_poi">Iskanje točk POI</string>
@ -1810,7 +1809,7 @@ Shranjene sledi je mogoče objavljati kot datoteke OSM. Z uporabo vstavka je mog
    <string name="no_internet_connection">Prejem ni mogoč; najverjetneje so težave s povezavo na internet.</string>
    <string name="shared_string_dismiss">Opusti</string>
    <string name="everything_up_to_date">Vse datoteke so posodobljene</string>
-    <string name="osmo_use_https">Uporabi protokol HTTPS</string>
+    

    <string name="map_update">Na voljo je %1$s posodobitev zemljevidov</string>
    <string name="search_for">Poišči</string>
@ -1821,7 +1820,7 @@ Shranjene sledi je mogoče objavljati kot datoteke OSM. Z uporabo vstavka je mog
    <string name="use_opengl_render">Uporabi izrisovanje OpenGL</string>
    <string name="use_opengl_render_descr">Uporabi strojno pospešeno izrisovanje OpenGL (na nekaterih napravah morda ne deluje)</string>
    <string name="home_button">Začetni zaslon</string>
-    <string name="osmo_use_https_descr">Uporabi varno povezavo s strežnikom</string>
+    
    <string name="error_avoid_specific_road">Ni najdenih možnosti obvoza</string>
    <string name="voices">Glasovna navodila</string>
    <string name="speak_pedestrian">Prehodi za pešce</string>
@ -2346,7 +2345,7 @@ Vrnitev na običajni pogled je mogoče na dva načina. Ali odklopite prekrivni s
    <string name="find_parking">Najdi parkirno mesto</string>
    <string name="select_map_markers">Izbor oznak zemljevida</string>
    <string name="shared_string_reverse_order">Obrni razvrstitev</string>
-    <string name="show_map_markers">Oznake zemljevida</string>
+    
    <string name="show_map_markers_description">Omogoči možnosti oznak zemljevida</string>
    <string name="clear_active_markers_q">Ali želite odstraniti vse dejavne oznake?</string>
    <string name="clear_markers_history_q">Ali res želite počistiti zgodovino oznake?</string>
@ -2355,7 +2354,7 @@ Vrnitev na običajni pogled je mogoče na dva načina. Ali odklopite prekrivni s
    <string name="map_marker">Oznaka zemljevida</string>
    <string name="rendering_attr_showMtbRoutes_name">Pokaži poti MTB</string>
    <string name="show_polygons">Pokaži poligone</string>
-    <string name="show_map_markers_topbar">Pokaži orodno vrstico oznak zemljevida</string>
+    
    <string name="map_marker_1st">Prva oznaka zemljevida</string>
    <string name="map_marker_2nd">Druga oznaka zemljevida</string>
    <string name="shared_string_toolbar">Orodna vrstica</string>
@ -2546,4 +2545,4 @@ V kolikor naletite na težave s programom OsmAnd, prosimo, stopite v stik s skup
    <string name="coords_search">Iskanje po koordinatah</string>
    <string name="advanced_coords_search">Napredno iskanje po koordinatah</string>
    <string name="route_stops_before">%1$s se zaustavi pred</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
    <string name="about_version">Верзија:</string>
    <string name="shared_string_about">Oko</string>
    <string name="about_settings_descr">Верзија инфо, лиценце, чланови пројекта</string>
@ -116,7 +115,7 @@
 	<string name="native_library_not_supported">Нативна библиотека није подржана на овом уређају .</string>
 	<string name="init_native_library">Покретање нативне библиотеке…</string>
 	<string name="choose_auto_follow_route">Аутоцентрирање мапе</string>
-	<string name="auto_follow_route_never">Никада</string>
+	
 	<string name="pref_vector_map">Подешавање векторске мапа</string>
 	<string name="city_type_suburb">Предграђе</string>
 	<string name="city_type_village">Село</string>
@ -190,7 +189,7 @@
 	<string name="auto_follow_location_enabled">Ауто-центрирање карте током употребе.</string>
 	<string name="day_night_info_description">Излазак сунца: %1$s \nЗалазак сунца: %2$s</string>
 	<string name="day_night_info">Дан/ноћ информације</string>
-	<string name="map_widget_day_night">Дневна/ноћна мапа</string>
+	
 	<string name="map_widget_renderer">Стил мапе</string>
 	
 	<string name="avoid_in_routing_title">Избегавати…</string>
@ -202,7 +201,7 @@
 	<string name="rotate_map_to_bearing_descr">Одаберите поравнавање екрана мапе</string>
 	<string name="show_route">Детаљи руте</string>
 	<string name="poi_namefinder_query_empty">Унети упит за претрагу POI</string>
-	<string name="layer_transport_route">Рута транспорта</string>
+	
 	<string name="layer_osm_bugs">Дневник ОСМ-а (на мрежи)</string>
 	<string name="layer_poi">POI…</string>
 	<string name="context_menu_item_search_poi">Претрага POI</string>
@ -242,7 +241,7 @@
    <string name="everything_up_to_date">Све датотеке су свеже</string>
    <string name="use_opengl_render">Користи ОпенГЛ за приказ</string>
    <string name="use_opengl_render_descr">Користи хардверско убрзање ОпенГЛ-а за приказ (можда не ради на неким уређајима)</string>
-    <string name="osmo_use_https_descr">Користи безбедну везу са сервером</string>
+    
    <string name="osmo_use_https">Користи ХТТПС</string>
 	
 	<string name="map_update">Доступне су надоградње %1$s карата</string>
@ -1080,4 +1079,4 @@
    <string name="clear_updates_proposition_message">Можете уклонити преузете надоградње и вратити се на изворну карту</string>
    <string name="shared_string_select">Означи</string>
    <string name="osmand_rastermaps_plugin_description"/>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
    <string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
    <string name="ChooseCountry">Välj land</string>
    <string name="choose_city">Välj stad eller postnummer</string>
@ -33,7 +32,7 @@
 <string name="day_night_info_description">Soluppgång: %1$s
 \nSolnedgång: %2$s</string>
    <string name="day_night_info">Dag-/nattinformation</string>
-    <string name="map_widget_day_night">Dag-/nattkarta</string>
+    
    <string name="map_widget_vector_attributes">Renderingsattribut</string>


@ -326,7 +325,7 @@ Proportionellt minne %4$s MB (Android-gräns %5$s MB, Dalvik %6$s MB).</string>
    <string name="user_name">Ditt OSM-användarnamn</string>
    <string name="open_street_map_login_descr">Behövs för ändringar i openstreetmap.org</string>
    <string name="user_password">Ditt OSM-lösenord</string>
-    <string name="user_password_descr">Behövs för ändringar i openstreetmap.org</string>
+    
    <string name="osmand_service">Bakgrundsläge</string>
    <string name="osmand_service_descr">OsmAnd körs i bakgrunden medan skärmen är avstängd</string>

@ -342,7 +341,7 @@ För tillfället finns det {2} MB ledigt.</string>
    <string name="init_native_library">Initierar inbyggt bibliotek …</string>
    <string name="choose_auto_follow_route">Auto-centrerad kartvy</string>
    <string name="choose_auto_follow_route_descr">Tid tills kartvyn synkroniseras med aktuell position</string>
-    <string name="auto_follow_route_never">Aldrig (tryck på Kör för att starta vägledning manuellt)</string>
+    
    <string name="auto_follow_route_navigation">Auto-centrera endast nav</string>
    <string name="auto_follow_route_navigation_descr">Auto-centrera kartan endast vid navigering.</string>
    <string name="auto_follow_location_enabled">Auto-centrera aktuell kartvy.</string>
@ -526,7 +525,7 @@ För tillfället finns det {2} MB ledigt.</string>
    <string name="reading_cached_tiles">Läser cachade kartbitar …</string>
    <string name="version_index_is_big_for_memory">Index \"{0}\" fick inte plats i minnet</string>
    <string name="version_index_is_not_supported">Denna version av indexet \"{0}\" stöds inte</string>
-    <string name="use_osmand_routing_service">OsmAnd-navigering &gt;20km</string>
+    
    <string name="use_osmand_routing_service_descr">Använd OsmAnd offline navigering gäller endast rutter &gt;20 km (experimentell)</string>
    <string name="specified_dir_doesnt_exist">Kan inte hitta den angivna mappen.</string>

@ -636,12 +635,12 @@ För tillfället finns det {2} MB ledigt.</string>
    <string name="none_region_found">Hittar inga offline-data för regioner på SD-kortet. Ladda ner regioner från Internet.</string>
    <string name="poi_namefinder_query_empty">Ange sökfråga för att hitta POI</string>
    <string name="any_poi">Alla</string>
-    <string name="layer_transport_route">Transportled</string>
+    
    <string name="thanks_yandex_traffic">Tack till Yandex för trafikinformationen.</string>
    <string name="layer_yandex_traffic">Yandex trafik</string>
    <string name="layer_route">Rutt</string>
    <string name="layer_osm_bugs">OSM-anteckningar (online)</string>
-    <string name="layer_transport">Hållplatser</string>
+    
    <string name="layer_poi">Intressepunkter (POI) …</string>
    <string name="layer_map">Kartkälla …</string>
    <string name="menu_layers">Kartlager</string>
@ -1547,7 +1546,7 @@ Vill du fortsätta med en ny registrering?</string>
    <string name="wake_on_voice">Slå på skärmen</string>
    <string name="wake_on_voice_descr">Slå på skärmen (om den är av) när jag närmar mig en sväng</string>
    <string name="lock_screen_request_explanation">%1$s behöver denna tillåtelse för att stänga av skärmen för strömsparningsfunktionen.</string>
-    <string name="osmo_use_https">Använd HTTPS</string>
+    
    <string name="osmo_use_https_descr">Använd säker anslutning till servern</string>
    <string name="home_button">Hem</string>
    <string name="search_for">Sök efter</string>
@ -2103,11 +2102,11 @@ Vill du fortsätta med en ny registrering?</string>
    <string name="shared_string_save_changes">Spara ändringar</string>
    <string name="find_parking">Hitta en parkeringsplats</string>
    <string name="show_polygons">Visa polygoner</string>
-    <string name="underlay_transparency">Underläggstransparens</string>
+    
    <string name="rendering_attr_showMtbRoutes_name">Visa MTB-rutter</string>
    <string name="select_map_markers">Välj kartmarkörer</string>
    <string name="shared_string_reverse_order">Omvänd ordning</string>
-    <string name="show_map_markers">Kartmarkörer</string>
+    
    <string name="show_map_markers_description">Aktivera kartmarkörer</string>
    <string name="clear_active_markers_q">Vill du ta bort alla aktiva markörer?</string>
    <string name="clear_markers_history_q">Vill du radera kartmarkörshistoriken?</string>
@ -2121,7 +2120,7 @@ Vill du fortsätta med en ny registrering?</string>
    <string name="map_marker_2nd">Andra kartmarkör</string>
    <string name="shared_string_toolbar">Verktygsfält</string>
    <string name="shared_string_widgets">Widgetar</string>
-    <string name="show_map_markers_topbar">Visa kartmarkörsfält</string>
+    
    <string name="download_files_error_not_enough_space">Inte tillräckligt med utrymme!
 Detta skulle kräva {3} MB temporärt och {1} MB permanent.
 För tillfället finns det bara {2} MB tillgängligt.</string>
@ -2240,4 +2239,4 @@ Om du tycker om OsmAnd och OSM och vill stödja detta så är detta ett utmärkt
    <string name="search_categories">Kategorier</string>
    <string name="postcode">Postnummer</string>
    <string name="rec_split"/>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-tr/phrases.xml
+++ b/OsmAnd/res/values-tr/phrases.xml
@ -863,7 +863,7 @@
 	<string name="poi_internet_cafe">İnternet kafe</string>

 	<string name="poi_bank">Banka</string>
-	<string name="poi_atm">Bankamatik</string>
+	<string name="poi_amenity_atm">Bankamatik</string>
 	<string name="poi_payment_terminal">Ödeme terminali</string>
 	<string name="poi_money_lender">Borç para veren</string>
 	<string name="poi_pawnbroker">Tefeci</string>
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="close_changeset">Değişiklik listesini kapat</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="close_changeset">Değişiklik listesini kapat</string>
 	<string name="zxing_barcode_scanner_not_found">ZXing Barcode Scanner uygulaması kurulu değil. Uygulama marketinde aramak ister misiniz?</string>
 	<string name="rendering_attr_roadColors_description">Yol renk şemasını seç:</string>
 	<string name="rendering_attr_roadColors_name">Yol renk şeması</string>
@ -49,7 +48,7 @@
 	<string name="select_navigation_mode">Ulaşım modunu seç</string>
 	
 	<string name="day_night_info">Gündüz/gece bilgisi</string>
-	<string name="map_widget_day_night">Gündüz/gece haritası</string>
+	
 	<string name="osmand_short_description_80_chars">OsmAnd açık kaynak kodlu, çevrımdışı ve çevrimiçi çalışabilen bir navigasyon uygulamasıdır</string>
 	
 	
@ -267,7 +266,7 @@
 	
 	<string name="download_files_not_enough_space">İndirme için yeterli yer yok: %1$s MB (free: %2$s).</string>
 	
-	<string name="auto_follow_route_never">Asla (musluk \'Git\' elle gidişi başlatmak için)</string>
+	
 	<string name="animate_route_off">Animasyonu durdur</string>
 	<string name="animate_route">Animasyonu başlat</string>
 	<string name="file_can_not_be_renamed">Dosya yeniden adlandırılamaz.</string>
@ -626,7 +625,7 @@
 	<string name="global_app_settings">Genel uygulama ayarları</string>
 	<string name="user_name">OSM kullanıcı adınız</string>
 	<string name="open_street_map_login_descr">Openstreetmap.org gönderimler için gereklidir</string>
-	<string name="user_password_descr">Openstreetmap.org gönderimler için gereklidir</string>
+	
 	<string name="osmand_service">Arka plan modu</string>
 	<string name="osmand_service_descr">Ekran kapalı iken Osmand arka planda çalışır</string>
 	
@ -911,9 +910,9 @@
 	<string name="error_occurred_loading_gpx">GPX yüklenirken hata oluştu</string>
 	<string name="none_region_found">Bölge için SD kart üzerinde çevrimdışı veri bulunamadı. Genel ağdan (internetten) bölgeleri indirin.</string>
 	<string name="poi_namefinder_query_empty">İÇN bulmak için kelime girin</string>
-	<string name="layer_transport_route">Ulaşım yolu</string>
+	
 	<string name="thanks_yandex_traffic">Trafik bilgileri için Yandex\'e teşekkürler.</string>
-	<string name="layer_transport">Ulaşım Durakları</string>
+	
 	<string name="layer_poi">İÇN…</string>
 	<string name="background_service_wait_int_descr">Arka planda konum düzeltmesi için azami bekleme süresini belirleyin</string>
 	<string name="background_service_wait_int">Düzeltme için azami bekleme</string>
@ -1226,7 +1225,7 @@
    <string name="download_tab_local">Yerel</string>
 	<string name="everything_up_to_date">Tüm dosyalar güncel</string>
    <string name="home_button">Ev</string>
-    <string name="osmo_use_https">HTTPS kullan</string>
+    
 	<string name="map_update">%1$s harita için güncelleme var</string>
 	<string name="coordinates">Koordinatlar</string>
 	<string name="rendering_category_details">Ayrıntılar</string>
@ -1581,7 +1580,7 @@
 	<string name="transport_context_menu">Durakta Arama taşımacılığı</string>
 	<string name="rotate_map_to_bearing">Harita yönlendirme</string>
 	<string name="version_index_is_not_supported">Endeksin versiyonu \'\' {0} \'desteklenmiyor</string>
-	<string name="use_osmand_routing_service">Osmand navigasyon&gt; 20km</string>
+	
 	<string name="use_osmand_routing_service_descr">Kullanım Osmand çevrimdışı gezinme yolları için geçerlidir&gt; 20 km (deneysel)</string>
 	<string name="osmand_routing_experimental">Osmand çevrimdışı gezinme deneysel bir özelliktir ve daha yaklaşık 20 km\'lik mesafelerde çalışmıyor.\n\nNavigasyon hizmeti geçici olarak çevrimiçi CloudMade geçer.</string>
 	<string name="install_selected_build">Eğer Osmand yüklemek istiyor musunuz - {0} {1} {2} MB?</string>
@ -1894,7 +1893,7 @@
    <string name="use_opengl_render">Kullanım OpenGL render</string>
    <string name="use_opengl_render_descr">Donanım hızlandırmalı OpenGL render (bazı cihazlarda çalışmayabilir) kullanın</string>
    <string name="error_avoid_specific_road">Bulunamadı baypas</string>
-    <string name="osmo_use_https_descr">Sunucuya Güvenli bağlantı kullan</string>
+    
    <string name="search_for">Arama</string>
    <string name="rendering_attr_publicTransportMode_name">Otobüs, troleybüs, mekik yolları</string>
    <string name="rendering_attr_tramTrainRoutes_name">Tramvay ve tren yolları</string>
@ -2042,10 +2041,10 @@
    <string name="shared_string_read_more">Daha fazla bilgi edinin</string>
    <string name="osmand_plus_extended_description_4000_chars_v2">" OsmAnd haritalar ve navigasyon - harita konumları bulmak ve Internet bağlantısı olmadan güzergah hesaplamak. Yerler ve yolları içinde yabancı bir alan bulmak için bir geziye gitmeden önce bir ülkenin bir harita yükleme. Temel seçenekleri: • detaylı haritalar 200 ülke • çevrimdışı Navigator ses ile ister çevrimdışı modu • bilgi haritada konumları hakkında • adres arama: faiz, kafeterya, otoparklar, Sık Kullanılanlar •, Bisiklet ve yaya sürüş için mağazaları • ekleme konumları yerlerin gezinti ek seçenekleri: • Beceri görüntülemek ve GPX kaydetmek için parça • Wikipedia açıklaması POI • ekleme fotoğraf, ses, ve harita • gündüz ve gece için video notları göster modları için daha uygun sürüş • toplu taşıma hakkında bilgi yönlendirir ve • bisiklet yolları ve patikalar • yürüyüş parkurları turizm Dünya • Online haritalar çok sayıda kaynakları • yol kaldırım kalite ve sokak aydınlatma • hakkında bilgi: her yerinde durur ekleme, düzenleme ve silme OsMo - canlı izleme diğer cihazlar olsun güvenilir bir navigator POI (OpenStreetMap.org kullanıcılar için) • senin ülke - Fransa olmak , Almanya, Meksika, İngiltere, İspanya, Hollanda, ABD, Rusya, Brezilya veya başka bir devlet. Eklentiler: • kontur haritaları ve arazi gölgelendirme https://goo.gl/7mojP8 kontur satır veri ve arazi görselleştirme temel OsmAnd harita ekledi. • Kayak https://goo.gl/pX6DxJ Kayak pistes, Kayak parça, kablo demiryolları ve teleferik hakkında bilgi: eşler. • Deniz harita https://goo.gl/0hEdxm kullan görüntülemek için özel harita stil arter ve nearshore deniz navigasyon için imzalar. • Park pozisyonu https://goo.gl/6JxQXF park edilmiş aracınızın konumunu işaretlemek ve sol ne kadar zaman zaman sınırlı park yeri görmek yardımcı olur. Bizi izlemeye devam edin! Twitter: https://twitter.com/osmandapp Facebook: https://www.facebook.com/osmandapp Site: http://osmand.net OsmAnd uygulama, yardıma ihtiyacınız varsa lütfen destek ekibimizle: support@osmand.net. "</string>
    <string name="show_polygons">Çokgenleri göster</string>
-    <string name="underlay_transparency">Şeffaflık altına koymak</string>
+    
    <string name="find_parking">Bir park yeri bulmak</string>
    <string name="rendering_attr_showMtbRoutes_name">MTB yolları göster</string>
-    <string name="show_map_markers_topbar"/>
+    
    <string name="map_marker_1st">İlk harita işareti</string>
    <string name="map_marker_2nd">İkinci harita işareti</string>
    <string name="shared_string_toolbar">Araç çubuğu</string>
@ -2137,4 +2136,4 @@
    <string name="change_markers_position">İmlecin konumunu değiştir</string>
    <string name="follow_us">Bizi takip edin</string>
    <string name="map_widget_bearing">Nispi yön</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
  <string name="asap">Швидко</string>
  
  <string name="route_roundabout">Круговий рух : %1$d з’їзд</string>
@ -186,7 +185,7 @@
  <string name="user_name">Ім’я користувача</string>
  <string name="open_street_map_login_descr">Вкажіть ім’я користувача для роботи з OSM</string>
  <string name="user_password">Пароль</string>
-  <string name="user_password_descr">Потрібно для роботи з openstreetmap.org</string>
+  
  <string name="osmand_service">Фоновий режим</string>
  <string name="osmand_service_descr">OsmAnd працюватиме у фоновому режимі коли екран вимкнено</string>
  
@ -206,7 +205,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_navigation">Автоцентрування мапи тільки під час навігації</string>
  <string name="auto_follow_route_navigation_descr">Повертати мапу в поточну позицію тільки при навігації за маршрутом.</string>
  <string name="auto_follow_location_enabled">Центрування мапи увімкнене.</string>
@ -420,7 +419,7 @@
  <string name="reading_cached_tiles">Зчитування кешованих растрових мап…</string>
  <string name="version_index_is_big_for_memory">Недостатньо пам’яті для локальної мапи \'\'{0}\'\'</string>
  <string name="version_index_is_not_supported">Версія локальної мапи \'\'{0}\'\' не підтримується</string>
-  <string name="use_osmand_routing_service">Автономна навігація &gt; 20км</string>
+  
  <string name="use_osmand_routing_service_descr">Використовувати OsmAnd оффлайн навігацію на відстані &gt; 20 км (експериментально)</string>
  <string name="osmand_routing_experimental">OsmAnd оффлайн навігація є експериментальною і не працює на відстанях &gt; 20 км\n\nВ цьому випадку для прокладання маршруту використовуйте онлайн сервіс CloudMade.</string>
  <string name="specified_dir_doesnt_exist">Неможливо знайти вказану теку.</string>
@ -505,13 +504,13 @@
  <string name="none_region_found">Не знайдено оффлайн мап для даного регіону на SD карті. Завантажити їх з Інтернету.</string>
  <string name="poi_namefinder_query_empty">Введіть запит для пошуку POI</string>
  <string name="any_poi">Всі</string>
-  <string name="layer_transport_route">Транспортний маршрут</string>
+  
  <string name="thanks_yandex_traffic">Дорожня інформація надається завдяки Яндексу.</string>
  <string name="layer_yandex_traffic">Яндекс Пробки</string>
  <string name="layer_route">Маршрут</string>
  <string name="shared_string_favorites">Закладки</string>
  <string name="layer_osm_bugs">Нотатки OSM (онлайн)</string>
-  <string name="layer_transport">Зупинки транспорту</string>
+  
  <string name="layer_poi">POI…</string>
  <string name="layer_map">Джерело мапи…</string>
  <string name="menu_layers">Шари мапи</string>
@ -1037,7 +1036,7 @@
 	<string name="day_night_info_description">Схід: %1$s
 \nЗахід: %2$s</string>
 	<string name="day_night_info">Схід/Захід</string>
-	<string name="map_widget_day_night">Денний/нічний режим</string>
+	
 	<string name="map_widget_vector_attributes">Налаштування візуалізації</string>
 	<string name="map_widget_renderer">Стиль мапи</string>
 	<string name="layer_map_appearance">Налаштування екрану</string>
@ -1716,7 +1715,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
 	<string name="save_global_track_interval">Загальний інтервал запису</string>
 	<string name="home_button">До початку</string>
    
-	<string name="osmo_use_https_descr">Використовувати захищене з’єднання з сервером</string>
+	
    <string name="osmo_use_https">Використовувати HTTPS</string>
 	
 	<string name="map_update">Наявні оновлення для %1$s мап</string>
@ -2277,7 +2276,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
    <string name="shared_string_add_to_map_markers">Додати до позначок мапи</string>
    <string name="select_map_markers">Обрати позначки мапи</string>
    <string name="shared_string_reverse_order">Зворотній порядок</string>
-    <string name="show_map_markers">Позначки Мапи</string>
+    
    <string name="show_map_markers_description">Показати елементи з позначок мапи</string>
    <string name="clear_active_markers_q">Вилучити всі активні позначки?</string>
    <string name="clear_markers_history_q">Очистити історію позначок мапи?</string>
@ -2289,7 +2288,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
    <string name="show_free_version_banner_description">Навіть, якщо ви придбали платну версію, ви все ще можете бачити банер для безкоштовної версії</string>
    <string name="dashboard_or_drawer_description">У вас зараз є вибір керувати застосунком через гнучку панель керування або через звичайне мені. Ваші вподобання завжди можна змінити в параметрах панелі керування.</string>
    <string name="release_2_2">" • Нові елементи інтерфейсу, що залежат від потоного стану, для вибору місця на мапи та на інших екранах\n\n • Екран з мапою відкривається під час запуску, якщо тільки не активовано функцію \'Показувати панель керування під час запуску\'\n\n • Налаштування того, які і як елементи будуть показуватись на панелі керування\n\n • Оминання панелі керування, якщо ви надаєте перевагу керуванню роботою через меню\n\n • Для завантаження мапи, територію можна обрати безпосередньо на мапі світу\n\n • Пошук ПОІ тепер підтримує більш конкретні запити\n\n • Покращено функції редагування ПОІ та додавання даних в OSM\n\n • Перероблено інтерфейс та структуру завантаження мап\n\n та багато іншого … "</string>
-    <string name="show_map_markers_topbar">Показувати Позначки мапи на панелі зверху</string>
+    
    <string name="map_marker_1st">Перша позначка мапи</string>
    <string name="map_marker_2nd">Друга позначка мапи</string>
    <string name="shared_string_toolbar">Панель інструментів</string>
@ -2391,4 +2390,4 @@ OsmAnd має відкриті сирці і активно розвиваєть
    <string name="lang_en_gb">Англійська (Сполучене Королівство)</string>
    <string name="lang_be_BY">Білоруська (Латинка)</string>
    <string name="lang_kn">Каннада</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-vi/strings.xml
+++ b/OsmAnd/res/values-vi/strings.xml
@ -1,10 +1,8 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!-- Language: Vietnamese; Language code: vi
-Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
-<resources>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><!-- Language: Vietnamese; Language code: vi
+Translator: Le Viet Thanh; email: lethanhx2k@gmail.com --><resources>
 	
 	<string name="choose_auto_follow_route_descr">Chọn thời gian chờ hiển thị bản đồ để quay lại vị trí vừa xong</string>
-	<string name="auto_follow_route_never">Không bao giờ</string>
+	
 	<string name="auto_follow_route_navigation">Tự động bám theo trên bản đồ</string>
 	<string name="auto_follow_route_navigation_descr">Bản đồ tự động di chuyển theo vị trí khi định vị.</string>
 	<string name="auto_follow_location_enabled">Đã kích hoạt thiết lập tự động bám theo.</string>
@ -235,7 +233,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
 	<string name="version_index_is_big_for_memory">Chỉ mục \'\'{0}\'\' lớn hơn bộ nhớ</string>
 	<string name="version_index_is_not_supported">Phiên bản chỉ mục \'\'{0}\'\' không được hỗ trợ</string>

-	<string name="use_osmand_routing_service">Tìm đường OsmAnd &gt;20km</string>
+	
 	<string name="use_osmand_routing_service_descr">Sử dụng tính năng tìm đường Offline với khoảng cách dài(đang thử nghiệm)</string>
 	<string name="osmand_routing_experimental">Tìm đường Offline trên OsmAnd là tính năng thử nghiệm và
 	nó không thể chạy được với khoảng cách trên 20km.\n\nDịch vụ tìm được sẽ tự động chuyển sang dùng CloudMade.</string>
@ -339,7 +337,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
 	<string name="poi_namefinder_query_empty">Nhập thông tin cần tìm</string>
 	<string name="any_poi">Bất kỳ</string>
 	<string name="shared_string_favorites">Ưa thích</string>
-	<string name="layer_transport">Điểm dừng giao thông</string>
+	
 	<string name="layer_poi">Địa điểm…</string>
 	<string name="layer_map">Nguồn bản đồ…</string>
 	<string name="menu_layers">Thiết lập Xem</string>
@ -497,7 +495,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
    
    <string name="use_online_routing_descr">Tìm đường qua Internet</string>
    <string name="use_online_routing">Tìm đường qua Internet</string>
-    <string name="user_password_descr">Mật khẩu tài khoản tại OpenStreetMap.org (OSM)</string>
+    
    <string name="user_password">Mật khẩu OSM</string>
    <string name="osm_settings_descr">Thiết lập Openstreetmap.org (OSM)</string>
    
@ -681,4 +679,4 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
    <string name="shared_string_type">Loại</string>
    <string name="starting_point">Điểm xuất phát</string>
    <string name="shared_string_not_selected">Chưa được chọn</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="email">電子郵件</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="email">電子郵件</string>
 <string name="poi_dialog_name">名稱</string>
 	<string name="poi_dialog_opening_hours">打開</string>
 	<string name="poi_dialog_comment">評論</string>
@ -201,13 +200,13 @@
 	<string name="user_name">你的OSM用户名</string>
 	<string name="open_street_map_login_descr">为提交openstreetmap.org需要</string>
 	<string name="user_password">您的OSM密码</string>
-	<string name="user_password_descr">为提交openstreetmap.org需要</string>
+	
 	<string name="osmand_service">睡眠模式功能</string>
 	<string name="osmand_service_descr">使用屏幕关闭时运行OsmAnd</string>
 	
 	
 	
-	<string name="auto_follow_route_never">从来没有</string>
+	
 	<string name="city_type_suburb">市郊</string>
 	<string name="city_type_hamlet">村庄</string>
 	<string name="city_type_village">村</string>
@ -545,7 +544,7 @@
 	<string name="filterpoi_activity">创建 POI 过滤器</string>
 	<string name="day_night_info_description">日出：%1$s \n日落：%2$s</string>
 	<string name="day_night_info">白天/黑夜信息</string>
-	<string name="map_widget_day_night">白天/黑夜地图</string>
+	
 	<string name="map_widget_vector_attributes">渲染属性：</string>
 	<string name="layer_map_appearance">配置屏幕</string>
 	<string name="map_widget_transparent">透明皮肤</string>
@ -728,7 +727,7 @@
 	<string name="reading_cached_tiles">正在读取缓存瓦片…</string>
 	<string name="version_index_is_big_for_memory">索引 \'\'{0}\'\' 太大而无法载入内存</string>
 	<string name="version_index_is_not_supported">索引版本号 \'\'{0}\'\' 不支持</string>
-	<string name="use_osmand_routing_service">OsmAnd 导航 &gt;20km</string>
+	
 	<string name="specified_dir_doesnt_exist">无法找到指定的目录。</string>
 	<string name="application_dir">存储目录</string>
 	
@ -1215,4 +1214,4 @@
    <string name="shared_string_share">分享</string>
    <string name="shared_string_export">导出</string>
    <string name="shared_string_more">更多…</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@ -695,7 +695,7 @@
 	<string name="poi_internet_cafe">網路咖啡館</string>

 	<string name="poi_bank">銀行</string>
-	<string name="poi_atm">自動提款機</string>
+	<string name="poi_amenity_atm">自動提款機</string>
 	<string name="poi_payment_terminal">支付終端機</string>
 	<string name="poi_money_lender">放款人</string>
 	<string name="poi_pawnbroker">典當鋪</string>
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
    <string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string>
    <string name="rendering_attr_roadColors_name">道路的色彩調配</string>
    <string name="map_widget_show_destination_arrow">顯示目的地方向</string>
@ -94,7 +93,7 @@

    <string name="day_night_info_description">日出：%1$s \n日落：%2$s</string>
    <string name="day_night_info">日/夜資訊</string>
-    <string name="map_widget_day_night">日/夜地圖</string>
+    
    <string name="map_widget_vector_attributes">著色演算屬性</string>
    <string name="map_widget_renderer">地圖樣式</string>

@ -361,7 +360,7 @@
    <string name="user_name">您 OSM 的使用者名稱</string>
    <string name="open_street_map_login_descr">需要在 openstreetmap.org 註冊</string>
    <string name="user_password">您 OSM 的密碼</string>
-    <string name="user_password_descr">需要在 openstreetmap.org 註冊</string>
+    
    <string name="osmand_service">背景模式</string>
    <string name="osmand_service_descr">當螢幕關閉時，讓 OsmAnd 在背景執行</string>

@ -377,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_navigation">只有導航時自動置中</string>
    <string name="auto_follow_route_navigation_descr">只有在導航時，地圖檢視自動置中。</string>
    <string name="auto_follow_location_enabled">使用地圖檢視自動置中。</string>
@ -561,7 +560,7 @@
    <string name="reading_cached_tiles">正在取讀暫存地圖圖磚…</string>
    <string name="version_index_is_big_for_memory">索引 \'\'{0}\'\' 不存在</string>
    <string name="version_index_is_not_supported">這版本的 \'\'{0}\'\' 索引不支援</string>
-    <string name="use_osmand_routing_service">OsmAnd 導航 &gt; 20公里</string>
+    
    <string name="use_osmand_routing_service_descr">使用 OsmAnd 離線導航僅適用于路線 &gt; 20 公里(實驗性的)</string>
    <string name="osmand_routing_experimental">OsmAnd 離線導航是個實驗性的功能，它不能運作超過 20 公里的距離。\n\n導航服務暫時切為線上的 CloudMade。</string>
    <string name="specified_dir_doesnt_exist">找不到指定的資料夾。</string>
@ -644,12 +643,12 @@
    <string name="none_region_found">在 SD 卡上沒有該地區離線資料。由網路下載資料。</string>
    <string name="poi_namefinder_query_empty">輸入查尋條件以查尋興趣點</string>
    <string name="any_poi">任何</string>
-    <string name="layer_transport_route">公車路線</string>
+    
    <string name="thanks_yandex_traffic">感謝 Yandex 提供的交通資訊。</string>
    <string name="layer_yandex_traffic">Yandex 的交通資訊</string>
    <string name="layer_route">導航路線</string>
    <string name="layer_osm_bugs">OSM 註解(連線)</string>
-    <string name="layer_transport">公車站牌</string>
+    
    <string name="layer_poi">興趣點…</string>
    <string name="layer_map">地圖來源…</string>
    <string name="menu_layers">地圖圖層</string>
@ -1729,7 +1728,7 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
    <string name="wake_on_voice">將螢幕開啟</string>
    <string name="wake_on_voice_descr">當接近轉彎時，開啟裝置螢幕 (螢幕關閉時)</string>
    <string name="lock_screen_request_explanation">為了節電作用 %1$s 需要此許可權才能關閉螢幕。</string>
-    <string name="osmo_use_https_descr">使用安全協定連線到伺服器</string>
+    
    <string name="osmo_use_https">使用 HTTPS</string>
    <string name="map_update">有 %1$s 個地圖可更新</string>
    <string name="search_for">查詢</string>
@ -2376,11 +2375,11 @@ Facebook：https://www.facebook.com/osmandapp
    <string name="shared_string_save_changes">儲存更改</string>
    <string name="find_parking">找停車場</string>
    <string name="show_polygons">顯示多邊形</string>
-    <string name="underlay_transparency">襯底透明度</string>
+    
    <string name="rendering_attr_showMtbRoutes_name">顯示 MTB 路線</string>
    <string name="select_map_markers">選擇地圖標記</string>
    <string name="shared_string_reverse_order">順序相反</string>
-    <string name="show_map_markers">地圖標記</string>
+    
    <string name="show_map_markers_description">啟動地圖標記功能</string>
    <string name="clear_active_markers_q">您想要移除所有的活動標記嗎？</string>
    <string name="clear_markers_history_q">您想清除地圖標記歷史記錄嗎？</string>
@ -2390,7 +2389,7 @@ Facebook：https://www.facebook.com/osmandapp
    <string name="add_points_to_map_markers_q">您想要將所有的標點都加到地圖標記嗎？</string>
    <string name="shared_string_add_to_map_markers">增加地圖標記</string>
    <string name="consider_turning_polygons_off">建議關閉多邊形的著色演算。</string>
-    <string name="show_map_markers_topbar">顯示地圖標記頂列</string>
+    
    <string name="map_marker_1st">第一個地圖標記</string>
    <string name="map_marker_2nd">第二個地圖標記</string>
    <string name="shared_string_toolbar">工具列</string>
@ -2552,4 +2551,4 @@ Facebook：https://www.facebook.com/osmandapp
 "</string>
    <string name="coords_search">座標查詢</string>
    <string name="advanced_coords_search">進階座標查詢</string>
-    </resources>
+    </resources>
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@ -897,7 +897,7 @@
 	<string name="poi_internet_cafe">Internet cafe</string>

 	<string name="poi_bank">Bank</string>
-	<string name="poi_atm">ATM</string>
+	<string name="poi_amenity_atm">ATM</string>
 	<string name="poi_payment_terminal">Payment terminal</string>
 	<string name="poi_money_lender">Money lender</string>
 	<string name="poi_pawnbroker">Pawnbroker</string>