diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index c1f1905804..ace5f9d79f 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2123,4 +2123,8 @@
     <string name="min_km">хв/км</string>
     <string name="m_s">м/с</string>
     
+    <string name="srtm_plugin_disabled">Ізалініі вышынь адключаны</string>
+    <string name="downloading_number_of_files">Сьцягваецца - %1$d файл</string>
+    <string name="show_free_version_banner_description">Нават калі вы маеце платную вэрсію вы можаце ўбачыць банэр бясплатнай вэрсіі</string>
+<string name="show_free_version_banner">Паказваць банэр бясплатнай вэрсіі</string>
     </resources>
diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml
index c075db1d73..f9778bab92 100644
--- a/OsmAnd/res/values-ca/phrases.xml
+++ b/OsmAnd/res/values-ca/phrases.xml
@@ -892,14 +892,14 @@
 	<string name="poi_highway_crossing">Pas de vianants</string>
 
 	<string name="poi_icn_ref">Xarxa internacional de rutes ciclistes</string>
-	<string name="poi_ncn_ref">Xarxa nacional de rutes ciclistes</string>
-	<string name="poi_rcn_ref">Xarxa regional de rutes ciclistes</string>
-	<string name="poi_lcn_ref">Xarxa local de rutes ciclistes</string>
+	<string name="poi_ncn_ref">Node de la xarxa ciclista nacional</string>
+	<string name="poi_rcn_ref">Node de la xarxa ciclista regional</string>
+	<string name="poi_lcn_ref">Node de la xarxa ciclista local</string>
 
-	<string name="poi_iwn_ref">Xarxa internacional de rutes de senderisme</string>
-	<string name="poi_nwn_ref">Xarxa nacional de rutes de senderisme</string>
-	<string name="poi_rwn_ref">Xarxa regional de rutes de senderisme</string>
-	<string name="poi_lwn_ref">Xarxa local de rutes de senderisme</string>
+	<string name="poi_iwn_ref">Node de la xarxa de senderisme internacional</string>
+	<string name="poi_nwn_ref">Node de la xarxa senderista nacional</string>
+	<string name="poi_rwn_ref">Node de la xarxa senderista regional</string>
+	<string name="poi_lwn_ref">Node de la xarxa senderista local</string>
 
 	<string name="poi_opening_hours">Horari de servei</string>
 	<string name="poi_collection_times">Horari de recollida</string>
@@ -919,7 +919,7 @@
 	<string name="poi_enforcement_maxspeed">Control de trànsit: velocitat màxima</string>
 	<string name="poi_enforcement_maxheight">Control de trànsit: alçada màxima</string>
 	<string name="poi_enforcement_mindistance">Control de trànsit: distància mínima</string>
-	<string name="poi_enforcement_check">Control de trànsit</string>
+	<string name="poi_enforcement_check">Control de trànsit: control</string>
 	<string name="poi_enforcement_access">Control de trànsit: accés</string>
 	<string name="poi_enforcement_toll">Control de trànsit: peatge</string>
 
@@ -1228,4 +1228,60 @@
 	<string name="poi_vending_ice_cream">Gelat</string>
 	<string name="poi_vending_sim_cards">Targes SIM</string>
 
