diff --git a/OsmAnd-telegram/res/values-be/strings.xml b/OsmAnd-telegram/res/values-be/strings.xml
index 3145d77a1e..89d31c982b 100644
--- a/OsmAnd-telegram/res/values-be/strings.xml
+++ b/OsmAnd-telegram/res/values-be/strings.xml
@@ -242,4 +242,6 @@
     <string name="min_logging_speed">Мінімальная хуткасць для рэгістрацыі</string>
     <string name="min_logging_speed_descr">Фільтр: не рэгістраваць пры хуткасці ніжэй за абраную</string>
     <string name="gpx_settings">Налады GPX</string>
+    <string name="timeline_no_data_descr">Даныя для абранага дня адсутнічаюць</string>
+    <string name="timeline_no_data">Няма даных</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-es/strings.xml b/OsmAnd-telegram/res/values-es/strings.xml
index babaaa2e90..c580d5b392 100644
--- a/OsmAnd-telegram/res/values-es/strings.xml
+++ b/OsmAnd-telegram/res/values-es/strings.xml
@@ -241,4 +241,6 @@
     <string name="min_logging_speed">Velocidad mínima de registro</string>
     <string name="min_logging_speed_descr">Filtro: sin registro por debajo de la velocidad elegida</string>
     <string name="gpx_settings">Ajustes de GPX</string>
+    <string name="timeline_no_data_descr">No tenemos datos recopilados para el día seleccionado</string>
+    <string name="timeline_no_data">Sin datos</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-eu/strings.xml b/OsmAnd-telegram/res/values-eu/strings.xml
index c08d7489cb..82f7f206bb 100644
--- a/OsmAnd-telegram/res/values-eu/strings.xml
+++ b/OsmAnd-telegram/res/values-eu/strings.xml
@@ -153,4 +153,15 @@
     <string name="proxy_settings">Proxyaren ezarpenak</string>
     <string name="proxy">Proxya</string>
     <string name="privacy">Pribatutasuna</string>
+    <string name="turn_off_location_sharing">Itzali kokalekua partekatzea</string>
+    <string name="shared_string_select">Hautatu</string>
+    <string name="min_logging_distance">Erregistratzeko gutxieneko distantzia</string>
+    <string name="min_logging_distance_descr">Iragazkia: Puntu berria erregistratzeko distantzia minimoa</string>
+    <string name="min_logging_accuracy">Erregistroaren gutxieneko zehaztasuna</string>
+    <string name="min_logging_accuracy_descr">Iragazkia: Ez erregistratu zehaztasun hau ez badago</string>
+    <string name="min_logging_speed">Erregistratzeko gutxieneko abiadura</string>
+    <string name="min_logging_speed_descr">Iragazkia: Ez erregistratu abiadura honen azpitik</string>
+    <string name="gpx_settings">GPX ezarpenak</string>
+    <string name="timeline_no_data_descr">Ez dugu bildutako daturik hautatutako egunarentzat</string>
+    <string name="timeline_no_data">Daturik ez</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-pl/strings.xml b/OsmAnd-telegram/res/values-pl/strings.xml
index 38b9d5efe8..a18fb685e6 100644
--- a/OsmAnd-telegram/res/values-pl/strings.xml
+++ b/OsmAnd-telegram/res/values-pl/strings.xml
@@ -243,4 +243,5 @@
     <string name="min_logging_speed_descr">Filtr: brak rejestrowania poniżej wybranej prędkości</string>
     <string name="gpx_settings">Ustawienia GPX</string>
     <string name="timeline_no_data_descr">Nie zgromadziliśmy danych dla wybranego dnia</string>
+    <string name="timeline_no_data">Brak danych</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-sr/strings.xml b/OsmAnd-telegram/res/values-sr/strings.xml
index a6b3daec93..f934e3a170 100644
--- a/OsmAnd-telegram/res/values-sr/strings.xml
+++ b/OsmAnd-telegram/res/values-sr/strings.xml
@@ -1,2 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="shared_string_select">Означи</string>
+    <string name="shared_string_enable">Омогући</string>
+    <string name="altitude">Надморска висина</string>
+    <string name="shared_string_search">Тражи</string>
+    <string name="shared_string_ok">У реду</string>
+    <string name="shared_string_update">Ажурирај</string>
+    <string name="average_altitude">Просечна висина</string>
+    <string name="average_speed">Просечна брзина</string>
+    <string name="shared_string_map">Карта</string>
+    <string name="shared_string_add">Додај</string>
+    <string name="shared_string_hide">Сакриј</string>
+    <string name="shared_string_status">Стање</string>
+    <string name="shared_string_disable">Онемогући</string>
+    <string name="shared_string_save">Сачувај</string>
+    <string name="shared_string_name">Име</string>
+    <string name="shared_string_sort">Сортирај</string>
+    <string name="shared_string_exit">Излаз</string>
+    <string name="shared_string_close">Затвори</string>
+    <string name="shared_string_all">Све</string>
+    <string name="shared_string_off">Искључено</string>
+    <string name="shared_string_install">Инсталирај</string>
+    <string name="shared_string_share">Дели</string>
+    <string name="shared_string_back">Назад</string>
+    <string name="shared_string_continue">Настави</string>
+    <string name="shared_string_cancel">Откажи</string>
+    <string name="shared_string_settings">Поставке</string>
+    <string name="osmand_service">Позадински режим</string>
+    <string name="yard">yd</string>
+    <string name="foot">ft</string>
+    <string name="mile">mi</string>
+    <string name="km">km</string>
+    <string name="m">m</string>
+    <string name="nm">nmi</string>
+    <string name="min_mile">min/m</string>
+    <string name="min_km">min/km</string>
+    <string name="m_s">m/s</string>
+    <string name="km_h">km/h</string>
+    <string name="mile_per_hour">mph</string>
+    <string name="si_kmh">Километара на сат</string>
+    <string name="si_mph">Миља на сат</string>
+    <string name="si_m_s">Метара у секунди</string>
+    <string name="si_min_km">Минута по километру</string>
+    <string name="si_min_m">Минута по миљи</string>
+    <string name="si_mi_feet">Миље/стопе</string>
+    <string name="si_mi_yard">Миље/јарди</string>
+    <string name="si_km_m">Километри/метри</string>
+    <string name="si_nm">Наутичке миље</string>
+    <string name="si_mi_meters">Миље/метри</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index de9c412cb0..54c55a76dd 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -3225,4 +3225,10 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="shared_string_file_is_saved">S\'ha desat %s</string>
     <string name="shared_string_open_track">Obre la traça</string>
     <string name="shared_string_track_is_saved">La traça %s s\'ha desat</string>
+    <string name="gpx_join_gaps">Ajunta separacions</string>
+    <string name="app_mode_camper">Camper</string>
+    <string name="app_mode_campervan">Autocaravana</string>
+    <string name="rendering_attr_showLez_description">Mostra les zones de baixes emissions al mapa. No afecta el càlcul de ruta.</string>
+    <string name="rendering_attr_showLez_name">Mostra les zones de baixes emissions</string>
+    <string name="temporary_conditional_routing">Considereu les limitacions temporals</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 7c8529ceb8..7f64d67a8b 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -3214,4 +3214,10 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="shared_string_file_is_saved">%s er gemt</string>
     <string name="shared_string_open_track">Åbn spor</string>
     <string name="shared_string_track_is_saved">Spor %s er gemt</string>
+    <string name="gpx_join_gaps">Forbind mellemrum</string>
+    <string name="app_mode_camper">Camper</string>
+    <string name="app_mode_campervan">Autocamper</string>
+    <string name="rendering_attr_showLez_description">Vis miljøzoner på kortet. Påvirker ikke routing.</string>
+    <string name="rendering_attr_showLez_name">Vis Miljøzoner</string>
+    <string name="temporary_conditional_routing">Overvej midlertidige begrænsninger</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 4cf26096d4..4733656cd0 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -3209,4 +3209,12 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="sett_parrot_ext_input">Parrot</string>
     <string name="external_input_device_descr">Ein Gerät, wie eine Tastatur oder ein WunderLINQ, zur externen Steuerung wählen.</string>
     <string name="sett_generic_ext_input">Tastatur</string>
+    <string name="rendering_attr_highway_class_track_grade1_name">Klasse 1</string>
+    <string name="rendering_attr_highway_class_track_grade2_name">Klasse 2</string>
+    <string name="rendering_attr_highway_class_track_grade3_name">Klasse 3</string>
+    <string name="rendering_attr_highway_class_track_grade4_name">Klasse 4</string>
+    <string name="rendering_attr_highway_class_track_grade5_name">Klasse 5</string>
+    <string name="rendering_attr_showLez_description">Umweltzonen auf der Karte anzeigen. Beeinflusst die Routenführung nicht.</string>
+    <string name="rendering_attr_showLez_name">Umweltzonen anzeigen</string>
+    <string name="temporary_conditional_routing">Vorübergehende Einschränkungen berückichtigen</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index 457a9760a5..e175cc993a 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -3190,4 +3190,10 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="shared_string_file_is_saved">%s estas konservita</string>
     <string name="shared_string_open_track">Malfermita kurso</string>
     <string name="shared_string_track_is_saved">Kurso %s estas konservita</string>
+    <string name="gpx_join_gaps">Kombini interspacojn</string>
+    <string name="app_mode_camper">Kampad‑postveturilo</string>
+    <string name="app_mode_campervan">Kampad‑veturilo</string>
+    <string name="rendering_attr_showLez_description">Montri zonojn nur por malalte aer‑malpurigantaj veturiloj. Ne influas voj‑difinadon.</string>
+    <string name="rendering_attr_showLez_name">Montri zonojn de restrikta emisio (LEZ)</string>
+    <string name="temporary_conditional_routing">Konsideri portempajn limigojn</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index c983aa35bc..ef50f4d816 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -3208,4 +3208,10 @@ Lon %2$s</string>
     <string name="shared_string_file_is_saved">Se ha guardado «%s»</string>
     <string name="shared_string_open_track">Abrir traza</string>
     <string name="shared_string_track_is_saved">Se ha guardado la traza «%s»</string>
+    <string name="gpx_join_gaps">Fusionar espacios</string>
+    <string name="app_mode_camper">Casa rodante</string>
+    <string name="app_mode_campervan">Autocaravana</string>
+    <string name="rendering_attr_showLez_description">Mostrar zonas de baja emisión en el mapa. No afecta a la navegación.</string>
+    <string name="rendering_attr_showLez_name">Mostrar zonas de baja emisión</string>
+    <string name="temporary_conditional_routing">Considerar limitaciones temporales</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index fafd97a7b3..ca728bae68 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -3209,4 +3209,10 @@ Lon %2$s</string>
     <string name="shared_string_file_is_saved">Se ha guardado «%s»</string>
     <string name="shared_string_open_track">Abrir traza</string>
     <string name="shared_string_track_is_saved">Se ha guardado la traza «%s»</string>
+    <string name="gpx_join_gaps">Fusionar espacios</string>
+    <string name="app_mode_camper">Casa rodante (camper)</string>
+    <string name="app_mode_campervan">Autocaravana</string>
+    <string name="rendering_attr_showLez_description">Mostrar zonas de baja emisión en el mapa. No afecta a la navegación.</string>
+    <string name="rendering_attr_showLez_name">Mostrar zonas de baja emisión</string>
+    <string name="temporary_conditional_routing">Considerar limitaciones temporales</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index ff343844a8..598277aea7 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -741,7 +741,7 @@
     <string name="osmand_parking_plugin_description">Este complemento, memoriza dónde se ha aparcado el automóvil y cuánto tiempo queda (si hay un límite de tiempo). 
 \nTanto la ubicación como el tiempo de estacionamiento se muestran en el panel de control y en el control en la pantalla de mapas. Añade una notificación al calendario, en el caso de que desee tener un recordatorio al respecto.</string>
     <string name="osmand_parking_plugin_name">Aparcamiento</string>
-    <string name="context_menu_item_add_parking_point">Marcar aparcamiento</string>
+    <string name="context_menu_item_add_parking_point">Marcar pos. aparcamiento</string>
     <string name="context_menu_item_delete_parking_point">Quitar marcador de aparcamiento</string>
     <string name="starting_point_too_far">Punto de inicio demasiado lejos del camino más cercano.</string>
     <string name="shared_location">Ubicación compartida</string>
@@ -3228,4 +3228,8 @@
     <string name="shared_string_file_is_saved">"%s  está guardado"</string>
     <string name="shared_string_open_track">Abrir traza</string>
     <string name="shared_string_track_is_saved">Traza %s guardada</string>
