diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java b/OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java
index 35f6b11a7d..8b5f0bbdcc 100644
--- a/OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java
+++ b/OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -397,7 +399,7 @@ public class BinaryMapIndexReader {
 		}
 		return "";
 	}
-	
+
 	public String getRegionName() {
 		List<String> rg = getRegionNames();
 		if (rg.size() == 0) {
@@ -405,7 +407,24 @@ public class BinaryMapIndexReader {
 		}
 		String ls = rg.get(0);
 		if (ls.lastIndexOf('_') != -1) {
-			return ls.substring(0, ls.lastIndexOf('_')).replace('_', ' ');
+			if (ls.matches(".*([0-9]+_*){3}\\.obf")) {
+				Pattern osmDiffDateEnding = Pattern.compile("_([0-9]+_*){3}\\.obf");
+				Matcher m = osmDiffDateEnding.matcher(ls);
+				if (m.find()) {
+					ls = ls.substring(0, m.start());
+				}
+				return ls.substring(0, ls.lastIndexOf('_')).replace('_', ' ');
+
+			} else {
+				if (ls.contains(".")) {
+					ls = ls.substring(0, ls.indexOf("."));
+				}
+				if (ls.endsWith("_2")) {
+					ls = ls.substring(0, ls.length() - "_2".length());
+				}
+				return ls.substring(0, ls.lastIndexOf('_')).replace('_', ' ');
+			}
+
 		}
 		return ls;
 	}
diff --git a/OsmAnd-java/src/net/osmand/data/Amenity.java b/OsmAnd-java/src/net/osmand/data/Amenity.java
index fef60b5866..4bc6df691e 100644
--- a/OsmAnd-java/src/net/osmand/data/Amenity.java
+++ b/OsmAnd-java/src/net/osmand/data/Amenity.java
@@ -29,6 +29,8 @@ public class Amenity extends MapObject {
 	public static final String OPENING_HOURS = "opening_hours";
 	public static final String CONTENT = "content";
 	public static final String CUISINE = "cuisine";
+	public static final String OSM_DELETE_VALUE = "delete";
+	public static final String OSM_DELETE_TAG = "osmand_change";
 
 	private String subType;
 	private PoiCategory type;
@@ -307,4 +309,8 @@ public class Amenity extends MapObject {
 		}
 		return x;
 	}
+
+	public boolean isClosed() {
+		return OSM_DELETE_VALUE.equals(getAdditionalInfo(OSM_DELETE_TAG));
+	}
 }