+	<string name="poi_nudism_customary">Nudisme: habitual</string>
+	<string name="poi_nudism_permissive">Nudisme: permissiu</string>
+
+	<string name="poi_parking_underground">Subterrani</string>
+	<string name="poi_bicycle_parking_anchors">Ancoratges</string>
+	<string name="poi_leaf_type_leafless">Sense fulles</string>
+	<string name="poi_species">Espècies</string>
+	<string name="poi_genus">Gènere</string>
+	<string name="poi_trees_olive">Olivera</string>
+	<string name="poi_trees_apple">Pomer</string>
+	<string name="poi_trees_orange">Taronger</string>
+	<string name="poi_trees_almond">Ametller</string>
+	<string name="poi_trees_banana">Bananer</string>
+	<string name="poi_trees_hazel">Avellaner</string>
+	<string name="poi_trees_coconut">Cocoter</string>
+	<string name="poi_trees_cherry">Cirerer</string>
+	<string name="poi_trees_walnut">Noguera</string>
+	<string name="poi_trees_plum">Pruner</string>
+	<string name="poi_trees_peach">Presseguer</string>
+	<string name="poi_trees_tea">Te</string>
+	<string name="poi_trees_pomegranate">Magraner</string>
+
+	<string name="poi_urban">Urbà</string>
+	<string name="poi_rural">Rural</string>
+
+	<string name="poi_int_name">Nom internacional</string>
+	<string name="poi_nat_name">Nom nacional</string>
+	<string name="poi_reg_name">Nom regional</string>
+	<string name="poi_loc_name">Nom local</string>
+	<string name="poi_old_name">Nom antic</string>
+	<string name="poi_alt_name">Nom alternatiu</string>
+
+	<string name="poi_pump_manual">Bomba manual</string>
+	<string name="poi_pump_powered">Bomba motoritzada</string>
+	<string name="poi_pump_no">Sense bomba</string>
+	<string name="poi_pump">Bomba</string>
+
+	<string name="poi_water_characteristic_mineral">Característica de l\'aigua: mineral</string>
+	<string name="poi_water_characteristic_mud">Característica de l\'aigua: argilosa</string>
+	<string name="poi_water_characteristic_sulfuric">Característica de l\'aigua: sulfúrica</string>
+
+	<string name="poi_cuisine">Cuina</string>
+
+	<string name="poi_information_board">Panell d\'informació</string>
+	<string name="poi_information_map">Mapa</string>
+	<string name="poi_information_office">Oficina d\'informació</string>
+	<string name="poi_information_terminal">Terminal d\'informació</string>
+	<string name="poi_information_route_marker">Marcador de ruta</string>
+	<string name="poi_information_hikingmap">Mapa de senderisme</string>
+	<string name="poi_information_audioguide">Audioguia</string>
+	<string name="poi_information_bicyclemap">Mapa ciclista</string>
+	<string name="poi_information_tactile_model">Model tàctil</string>
+	<string name="poi_information_tactile_map">Mapa tàctil</string>
+	<string name="poi_board_type_notice">Tauler d\'anuncis</string>
+	<string name="poi_vending_drinks_sweets">Begudes i dolços</string>
+	<string name="poi_vending_animal_food">Menjar per animals</string>
 	</resources>
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index e3e1bdea47..27b0e315f8 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -117,7 +117,7 @@
         <string name="poi_traffic_calming_rumble_strip">Rumlestriber</string>
         <string name="poi_traffic_calming_table">Plateau bumb</string>
         <string name="poi_traffic_calming_choker">Indsnævring</string>
-        <string name="poi_traffic_signals">Lyskurv</string>
+        <string name="poi_traffic_signals">Lyskryds</string>
 
         <string name="poi_car_repair">Autoværksted</string>
         <string name="poi_service_tyres">Dækservice</string>
@@ -931,13 +931,13 @@
 	<string name="poi_service_times">Service-tider</string>
 	<string name="poi_brand">Varemærke</string>
 
-	<string name="poi_enforcement_traffic_signals">Overvågning: stoplys</string>
-	<string name="poi_enforcement_maxspeed">Overvågning: hastighedskontrol</string>
-	<string name="poi_enforcement_maxheight">Overvågning: højdekontrol</string>
-	<string name="poi_enforcement_mindistance">Overvågning: afstandskontrol</string>
-	<string name="poi_enforcement_check">Overvågning: trafikkontrol</string>
-	<string name="poi_enforcement_access">Overvågning: adgangskontrol</string>
-	<string name="poi_enforcement_toll">Overvågning: vejafgiftskontrol</string>
+	<string name="poi_enforcement_traffic_signals">Kontrol: stoplys</string>
+	<string name="poi_enforcement_maxspeed">Kontrol: max. hastighed</string>
+	<string name="poi_enforcement_maxheight">Kontrol: max. højde</string>
+	<string name="poi_enforcement_mindistance">Kontrol: min. afstand</string>
+	<string name="poi_enforcement_check">Kontrol: tjek</string>
+	<string name="poi_enforcement_access">Kontrol: adgang</string>
+	<string name="poi_enforcement_toll">Kontrol: vejafgift</string>
 
 <string name="poi_country">Landlig</string>
 	<string name="poi_fee_yes">Gebyr</string>