+    <string name="app_mode_campervan">Caravana</string>
+    <string name="rendering_attr_showLez_description">Mostrar zonas de baja emisión en el mapa. No afecta al enrutamiento.</string>
+    <string name="rendering_attr_showLez_name">Mostrar zonas de baja emisión</string>
+    <string name="temporary_conditional_routing">Considerar limitaciones temporales</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-eu/phrases.xml b/OsmAnd/res/values-eu/phrases.xml
index 081af64fb2..978ffc5bc5 100644
--- a/OsmAnd/res/values-eu/phrases.xml
+++ b/OsmAnd/res/values-eu/phrases.xml
@@ -3536,4 +3536,54 @@
     <string name="poi_books_children">Haurrak</string>
     <string name="poi_atoll">Atoloia</string>
     <string name="poi_denotation">Denotazioa</string>
+    <string name="poi_childcare">Haurtzaindegia</string>
+    <string name="poi_denotation_natural_monument">Monumentu naturala</string>
+    <string name="poi_denotation_landmark">Lurreko marka</string>
+    <string name="poi_park_ride_yes">Bai</string>
+    <string name="poi_park_ride_train">Trena</string>
+    <string name="poi_park_ride_bus">Autobusa</string>
+    <string name="poi_park_ride_metro">Metroa</string>
+    <string name="poi_park_ride_tram">Tranbia</string>
+    <string name="poi_park_ride_ferry">Ferrya</string>
+    <string name="poi_hazard">Arriskua</string>
+    <string name="poi_rtsa_scale_filter">Zailtasun-kategoria</string>
+    <string name="poi_rtsa_scale_nc">н/к</string>
+    <string name="poi_rtsa_scale_nc_asterisk">н/к*</string>
+    <string name="poi_rtsa_scale_1a">1А</string>
+    <string name="poi_rtsa_scale_1a_asterisk">1А*</string>
+    <string name="poi_rtsa_scale_1b">1Б</string>
+    <string name="poi_rtsa_scale_1b_asterisk">1Б*</string>
+    <string name="poi_rtsa_scale_2a">2А</string>
+    <string name="poi_rtsa_scale_2a_asterisk">2А*</string>
+    <string name="poi_rtsa_scale_2b">2Б</string>
+    <string name="poi_rtsa_scale_2b_asterisk">2Б*</string>
+    <string name="poi_rtsa_scale_3a">3А</string>
+    <string name="poi_rtsa_scale_3a_asterisk">3А*</string>
+    <string name="poi_rtsa_scale_3b">3Б</string>
+    <string name="poi_rtsa_scale_3b_asterisk">3Б*</string>
+    <string name="poi_change_delete">Ezabatutako objektua</string>
+    <string name="poi_health_specialty_radiotherapy_yes">Erradioterapia</string>
+    <string name="poi_climbing_crag">Bai</string>
+    <string name="reddit">Reddit</string>
+    <string name="poi_hazard_additional_erosion">Arriskua: higadura</string>
+    <string name="poi_hazard_additional_rockfall">Arriskua: lur-jausia</string>
+    <string name="poi_hazard_additional_nuclear">Arriskua: nuklearra</string>
+    <string name="poi_hazard_additional_flood">Arriskua: uholdea</string>
+    <string name="poi_hazard_additional_avalanche">Arriskua: elur-jausia</string>
+    <string name="poi_hazard_additional_minefield">Arriskua: mina-zelaia</string>
+    <string name="poi_hazard_additional_contamination">Arriskua: kutsadura</string>
+    <string name="poi_defibrillator_location">Kokalekua</string>
+    <string name="poi_changing_table_yes">Aldatzeko mahaia: bai</string>
+    <string name="poi_changing_table_no">Aldatzeko mahaia: ez</string>
+    <string name="poi_changing_table_limited">Aldatzeko mahaia: mugatua</string>
+    <string name="poi_changing_table_location_room">Aldatzeko mahaiaren kokalekua: gela</string>
+    <string name="poi_changing_table_location_male_toilet">Aldatzeko mahaiaren kokalekua: gizonezkoen komuna</string>
+    <string name="poi_changing_table_location_female_toilet">Aldatzeko mahaiaren kokalekua: emakumezkoen komuna</string>
+    <string name="poi_changing_table_location_unisex_toilet">Aldatzeko mahaiaren kokalekua: unisex komuna</string>
+    <string name="poi_changing_table_count">Aldatzeko mahai kopurua</string>
+    <string name="poi_changing_table_fee_yes">Aldatzeko mahaia ordainpekoa: bai</string>
+    <string name="poi_changing_table_fee_no">Aldatzeko mahaia ordainpekoa: ez</string>
+    <string name="poi_charcoal_pile">Ikatz meta</string>
+    <string name="poi_historic_tank">Tanke historikoa</string>
+    <string name="poi_source_biomass">Energia iturria: biomasa</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index 65a3620340..01c822fa93 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -116,7 +116,7 @@
     <string name="stop_routing_confirm">Ziur nabigazioa gelditu nahi duzula?</string>
     <string name="clear_dest_confirm">Ziur zaude zure helmuga (eta erdibideko helburuak) garbitu nahi dituzula?</string>
     <string name="precise_routing_mode_descr">Kalkulatu errorerik gabeko ibilbide zehatza. Distantzia laburetara dago mugatua eta motela da.</string>
-    <string name="precise_routing_mode">Ibilbide kalkulu zehatza (alpha)</string>
+    <string name="precise_routing_mode">Ibilbide-kalkulu zehatza (alpha)</string>
     <string name="recording_context_menu_show">Erakutsi</string>
     <string name="recording_photo_description">"%1$s  %2$s argazkia"</string>
     <string name="av_def_action_picture">Argazkia atera</string>
@@ -241,7 +241,7 @@
     <string name="osmand_short_description_80_chars">Lineaz Kanpoko eta Sare Bidezko Mapa Ikusle eta Nabigatzaile Mugikor Globala OSM Mapetarako</string>
     <string name="osmand_long_description_1000_chars">OsmAnd (OSM Automated Navigation Directions) 
 \n 
-\nOsmAnd kode irekiko software bidezko nabigaziorako aplikazioa da, OpenStreetMapeko (OSM) mota askotako munduko mapetara sarbidearekin. Mapa guztiak (bektore edo tesela mapak) telefonoaren memoria txartelean gorde daitezke, lineaz kanpoko erabilpena bermatzeko. OsmAndek ere lineaz kanpoko eta sareko ibilbideak eskaintzen ditu, txandakako ahots gidaritzarekin. 
+\nOsmAnd kode irekiko software bidezko nabigaziorako aplikazioa da, OpenStreetMapeko (OSM) mota askotako munduko mapetara sarbidearekin. Mapa guztiak (bektore edo tesela mapak) telefonoaren memoria txartelean gorde daitezke, lineaz kanpoko erabilpena bermatzeko. OsmAndek ere lineaz kanpoko eta sareko ibilbide-kalkulua eskaintzen du, txandakako ahots gidaritzarekin. 
 \n 
 \nEzaugarri nagusi batzuk: 
 \n- Lineaz kanpoko erabateko erabilpena (bektore edo tesela mapak gorde ondoren aukeratu daitezken karpetetan) 
@@ -249,7 +249,7 @@
 \n- Herrialde edo eskualdeetako mapen deskarga, aplikaziotik zuzenean 
 \n- Gain-geruza desberdin asko ikusi daitezke, GPX edo ibilbide bidea, interes puntuak (POI), gogokoak, sestra-kurbak, garraio publikoaren geltokiak, geruza gardeneko mapa gehigarriak. 
 \n- Lineaz kanpoko helbide eta lekuen bilatzailea (POI-ak) 
-\n- Lineaz kanpoko ibilbide motzetarako nabigazioa 
+\n- Lineaz kanpoko ibilbide-kalkulua distantzia ertainetarako 
 \n- Kotxea, bizikleta eta oinezkoentzat modua: 
 \n- Egun/gau ikuspegi automatizatua 
 \n- Abiaduraren araberako maparen zooma 
@@ -265,7 +265,7 @@
     <string name="osmand_plus_short_description_80_chars">Lineaz Kanpoko eta Sare Bidezko OSM Mapetarako Mapa Ikusle eta Nabigatzaile Mugikor Globala</string>
     <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automated Navigation Directions) 
 \n 
-\nOsmAnd+ kode irekiko nabigaziorako aplikazioa da, OpenStreetMap-eko (OSM) mota askotako munduko mapetara sarbidearekin. Mapa guztiak (bektore edo tesela mapak) telefonoaren memoria txartelean gorde daitezke, lineaz kanpoko erabilpena bermatzeko. OsmAnd-ek ere lineaz kanpoko eta sareko ibilbideak eskaintzen ditu, txandakako ahots gidaritzarekin. 
+\nOsmAnd+ kode irekiko nabigaziorako aplikazioa da, OpenStreetMap-eko (OSM) mota askotako munduko mapetara sarbidearekin. Mapa guztiak (bektore edo tesela mapak) telefonoaren memoria txartelean gorde daitezke, lineaz kanpoko erabilpena bermatzeko. OsmAnd-ek ere lineaz kanpoko eta sareko ibilbide-kalkulua eskaintzen du, txandakako ahots gidaritzarekin. 
 \n 
 \nOsmAnd+ aplikazioaren ordaindutako bertsioa da, hau erosiz gero proiektua aurrera eramaten laguntzen ari zara, ezaugarri berrien garapena finantzatzen, eta gainera, azken eguneraketak jasoko dituzu. 
 \n 
@@ -276,12 +276,13 @@
 \n- Lineaz kanpoko WIkipedia-ko erabilpena (deskargatu Wikipedia-ko POIak), turismorako erabilgarriak 
 \n- Gain-geruza desberdin asko ikusi daitezke, GPX edo ibilbide bidea, interes puntuak (POI), gogokoak, sestra-kurbak, garraio publikoaren geltokiak, geruza gardeneko mapa gehigarriak. 
 \n- Lineaz kanpoko helbide eta lekuen bilatzailea (POI-ak) 
-\n- Lineaz kanpoko ibilbide ertainetarako nabigazioa 
+\n- Lineaz kanpoko ibilbide-kalkulua distantzia ertainetarako
 \n- Kotxea, bizikleta eta oinezkoentzat modua: 
 \n- Aukerazko egun/gau ikuspegi automatizatua 
 \n- Aukerazko abiaduraren araberako maparen zooma 
 \n- Aukerazko maparen lerrokatzea, iparrorratzaren edo norabidearen araberakoa 
-\n- Aukerazko errei gidaritza, abiadura muga bistaratzea, grabaketa edo TTS (ahots bihurgailua) motorra⏎ ⇥</string>
+\n- Aukerazko errei gidaritza, abiadura muga bistaratzea, grabaketa edo TTS (ahots bihurgailua) motorra⏎ ⇥
+\n</string>
     <string name="filterpoi_activity">Sortu POI iragazkia</string>
     <string name="recalculate_route_to_your_location">Garraio modua:</string>
     <string name="select_navigation_mode">Aukeratu garraio modua</string>
@@ -318,7 +319,7 @@
     <string name="map_widget_time">Falta den denbora</string>
     <string name="map_widget_next_turn">Hurrengo biraketa</string>
     <string name="map_widget_next_turn_small">Hurrengo biraketa (txikia)</string>
-    <string name="map_widget_next_next_turn">Hurrengoaren ondorengo bilaketa</string>
+    <string name="map_widget_next_next_turn">Hurrengoaren ondorengo biraketa</string>
     <string name="map_widget_mini_route">Ibilbide mapa txikia</string>
     <string name="bg_service_screen_lock">Pantaila blokeatu</string>
     <string name="bg_service_screen_unlock">Pantaila desblokeatu</string>
@@ -409,7 +410,7 @@
 \n
 \nTesela mapak zuzenean sareko iturburuetatik eskuratu daitezke, edo lineaz kanporako prestatu daitezke ere SQLite datu base gisa (eta eskuz OsmAndeko karpetan kopiatu), horretarako dauden hirugarrengoen prestaketa tresnaren bat erabiliz."</string>
     <string name="osmand_accessibility_description">Gehigarri honek gailuaren irisgarritasun ezaugarriak OsmAnd aplikazioan eskuragarri jartzen ditu. Besteak beste TTS ahotsen hizketaren abiadura moldatzea baimentzen du, gurutzetaren bidezko nabigazioa konfiguratzea, zooma trackball bidez kontrolatzea, edo testu-ahots bihurketaren bidezko erantzuna, adibidez zure kokalekua iragartzeko.</string>