diff --git a/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java b/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java
index a6e21fe416..52d004a8d3 100644
--- a/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java
+++ b/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java
@@ -38,14 +38,18 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
 
 import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.set.hash.TLongHashSet;
 
 
 public class SearchCoreFactory {
@@ -486,6 +490,7 @@ public class SearchCoreFactory {
 					SearchPhraseDataType.POI);
 			final NameStringMatcher nm = phrase.getNameStringMatcher();
 			QuadRect bbox = phrase.getRadiusBBoxToSearch(BBOX_RADIUS_INSIDE);
+			final Set<String> ids = new HashSet<String>();
 			SearchRequest<Amenity> req = BinaryMapIndexReader.buildSearchPoiRequest(
 					(int)bbox.centerX(), (int)bbox.centerY(),
 					phrase.getUnknownSearchWord(),
@@ -498,6 +503,10 @@ public class SearchCoreFactory {
 							if (limit ++ > LIMIT) {
 								return false;
 							}
+							String poiID = object.getType().getKeyName() + "_" + object.getId();
+							if (ids.contains(poiID)) {
+								return false;
+							}
 							SearchResult sr = new SearchResult(phrase);
 							sr.otherNames = object.getAllNames(true);
 							sr.localeName = object.getName(phrase.getSettings().getLang(), phrase.getSettings().isTransliterate());
@@ -523,6 +532,7 @@ public class SearchCoreFactory {
 							phrase.countUnknownWordsMatch(sr);
 							sr.objectType = ObjectType.POI;
 							resultMatcher.publish(sr);
+							ids.add(poiID);
 							return false;
 						}
 
@@ -726,8 +736,9 @@ public class SearchCoreFactory {
 
 				QuadRect bbox = phrase.getRadiusBBoxToSearch(10000);
 				List<BinaryMapIndexReader> oo = phrase.getOfflineIndexes();
+				Set<String> searchedPois = new TreeSet<>();
 				for (BinaryMapIndexReader o : oo) {
-					ResultMatcher<Amenity> rm = getResultMatcher(phrase, resultMatcher, o);
+					ResultMatcher<Amenity> rm = getResultMatcher(phrase, resultMatcher, o, searchedPois);
 					if (obj instanceof CustomSearchPoiFilter) {
 						rm = ((CustomSearchPoiFilter) obj).wrapResultMatcher(rm);
 					}
@@ -743,13 +754,20 @@ public class SearchCoreFactory {
 		}
 
 		private ResultMatcher<Amenity> getResultMatcher(final SearchPhrase phrase, final SearchResultMatcher resultMatcher,
-														final BinaryMapIndexReader selected) {
+														final BinaryMapIndexReader selected, final Set<String> searchedPois) {
 			final NameStringMatcher ns = phrase.getNameStringMatcher();
 			return new ResultMatcher<Amenity>() {
 
 				@Override
 				public boolean publish(Amenity object) {
 					SearchResult res = new SearchResult(phrase);
+					String poiID = object.getType().getKeyName() + "_" + object.getId();
+					if(!searchedPois.add(poiID)) {
+						return false;
+					}
+					if(object.isClosed()) {
+						return false;
+					}
 					res.localeName = object.getName(phrase.getSettings().getLang(), phrase.getSettings().isTransliterate());
 					res.otherNames = object.getAllNames(true);
 					if (Algorithms.isEmpty(res.localeName)) {
diff --git a/OsmAnd-java/src/net/osmand/search/core/SearchPhrase.java b/OsmAnd-java/src/net/osmand/search/core/SearchPhrase.java
index 10327e832a..e0eac2a796 100644
--- a/OsmAnd-java/src/net/osmand/search/core/SearchPhrase.java
+++ b/OsmAnd-java/src/net/osmand/search/core/SearchPhrase.java
@@ -13,6 +13,7 @@ import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -531,41 +532,74 @@ public class SearchPhrase {
 		}
 	}
 
-	public void sortFiles() {
-		if(indexes == null) {
-			indexes = new ArrayList<>(getOfflineIndexes());
-		}
-		final LatLon ll = getLastTokenLocation();
-		if(ll != null) {
-			Collections.sort(indexes, new Comparator<BinaryMapIndexReader>() {
-				Map<BinaryMapIndexReader, LatLon> locations = new HashMap<>();
+    public void sortFiles() {
+        if (indexes == null) {
+            indexes = new ArrayList<>(getOfflineIndexes());
+        }
+        Map<String, List<BinaryMapIndexReader>> diffsByRegion = getDiffsByRegion();
+        final LatLon ll = getLastTokenLocation();
+        if (ll != null) {
+            Collections.sort(indexes, new Comparator<BinaryMapIndexReader>() {
+                Map<BinaryMapIndexReader, LatLon> locations = new HashMap<>();
 
-				@Override
-				public int compare(BinaryMapIndexReader o1, BinaryMapIndexReader o2) {
- 					LatLon rc1 = o1 == null ? null : getLocation(o1);
-					LatLon rc2 = o2 == null ? null : getLocation(o2);
-					double d1 = rc1 == null ? 10000000d : MapUtils.getDistance(rc1, ll);
-					double d2 = rc2 == null ? 10000000d : MapUtils.getDistance(rc2, ll);
-					return Double.compare(d1, d2);
-				}
+                @Override
+                public int compare(BinaryMapIndexReader o1, BinaryMapIndexReader o2) {
+                    LatLon rc1 = o1 == null ? null : getLocation(o1);
+                    LatLon rc2 = o2 == null ? null : getLocation(o2);
+                    double d1 = rc1 == null ? 10000000d : MapUtils.getDistance(rc1, ll);
+                    double d2 = rc2 == null ? 10000000d : MapUtils.getDistance(rc2, ll);
+                    return Double.compare(d1, d2);
+                }
+
+                private LatLon getLocation(BinaryMapIndexReader o1) {
+                    if (locations.containsKey(o1)) {
+                        return locations.get(o1);
+                    }
+                    LatLon rc1 = null;
+                    if (o1.containsMapData()) {
+                        rc1 = o1.getMapIndexes().get(0).getCenterLatLon();
+                    } else {
+                        rc1 = o1.getRegionCenter();
+                    }
+                    locations.put(o1, rc1);
+                    return rc1;
+                }
+            });
+            if (!diffsByRegion.isEmpty()) {
+                List<BinaryMapIndexReader> finalSort = new ArrayList<>();
+                for (int i = 0; i < indexes.size(); i++) {
+                    BinaryMapIndexReader currFile = indexes.get(i);
+                    if (diffsByRegion.get(currFile.getRegionName()) != null) {
+                        finalSort.addAll(diffsByRegion.get(currFile.getRegionName()));
+                        finalSort.add(currFile);
+                    } else {
+                        finalSort.add(currFile);
+                    }
+                }
+                indexes.clear();
+                indexes.addAll(finalSort);
+            }
+        }
+    }
+
+    private Map<String, List<BinaryMapIndexReader>> getDiffsByRegion() {
+        Map<String, List<BinaryMapIndexReader>> result = new HashMap<>();
+        Iterator<BinaryMapIndexReader> it = indexes.iterator();
+        while (it.hasNext()) {
+            BinaryMapIndexReader r = it.next();
+            if (r.getFile().getName().matches(".*([0-9]+_*){3}\\.obf")) {
+                String currRegionName = r.getRegionName();
+                if (result.containsKey(currRegionName)) {
+                    result.get(currRegionName).add(r);
+                } else {
+                    result.put(currRegionName, new ArrayList<>(Arrays.asList(r)));
+                }
+                it.remove();
+            }
+        }
+        return result;
+    }
 
-				private LatLon getLocation(BinaryMapIndexReader o1) {
-					if(locations.containsKey(o1)) {
-						return locations.get(o1);
-					}
-					LatLon rc1 = null;
-					if(o1.containsMapData()) {
-						rc1 = o1.getMapIndexes().get(0).getCenterLatLon();
-					} else {
-						rc1 = o1.getRegionCenter();
-					}
-					locations.put(o1, rc1);
-					return rc1;
-				}
-			});
-		}
-	}
-	
 	public static class NameStringMatcher implements StringMatcher {
 
 		private CollatorStringMatcher sm;
diff --git a/OsmAnd-java/src/net/osmand/util/Algorithms.java b/OsmAnd-java/src/net/osmand/util/Algorithms.java
index 4d3637bf98..32a01eb452 100644
--- a/OsmAnd-java/src/net/osmand/util/Algorithms.java
+++ b/OsmAnd-java/src/net/osmand/util/Algorithms.java
@@ -2,6 +2,7 @@ package net.osmand.util;
 
 import net.osmand.IProgress;
 import net.osmand.PlatformUtil;
+import net.osmand.binary.BinaryMapIndexReader;
 
 import org.apache.commons.logging.Log;
 
@@ -113,29 +114,39 @@ public class Algorithms {
 				return -simplifyFileName(o1.getName()).compareTo(simplifyFileName(o2.getName()));
 			}
 
-			public String simplifyFileName(String fn) {
-				String lc = fn.toLowerCase();
-				if (lc.contains(".")) {
-					lc = lc.substring(0, lc.indexOf("."));
-				}
-				if (lc.endsWith("_2")) {
-					lc = lc.substring(0, lc.length() - "_2".length());
-				}
-				boolean hasTimestampEnd = false;
-				for (int i = 0; i < lc.length(); i++) {
-					if (lc.charAt(i) >= '0' && lc.charAt(i) <= '9') {
-						hasTimestampEnd = true;
-						break;
-					}
-				}
-				if (!hasTimestampEnd) {
-					lc += "_00_00_00";
-				}
-				return lc;
-			}
 		};
 	}
 
+    private static String simplifyFileName(String fn) {
+        String lc = fn.toLowerCase();
+        if (lc.contains(".")) {
+            lc = lc.substring(0, lc.indexOf("."));
+        }
+        if (lc.endsWith("_2")) {
+            lc = lc.substring(0, lc.length() - "_2".length());
+        }
+        boolean hasTimestampEnd = false;
+        for (int i = 0; i < lc.length(); i++) {
+            if (lc.charAt(i) >= '0' && lc.charAt(i) <= '9') {
+                hasTimestampEnd = true;
+                break;
+            }
+        }
+        if (!hasTimestampEnd) {
+            lc += "_00_00_00";
+        }
+        return lc;
+    }
+
+    public static Comparator<String> getStringVersionComparator() {
+        return new Comparator<String>() {
+            @Override
+            public int compare(String o1, String o2) {
+                return -simplifyFileName(o1).compareTo(simplifyFileName(o2));
+            }
+        };
+    }
+
 	private static final char CHAR_TOSPLIT = 0x01;
 
 	public static Map<String, String> decodeMap(String s) {
diff --git a/OsmAnd/res/layout/fragment_marker_show_direction_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_show_direction_bottom_sheet_dialog.xml
index 6e667ee0b3..1e0030de66 100644
--- a/OsmAnd/res/layout/fragment_marker_show_direction_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_marker_show_direction_bottom_sheet_dialog.xml
@@ -38,7 +38,7 @@
                 android:paddingLeft="@dimen/bottom_sheet_content_padding"
                 android:paddingRight="@dimen/bottom_sheet_content_padding"
                 android:paddingStart="@dimen/bottom_sheet_content_padding"
-                android:text="@string/measurement_tool_save_as_new_track_descr"
+                android:text="@string/marker_show_distance_descr"
                 android:textColor="?android:textColorSecondary"
                 android:textSize="@dimen/default_desc_text_size"/>
 
@@ -76,7 +76,7 @@
                         android:layout_marginLeft="@dimen/bottom_sheet_image_text_margin_start"
                         android:layout_marginStart="@dimen/bottom_sheet_image_text_margin_start"
                         android:layout_marginTop="@dimen/bottom_sheet_content_margin_small"
-                        android:text="@string/top_bar"
+                        android:text="@string/shared_string_topbar"
                         android:textColor="?android:textColorSecondary"
                         android:textSize="@dimen/default_split_segments_sub"/>
                 </RelativeLayout>
@@ -108,7 +108,7 @@
                         android:layout_marginLeft="@dimen/bottom_sheet_image_text_margin_start"
                         android:layout_marginStart="@dimen/bottom_sheet_image_text_margin_start"
                         android:layout_marginTop="@dimen/bottom_sheet_content_margin_small"
-                        android:text="@string/widget"
+                        android:text="@string/shared_string_widgets"
                         android:textColor="?android:textColorSecondary"
                         android:textSize="@dimen/default_split_segments_sub"/>
                 </RelativeLayout>
@@ -144,7 +144,7 @@
                     android:layout_toEndOf="@id/top_bar_icon"
                     android:layout_toRightOf="@id/top_bar_icon"
                     android:maxLines="1"
-                    android:text="@string/top_bar"
+                    android:text="@string/shared_string_topbar"
                     android:textAppearance="@style/TextAppearance.ListItemTitle"/>
 
                 <RadioButton
@@ -188,7 +188,7 @@
                     android:layout_toEndOf="@id/widget_icon"
                     android:layout_toRightOf="@id/widget_icon"
                     android:maxLines="1"
-                    android:text="@string/widget"
+                    android:text="@string/shared_string_widgets"
                     android:textAppearance="@style/TextAppearance.ListItemTitle"/>
 
                 <RadioButton
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index 67d04f522b..86b5f989d2 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -2758,4 +2758,27 @@
     <string name="import_track_desc">الملف %1$s لا يحتوي على نقاط وجهة، هل تود ادخاله كمسار؟</string>
     <string name="move_point">تحريك نقطة</string>
     <string name="add_segment_to_the_track">إضافة إلى مسار GPX</string>
-</resources>
+<string name="map_orientation_change_in_accordance_with_speed">اتجاه الخريطة يتغيير وفقا للسرعة</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">استخدام بوصلة الجهاز بدل اتجاه الحركة لتحديد اتجاه الخريطة أثناء سرعة منخفضة</string>
+    <string name="all_markers_moved_to_history">كافة علامات انتقلت إلى التاريخ</string>
+    <string name="marker_moved_to_history">العلامة انتقلت إلى التاريخ</string>
+    <string name="marker_moved_to_active">العلامة انتقلت إلى نشطة</string>
+    <string name="shared_string_list">قائمة</string>
+    <string name="shared_string_groups">مجموعات</string>
+    <string name="passed">تم تجاوزه: %1$s</string>
+    <string name="make_active">جعله نشطاً</string>
+    <string name="today">اليوم</string>
+    <string name="yesterday">أمس</string>
+    <string name="last_seven_days">آخر 7 أيام</string>
+    <string name="this_year">هذه السنة</string>
+    <string name="widget">ويدجت</string>
+    <string name="top_bar">الشريط العلوي</string>
+    <string name="move_all_to_history">نقل الكل إلى التاريخ</string>
+    <string name="build_route">بناء طريق</string>
+    <string name="show_direction">إظهار الاتجاه</string>
+    <string name="sort_by">فرز حسب</string>
+    <string name="do_not_use_animations">عدم استخدام الرسوم المتحركة</string>
+    <string name="do_not_use_animations_descr">تعطيل الرسوم المتحركة في التطبيق</string>
+    <string name="keep_showing_on_map">استمرار العرض على الخريطة</string>
+    <string name="exit_without_saving">الخروج دون حفظ؟</string>
+    </resources>
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index e540f237e2..1601d0125b 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -1742,7 +1742,7 @@ Miesca parkoŭkі і čas vіdać na paneli kіravańnia OsmAnd і na vіdžecie
     <string name="avoid_road">Paźbiahać daroh</string>
     <string name="storage_directory_readonly_desc">Abrany dla zachoŭvańnia źviestak kataloh dastupny tolkі dla čytańnia. Kataloh zachoŭvańnia časova raźmieščany va ŭnutranaj pamiacі. Kali łaska, abiarycie padychodziačy kataloh dla zachoŭvańnia źviestak.</string>
     <string name="storage_directory_shared">Sumiesnaja pamiać</string>
-    <string name="shared_string_topbar">Vierchniaja panel</string>
+    <string name="shared_string_topbar">Vierchniaja paneĺ</string>
     <string name="full_report">Poŭnaja spravazdača</string>
     <string name="recalculate_route">Pieraličyć maršrut</string>
     <string name="open_street_map_login_and_pass">Іmia karystalnіka і parol OpenStreetMap</string>
@@ -2812,7 +2812,23 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
     <string name="do_not_use_animations_descr">Adklučeńnie animacyi ŭ prahramie</string>
     <string name="move_all_to_history">Pieramiascić usio ŭ historyju</string>
     <string name="build_route">Pabudavać maršrut</string>
-    <string name="show_direction">Pakazać napramak</string>
+    <string name="show_direction">Indykacyja adliehlasci</string>
     <string name="sort_by">Sartavać pa</string>
     <string name="marker_options">Nalady markiera</string>
+    <string name="marker_show_distance_descr">Abrać jak pakazvać adliehlasć i napramak da markieraŭ na ekranie mapy:</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Paroh aryjentacyi mapy</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Abiarycie nižej, na jakoj chutkasct aryjentacyja mapy pierakliučajecca z «Napramku ruchu» u «Pa kompasu»</string>
+    <string name="all_markers_moved_to_history">Usie markiery pieraniesieny ŭ historyju</string>
+    <string name="marker_moved_to_history">Markier mapy pieraniesieny ŭ historyju</string>
+    <string name="marker_moved_to_active">Markier mapy staŭ aktyŭnym</string>
+    <string name="shared_string_list">Spis</string>
+    <string name="shared_string_groups">Hrupy</string>
+    <string name="passed">Projdziena: %1$s</string>
+    <string name="make_active">Aktyvizavać</string>
+    <string name="today">Sionnia</string>
+    <string name="yesterday">Učora</string>
+    <string name="last_seven_days">Apošnija 7 dzion</string>
+    <string name="this_year">Siolieta</string>
+    <string name="widget">Vidžet</string>
+    <string name="top_bar">Vierchniaja paneĺ</string>
     </resources>
diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index e269d4cf2e..0a9e2da2c9 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -3522,4 +3522,13 @@
 
 <string name="poi_network">Сетка</string>
 
+<string name="poi_government_archive">Архіў</string>
+	<string name="poi_government_ministry">Міністэрства</string>
+	<string name="poi_government_public_service">Дзяржаўная служба</string>
+	<string name="poi_government_social_security">Сацыяльная абарона</string>
+	<string name="poi_government_social_services">Сацыяльныя службы</string>
+	<string name="poi_government_treasury">Казначэйства</string>
+	<string name="poi_government_transportation">Транспартная ўстанова</string>
+	<string name="poi_government_legislative">Заканадаўчая ўстанова</string>
+
 </resources>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 8738d9e21d..3af923834b 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2861,7 +2861,23 @@
     <string name="do_not_use_animations_descr">Адключэньне анімацыі ў праграме</string>
     <string name="move_all_to_history">Перамясціць усё ў гісторыю</string>
     <string name="build_route">Пабудаваць маршрут</string>
-    <string name="show_direction">Паказаць напрамак</string>
+    <string name="show_direction">Індыкацыя адлегласці</string>
     <string name="sort_by">Сартаваць па</string>
     <string name="marker_options">Налады маркера</string>
+    <string name="marker_show_distance_descr">Абраць як паказваць адлегласць і напрамак да маркераў на экране мапы:</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Парог арыентацыі мапы</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Абярыце ніжэй, на якой хуткасцт арыентацыя мапы пераключаецца з «Напрамку руху» у «Па компасу»</string>
+    <string name="all_markers_moved_to_history">Усе маркеры перанесены ў гісторыю</string>
+    <string name="marker_moved_to_history">Маркер мапы перанесены ў гісторыю</string>
+    <string name="marker_moved_to_active">Маркер мапы стаў актыўным</string>
+    <string name="shared_string_list">Спіс</string>
+    <string name="shared_string_groups">Групы</string>
+    <string name="passed">Пройдзена: %1$s</string>
+    <string name="make_active">Актывізаваць</string>
+    <string name="today">Сёння</string>
+    <string name="yesterday">Учора</string>
+    <string name="last_seven_days">Апошнія 7 дзён</string>
+    <string name="this_year">Сёлета</string>
+    <string name="widget">Віджэт</string>
+    <string name="top_bar">Верхняя панэль</string>
     </resources>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index b56f926d09..a83a5d5a1b 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -1558,7 +1558,7 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
 \nAquesta vista es pot desfer tornant a fer la mateixa selecció, o en canviar l\'«Estil del mapa» de «Configuració del mapa» a la vista que es desitgi.</string>
     <string name="osmo_grop_name_length_alert">El nom de grup ha de tenir una mida mínima de 3 caràcters!</string>
     <string name="local_osm_changes_upload_all_confirm">"Esteu a punt de pujar %1$d modificacio(ns)  a OSM. N\'esteu segur?"</string>
-    <string name="confirmation_to_clear_history">Voleu esborrar l\'històric?</string>
+    <string name="confirmation_to_clear_history">Voleu esborrar l\'historial?</string>
     <string name="delay_to_start_navigation_descr">Indiqueu el temps d\'espera sense canvis per tancar la pantalla de planificació de la ruta</string>
     <string name="delay_to_start_navigation">Inici de navegació gir a gir després de…</string>
     <string name="shared_string_go">Vés</string>
@@ -2179,7 +2179,7 @@ L\'ús de memòria serà de {3} MB temporalment i {1} MB permanentment.
     <string name="first_usage_greeting">Obteniu indicacions i descobriu llocs nous sense connexió a Internet</string>
     <string name="si_mi_meters">Milles/metres</string>
     <string name="get_for">Obteniu-lo per %1$s</string>
-    <string name="get_for_month">Obteniu-lo per %1$s mesos</string>
+    <string name="get_for_month">Obteniu-lo per %1$s al mes</string>
     <string name="osm_live_banner_desc">Obteniu nous mapes i actualitzacions sense límit més sovint d\'un cop al mes: cada hora, dia o setmana.</string>
     <string name="osmand_plus_banner_desc">Baixada il·limitada de mapes, actualitzacions i el connector Viquipèdia.</string>
     <string name="get_it">Obteniu-lo</string>
@@ -2201,7 +2201,7 @@ L\'ús de memòria serà de {3} MB temporalment i {1} MB permanentment.
     <string name="edit_filter">Edita les categories</string>
     <string name="subcategories">Subcategories</string>
     <string name="translit_names">Translitera els noms</string>
-    <string name="translit_name_if_miss">Si no hi ha noms en %1$s translitera els propis</string>
+    <string name="translit_name_if_miss">Translitera si el nom %1$s no existeix</string>
     <string name="rendering_attr_contourColorScheme_description">Esquema de color de les línies de contorn</string>
     <string name="save_track_min_speed">Velocitat mínima per registrar la ruta</string>
     <string name="save_track_min_speed_descr">Filtre: Establiu la velocitat mínima per enregistrar els punts</string>
@@ -2612,9 +2612,24 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="exit_without_saving">Voleu sortir sense desar?</string>
     <string name="do_not_use_animations">Sense ús d\'animacions</string>
     <string name="do_not_use_animations_descr">Desactiva les animacions a l\'aplicació</string>
-    <string name="move_all_to_history">Mou tot a l\'històric</string>
+    <string name="move_all_to_history">Mou tot a l\'historial</string>
     <string name="build_route">Calcula la ruta</string>
     <string name="show_direction">Mostra la direcció</string>
     <string name="sort_by">Ordena per</string>
     <string name="marker_options">Opcions de marcador</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Orientació del mapa seguint la direcció del moviment</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Utilitza la brúixola interna per determinar l\'orientació del mapa a baixa velocitat en comptes de la direcció del moviment</string>
+    <string name="all_markers_moved_to_history">Tots els marcadors s\'han mogut a Historial</string>
+    <string name="marker_moved_to_history">El marcador s\'ha mogut a Historial</string>
+    <string name="marker_moved_to_active">Marcador activat</string>
+    <string name="shared_string_list">Llista</string>
+    <string name="shared_string_groups">Grups</string>
+    <string name="passed">Acceptat: %1$s</string>
+    <string name="make_active">Activa</string>
+    <string name="today">Avui</string>
+    <string name="yesterday">Ahir</string>
+    <string name="last_seven_days">Darrers 7 dies</string>
+    <string name="this_year">Aquest any</string>
+    <string name="widget">Giny</string>
+    <string name="top_bar">Barra superior</string>
     </resources>
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index 84bb1f2902..4a3b8ef7b5 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -2739,4 +2739,19 @@ Pokud potřebujete pomoci s aplikací OsmAnd, prosím kontaktujte naši podporu
     <string name="do_not_use_animations_descr">Zakáže animace v aplikaci</string>
     <string name="keep_showing_on_map">Stále zobrazovat na mapě</string>
     <string name="exit_without_saving">Ukončit bez uložení?</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Změna orientace mapy v závislosti na rychlosti</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Při nízké rychlosti použít k určení orientace mapy vestavěný kompas namísto směru pohybu</string>
+    <string name="all_markers_moved_to_history">Všechny značky přesunuty do Historie</string>
+    <string name="marker_moved_to_history">Značka přesunuta do Historie</string>
+    <string name="marker_moved_to_active">Značka přesunuta do Aktivní</string>
+    <string name="shared_string_list">Seznam</string>
+    <string name="shared_string_groups">Skupiny</string>
+    <string name="passed">Prošlé: %1$s</string>
+    <string name="make_active">Aktivovat</string>
+    <string name="today">Dnes</string>
+    <string name="yesterday">Včera</string>
+    <string name="last_seven_days">Posledních 7 dní</string>
+    <string name="this_year">Tento rok</string>
+    <string name="widget">Nástroj</string>
+    <string name="top_bar">Horní lišta</string>
     </resources>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 342beb4764..c971c7c687 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -2863,7 +2863,21 @@ Tidligere destination bliver sidste mellemliggende punkt.</string>
     <string name="do_not_use_animations_descr">Deaktiverer animationer i programmet</string>
     <string name="move_all_to_history">Flyt alle til historik</string>
     <string name="build_route">Beregn rute</string>
-    <string name="show_direction">Vis retning</string>
+    <string name="show_direction">Afstandsangivelse</string>
     <string name="sort_by">Sorter efter</string>
     <string name="marker_options">Markør indstillinger</string>
+    <string name="shared_string_list">Liste</string>
+    <string name="shared_string_groups">Grupper</string>
+    <string name="today">I dag</string>
+    <string name="yesterday">I går</string>
+    <string name="last_seven_days">Sidste 7 dage</string>
+    <string name="this_year">I år</string>
+    <string name="widget">Modul</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Kortets orientering ændres i overensstemmelse med hastigheden</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Brug det indbyggede kompas i stedet for bevægelsesretningen til at bestemme orienteringen af kortet ved lav hastighed</string>
+    <string name="all_markers_moved_to_history">Alle kortmarkører flyttet til historik</string>
+    <string name="marker_moved_to_history">Kortmarkør flyttet til historik</string>
+    <string name="marker_moved_to_active">Kortmarkør flyttet til aktiv</string>
+    <string name="passed">Bestået: %1$s</string>
+    <string name="make_active">Aktivér</string>
     </resources>
diff --git a/OsmAnd/res/values-eo/phrases.xml b/OsmAnd/res/values-eo/phrases.xml
index c6ebf4c0bb..f6fdcae188 100644
--- a/OsmAnd/res/values-eo/phrases.xml
+++ b/OsmAnd/res/values-eo/phrases.xml
@@ -3485,4 +3485,13 @@
 
 <string name="poi_network">Reto</string>
 
+<string name="poi_government_archive">Arĥivejo</string>
+	<string name="poi_government_ministry">Ministrejo</string>
+	<string name="poi_government_public_service">Publika servo</string>
+	<string name="poi_government_social_security">Socia sekuro</string>
+	<string name="poi_government_social_services">Socia servo</string>
+	<string name="poi_government_treasury">Trezorejo</string>
+	<string name="poi_government_transportation">Transporta institucio</string>
+	<string name="poi_government_legislative">Leĝdona institucio</string>
+
 </resources>
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index ee69ebb7bb..a742dbc0f4 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -25,7 +25,7 @@
  Parto de enspezo revenos al la OSM-komunumo kaj estos pagita por iu ajn kontribuaĵo al OSM.
  Se vi ŝategas OsmAnd kaj OSM kaj vi volas subteni ilin, tio ĉi estas la plej bona kielo.</string>
     
-    <string name="select_map_marker">Elekti mapmarkon</string>
+    <string name="select_map_marker">Elekti map-markon</string>
     <string name="map_markers_other">Aliaj markoj</string>
     <string name="upload_anonymously">Alŝuti anonime</string>
     <string name="share_geo">geo:</string>
@@ -218,15 +218,15 @@
     <string name="storage_directory_readonly_desc">Nuntempe elektita datum-konservada dosierujo estas nurlega. La konservada dosierujo estas provizore agordita en interna memorejo. Bonvolu elekti ĝustan konservadan dosierujon.</string>
     <string name="storage_directory_shared">Komuna memoro</string>
     <string name="osm_live_month_cost_desc">Monata elspezo</string>
-    <string name="map_marker_1st">Unua mapmarko</string>
-    <string name="map_marker_2nd">Dua mapmarko</string>
-    <string name="add_points_to_map_markers_q">Ĉu vi volas aldoni ĉiujn punktojn al mapmarkoj?</string>
-    <string name="shared_string_add_to_map_markers">Aldoni al mapmarkoj</string>
-    <string name="select_map_markers">Elekti mapmarkojn</string>
-    <string name="show_map_markers_description">Ebligi uzi mapmarkojn</string>
+    <string name="map_marker_1st">Unua map-marko</string>
+    <string name="map_marker_2nd">Dua map-marko</string>
+    <string name="add_points_to_map_markers_q">Ĉu vi volas aldoni ĉiujn punktojn al map-markoj?</string>
+    <string name="shared_string_add_to_map_markers">Aldoni al map-markoj</string>
+    <string name="select_map_markers">Elekti map-markojn</string>
+    <string name="show_map_markers_description">Ebligi uzi map-markojn</string>
     <string name="clear_active_markers_q">Ĉu vi volas forigi ĉiujn aktivajn mapmarkojn?</string>
-    <string name="map_markers">Mapmarkoj</string>
-    <string name="map_marker">Mapmarko</string>
+    <string name="map_markers">Map-markoj</string>
+    <string name="map_marker">Map-marko</string>
     <string name="clear_markers_history_q">Ĉu vi volas forviŝi historion de mapmarkoj?</string>
     <string name="active_markers">Aktivaj markoj</string>
     <string name="lang_nv">Navaha</string>
@@ -2775,7 +2775,23 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="do_not_use_animations_descr">Malaktivigi animaciojn en la aplikaĵo</string>
     <string name="move_all_to_history">Movi ĉiujn al historio</string>
     <string name="build_route">Kalkuli kurson</string>
-    <string name="show_direction">Montri direkton</string>
+    <string name="show_direction">Distanc-vidigo</string>
     <string name="sort_by">Ordigi laŭ</string>
     <string name="marker_options">Agordo de marko</string>
+    <string name="marker_show_distance_descr">Elekti kiel vidigi distancon kaj direkton al map-markoj sur la map-ekrano:</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Map-orientiĝa sojlo</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Elekti rapidon sube kiun map-orientiĝo ŝanĝiĝos el ‘laŭ direkto de movado’ al ‘laŭ kompaso’</string>
+    <string name="all_markers_moved_to_history">Ĉiuj map-markoj movitaj al historio</string>
+    <string name="marker_moved_to_history">Map-marko movita al historio</string>
+    <string name="marker_moved_to_active">Map-marko movita al aktivaj</string>
+    <string name="shared_string_list">Listo</string>
+    <string name="shared_string_groups">Grupoj</string>
+    <string name="passed">Pasigita: %1$s</string>
+    <string name="make_active">Aktivigi</string>
+    <string name="today">Hodiaŭ</string>
+    <string name="yesterday">Hieraŭ</string>
+    <string name="last_seven_days">Lastaj 7 tagoj</string>
+    <string name="this_year">Tiu ĉi jaro</string>
+    <string name="widget">Fenestraĵo</string>
+    <string name="top_bar">Supra breto</string>
     </resources>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index c7d225edc7..bd0c5d8458 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -766,8 +766,8 @@ Se aprecia la participación activa, y las contribuciones pueden hacerse directa
     <string name="av_def_action_choose">Elegir a petición</string>
     <string name="av_def_action_video">Grabar video</string>
     <string name="av_def_action_audio">Grabar audio</string>
-    <string name="av_widget_action_descr">Elige la acción predeterminada</string>
-    <string name="av_widget_action">Acción predeterminada</string>
+    <string name="av_widget_action_descr">Elige la acción predefinida</string>
+    <string name="av_widget_action">Acción predefinida</string>
     <string name="av_video_format_descr">Elige el formato de salida del video</string>
     <string name="av_video_format">Formato de salida del video</string>
     <string name="av_use_external_recorder_descr">Usa la grabadora de video del sistema</string>
@@ -2739,7 +2739,23 @@ Proporciona un código completo</string>
     <string name="do_not_use_animations_descr">Desactiva las animaciones en la aplicación</string>
     <string name="move_all_to_history">Mover todo al historial</string>
     <string name="build_route">Crear ruta</string>
-    <string name="show_direction">Mostrar dirección</string>
+    <string name="show_direction">Indicación de distancia</string>
     <string name="sort_by">Ordenar por</string>
     <string name="marker_options">Opciones del marcador</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Umbral de orientación del mapa</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Elije la velocidad a partir de la cual la orientación del mapa cambia de «Dirección del movimiento» a «Brújula»</string>
+    <string name="all_markers_moved_to_history">Todos los marcadores del mapa movidos al historial</string>
+    <string name="marker_moved_to_history">Marcador del mapa movido al historial</string>
+    <string name="marker_moved_to_active">Marcador del mapa movido a los activos</string>
+    <string name="shared_string_list">Lista</string>
+    <string name="shared_string_groups">Grupos</string>
+    <string name="passed">Pasado: %1$s</string>
+    <string name="make_active">Activar</string>
+    <string name="today">Hoy</string>
+    <string name="yesterday">Ayer</string>
+    <string name="last_seven_days">Últimos 7 días</string>
+    <string name="this_year">Este año</string>
+    <string name="widget">Control</string>
+    <string name="top_bar">Barra superior</string>
+    <string name="marker_show_distance_descr">Elige cómo se indica la distancia y dirección a los marcadores del mapa en la pantalla del mapa:</string>
     </resources>
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index 9c9acbb065..f172279a53 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -766,8 +766,8 @@ Se aprecia la participación activa, y las contribuciones pueden hacerse directa
     <string name="av_def_action_choose">Elegir a petición</string>
     <string name="av_def_action_video">Grabar video</string>
     <string name="av_def_action_audio">Grabar audio</string>
-    <string name="av_widget_action_descr">Elige la acción predeterminada</string>
-    <string name="av_widget_action">Acción predeterminada</string>
+    <string name="av_widget_action_descr">Elige la acción predefinida</string>
+    <string name="av_widget_action">Acción predefinida</string>
     <string name="av_video_format_descr">Elige el formato de salida del video</string>
     <string name="av_video_format">Formato de salida del video</string>
     <string name="av_use_external_recorder_descr">Usa la grabadora de video del sistema</string>
@@ -2740,7 +2740,23 @@ Proporciona un código completo</string>
     <string name="do_not_use_animations_descr">Desactiva las animaciones en la aplicación</string>
     <string name="move_all_to_history">Mover todo al historial</string>
     <string name="build_route">Crear ruta</string>
-    <string name="show_direction">Mostrar dirección</string>
+    <string name="show_direction">Indicación de distancia</string>
     <string name="sort_by">Ordenar por</string>
     <string name="marker_options">Opciones del marcador</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Umbral de orientación del mapa</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Elije la velocidad a partir de la cual la orientación del mapa cambia de «Dirección del movimiento» a «Brújula»</string>
+    <string name="all_markers_moved_to_history">Todos los marcadores del mapa movidos al historial</string>
+    <string name="marker_moved_to_history">Marcador del mapa movido al historial</string>
+    <string name="marker_moved_to_active">Marcador del mapa movido a los activos</string>
+    <string name="shared_string_list">Lista</string>
+    <string name="shared_string_groups">Grupos</string>
+    <string name="passed">Pasado: %1$s</string>
+    <string name="make_active">Activar</string>
+    <string name="today">Hoy</string>
+    <string name="yesterday">Ayer</string>
+    <string name="last_seven_days">Últimos 7 días</string>
+    <string name="this_year">Este año</string>
+    <string name="widget">Control</string>
+    <string name="top_bar">Barra superior</string>
+    <string name="marker_show_distance_descr">Elige cómo se indica la distancia y dirección a los marcadores del mapa en la pantalla del mapa:</string>
     </resources>
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index 1d2fc87803..0611da9075 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -3057,7 +3057,7 @@
 <string name="poi_length">Longitud</string>
 
 <string name="poi_fuel_type">Tipo de combustible</string>
-	<string name="poi_fuel_avia_type">Tipo de combustible (aviones)</string>
+	<string name="poi_fuel_avia_type">Tipo</string>
 	<string name="poi_payment_type">Forma de pago</string>
 	<string name="poi_payment_fuel_type">Tarjetas de combustible</string>
 	<string name="poi_additional_type">Adicional</string>
@@ -3522,4 +3522,13 @@
 
 <string name="poi_network">Red</string>
 
+<string name="poi_government_archive">Archivos gubernamentales</string>
+	<string name="poi_government_ministry">Ministerio</string>
+	<string name="poi_government_public_service">Servicio público</string>
+	<string name="poi_government_social_security">Seguridad social</string>
+	<string name="poi_government_social_services">Servicios sociales</string>
+	<string name="poi_government_treasury">Hacienda pública</string>
+	<string name="poi_government_transportation">Institución de transporte</string>
+	<string name="poi_government_legislative">Institución legislativa</string>
+
 </resources>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 433edb313e..baddb89911 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -2676,7 +2676,23 @@ Por favor proporciona un código completo</string>
     <string name="add_segment_to_the_track">Añadir a una traza GPX</string>
 <string name="move_all_to_history">Mover todo al historial</string>
     <string name="build_route">Crear ruta</string>
-    <string name="show_direction">Mostrar dirección</string>
+    <string name="show_direction">Indicación de distancia</string>
     <string name="sort_by">Ordenar por</string>
     <string name="marker_options">Opciones del marcador</string>
+    <string name="marker_show_distance_descr">Elige cómo se indica la distancia y dirección a los marcadores del mapa en la pantalla del mapa:</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Umbral de orientación del mapa</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Elije la velocidad a partir de la cual la orientación del mapa cambia de «Dirección del movimiento» a «Brújula»</string>
+    <string name="all_markers_moved_to_history">Todos los marcadores del mapa movido al historial</string>
+    <string name="marker_moved_to_history">Marcador del mapa movido al historial</string>
+    <string name="marker_moved_to_active">Marcador del mapa movido a los activos</string>
+    <string name="shared_string_list">Lista</string>
+    <string name="shared_string_groups">Grupos</string>
+    <string name="passed">Pasado: %1$s</string>
+    <string name="make_active">Activar</string>
+    <string name="today">Hoy</string>
+    <string name="yesterday">Ayer</string>
+    <string name="last_seven_days">Últimos 7 días</string>
+    <string name="this_year">Este año</string>
+    <string name="widget">Control</string>
+    <string name="top_bar">Barra superior</string>
     </resources>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index 59686f222d..12fd63d21d 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -2793,4 +2793,19 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="import_track_desc">%1$s fitxategiak ez du bide-punturik, inportatu lorratz gisa?</string>
     <string name="move_point">Mugitu puntua</string>
     <string name="add_segment_to_the_track">Gehitu GPX lorratzera</string>
-</resources>
+<string name="map_orientation_change_in_accordance_with_speed">Maparen orientazioa abiaduraren arabera aldatzen da</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Erabili barne ipar-orratza eta ez mugimenduaren norabidea maparen orientazioa erabakitzeko abiadura txikia denean</string>
+    <string name="all_markers_moved_to_history">Markatzaile guztiak historialera mugituta</string>
+    <string name="marker_moved_to_history">Markatzailea historialera mugitu da</string>
+    <string name="marker_moved_to_active">Markatzailea aktibora mugitu da</string>
+    <string name="shared_string_list">Zerrenda</string>
+    <string name="shared_string_groups">Taldeak</string>
+    <string name="passed">Gaindituta: %1$s</string>
+    <string name="make_active">Aktibatu</string>
+    <string name="today">Gaur</string>
+    <string name="yesterday">Atzo</string>
+    <string name="last_seven_days">Azken 7 egunak</string>
+    <string name="this_year">Aurten</string>
+    <string name="widget">Trepeta</string>
+    <string name="top_bar">Goiko barra</string>
+    </resources>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 9ce1e54b8e..40fdd3162c 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -2228,7 +2228,7 @@ Actuellement {2} Mo sont disponibles.</string>
     <string name="show_transparency_seekbar">Afficher la barre de recherche transparente</string>
     <string name="recalculate_route">Recalculer l\'itinéraire</string>
     <string name="storage_directory_shared">Mémoire partagée</string>
-    <string name="shared_string_topbar">Menu supérieur</string>
+    <string name="shared_string_topbar">Barre supérieure</string>
     <string name="osm_live_ask_for_purchase">Au préalable achetez un abonnement à OSM Live</string>
 
     <string name="osm_live_region_desc">Une partie de vos dons seront distribués aux utilisateurs OSM ayant soumis des mises à jour dans cette région</string>
@@ -2877,7 +2877,7 @@ représentant la zone : %1$s x %2$s</string>
 \n• Vous pouvez charger et suivre une trace GPX existante; enregistrer et partager un nouvel itinéraire GPX</string>
     <string name="move_all_to_history">Déplacer tout dans l\'historique</string>
     <string name="build_route">Calculer l\'itinéraire</string>
-    <string name="show_direction">Afficher les indications de direction</string>
+    <string name="show_direction">Indication de distance</string>
     <string name="sort_by">Trier par</string>
     <string name="marker_options">Options de la marque</string>
     <string name="osmand_extended_description_part8">OsmAnd est un projet open source très actif. Tout le monde peut contribuer à l\'application en signalant des bugs, en améliorant les traductions ou en développant de nouvelles fonctionnalités. Les nombreux échanges entre développeurs et utilisateurs permettent d\'améliorer régulièrement OsmAnd et les contributions financières permettent de développer de nouvelles fonctionnalités.
@@ -2916,4 +2916,15 @@ représentant la zone : %1$s x %2$s</string>
 \n• Téléchargements gratuits illimités, directement à partir de l\'application
 \n• Cartes vectorielles compactes et mises à jour au moins une fois par mois
 \n• Sélection entre les données régionales complètes ou le réseau routier uniquement (par exemple: 700 Mo pour la carte intégrale du Japon et 200 Mo uniquement pour la carte du réseau routier japonnais).</string>
+    <string name="today">Aujourd\'hui</string>
+    <string name="yesterday">Hier</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Pilotage de l\'orientation de la carte</string>
+    <string name="all_markers_moved_to_history">Toutes les marques ont été déplacées vers l\'Historique</string>
+    <string name="marker_moved_to_history">Marque déplacée vers l\'Historique</string>
+    <string name="shared_string_list">Liste</string>
+    <string name="shared_string_groups">Groupes</string>
+    <string name="last_seven_days">Ces 7 derniers jours</string>
+    <string name="this_year">Cette année</string>
+    <string name="make_active">Marquer comme actif</string>
+    <string name="top_bar">Barre supérieure</string>
     </resources>
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index 148d536e23..9684c1433b 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -348,7 +348,7 @@
 		
 	
 	<string name="download_files_not_enough_space">אין די מקום כדי להוריד %1$s מ״ב (פנויים: %2$s).</string>
-	<string name="download_files_question_space">כעת ישנם {2} מ״ב פנויים! האם להוריד {0} קבצים (או קובץ) ({1} מ״ב)?</string>
+	<string name="download_files_question_space">האם להוריד {0} קבצים (או קובץ) בנפח של {1} מ״ב? (ישנם {2} מ״ב פנויים.)</string>
 	
 	 
 	
@@ -984,7 +984,7 @@
     <string name="index_srtm_parts">קטעים</string>
     <string name="index_srtm_ele">קווי הגבהה</string>
     <string name="srtm_plugin_description">תוסף זה מאפשר להוריד קווי הגבהה (הורדת מפות -&gt; תפריט -&gt; מפות אחרות) עבור קטע מסוים ולהשתמש בהם למפות בלתי מקוונות.</string>
-    <string name="srtm_plugin_name">תוסף SRTM</string>
+    <string name="srtm_plugin_name">קווי מתאר</string>
     <string name="download_select_map_types">מפות אחרות</string>
     <string name="download_srtm_maps">מפות SRTM</string>
     
@@ -1126,7 +1126,7 @@
     <string name="context_menu_item_destination_point">הגדרה כיעד</string>
     <string name="destination_point">יעד %1$s</string>
     <string name="available_maps">מפות זמינות</string>
-    <string name="item_removed">הפריט נמחק</string>
+    <string name="item_removed">הפריט הוסר</string>
     <string name="n_items_removed">פריטים נמחקו</string>
     <string name="shared_string_type">סוג</string>
     <string name="starting_point">נקודת המוצא</string>
@@ -1139,7 +1139,7 @@
     <string name="select_voice_provider_descr">יש לבחור או להוריד הנחיה קולית עבור שפתך</string>
     <string name="impassable_road_desc">בחירת דרכים מהן יש להמנע במהלך הניווט</string>
     <string name="shared_string_sound">קול</string>
-    <string name="no_location_permission">ליישום אין הרשאה להשתמש במידע מיקום.</string>
+    <string name="no_location_permission">ליישום אין הרשאה להשתמש בנתוני המיקום.</string>
     <string name="no_camera_permission">ליישום אין הרשאה להשתמש במצלמה.</string>
     <string name="no_microphone_permission">ליישום אין הרשאה להשתמש במיקרופון.</string>
     <string name="route_distance">מרחק:</string>
@@ -1219,10 +1219,10 @@
     <string name="import_gpx_failed_descr">ל־OsmAnd אין אפשרות לייבא את הקובץ. נא לוודא של־OsmAnd יש הרשאה לקרוא קבצים מהמיקום הזה.</string>
     <string name="distance_moving">המרחק תוקן</string>
     <string name="quick_action_resume_pause_navigation">הפסקה/המשך בניווט</string>
-    <string name="quick_action_resume_pause_navigation_descr">יש ללחוץ על כפתור זה כדי להפסיק את הניווט או כדי להמשיך אם הוא כבר הופסק.</string>
+    <string name="quick_action_resume_pause_navigation_descr">יש לגעת בכפתור זה כדי להמשיך את הניווט.</string>
     <string name="quick_action_show_navigation_finish_dialog">הצגת דו־שיח סיום הניווט</string>
-    <string name="quick_action_start_stop_navigation">התחלה/סיום הניווט</string>
-    <string name="quick_action_start_stop_navigation_descr">יש ללחוץ על כפתור זה כדי להתחיל בניווט או כדי לעצור אותו אם הוא כבר החל.</string>
+    <string name="quick_action_start_stop_navigation">התחלה/עצירת הניווט</string>
+    <string name="quick_action_start_stop_navigation_descr">יש ללחוץ על כפתור זה כדי להתחיל בניווט או כדי לסיים אותו.</string>
     <string name="store_tracks_in_monthly_directories_descrp">אחסון המסלולים המוקלטים בתת־תיקיות לפי חודש ההקלטה (למשל: 2017-01).</string>
     <string name="mapillary_image">תמונת Mapillary</string>
     <string name="open_mapillary">פתיחת Mapillary</string>
diff --git a/OsmAnd/res/values-hu/phrases.xml b/OsmAnd/res/values-hu/phrases.xml
index e365279245..4712dd099e 100644
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@@ -3380,7 +3380,7 @@
 
 <string name="poi_zoo_type">Típus</string>
 	<string name="poi_motorcycle_services">Szolgáltatások</string>
-	<string name="poi_motorcycle_type">Motorkerékpár típus</string>
+	<string name="poi_motorcycle_type">Motorkerékpár-kategória</string>
 
 <string name="poi_zoo_petting_zoo">Állatsimogató</string>
 	<string name="poi_zoo_wildlife_park">Vadaspark</string>
@@ -3390,19 +3390,19 @@
 	<string name="poi_zoo_reptile">Hüllők</string>
 
 	<string name="poi_motorcycle_sales_yes">Értékesítés</string>
-	<string name="poi_motorcycle_sales_no">Értékesítés: nincs</string>
-	<string name="poi_motorcycle_sales_yes_used">Értékesítés: van; használt</string>
+	<string name="poi_motorcycle_sales_no">Értékesítés nincs</string>
+	<string name="poi_motorcycle_sales_yes_used">Értékesítés: új és használt</string>
 	<string name="poi_motorcycle_sales_used">Értékesítés: használt</string>
 	<string name="poi_motorcycle_rental_yes">Kölcsönzés</string>
-	<string name="poi_motorcycle_rental_no">Kölcsönzés: nincs</string>
-	<string name="poi_motorcycle_repair_yes">Szerviz</string>
-	<string name="poi_motorcycle_repair_no">Szerviz: nincs</string>
+	<string name="poi_motorcycle_rental_no">Kölcsönzés nincs</string>
+	<string name="poi_motorcycle_repair_yes">Szerelés</string>
+	<string name="poi_motorcycle_repair_no">Szerelés nincs</string>
 	<string name="poi_motorcycle_parts_yes">Alkatrész</string>
-	<string name="poi_motorcycle_parts_no">Alkatrész: nincs</string>
+	<string name="poi_motorcycle_parts_no">Alkatrész nincs</string>
 	<string name="poi_motorcycle_tyres_yes">Gumi</string>
-	<string name="poi_motorcycle_tyres_no">Gumi: nincs</string>
-	<string name="poi_motorcycle_clothes_yes">Motoros ruha</string>
-	<string name="poi_motorcycle_clothes_no">Motoros ruha: nincs</string>
+	<string name="poi_motorcycle_tyres_no">Gumi nincs</string>
+	<string name="poi_motorcycle_clothes_yes">Motorosruha</string>
+	<string name="poi_motorcycle_clothes_no">Motorosruha nincs</string>
 	<string name="poi_motorcycle_type_scooter">Robogó</string>
 	<string name="poi_zoo_enclosure">Kifutó</string>
 	<string name="poi_zoo_falconry">Solymászat</string>
@@ -3491,4 +3491,14 @@
 	<string name="poi_government_transportation">Közlekedési intézmény</string>
 	<string name="poi_government_legislative">Jogalkotási intézmény</string>
 
-</resources>
+<string name="poi_stands">Parkolóhely</string>
+
+	<string name="poi_motorcycle_type_sportbike">Sportmotor</string>
+	<string name="poi_motorcycle_type_chopper">Chopper</string>
+	<string name="poi_motorcycle_type_offroad">Terepmotor</string>
+	<string name="poi_motorcycle_type_dualsport">Túraenduró</string>
+	<string name="poi_motorcycle_type_standard">Standard</string>
+
+	<string name="poi_network">Hálózat</string>
+
+	</resources>
diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 7cc31be6d7..7af8d80f04 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -2764,4 +2764,45 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="max_min">Maks/Min</string>
     <string name="min_max">Min/Maks</string>
     <string name="osmand_plus_extended_description_part8">Apytikslė žemėlapių aprėptis ir kokybė: • Vakarų Europa: **** • Rytų Europa: *** • Rusija: *** • Šiaurės Amerika: *** • Pietų Amerika: ** • Azija: ** • Japonija ir Korėja: *** • Artimieji Rytai: ** • Afrika: ** • Antarktika: * Daugelį šalių visame pasaulyje galima atsisiųsti! Nuo Afganistano iki Zimbabvės, nuo Australijos iki JAV. Argentina, Brazilija, Kanada, Prancūzija, Vokietija, Meksika, Jungtinė Karalystė, Ispanija…</string>
+    <string name="shared_string_list">Sąrašas</string>
+    <string name="shared_string_groups">Grupės</string>
+    <string name="make_active">Aktyvuoti</string>
+    <string name="today">Šiandien</string>
+    <string name="yesterday">Vakar</string>
+    <string name="last_seven_days">Per pastarąsias 7 dienas</string>
+    <string name="this_year">Šiemet</string>
+    <string name="widget">Valdiklis</string>
+    <string name="top_bar">Viršutinė juosta</string>
+    <string name="move_all_to_history">Perkelti visus į istoriją</string>
+    <string name="build_route">Sukurti maršrutą</string>
+    <string name="show_direction">Rodyti kryptį</string>
+    <string name="sort_by">Rūšiuoti pagal</string>
+    <string name="do_not_use_animations">Nenaudoti animacijos</string>
+    <string name="do_not_use_animations_descr">Išjungia animaciją programoje</string>
+    <string name="keep_showing_on_map">Nuolat rodyti žemėlapyje</string>
+    <string name="exit_without_saving">Ar norite išeiti neįrašę?</string>
+    <string name="line">Linija</string>
+    <string name="save_as_route_point">Išsaugoti kaip maršruto taškus</string>
+    <string name="save_as_line">Išsaugoti kaip liniją</string>
+    <string name="route_point">Maršruto taškas</string>
+    <string name="edit_line">Redaguoti liniją</string>
+    <string name="add_point_before">Pridėti tašką prieš</string>
+    <string name="add_point_after">Pridėti tašką po</string>
+    <string name="shared_string_options">Parinktys</string>
+    <string name="measurement_tool_snap_to_road_descr">OsmAnd sujungs taškus su pasirinkto profilio maršrutu.</string>
+    <string name="measurement_tool_save_as_new_track_descr">Taškus galite įrašyti kaip maršruto taškus arba kaip linija.</string>
+    <string name="choose_navigation_type">Pasirinkite navigacijos profilį</string>
+    <string name="none_point_error">Prašome pridėti bent vieną tašką.</string>
+    <string name="enter_gpx_name">GPX failo pavadinimas:</string>
+    <string name="show_on_map_after_saving">Rodyti žemėlapyje išsaugojus</string>
+    <string name="measurement_tool_action_bar">Naršykite žemėlapį ir pridėkite taškų</string>
+    <string name="measurement_tool">Išmatuoti atstumą</string>
+    <string name="osmand_extended_description_part7">Prisidėkite prie OSM • Praneškite apie duomenų klaidas • Įkelkite GPX maršrutus į OSM tiesiai iš programos • Pridėkite LV-as ir tiesiogiai jas įkelkite į OSM (arba vėliau, jei neprisijungę)</string>
+    <string name="osmand_extended_description_part8">"OsmAnd yra atviro kodo ir aktyviai plėtojama. Kiekvienas gali prisidėti prie plėtros pranešdamas apie klaidas, tobulindamas vertimus ar kurdamas naujas funkcijas. Projektas yra  nuolat gerinamas sąveikaujant programuotojamas ir vartotojams. Projekto eiga taip pat priklauso nuo finansinių įnašų paremiant programavimą ir naujų funkcijų testavimą. Apytikslė žemėlapyje aprėptis ir kokybė: • Vakarų Europa: *** • Rytų Europa: *** • Rusija: *** • Šiaurės Amerika: *** • Pietų Amerika: ** • Azija: ** • Japonija ir Korėja: *** • Artimieji Rytai: ** • Afrika: ** • Antarktida: * Galima atsisiųsti didžiąją dalį šalių! Gaukite patikimą navigatorius jūsų šalyje - ar tai būtų Prancūzija, Vokietija, Meksika, Jungtinė Karalystė, Ispanija, Nyderlandai, JAV, Rusija, Brazilija ar kita."</string>
+    <string name="quick_action_navigation_voice">Balso įj/išj</string>
+    <string name="quick_action_navigation_voice_off">Balso išjungtas</string>
+    <string name="quick_action_navigation_voice_on">Balsas įjungtas</string>
+    <string name="quick_action_add_create_items">Sukurti elementus</string>
+    <string name="retry">Bandykite dar kartą</string>
+    <string name="add_route_points">Pridėti maršruto taškus</string>
     </resources>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index f7a2ce6617..4cd29c9b02 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -2881,4 +2881,17 @@ Van bijna alle landen is een kaart te downloaden: van Afghanistan tot Zimbabwe,
     <string name="add_point_before">Punt ervoor toevoegen</string>
     <string name="add_point_after">Punt erna toevoegen</string>
     <string name="shared_string_options">Opties</string>
+    <string name="today">Vandaag</string>
+    <string name="yesterday">Gisteren</string>
+    <string name="last_seven_days">Afgelopen 7 dagen</string>
+    <string name="this_year">Dit jaar</string>
+    <string name="choose_navigation_type">Selecteer navigatieprofiel</string>
+    <string name="none_point_error">Voeg minstens een punt toe.</string>
+    <string name="enter_gpx_name">GPX bestandsnaam:</string>
+    <string name="show_on_map_after_saving">Toon op kaart na opslaan</string>
+    <string name="measurement_tool">Meet afstand</string>
+    <string name="quick_action_start_stop_navigation">Start/stop navigatie</string>
+    <string name="average">Gemiddeld</string>
+    <string name="of">%1$d van de %2$d</string>
+    <string name="retry">Probeer opnieuw</string>
     </resources>
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index ab4505ccef..c41e9a41ad 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -3506,4 +3506,13 @@
 
 <string name="poi_network">Sieć</string>
 
+<string name="poi_government_archive">Archiwum</string>
+	<string name="poi_government_ministry">Ministerstwo</string>
+	<string name="poi_government_public_service">Placówka publiczna</string>
+	<string name="poi_government_social_security">Bezpieczeństwo socjalne</string>
+	<string name="poi_government_social_services">Usługi socjalne</string>
+	<string name="poi_government_treasury">Skarbiec</string>
+	<string name="poi_government_transportation">Instytucja transportowa</string>
+	<string name="poi_government_legislative">Instytucja ustawodawcza</string>
+
 </resources>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index ba52304302..521d972a6f 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -2837,7 +2837,23 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="do_not_use_animations_descr">Wyłącza animacje w programie</string>
     <string name="move_all_to_history">Przenieś wszystkie do historii</string>
     <string name="build_route">Oblicz trasę</string>
-    <string name="show_direction">Pokaż kierunek</string>
+    <string name="show_direction">Wskaźnik odległości</string>
     <string name="sort_by">Sortuj według</string>
     <string name="marker_options">Opcje znacznika</string>
+    <string name="marker_show_distance_descr">Wybierz w jaki sposób wskazywać odległość i kierunek do znaczników mapy na ekranie:</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Zmiana orientacji mapy</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Wybierz prędkość poniżej której orientacja mapy zmieni się z „według kierunku poruszania” na „według kompasu”</string>
+    <string name="all_markers_moved_to_history">Wszystkie znaczniki mapy przeniesiono do historii</string>
+    <string name="marker_moved_to_history">Znacznik mapy przeniesiono do historii</string>
+    <string name="marker_moved_to_active">Znacznik mapy przeniesiono do aktywnych</string>
+    <string name="shared_string_list">Lista</string>
+    <string name="shared_string_groups">Grupy</string>
+    <string name="passed">Minęło: %1$s</string>
+    <string name="make_active">Uaktywnij</string>
+    <string name="today">Dzisiaj</string>
+    <string name="yesterday">Wczoraj</string>
+    <string name="last_seven_days">Ostatnie 7 dni</string>
+    <string name="this_year">Ten rok</string>
+    <string name="widget">Widżet</string>
+    <string name="top_bar">Belka górna</string>
     </resources>
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index 1dc5b4ec84..5c9c768f0f 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -2672,4 +2672,6 @@
 
 <string name="poi_network">Retza</string>
 
+<string name="poi_government_legislative">Istitutzione legislativa</string>
+
 </resources>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 3a412ac919..0f41cb009c 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -2765,4 +2765,16 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="show_direction">Ammustra sas indicatziones de diretzione</string>
     <string name="sort_by">Òrdina pro</string>
     <string name="marker_options">Optziones de sos marcadores</string>
+    <string name="map_orientation_change_in_accordance_with_speed">S\'orientamentu de sa mapa mudat cun sa lestresa</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Imprea sa bussola integrata imbetzes de sa diretzione de su movimentu pro determinare s\'orientamentu de sa mapa a lestresas bassas</string>
+    <string name="all_markers_moved_to_history">Totu sos marcadores postos in sa Cronologia</string>
+    <string name="marker_moved_to_history">Marcadore postu in sa Cronologia</string>
+    <string name="marker_moved_to_active">Marcadore postu in Ativos</string>
+    <string name="shared_string_list">Lista</string>
+    <string name="shared_string_groups">Grupos</string>
+    <string name="today">Oe</string>
+    <string name="yesterday">Eris</string>
+    <string name="last_seven_days">Ùrtimas 7 dies</string>
+    <string name="this_year">Cust\'annu</string>
+    <string name="top_bar">Barra superiore</string>
     </resources>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 199d151b92..f2bc4c5cb0 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2862,4 +2862,19 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="show_direction">Zobraziť smer</string>
     <string name="sort_by">Zotriediť podľa</string>
     <string name="marker_options">Možnosti značiek</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Zmena orientácie mapy podľa rýchlosti</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Pri nízkej rýchlosti použiť na zistenie orientácie mapy zabudovaný kompas namiesto smeru pohybu</string>
+    <string name="all_markers_moved_to_history">Všetky značky presunuté do histórie</string>
+    <string name="marker_moved_to_history">Značka presunutá do histórie</string>
+    <string name="marker_moved_to_active">Značka presunutá do archívu</string>
+    <string name="shared_string_list">Zoznam</string>
+    <string name="shared_string_groups">Skupiny</string>
+    <string name="passed">Prešli sme okolo: %1$s</string>
+    <string name="make_active">Aktivovať</string>
+    <string name="today">Dnes</string>
+    <string name="yesterday">Včera</string>
+    <string name="last_seven_days">Posledných 7 dní</string>
+    <string name="this_year">Tento rok</string>
+    <string name="widget">Nástroj</string>
+    <string name="top_bar">Horná lišta</string>
     </resources>
diff --git a/OsmAnd/res/values-uk/phrases.xml b/OsmAnd/res/values-uk/phrases.xml
index a5e6b63228..67c0ba630a 100644
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@@ -3476,4 +3476,13 @@
 
 <string name="poi_network">Мережа</string>
 
+<string name="poi_government_archive">Архів</string>
+	<string name="poi_government_ministry">Міністерство</string>
+	<string name="poi_government_public_service">Державна служба</string>
+	<string name="poi_government_social_security">Соціальний захист</string>
+	<string name="poi_government_social_services">Соціальні послуги</string>
+	<string name="poi_government_treasury">Казначейство</string>
+	<string name="poi_government_transportation">Транспортна установа</string>
+	<string name="poi_government_legislative">Законодавчі установи</string>
+
 </resources>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index 7fe6f3392a..deccf3c2b3 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -1567,7 +1567,7 @@
     <string name="app_modes_choose_descr">Виберіть профілі, видимі в застосунку</string>
     <string name="app_modes_choose">Профілі застосунку</string>
 	<string name="map_widget_map_rendering">Візуалізація мапи</string>
-    <string name="app_mode_hiking">Піший туризм</string>
+    <string name="app_mode_hiking">Піші прогулянки</string>
     <string name="app_mode_motorcycle">Мотоцикл</string>
     <string name="app_mode_boat">Човен</string>
     <string name="app_mode_aircraft">Літак</string>
@@ -2994,9 +2994,23 @@
     <string name="exit_without_saving">Вийти без збереження?</string>
     <string name="move_all_to_history">Перемістити усе в історію</string>
     <string name="build_route">Побудувати маршрут</string>
-    <string name="show_direction">Показати напрямок</string>
+    <string name="show_direction">Відображення відстані</string>
     <string name="sort_by">Сортувати за</string>
     <string name="marker_options">Параметри маркера</string>
     <string name="do_not_use_animations">Не застосовувати анімацію</string>
     <string name="do_not_use_animations_descr">Відключення анімації в програмі</string>
+    <string name="marker_show_distance_descr">Вибрати як показувати відстань і напрямок до маркерів на екрані мапи:</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Поріг орієнтації мапи</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Виберіть нижче, на якій швидкості орієнтація мапи перемикається зі „за напрямком руху“ на „за компасом“</string>
+    <string name="all_markers_moved_to_history">Усі маркери перенесені в історію</string>
+    <string name="marker_moved_to_history">Маркер мапи перенесений в історію</string>
+    <string name="marker_moved_to_active">Маркер мапи став активним</string>
+    <string name="shared_string_list">Список</string>
+    <string name="shared_string_groups">Групи</string>
+    <string name="passed">Пройшло: %1$s</string>
+    <string name="make_active">Зробити активним</string>
+    <string name="today">Сьогодні</string>
+    <string name="yesterday">Вчора</string>
+    <string name="last_seven_days">Останні 7 днів</string>
+    <string name="this_year">Цього року</string>
     </resources>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 778b37c842..6ee318461b 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -1207,7 +1207,7 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
     <string name="app_mode_hiking">健行</string>
     <string name="app_mode_motorcycle">機車</string>
     <string name="app_mode_boat">船</string>
-    <string name="app_mode_aircraft">飛航</string>
+    <string name="app_mode_aircraft">飛行器</string>
     <string name="map_widget_map_rendering">地圖著色演算</string>
     <string name="app_modes_choose_descr">在應用程式中選擇曾見過的設定檔</string>
     <string name="app_modes_choose">應用設定檔</string>
@@ -2220,7 +2220,7 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
     <string name="show_map_markers_description">啟動地圖標記功能</string>
     <string name="clear_active_markers_q">您想要移除所有的活動標記嗎？</string>
     <string name="clear_markers_history_q">您想清除地圖標記歷史記錄嗎？</string>
-    <string name="active_markers">啟動標記</string>
+    <string name="active_markers">活動標記</string>
     <string name="map_markers">地圖標記</string>
     <string name="map_marker">地圖標記</string>
     <string name="add_points_to_map_markers_q">您想要將所有的標點都加到地圖標記嗎？</string>
@@ -2254,7 +2254,7 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
     <string name="osm_live_support_region">支援地區</string>
     <string name="osm_live_month_cost">每月費用</string>
     <string name="osm_live_month_cost_desc">每月付款</string>
-    <string name="osm_live_active">有效的</string>
+    <string name="osm_live_active">活動</string>
     <string name="osm_live_not_active">失效的</string>
     <string name="osm_live_enter_email">請輸入有效的電子郵件地址</string>
     <string name="osm_live_enter_user_name">請輸入公開名稱</string>
@@ -2845,7 +2845,23 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
     <string name="do_not_use_animations_descr">停用在應用程式中的動畫</string>
     <string name="move_all_to_history">全部移動到歷程</string>
     <string name="build_route">建立路線</string>
-    <string name="show_direction">顯示方向</string>
+    <string name="show_direction">距離指示</string>
     <string name="sort_by">排序方式</string>
     <string name="marker_options">標記選項</string>
+    <string name="map_orientation_change_in_accordance_with_speed">地圖定位開端</string>
+    <string name="all_markers_moved_to_history">所有的地圖標記已移到歷程記錄</string>
+    <string name="marker_moved_to_history">地圖標記已移到歷程記錄</string>
+    <string name="marker_moved_to_active">地圖標記已移到活動</string>
+    <string name="shared_string_list">清單</string>
+    <string name="shared_string_groups">群組</string>
+    <string name="passed">已經過：%1$s</string>
+    <string name="make_active">進行活動</string>
+    <string name="today">今天</string>
+    <string name="yesterday">昨天</string>
+    <string name="last_seven_days">最近 7 天</string>
+    <string name="this_year">今年</string>
+    <string name="widget">小工具</string>
+    <string name="top_bar">頂欄</string>
+    <string name="marker_show_distance_descr">選擇如何在地圖畫面上指示距離和方向的地圖標記：</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">選擇下方哪個速度的地圖方向從\'行動方向\'切換到\'羅盤\'</string>
     </resources>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 6fb20954d8..034ca5acff 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -12,13 +12,14 @@
     <string name="remove_from_map_markers">Remove from Map Markers</string>
     <string name="descendingly">Descendingly</string>
     <string name="ascendingly">Ascendingly</string>
-    <string name="map_orientation_change_in_accordance_with_speed">Map orientation change in accordance with speed</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">Use built in compass instead of direction of movement to determine map orientation at low speed</string>
     <string name="date_added">Date added</string>
     <string name="order_by">Order by:</string>
-    <string name="all_markers_moved_to_history">All markers moved to History</string>
-    <string name="marker_moved_to_history">Marker moved to History</string>
-    <string name="marker_moved_to_active">Marker moved to Active</string>
+    <string name="marker_show_distance_descr">Select how to indicate distance and direction to Map markers on the map screen:</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Map orientation threshold</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Select below which speed the map orientation switches from \'To direction of movement\' to \'To compass\'</string>
+    <string name="all_markers_moved_to_history">All Map markers moved to history</string>
+    <string name="marker_moved_to_history">Map marker moved to history</string>
+    <string name="marker_moved_to_active">Map marker moved to active</string>
     <string name="shared_string_list">List</string>
     <string name="shared_string_groups">Groups</string>
     <string name="passed">Passed: %1$s</string>
@@ -27,11 +28,11 @@
     <string name="yesterday">Yesterday</string>
     <string name="last_seven_days">Last 7 days</string>
     <string name="this_year">This year</string>
-    <string name="widget">Widget</string>
-    <string name="top_bar">Top bar</string>
+    <!-- string name="widget">Widget</string if needed should be shared_string_widget -->
+    <!-- string name="top_bar">Top bar</string use shared_string_topbar -->
     <string name="move_all_to_history">Move all to history</string>
     <string name="build_route">Build route</string>
-    <string name="show_direction">Show direction</string>
+    <string name="show_direction">Distance indication</string>
     <string name="sort_by">Sort by</string>
     <string name="do_not_use_animations">Do not use animations</string>
     <string name="do_not_use_animations_descr">Disables animations in the app</string>
@@ -446,7 +447,7 @@
     <string name="avoid_road">Avoid road</string>
     <string name="storage_directory_readonly_desc">Currently selected Data storage folder is readonly. The storage folder was temporarily switched to Internal memory. Please choose valid storage directory.</string>
     <string name="storage_directory_shared">Shared memory</string>
-    <string name="shared_string_topbar">Topbar</string>
+    <string name="shared_string_topbar">Top bar</string>
     <string name="full_report">Full report</string>
     <string name="recalculate_route">Recalculate route</string>
     <string name="open_street_map_login_and_pass">OpenStreetMap login and password</string>
diff --git a/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java b/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
index 58b53cb878..5e49704250 100644
--- a/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
+++ b/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
@@ -421,12 +421,20 @@ public class PoiUIFilter implements SearchPoiTypeFilter, Comparable<PoiUIFilter>
 	@Override
 	public ResultMatcher<Amenity> wrapResultMatcher(final ResultMatcher<Amenity> matcher) {
 		final AmenityNameFilter nm = getNameFilter(filterByName);
+		final Set<String> searchedPois = new TreeSet<>();
 		return new ResultMatcher<Amenity>() {
 
 			@Override
 			public boolean publish(Amenity a) {
 				if (nm.accept(a)) {
 					if (matcher == null || matcher.publish(a)) {
+						String poiID = a.getType().getKeyName() + "_" + a.getId();
+						if (!searchedPois.add(poiID)) {
+							return false;
+						}
+						if (a.isClosed()) {
+							return false;
+						}
 						return true;
 					}
 				}
diff --git a/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java b/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
index 98255722b9..803945c8a7 100644
--- a/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
+++ b/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
@@ -60,6 +60,7 @@ import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -715,7 +716,10 @@ public class ResourceManager {
 				int left31 = MapUtils.get31TileNumberX(leftLongitude);
 				int bottom31 = MapUtils.get31TileNumberY(bottomLatitude);
 				int right31 = MapUtils.get31TileNumberX(rightLongitude);
-				for (AmenityIndexRepository index : amenityRepositories.values()) {
+				List<String> fileNames = new ArrayList<String>(amenityRepositories.keySet());
+				Collections.sort(fileNames, Algorithms.getStringVersionComparator());
+				for (String name : fileNames) {
+					AmenityIndexRepository index = amenityRepositories.get(name);
 					if (matcher != null && matcher.isCancelled()) {
 						searchAmenitiesInProgress = false;
 						break;
@@ -734,8 +738,8 @@ public class ResourceManager {
 		}
 		return amenities;
 	}
-	
-	public List<Amenity> searchAmenitiesOnThePath(List<Location> locations, double radius, SearchPoiTypeFilter filter,
+
+    public List<Amenity> searchAmenitiesOnThePath(List<Location> locations, double radius, SearchPoiTypeFilter filter,
 			ResultMatcher<Amenity> matcher) {
 		searchAmenitiesInProgress = true;
 		final List<Amenity> amenities = new ArrayList<Amenity>();