@@ -1293,19 +1293,19 @@
 	<string name="poi_information_terminal">Informationsstander</string>
 	<string name="poi_information_route_marker">Ruteskilte</string>
 	<string name="poi_information_hikingmap">Vandrekort</string>
-	<string name="poi_information_nature">Information om: natur</string>
-	<string name="poi_information_wildlife">Information om: dyreliv</string>
-	<string name="poi_information_history">Information om: historie</string>
+	<string name="poi_information_nature">Informationsmarkør: natur</string>
+	<string name="poi_information_wildlife">Informationsmarkør: dyreliv</string>
+	<string name="poi_information_history">Informationsmarkør: historie</string>
 	<string name="poi_information_sign">Skilt</string>
 	<string name="poi_information_audioguide">Audioguide</string>
 	<string name="poi_information_bicyclemap">Cykelkort</string>
 	<string name="poi_information_tactile_model">Taktilmodel</string>
 	<string name="poi_information_tactile_map">Taktilkort</string>
-	<string name="poi_board_type_plants">Information om: planter</string>
-	<string name="poi_board_type_geology">Information om: geologi</string>
-	<string name="poi_board_type_public_transport">Information om: offentlig transport</string>
-	<string name="poi_board_type_technology">Information om: teknologi</string>
-	<string name="poi_board_type_astronomy">Information om: astronomi</string>
+	<string name="poi_board_type_plants">Informationsmarkør: planter</string>
+	<string name="poi_board_type_geology">Informationsmarkør: geologi</string>
+	<string name="poi_board_type_public_transport">Informationsmarkør: offentlig transport</string>
+	<string name="poi_board_type_technology">Informationsmarkør: teknologi</string>
+	<string name="poi_board_type_astronomy">Informationsmarkør: astronomi</string>
 
 <string name="poi_information_trail_blaze">Stiafmærkning</string>
 	<string name="poi_board_type_notice">Opslagstavle</string>
@@ -1385,7 +1385,7 @@
 	<string name="poi_piste_grooming_mogul">Pistepreparering: pukkelpist</string>
 
 <string name="poi_garden_type_residential">Havetype: beboelse</string>
-	<string name="poi_garden_type_community">Havetype: offentlig</string>
+	<string name="poi_garden_type_community">Havetype: fælles</string>
 	<string name="poi_garden_type_private">Havetype: privat</string>
 	<string name="poi_garden_type_botanical">Havetype: botanisk</string>
 
@@ -1411,8 +1411,8 @@
 	<string name="poi_aerialway_occupancy">Kabine/stol/vogn kapacitet</string>
 	<string name="poi_aerialway_capacity">Kapacitet pr. time</string>
 	<string name="poi_aerialway_duration">Gennemsnitlige rejsetid, minutter</string>
-	<string name="poi_aerialway_bubble_yes">Boble</string>
-	<string name="poi_aerialway_bubble_no">Ingen boble</string>
+	<string name="poi_aerialway_bubble_yes">Boble lukket</string>
+	<string name="poi_aerialway_bubble_no">Ikke boble lukket</string>
 	<string name="poi_aerialway_heating_yes">Opvarmet</string>
 	<string name="poi_aerialway_heating_no">Ikke opvarmet</string>
 	<string name="poi_aerialway_bicycle_yes">Cykel: tilladt</string>