-    <string name="osmand_development_plugin_description">Gehigarri honek garapen eta arazte ezaugarriak azalarazten ditu, ibilbide simulazioa edo pantailaren marrazketaren errendimenduaren bistaratzea, edo ahots abisuak esaterako. Ezarpen hauek garatzaileentzako dira eta erabiltzaile arruntek ez dituzte behar.</string>
+    <string name="osmand_development_plugin_description">Gehigarri honek garapen eta arazte ezaugarriak azalarazten ditu, ibilbide-kalkuluaren simulazioa edo pantailaren marrazketaren errendimenduaren bistaratzea, edo ahots abisuak esaterako. Ezarpen hauek garatzaileentzako dira eta erabiltzaile arruntek ez dituzte behar.</string>
     <string name="plugins_screen">Gehigarriak</string>
     <string name="prefs_plugins_descr">Gehigarriek ezarpen aurreratuak eta funtzionalitate berriak aktibatzen dituzte.</string>
     <string name="prefs_plugins">Gehigarriak</string>
@@ -1095,7 +1096,7 @@ Biltegiratzean {1} MB erabiliko dira.
     <string name="copying_osmand_files">OsmAnd fitxategiak kopiatzen…</string>
     <string name="app_mode_truck">Kamioia</string>
     <string name="guidance_preferences_descr">Nabigazio hobespenak</string>
-    <string name="routing_preferences_descr">Nabigazioaren hobespenak</string>
+    <string name="routing_preferences_descr">Ibilbide-kalkuluaren hobespenak</string>
     <string name="speech_rate_descr">Zehaztu TTS ahotsaren abiadura.</string>
     <string name="speech_rate">Ahots abiadura</string>
     <string name="rendering_attr_coloredBuildings_name">Koloreztatu eraikinak motaren arabera</string>
@@ -1625,7 +1626,7 @@ Eskuragarri {2} MB besterik ez daude.</string>
     <string name="index_item_world_bitcoin_payments">Munduko bitcoin ordainketak</string>
     <string name="index_item_world_basemap">Munduko ikuspegi mapa</string>
     <string name="index_item_world_ski">Munduko ski mapa</string>
-    <string name="disable_complex_routing">Ezgaitu ibilbide kalkulu konplexua</string>
+    <string name="disable_complex_routing">Desgaitu ibilbide-kalkulu konplexua</string>
     <string name="amenity_type_seamark">Itsaso marka</string>
     <string name="app_modes_choose">Aplikazio profilak</string>
     <string name="app_mode_motorcycle">Motorra</string>
@@ -1684,7 +1685,7 @@ Eskuragarri {2} MB besterik ez daude.</string>
     <string name="si_min_m">Minutu miliaro</string>
     <string name="si_nm_h">Itsas miliak orduko (korapiloak)</string>
     <string name="nm_h">kn</string>
-    <string name="av_locations_descr">GPX fitxategia ohar-kokapenekin.</string>
+    <string name="av_locations_descr">GPX fitxategia kokalekuekin.</string>
     <string name="traffic_warning_hazard">Arriskua</string>
     <string name="rendering_value_boldOutline_name">Ingerada lodia</string>
     <string name="download_live_updates">Berehalako eguneraketak</string>
@@ -1755,8 +1756,8 @@ Eskuragarri {2} MB besterik ez daude.</string>
     <string name="rendering_value_default_name">Lehenetsia</string>
     <string name="traffic_warning_pedestrian">Zebrabidea</string>
     <string name="show_pedestrian_warnings">Zebrabideak</string>
-    <string name="routing_attr_no_new_routing_name">v1.9 nabigazio araurik gabe</string>
-    <string name="routing_attr_no_new_routing_description">Ez erabili 1.9 bertsioan sartutako nabigazio arauak.</string>
+    <string name="routing_attr_no_new_routing_name">v1.9 ibilbide-kalkulu araurik gabe</string>
+    <string name="routing_attr_no_new_routing_description">Ez erabili 1.9 bertsioan sartutako ibilbide-kalkulu arauak.</string>
     <string name="dash_download_msg_none">Deskargatu lineaz kanpoko mapak?</string>
     <string name="dash_download_msg">%1$s mapa deskargatu dituzu</string>
     <string name="dash_download_new_one">Deskargatu mapa berria</string>
@@ -1908,7 +1909,7 @@ Eskuragarri {2} MB besterik ez daude.</string>
     <string name="lang_hu_formal">Hungariera (formala)</string>
     <string name="lang_kn">Kannada</string>
     <string name="routing_attr_height_name">Altuera muga</string>
-    <string name="disable_complex_routing_descr">Desgaitu bi faseetako ibilbide kalkulua kotxe bidezko nabigaziorako.</string>
+    <string name="disable_complex_routing_descr">Desgaitu bi faseetako ibilbide-kalkulua kotxe bidezko nabigaziorako.</string>
     <string name="app_modes_choose_descr">Hautatu aplikazioan ikusgai egongo diren erabilera profilak.</string>
     <string name="map_widget_map_rendering">Mapen marrazketa</string>
     <string name="local_osm_changes_delete_all_confirm">%1$d OSM aldaketa ezabatuko dituzu. Ziur zaude?</string>
@@ -2394,7 +2395,7 @@ Area honi dagokio: %1$s x %2$s</string>
 \n• Gehigarriekin sestra-kurbak eta erliebe-itzalak gaitu ditzakezu</string>
     <string name="osmand_plus_extended_description_part6">Bizikleta eta oinezkoentzako ezaugarriak 
 \n• Oinez, mendian, eta bizikletarekin egiteko bideak eta aktibitateak ikusi 
-\n• Bizikleta eta oinezkoentzako ibilbide eta ikuspegi bereziak 
+\n• Bizikleta eta oinezkoentzako ibilbide-kalkulu eta ikuspegi bereziak 
 \n• Aukeran garraio publikoaren geltokiak (autobusa, tranbia, trena) lineen izenak barne 
 \n• Aukeran bidaiaren grabaketa tokiko GPX fitxategira edo interneteko zerbitzari batera 
 \n• Aukeran abiadura eta garaiera bistaratu 
@@ -3014,7 +3015,7 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="files_failed">%1$d fitxategi kopiatzeak huts egin du (%2$s).</string>
     <string name="move_maps">Mugitu mapak</string>
     <string name="dont_move_maps">Ez mugitu</string>
-    <string name="public_transport_ped_route_title">Oinezko bidea</string>
+    <string name="public_transport_ped_route_title">Ibilbidea oinez gutxi gora behera %1$s da eta garraio publikoa baino azkarrago izan daiteke</string>
     <string name="public_transport_no_route_title">Tamalez, OsmAnd-ek ezin izan du zure ezarpenetarako bide egokirik aurkitu.</string>
     <string name="public_transport_try_ped">Saiatu oinezko nabigazioa.</string>
     <string name="public_transport_try_change_settings">Saiatu ezarpenak aldatzen.</string>
@@ -3029,16 +3030,16 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="files_present">%1$d fitxategi (%2$s) aurreko kokapen batean daude jada \'%3$s\'.</string>
     <string name="searching_gps">GPSa bilatzen</string>
     <string name="coordinates_widget">Koordenatuen trepeta</string>
-    <string name="rate_dialog_descr">Emazkiguzu 30 segundo mesedez, eman zure iritzia eta baloratu gure lana Google Play-n.</string>
+    <string name="rate_dialog_descr">"Emazkiguzu 30 segundo mesedez Google Play-n zure iritzia emanez eta  gure lana baloratuz."</string>
     <string name="button_rate">Baloratu</string>
     <string name="help_us_make_osmand_better">Lagundu gaitzazu OsmAnd hobetzen!</string>
     <string name="choose_data_to_share">Aukeratu zein motako datuak partekatu nahi dituzun:</string>
     <string name="downloaded_maps">Deskargatutako mapak</string>
     <string name="visited_screens">Bisitatutako pantailak</string>
     <string name="colleted_data">Jasotako datuak</string>
-    <string name="collected_data_descr">OsmAnd proiektuarekin partekatu nahi dituzun datuak.</string>
-    <string name="downloaded_maps_collect_descr">OsmAnd zeintzuk eskualde eta herrialdetan erabili ohi den ulertzeko jasotzen ditugu datu hauek.</string>
-    <string name="visited_screens_collect_descr">OsmAnd-en zeintzuk ezaugarri erabili ohi diren ulertzeko jasotzen ditugu datu hauek.</string>
+    <string name="collected_data_descr">Zehaztu zeintzuk datu baimentzen duzun OsmAnd-ek partekatzea.</string>
+    <string name="downloaded_maps_collect_descr">Lagundu gaitzazu mapa eta eskualde erabilienak zeintzuk diren ulertzen.</string>
+    <string name="visited_screens_collect_descr">Lagundu gaitzazu OsmAnd-en ezaugarri erabilienak zeintzuk diren ulertzen.</string>
     <string name="privacy_and_security_change_descr">\"Onartu\" sakatzean gure %1$s onartzen duzu</string>
     <string name="settings_privacy_and_security">Pribatutasuna eta segurtasuna</string>
     <string name="settings_privacy_and_security_desc">Hautatu gurekin partekatu nahi dituzun datuak</string>
@@ -3061,7 +3062,7 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="profile_type_descr_string">Mota: %s</string>
     <string name="profile_type_base_string">Oinarrizko profila</string>
     <string name="profile_alert_need_routing_type_title">Hautatu nabigazio mota</string>
-    <string name="profile_alert_need_routing_type_msg">Nabigazio mota hautatu behar duzu aplikazioaren profil berria sortzeko</string>
+    <string name="profile_alert_need_routing_type_msg">Hautatu aplikazio-profil berriaren nabigazio mota</string>
     <string name="profile_alert_need_profile_name_title">Sartu profilaren izena</string>
     <string name="profile_alert_need_profile_name_msg">Profilaren izena ezin da hutsik egon!</string>
     <string name="profile_alert_duplicate_name_title">Bikoiztutako izena</string>
@@ -3079,4 +3080,103 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="application_profiles_descr">Hautatu aplikazioan ikusgai egongo diren profilak.</string>
     <string name="application_profiles">Aplikazioaren profilak</string>
     <string name="routing_attr_freeride_policy_name">Pistatik kanpo</string>