@@ -1674,7 +1674,7 @@
 	<string name="poi_toilets_wheelchair_no">Adgang til toiletter for kørestole: nej</string>
 	<string name="poi_toilets_access_customers">Toiletadgang: kunder</string>
 	<string name="poi_toilets_access_permissive">Toiletadgang: med tilladelse</string>
-	<string name="poi_toilets_access_community">Toiletadgang: fællesskab</string>
+	<string name="poi_toilets_access_community">Toiletadgang: fælles</string>
 	<string name="poi_toilets_access_public">Toiletadgang: offentlig</string>
 
 	<string name="poi_diaper_yes">Puslebord</string>
@@ -1685,7 +1685,7 @@
 
 	<string name="poi_car_wash_no">Bilvask: nej</string>
 
-	<string name="poi_maxstay">Parkering tidsfrist</string>
+	<string name="poi_maxstay">Parkering tidsgrænse</string>
 
 	<string name="poi_vending_parking_tickets">Parkeringsbilletter</string>
 	<string name="poi_vending_cigarettes">Cigaretter</string>
@@ -1710,7 +1710,7 @@
 	<string name="poi_vending_toll">Vejafgiftautomat</string>
 	<string name="poi_vending_tickets">Billetautomat</string>
 	<string name="poi_vending_water">Vandautomat</string>
-	<string name="poi_vending_telephone_vouchers">Telefon værdikuponer</string>
+	<string name="poi_vending_telephone_vouchers">Telekort</string>
 	<string name="poi_vending_animal_food">Dyrefoder</string>
 	<string name="poi_vending_public_transport_plans">Køreplaner</string>
 	<string name="poi_vending_drinks_sweets">Drikkevarer og slik</string>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 1be506b3ac..0c13e08e53 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
 	<string name="gps_network_not_enabled">Kein Standortdienst aktiviert. Aktivieren?</string>
 	<string name="disable_recording_once_app_killed">Eigenständige Streckenaufzeichnung unterbinden</string>
@@ -1229,7 +1229,7 @@
 
 	<string name="show_cameras">Radarfallen anzeigen</string>
 	<string name="show_traffic_warnings">Verkehrswarnungen anzeigen</string>
-	<string name="avoid_toll_roads">Vermeide Mautstraßen</string>
+	<string name="avoid_toll_roads">Mautstraßen vermeiden</string>
 	<string name="map_widget_top_text">Straßenname</string>
 	<string name="map_widget_config">Konfiguration</string>
 	
@@ -2166,7 +2166,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="shared_string_logoff">Abmelden</string>
     <string name="osmo_share_my_location">Teile meine Position</string>
     <string name="rendering_value_disabled_name">Deaktiviert</string>
-    <string name="routing_attr_avoid_borders_name">Überfahren von Grenzen vermeiden</string>
+    <string name="routing_attr_avoid_borders_name">Grenzübergänge vermeiden</string>
 	<string name="routing_attr_height_name">Höhenbeschränkung</string>
 	<string name="read_full_article">Vollständigen Artikel lesen (online)</string>
     <string name="shared_string_wikipedia">Wikipedia</string>
@@ -2264,4 +2264,27 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
 	<string name="building_number">Gebäude-Nummer</string>
 	<string name="opening_at">geöffnet ab</string>
 	<string name="closing_at">geschlossen ab</string>