+    <string name="shared_string_privacy_policy">Pribatutasun-politika</string>
+    <string name="make_osmand_better_descr">"Baimendu OsmAnd aplikazioaren erabilera-datu  anonimoen bildu eta prozesatzea. Ez dugu zure kokalekuari buruzko datuak biltzen edo gordetzen, ezta mapan begiratzen dituzun tokiena ere.
+\n
+\nEdonoiz zure hautapena alda dezakezu Ezarpenak &gt; Pribatutasuna eta segurtasuna atalean."</string>
+    <string name="app_mode_shuttle_bus">Autobus lotura-linea</string>
+    <string name="osmand_routing_promo">Routing.xml fitxategiaren zure bertsio aldatua gehitu dezakezu ..osmand/routing helbidean</string>
+    <string name="base_profile_descr_bicycle">Mendiko bizikleta, ziklomotorra, zaldia</string>
+    <string name="base_profile_descr_pedestrian">Oinezkoa, mendizalea, korrikalaria</string>
+    <string name="base_profile_descr_public_transport">Garraio publiko mota guztiak</string>
+    <string name="base_profile_descr_boat">Barkua, arrauna, bela</string>
+    <string name="base_profile_descr_aircraft">Hegazkina, planeatzailea</string>
+    <string name="routing_profile_geocoding">Geokodetzea</string>
+    <string name="osmand_default_routing">OsmAnd ibilbide-kalkulua</string>
+    <string name="custom_routing">Ibilbide-kalkuluaren profil pertsonalizatua</string>
+    <string name="special_routing_type">Ibilbide-kalkulu berezia</string>
+    <string name="third_party_routing_type">Hirugarrengoen ibilbide-kalkulua</string>
+    <string name="quick_action_need_to_add_item_to_list">Gutxienez elementu bat gehitu behar duzu zerrendara ekintza azkarren ezarpenetan</string>
+    <string name="routing_attr_piste_type_downhill_name">Eski alpinoa edo jaitsierakoa</string>
+    <string name="routing_attr_piste_type_downhill_description">Eski alpino edo jaitsierakoarentzako maldak eta igogailuetarako sarbideak.</string>
+    <string name="routing_attr_piste_type_nordic_name">Eski nordikoa edo fondokoa</string>
+    <string name="routing_attr_piste_type_nordic_description">Eski nordiko edo fondokoarentzako bidexkak.</string>
+    <string name="routing_attr_piste_type_skitour_name">Mendiko eskia</string>
+    <string name="routing_attr_piste_type_skitour_description">Mendiko eskiarentzako ibilbideak.</string>
+    <string name="routing_attr_piste_type_sled_name">Lera</string>
+    <string name="routing_attr_piste_type_sled_description">Lera erabiltzeko maldak.</string>
+    <string name="routing_attr_allow_intermediate_name">Baimendu tarteko ibilbideak</string>
+    <string name="routing_attr_allow_intermediate_description">Ibilbide zailagoak tarte aldapatsuagoekin. Orokorrean gainditu behar diren oztopoak.</string>
+    <string name="routing_attr_allow_advanced_name">Baimendu ibilbide aurreratuak</string>
+    <string name="routing_attr_allow_advanced_description">Ibilbide zailak, oztopo arriskutsuekin eta tarte aldapatsuekin.</string>
+    <string name="routing_attr_allow_expert_name">Baimendu adituentzako ibilbideak</string>
+    <string name="routing_attr_allow_expert_description">Ibilbide oso zailak, oztopo eta ingurune arriskutsuekin.</string>
+    <string name="routing_attr_allow_skating_only_name">Baimendu skate ibilbideak soilik</string>
+    <string name="routing_attr_allow_skating_only_description">Estilo libre edo skaterako prestatutako ibilbideak, bidexka klasikorik gabe.</string>
+    <string name="routing_attr_allow_classic_only_name">Baimendu ibilbide klasikoak soilik</string>
+    <string name="routing_attr_allow_classic_only_description">Estilo klasikorako soilik prestatutako ibilbideak, skaterako bidexkarik gabe. Elurretarako motorrarekin zein eskiatzaileek egindako pistak barne.</string>
+    <string name="routing_attr_difficulty_preference_name">Hobetsitako zailtasuna</string>
+    <string name="routing_attr_difficulty_preference_description">Hobetsi zailtasun hau duten ibilbideak, baina laburragoa bada pista zailago edo errazagoak hartu daitezke.</string>
+    <string name="routing_attr_freeride_policy_description">"Pista kanpoko ibilbideak ibilbide eta pasabide ez ofizialak dira. Orokorrean ofizialki  konpondu eta prestatu gabekoak eta gauez zaindu gabeak. Sartu zure ardurapean."</string>
+    <string name="process_downloading_service">OsmAnd deskarga zerbitzua</string>
+    <string name="shared_string_color_magenta">Magenta</string>
+    <string name="shared_string_icon">Ikonoa</string>
+    <string name="collected_data">Bildutako datuak</string>
+    <string name="press_again_to_change_the_map_orientation">Sakatu berriro maparen orientazioa aldatzeko</string>
+    <string name="shared_string_min_speed">Gutxieneko abiadura</string>
+    <string name="shared_string_max_speed">Gehieneko abiadura</string>
+    <string name="default_speed_setting_title">Lehenetsitako abiadura</string>
+    <string name="default_speed_setting_descr">Aldatu lehenetsitako abiadura-ezarpenak</string>
+    <string name="minmax_speed_dialog_title">Ezarri gutxieneko/gehieneko abiadurak</string>
+    <string name="default_speed_dialog_msg">Erabili ibilbide-kalkuluetan estimatutako iritsiera ordua kalkulatzeko</string>
+    <string name="new_profile">Profil berria</string>
+    <string name="shared_string_crash">Kraskatzea</string>
+    <string name="last_launch_crashed">Aurreko OsmAnd abioak huts egin du. Lagundu gaitzazu OsmAnd hobetzen errore mezua partekatuz.</string>
+    <string name="app_mode_ufo">OHE (objektu hegalari ezezagun)</string>
+    <string name="app_mode_personal_transporter">Garraio pertsonala</string>
+    <string name="app_mode_monowheel">Monozikloa</string>
+    <string name="precision_hdop_and_vdop">Zehaztasun horizontala: %1$s, bertikala: %2$s</string>
+    <string name="precision_hdop">Zehaztasun horizontala: %s</string>
+    <string name="app_mode_offroad">Errepidez kanpokoa</string>
+    <string name="edit_profile_setup_title">Ezarri profila</string>
+    <string name="edit_profile_setup_subtitle">Profilak bere ezarpen propioak ditu</string>
+    <string name="edit_profile_setup_map_subtitle">Hautatu profilean lehenetsitako mapa-aukerak</string>
+    <string name="edit_profile_screen_options_subtitle">Hautatu profilean lehenetsitako pantaila-aukerak</string>
+    <string name="edit_profile_nav_settings_subtitle">Hautatu profilean lehenetsitako nabigazio-aukerak</string>
+    <string name="routing_attr_max_num_changes_description">Zehaztu gehieneko aldaketa kopurua</string>
+    <string name="routing_attr_max_num_changes_name">Aldaketa kopurua</string>
+    <string name="turn_screen_on_router">Piztu pantaila biraketetan</string>
+    <string name="turn_screen_on_time_descr">Ezarri pantaila piztuta mantentzeko denbora.</string>
+    <string name="turn_screen_on_sensor">Erabili gertutasun sentsorea</string>
+    <string name="turn_screen_on_sensor_descr">Agurtu eskuarekin pantailaren goialdean pantaila pizteko nabigazioan zehar.</string>
+    <string name="rendering_attr_highway_class_track_grade1_name">1. gradua</string>
+    <string name="rendering_attr_highway_class_track_grade2_name">2. gradua</string>
+    <string name="rendering_attr_highway_class_track_grade3_name">3. gradua</string>
+    <string name="rendering_attr_highway_class_track_grade4_name">4. gradua</string>
+    <string name="rendering_attr_highway_class_track_grade5_name">5. gradua</string>
+    <string name="external_input_device">Kanpoko sarrera-gailuak</string>
+    <string name="external_input_device_descr">Hautatu kanpo-kontroletarako gailu bat, esaterako teklatu generiko bat edo WunderLINQ.</string>
+    <string name="sett_no_ext_input">Bat ere ez</string>
+    <string name="sett_generic_ext_input">Teklatu generikoa</string>
+    <string name="sett_wunderlinq_ext_input">WunderLINQ</string>
+    <string name="sett_parrot_ext_input">Parrot</string>
+    <string name="turn_on_profile_desc">Aktibatu aplikazio-profilen bat ezarpen hau erabiltzeko.</string>
+    <string name="rendering_attr_winter_road_name">Elur gaineko errepidea</string>
+    <string name="rendering_attr_ice_road_name">Izotz gaineko errepidea</string>
+    <string name="routeInfo_winter_ice_road_name">Elur eta izotz gaineko errepideak</string>
+    <string name="rendering_attr_tracktype_grade1_name">Sendoa (zolatua)</string>
+    <string name="rendering_attr_tracktype_grade2_name">Sendoa (zolatu gabea)</string>
+    <string name="rendering_attr_tracktype_grade3_name">Nagusiki sendoa</string>
+    <string name="rendering_attr_tracktype_grade4_name">Nagusiki biguna</string>
+    <string name="rendering_attr_tracktype_grade5_name">Biguna</string>
+    <string name="routeInfo_tracktype_name">Gainazalaren irmotasuna</string>
+    <string name="shared_string_file_is_saved">%s gorde da</string>
+    <string name="shared_string_open_track">Ireki lorratza</string>
+    <string name="shared_string_track_is_saved">%s lorratza gorde da</string>
+    <string name="gpx_join_gaps">Elkartu hutsuneak</string>
+    <string name="app_mode_camper">Kanpinzalea</string>
+    <string name="app_mode_campervan">Karabana</string>
+    <string name="rendering_attr_showLez_description">Erakutsi emisio gutxiko zonaldeak mapan. Ez dio ibilbide-kalkuluari eragiten.</string>
+    <string name="rendering_attr_showLez_name">Erakutsi emisio gutxiko zonaldeak</string>
+    <string name="temporary_conditional_routing">Hartu behin behineko mugatzeak aintzat</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index 1ebab3111c..f64d27086b 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -1119,7 +1119,7 @@
     <string name="app_mode_boat">قایق</string>
     <string name="app_mode_aircraft">هواپیما</string>
     <string name="amenity_type_seamark">علامت دریایی</string>
-    <string name="app_modes_choose_descr">پروفایل‌ها را از اینجا انتخاب کنید تا در برنامه ببینیدشان.</string>
+    <string name="app_modes_choose_descr">پروفایل‌ها را اینجا انتخاب کنید تا در برنامه ظاهر شوند.</string>
     <string name="app_modes_choose">پروفایل‌های برنامه</string>
     <string name="map_widget_map_rendering">رسم نقشه</string>
     <string name="routing_preferences_descr">تنظیمات مسیریابی</string>
@@ -2405,7 +2405,7 @@
     <string name="context_menu_item_open_note">ایجاد یادداشت OSM</string>
     <string name="osm_edit_reopened_note">یادداشت OSM بازگشوده</string>
     <string name="osm_edit_created_note">ایجاد یادداشت OSM</string>
-    <string name="rendering_attr_hideProposed_name">مکان‌های در حد پیشنهاد</string>
+    <string name="rendering_attr_hideProposed_name">عارضه‌های پیشنهادی (Proposed)</string>
     <string name="osm_edit_created_poi">ایجاد POI</string>
     <string name="logged_as">واردشده با عنوان %1$s</string>
     <string name="moving_time">مدت حرکت</string>
@@ -3102,7 +3102,7 @@
     <string name="app_mode_shuttle_bus">اتوبوس خطی</string>
     <string name="app_mode_subway">مترو</string>
     <string name="app_mode_horse">اسب</string>
-    <string name="app_mode_helicopter">بالگرد</string>
+    <string name="app_mode_helicopter">هلی‌کوپتر</string>
     <string name="app_mode_skiing">اسکی</string>
     <string name="base_profile_descr_ski">اسکی</string>
     <string name="select_icon_profile_dialog_title">انتخاب نماد</string>
@@ -3120,7 +3120,8 @@
     <string name="profile_alert_delete_title">حذف پروفایل</string>
     <string name="profile_alert_delete_msg">آیا از حذف پروفایل %s اطمینان دارید</string>
     <string name="select_base_profile_dialog_title">یک پروفایل پایه انتخاب کنید</string>
-    <string name="select_base_profile_dialog_message">پروفایل سفارشی خود را بر پایهٔ یکی از پروفایل‌های برنامه بسازید. با این کار برخی چیزهای ابتدایی مانند نمایانی ابزارک‌ها و واحد سرعت و مسافت تنظیم می‌شود. این‌ها پروفایل‌های پیشفرض برنامه هستند، به‌علاوهٔ نمونه‌هایی از پروفایل‌های سفارشی که بر پایهٔ آن‌ها ساخته شده‌اند:</string>
+    <string name="select_base_profile_dialog_message">پروفایل سفارشی خود را بر پایهٔ یکی از پروفایل‌های برنامه بسازید. با این کار برخی چیزهای ابتدایی مانند نمایانی ابزارک‌ها و واحد سرعت و مسافت تنظیم می‌شود. 
+\nپروفایل‌های پیشفرض برنامه و چند نمونه پروفایل سفارشی که بر پایهٔ آن‌ها ساخته شده، در زیر آمده:</string>
     <string name="select_nav_profile_dialog_title">انتخاب نوع ناوبری</string>
     <string name="base_profile_descr_car">خودرو، کامیون، موتورسیکلت</string>
     <string name="base_profile_descr_pedestrian">پیاده‌روی، پیاده‌گردی، دو</string>
@@ -3142,23 +3143,23 @@
     <string name="default_speed_dialog_msg">برای پیش‌بینی زمان رسیدن در هنگام مسیریابی استفاده می‌شود</string>
     <string name="new_profile">پروفایل جدید</string>
     <string name="last_launch_crashed">آخرین اجرای OsmAnd با شکست مواجه شد. لطفاً با اشتراک‌گذاری پیغام خطا ما را در بهبود OsmAnd یاری کنید.</string>
-    <string name="release_3_4">"• پروفایل‌های برنامه: متناسب با نیازهای خود پروفایل سفارشی بسازید؛ با رنگ و نماد دلخواه 
-\n 
+    <string name="release_3_4">"• پروفایل‌های برنامه: متناسب با نیاز خود پروفایل سفارشی بسازید؛ با رنگ و نماد دلخواه 
+\n
 \n • برای هر پروفایل پیشفرض‌ها و سرعت‌های حداقل/حداکثر  را به‌دلخواه تنظیم کنید 
-\n 
+\n
 \n • یک ابزارک برای نمایش مختصات کنونی اضافه شده 
+\n
+\n • گزینه‌های جدید برای نمایش قطب‌نما و خط‌کش شعاعی روی نقشه اضافه شده
+\n
+\n • ضبط رد در پس‌زمینه اصلاح شد
+\n
+\n • دانلود نقشه در پس‌زمینه بهبود یافت
+\n
+\n • انتخاب زبان ویکی‌پدیا اصلاح شد
+\n
+\n • رفتار دکمهٔ قطب‌نما در هنگام مسیریابی اصلاح شد
 \n 
-\n • Added options to show the compass and a radius ruler on the map 
-\n 
-\n • Fix background track logging 
-\n 
-\n • Improved background map downloads 
-\n 
-\n • Fixed Wikipedia language selection 
-\n 
-\n • Fixed compass button behavior during navigation 
-\n 
-\n • Other bug fixes
+\n •  اصلاح سایر باگ‌ها
 \n
 \n"</string>
     <string name="app_mode_offroad">آفرود</string>
@@ -3167,7 +3168,7 @@
     <string name="edit_profile_setup_map_subtitle">انتخاب گزینه‌های پیشفرض نقشه برای پروفایل</string>
     <string name="edit_profile_screen_options_subtitle">انتخاب گزینه‌های پیشفرض صفحه برای پروفایل</string>
     <string name="edit_profile_nav_settings_subtitle">انتخاب تنظیمات پیشفرض ناوبری برای پروفایل</string>
-    <string name="app_mode_ufo">یوفو</string>
+    <string name="app_mode_ufo">بشقاب‌پرنده</string>
     <string name="app_mode_personal_transporter">رانَک (وسیلهٔ نقلیهٔ انفرادی)</string>
     <string name="app_mode_monowheel">یکچرخه</string>
     <string name="app_mode_scooter">اسکوتر</string>
@@ -3226,4 +3227,8 @@
     <string name="base_profile_descr_aircraft">هواپیما، گلایدینگ</string>
     <string name="routing_attr_max_num_changes_description">بیشترین تعداد تغییر وسیله را مشخص کنید</string>
     <string name="routing_attr_max_num_changes_name">تعداد تغییرات</string>
+    <string name="gpx_join_gaps">اتصال بریدگی‌ها</string>
+    <string name="rendering_attr_showLez_description">محدوده‌های کم‌آلاینده (LEZ) را روی نقشه نشان بده. بر مسیریابی تأثیر ندارد.</string>
+    <string name="rendering_attr_showLez_name">نمایش محدوده‌های کم‌آلاینده</string>
+    <string name="temporary_conditional_routing">در نظر گرفتن محدودیت‌های موقت در مسیریابی</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 7b1eb4be21..91557585fb 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -3175,4 +3175,5 @@ représentant la zone : %1$s x %2$s</string>
     <string name="sett_wunderlinq_ext_input">WunderLINQ</string>
     <string name="sett_parrot_ext_input">Parrot</string>
     <string name="select_base_profile_dialog_message">Basez votre profil personnalisé sur l\'un des profils par défaut pour définir les unités de vitesse, de distance ou la visibilité des widgets. Voici les profils par défaut de l\'application ainsi que des exemples de profils personnalisés :</string>
+    <string name="temporary_conditional_routing">Prendre en compte les limitations temporaires</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index 12f5619f2f..11e60b42e8 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -3181,7 +3181,7 @@ Lon %2$s</string>
     <string name="routing_attr_difficulty_preference_description">Preferir rotas desta dificultade, aínda que o trazado sobre pistas máis duras ou máis doadas segue a ser posíbel se son máis curtas.</string>
     <string name="routing_attr_freeride_policy_name">Fóra de pista</string>
     <string name="routing_attr_freeride_policy_description">As pistas libres e fóra de pista son rotas e pasaxes non oficiais. Adoitan ser descoidadas, non mantidas polos oficiais e non controladas pola noite. Entrar baixo o teu propio risco.</string>
-    <string name="app_mode_ufo">UFO</string>
+    <string name="app_mode_ufo">OVNI</string>
     <string name="release_3_4">• Perfís de aplicación: crea o teu propio perfil para as túas necesidades, cunha icona e unha cor personalizadas 
 \n 
 \n • Engade a opción para estabelecer a velocidade predeterminada e mínima/máxima para os diferentes perfís 
@@ -3242,4 +3242,10 @@ Lon %2$s</string>
     <string name="shared_string_file_is_saved">%s está gardado</string>
     <string name="shared_string_open_track">Abrir pista</string>
     <string name="shared_string_track_is_saved">A pista %s está gardada</string>
+    <string name="gpx_join_gaps">Xuntar espazos</string>
+    <string name="app_mode_camper">Casa móbil (camper)</string>
+    <string name="app_mode_campervan">Autocaravana</string>
+    <string name="rendering_attr_showLez_description">Amosar zonas de baixas emisións no mapa. Non afecta á navigación.</string>
+    <string name="rendering_attr_showLez_name">Amosar zonas de baixas emisións</string>
+    <string name="temporary_conditional_routing">Considerar limitacións temporais</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index 670f4bf461..1c07dcb97b 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -3089,4 +3089,49 @@
     <string name="new_profile">פרופיל חדש</string>
     <string name="shared_string_crash">קריסה</string>
     <string name="last_launch_crashed">הטעינה האחרונה של OsmAnd נכשלה. נא לסייע לנו לשפר את OsmAnd על ידי שיתוף הודעת השגיאה.</string>
+    <string name="button_rate">דירוג</string>
+    <string name="shared_string_privacy_policy">מדיניות פרטיות</string>
+    <string name="help_us_make_osmand_better">נשמח לקבל סיוע בשיפור OsmAnd!</string>
+    <string name="choose_data_to_share">נא לבחור את סוג הנתונים שברצונך לשתף:</string>
+    <string name="downloaded_maps">מפות התקבלו</string>
+    <string name="visited_screens">מסכים בהם ביקרת</string>
+    <string name="collected_data_descr">נא לציין איזה סוג של מידע מוסכם עליך לשתף עם OsmAnd.</string>
+    <string name="visited_screens_collect_descr">מסייע לנו להבין אילו תכונות של OsmAnd הן הנפוצות ביותר.</string>
+    <string name="privacy_and_security_change_descr">נגיעה ב„הרשאה” מביעה את הסכמתך עם %1$s שלנו</string>
+    <string name="settings_privacy_and_security">פרטיות ואבטחה</string>
+    <string name="settings_privacy_and_security_desc">נא לבחור אילו נתונים ישותפו אתנו</string>
+    <string name="shared_string_no_thank_you">לא, תודה</string>
+    <string name="shared_string_allow">הרשאה</string>
+    <string name="profile_name_hint">שם הפרופיל</string>
+    <string name="nav_type_hint">סוג ניווט</string>
+    <string name="app_mode_taxi">מונית</string>
+    <string name="app_mode_shuttle_bus">שאטל</string>
+    <string name="app_mode_subway">רכבת תחתית</string>
+    <string name="app_mode_horse">סוס</string>
+    <string name="app_mode_helicopter">הליקופטר</string>
+    <string name="app_mode_skiing">סקי</string>
+    <string name="base_profile_descr_ski">סקי</string>
+    <string name="show_compass_ruler">הצגת סרגל מצפן</string>
+    <string name="hide_compass_ruler">הסתרת סרגל מצפן</string>
+    <string name="select_icon_profile_dialog_title">בחירת סמל</string>
+    <string name="settings_routing_mode_string">מצב: %s</string>
+    <string name="settings_derived_routing_mode_string">מצב משתמש, נגזר מתוך: %s</string>
+    <string name="routing_profile_ski">סקי</string>
+    <string name="profile_type_descr_string">סוג: %s</string>
+    <string name="profile_type_base_string">פרופיל בסיס</string>
+    <string name="profile_alert_need_routing_type_title">בחירת סוג ניווט</string>
+    <string name="profile_alert_need_routing_type_msg">נא לבחור בסוג ניווט לפרופיל החדש ביישומון</string>
+    <string name="profile_alert_need_profile_name_title">נא להקליד שם פרופיל</string>
+    <string name="profile_alert_need_profile_name_msg">שם הפרופיל לא אמור להישאר ריק!</string>
+    <string name="profile_alert_duplicate_name_title">שם כפול</string>
+    <string name="profile_alert_duplicate_name_msg">כבר יש פרופיל בשם הזה</string>
+    <string name="shared_string_color_magenta">מג׳נטה</string>
+    <string name="shared_string_icon">סמל</string>
+    <string name="collected_data">נתונים שנאספו</string>
+    <string name="gpx_join_gaps">צירוף מרווחים</string>
+    <string name="app_mode_camper">מחנאות</string>
+    <string name="app_mode_campervan">רכב מחנאות</string>
+    <string name="rendering_attr_showLez_description">הצגת אזורים עם פליטה נמוכה במפה. לא משפיע על הניווט.</string>
+    <string name="rendering_attr_showLez_name">הצגת אזורים עם פליטה נמוכה</string>
+    <string name="temporary_conditional_routing">התייחסות למגבלות זמניות</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-hu/phrases.xml b/OsmAnd/res/values-hu/phrases.xml
index a9e06d6c42..3757ec5913 100644
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@@ -1060,13 +1060,13 @@
     <string name="poi_backrest_no">Támla nincs</string>
     <string name="poi_intermittent">Időszakos meder</string>
     <string name="poi_building">Épület</string>
-    <string name="poi_generator_source_coal">Áramforrás: szén</string>
-    <string name="poi_generator_source_gas">Áramforrás: földgáz</string>
-    <string name="poi_generator_source_nuclear">Áramforrás: nukleáris energia</string>
-    <string name="poi_generator_source_solar">Áramforrás: napenergia</string>
-    <string name="poi_generator_source_hydro">Áramforrás: vízenergia</string>
-    <string name="poi_generator_source_wind">Áramforrás: szélenergia</string>
-    <string name="poi_generator_source_geothermal">Áramforrás: geotermikus energia</string>
+    <string name="poi_generator_source_coal">Energiaforrás: szén</string>
+    <string name="poi_generator_source_gas">Energiaforrás: földgáz</string>
+    <string name="poi_generator_source_nuclear">Energiaforrás: nukleáris energia</string>
+    <string name="poi_generator_source_solar">Energiaforrás: napsütés</string>
+    <string name="poi_generator_source_hydro">Energiaforrás: vízenergia</string>
+    <string name="poi_generator_source_wind">Energiaforrás: szél</string>
+    <string name="poi_generator_source_geothermal">Energiaforrás: geotermikus energia</string>
     <string name="poi_generator_source_oil">Áramforrás: kőolaj</string>
     <string name="poi_generator_source_diesel">Áramforrás: gázolaj</string>
     <string name="poi_pump_manual">Kézi</string>
@@ -3597,4 +3597,5 @@
     <string name="poi_charcoal_pile">Faszénégető boksa</string>
     <string name="poi_historic_tank">Történelmi harckocsi</string>
     <string name="poi_hookah_lounge">Vízipipázó társalgóhely</string>
+    <string name="poi_source_biomass">Energiaforrás: biomassza</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 821ad4acaa..33f1d19a35 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -3097,4 +3097,37 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="shared_string_file_is_saved">%s elmentve</string>
     <string name="shared_string_open_track">Nyitott nyomvonal</string>
     <string name="shared_string_track_is_saved">%s nyomvonal elmentve</string>