+<string name="si_nm">Nautische Meilen</string>
+    <string name="si_kmh">Kilometer pro Stunde</string>
+    <string name="si_mph">Meilen pro Stunde</string>
+    <string name="si_m_s">Meter pro Sekunde</string>
+    <string name="si_min_km">Minuten pro Kilometer</string>
+    <string name="si_min_m">Minuten pro Meile</string>
+    <string name="si_nm_h">Nautische Meilen pro Stunde (Knoten)</string>
+    <string name="shared_string_navigation">Navigation</string>
+    <string name="address_unknown">Adresse noch unbekannt</string>
+    <string name="favourites_context_menu_add">Favorit hinzufügen</string>
+	<string name="poi_action_delete">löschen</string>
+	<string name="show_on_start">Beim Start anzeigen</string>
+	<string name="description">Beschreibung</string>
+	<string name="add_opening_hours">Öffnungszeiten hinzufügen</string>
+	<string name="please_specify_poi_type">Bitte Art des POI angeben.</string>
+	<string name="working_days">Werktage</string>
+	<string name="favourites">Favoriten</string>
+	<string name="poi_deleted_localy">Der POI wird hier gelöscht, sobald sie ihre Änderungen hochladen.</string>
+	<string name="show_gpx">GPX anzeigen</string>
+	<string name="are_you_sure">Sicher?</string>
+	<string name="unsaved_changes_will_be_lost">Alle ungesicherten Änderungen gehen verloren. Fortfahren?</string>
+	<string name="roads">Straßen</string>
+    <string name="show_free_version_banner_description">Auch bei der bezahlten Version ist das Banner der kostenlosen Version sichtbar.</string>
 </resources>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 2a45965856..d61658bc7d 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -757,8 +757,8 @@
     <string name="map_widget_plain_time">Gjeldende tid</string>
     <string name="osmo_edit_color">Visningsfarge</string>
     <string name="always_center_position_on_map">Vis posisjon alltid i midten</string>
-    <string name="guidance_preferences_descr">Innstillinger for navigering</string>
-    <string name="routing_preferences_descr">Innstillinger for ruteplanlegging</string>
+    <string name="guidance_preferences_descr">Navigeringsinnstillinger</string>
+    <string name="routing_preferences_descr">Ruteplanleggingsinnstillinger</string>
     <string name="rendering_attr_noAdminboundaries_name">Skjul grenser</string>
 	<string name="map_widget_max_speed">Fartsgrense</string>
     <string name="map_widget_transparent">Gjennomsiktig layout</string>
@@ -1415,4 +1415,21 @@
 <string name="address_unknown">Adresse er ikke kjent ennå</string>
     <string name="routing_attr_avoid_shuttle_train_name">Unngå pendeltog</string>
 	<string name="routing_attr_avoid_shuttle_train_description">Unngå pendeltog</string>
-    </resources>
+    <string name="srtm_plugin_disabled">Koter deaktivert</string>
+    <string name="favorite_category_add_new">Legg til ny</string>
+    <string name="favorite_category_select">Velg kategori</string>
+    <string name="shared_string_navigation">Navigering</string>
+    <string name="osmand_running_in_background">Kjører i bakgrunnen</string>
+    <string name="favourites_edit_dialog_title">Favorittinformasjon</string>
+    <string name="next_proceed">Neste</string>
+	<string name="tag_poi_name">navn</string>
+	<string name="description">Beskrivelse</string>
+	<string name="add_opening_hours">Legg til åpningstider</string>
+	<string name="poi_dialog_poi_type">Interessepunkttype</string>
+	<string name="please_specify_poi_type">Spesifiser interessepunkttype.</string>
+	<string name="working_days">Arbeidsdager</string>
+	<string name="favourites">Favoritter</string>
+	<string name="show_gpx">Vis GPX</string>
+	<string name="roads">Veier</string>
+    <string name="favourites_context_menu_add">Legg til favoritt</string>
+	</resources>
diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml
index 69646367d3..a460782565 100644
--- a/OsmAnd/res/values-zh-rTW/phrases.xml
+++ b/OsmAnd/res/values-zh-rTW/phrases.xml
@@ -1578,4 +1578,40 @@
 	<string name="poi_internet_access_fee_yes">網路存取 - 收取費用</string>
 	<string name="poi_internet_access_fee_no">網路存取 - 不收費</string>
 