+    <string name="select_nav_profile_dialog_title">Navigációs mód kijelölése</string>
+    <string name="base_profile_descr_car">Személyautó, teherautó, motorkerékpár</string>
+    <string name="base_profile_descr_bicycle">MTB, kismotor, ló</string>
+    <string name="base_profile_descr_pedestrian">Gyaloglás, túrázás, futás</string>
+    <string name="base_profile_descr_public_transport">Minden tömegközlekedés-típus</string>
+    <string name="base_profile_descr_boat">Hajózás, evezés, vitorlázás</string>
+    <string name="base_profile_descr_aircraft">Repülés, siklórepülés</string>
+    <string name="routing_profile_geocoding">Geokódolás</string>
+    <string name="routing_profile_straightline">Légvonal</string>
+    <string name="routing_profile_broutrer">BRouter (offline)</string>
+    <string name="osmand_default_routing">OsmAnd útvonaltervezés</string>
+    <string name="custom_routing">Egyedi útvonal-tervezési profil</string>
+    <string name="special_routing_type">Speciális útvonaltervezés</string>
+    <string name="third_party_routing_type">Harmadik fél által biztosított útvonaltervezés</string>
+    <string name="application_profiles_descr">Jelölje ki az alkalmazásban látni kívánt profilokat.</string>
+    <string name="application_profiles">Alkalmazásprofilok</string>
+    <string name="routing_attr_piste_type_sled_name">Szánkó</string>
+    <string name="app_mode_offroad">Terep</string>
+    <string name="external_input_device">Külső beviteli eszköz</string>
+    <string name="external_input_device_descr">A külső vezérléshez jelöljön ki egy eszközt, például egy általános billentyűzetet vagy WunderLINQ-et.</string>
+    <string name="sett_no_ext_input">Nincs</string>
+    <string name="sett_generic_ext_input">Általános billentyűzet</string>
+    <string name="sett_wunderlinq_ext_input">WunderLINQ</string>
+    <string name="sett_parrot_ext_input">Parrot</string>
+    <string name="turn_on_profile_desc">Ennek a beállításnak a használatához kapcsoljon be legalább egy alkalmazásprofilt.</string>
+    <string name="rendering_attr_winter_road_name">Havas út</string>
+    <string name="rendering_attr_ice_road_name">Jeges út</string>
+    <string name="routeInfo_winter_ice_road_name">Havas és jeges utak</string>
+    <string name="app_mode_camper">Lakókocsi</string>
+    <string name="app_mode_campervan">Lakóautó</string>
+    <string name="rendering_attr_showLez_description">Alacsony kibocsátású övezetek megjelenítése a térképen. Nem befolyásolja az útvonaltervezést.</string>
+    <string name="rendering_attr_showLez_name">Alacsony kibocsátású övezetek megjelenítése</string>
+    <string name="temporary_conditional_routing">Időszakos korlátozások figyelembevétele</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index 9607cb9d28..5b5f99abd6 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -630,7 +630,7 @@ POIの更新は利用できません</string>
     <string name="recording_delete_confirm">この記録を削除しますか？</string>
     <string name="recording_unavailable">利用できません</string>
     <string name="recording_context_menu_arecord">音声を録音</string>
-    <string name="recording_context_menu_vrecord">動画メモを取る</string>
+    <string name="recording_context_menu_vrecord">動画メモを撮影</string>
     <string name="layer_recordings">記録レイヤー</string>
     <string name="recording_can_not_be_played">記録されたファイルは再生できませんでした</string>
     <string name="recording_context_menu_delete">記録を削除</string>
@@ -2141,7 +2141,7 @@ POIの更新は利用できません</string>
     <string name="quick_action_map_style">マップスタイルの変更</string>
     <string name="quick_action_map_style_switch">マップスタイルが\"%s\"に変更されました。</string>
     <string name="quick_action_take_audio_note">音声メモを取る</string>
-    <string name="quick_action_take_video_note">動画メモを取る</string>
+    <string name="quick_action_take_video_note">動画メモを撮影</string>
     <string name="quick_action_take_photo_note">写真メモを取る</string>
     <string name="quick_action_add_osm_bug">OSM注記を追加</string>
     <string name="quick_action_navigation_voice">音声のon/off</string>
@@ -3049,4 +3049,11 @@ POIの更新は利用できません</string>
     <string name="add_home">自宅の追加</string>
     <string name="shared_string_privacy_policy">プライバシーポリシー</string>
     <string name="settings_privacy_and_security">プライバシーとセキュリティ</string>
+    <string name="downloaded_maps">ダウンロードしたマップ</string>
+    <string name="visited_screens">アクセスした画面</string>
+    <string name="application_profiles_descr">アプリ内で使用する移動手段別プロファイルの設定をします。</string>
+    <string name="application_profiles">各プロファイルの設定</string>
+    <string name="collected_data">収集されるデータ</string>
+    <string name="shared_string_crash">動作停止エラー</string>
+    <string name="last_launch_crashed">前回OsmAndの起動に失敗しました。エラー内容を送信し、OsmAndの改善にご協力ください。</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 408cf9924e..6fc2be25ca 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -3183,7 +3183,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="rendering_attr_tracktype_grade4_name">Głównie miękkie</string>
     <string name="rendering_attr_tracktype_grade5_name">Miękkie</string>
     <string name="routeInfo_tracktype_name">Trwałość powierzchni</string>
-    <string name="shared_string_file_is_saved">%s jest zapisany</string>
+    <string name="shared_string_file_is_saved">Zapisano %s</string>
     <string name="shared_string_open_track">Otwórz ślad</string>
     <string name="shared_string_track_is_saved">Ślad %s jest zapisany</string>
     <string name="release_3_4">• Profile aplikacji: Stwórz własny profil dla własnych potrzeb, z niestandardową ikoną i kolorem
@@ -3208,4 +3208,14 @@ Reprezentuje obszar: %1$s x %2$s</string>
 \n
 \n</string>
     <string name="edit_profile_setup_title">Konfiguracja Profilu</string>
+    <string name="rendering_attr_highway_class_track_grade1_name">Stopień 1</string>
+    <string name="rendering_attr_highway_class_track_grade2_name">Stopień 2</string>
+    <string name="rendering_attr_highway_class_track_grade3_name">Stopień 3</string>
+    <string name="rendering_attr_highway_class_track_grade4_name">Stopień 4</string>
+    <string name="rendering_attr_highway_class_track_grade5_name">Stopień 5</string>
+    <string name="app_mode_camper">Kamper</string>
+    <string name="app_mode_campervan">Samochód kempingowy</string>
+    <string name="rendering_attr_showLez_description">Pokaż strefy niskiej emisji na mapie. Nie ma to wpływu na przebieg trasy.</string>
+    <string name="rendering_attr_showLez_name">Pokaż strefy niskiej emisji</string>
+    <string name="temporary_conditional_routing">Rozważ tymczasowe ograniczenia</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 23f38ee766..409770f79a 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -1554,7 +1554,7 @@ Pôr do Sol: %2$s</string>
     <string name="use_fast_recalculation_desc">Recalcular apenas a parte inicial da rota para viagens longas.</string>
     <string name="rendering_value_disabled_name">Desativado</string>
     <string name="rendering_value_walkingRoutesScopeOSMC_name">Cor por afiliação da rede</string>
-    <string name="rendering_value_walkingRoutesOSMC_name">Colorir conforme símbolo de caminhadas OSMC</string>
+    <string name="rendering_value_walkingRoutesOSMC_name">Cor por símbolo de caminhadas OSMC</string>
     <string name="osm_edit_context_menu_delete">Apagar edição no OSM</string>
     <string name="shared_string_show_details">Mostrar detalhes</string>
     <string name="read_full_article">Leia o artigo completo (on-line)</string>
@@ -3194,4 +3194,10 @@ Pôr do Sol: %2$s</string>
     <string name="rendering_attr_tracktype_grade3_name">Principalmente sólido</string>
     <string name="rendering_attr_tracktype_grade4_name">Principalmente macio</string>
     <string name="rendering_attr_tracktype_grade5_name">Suave</string>
+    <string name="gpx_join_gaps">Mesclar espaços</string>
+    <string name="app_mode_camper">Casa móvel (campista)</string>
+    <string name="app_mode_campervan">Autocaravana</string>
+    <string name="rendering_attr_showLez_description">"Mostrar zonas de baixa emissão no mapa.  Não afeta o roteamento."</string>
+    <string name="rendering_attr_showLez_name">Mostrar baixas zonas de emissão</string>
+    <string name="temporary_conditional_routing">Considere limitações temporárias</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index a6bb3b5686..01de91e30b 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -3206,4 +3206,7 @@
     <string name="shared_string_file_is_saved">%s está gravado</string>
     <string name="shared_string_open_track">Abrir faixa</string>
     <string name="shared_string_track_is_saved">A faixa %s está gravada</string>
-</resources>
+    <string name="rendering_attr_showLez_description">Mostrar zonas de baixa emissão no mapa. Não afeta o roteamento.</string>
+    <string name="rendering_attr_showLez_name">Mostrar zonas de baixa emissão</string>
+    <string name="temporary_conditional_routing">Considerar limitações temporárias</string>
+</resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index be576bc726..3323f5e54e 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -379,7 +379,7 @@
     <string name="read_more">Прочитај више</string>
     <string name="whats_new">Шта је ново</string>
     <string name="rendering_attr_hideProposed_name">Предложене објекте</string>
-    <string name="shared_string_update">Освежи</string>
+    <string name="shared_string_update">Ажурирај</string>
     <string name="shared_string_upload">Отпреми</string>
     <string name="world_map_download_descr">Основна карта света (која покрива целу Земљу при погледу издалека) не постоји или је застарела. Молим, преузмите основну карту света за употпуњавање радне средине.</string>
     <string name="shared_string_qr_code">QR код</string>
@@ -416,7 +416,7 @@
     <string name="simulate_your_location_stop_descr">Заустави опонашање свог положаја.</string>
     <string name="simulate_your_location_descr">Опонашај употребом прорачунате путање или GPX снимка.</string>
     <string name="looking_up_address">Претражујем адресу</string>
-    <string name="av_locations_descr">GPX фајл са положајима белешки.</string>
+    <string name="av_locations_descr">GPX фајл са положајима.</string>
     <string name="av_locations">Положаји</string>
     <string name="plugin_settings">Додаци</string>
     <string name="rendering_value_boldOutline_name">Задебљај обрисне линије</string>
@@ -1175,7 +1175,7 @@
     <string name="access_shared_string_not_installed">Није уграђено</string>
     <string name="access_widget_expand">Простри</string>
     <string name="access_shared_string_navigate_up">Наведи горе</string>
-    <string name="access_sort">Разврстај</string>
+    <string name="access_sort">Сортирај</string>
     <string name="map_mode">Приказ карте</string>
     <string name="number_of_gpx_files_selected_pattern">%s GPX фајла је одабрано</string>
     <string name="rendering_value_fine_name">Нежно</string>
@@ -1242,7 +1242,7 @@
     <string name="change_color">Промени боју</string>
     <string name="edit_name">Промени име</string>
     <string name="animate_my_location">Оживи мој положај</string>
-    <string name="shared_string_install">Угради</string>
+    <string name="shared_string_install">Инсталирај</string>
     <string name="online_photos">Мрежне слике</string>
     <string name="shared_string_add_photos">Додај слике</string>
     <string name="no_photos_descr">Нема слика овог положаја.</string>
@@ -1447,7 +1447,7 @@
     <string name="my_location">Мој положај</string>
     <string name="shared_string_finish">Крај</string>
     <string name="plan_route">План путовања</string>
-    <string name="shared_string_sort">Распореди</string>
+    <string name="shared_string_sort">Сортирај</string>
     <string name="coordinate_input">Унос координата</string>
     <string name="marker_save_as_track_descr">Извезите ознаке у следећи GPX фајл:</string>
     <string name="marker_save_as_track">Сачувај као GPX фајл</string>
@@ -3034,4 +3034,117 @@
     <string name="public_transport_type">Тип превоза</string>
     <string name="searching_gps">Тражим GPS</string>
     <string name="coordinates_widget">Справица за координате</string>
+    <string name="button_rate">Оцени</string>
+    <string name="shared_string_privacy_policy">Политика приватности</string>
+    <string name="help_us_make_osmand_better">Помозите нам да побољшамо OsmAnd!</string>
+    <string name="choose_data_to_share">Одаберите које типове података желите да делите:</string>
+    <string name="downloaded_maps">Преузете карте</string>
+    <string name="visited_screens">Посећени екрани</string>
+    <string name="collected_data_descr">Дефинишите које податке дозвољавате OsmAnd-у да дели.</string>
+    <string name="downloaded_maps_collect_descr">Помозите нам да разумемо које карте из којих региона и држава су најпопуларније.</string>
+    <string name="visited_screens_collect_descr">Помозите нам да разумемо које OsmAnd функционалности су најпопуларније.</string>
+    <string name="privacy_and_security_change_descr">Притиском на „Дозволи“, слажете се са нашом %1$s</string>
+    <string name="settings_privacy_and_security">Приватност и безбедност</string>
+    <string name="settings_privacy_and_security_desc">Одаберите које податке делите са нама</string>
+    <string name="shared_string_no_thank_you">Не, хвала</string>
+    <string name="shared_string_allow">Дозволи</string>
+    <string name="profile_name_hint">Име профила</string>
+    <string name="nav_type_hint">Тип навођења</string>
+    <string name="app_mode_taxi">Такси</string>
+    <string name="app_mode_shuttle_bus">Аутобус</string>
+    <string name="app_mode_subway">Подземна</string>
+    <string name="app_mode_horse">Коњ</string>
+    <string name="app_mode_helicopter">Хеликоптер</string>
+    <string name="app_mode_skiing">Скијање</string>
+    <string name="base_profile_descr_ski">Скијање</string>
+    <string name="select_icon_profile_dialog_title">Одаберите иконицу</string>
+    <string name="settings_routing_mode_string">Режим: %s</string>
+    <string name="settings_derived_routing_mode_string">Кориснички режим, изведен из: %s</string>
+    <string name="routing_profile_ski">Скијање</string>
+    <string name="profile_type_descr_string">Тип: %s</string>
+    <string name="profile_type_base_string">Основни профил</string>
+    <string name="profile_alert_need_routing_type_title">Одаберите тип навођења</string>
+    <string name="profile_alert_need_routing_type_msg">Одаберите тип навођења за нови апликативни профил</string>
+    <string name="profile_alert_need_profile_name_title">Унесите име профила</string>
+    <string name="profile_alert_need_profile_name_msg">Име профила не може бити празно!</string>
+    <string name="profile_alert_duplicate_name_title">Име већ постоји</string>
+    <string name="profile_alert_duplicate_name_msg">Већ постоји профил са овим именом</string>
+    <string name="profile_alert_cant_delete_base">Не можете обрисати OsmAnd основни профил</string>
+    <string name="profile_alert_need_save_title">Снимите измене</string>
+    <string name="profile_alert_need_save_msg">Морате снимити измене на профилу пре настављања</string>
+    <string name="profile_alert_delete_title">Обриши профил</string>
+    <string name="profile_alert_delete_msg">Да ли сте сигурни да желите да обришете профил %s</string>
+    <string name="select_base_profile_dialog_title">Одаберите основни профил</string>
+    <string name="select_nav_profile_dialog_title">Одаберите тип навођења</string>
+    <string name="base_profile_descr_car">Кола, камион, мотор</string>
+    <string name="base_profile_descr_bicycle">MTB, мопед, коњ</string>
+    <string name="base_profile_descr_pedestrian">Ходање, шетање, трчање</string>
+    <string name="base_profile_descr_public_transport">Сви типови јавног превоза</string>
+    <string name="base_profile_descr_boat">Брод, веслање, једрење</string>
+    <string name="base_profile_descr_aircraft">Авион, параглајдинг</string>
+    <string name="routing_profile_geocoding">Геокодирање</string>
+    <string name="routing_profile_straightline">Права линија</string>
+    <string name="routing_profile_broutrer">BRouter (не треба интернет)</string>
+    <string name="osmand_default_routing">OsmAnd рутирање</string>
+    <string name="custom_routing">Произвољни профил рутирања</string>
+    <string name="special_routing_type">Специјално рутирање</string>
+    <string name="third_party_routing_type">Рутирање треће стране</string>
+    <string name="application_profiles_descr">Одаберите профиле видљиве из апликације.</string>
+    <string name="application_profiles">Апликативни профили</string>
+    <string name="routing_attr_difficulty_preference_name">Жељена тежина</string>
+    <string name="routing_attr_freeride_policy_name">Ван стазе</string>
+    <string name="routing_attr_freeride_policy_description">Путање ван стазе су незваничне руте и пролази. Углавном су несређене, неодржаване и не проверавају се увече. Улазите на сопствену одговорност.</string>
+    <string name="process_downloading_service">OsmAnd сервис преузимања</string>
+    <string name="shared_string_color_magenta">Магента</string>
+    <string name="shared_string_icon">Иконица</string>
+    <string name="collected_data">Преузети подаци</string>
+    <string name="press_again_to_change_the_map_orientation">Притисните поново да промените оријентацију карте</string>
+    <string name="shared_string_min_speed">Мин. брзина</string>
+    <string name="shared_string_max_speed">Макс. брзина</string>
+    <string name="default_speed_setting_title">Подразумевана брзина</string>
+    <string name="default_speed_setting_descr">Промени подешавања подразумеване брзине</string>
+    <string name="minmax_speed_dialog_title">Постави мин/макс брзину</string>
+    <string name="default_speed_dialog_msg">Користи се да израчуна очекивано време доласка код рутирања</string>
+    <string name="new_profile">Нови профил</string>
+    <string name="shared_string_crash">Рушење</string>
+    <string name="last_launch_crashed">Последње покретање апликације није успело. Помозите нам да побољшамо OsmAnd тако што ћете поделити поруку о грешци са нама.</string>
+    <string name="app_mode_ufo">НЛО</string>
+    <string name="app_mode_personal_transporter">Лично превозно средство</string>
+    <string name="app_mode_monowheel">Моноцикл</string>
+    <string name="app_mode_scooter">Скутер</string>
+    <string name="precision_hdop_and_vdop">Хоризонтална прецизност: %1$s, вертикална: %2$s</string>
+    <string name="precision_hdop">Хоризонтална прецизност: %s</string>
+    <string name="app_mode_offroad">Ван пута</string>
+    <string name="edit_profile_setup_title">Подеси профил</string>
+    <string name="edit_profile_setup_subtitle">Профили задржавају своја подешавања</string>
+    <string name="edit_profile_setup_map_subtitle">Одаберите подразумеване опције мапе за профил</string>
+    <string name="edit_profile_screen_options_subtitle">Одаберите подразумеване опције екрана за профил</string>
+    <string name="edit_profile_nav_settings_subtitle">Одаберите подразумеване поставке навођења за профил</string>
+    <string name="routing_attr_max_num_changes_description">Одаберите највећи број измена</string>
+    <string name="routing_attr_max_num_changes_name">Број измена</string>
+    <string name="turn_screen_on_router">Пробуди се код скретања</string>
+    <string name="turn_screen_on_time_descr">Подесите време када да се екран пробуди.</string>
+    <string name="turn_screen_on_sensor">Користи сензор близине</string>
+    <string name="turn_screen_on_sensor_descr">Махните руком преко екрана да укључите екран за време навигације.</string>
+    <string name="external_input_device">Екстерни улазни уређај</string>
+    <string name="sett_no_ext_input">Ниједан</string>
+    <string name="sett_generic_ext_input">Генеричка тастатура</string>
+    <string name="sett_wunderlinq_ext_input">WunderLINQ</string>
+    <string name="sett_parrot_ext_input">Parrot</string>
+    <string name="turn_on_profile_desc">Укључите бар један апликативни профил, да користите ово подешавање.</string>
+    <string name="rendering_attr_winter_road_name">Снежни коловоз</string>
+    <string name="rendering_attr_ice_road_name">Залеђени коловоз</string>
+    <string name="routeInfo_winter_ice_road_name">Снежни и залеђени коловози</string>
+    <string name="rendering_attr_tracktype_grade1_name">Чврста (поплочана)</string>
+    <string name="rendering_attr_tracktype_grade2_name">Чврста (непоплочана)</string>
+    <string name="rendering_attr_tracktype_grade3_name">Углавном чврста</string>
+    <string name="rendering_attr_tracktype_grade4_name">Углавном мекана</string>
+    <string name="rendering_attr_tracktype_grade5_name">Мекана</string>
+    <string name="routeInfo_tracktype_name">Чврстина подлоге</string>
+    <string name="shared_string_file_is_saved">%s је сачуван</string>
+    <string name="app_mode_camper">Кампер</string>
+    <string name="app_mode_campervan">Камп приколица</string>
+    <string name="rendering_attr_showLez_description">Прикажи зоне ниске емисије загађења. Не утиче на рутирање.</string>
+    <string name="rendering_attr_showLez_name">Прикажи зоне ниске емисије загађења</string>
+    <string name="temporary_conditional_routing">Укључи у обзир и привремена ограничења</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index f64fe551f0..3da72c1210 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -1884,7 +1884,7 @@
     <string name="map_markers">Маркери мапи</string>
     <string name="map_marker">Позначка мапи</string>
     <string name="consider_turning_polygons_off">Рекомендується вимкнути промальовку полігонів.</string>
-    <string name="av_locations_descr">Файл GPX з координатами нотаток.</string>
+    <string name="av_locations_descr">GPX-файл з координатами.</string>
     <string name="show_free_version_banner_description">Навіть, якщо ви придбали платну версію, ви все ще можете бачити банер для безкоштовної версії.</string>
     <string name="dashboard_or_drawer_description">На вибір пропонується керувати додатком головним чином за допомогою гнучкої панелі керування або статичного меню. Ваш вибір завжди може бути змінений в налаштуваннях панелі керування.</string>
     <string name="map_marker_1st">Перша позначка мапи</string>
@@ -3049,9 +3049,9 @@
     <string name="choose_data_to_share">Оберіть, даними якого типу ви хотіли б поділитися:</string>
     <string name="downloaded_maps">Мап завантажено</string>
     <string name="visited_screens">Екранів відвідано</string>
-    <string name="collected_data_descr">Список даних, якими ви хочете поділитися з OsmAnd.</string>
-    <string name="downloaded_maps_collect_descr">Ми збираємо ці дані, щоб зрозуміти, які мапи яких областей і країн є найбільш популярними.</string>
-    <string name="visited_screens_collect_descr">Ми збираємо ці дані, щоб зрозуміти, які можливості OsmAnd є найбільш популярними.</string>
+    <string name="collected_data_descr">Вкажіть, якими даними ви дозволяєте OsmAnd-у ділитися.</string>
+    <string name="downloaded_maps_collect_descr">Допомагає нам зрозуміти, які мапи яких областей і країн є найбільш популярними.</string>
+    <string name="visited_screens_collect_descr">Допомагає нам зрозуміти, які можливості OsmAnd є найбільш популярними.</string>
     <string name="privacy_and_security_change_descr">Натискаючи \"Дозволити\", ви погоджуєтесь з нашими %1$s</string>
     <string name="settings_privacy_and_security">Конфіденційність та безпека</string>
     <string name="settings_privacy_and_security_desc">Оберіть, якими даними ви ділитися з нами</string>
@@ -3167,4 +3167,47 @@
     <string name="routing_attr_allow_advanced_name">Дозволити розширені маршрути</string>
     <string name="routing_attr_allow_advanced_description">Складні маршрути з небезпечними перешкодами і крутими ділянками.</string>
     <string name="routing_attr_allow_expert_name">Дозволити експертні маршрути</string>
+    <string name="routing_attr_allow_expert_description">Надзвичайно складні маршрути з небезпечними перешкодами та оточенням.</string>
+    <string name="routing_attr_allow_skating_only_name">Дозволити лише маршрути для катання на ковзанах</string>
+    <string name="routing_attr_allow_skating_only_description">Маршрути, створені лише для фрістайлу або ковзанів, без класичних трас.</string>
+    <string name="routing_attr_allow_classic_only_name">Дозволити тільки класичні маршрути</string>
+    <string name="routing_attr_allow_classic_only_description">Маршрути, створені тільки для класичної їзди, без роликових треків. Сюди входять маршрути, доглянуті малим снігоходом з більш твердим треком, та траси, зроблені лижниками вручну.</string>
+    <string name="routing_attr_difficulty_preference_name">Бажана складність</string>
+    <string name="routing_attr_difficulty_preference_description">Надавати перевагу маршрутам такої складності, хоча маршрутизація через складніші або легші треки все ж можлива, якщо коротша.</string>
+    <string name="routing_attr_freeride_policy_name">Позатрековий</string>
+    <string name="routing_attr_freeride_policy_description">Фрірайд та позатрековик є неофіційними маршрутами та проїздами. Зазвичай недоглянуті, непомічені чиновниками і не перевіряються по вечорам. Заходьте лише на власний ризик.</string>
+    <string name="turn_screen_on_router">Прокидатися перед поворотом</string>
+    <string name="turn_screen_on_time_descr">Встановіть час, за який увімкнеться екран.</string>
+    <string name="turn_screen_on_sensor">Використовувати датчик наближення</string>
+    <string name="turn_screen_on_sensor_descr">Проведіть рукою над екраном, щоб увімкнути його під час навігації.</string>
+    <string name="rendering_attr_highway_class_track_grade1_name">1 клас</string>
+    <string name="rendering_attr_highway_class_track_grade2_name">2 клас</string>
+    <string name="rendering_attr_highway_class_track_grade3_name">3 клас</string>
+    <string name="rendering_attr_highway_class_track_grade4_name">4 клас</string>
+    <string name="rendering_attr_highway_class_track_grade5_name">5 клас</string>
+    <string name="external_input_device">Зовнішні пристрої введення</string>
+    <string name="external_input_device_descr">Оберіть пристрій на кшталт звичайної клавіатури чи WunderLINQ для зовнішнього управління.</string>
+    <string name="sett_no_ext_input">Немає</string>
+    <string name="sett_generic_ext_input">Звичайна клавіатура</string>
+    <string name="sett_wunderlinq_ext_input">WundеrLINQ</string>
+    <string name="sett_parrot_ext_input">Parrot</string>
+    <string name="turn_on_profile_desc">Увімкніть принаймні один профіль додатку, щоб скористатися цим параметром.</string>
+    <string name="rendering_attr_winter_road_name">Зимова дорога</string>
+    <string name="rendering_attr_ice_road_name">Льодова дорога</string>
+    <string name="routeInfo_winter_ice_road_name">Зимові та льодові дороги</string>
+    <string name="rendering_attr_tracktype_grade1_name">Тверде (з покриттям)</string>
+    <string name="rendering_attr_tracktype_grade2_name">Тверде (без покриття)</string>
+    <string name="rendering_attr_tracktype_grade3_name">Переважно тверде</string>
+    <string name="rendering_attr_tracktype_grade4_name">Переважно м\'яке</string>
+    <string name="rendering_attr_tracktype_grade5_name">М\'яке</string>
+    <string name="routeInfo_tracktype_name">Твердість поверхні дороги</string>
+    <string name="shared_string_file_is_saved">%s збережено</string>
+    <string name="shared_string_open_track">Відкрити трек</string>
+    <string name="shared_string_track_is_saved">Трек %s збережено</string>
+    <string name="gpx_join_gaps">Об\'єднати прогалини</string>
+    <string name="app_mode_camper">Житель табору</string>
+    <string name="app_mode_campervan">Автомобіль табору</string>
+    <string name="rendering_attr_showLez_description">Показати на карті зони низьких викидів. Не впливає на маршрутизацію.</string>
+    <string name="rendering_attr_showLez_name">Показати зони низьких викидів</string>
+    <string name="temporary_conditional_routing">Враховувати тимчасові обмеження</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-zh-rCN/phrases.xml b/OsmAnd/res/values-zh-rCN/phrases.xml
index e1d3c4f3fc..16b40ecb65 100644
--- a/OsmAnd/res/values-zh-rCN/phrases.xml
+++ b/OsmAnd/res/values-zh-rCN/phrases.xml
@@ -78,4 +78,180 @@
     <string name="poi_cafe_and_restaurant">咖啡馆和餐厅</string>
     <string name="poi_service">服务</string>
     <string name="poi_water_supply_type">水供应类型</string>