+	<string name="poi_events_venue">活動場地</string>
+
+	<string name="poi_diet_vegetarian_only">只有素食</string>
+	<string name="poi_diet_vegetarian_yes">純素食</string>
+	<string name="poi_diet_vegetarian_no">純素食：無</string>
+	<string name="poi_diet_vegetarian_few">純素食：很少</string>
+	<string name="poi_diet_vegan_only">只有素食</string>
+	<string name="poi_diet_vegan_yes">素食</string>
+	<string name="poi_diet_vegan_no">素食：不是</string>
+	<string name="poi_diet_gluten_free_only">只有無麩質食物</string>
+	<string name="poi_diet_gluten_free_yes">無麩質食物</string>
+	<string name="poi_diet_gluten_free_no">無麩質食物：無</string>
+	<string name="poi_diet_kosher_only">只有符合猶太教規食物</string>
+	<string name="poi_diet_kosher_yes">符合猶太教規食物</string>
+	<string name="poi_diet_kosher_no">符合猶太教規食物：無</string>
+	<string name="poi_diet_halal_only">只有清真食物</string>
+	<string name="poi_diet_halal_yes">清真食物</string>
+	<string name="poi_diet_halal_no">清真食物：無</string>
+	<string name="poi_diet_lactose_free_only">只有無乳糖食物</string>
+	<string name="poi_diet_lactose_free_yes">無乳糖食物</string>
+	<string name="poi_diet_lactose_free_no">無乳糖食物：無</string>
+	<string name="poi_diet_pescetarian_yes">魚素食物</string>
+
+	<string name="poi_drive_in_yes">免下車服務：有</string>
+	<string name="poi_drive_in_no">免下車服務：無</string>
+	<string name="poi_drive_through_yes">得來速：有</string>
+	<string name="poi_drive_through_no">得來速：無</string>
+
+	<string name="poi_brewery_additional">啤酒廠名</string>
+	<string name="poi_microbrewery_yes">自釀酒廠</string>
+	<string name="poi_microbrewery_no">無自釀酒廠</string>
+
+	<string name="poi_takeaway_yes">腳架</string>
+	<string name="poi_takeaway_no">無腳架</string>
+	<string name="poi_takeaway_only">只有腳架</string>
+
 	</resources>
diff --git a/OsmAnd/src/net/osmand/plus/download/items/ItemsListBuilder.java b/OsmAnd/src/net/osmand/plus/download/items/ItemsListBuilder.java
index 1aa66c2ec0..8ec8a5650c 100644
--- a/OsmAnd/src/net/osmand/plus/download/items/ItemsListBuilder.java
+++ b/OsmAnd/src/net/osmand/plus/download/items/ItemsListBuilder.java
@@ -70,7 +70,7 @@ public class ItemsListBuilder {
 		}
 	}
 
-	class ResourceItemComparator implements Comparator {
+	class ResourceItemComparator implements Comparator<Object> {
 		@Override
 		public int compare(Object obj1, Object obj2) {
 			String str1;
@@ -111,7 +111,7 @@ public class ItemsListBuilder {
 	private static final Lock lock = new ReentrantLock();
 
 	private List<ResourceItem> regionMapItems;
-	private List allResourceItems;
+	private List<Object> allResourceItems;
 	private List<WorldRegion> allSubregionItems;
 
 	private OsmandApplication app;
@@ -124,7 +124,7 @@ public class ItemsListBuilder {
 		return regionMapItems;
 	}
 
-	public List getAllResourceItems() {
+	public List<Object> getAllResourceItems() {
 		return allResourceItems;
 	}
 
@@ -174,7 +174,7 @@ public class ItemsListBuilder {
 	public ItemsListBuilder(OsmandApplication app) {
 		this.app = app;
 		regionMapItems = new LinkedList<>();
-		allResourceItems = new LinkedList();
+		allResourceItems = new LinkedList<Object>();
 		allSubregionItems = new LinkedList<>();
 	}
 
@@ -318,7 +318,7 @@ public class ItemsListBuilder {
 		Map<String, IndexItem> regionResources = resourcesByRegions.get(region);
 
 		List<ResourceItem> regionMapArray = new LinkedList<>();
-		List allResourcesArray = new LinkedList();
+		List<Object> allResourcesArray = new LinkedList<Object>();
 
 		Context context = app.getApplicationContext();
 		OsmandRegions osmandRegions = app.getRegions();