+    <string name="poi_bicycle_parking_type">类型</string>
+    <string name="poi_archaeological_site_type">类型</string>
+    <string name="poi_information_type">类型</string>
+    <string name="poi_resort_type">类型</string>
+    <string name="poi_recycling_type">类型</string>
+    <string name="poi_shelter_type">类型</string>
+    <string name="poi_social_facility_type">类型</string>
+    <string name="poi_zoo_type">类型</string>
+    <string name="poi_shop">商店</string>
+    <string name="poi_emergency">急</string>
+    <string name="poi_man_made">人造</string>
+    <string name="poi_landuse">土地利用</string>
+    <string name="poi_administrative">行政</string>
+    <string name="poi_healthcare">医疗保健</string>
+    <string name="poi_office">办公室</string>
+    <string name="poi_sport">运动</string>
+    <string name="poi_tourism">旅游</string>
+    <string name="poi_sightseeing">遊覽</string>
+    <string name="poi_accomodation">住宿</string>
+    <string name="poi_entertainment">闲暇</string>
+    <string name="poi_finance">金融</string>
+    <string name="poi_natural">自然</string>
+    <string name="poi_military">军事</string>
+    <string name="poi_alcohol">酒商店</string>
+    <string name="poi_chocolate">巧克力店</string>
+    <string name="poi_coffee">咖啡馆</string>
+    <string name="poi_beverages">饮料店</string>
+    <string name="poi_ice_cream">冰淇淋馆</string>
+    <string name="poi_tea">茶馆</string>
+    <string name="poi_wine">葡萄酒店</string>
+    <string name="poi_books">书店</string>
+    <string name="poi_bicycle">自行车店</string>
+    <string name="poi_bag">袋子店</string>
+    <string name="poi_shoes">鞋店</string>
+    <string name="poi_candles">蜡烛店</string>
+    <string name="poi_computer">电脑店</string>
+    <string name="poi_doors">门</string>
+    <string name="poi_florist">花店</string>
+    <string name="poi_gift">礼物店</string>
+    <string name="poi_leather">皮店</string>
+    <string name="poi_mobile_phone">手机店</string>
+    <string name="poi_music">音乐店</string>
+    <string name="poi_games">游戏</string>
+    <string name="poi_honey">蜂蜜店</string>
+    <string name="poi_toll_booth">收费站</string>
+    <string name="poi_border_control">边境管制</string>
+    <string name="poi_car_repair">汽车修</string>
+    <string name="poi_public_transport_platform_bus">公共汽车站</string>
+    <string name="poi_bus_stop">公共汽车站</string>
+    <string name="poi_railway_station">火车站</string>
+    <string name="poi_aerodrome">飞机场</string>
+    <string name="poi_speed_camera">测速摄像机</string>
+    <string name="poi_telephone">电话</string>
+    <string name="poi_recycling_clothes">衣服</string>
+    <string name="poi_recycling_books">书</string>
+    <string name="poi_recycling_shoes">鞋</string>
+    <string name="poi_recycling_mobile_phones">手机</string>
+    <string name="poi_recycling_computers">电脑</string>
+    <string name="poi_recycling_cds">光盘</string>
+    <string name="poi_recycling_bottles">瓶</string>
+    <string name="poi_recycling_christmas_trees">圣诞树</string>
+    <string name="poi_recycling_cars">汽车</string>
+    <string name="poi_recycling_bicycles">自行车</string>
+    <string name="poi_college">学院</string>
+    <string name="poi_school">学校</string>
+    <string name="poi_university">大学</string>
+    <string name="poi_country">国家</string>
+    <string name="poi_city">城市</string>
+    <string name="poi_hospital">医院</string>
+    <string name="poi_doctors">医生</string>
+    <string name="poi_dentist">牙医</string>
+    <string name="poi_company">公司</string>
+    <string name="poi_insurance">保险</string>
+    <string name="poi_lawyer">律师</string>
+    <string name="poi_american_football"></string>
+    <string name="poi_baseball">棒球</string>
+    <string name="poi_basketball">篮球</string>
+    <string name="poi_ice_hockey">冰球</string>
+    <string name="poi_golf">高尔夫球</string>
+    <string name="poi_ice_skating">滑冰</string>
+    <string name="poi_skateboard">滑板</string>
+    <string name="poi_soccer">足球</string>
+    <string name="poi_swimming">游泳</string>
+    <string name="poi_table_tennis">乒乓球</string>
+    <string name="poi_tennis">网球</string>
+    <string name="poi_volleyball">排球</string>
+    <string name="poi_museum">博物馆</string>
+    <string name="poi_hotel">酒店</string>
+    <string name="poi_religion_buddhist">佛教</string>
+    <string name="poi_club_computer">电脑俱乐部</string>
+    <string name="poi_club_sport">运动俱乐部</string>
+    <string name="poi_club_game">游戏俱乐部</string>
+    <string name="poi_club_automobile">汽车俱乐部</string>
+    <string name="poi_club_history">历史俱乐部</string>
+    <string name="poi_club_music">音乐俱乐部</string>
+    <string name="poi_piste_ice_skate">滑冰</string>
+    <string name="poi_library">图书馆</string>
+    <string name="poi_dog_park">狗狗公园</string>
+    <string name="poi_swimming_pool">游泳池</string>
+    <string name="poi_water_park">水公园</string>
+    <string name="poi_park">公园</string>
+    <string name="poi_restaurant">餐馆</string>
+    <string name="poi_fast_food">快餐</string>
+    <string name="poi_water">水</string>
+    <string name="poi_wood">木</string>
+    <string name="poi_tree">树</string>
+    <string name="poi_wiki_place">维基百科</string>
+    <string name="poi_wiki_lang_en">英文维基百科</string>
+    <string name="poi_wiki_lang_de">德文维基百科</string>
+    <string name="poi_wiki_lang_es">西班牙文维基百科</string>
+    <string name="poi_wiki_lang_fr">法文维基百科</string>
+    <string name="poi_wiki_lang_it">意大利文维基百科</string>
+    <string name="poi_wiki_lang_ja">日文维基百科</string>
+    <string name="poi_wiki_lang_ko">韩文维基百科</string>
+    <string name="poi_wiki_lang_pl">波兰文维基百科</string>
+    <string name="poi_wiki_lang_ru">俄文维基百科</string>
+    <string name="poi_wiki_lang_zh">中文维基百科</string>
+    <string name="poi_wiki_lang_ga">爱尔兰文维基百科</string>
+    <string name="poi_entrance_exit">出口</string>
+    <string name="poi_description">描述</string>
+    <string name="poi_phone">电话号</string>
+    <string name="poi_website">网站</string>
+    <string name="twitter">推特</string>
+    <string name="poi_mobile">手机号</string>
+    <string name="poi_height">高度</string>
+    <string name="poi_seasonal_spring">春天</string>
+    <string name="poi_seasonal_summer">夏天</string>
+    <string name="poi_seasonal_autumn">秋天</string>
+    <string name="poi_seasonal_winter">冬天</string>
+    <string name="poi_trees_olive">橄榄</string>
+    <string name="poi_trees_apple">苹果</string>
+    <string name="poi_trees_orange">橙子</string>
+    <string name="poi_trees_peach">桃子</string>
+    <string name="poi_trees_tea">茶</string>
+    <string name="poi_trees_coffea">咖啡</string>
+    <string name="poi_animal_shelter_dog">狗</string>
+    <string name="poi_animal_shelter_cat">猫</string>
+    <string name="poi_animal_shelter_dog_cat">狗和猫</string>
+    <string name="poi_animal_shelter_bird">鸟</string>
+    <string name="poi_information_map">地图</string>
+    <string name="poi_information_office">办公室</string>
+    <string name="poi_information_history">历史</string>
+    <string name="poi_board_type_public_transport">公共交通</string>
+    <string name="poi_board_type_technology">科技</string>
+    <string name="poi_payment_telephone_cards_yes">电话卡</string>
+    <string name="poi_payment_bitcoin_yes">比特币</string>
+    <string name="poi_payment_dogecoin_yes">多吉币</string>
+    <string name="poi_service_repair">修</string>
+    <string name="poi_vending_drinks">饮料</string>
+    <string name="poi_vending_food">食物</string>
+    <string name="poi_vending_drinks_food">饮料和食物</string>
+    <string name="poi_vending_milk">牛奶</string>
+    <string name="poi_vending_bread">面包</string>
+    <string name="poi_vending_chewing_gums">口香糖</string>
+    <string name="poi_vending_coffee">咖啡</string>
+    <string name="poi_vending_animal_food">动物食物</string>
+    <string name="poi_vending_candles">蜡烛</string>
+    <string name="poi_vending_ice_cream">冰淇淋</string>
+    <string name="poi_resource_bismuth">铋</string>
+    <string name="poi_resource_clay">粘土</string>
+    <string name="poi_resource_coal">煤</string>
+    <string name="poi_resource_copper">铜</string>
+    <string name="poi_resource_diamond">钻石</string>
+    <string name="poi_resource_gold">金</string>
+    <string name="poi_resource_iron_ore">铁矿石</string>
+    <string name="poi_resource_lead">铅</string>
+    <string name="poi_resource_mercury">汞</string>
+    <string name="poi_resource_nickel">镍</string>
+    <string name="poi_resource_oil">油</string>
+    <string name="poi_resource_platinum">铂</string>
+    <string name="poi_resource_radium">镭</string>
+    <string name="poi_width">宽度</string>
+    <string name="poi_animal_shelter_horse">马</string>
+    <string name="poi_animal_shelter_fish">鱼</string>
+    <string name="poi_substation_type">类型</string>
+    <string name="poi_books_type">书</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 319976d92f..6e70b0efc3 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -3198,4 +3198,10 @@
     <string name="shared_string_file_is_saved">%s 已儲存</string>
     <string name="shared_string_open_track">開放軌道</string>
     <string name="shared_string_track_is_saved">軌道 %s 已儲存</string>
+    <string name="gpx_join_gaps">加入 gaps</string>
+    <string name="app_mode_camper">露營車</string>
+    <string name="app_mode_campervan">露營車</string>
+    <string name="rendering_attr_showLez_description">在地圖上顯示低排放區域。不會影響路徑。</string>
+    <string name="rendering_attr_showLez_name">顯示低排放區域</string>
+    <string name="temporary_conditional_routing">考慮暫時限制</string>
 </resources>
\ No newline at end of file