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

OsmAnd-java/src/main/java/net/osmand/Period.java

@@ -0,0 +1,171 @@
+package net.osmand;
+
+import java.text.ParseException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class Period {
+
+	public enum PeriodUnit {
+		YEAR("Y"),
+		MONTH("M"),
+		WEEK("W"),
+		DAY("D");
+
+		private String unitStr;
+
+		PeriodUnit(String unitStr) {
+			this.unitStr = unitStr;
+		}
+
+		public String getUnitStr() {
+			return unitStr;
+		}
+
+		public double getMonthsValue() {
+			switch (this) {
+				case YEAR:
+					return 12d;
+				case MONTH:
+					return 1d;
+				case WEEK:
+					return 1/4d;
+				case DAY:
+					return 1/30d;
+			}
+			return 0d;
+		}
+
+		public static PeriodUnit parseUnit(String unitStr) {
+			for (PeriodUnit unit : values()) {
+				if (unit.unitStr.equals(unitStr)) {
+					return unit;
+				}
+			}
+			return null;
+		}
+	}
+
+	private static final Pattern PATTERN =
+			Pattern.compile("^P(?:([-+]?[0-9]+)([YMWD]))?$", Pattern.CASE_INSENSITIVE);
+
+	private PeriodUnit unit;
+
+	private final int numberOfUnits;
+
+	public static Period ofYears(int years) {
+		return new Period(PeriodUnit.YEAR, years);
+	}
+
+	public static Period ofMonths(int months) {
+		return new Period(PeriodUnit.MONTH, months);
+	}
+
+	public static Period ofWeeks(int weeks) {
+		return new Period(PeriodUnit.WEEK, weeks);
+	}
+
+	public static Period ofDays(int days) {
+		return new Period(PeriodUnit.DAY, days);
+	}
+
+	public PeriodUnit getUnit() {
+		return unit;
+	}
+
+	public int getNumberOfUnits() {
+		return numberOfUnits;
+	}
+
+	/**
+	 * Obtains a {@code Period} from a text string such as {@code PnY PnM PnD PnW}.
+	 * <p>
+	 * This will parse the string produced by {@code toString()} which is
+	 * based on the ISO-8601 period formats {@code PnY PnM PnD PnW}.
+	 * <p>
+	 * The string cannot start with negative sign.
+	 * The ASCII letter "P" is next in upper or lower case.
+	 * <p>
+	 * For example, the following are valid inputs:
+	 * <pre>
+	 *   "P2Y"             -- Period.ofYears(2)
+	 *   "P3M"             -- Period.ofMonths(3)
+	 *   "P4W"             -- Period.ofWeeks(4)
+	 *   "P5D"             -- Period.ofDays(5)
+	 * </pre>
+	 *
+	 * @param text the text to parse, not null
+	 * @return the parsed period, not null
+	 * @throws ParseException if the text cannot be parsed to a period
+	 */
+	public static Period parse(CharSequence text) throws ParseException {
+		Matcher matcher = PATTERN.matcher(text);
+		if (matcher.matches()) {
+			String numberOfUnitsMatch = matcher.group(1);
+			String unitMatch = matcher.group(2);
+			if (numberOfUnitsMatch != null && unitMatch != null) {
+				try {
+					int numberOfUnits = parseNumber(numberOfUnitsMatch);
+					PeriodUnit unit = PeriodUnit.parseUnit(unitMatch);
+					return new Period(unit, numberOfUnits);
+				} catch (IllegalArgumentException ex) {
+					throw new ParseException("Text cannot be parsed to a Period: " + text, 0);
+				}
+			}
+		}
+		throw new ParseException("Text cannot be parsed to a Period: " + text, 0);
+	}
+
+	private static int parseNumber(String str) throws ParseException {
+		if (str == null) {
+			return 0;
+		}
+		return Integer.parseInt(str);
+	}
+
+	public Period(PeriodUnit unit, int numberOfUnits) {
+		if (unit == null) {
+			throw new IllegalArgumentException("PeriodUnit cannot be null");
+		}
+		this.unit = unit;
+		this.numberOfUnits = numberOfUnits;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj instanceof Period) {
+			Period other = (Period) obj;
+			return unit.ordinal() == other.unit.ordinal() && numberOfUnits == other.numberOfUnits;
+		}
+		return false;
+	}
+
+	@Override
+	public int hashCode() {
+		return unit.ordinal() + Integer.rotateLeft(numberOfUnits, 8);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder buf = new StringBuilder();
+		buf.append('P').append(numberOfUnits);
+		switch (unit) {
+			case YEAR:
+				buf.append('Y');
+				break;
+			case MONTH:
+				buf.append('M');
+				break;
+			case WEEK:
+				buf.append('W');
+				break;
+			case DAY:
+				buf.append('D');
+				break;
+		}
+		return buf.toString();
+	}
+}

OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java

@@ -315,7 +315,7 @@ public class OsmandRegions {
 	}
 
 	public List<BinaryMapDataObject> query(int lx, int rx, int ty, int by) throws IOException {
-		return queryBboxNoInit(lx, rx, ty, by, true);
+		return query(lx, rx, ty, by, true);
 	}
 
 	public List<BinaryMapDataObject> query(int lx, int rx, int ty, int by, boolean checkCenter) throws IOException {

OsmAnd-java/src/main/java/net/osmand/osm/edit/Entity.java

@@ -127,14 +127,18 @@ public abstract class Entity implements Serializable {
 
 	public Entity(Entity copy, long id) {
 		this.id = id;
-		for (String t : copy.getTagKeySet()) {
-			putTagNoLC(t, copy.getTag(t));
-		}
+		copyTags(copy);
 		this.dataLoaded = copy.dataLoaded;
 		this.latitude = copy.latitude;
 		this.longitude = copy.longitude;
 	}
 
+	public void copyTags(Entity copy) {
+		for (String t : copy.getTagKeySet()) {
+			putTagNoLC(t, copy.getTag(t));
+		}
+	}
+
 	public Set<String> getChangedTags() {
 		return changedTags;
 	}

OsmAnd-java/src/main/java/net/osmand/osm/edit/Way.java

@@ -21,8 +21,8 @@ public class Way extends Entity {
 		super(id);
 	}
 
-	public Way(Way w) {
-		super(w.getId());
+	public Way(Way w, long id) {
+		super(w, id);
 		if (w.nodeIds != null) {
 			nodeIds = new TLongArrayList(w.nodeIds);
 		}

OsmAnd-java/src/main/java/net/osmand/router/RoutingContext.java

@@ -235,7 +235,6 @@ public class RoutingContext {
 	
 	private int searchSubregionTile(RouteSubregion subregion){
 		RoutingSubregionTile key = new RoutingSubregionTile(subregion);
-		long now = System.nanoTime();
 		int ind = Collections.binarySearch(subregionTiles, key, new Comparator<RoutingSubregionTile>() {
 			@Override
 			public int compare(RoutingSubregionTile o1, RoutingSubregionTile o2) {
@@ -256,7 +255,6 @@ public class RoutingContext {
 				}
 			}
 		}
-		timeToLoadHeaders += (System.nanoTime() - now);
 		return ind;
 	}
 	

OsmAnd-telegram/res/values-de/strings.xml

@@ -248,4 +248,5 @@
     <string name="shared_string_start">Start</string>
     <string name="start_end_date">Start — Ende Datum</string>
     <string name="shared_string_apply">Anwenden</string>
+    <string name="set_time_timeline_descr">Dauer der Anzeige auswählen</string>
 </resources>

OsmAnd-telegram/res/values-it/strings.xml

@@ -242,4 +242,5 @@
     <string name="min_logging_speed">Velocità minima di registrazione</string>
     <string name="min_logging_speed_descr">Filtra: nessuna registrazione al di sotto della velocità selezionata</string>
     <string name="gpx_settings">Impostazioni GPX</string>
+    <string name="shared_string_apply">Applica</string>
 </resources>

OsmAnd-telegram/res/values-ru/strings.xml

@@ -26,7 +26,7 @@
     <string name="gps_not_available">Пожалуйста, включите «Местоположение» в системных настройках</string>
     <string name="location_service_no_gps_available">Выберите один из провайдеров определения местоположения, чтобы поделиться своим местоположением.</string>
     <string name="background_work">Работа в фоне</string>
-    <string name="battery_optimization_description">Отключите оптимизацию батареи для OsmAnd Tracker, чтобы оно не было внезапно отключено в фоновом режиме.</string>
+    <string name="battery_optimization_description">Отключите оптимизацию батареи для OsmAnd Tracker, чтобы не было внезапного отключения в фоновом режиме.</string>
     <string name="osmand_service">Фоновый режим</string>
     <string name="osmand_service_descr">OsmAnd Tracker работает в фоновом режиме с выключенным экраном.</string>
     <string name="choose_osmand_desc">Выберите версию OsmAnd, в которой контакты будут отображаться на карте.</string>
@@ -214,4 +214,20 @@
     <string name="search_contacts_descr">Поиск среди всех ваших групп и контактов.</string>
     <string name="type_contact_or_group_name">Введите контакт или название группы</string>
     <string name="shared_string_search">Поиск</string>
+    <string name="direction">Направление</string>
+    <string name="precision">Точность</string>
+    <string name="proxy_credentials">Учетные данные</string>
+    <string name="proxy_port">Порт</string>
+    <string name="proxy_server">Сервер</string>
+    <string name="shared_string_connection">Соединение</string>
+    <string name="proxy_type">Тип прокси</string>
+    <string name="proxy_connected">Подключено</string>
+    <string name="proxy_disconnected">Отключено</string>
+    <string name="proxy_settings">Настройки прокси</string>
+    <string name="proxy">Прокси</string>
+    <string name="gpx_settings">настройки GPX</string>
+    <string name="timeline_no_data_descr">Нет собранных данных за выбранный день</string>
+    <string name="timeline_no_data">Нет данных</string>
+    <string name="shared_string_apply">Применить</string>
+    <string name="start_end_date">Дата начала - окончания</string>
 </resources>

OsmAnd-telegram/res/values-sl/strings.xml

@@ -94,4 +94,26 @@
     <string name="search_contacts_descr">Iskanje med skupinami in stiki</string>
     <string name="shared_string_search">Iskanje</string>
     <string name="shared_string_ok">V redu</string>
+    <string name="time_ago">nazaj</string>
+    <string name="shared_string_all">Vse</string>
+    <string name="shared_string_off">Izlključeno</string>
+    <string name="shared_string_install">Namesti</string>
+    <string name="shared_string_share">Skupna raba</string>
+    <string name="shared_string_back">Nazaj</string>
+    <string name="shared_string_continue">Nadaljuj</string>
+    <string name="shared_string_cancel">Prekliči</string>
+    <string name="shared_string_settings">Nastavitve</string>
+    <string name="osmand_service">Delovanje v ozadju</string>
+    <string name="shared_string_map">Zemljevid</string>
+    <string name="average_altitude">Povprečna nadmorska višina</string>
+    <string name="average_speed">Povprečna hitrost</string>
+    <string name="shared_string_update">Posodobitev</string>
+    <string name="received_gps_points">Prejetih točk GPX: %1$s</string>
+    <string name="altitude">Višina</string>
+    <string name="shared_string_enable">Omogoči</string>
+    <string name="shared_string_select">Izberi</string>
+    <string name="timeline_no_data">Ni podatkov</string>
+    <string name="shared_string_end">Končaj</string>
+    <string name="shared_string_start">Začni</string>
+    <string name="shared_string_apply">Uveljavi</string>
 </resources>

OsmAnd-telegram/res/values-uk/strings.xml

@@ -21,7 +21,7 @@
     <string name="connecting_to_the_internet">Зʼєднання із інтернетом</string>
     <string name="background_work_description">Змініть налаштування оптимізації батареї, для стабільної трансляції позиціювання.</string>
     <string name="background_work">Робота у фоні</string>
-    <string name="battery_optimization_description">Вимкніть оптимізацію батареї для OsmAnd Tracker, аби додаток не вимикався у фоновому режимі.</string>
+    <string name="battery_optimization_description">Вимкніть оптимізацію батареї для OsmAnd Tracker,для того, щоб вона не вимкнулась у фоновому режимі.</string>
     <string name="sharing_in_background">Трансляція у фоновому режимі</string>
     <string name="go_to_settings">Перейти до налаштувань</string>
     <string name="shared_string_later">Пізніше</string>
@@ -39,7 +39,7 @@
     <string name="add_device">Додати пристрій</string>
     <string name="share_location_as">Поділитися позицією як</string>
     <string name="live_now_description">Контакти та групи, які транслюють свою позицію Вам.</string>
-    <string name="logout_from_osmand_telegram_descr">Ви впевнені, що бажаєте вийти з OsmAnd Tracker\? Оскільки не зможете транслювати свою позицію чи бачити позицію інших.</string>
+    <string name="logout_from_osmand_telegram_descr">Ви впевнені, що бажаєте вийти з OsmAnd Tracker, оскільки не зможете транслювати свою позицію чи бачити позицію інших\?</string>
     <string name="logout_from_osmand_telegram">Вийти з OsmAnd Tracker\?</string>
     <string name="shared_string_name">Імʼя</string>
     <string name="by_distance">За відстанню</string>
@@ -64,7 +64,7 @@
     <string name="connected_account">Повʼязаний обліковий запис</string>
     <string name="shared_string_account">Обліковий запис</string>
     <string name="in_time">через %1$s</string>
-    <string name="osmand_connect_desc">Оберіть версію OsmAnd, яку OsmAnd Tracker буде використовувати для показу позицій на карті.</string>
+    <string name="osmand_connect_desc">Оберіть версію OsmAnd, яку OsmAnd Tracker буде використовувати для відображення позицій на карті.</string>
     <string name="osmand_connect">Підключення OsmAnd</string>
     <string name="location_history_desc">Приховайте контакти, які не рухалися на протязі визначеного проміжку часу.</string>
     <string name="location_history">Історія позицій</string>
@@ -85,24 +85,24 @@
     <string name="do_not_have_telegram">Я не маю облікового запису Telegram</string>
     <string name="enter_phone_number">Введіть номер телефону</string>
     <string name="enter_authentication_code">Введіть код аутентифікації</string>
-    <string name="hours_and_minutes_format">%1$d г %2$d х</string>
-    <string name="minutes_format">%1$d х</string>
+    <string name="hours_and_minutes_format">%1$d г %2$d хв</string>
+    <string name="minutes_format">%1$d хв</string>
     <string name="hours_format">%1$d г</string>
     <string name="shared_string_install">Встановити</string>
     <string name="shared_string_share">Поділитися</string>
     <string name="shared_string_back">Назад</string>
     <string name="set_time">Оберіть час</string>
-    <string name="location_sharing_description">Оберіть контакти та групи, яким ви транслюватимете свою позицію.</string>
+    <string name="location_sharing_description">Оберіть контакти та групи, з якими ви бажаєте поділитися своїм місцезнаходженням.</string>
     <string name="my_location_search_hint">Пошук: Група або контакт</string>
-    <string name="start_location_sharing">Транслювати позицію</string>
+    <string name="start_location_sharing">Поділитися місцезнаходженням</string>
     <string name="show_on_map">Показати на карті</string>
-    <string name="app_name">OsmAnd Online GPS Tracker</string>
+    <string name="app_name">OsmAnd онлайн GPS Tracker</string>
     <string name="phone_number_title">Номер телефону</string>
-    <string name="phone_number_descr">Номер телефону у міжнародному форматі</string>
+    <string name="phone_number_descr">Номер телефону в міжнародному форматі</string>
     <string name="shared_string_password">Пароль</string>
     <string name="enter_code">Введіть код</string>
     <string name="authentication_code">Код аутентифікації</string>
-    <string name="authentication_code_descr">Telegram надіслав Вам код, аби OsmAnd увійшов до вашого облікового запису.</string>
+    <string name="authentication_code_descr">Telegram надіслав Вам код, для OsmAnd, щоб Ви могли увійти до вашого облікового запису.</string>
     <string name="enter_password">Введіть пароль</string>
     <string name="password_descr">Пароль Telegram</string>
     <string name="shared_string_login">Увійти</string>
@@ -110,7 +110,7 @@
     <string name="initialization">Запуск</string>
     <string name="logging_out">Вихід із системи</string>
     <string name="closing">Закриття</string>
-    <string name="gps_network_not_enabled">Увімкнути «Позиціювання»\?</string>
+    <string name="gps_network_not_enabled">Служба визначення місцезнаходження вимкнена. Увімкнути\?</string>
     <string name="not_logged_in">Ви не увійшли до системи</string>
     <string name="shared_string_continue">Продовжити</string>
     <string name="shared_string_cancel">Скасувати</string>
@@ -122,7 +122,7 @@
     <string name="shared_string_distance">Відстань</string>
     <string name="share_location">Поділитися позицією</string>
     <string name="sharing_location">Трансляція позиції</string>
-    <string name="install_osmand_dialog_message">Вам спершу необхідно встановити безкоштовну, чи платну версію OsmAnd</string>
+    <string name="install_osmand_dialog_message">Спочатку Вам необхідно встановити безкоштовну або платну версію OsmAnd</string>
     <string name="install_osmand">Встановити OsmAnd</string>
     <string name="show_users_on_map">Показувати користувачів на карті</string>
     <string name="active_chats">Активні чати</string>
@@ -147,11 +147,11 @@
     <string name="si_min_km">Хвилин за кілометр</string>
     <string name="si_min_m">Хвилин за милю</string>
     <string name="si_nm_h">Морських миль на годину (вузол)</string>
-    <string name="si_mi_feet">Милі, фути</string>
-    <string name="si_mi_yard">Милі, ярди</string>
-    <string name="si_km_m">Кілометри, метри</string>
+    <string name="si_mi_feet">Милі/фути</string>
+    <string name="si_mi_yard">Милі/ярди</string>
+    <string name="si_km_m">Кілометри/метри</string>
     <string name="si_nm">Морські милі</string>
-    <string name="si_mi_meters">Милі, метри</string>
+    <string name="si_mi_meters">Милі/метри</string>
     <string name="shared_string_hour_short">г</string>
     <string name="shared_string_minute_short">хв</string>
     <string name="shared_string_second_short">сек</string>
@@ -187,17 +187,17 @@
     <string name="map_and_text">Карта та текст</string>
     <string name="process_service">Сервіс OsmAnd Tracker</string>
     <string name="osmand_logo">OsmAnd логотип</string>
-    <string name="live_now">Активно зараз</string>
+    <string name="live_now">В мережі</string>
     <string name="location_recording_enabled">Запис позиціювання увімкнуто</string>
-    <string name="timeline_description">Увімкніть моніторинг, аби зберігати позиціювання в історії.</string>
+    <string name="timeline_description">Увімкніть моніторинг, аби зберігати всі позиції в історії.</string>
     <string name="app_name_short">OsmAnd трекер</string>
-    <string name="privacy_policy_use_telegram">Telegram (менеджер повідомлень) використовується для зв\'язку та спілкування між людьми.</string>
-    <string name="privacy_policy_telegram_client">OsmAnd трекер є одним із клієнтів, який використовує відкриту платформу Telegram. Ваші контакти можуть використовувати будь-який інший клієнт Telegram.</string>
-    <string name="privacy_policy_agree">Натиснувши продовжити, Ви погоджуєтесь з умовами політики конфіденційності Telegram та OsmAnd.</string>
+    <string name="privacy_policy_use_telegram">Telegram (програма месенджер) використовується для зв\'язку та спілкування між людьми.</string>
+    <string name="privacy_policy_telegram_client">OsmAnd трекер є одним із клієнтів, який використовує відкриту платформу Telegram. Вашими контактами зможе скористуватися будь-який інший клієнт Telegram.</string>
+    <string name="privacy_policy_agree">Клацнувши далі,, Ви погоджуєтесь з умовами політики конфіденційності Telegram та політикою конфіденційності OsmAnd.</string>
     <string name="telegram_privacy_policy">Політика конфіденційності Telegram</string>
     <string name="osmand_privacy_policy">Політика конфіденційності OsmAnd</string>
     <string name="shared_string_appearance">Зовнішній вигляд</string>
-    <string name="gps_points_in_buffer">надіслано (%1$d в буфері)</string>
+    <string name="gps_points_in_buffer">надіслано (%1$d в буфер)</string>
     <string name="monitoring_is_enabled">Моніторинг увімкнуто</string>
     <string name="monitoring_is_disabled">Моніторинг вимкнуто</string>
     <string name="shared_string_live">Активні</string>
@@ -207,4 +207,46 @@
     <string name="shared_string_enable">Увімкнути</string>
     <string name="shared_string_select">Обрати</string>
     <string name="shared_string_apply">Застосувати</string>
+    <string name="proxy_key">Ключ</string>
+    <string name="proxy_password">Пароль</string>
+    <string name="proxy_username">Ім\'я користувача</string>
+    <string name="proxy_credentials">Облікові дані</string>
+    <string name="proxy_port">Порт</string>
+    <string name="proxy_server">Сервер</string>
+    <string name="shared_string_connection">З’єднання</string>
+    <string name="proxy_type">Тип проксі-сервера</string>
+    <string name="proxy_connected">З\'єднано</string>
+    <string name="proxy_disconnected">Роз\'єднано</string>
+    <string name="proxy_settings">Налаштування проксі</string>
+    <string name="proxy">Проксі</string>
+    <string name="privacy">Конфіденційність</string>
+    <string name="timeline_no_data">Нема даних</string>
+    <string name="shared_string_end">Кінець</string>
+    <string name="shared_string_start">Початок</string>
+    <string name="start_end_date">Дата початку - кінця</string>
+    <string name="gpx_settings">Налаштування GPX</string>
+    <string name="timeline_no_data_descr">Накопичені дані для обраного дня відсутні</string>
+    <string name="send_location_as">Надіслати місцезнаходження як</string>
+    <string name="send_location_as_descr">Виберіть, як виглядатимуть повідомлення з вашим місцезнаходженням.</string>
+    <string name="time_on_the_move">Час руху</string>
+    <string name="show_gps_points_descr">Показати кількість зібраних та відправлених GPS-точок.</string>
+    <string name="set_time_timeline_descr">Виберіть час для відображення</string>
+    <string name="stale_location_desc">Востаннє контакт переміщувався.</string>
+    <string name="stale_location">Не рухається</string>
+    <string name="set_visible_time_for_all">Встановити денний час для всіх</string>
+    <string name="visible_time_for_all">Видимий час для всіх</string>
+    <string name="set_time_description">Встановіть час, коли вибрані контакти та групи будуть бачити ваше місцезнаходження в режимі реального часу.</string>
+    <string name="location_service_no_gps_available">Виберіть одного з локальних постачальників, щоб поділитися своїм місцеположенням.</string>
+    <string name="search_contacts">Пошук контактів</string>
+    <string name="search_contacts_descr">Пошук у всіх своїх групах та контактах.</string>
+    <string name="type_contact_or_group_name">Введіть назву контакту чи групи</string>
+    <string name="direction">Напрямок</string>
+    <string name="precision">Точність</string>
+    <string name="bearing">Орієнтація</string>
+    <string name="min_logging_distance">Мінімальна відстань реєстрації</string>
+    <string name="min_logging_distance_descr">Фільтр: мінімальна відстань для реєстрації нової точки</string>
+    <string name="min_logging_accuracy">Мінімальна точність реєстрації</string>
+    <string name="min_logging_accuracy_descr">Фільтр: реєстрація не проводиться, якщо не досягнуто точності</string>
+    <string name="min_logging_speed">Мінімальна швидкість реєстрації</string>
+    <string name="min_logging_speed_descr">Фільтр: не реєструвати, якщо швидкість меньша за обрану</string>
 </resources>

OsmAnd-telegram/src/net/osmand/telegram/ui/UserGpxInfoFragment.kt

@@ -156,14 +156,12 @@ class UserGpxInfoFragment : BaseDialogFragment() {
 		updateDateAndTimeButton()
 
 		liveBtn = mainView.findViewById<TextView>(R.id.live_btn).apply {
-			if (userId != telegramHelper.getCurrentUserId()) {
-				setOnClickListener {
-					val enabled = !liveTrackEnabled()
-					settings.updateLiveTrack(userId, chatId, deviceName, enabled)
-					updateLiveTrackBtn()
-					if (enabled) {
-						startHandler()
-					}
+			setOnClickListener {
+				val enabled = !liveTrackEnabled()
+				settings.updateLiveTrack(userId, chatId, deviceName, enabled)
+				updateLiveTrackBtn()
+				if (enabled) {
+					startHandler()
 				}
 			}
 		}
@@ -510,4 +508,4 @@ class UserGpxInfoFragment : BaseDialogFragment() {
 			}
 		}
 	}
-}
+}

OsmAnd/build.gradle

@@ -396,6 +396,7 @@ dependencies {
 	implementation 'org.immutables:gson:2.5.0'
 	implementation 'com.vividsolutions:jts-core:1.14.0'
 	implementation 'com.google.openlocationcode:openlocationcode:1.0.4'
+	implementation 'com.android.billingclient:billing:2.0.3'
 	// turn off for now
 	//implementation 'com.atilika.kuromoji:kuromoji-ipadic:0.9.0'
 	implementation 'com.squareup.picasso:picasso:2.71828'

OsmAnd/res/layout/purchase_dialog_card_button_active_ex.xml

@@ -6,52 +6,51 @@
 	android:layout_height="wrap_content"
 	android:layout_marginLeft="1dp"
 	android:layout_marginRight="1dp"
-	android:background="?attr/subscription_active_bg_color"
 	android:orientation="vertical">
 
-	<View
-		android:id="@+id/div_top"
-		android:layout_width="match_parent"
-		android:layout_height="1dp"
-		android:background="?attr/subscription_active_div_color"
-		android:visibility="gone" />
-
 	<LinearLayout
 		android:id="@+id/button_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:background="?attr/selectableItemBackground"
 		android:baselineAligned="false"
-		android:minHeight="@dimen/dialog_button_ex_height"
-		android:orientation="horizontal"
+		android:orientation="vertical"
 		android:paddingLeft="@dimen/card_padding"
 		android:paddingRight="@dimen/card_padding">
 
 		<LinearLayout
-			android:layout_width="0dp"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center"
 			android:layout_marginTop="@dimen/list_header_padding"
-			android:layout_marginEnd="@dimen/list_content_padding"
-			android:layout_marginRight="@dimen/list_content_padding"
 			android:layout_marginBottom="@dimen/list_header_padding"
-			android:layout_weight="1"
-			android:orientation="vertical">
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/title"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:gravity="center"
-				android:textColor="?attr/dialog_title_color"
-				android:textSize="@dimen/default_list_text_size"
-				osmand:typeface="@string/font_roboto_regular"
-				tools:text="Pay monthly" />
+			android:orientation="horizontal">
 
 			<LinearLayout
-				android:layout_width="wrap_content"
+				android:layout_width="0dp"
 				android:layout_height="wrap_content"
-				android:orientation="horizontal">
+				android:layout_weight="1"
+				android:orientation="vertical">
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/title"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:gravity="center"
+					android:textColor="?attr/dialog_title_color"
+					android:textSize="@dimen/default_list_text_size"
+					osmand:typeface="@string/font_roboto_regular"
+					tools:text="Pay monthly" />
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/description_contribute"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:text="@string/osm_live_payment_contribute_descr"
+					android:textColor="?attr/card_description_text_color"
+					android:textSize="@dimen/default_desc_text_size"
+					android:visibility="gone"
+					osmand:typeface="@string/font_roboto_regular"
+					tools:visibility="visible" />
 
 				<net.osmand.plus.widgets.TextViewEx
 					android:id="@+id/description"
@@ -64,11 +63,20 @@
 
 			</LinearLayout>
 
+			<android.support.v7.widget.AppCompatImageView
+				android:id="@+id/right_image"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:layout_marginStart="@dimen/list_header_padding"
+				android:layout_marginLeft="@dimen/list_header_padding"
+				android:src="@drawable/img_feature_purchased" />
+
 		</LinearLayout>
 
 		<LinearLayout
 			android:id="@+id/button_view"
-			android:layout_width="wrap_content"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center"
 			android:background="?attr/wikivoyage_secondary_btn_bg">
@@ -76,7 +84,7 @@
 			<LinearLayout
 				android:id="@+id/button"
 				android:layout_width="match_parent"
-				android:layout_height="@dimen/dialog_button_height"
+				android:layout_height="wrap_content"
 				android:gravity="center"
 				android:orientation="horizontal"
 				android:padding="@dimen/list_header_padding">
@@ -100,7 +108,7 @@
 
 		<LinearLayout
 			android:id="@+id/button_cancel_view"
-			android:layout_width="wrap_content"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center"
 			android:background="?attr/wikivoyage_primary_btn_bg">
@@ -108,7 +116,8 @@
 			<LinearLayout
 				android:id="@+id/button_cancel"
 				android:layout_width="match_parent"
-				android:layout_height="@dimen/dialog_button_height"
+				android:layout_height="wrap_content"
+				android:background="?attr/selectableItemBackground"
 				android:gravity="center"
 				android:orientation="horizontal"
 				android:padding="@dimen/list_header_padding">
@@ -121,7 +130,7 @@
 					android:letterSpacing="@dimen/text_button_letter_spacing"
 					android:maxWidth="@dimen/dialog_button_ex_max_width"
 					android:minWidth="@dimen/dialog_button_ex_min_width"
-					android:text="@string/shared_string_cancel"
+					android:text="@string/cancel_subscription"
 					android:textColor="@color/color_white"
 					android:textSize="@dimen/text_button_text_size"
 					osmand:typeface="@string/font_roboto_medium" />
@@ -136,16 +145,8 @@
 		android:id="@+id/div"
 		android:layout_width="match_parent"
 		android:layout_height="1dp"
-		android:layout_marginLeft="@dimen/card_padding"
-		android:layout_marginRight="@dimen/card_padding"
-		android:background="?attr/subscription_active_div_color"
-		android:visibility="gone" />
-
-	<View
-		android:id="@+id/div_bottom"
-		android:layout_width="match_parent"
-		android:layout_height="1dp"
-		android:background="?attr/subscription_active_div_color"
+		android:layout_marginTop="@dimen/content_padding_small"
+		android:background="?attr/wikivoyage_card_divider_color"
 		android:visibility="gone" />
 
 </LinearLayout>

OsmAnd/res/layout/purchase_dialog_card_button_ex.xml

@@ -12,82 +12,52 @@
 		android:id="@+id/button_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:background="?attr/selectableItemBackground"
 		android:baselineAligned="false"
-		android:minHeight="@dimen/dialog_button_ex_height"
-		android:orientation="horizontal"
+		android:orientation="vertical"
 		android:paddingLeft="@dimen/card_padding"
 		android:paddingRight="@dimen/card_padding">
 
 		<LinearLayout
-			android:layout_width="0dp"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center"
 			android:layout_marginTop="@dimen/list_header_padding"
-			android:layout_marginEnd="@dimen/list_content_padding"
-			android:layout_marginRight="@dimen/list_content_padding"
 			android:layout_marginBottom="@dimen/list_header_padding"
-			android:layout_weight="1"
 			android:orientation="vertical">
 
 			<net.osmand.plus.widgets.TextViewEx
 				android:id="@+id/title"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:gravity="center"
 				android:textColor="?attr/dialog_title_color"
 				android:textSize="@dimen/default_list_text_size"
 				osmand:typeface="@string/font_roboto_regular"
 				tools:text="Pay monthly" />
 
-			<LinearLayout
-				android:layout_width="wrap_content"
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/description_contribute"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:orientation="horizontal">
+				android:text="@string/osm_live_payment_contribute_descr"
+				android:textColor="?attr/card_description_text_color"
+				android:textSize="@dimen/default_desc_text_size"
+				android:visibility="gone"
+				osmand:typeface="@string/font_roboto_regular"
+				tools:visibility="visible" />
 
-				<net.osmand.plus.widgets.TextViewEx
-					android:id="@+id/description"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_weight="1"
-					android:textColor="?attr/card_description_text_color"
-					android:textSize="@dimen/default_desc_text_size"
-					osmand:typeface="@string/font_roboto_regular"
-					tools:text="Monthly payment" />
-
-				<net.osmand.plus.widgets.TextViewEx
-					android:id="@+id/discount_banner_regular"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_gravity="bottom"
-					android:layout_marginStart="@dimen/list_item_button_padding"
-					android:layout_marginLeft="@dimen/list_item_button_padding"
-					android:background="?attr/text_rounded_bg_regular"
-					android:textColor="?attr/card_description_text_color"
-					android:textSize="@dimen/default_desc_text_size"
-					osmand:typeface="@string/font_roboto_regular"
-					tools:text=" Save 20%! " />
-
-				<net.osmand.plus.widgets.TextViewEx
-					android:id="@+id/discount_banner_active"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_gravity="bottom"
-					android:layout_marginStart="@dimen/list_item_button_padding"
-					android:layout_marginLeft="@dimen/list_item_button_padding"
-					android:background="?attr/text_rounded_bg_active"
-					android:textColor="@color/osmand_orange"
-					android:textSize="@dimen/default_desc_text_size"
-					osmand:typeface="@string/font_roboto_regular"
-					tools:text=" Save 20%! " />
-
-			</LinearLayout>
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/description"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:textColor="?attr/card_description_text_color"
+				android:textSize="@dimen/default_desc_text_size"
+				osmand:typeface="@string/font_roboto_regular"
+				tools:text="$0.62 / month • Save 68%" />
 
 		</LinearLayout>
 
 		<LinearLayout
 			android:id="@+id/button_view"
-			android:layout_width="wrap_content"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center"
 			android:background="?attr/btn_round_border_2">
@@ -95,7 +65,7 @@
 			<LinearLayout
 				android:id="@+id/button"
 				android:layout_width="match_parent"
-				android:layout_height="@dimen/dialog_button_height"
+				android:layout_height="wrap_content"
 				android:background="?attr/selectableItemBackground"
 				android:gravity="center"
 				android:orientation="horizontal"
@@ -119,7 +89,7 @@
 					android:textColor="?attr/color_dialog_buttons"
 					android:textSize="@dimen/text_button_text_size"
 					osmand:typeface="@string/font_roboto_medium"
-					tools:text="7,99€" />
+					tools:text="7,99€ / year" />
 
 			</LinearLayout>
 
@@ -127,7 +97,7 @@
 
 		<LinearLayout
 			android:id="@+id/button_ex_view"
-			android:layout_width="wrap_content"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center"
 			android:background="?attr/wikivoyage_primary_btn_bg">
@@ -135,7 +105,7 @@
 			<LinearLayout
 				android:id="@+id/button_ex"
 				android:layout_width="match_parent"
-				android:layout_height="@dimen/dialog_button_height"
+				android:layout_height="wrap_content"
 				android:background="?attr/selectableItemBackground"
 				android:gravity="center"
 				android:orientation="horizontal"
@@ -152,7 +122,7 @@
 					android:textColor="@color/color_white"
 					android:textSize="@dimen/text_button_text_size"
 					osmand:typeface="@string/font_roboto_medium"
-					tools:text="7,99€" />
+					tools:text="$3.99 for six month\nthan $7.49 / year" />
 
 			</LinearLayout>
 
@@ -164,8 +134,7 @@
 		android:id="@+id/div"
 		android:layout_width="match_parent"
 		android:layout_height="1dp"
-		android:layout_marginLeft="@dimen/card_padding"
-		android:layout_marginRight="@dimen/card_padding"
+		android:layout_marginTop="@dimen/content_padding_small"
 		android:background="?attr/wikivoyage_card_divider_color"
 		android:visibility="gone" />
 

OsmAnd/res/layout/purchase_dialog_osm_live_card.xml

@@ -64,6 +64,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginBottom="2dp"
+		android:paddingBottom="@dimen/content_padding_small"
 		android:orientation="vertical"
 		android:visibility="gone" />
 

OsmAnd/res/values-ca/phrases.xml

@@ -2877,4 +2877,5 @@
     <string name="poi_rtsa_scale_filter">Categoria de dificultat</string>
     <string name="poi_bulk_purchase">Venda a granel</string>
     <string name="poi_denotation">Denotació</string>
+    <string name="reddit">Reddit</string>
 </resources>

OsmAnd/res/values-ca/strings.xml

@@ -2920,7 +2920,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="shared_string_capacity">Capacitat</string>
     <string name="shared_string_width">Amplada</string>
     <string name="shared_string_height">Alçada</string>
-    <string name="routeInfo_roadClass_name">Classe</string>
+    <string name="routeInfo_roadClass_name">Tipus de via</string>
     <string name="routeInfo_surface_name">Superfície</string>
     <string name="routeInfo_smoothness_name">Uniformitat</string>
     <string name="routeInfo_steepness_name">Pendent</string>
@@ -2934,7 +2934,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="tracks_on_map">Traces visualitzades</string>
     <string name="time_of_day">Hora del dia</string>
     <string name="by_transport_type">Per %1$s</string>
-    <string name="step_by_step">Pas a pas</string>
+    <string name="step_by_step">Totes les cruïlles</string>
     <string name="routeInfo_road_types_name">Tipus de carretera</string>
     <string name="exit_at">Sortida a</string>
     <string name="quick_action_show_hide_gpx_tracks">"Mostra/amaga traces GPX "</string>
@@ -3232,4 +3232,6 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="rendering_attr_showLez_name">Mostra les zones de baixes emissions</string>
     <string name="temporary_conditional_routing">Considereu les limitacions temporals</string>
     <string name="shared_string_default">Per defecte</string>
+    <string name="lang_oc">Occità</string>
+    <string name="app_mode_pickup_truck">Camioneta descoberta</string>
 </resources>

OsmAnd/res/values-da/phrases.xml

@@ -470,7 +470,7 @@
     <string name="poi_car_rental">Biludlejning</string>
     <string name="poi_car_sharing">Delebil</string>
     <string name="poi_boat_sharing">Delebåd</string>
-    <string name="poi_toilets">Toilet</string>
+    <string name="poi_toilets">Toiletetter</string>
     <string name="poi_sauna">Sauna</string>
     <string name="poi_brothel">Bordel</string>
     <string name="poi_mortuary">Ligkapel</string>
@@ -1211,7 +1211,7 @@
     <string name="poi_covered_yes">Ja</string>
     <string name="poi_covered_no">Ikke overdækket</string>
     <string name="poi_smoking_no">Ikke tilladt</string>
-    <string name="poi_smoking_outside">Kun tilladt udendørs</string>
+    <string name="poi_smoking_outside">Kun udendørs</string>
     <string name="poi_smoking_yes">Tilladt</string>
     <string name="poi_smoking_separated">I et adskilt lokale</string>
     <string name="poi_smoking_isolated">I et isoleret rum</string>
@@ -3555,7 +3555,7 @@
     <string name="poi_childcare">Børnepasning</string>
     <string name="poi_denotation_natural_monument">Naturmonument</string>
     <string name="poi_denotation_landmark">Vartegn</string>
-    <string name="poi_park_ride">Parker &amp; rejs</string>
+    <string name="poi_park_ride">Parkere &amp; kør videre system</string>
     <string name="poi_park_ride_yes">Ja</string>
     <string name="poi_park_ride_train">Tog</string>
     <string name="poi_park_ride_bus">Bus</string>
@@ -3583,13 +3583,13 @@
     <string name="poi_rtsa_scale_3a_asterisk">3А*</string>
     <string name="poi_rtsa_scale_3b">3Б</string>
     <string name="poi_rtsa_scale_3b_asterisk">3Б*</string>
-    <string name="poi_flare">Gasafbrænding;flaring</string>
+    <string name="poi_flare">Gas-afbrænding; fakkel stak</string>
     <string name="poi_change_delete">Slettet objekt</string>
     <string name="poi_health_specialty_radiotherapy_yes">Strålebehandling</string>
     <string name="poi_rescue_box">Redningsboks</string>
     <string name="poi_climbing_crag">Ja</string>
     <string name="reddit">Reddit</string>
-    <string name="poi_climbing_crag_filter">Klatring</string>
+    <string name="poi_climbing_crag_filter">Klatringskrog</string>
     <string name="poi_hazard_additional_erosion">Fare: erosion</string>
     <string name="poi_hazard_additional_rockfall">Fare: stenskred</string>
     <string name="poi_hazard_additional_nuclear">Fare: nuklear</string>
@@ -3610,6 +3610,119 @@
     <string name="poi_changing_table_fee_no">Puslebordsgebyr: nej</string>
     <string name="poi_charcoal_pile">Trækulsbunke</string>
     <string name="poi_historic_tank">Historisk kampvogn</string>
-    <string name="poi_hookah_lounge">Hookah lounge</string>
+    <string name="poi_hookah_lounge">Vandpibe bar</string>
     <string name="poi_source_biomass">Energikilde: biomasse</string>
+    <string name="poi_snowmobile_filter">Snescooter adgang</string>
+    <string name="poi_access_bus">Busadgang</string>
+    <string name="poi_access_caravan">Campingvogn adgang</string>
+    <string name="poi_access_motorhome">Autocamper adgang</string>
+    <string name="poi_access_trailer">Trailer adgang</string>
+    <string name="poi_access_motorcycle">Motorcykel adgang</string>
+    <string name="poi_access_moped">Knallert adgang</string>
+    <string name="poi_access_mofa">Mofa adgang</string>
+    <string name="poi_access_hgv">Lastbil adgang</string>
+    <string name="poi_access_goods">Lette lastbiler adgang</string>
+    <string name="poi_access_disabled">Handicappede adgang</string>
+    <string name="poi_taxi_office">Taxakontor</string>
+    <string name="poi_vehicle_yes">Adgang for køretøjer: ja</string>
+    <string name="poi_vehicle_private">Adgang for køretøjer: privat</string>
+    <string name="poi_vehicle_no">Adgang for køretøjer: nej</string>
+    <string name="poi_vehicle_destination">Adgang for køretøjer: destination</string>
+    <string name="poi_vehicle_permissive">Adgang for køretøjer: med tilladelse</string>
+    <string name="poi_vehicle_customers">Adgang for køretøjer: kunder</string>
+    <string name="poi_vehicle_military">Adgang for køretøjer: militær</string>
+    <string name="poi_vehicle_delivery">Adgang for køretøjer: levering</string>
+    <string name="poi_vehicle_forestry">Adgang for køretøjer: skovbrug</string>
+    <string name="poi_motorcar_yes">Adgang for biler:</string>
+    <string name="poi_motorcar_private">Adgang for biler: privat</string>
+    <string name="poi_motorcar_no">Adgang for biler: nej</string>
+    <string name="poi_motorcar_destination">Adgang for biler: destination</string>
+    <string name="poi_motorcar_permissive">Adgang for biler: med tilladelse</string>
+    <string name="poi_motorcar_customers">Adgang for biler: kunder</string>
+    <string name="poi_motorcar_forestry">Adgang for biler: skovbrug</string>
+    <string name="poi_motor_vehicle_yes">Adgang for køretøjer: ja</string>
+    <string name="poi_motor_vehicle_private">Adgang for køretøjer: privat</string>
+    <string name="poi_motor_vehicle_no">Adgang for køretøjer: ja</string>
+    <string name="poi_motor_vehicle_destination">Adgang for køretøjer: destination</string>
+    <string name="poi_motor_vehicle_permissive">Adgang for køretøjer: med tilladelse</string>
+    <string name="poi_motor_vehicle_customers">Adgang for køretøjer: kunder</string>
+    <string name="poi_motor_vehicle_military">Adgang for køretøjer: militær</string>
+    <string name="poi_motor_vehicle_delivery">Adgang for køretøjer: levering</string>
+    <string name="poi_motor_vehicle_forestry">Adgang for køretøjer: skovbrug</string>
+    <string name="poi_motor_vehicle_agricultural">Adgang for køretøjer: landbrug</string>
+    <string name="poi_hgv_private">Lastbil adgang: privat</string>
+    <string name="poi_hgv_no">Lastbil adgang: nej</string>
+    <string name="poi_hgv_agricultural">Lastbil adgang: landbrug</string>
+    <string name="poi_hgv_discouraged">Lastbil adgang: ikke anbefalet</string>
+    <string name="poi_hgv_unsuitable">Lastbil adgang: uegnet</string>
+    <string name="poi_goods_no">Adgang for lette godskøretøjer: nej</string>
+    <string name="poi_motorcycle_private">Adgang for motorcykler: privat</string>
+    <string name="poi_motorcycle_no">Adgang for motorcykler: nej</string>
+    <string name="poi_moped_no">Adgang for knallert: nej</string>
+    <string name="poi_mofa_no">Mofa adgang: nej</string>
+    <string name="poi_bicycle_private">Adgang for cykler: privat</string>
+    <string name="poi_bicycle_dismount">Adgang for cykler: træk</string>
+    <string name="poi_bicycle_destination">Adgang for cykler: destination</string>
+    <string name="poi_bicycle_permissive">Adgang for cykler: med tilladelse</string>
+    <string name="poi_bicycle_customers">Adgang for cykler: kunder</string>
+    <string name="poi_horse_private">Adgang for heste: privat</string>
+    <string name="poi_horse_destination">Adgang for heste: destination</string>
+    <string name="poi_horse_permissive">Adgang for heste: med tilladelse</string>
+    <string name="poi_horse_forestry">Adgang for heste: skovbrug</string>
+    <string name="poi_foot_yes">Adgang for fodgængere: ja</string>
+    <string name="poi_foot_private">Adgang for fodgængere: privat</string>
+    <string name="poi_foot_no">Adgang for fodgængere: nej</string>
+    <string name="poi_foot_destination">Adgang for fodgængere: destination</string>
+    <string name="poi_foot_permissive">Adgang for fodgængere: med tilladelse</string>
+    <string name="poi_foot_customers">Adgang for fodgængere: kunder</string>
+    <string name="poi_caravan_no">Adgang for campingvogn: nej</string>
+    <string name="poi_motorhome_no">Adgang for autocamper : nej</string>
+    <string name="poi_trailer_no">Adgang for trailer: nej</string>
+    <string name="poi_psv_yes">Offentlig service køretøj adgang: ja</string>
+    <string name="poi_psv_designated">Offentlig service køretøj adgang: udpeget</string>
+    <string name="poi_psv_no">Offentlig service køretøj adgang: nej</string>
+    <string name="poi_bus_no">Adgang for bus: nej</string>
+    <string name="poi_tourist_bus_yes">Adgang for turistbusser: ja</string>
+    <string name="poi_tourist_bus_designated">Adgang for turistbus: udpeget</string>
+    <string name="poi_tourist_bus_no">Adgang for turistbusser: nej</string>
+    <string name="poi_coach_yes">Adgang for langdistancebusser: ja</string>
+    <string name="poi_coach_no">Adgang for langdistancebusser: nej</string>
+    <string name="poi_ski_yes">Adgang for ski: ja</string>
+    <string name="poi_ski_no">Adgang for ski: nej</string>
+    <string name="poi_snowmobile_private">Adgang for snescooter: privat</string>
+    <string name="poi_snowmobile_no">Adgang for snescooter: nej</string>
+    <string name="poi_agricultural_yes">Adgang for landbrugskøretøjer: ja</string>
+    <string name="poi_agricultural_no">Adgang for landbrugskøretøjer: nej</string>
+    <string name="poi_taxi_yes">Adgang for taxa: ja</string>
+    <string name="poi_taxi_designated">Adgang for taxa: udpeget</string>
+    <string name="poi_taxi_no">Adgang for taxa: nej</string>
+    <string name="poi_disabled_no">Adgang for handicappede: nej</string>
+    <string name="poi_snowmobile_yes">Ja</string>
+    <string name="poi_snowmobile_designated">Udpeget</string>
+    <string name="poi_snowmobile_permissive">Med tilladelse</string>
+    <string name="poi_bus_yes">Ja</string>
+    <string name="poi_bus_designated">Udpeget</string>
+    <string name="poi_caravan_yes">Ja</string>
+    <string name="poi_caravan_designated">Udpeget</string>
+    <string name="poi_motorhome_yes">Ja</string>
+    <string name="poi_motorhome_designated">Udpeget</string>
+    <string name="poi_trailer_yes">Ja</string>
+    <string name="poi_trailer_designated">Udpeget</string>
+    <string name="poi_motorcycle_yes">Ja</string>
+    <string name="poi_motorcycle_permissive">Med tilladelse</string>
+    <string name="poi_motorcycle_destination">Destination</string>
+    <string name="poi_motorcycle_designated">Udpeget</string>
+    <string name="poi_moped_yes">Ja</string>
+    <string name="poi_moped_designated">Udpeget</string>
+    <string name="poi_mofa_yes">Ja</string>
+    <string name="poi_mofa_designated">Udpeget</string>
+    <string name="poi_hgv_yes">Ja</string>
+    <string name="poi_hgv_destination">Destination</string>
+    <string name="poi_hgv_permissive">Med tilladelse</string>
+    <string name="poi_hgv_designated">Udpeget</string>
+    <string name="poi_hgv_delivery">Levering</string>
+    <string name="poi_goods_yes">Ja</string>
+    <string name="poi_goods_designated">Udpeget</string>
+    <string name="poi_disabled_yes">Ja</string>
+    <string name="poi_disabled_designated">Udpeget</string>
 </resources>

OsmAnd/res/values-da/strings.xml

@@ -541,9 +541,9 @@ Proportional hukommelse %4$s MB (Android grænse %5$s MB, Dalvik %6$s MB).</stri
 \n\tFor at anvende aktiver \'Menu\' → \'Konfigurer kort\' → \'Vælg kortkilde…\' → \'Offline vektor-kort\'.</string>
     <string name="choose_audio_stream">Lydkanal for talevejledning</string>
     <string name="choose_audio_stream_descr">Vælg højttaler til at afspille talevejledning.</string>
-    <string name="voice_stream_voice_call">Telefonopkald lyd (afbryder også Bluetooth bilradio)</string>
+    <string name="voice_stream_voice_call">Telefonopkaldslyd (til at afbryde Bluetooth bilradio)</string>
     <string name="voice_stream_notification">Meddelelselyd</string>
-    <string name="voice_stream_music">Medie-/musiklyd</string>
+    <string name="voice_stream_music">Medie-/navigationslyd</string>
     <string name="warning_tile_layer_not_downloadable">Kan ikke hente kortlaget %1$s, at geninstallere kan hjælpe.</string>
     <string name="overlay_transparency_descr">Ændr gennemsigtigheden for overlejring.</string>
     <string name="overlay_transparency">Overlejrings-gennemsigtighed</string>
@@ -1243,7 +1243,7 @@ Proportional hukommelse %4$s MB (Android grænse %5$s MB, Dalvik %6$s MB).</stri
     <string name="keep_navigation_service">Hold</string>
     <string name="lang_al">Albansk</string>
     <string name="lang_ar">Arabisk</string>
-    <string name="lang_sr">Serbisk</string>
+    <string name="lang_sr">Serbisk (kyrillisk)</string>
     <string name="lang_zh_cn">Kinesisk (forenklet)</string>
     <string name="lang_zh_tw">Kinesisk (traditionelt)</string>
     <string name="lang_sc">Sardisk</string>
@@ -2106,7 +2106,7 @@ Proportional hukommelse %4$s MB (Android grænse %5$s MB, Dalvik %6$s MB).</stri
     <string name="legacy_search">Legacy søgning</string>
     <string name="show_legacy_search">Vis legacy søgning</string>
     <string name="show_legacy_search_desc">Tilføj legacy søgning til sidemenuen.</string>
-    <string name="lang_sr_latn">Serbisk (Latin)</string>
+    <string name="lang_sr_latn">Serbisk (latinsk)</string>
     <string name="lang_zh_hk">Kinesisk (Hong Kong)</string>
     <string name="rendering_attr_hideWaterPolygons_description">Vand</string>
     <string name="rendering_attr_contourWidth_description">Bredde på højdekurver</string>
@@ -2907,7 +2907,7 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="voice_announcements">Stemmemeddelelser</string>
     <string name="arrive_at_time">Ankommer %1$s</string>
     <string name="quick_action_switch_day_night_descr">Tryk på handlingsknappen skifter mellem dag- og nattilstand</string>
-    <string name="routeInfo_roadClass_name">Klasse</string>
+    <string name="routeInfo_roadClass_name">Vejtype</string>
     <string name="routeInfo_surface_name">Overflade</string>
     <string name="routeInfo_smoothness_name">Jævnhed</string>
     <string name="routeInfo_steepness_name">Stejlhed</string>
@@ -2921,7 +2921,7 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="work_button">Arbejde</string>
     <string name="time_of_day">Tidspunkt på dagen</string>
     <string name="by_transport_type">Med %1$s</string>
-    <string name="step_by_step">Trin for trin</string>
+    <string name="step_by_step">Sving-for-sving</string>
     <string name="routeInfo_road_types_name">Vejtyper</string>
     <string name="exit_at">Stå af ved</string>
     <string name="sit_on_the_stop">Stig på ved stoppested</string>
@@ -3097,7 +3097,7 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="profile_alert_delete_title">Slet profil</string>
     <string name="profile_alert_delete_msg">Slet profilen %s\?</string>
     <string name="select_base_profile_dialog_title">Vælg en basisprofil</string>
-    <string name="select_base_profile_dialog_message">Brugerdefineret Programprofil skal være baseret på en af standardprofilerne. Valgte Profil definerer grundlæggende indstillinger: opsætning af moduler, enheder for hastighed og afstand. I strengen nedenunder Profilnavn, kan ses, hvilke Navigationprofiler der er velegnet for hver Profil.</string>
+    <string name="select_base_profile_dialog_message">Basér den brugerdefinerede profil på en af standardprofilerne, dette definerer den grundlæggende opsætning som standard synlighed for moduler og enheder for hastighed og distance. Dette er standardprofilerne, sammen med eksempler på brugerdefinerede profiler, de kan udvides til:</string>
     <string name="select_nav_profile_dialog_title">Vælg navigationstype</string>
     <string name="base_profile_descr_car">Bil, lastbil, motorcykel</string>
     <string name="base_profile_descr_bicycle">MTB, knallert, hest</string>
@@ -3155,7 +3155,7 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="last_launch_crashed">Den sidste start af OsmAnd mislykkedes. Hjælp med at forbedre OsmAnd ved at dele fejlmeddelelsen.</string>
     <string name="app_mode_ufo">UFO</string>
     <string name="release_3_4">"• Anvendelsesprofiler: opret en brugervalgt profil med en brugervalgt ikon og farve 
-\n 
+\n
 \n • Tilpas alle profilers standard- og min/max hastigheder 
 \n
 \n• Tilføjet et modul til de aktuelle koordinater 
@@ -3165,7 +3165,7 @@ Repræsenterer område: %1$s x %2$s</string>
 \n• Rettet logføring af baggrundsspor 
 \n
 \n• Forbedret hentning af kort  i baggrunden 
-\n 
+\n
 \n• Rettet Wikipedia sprogvalg 
 \n
 \n• Rettet kompasknappens opførsel under navigationen 
@@ -3173,7 +3173,7 @@ Repræsenterer område: %1$s x %2$s</string>
 \n• Andre fejlrettelser
 \n
 \n"</string>
-    <string name="app_mode_personal_transporter">Personlig transportør</string>
+    <string name="app_mode_personal_transporter">Person transport</string>
     <string name="app_mode_monowheel">Monowheel</string>
     <string name="app_mode_scooter">Scooter</string>
     <string name="precision_hdop_and_vdop">Horisontal nøjagtighed: %1s, lodret: %2s</string>
@@ -3186,8 +3186,8 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="edit_profile_nav_settings_subtitle">Vælg standardnavigationsindstillinger for profil</string>
     <string name="routing_attr_max_num_changes_description">Angiv det maksimale antal ændringer</string>
     <string name="routing_attr_max_num_changes_name">Antal ændringer</string>
-    <string name="turn_screen_on_router">Vågn op, når der skiftes retning</string>
-    <string name="turn_screen_on_time_descr">Indstil tiden, for hvornår skærmen vil tænde.</string>
+    <string name="turn_screen_on_router">Vågn op ved retningsændring</string>
+    <string name="turn_screen_on_time_descr">Indstil tid for hvornår skærmen tænder.</string>
     <string name="turn_screen_on_sensor">Brug nærhedssensor</string>
     <string name="turn_screen_on_sensor_descr">Vink med hånden over toppen af skærmen for at tænde for skærmen, under navigering.</string>
     <string name="rendering_attr_highway_class_track_grade1_name">Grad 1</string>
@@ -3221,4 +3221,9 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="rendering_attr_showLez_name">Vis Miljøzoner</string>
     <string name="temporary_conditional_routing">Overvej midlertidige begrænsninger</string>
     <string name="shared_string_default">Standard</string>
+    <string name="new_route_calculated_dist_dbg">Rute: afstand %s, rute tid %s 
+\nBeregning: %.1f s., %d veje, %d fortove</string>
+    <string name="lang_oc">Occitansk</string>
+    <string name="app_mode_wagon">Vogn</string>
+    <string name="app_mode_pickup_truck">Pickup</string>
 </resources>

OsmAnd/res/values-de/phrases.xml

@@ -509,7 +509,7 @@
     <string name="poi_studio">Studio</string>
     <string name="poi_suburb">Stadtteil</string>
     <string name="poi_subway_entrance">U-Bahnhofeingang</string>
-    <string name="poi_subway_station">Ja</string>
+    <string name="poi_subway_station">ja</string>
     <string name="poi_craft_sun_protection">Sonnenschutz</string>
     <string name="poi_supermarket">Supermarkt</string>
     <string name="poi_surveillance">Überwachung</string>
@@ -694,7 +694,7 @@
     <string name="poi_apartment">Apartment</string>
     <string name="poi_internet_access_wlan">Internetzugang: WLAN</string>
     <string name="poi_internet_access_wired">Internetzugang: kabelgebunden</string>
-    <string name="poi_internet_access_public">Internetzugang: Öffentlich</string>
+    <string name="poi_internet_access_public">Internetzugang: öffentlich</string>
     <string name="poi_picnic_table">Picknicktisch</string>
     <string name="poi_wine_cellar">Weinkeller</string>
     <string name="poi_piste">Piste</string>
@@ -735,7 +735,7 @@
     <string name="poi_wiki_lang_vi">Vietnamesisches Wiki</string>
     <string name="poi_internet_access_terminal">Internetzugang: Terminal</string>
     <string name="poi_internet_access_service">Internetzugang: Dienst</string>
-    <string name="poi_fee_yes">Ja</string>
+    <string name="poi_fee_yes">ja</string>
     <string name="poi_brand">Marke</string>
     <string name="poi_maxweight">Höchstgewicht</string>
     <string name="poi_operator">Betreiber</string>
@@ -929,15 +929,15 @@
     <string name="poi_recycling_car_batteries">Autobatterien</string>
     <string name="poi_recycling_cars">Autos</string>
     <string name="poi_recycling_bicycles">Fahrräder</string>
-    <string name="poi_capital">Ja</string>
+    <string name="poi_capital">ja</string>
     <string name="poi_shower">Dusche</string>
     <string name="poi_email">E-Mail</string>
     <string name="poi_fax">Fax</string>
     <string name="facebook">"Facebook "</string>
     <string name="poi_mobile">Handy</string>
-    <string name="poi_fee_no">Nein</string>
-    <string name="poi_drinking_water_yes">Ja</string>
-    <string name="poi_drinking_water_no">Nein</string>
+    <string name="poi_fee_no">nein</string>
+    <string name="poi_drinking_water_yes">ja</string>
+    <string name="poi_drinking_water_no">nein</string>
     <string name="poi_supervised_yes">Beaufsichtigt</string>
     <string name="poi_supervised_no">Ohne Aufsicht</string>
     <string name="poi_crossing_traffic_signals">Mit Ampeln</string>
@@ -963,8 +963,8 @@
     <string name="poi_recycling_plasterboard">Gipskartonplatte</string>
     <string name="poi_recycling_animal_waste">Tierischer Abfall</string>
     <string name="poi_monitoring_station">Überwachungsstation</string>
-    <string name="poi_seasonal_yes">Ja</string>
-    <string name="poi_seasonal_no">Nein</string>
+    <string name="poi_seasonal_yes">ja</string>
+    <string name="poi_seasonal_no">nein</string>
     <string name="poi_seasonal_dry_season">Trockenzeit</string>
     <string name="poi_seasonal_wet_season">Regenzeit</string>
     <string name="poi_recycling_container">Container</string>
@@ -974,9 +974,9 @@
     <string name="poi_seasonal_winter">Winter</string>
     <string name="poi_crossing_uncontrolled">Unkontrolliert</string>
     <string name="poi_crossing_unmarked">Unmarkiert</string>
-    <string name="poi_access_private">Privater Zugang</string>
+    <string name="poi_access_private">Zugang Privat</string>
     <string name="poi_access_destination">Anlieger frei</string>
-    <string name="poi_access_permissive">Zutritt erlaubt</string>
+    <string name="poi_access_permissive">Zugang gestattet</string>
     <string name="poi_animal_shelter_dog">Hunde</string>
     <string name="poi_animal_shelter_cat">Katzen</string>
     <string name="poi_animal_shelter_dog_cat">Hunde, Katzen</string>
@@ -1028,8 +1028,8 @@
     <string name="poi_height">Höhe</string>
     <string name="poi_ele">Meereshöhe</string>
     <string name="poi_start_date">Anfangsdatum</string>
-    <string name="poi_wheelchair_yes">Ja</string>
-    <string name="poi_wheelchair_no">Nein</string>
+    <string name="poi_wheelchair_yes">ja</string>
+    <string name="poi_wheelchair_no">nein</string>
     <string name="poi_wheelchair_limited">Eingeschränkt</string>
     <string name="poi_wholesale">Großhandel</string>
     <string name="poi_content_silage">Inhalt: Silage</string>
@@ -1052,7 +1052,7 @@
     <string name="poi_nudism_no">Verboten</string>
     <string name="poi_nudism_obligatory">Verbindlich</string>
     <string name="poi_nudism_customary">Üblich</string>
-    <string name="poi_nudism_permissive">Freizügig</string>
+    <string name="poi_nudism_permissive">gestattet</string>
     <string name="poi_trade_building_supplies">Baubedarf</string>
     <string name="poi_trade_plumbing">Klempnerbedarf</string>
     <string name="poi_trade_wood">Holzhandel</string>
@@ -1119,10 +1119,10 @@
     <string name="poi_beach_sand">Sand</string>
     <string name="poi_beach_rocky">Fels</string>
     <string name="poi_cypress">Zypresse</string>
-    <string name="poi_bench_yes">Ja</string>
+    <string name="poi_bench_yes">ja</string>
     <string name="poi_bench_no">ohne Sitzbank</string>
     <string name="poi_bin_yes">Mit Abfalleimer</string>
-    <string name="poi_bin_no">Ohne Abfalleimer</string>
+    <string name="poi_bin_no">ohne Abfalleimer</string>
     <string name="poi_internet_access_type_wlan">WLAN</string>
     <string name="poi_internet_access_type_terminal">Arbeitsplatz</string>
     <string name="poi_internet_access_type_wired">kabelgebunden</string>
@@ -1180,7 +1180,7 @@
     <string name="poi_shoes_orthopedic">Orthopädisch</string>
     <string name="poi_openfire_yes">Offenes Feuer erlaubt</string>
     <string name="poi_openfire_no">Offenes Feuer verboten</string>
-    <string name="poi_washing_machine_yes">Ja</string>
+    <string name="poi_washing_machine_yes">ja</string>
     <string name="poi_washing_machine_no">Waschmaschine: nein</string>
     <string name="poi_shower_yes">Dusche: ja</string>
     <string name="poi_shower_no">Dusche: nein</string>
@@ -1188,9 +1188,9 @@
     <string name="poi_shower_outdoor">Dusche: im Freien</string>
     <string name="poi_shower_cold">Dusche: kalt</string>
     <string name="poi_shower_indoor">Dusche: drinnen</string>
-    <string name="poi_caravans_yes">Ja</string>
+    <string name="poi_caravans_yes">ja</string>
     <string name="poi_caravans_no">Wohnwagen: nein</string>
-    <string name="poi_power_supply_yes">Ja</string>
+    <string name="poi_power_supply_yes">ja</string>
     <string name="poi_power_supply_no">Stromanschluss: nein</string>
     <string name="poi_power_supply_cee_17_blue">Sockel: CEE 17 blau</string>
     <string name="poi_power_supply_cee_7_4">Sockel: CEE 7/4</string>
@@ -1231,7 +1231,7 @@
     <string name="poi_ramp_bicycle_yes">Fahrradrampe: ja</string>
     <string name="poi_ramp_bicycle_no">Fahrradrampe: nein</string>
     <string name="poi_step_count">Anzahl Stufen</string>
-    <string name="poi_defibrillator">Defibrillator</string>
+    <string name="poi_defibrillator">Defibrillator (AED)</string>
     <string name="poi_defibrillator_yes">Defibrillator: ja</string>
     <string name="poi_horse_yes">Pferde erlaubt</string>
     <string name="poi_horse_no">Pferde nicht erlaubt</string>
@@ -1306,7 +1306,7 @@
     <string name="poi_alt_name">Alternative Bezeichnung</string>
     <string name="poi_pump_manual">Manuell</string>
     <string name="poi_pump_no">Keine Pumpe</string>
-    <string name="poi_pump_yes">Ja</string>
+    <string name="poi_pump_yes">ja</string>
     <string name="poi_information_board">Tafel</string>
     <string name="poi_information_map">Karte</string>
     <string name="poi_information_office">Büro</string>
@@ -1324,16 +1324,16 @@
     <string name="poi_board_type_technology">Technologie</string>
     <string name="poi_board_type_astronomy">Astronomie</string>
     <string name="poi_commercial">Gewerbegebiet</string>
-    <string name="poi_fireplace_yes">Ja</string>
+    <string name="poi_fireplace_yes">ja</string>
     <string name="poi_fireplace_no">Keine Feuerstelle</string>
-    <string name="poi_covered_yes">Ja</string>
-    <string name="poi_covered_no">nicht überdacht</string>
+    <string name="poi_covered_yes">ja</string>
+    <string name="poi_covered_no">Nicht überdacht</string>
     <string name="poi_smoking_no">Nicht erlaubt</string>
     <string name="poi_smoking_outside">nur Außerhalb</string>
     <string name="poi_smoking_yes">Erlaubt</string>
     <string name="poi_smoking_separated">In einem separaten Raum</string>
-    <string name="poi_traffic_signals_sound_yes">Ja</string>
-    <string name="poi_traffic_signals_sound_no">Nein</string>
+    <string name="poi_traffic_signals_sound_yes">ja</string>
+    <string name="poi_traffic_signals_sound_no">nein</string>
     <string name="poi_rescue_station">Rettungsstation</string>
     <string name="poi_mini_roundabout">Mini-Kreisverkehr</string>
     <string name="poi_railway_crossing">Bahnübergang</string>
@@ -1361,7 +1361,7 @@
     <string name="poi_garden_style_english">Gartenstil: Englisch</string>
     <string name="poi_garden_style_japanese">Gartenstil: Japanisch</string>
     <string name="poi_capacity">Kapazität</string>
-    <string name="poi_capacity_disabled_yes">Ja</string>
+    <string name="poi_capacity_disabled_yes">ja</string>
     <string name="poi_capacity_disabled_no">keine Behindertenplätze</string>
     <string name="poi_capacity_disabled">Behindertenplätze</string>
     <string name="poi_capacity_women_yes">Frauenplätze</string>
@@ -1377,7 +1377,7 @@
     <string name="poi_aerialway_duration">durchschnittliche Fahrzeit, Minuten</string>
     <string name="poi_aerialway_bubble_yes">mit Überdachung</string>
     <string name="poi_aerialway_bubble_no">Ohne Überdachung</string>
-    <string name="poi_aerialway_heating_yes">Ja</string>
+    <string name="poi_aerialway_heating_yes">ja</string>
     <string name="poi_aerialway_heating_no">keine Heizung</string>
     <string name="poi_aerialway_bicycle_yes">Erlaubt</string>
     <string name="poi_aerialway_bicycle_no">Fahrrad: nicht erlaubt</string>
@@ -1387,7 +1387,7 @@
     <string name="poi_aerialway_access_both">Eingang und Ausgang</string>
     <string name="poi_aerialway_summer_access_entry">Sommereingang</string>
     <string name="poi_aerialway_summer_access_exit">Sommerausgang</string>
-    <string name="poi_aerialway_summer_access_both">Sommerein- und ausgang</string>
+    <string name="poi_aerialway_summer_access_both">Sommer Ein- und Ausgang</string>
     <string name="poi_stars_1">1 (Tourist)</string>
     <string name="poi_stars_1s">1S (gehobener Tourist)</string>
     <string name="poi_stars_2">2 (Standard)</string>
@@ -1430,12 +1430,12 @@
     <string name="poi_payment_diners_club_no">Diners Club Karte nicht akzeptiert</string>
     <string name="poi_payment_dkv_yes">DKV</string>
     <string name="poi_payment_dkv_no">DKV nicht akzeptiert</string>
-    <string name="poi_drive_in_yes">Ja</string>
+    <string name="poi_drive_in_yes">ja</string>
     <string name="poi_drive_in_no">Drive-in: nein</string>
-    <string name="poi_drive_through_yes">Ja</string>
+    <string name="poi_drive_through_yes">ja</string>
     <string name="poi_drive_through_no">Durchfahrt: nein</string>
     <string name="poi_brewery_additional">Brauereiname</string>
-    <string name="poi_microbrewery_yes">Ja</string>
+    <string name="poi_microbrewery_yes">ja</string>
     <string name="poi_microbrewery_no">Keine Minibrauerei</string>
     <string name="poi_takeaway_yes">Zum Mitnehmen</string>
     <string name="poi_takeaway_no">Nicht zum Mitnehmen</string>
@@ -1443,11 +1443,11 @@
     <string name="poi_delivery_yes">Lieferung</string>
     <string name="poi_delivery_no">Kein Lieferservice</string>
     <string name="poi_delivery_only">Nur Lieferung</string>
-    <string name="poi_cocktails_yes">Ja</string>
+    <string name="poi_cocktails_yes">ja</string>
     <string name="poi_service_dealer">Händler</string>
     <string name="poi_service_repair">Reparatur</string>
     <string name="poi_service_repair_no">Keine Reparatur</string>
-    <string name="poi_automated_yes">Ja</string>
+    <string name="poi_automated_yes">ja</string>
     <string name="poi_automated_no">Nicht automatisiert</string>
     <string name="poi_brushless_no">Bürstenlos: nein</string>
     <string name="poi_car_wash_no">Autowäsche: nein</string>
@@ -1455,7 +1455,7 @@
     <string name="poi_male_no">Für Männer verboten</string>
     <string name="poi_female_yes">Weiblich</string>
     <string name="poi_female_no">Für Frauen verboten</string>
-    <string name="poi_toilets_yes">Ja</string>
+    <string name="poi_toilets_yes">ja</string>
     <string name="poi_toilets_no">Keine Toiletten</string>
     <string name="poi_religion_bahai">Bahaitum</string>
     <string name="poi_religion_pagan">Heidentum</string>
@@ -1618,7 +1618,7 @@
     <string name="poi_toll_yes">Maut</string>
     <string name="poi_toll_no">keine Maut</string>
     <string name="poi_toll_hgv_yes">LKW Maut</string>
-    <string name="poi_tactile_paving_yes">Ja</string>
+    <string name="poi_tactile_paving_yes">ja</string>
     <string name="poi_tactile_paving_no">Ohne Blindenleitsystem</string>
     <string name="poi_traffic_signals_sound_walk">Nur wenn Gehen erlaubt ist</string>
     <string name="poi_services">Raststätte</string>
@@ -1635,7 +1635,7 @@
     <string name="poi_piste_grooming_backcountry">Tourenski</string>
     <string name="poi_piste_grooming_scooter">Schneemobil</string>
     <string name="poi_piste_grooming_skating">Skaten</string>
-    <string name="poi_piste_grooming_no">Nein</string>
+    <string name="poi_piste_grooming_no">nein</string>
     <string name="poi_piste_grooming_mogul">Buckel</string>
     <string name="poi_garden_type_residential">Gartentyp: Hausgarten</string>
     <string name="poi_garden_type_community">Gartentyp: Gemeinschaftsgarten</string>
@@ -1654,7 +1654,7 @@
     <string name="poi_payment_girocard_no">Girokarte nicht akzeptiert</string>
     <string name="poi_payment_discover_card_yes">Discover-Karte</string>
     <string name="poi_payment_discover_card_no">Discover Karte nicht akzeptiert</string>
-    <string name="poi_brushless_yes">Ja</string>
+    <string name="poi_brushless_yes">ja</string>
     <string name="poi_parish">Gemeindebüro</string>
     <string name="poi_payment_cheque_yes">Schecks</string>
     <string name="poi_payment_cheque_no">Schecks nicht akzeptiert</string>
@@ -1684,7 +1684,7 @@
     <string name="poi_payment_visa_electron_no">Visa Electron Karte nicht akzeptiert</string>
     <string name="poi_payment_litecoin_yes">Litecoin</string>
     <string name="poi_payment_litecoin_no">Litecoin nicht akzeptiert</string>
-    <string name="poi_payment_pikepass_designated">PIKEPASS (bestimmte)</string>
+    <string name="poi_payment_pikepass_designated">PIKEPASS (ausgewiesen)</string>
     <string name="poi_payment_laser_yes">Laser</string>
     <string name="poi_payment_laser_no">Laser Karten nicht akzeptiert</string>
     <string name="poi_payment_ep_quick_yes">Quick</string>
@@ -1694,7 +1694,7 @@
     <string name="poi_payment_kitcard_yes">KITCard</string>
     <string name="poi_payment_kitcard_no">KITCard nicht akzeptiert</string>
     <string name="poi_payment_v_pay_yes">V PAY</string>
-    <string name="poi_payment_v_pay_no">V PAYKIT Karte nicht akzeptiert</string>
+    <string name="poi_payment_v_pay_no">V PAY Karte nicht akzeptiert</string>
     <string name="poi_payment_dogecoin_yes">Dogecoin Ɖ</string>
     <string name="poi_payment_dogecoin_no">Dogecoin nicht akzeptiert</string>
     <string name="poi_payment_cibus_yes">Cibus</string>
@@ -1758,8 +1758,8 @@
     <string name="poi_payment_yandexmoney_yes">Yandex.Money</string>
     <string name="poi_payment_yandexmoney_no">Yandex.Money nicht akzeptiert</string>
     <string name="poi_description_payment">Zahlungsbeschreibung</string>
-    <string name="poi_internet_access_fee_yes">Internetzugang - kostenpflichtig</string>
-    <string name="poi_internet_access_fee_no">Internetzugang - kostenfrei</string>
+    <string name="poi_internet_access_fee_yes">Internetzugang: kostenpflichtig</string>
+    <string name="poi_internet_access_fee_no">Internetzugang: gratis</string>
     <string name="poi_events_venue">Veranstaltungsort</string>
     <string name="poi_diet_vegetarian_only">Nur vegetarisch</string>
     <string name="poi_diet_vegetarian_yes">Vegetarische</string>
@@ -1782,7 +1782,7 @@
     <string name="poi_diet_lactose_free_no">Laktosefrei: nein</string>
     <string name="poi_diet_pescetarian_yes">Pescetarismus</string>
     <string name="poi_outdoor_seating_yes">Sitzplätze im Freien: ja</string>
-    <string name="poi_outdoor_seating_no">keine Sitzgelegenheiten im Freien</string>
+    <string name="poi_outdoor_seating_no">Keine Sitzgelegenheiten im Freien</string>
     <string name="poi_outdoor_seating_terrace">Sitzplätze im Freien: Terrasse</string>
     <string name="poi_outdoor_seating_sidewalk">Sitzplätze im Freien: Bürgersteig</string>
     <string name="poi_outdoor_seating_pedestrian_zone">Sitzplätze im Freien: Fußgängerzone</string>
@@ -1794,7 +1794,7 @@
     <string name="poi_service_parts">Teile</string>
     <string name="poi_service_electrical">Reparatur von elektrischen Fahrzeugen</string>
     <string name="poi_motorcycle_repair">Motorradreparatur</string>
-    <string name="poi_self_service_yes">Ja</string>
+    <string name="poi_self_service_yes">ja</string>
     <string name="poi_self_service_no">keine Selbstbedienung</string>
     <string name="poi_full_service_yes">Rundumservice</string>
     <string name="poi_aeroway_fuel">Flugzeugtankstelle</string>
@@ -1804,7 +1804,7 @@
     <string name="poi_toilets_wheelchair_yes">Rollstuhlgerechte Toilette: ja</string>
     <string name="poi_toilets_wheelchair_no">Rollstuhlgerechte Toilette: nein</string>
     <string name="poi_toilets_access_customers">Toilettenzugang: Kunden</string>
-    <string name="poi_toilets_access_permissive">Toilettenzugang: geduldet</string>
+    <string name="poi_toilets_access_permissive">Toilettenzugang: gestattet</string>
     <string name="poi_toilets_access_community">Toilettenzugang: öffentlich</string>
     <string name="poi_toilets_access_public">Toilettenzugang: öffentlich</string>
     <string name="poi_diaper_yes">Wickeltisch</string>
@@ -2112,9 +2112,9 @@
     <string name="poi_solarium_yes">Solarium</string>
     <string name="poi_tents_yes">Erlaubt</string>
     <string name="poi_tents_no">Zelten nicht gestattet</string>
-    <string name="poi_backcountry_yes">Ja</string>
-    <string name="poi_backcountry_no">Nein</string>
-    <string name="poi_scout_yes">Ja</string>
+    <string name="poi_backcountry_yes">ja</string>
+    <string name="poi_backcountry_no">nein</string>
+    <string name="poi_scout_yes">ja</string>
     <string name="poi_scout_no">Pfadfinderlager: nein</string>
     <string name="poi_group_only_yes">Nur Gruppen: ja</string>
     <string name="poi_group_only_no">Nur Gruppen: nein</string>
@@ -2438,10 +2438,10 @@
     <string name="poi_nuclear_explosion_device">Explosion: Einheit</string>
     <string name="poi_religion">Religiöse Waren</string>
     <string name="poi_plant_nursery">Baumschule</string>
-    <string name="poi_compressed_air_yes">Ja</string>
+    <string name="poi_compressed_air_yes">ja</string>
     <string name="poi_compressed_air_no">Druckluft: nein</string>
-    <string name="poi_car_wash_yes">Ja</string>
-    <string name="poi_vacuum_cleaner_yes">Ja</string>
+    <string name="poi_car_wash_yes">ja</string>
+    <string name="poi_vacuum_cleaner_yes">ja</string>
     <string name="poi_vacuum_cleaner_no">Staubsauger: nein</string>
     <string name="poi_amenity_vacuum_cleaner">Staubsauger</string>
     <string name="poi_sport_free_flying">Freies Fliegen (Sport)</string>
@@ -2602,7 +2602,7 @@
     <string name="poi_counselling_no">Beratung: nein</string>
     <string name="poi_emergency_yes">Notaufnahme: ja</string>
     <string name="poi_emergency_no">Notaufnahme: nein</string>
-    <string name="poi_home_visit_yes">Ja</string>
+    <string name="poi_home_visit_yes">ja</string>
     <string name="poi_home_visit_no">Hausbesuch: nein</string>
     <string name="poi_disease_ebola_no">Ebola: nein</string>
     <string name="poi_disease_autism_no">Autismus: nein</string>
@@ -2643,7 +2643,7 @@
     <string name="poi_bicycle_parking_streetpod">Straßenunterstand</string>
     <string name="poi_salt_yes">Salz</string>
     <string name="poi_salt_no">Salz: nein</string>
-    <string name="poi_wheelchair_designated">Rollstuhlgerecht</string>
+    <string name="poi_wheelchair_designated">ausgewiesen</string>
     <string name="poi_spoil_heap">Abraumhalde</string>
     <string name="poi_summer_camp">Sommerlager</string>
     <string name="poi_recreation_center">Erholungszentrum</string>
@@ -2696,7 +2696,7 @@
     <string name="poi_crossing_supervision_no">Bahnübergangsüberwachung: keine</string>
     <string name="poi_crossing_supervision_attendant">Bahnübergangsüberwachung: Bediensteter</string>
     <string name="poi_crossing_supervision_camera">Bahnübergangsüberwachung: Kamera</string>
-    <string name="poi_dispensing_yes">Ja</string>
+    <string name="poi_dispensing_yes">ja</string>
     <string name="poi_dispensing_no">Nach Rezept: nein</string>
     <string name="poi_pumping_station">Pumpstation</string>
     <string name="poi_display_yes">Anzeige: ja</string>
@@ -2741,8 +2741,8 @@
     <string name="poi_aquaculture_fish">Aquakultur: Fisch</string>
     <string name="poi_aquaculture_mussels">Aquakultur: Muscheln</string>
     <string name="poi_mdf">Hauptverteiler</string>
-    <string name="poi_organic_yes">Ja</string>
-    <string name="poi_organic_no">Nein</string>
+    <string name="poi_organic_yes">ja</string>
+    <string name="poi_organic_no">nein</string>
     <string name="poi_organic_only">Ausschließlich</string>
     <string name="poi_diplomatic_consulate">Konsulat</string>
     <string name="poi_diplomatic_permanent_mission">Ständige Vertretung</string>
@@ -3018,16 +3018,16 @@
     <string name="poi_cuisine_yakitori">Yakitori</string>
     <string name="poi_cuisine_teriyaki">Teriyaki</string>
     <string name="poi_payment_transport_type">Zahlungsart (Transport)</string>
-    <string name="poi_outdoor_seating_filter_yes">Ja</string>
-    <string name="poi_delivery_filter_yes">Ja</string>
+    <string name="poi_outdoor_seating_filter_yes">ja</string>
+    <string name="poi_delivery_filter_yes">ja</string>
     <string name="poi_diet_vegetarian_filter_yes">Vegetarisch</string>
     <string name="poi_diet_vegan_filter_yes">Vegan</string>
     <string name="poi_diet_gluten_free_filter_yes">Glutenfrei</string>
     <string name="poi_diet_kosher_filter_yes">Koscher</string>
     <string name="poi_diet_halal_filter_yes">Halal</string>
     <string name="poi_diet_lactose_free_filter_yes">Laktosefrei</string>
-    <string name="poi_takeaway_filter_yes">Ja</string>
-    <string name="poi_shower_filter_yes">Ja</string>
+    <string name="poi_takeaway_filter_yes">ja</string>
+    <string name="poi_shower_filter_yes">ja</string>
     <string name="poi_social_facility_for">Zielgruppe</string>
     <string name="poi_compressed_air_filter">Druckluft</string>
     <string name="poi_vacuum_cleaner_filter">Staubsauger</string>
@@ -3075,7 +3075,7 @@
     <string name="poi_railway_yard">Güterbahnhof</string>
     <string name="poi_coworking_space">Coworking Space</string>
     <string name="poi_cafeteria">Cafeteria</string>
-    <string name="poi_fast_food_cafeteria">Ja</string>
+    <string name="poi_fast_food_cafeteria">ja</string>
     <string name="poi_drink_wine_yes">Wein: ja</string>
     <string name="poi_drink_wine_retail">Wein: Einzelhandel</string>
     <string name="poi_drink_wine_served">Wein: Ausschank</string>
@@ -3386,8 +3386,8 @@
     <string name="poi_climbing_quality_fragile">Felsqualität: brüchig</string>
     <string name="poi_climbing_bolted_yes">Fixpunkte: ja</string>
     <string name="poi_climbing_bolted_no">Fixpunkte: nein</string>
-    <string name="poi_climbing_summit_log_yes">Klettergipfelbuch: ja</string>
-    <string name="poi_climbing_summit_log_no">Klettergipfelbuch: nein</string>
+    <string name="poi_climbing_summit_log_yes">Gipfelbuch: ja</string>
+    <string name="poi_climbing_summit_log_no">Gipfelbuch: nein</string>
     <string name="poi_circumference">Umfang</string>
     <string name="poi_meadow_perpetual">Typ: dauernd</string>
     <string name="poi_meadow_pasture">Typ: Weide</string>
@@ -3519,7 +3519,7 @@
     <string name="poi_shoe_repair">Schuhreparatur</string>
     <string name="poi_bulk_purchase">Großeinkauf</string>
     <string name="poi_substation_type">Typ</string>
-    <string name="poi_bulk_purchase_yes">Ja</string>
+    <string name="poi_bulk_purchase_yes">ja</string>
     <string name="poi_bulk_purchase_only">Nur</string>
     <string name="poi_substation_transmission">Umspannwerk</string>
     <string name="poi_substation_distribution">Verteiler</string>
@@ -3553,7 +3553,7 @@
     <string name="poi_denotation_natural_monument">Naturdenkmal</string>
     <string name="poi_denotation_landmark">Orientierungspunkt</string>
     <string name="poi_park_ride">Park-and-ride</string>
-    <string name="poi_park_ride_yes">Ja</string>
+    <string name="poi_park_ride_yes">ja</string>
     <string name="poi_park_ride_train">Zug</string>
     <string name="poi_park_ride_bus">Bus</string>
     <string name="poi_park_ride_metro">U-Bahn</string>
@@ -3583,7 +3583,7 @@
     <string name="poi_health_specialty_radiotherapy_yes">Strahlentherapie</string>
     <string name="poi_climbing_crag_filter">Kletterfelsen</string>
     <string name="poi_rescue_box">Selbsthilfebox</string>
-    <string name="poi_climbing_crag">Ja</string>
+    <string name="poi_climbing_crag">ja</string>
     <string name="reddit">Reddit</string>
     <string name="poi_hazard_additional_erosion">Gefahr: Erosion</string>
     <string name="poi_hazard_additional_rockfall">Gefahr: Steinschlag</string>
@@ -3607,4 +3607,117 @@
     <string name="poi_historic_tank">Historischer Panzer</string>
     <string name="poi_hookah_lounge">Wasserpfeifen-Lounge</string>
     <string name="poi_source_biomass">Energiequelle: Biomasse</string>
+    <string name="poi_snowmobile_filter">Zufahrt Schneemobil</string>
+    <string name="poi_access_bus">Zufahrt Linienbus</string>
+    <string name="poi_access_caravan">Zufahrt Wohnwagen</string>
+    <string name="poi_access_motorhome">Zufahrt Wohnmobil</string>
+    <string name="poi_access_motorcycle">Zufahrt Motorrad</string>
+    <string name="poi_access_moped">Zufahrt Moped</string>
+    <string name="poi_access_mofa">Zufahrt Mofa</string>
+    <string name="poi_access_hgv">Zufahrt LKW</string>
+    <string name="poi_access_goods">Zufahrt leichter Lieferfahrzeuge</string>
+    <string name="poi_access_disabled">Zugang Behinderte</string>
+    <string name="poi_taxi_office">Taxibüro</string>
+    <string name="poi_vehicle_yes">Zufahrt Fahrzeuge: ja</string>
+    <string name="poi_vehicle_private">Zufahrt Fahrzeuge: privat</string>
+    <string name="poi_vehicle_no">Zufahrt Fahrzeuge: nein</string>
+    <string name="poi_vehicle_destination">Zufahrt Fahrzeuge: für Anlieger</string>
+    <string name="poi_vehicle_permissive">Zufahrt Fahrzeuge: gestattet</string>
+    <string name="poi_vehicle_customers">Zufahrt Fahrzeuge: Kunden</string>
+    <string name="poi_vehicle_military">Zufahrt Fahrzeuge: militärisch</string>
+    <string name="poi_vehicle_delivery">Zufahrt Fahrzeuge: Lieferung</string>
+    <string name="poi_vehicle_forestry">Zufahrt Fahrzeuge: Forstwirtschaft</string>
+    <string name="poi_motorcar_yes">Zufahrt PKW: ja</string>
+    <string name="poi_motorcar_private">Zufahrt PKW: privat</string>
+    <string name="poi_motorcar_no">Zufahrt PKW: nein</string>
+    <string name="poi_motorcar_destination">Zufahrt PKW: für Anlieger</string>
+    <string name="poi_motorcar_permissive">Zufahrt PKW: gestattet</string>
+    <string name="poi_motorcar_customers">Zufahrt PKW: Kunden</string>
+    <string name="poi_motorcar_forestry">Zufahrt PKW: Forstwirtschaft</string>
+    <string name="poi_motor_vehicle_yes">Zufahrt Kraftfahrzeuge: ja</string>
+    <string name="poi_motor_vehicle_private">Zufahrt Kraftfahrzeuge: privat</string>
+    <string name="poi_motor_vehicle_no">Zufahrt Kraftfahrzeuge: nein</string>
+    <string name="poi_motor_vehicle_destination">Zufahrt Kraftfahrzeuge: für Anlieger</string>
+    <string name="poi_motor_vehicle_permissive">Zufahrt Kraftfahrzeuge: gestattet</string>
+    <string name="poi_motor_vehicle_customers">Zufahrt Kraftfahrzeuge: Kunden</string>
+    <string name="poi_motor_vehicle_military">Zufahrt Kraftfahrzeuge: militärisch</string>
+    <string name="poi_motor_vehicle_delivery">Zufahrt Kraftfahrzeuge: Lieferung</string>
+    <string name="poi_motor_vehicle_forestry">Zufahrt Kraftfahrzeuge: Forstwirtschaft</string>
+    <string name="poi_motor_vehicle_agricultural">Zufahrt Kraftfahrzeuge: landwirtschaftlich</string>
+    <string name="poi_hgv_private">Zufahrt LKW: privat</string>
+    <string name="poi_hgv_no">Zufahrt LKW: nein</string>
+    <string name="poi_hgv_agricultural">Zufahrt LKW: landwirtschaftlich</string>
+    <string name="poi_hgv_discouraged">Zufahrt LKW: nicht empfohlen</string>
+    <string name="poi_hgv_unsuitable">Zufahrt LKW: ungeeignet</string>
+    <string name="poi_goods_no">Zufahrt leichter Lieferfahrzeuge: nein</string>
+    <string name="poi_motorcycle_private">Zufahrt Motorrad: privat</string>
+    <string name="poi_motorcycle_no">Zufahrt Motorrad: nein</string>
+    <string name="poi_moped_no">Zufahrt Moped: nein</string>
+    <string name="poi_mofa_no">Zufahrt Mofa: nein</string>
+    <string name="poi_bicycle_private">Zufahrt Fahrrad: privat</string>
+    <string name="poi_bicycle_dismount">Zufahrt Fahrrad: absteigen</string>
+    <string name="poi_bicycle_destination">Zufahrt Fahrrad: für Anlieger</string>
+    <string name="poi_bicycle_permissive">Zufahrt Fahrrad: gestattet</string>
+    <string name="poi_bicycle_customers">Zufahrt Fahrrad: Kunden</string>
+    <string name="poi_horse_private">Zugang Pferde: privat</string>
+    <string name="poi_horse_destination">Zugang Pferde: für Anlieger</string>
+    <string name="poi_horse_permissive">Zugang Pferde: gestattet</string>
+    <string name="poi_horse_forestry">Zugang Pferde: Forstwirtschaft</string>
+    <string name="poi_foot_yes">Zugang Fußgänger: ja</string>
+    <string name="poi_foot_private">Zugang Fußgänger: privat</string>
+    <string name="poi_foot_no">Zugang Fußgänger: nein</string>
+    <string name="poi_foot_destination">Zugang Fußgänger: für Anlieger</string>
+    <string name="poi_foot_permissive">Zugang Fußgänger: gestattet</string>
+    <string name="poi_foot_customers">Zugang Fußgänger: Kunden</string>
+    <string name="poi_caravan_no">Zufahrt Wohnwagen: nein</string>
+    <string name="poi_motorhome_no">Zufahrt Wohnmobil: nein</string>
+    <string name="poi_bus_no">Zufahrt Linienbus: nein</string>
+    <string name="poi_tourist_bus_yes">Zufahrt Touristenbus: ja</string>
+    <string name="poi_tourist_bus_designated">Zufahrt Touristenbus: ausgewiesen</string>
+    <string name="poi_tourist_bus_no">Zufahrt Touristenbus: nein</string>
+    <string name="poi_ski_yes">Zufahrt Ski: ja</string>
+    <string name="poi_ski_no">Zufahrt Ski: nein</string>
+    <string name="poi_snowmobile_private">Zufahrt Schneemobil: privat</string>
+    <string name="poi_access_trailer">Zufahrt Anhänger</string>
+    <string name="poi_trailer_no">Zufahrt Anhänger: nein</string>
+    <string name="poi_psv_yes">Zufahrt öffentliche Verkehrsmittel: ja</string>
+    <string name="poi_psv_designated">Zufahrt öffentliche Verkehrsmittel: ausgewiesen</string>
+    <string name="poi_psv_no">Zufahrt öffentliche Verkehrsmittel: nein</string>
+    <string name="poi_coach_yes">Zufahrt Bus: ja</string>
+    <string name="poi_coach_no">Zufahrt Bus: nein</string>
+    <string name="poi_snowmobile_no">Zufahrt Schneemobil: nein</string>
+    <string name="poi_agricultural_yes">Zufahrt landwirtschaftliche Fahrzeuge: ja</string>
+    <string name="poi_agricultural_no">Zufahrt landwirtschaftliche Fahrzeuge: nein</string>
+    <string name="poi_taxi_yes">Zufahrt Taxi: ja</string>
+    <string name="poi_taxi_designated">Zufahrt Taxi: ausgewiesen</string>
+    <string name="poi_taxi_no">Zufahrt Taxi: nein</string>
+    <string name="poi_disabled_no">Zugang Behinderte: nein</string>
+    <string name="poi_snowmobile_yes">ja</string>
+    <string name="poi_snowmobile_designated">ausgewiesen</string>
+    <string name="poi_snowmobile_permissive">gestattet</string>
+    <string name="poi_bus_yes">ja</string>
+    <string name="poi_bus_designated">ausgewiesen</string>
+    <string name="poi_caravan_yes">ja</string>
+    <string name="poi_caravan_designated">ausgewiesen</string>
+    <string name="poi_motorhome_yes">ja</string>
+    <string name="poi_motorhome_designated">ausgewiesen</string>
+    <string name="poi_trailer_yes">ja</string>
+    <string name="poi_trailer_designated">ausgewiesen</string>
+    <string name="poi_motorcycle_yes">ja</string>
+    <string name="poi_motorcycle_permissive">gestattet</string>
+    <string name="poi_motorcycle_destination">für Anlieger</string>
+    <string name="poi_motorcycle_designated">ausgewiesen</string>
+    <string name="poi_moped_yes">ja</string>
+    <string name="poi_moped_designated">ausgewiesen</string>
+    <string name="poi_mofa_yes">ja</string>
+    <string name="poi_mofa_designated">ausgewiesen</string>
+    <string name="poi_hgv_yes">ja</string>
+    <string name="poi_hgv_destination">für Anlieger</string>
+    <string name="poi_hgv_permissive">gestattet</string>
+    <string name="poi_hgv_designated">ausgewiesen</string>
+    <string name="poi_hgv_delivery">Lieferverkehr</string>
+    <string name="poi_goods_yes">ja</string>
+    <string name="poi_goods_designated">ausgewiesen</string>
+    <string name="poi_disabled_yes">ja</string>
+    <string name="poi_disabled_designated">ausgewiesen</string>
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -155,7 +155,7 @@
     <string name="asap">So bald wie möglich</string>
     <string name="route_roundabout">Kreisverkehr: Nehmen Sie die %1$d Ausfahrt, dann</string>
     <string name="route_kl">Links halten, dann</string>
-    <string name="route_kr">Rechts halten, dann</string>
+    <string name="route_kr">rechts halten, dann</string>
     <string name="rendering_attr_noPolygons_description">Unterdrückt die Anzeige aller Flächenelemente in der Karte.</string>
     <string name="rendering_attr_noPolygons_name">Flächen</string>
     <string name="rendering_attr_appMode_description">Optimierung der Kartendarstellung für</string>
@@ -426,9 +426,9 @@
 		\n\tZur Verwendung aktivieren: \'Menu\' → \'Karte konfigurieren\' → \'Kartenquelle…\' → \'Offline-Vektor-Karten\'.</string>
     <string name="choose_audio_stream">Navi-Sprachausgabe</string>
     <string name="choose_audio_stream_descr">Lautsprecher für Sprachansagen auswählen.</string>
-    <string name="voice_stream_voice_call">Wie Anrufe (über Bluetooth auch zur Stereoanlage im Auto)</string>
+    <string name="voice_stream_voice_call">Wie Anrufe (unterbricht Bluetooth Verbindung zum Autoradio)</string>
     <string name="voice_stream_notification">Wie Benachrichtigungen</string>
-    <string name="voice_stream_music">Wie Medien/Musik</string>
+    <string name="voice_stream_music">Wie Medien/Navigation</string>
     <string name="warning_tile_layer_not_downloadable">Die App kann die Kartenebene %1$s nicht herunterladen, eine Neuinstallation könnte helfen.</string>
     <string name="overlay_transparency_descr">Transparenz der Overlay-Karte ändern.</string>
     <string name="overlay_transparency">Overlay-Transparenz</string>
@@ -3219,4 +3219,11 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="temporary_conditional_routing">Vorübergehende Einschränkungen berückichtigen</string>
     <string name="gpx_join_gaps">Lücken schließen</string>
     <string name="app_mode_campervan">Wohnmobil</string>
+    <string name="shared_string_default">Standard</string>
+    <string name="app_mode_camper">Wohnwagen</string>
+    <string name="lang_oc">Okzitanisch</string>
+    <string name="app_mode_wagon">Wagen</string>
+    <string name="app_mode_pickup_truck">Kleintransporter</string>
+    <string name="new_route_calculated_dist_dbg">Route: Entfernung %s, Fahrzeit%s
+\nBerechnung: %.1f Sek.,%d Straßen,%d Kacheln)</string>
 </resources>

OsmAnd/res/values-eo/phrases.xml

@@ -1093,7 +1093,7 @@
     <string name="poi_access_destination">Aliro nur al celo</string>
     <string name="poi_access_permissive">Verŝajne alirebla</string>
     <string name="poi_access_delivery">Aliro nur por liverantoj</string>
-    <string name="poi_access_agricultural">Aliro nur por traktoroj</string>
+    <string name="poi_access_agricultural">Aliro nur por agrokulturaj maŝinoj</string>
     <string name="poi_content_silage">Enhavo: insilaĵo</string>
     <string name="poi_content_water">Enhavo: akvo</string>
     <string name="poi_content_slurry">Enhavo: ŝlimo</string>
@@ -2457,14 +2457,14 @@
     <string name="poi_fire_hydrant_style_water_source_stream">rivereto</string>
     <string name="poi_fire_hydrant_style_water_source_cistern">cisterno</string>
     <string name="poi_in_service_yes">Funkcias: jes</string>
-    <string name="poi_street_cabinet_power">Ŝranko-tipo: elektra</string>
-    <string name="poi_street_cabinet_telecom">Ŝranko-tipo: telefona</string>
-    <string name="poi_street_cabinet_cable_tv">Ŝranko-tipo: kablo-televida</string>
-    <string name="poi_street_cabinet_gas">Ŝranko-tipo: gasa</string>
-    <string name="poi_street_cabinet_postal_service">Ŝranko-tipo: poŝta</string>
-    <string name="poi_street_cabinet_waste">Ŝranko-tipo: rubuja</string>
-    <string name="poi_street_cabinet_water_management">Ŝranko-tipo: akvokonduktila</string>
-    <string name="poi_street_cabinet_street_lighting">Ŝranko-tipo: strat-prilumada</string>
+    <string name="poi_street_cabinet_power">Speco de ŝranko: elektra</string>
+    <string name="poi_street_cabinet_telecom">Speco de ŝranko: telefona</string>
+    <string name="poi_street_cabinet_cable_tv">Speco de ŝranko: kabl-televida</string>
+    <string name="poi_street_cabinet_gas">Speco de ŝranko: gasa</string>
+    <string name="poi_street_cabinet_postal_service">Speco de ŝranko: poŝta</string>
+    <string name="poi_street_cabinet_waste">Speco de ŝranko: rubuja</string>
+    <string name="poi_street_cabinet_water_management">Speco de ŝranko: akvokonduktila</string>
+    <string name="poi_street_cabinet_street_lighting">Speco de ŝranko: strat-prilumada</string>
     <string name="poi_aerodrome_type_international">Interŝtata</string>
     <string name="poi_aerodrome_type_regional">Regiona</string>
     <string name="poi_aerodrome_type_public">Publika</string>
@@ -3597,4 +3597,117 @@
     <string name="poi_historic_tank">Tanko historia</string>
     <string name="poi_hookah_lounge">Salono por fumi akvopipon</string>
     <string name="poi_source_biomass">Energifonto: biomaso</string>
+    <string name="poi_snowmobile_filter">Aliro por motorsledoj</string>
+    <string name="poi_access_bus">Aliro por aŭtobusoj</string>
+    <string name="poi_access_caravan">Aliro por kampad-postveturiloj</string>
+    <string name="poi_access_motorhome">Aliro por kampad-veturiloj</string>
+    <string name="poi_access_trailer">Aliro por postveturiloj</string>
+    <string name="poi_access_motorcycle">Aliro por motorcikloj</string>
+    <string name="poi_access_moped">Aliro por motorbicikloj</string>
+    <string name="poi_access_mofa">Aliro por malpezaj motorbicikloj (≤25km\\h)</string>
+    <string name="poi_access_hgv">Aliro por kamionoj</string>
+    <string name="poi_access_goods">Aliro por kamionetoj</string>
+    <string name="poi_access_disabled">Aliro por veturiloj kun malkapabluloj</string>
+    <string name="poi_taxi_office">Oficejo de taksia kompanio</string>
+    <string name="poi_vehicle_yes">Aliro por veturiloj: jes</string>
+    <string name="poi_vehicle_private">Aliro por veturiloj: nur laŭ privata permeso</string>
+    <string name="poi_vehicle_no">Aliro por veturiloj: ne</string>
+    <string name="poi_vehicle_destination">Aliro por veturiloj: nur al celo</string>
+    <string name="poi_vehicle_permissive">Aliro por veturiloj: verŝajne jes</string>
+    <string name="poi_vehicle_customers">Aliro por veturiloj: nur klientoj</string>
+    <string name="poi_vehicle_military">Aliro por veturiloj: nur armeaj</string>
+    <string name="poi_vehicle_delivery">Aliro por veturiloj: nur liverado</string>
+    <string name="poi_vehicle_forestry">Aliro por veturiloj: nur arbara servo</string>
+    <string name="poi_motorcar_yes">Aliro por aŭtoj:</string>
+    <string name="poi_motorcar_private">Aliro por aŭtoj: nur laŭ privata permeso</string>
+    <string name="poi_motorcar_no">Aliro por aŭtoj: ne</string>
+    <string name="poi_motorcar_destination">Aliro por aŭtoj: nur al celo</string>
+    <string name="poi_motorcar_permissive">Aliro por aŭtoj: verŝajne jes</string>
+    <string name="poi_motorcar_customers">Aliro por aŭtoj: nur klientoj</string>
+    <string name="poi_motorcar_forestry">Aliro por aŭtoj: nur arbara servo</string>
+    <string name="poi_motor_vehicle_yes">Aliro por motorveturiloj: jes</string>
+    <string name="poi_motor_vehicle_private">Aliro por motorveturiloj: nur laŭ privata permeso</string>
+    <string name="poi_motor_vehicle_no">Aliro por motorveturiloj: ne</string>
+    <string name="poi_motor_vehicle_destination">Aliro por motorveturiloj: nur al celo</string>
+    <string name="poi_motor_vehicle_permissive">Aliro por motorveturiloj: verŝajne jes</string>
+    <string name="poi_motor_vehicle_customers">Aliro por motorveturiloj: nur klientoj</string>
+    <string name="poi_motor_vehicle_military">Aliro por motorveturiloj: nur armeaj</string>
+    <string name="poi_motor_vehicle_delivery">Aliro por motorveturiloj: nur liverado</string>
+    <string name="poi_motor_vehicle_forestry">Aliro por motorveturiloj: nur arbara servo</string>
+    <string name="poi_motor_vehicle_agricultural">Aliro por motorveturiloj: nur agrokulturaj</string>
+    <string name="poi_hgv_private">Aliro por kamionoj: nur laŭ privata permeso</string>
+    <string name="poi_hgv_no">Aliro por kamionoj: ne</string>
+    <string name="poi_hgv_agricultural">Aliro por kamionoj: nur agrokulturaj</string>
+    <string name="poi_hgv_discouraged">Aliro por kamionoj: malkonsilinda</string>
+    <string name="poi_hgv_unsuitable">Aliro por kamionoj: netaŭga</string>
+    <string name="poi_goods_no">Aliro por kamionetoj: ne</string>
+    <string name="poi_motorcycle_private">Aliro por motorcikloj: nur laŭ privata permeso</string>
+    <string name="poi_motorcycle_no">Aliro por motorcikloj: ne</string>
+    <string name="poi_moped_no">Aliro por motorbicikloj: ne</string>
+    <string name="poi_mofa_no">Aliro por motorbicikloj (≤25km/h): ne</string>
+    <string name="poi_bicycle_private">Aliro por bicikloj: nur laŭ privata permeso</string>
+    <string name="poi_bicycle_dismount">Aliro por bicikloj: debicikligu</string>
+    <string name="poi_bicycle_destination">Aliro por bicikloj: nur al celo</string>
+    <string name="poi_bicycle_permissive">Aliro por bicikloj: verŝajne jes</string>
+    <string name="poi_bicycle_customers">Aliro por bicikloj: nur klientoj</string>
+    <string name="poi_horse_private">Aliro por ĉevaloj: nur laŭ privata permeso</string>
+    <string name="poi_horse_destination">Aliro por ĉevaloj: nur al celo</string>
+    <string name="poi_horse_permissive">Aliro por ĉevaloj: verŝajne jes</string>
+    <string name="poi_horse_forestry">Aliro por ĉevaloj: arbara servo</string>
+    <string name="poi_foot_yes">Aliro por piedirantoj: jes</string>
+    <string name="poi_foot_private">Aliro por piedirantoj: nur laŭ privata permeso</string>
+    <string name="poi_foot_no">Aliro por piedirantoj: ne</string>
+    <string name="poi_foot_destination">Aliro por piedirantoj: nur al celo</string>
+    <string name="poi_foot_permissive">Aliro por piedirantoj: verŝajne jes</string>
+    <string name="poi_foot_customers">Aliro por piedirantoj: nur klientoj</string>
+    <string name="poi_caravan_no">Aliro por kampad-postveturiloj: ne</string>
+    <string name="poi_motorhome_no">Aliro por kampad-veturiloj: ne</string>
+    <string name="poi_trailer_no">Aliro por postveturiloj: ne</string>
+    <string name="poi_psv_yes">Aliro por veturiloj de publika servo: jes</string>
+    <string name="poi_psv_designated">Aliro por veturiloj de publika servo: destinita</string>
+    <string name="poi_psv_no">Aliro por veturiloj de publika servo: ne</string>
+    <string name="poi_bus_no">Aliro por aŭtobusoj: ne</string>
+    <string name="poi_tourist_bus_yes">Aliro por turismaj aŭtobusoj: jes</string>
+    <string name="poi_tourist_bus_designated">Aliro por turismaj aŭtobusoj: destinita</string>
+    <string name="poi_tourist_bus_no">Aliro por turismaj aŭtobusoj: ne</string>
+    <string name="poi_coach_yes">Aliro por longdistancaj aŭtobusoj: jes</string>
+    <string name="poi_coach_no">Aliro por longdistancaj aŭtobusoj: ne</string>
+    <string name="poi_ski_yes">Aliro por skiantoj: jes</string>
+    <string name="poi_ski_no">Aliro por skiantoj: ne</string>
+    <string name="poi_snowmobile_private">Aliro por motorsledoj: nur laŭ privata permeso</string>
+    <string name="poi_snowmobile_no">Aliro por motorsledoj: ne</string>
+    <string name="poi_agricultural_yes">Aliro por agrokulturaj maŝinoj: jes</string>
+    <string name="poi_agricultural_no">Aliro por agrokulturaj maŝinoj: ne</string>
+    <string name="poi_taxi_yes">Aliro por taksioj: jes</string>
+    <string name="poi_taxi_designated">Aliro por taksioj: destinita</string>
+    <string name="poi_taxi_no">Aliro por taksioj: destinita</string>
+    <string name="poi_disabled_no">Aliro por veturiloj kun malkapabluloj: ne</string>
+    <string name="poi_snowmobile_yes">jes</string>
+    <string name="poi_snowmobile_designated">destinita</string>
+    <string name="poi_snowmobile_permissive">verŝajne jes</string>
+    <string name="poi_bus_yes">jes</string>
+    <string name="poi_bus_designated">jes</string>
+    <string name="poi_caravan_yes">jes</string>
+    <string name="poi_caravan_designated">jes</string>
+    <string name="poi_motorhome_yes">jes</string>
+    <string name="poi_motorhome_designated">destinita</string>
+    <string name="poi_trailer_yes">jes</string>
+    <string name="poi_trailer_designated">destinita</string>
+    <string name="poi_motorcycle_yes">jes</string>
+    <string name="poi_motorcycle_permissive">verŝajne jes</string>
+    <string name="poi_motorcycle_destination">nur al celo</string>
+    <string name="poi_motorcycle_designated">destinita</string>
+    <string name="poi_moped_yes">jes</string>
+    <string name="poi_moped_designated">destinita</string>
+    <string name="poi_mofa_yes">jes</string>
+    <string name="poi_mofa_designated">destinita</string>
+    <string name="poi_hgv_yes">jes</string>
+    <string name="poi_hgv_destination">nur al celo</string>
+    <string name="poi_hgv_permissive">verŝajne jes</string>
+    <string name="poi_hgv_designated">destinita</string>
+    <string name="poi_hgv_delivery">nur liverado</string>
+    <string name="poi_goods_yes">jes</string>
+    <string name="poi_goods_designated">destinita</string>
+    <string name="poi_disabled_yes">jes</string>
+    <string name="poi_disabled_designated">destinita</string>
 </resources>

OsmAnd/res/values-eo/strings.xml

@@ -1595,7 +1595,7 @@ Proporcia memoro %4$s MB (limito de Android %5$s MB, Dalvik %6$s MB).</string>
     <string name="maps_could_not_be_downloaded">Tiu ĉi mapo ne povas esti elŝutita</string>
     <string name="continuous_rendering">Konstanta bildigado</string>
     <string name="continuous_rendering_descr">Bildigi konstante anstataŭ bildigi po unu bildo en unu fojo.</string>
-    <string name="rendering_exception">Ne povas bildigadi elektitan areon</string>
+    <string name="rendering_exception">Ne povas bildigi la elektitan areon</string>
     <string name="show_point_options">Uzi lokon…</string>
     <string name="renderer_load_sucess">Bildigilo ŝargita</string>
     <string name="renderer_load_exception">Ne povas ŝargi bildigilon</string>
@@ -3197,4 +3197,9 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="rendering_attr_showLez_name">Montri zonojn de restrikta emisio (LEZ)</string>
     <string name="temporary_conditional_routing">Konsideri portempajn limigojn</string>
     <string name="shared_string_default">Implicita</string>
+    <string name="new_route_calculated_dist_dbg">Kurso: distanco %s, tempo: %s 
+\n(kalkulita en %.1f s, %d vojoj, %d kaheloj)</string>
+    <string name="lang_oc">Okcitana</string>
+    <string name="app_mode_wagon">Aŭto (kombino)</string>
+    <string name="app_mode_pickup_truck">Aŭto (pickup)</string>
 </resources>

OsmAnd/res/values-es-rAR/phrases.xml

@@ -139,7 +139,7 @@
     <string name="poi_emergency_phone">Teléfono de emergencia</string>
     <string name="poi_fire_hydrant">Hidrante</string>
     <string name="poi_fire_extinguisher">Extintor de incendios</string>
-    <string name="poi_fire_flapper">Aleta de fuego</string>
+    <string name="poi_fire_flapper">Aleta de fuego;Batefuego</string>
     <string name="poi_fire_hose">Manguera de incendio</string>
     <string name="poi_fire_water_pond">Estanque de agua contra incendios</string>
     <string name="poi_grit_bin">Contenedor de arena</string>
@@ -349,7 +349,7 @@
     <string name="poi_podiatrist">Podólogo</string>
     <string name="poi_psychotherapist">Psicoterapeuta</string>
     <string name="poi_healthcare_rehabilitation">Rehabilitación</string>
-    <string name="poi_speech_therapist">Fonoaudiólogo;Terapeuta del lenguaje</string>
+    <string name="poi_speech_therapist">Fonoaudiólogo;Logopeda;Terapeuta del lenguaje</string>
     <string name="poi_healthcare_yes">Instalación médica</string>
     <string name="poi_company">Empresa privada;Compañia</string>
     <string name="poi_insurance">Aseguradora</string>
@@ -597,7 +597,7 @@
     <string name="poi_craft_boatbuilder">Fabricante de embarcaciones</string>
     <string name="poi_craft_bookbinder">Encuadernador</string>
     <string name="poi_craft_carpenter">Carpintero</string>
-    <string name="poi_craft_carpet_layer">Instalador de alfombras</string>
+    <string name="poi_craft_carpet_layer">Instalador de alfombras;Instalador de moquetas</string>
     <string name="poi_craft_caterer">Cáterin;Catering;Organizador de eventos</string>
     <string name="poi_craft_clockmaker">Relojero</string>
     <string name="poi_craft_dressmaker">Modista</string>
@@ -611,7 +611,7 @@
     <string name="poi_craft_locksmith">Cerrajero</string>
     <string name="poi_craft_key_cutter">Duplicación de llaves</string>
     <string name="poi_craft_metal_construction">Metalistería</string>
-    <string name="poi_craft_optician">Oculista;Óptica</string>
+    <string name="poi_craft_optician">Optometrista;Técnico óptico;Oculista;Óptica</string>
     <string name="poi_craft_painter">Pintor</string>
     <string name="poi_craft_parquet_layer">Parquetista</string>
     <string name="poi_craft_photographer">Fotógrafo</string>
@@ -652,7 +652,7 @@
     <string name="poi_dock">Dársena</string>
     <string name="poi_toilets">Baño;Aseos</string>
     <string name="poi_sauna">Sauna</string>
-    <string name="poi_brothel">Burdel;Cabaré;Prostíbulo</string>
+    <string name="poi_brothel">Burdel;Cabaré;Lupanar;Prostíbulo;Mancebía</string>
     <string name="poi_smoking_area">Área de fumadores</string>
     <string name="poi_mortuary">Morgue</string>
     <string name="poi_crematorium">Crematorio</string>
@@ -3611,4 +3611,117 @@
     <string name="poi_historic_tank">Tanque histórico</string>
     <string name="poi_hookah_lounge">Bar de cachimbas;Salón Hookah</string>
     <string name="poi_source_biomass">Fuente de energía: biomasa</string>
+    <string name="poi_snowmobile_filter">Acceso para motonieves</string>
+    <string name="poi_access_bus">Acceso para colectivos</string>
+    <string name="poi_access_caravan">Acceso para casas móviles</string>
+    <string name="poi_access_motorhome">Acceso para casas rodantes (motorhome)</string>
+    <string name="poi_access_trailer">Acceso con remolque</string>
+    <string name="poi_access_motorcycle">Acceso para motocicletas</string>
+    <string name="poi_access_moped">Acceso para ciclomotores</string>
+    <string name="poi_access_mofa">Acceso para bicimotos</string>
+    <string name="poi_access_hgv">Acceso para vehículos pesados</string>
+    <string name="poi_access_goods">Acceso para vehículos de mercancías ligeras</string>
+    <string name="poi_access_disabled">Acceso para discapacitados</string>
+    <string name="poi_taxi_office">Oficina de taxis;Remisería</string>
+    <string name="poi_vehicle_yes">Acceso para vehículos: sí</string>
+    <string name="poi_vehicle_private">Acceso para vehículos: privado</string>
+    <string name="poi_vehicle_no">Acceso para vehículos: no</string>
+    <string name="poi_vehicle_destination">Acceso para vehículos: destino</string>
+    <string name="poi_vehicle_permissive">Acceso para vehículos: permisivo</string>
+    <string name="poi_vehicle_customers">Acceso para vehículos: clientes</string>
+    <string name="poi_vehicle_military">Acceso para vehículos: militar</string>
+    <string name="poi_vehicle_delivery">Acceso para vehículos: entregas</string>
+    <string name="poi_vehicle_forestry">Acceso para vehículos: forestal</string>
+    <string name="poi_motorcar_yes">Acceso para automóviles:</string>
+    <string name="poi_motorcar_private">Acceso para automóviles: privado</string>
+    <string name="poi_motorcar_no">Acceso para automóviles: no</string>
+    <string name="poi_motorcar_destination">Acceso para automóviles: destino</string>
+    <string name="poi_motorcar_permissive">Acceso para automóviles: permisivo</string>
+    <string name="poi_motorcar_customers">Acceso para automóviles: clientes</string>
+    <string name="poi_motorcar_forestry">Acceso para automóviles: forestal</string>
+    <string name="poi_motor_vehicle_yes">Acceso para vehículos a motor: sí</string>
+    <string name="poi_motor_vehicle_private">Acceso para vehículos a motor: privado</string>
+    <string name="poi_motor_vehicle_no">Acceso para vehículos a motor: no</string>
+    <string name="poi_motor_vehicle_destination">Acceso para vehículos a motor: destino</string>
+    <string name="poi_motor_vehicle_permissive">Acceso para vehículos a motor: permisivo</string>
+    <string name="poi_motor_vehicle_customers">Acceso para vehículos a motor: clientes</string>
+    <string name="poi_motor_vehicle_military">Acceso para vehículos a motor: militar</string>
+    <string name="poi_motor_vehicle_delivery">Acceso para vehículos a motor: entregas</string>
+    <string name="poi_motor_vehicle_forestry">Acceso para vehículos a motor: forestal</string>
+    <string name="poi_motor_vehicle_agricultural">Acceso para vehículos a motor: agrícola</string>
+    <string name="poi_hgv_private">Acceso para vehículos pesados: privado</string>
+    <string name="poi_hgv_no">Acceso para vehículos pesados: no</string>
+    <string name="poi_hgv_agricultural">Acceso para vehículos pesados: agrícola</string>
+    <string name="poi_hgv_discouraged">Acceso para vehículos pesados: desaconsejado</string>
+    <string name="poi_hgv_unsuitable">Acceso para vehículos pesados: inadecuado</string>
+    <string name="poi_goods_no">Acceso para vehículos de mercancías ligeras: no</string>
+    <string name="poi_motorcycle_private">Acceso para motocicletas: privado</string>
+    <string name="poi_motorcycle_no">Acceso para motocicletas: no</string>
+    <string name="poi_moped_no">Acceso para ciclomotores: no</string>
+    <string name="poi_mofa_no">Acceso para bicimotos: no</string>
+    <string name="poi_bicycle_private">Acceso para bicicletas: privado</string>
+    <string name="poi_bicycle_dismount">Acceso para bicicletas: descender</string>
+    <string name="poi_bicycle_destination">Acceso para bicicletas: destino</string>
+    <string name="poi_bicycle_permissive">Acceso para bicicletas: permisivo</string>
+    <string name="poi_bicycle_customers">Acceso para bicicletas: clientes</string>
+    <string name="poi_horse_private">Acceso para caballos: privado</string>
+    <string name="poi_horse_destination">Acceso para caballos: destino</string>
+    <string name="poi_horse_permissive">Acceso para caballos: permisivo</string>
+    <string name="poi_horse_forestry">Acceso para caballos: forestal</string>
+    <string name="poi_foot_yes">Acceso peatonal: sí</string>
+    <string name="poi_foot_private">Acceso peatonal: privado</string>
+    <string name="poi_foot_no">Acceso peatonal: no</string>
+    <string name="poi_foot_destination">Acceso peatonal: destino</string>
+    <string name="poi_foot_permissive">Acceso peatonal: permisivo</string>
+    <string name="poi_foot_customers">Acceso peatonal: clientes</string>
+    <string name="poi_caravan_no">Acceso para casas móviles: no</string>
+    <string name="poi_motorhome_no">Acceso para casas rodantes: no</string>
+    <string name="poi_trailer_no">Acceso con remolque: no</string>
+    <string name="poi_psv_yes">Acceso para transporte público: sí</string>
+    <string name="poi_psv_designated">Acceso para transporte público: designado</string>
+    <string name="poi_psv_no">Acceso para transporte público: no</string>
+    <string name="poi_bus_no">Acceso para colectivos: no</string>
+    <string name="poi_tourist_bus_yes">Acceso para colectivos turísticos: sí</string>
+    <string name="poi_tourist_bus_designated">Acceso para colectivos turísticos: designado</string>
+    <string name="poi_tourist_bus_no">Acceso para colectivos turísticos: no</string>
+    <string name="poi_coach_yes">Acceso para colectivos de larga distancia: sí</string>
+    <string name="poi_coach_no">Acceso para colectivos de larga distancia: no</string>
+    <string name="poi_ski_yes">Acceso para esquís: sí</string>
+    <string name="poi_ski_no">Acceso para esquís: no</string>
+    <string name="poi_snowmobile_private">Acceso para motonieves: privado</string>
+    <string name="poi_snowmobile_no">Acceso para motonieves: no</string>
+    <string name="poi_agricultural_yes">Acceso para vehículos agrícolas: sí</string>
+    <string name="poi_agricultural_no">Acceso para vehículos agrícolas: no</string>
+    <string name="poi_taxi_yes">Acceso para taxis: sí</string>
+    <string name="poi_taxi_designated">Acceso para taxis: designado</string>
+    <string name="poi_taxi_no">Acceso para taxis: no</string>
+    <string name="poi_disabled_no">Acceso para discapacitados: no</string>
+    <string name="poi_snowmobile_yes">Sí</string>
+    <string name="poi_snowmobile_designated">Designado</string>
+    <string name="poi_snowmobile_permissive">Permisivo</string>
+    <string name="poi_bus_yes">Sí</string>
+    <string name="poi_bus_designated">Designado</string>
+    <string name="poi_caravan_yes">Sí</string>
+    <string name="poi_caravan_designated">Designado</string>
+    <string name="poi_motorhome_yes">Sí</string>
+    <string name="poi_motorhome_designated">Designado</string>
+    <string name="poi_trailer_yes">Sí</string>
+    <string name="poi_trailer_designated">Designado</string>
+    <string name="poi_motorcycle_yes">Sí</string>
+    <string name="poi_motorcycle_permissive">Permisivo</string>
+    <string name="poi_motorcycle_destination">Destino</string>
+    <string name="poi_motorcycle_designated">Designado</string>
+    <string name="poi_moped_yes">Sí</string>
+    <string name="poi_moped_designated">Designado</string>
+    <string name="poi_mofa_yes">Sí</string>
+    <string name="poi_mofa_designated">Designado</string>
+    <string name="poi_hgv_yes">Sí</string>
+    <string name="poi_hgv_destination">Destino</string>
+    <string name="poi_hgv_permissive">Permisivo</string>
+    <string name="poi_hgv_designated">Designado</string>
+    <string name="poi_hgv_delivery">Entregas</string>
+    <string name="poi_goods_yes">Sí</string>
+    <string name="poi_goods_designated">Designado</string>
+    <string name="poi_disabled_yes">Sí</string>
+    <string name="poi_disabled_designated">Designado</string>
 </resources>

OsmAnd/res/values-es-rAR/strings.xml

@@ -3215,4 +3215,9 @@ Lon %2$s</string>
     <string name="rendering_attr_showLez_name">Mostrar zonas de baja emisión</string>
     <string name="temporary_conditional_routing">Considerar limitaciones temporales</string>
     <string name="shared_string_default">Predefinido</string>
+    <string name="new_route_calculated_dist_dbg">Ruta: distancia %s, tiempo de navegación %s
+\nCálculo: %.1f seg, %d carreteras, %d teselas)</string>
+    <string name="lang_oc">Occitano</string>
+    <string name="app_mode_wagon">Vagón</string>
+    <string name="app_mode_pickup_truck">Camioneta</string>
 </resources>

OsmAnd/res/values-es-rUS/phrases.xml

@@ -611,7 +611,7 @@
     <string name="poi_craft_locksmith">Cerrajero</string>
     <string name="poi_craft_key_cutter">Duplicación de llaves</string>
     <string name="poi_craft_metal_construction">Metalistería</string>
-    <string name="poi_craft_optician">Oculista;Óptica</string>
+    <string name="poi_craft_optician">Optometrista;Técnico óptico;Oculista;Óptica</string>
     <string name="poi_craft_painter">Pintor</string>
     <string name="poi_craft_parquet_layer">Parquetista</string>
     <string name="poi_craft_photographer">Fotógrafo</string>
@@ -1829,7 +1829,7 @@
     <string name="poi_industrial_timber">Tipo: maderera</string>
     <string name="poi_industrial_refinery">Tipo: refinería</string>
     <string name="poi_industrial_warehouse">Tipo: almacén</string>
-    <string name="poi_industrial_auto_wrecker">Tipo: Deshuesadero;Tipo: Cementerio de coches</string>
+    <string name="poi_industrial_auto_wrecker">Tipo: Deshuesadero;Cementerio de coches</string>
     <string name="poi_industrial_agriculture">Tipo: agrícola</string>
     <string name="poi_industrial_brewery">Tipo: cervecería</string>
     <string name="poi_industrial_brickyard">Tipo: fábrica de ladrillos</string>
@@ -3611,4 +3611,117 @@
     <string name="poi_historic_tank">Tanque histórico</string>
     <string name="poi_hookah_lounge">Bar de cachimbas;Salón Hookah</string>
     <string name="poi_source_biomass">Fuente de energía: biomasa</string>
+    <string name="poi_snowmobile_filter">Acceso para motonieves</string>
+    <string name="poi_access_bus">Acceso para autobuses</string>
+    <string name="poi_access_caravan">Acceso para caravanas</string>
+    <string name="poi_access_motorhome">Acceso para casas rodantes (motorhome)</string>
+    <string name="poi_access_trailer">Acceso con remolque</string>
+    <string name="poi_access_motorcycle">Acceso para motocicletas</string>
+    <string name="poi_access_moped">Acceso para ciclomotores</string>
+    <string name="poi_access_mofa">Acceso para bicimotos</string>
+    <string name="poi_access_hgv">Acceso para vehículos pesados</string>
+    <string name="poi_access_goods">Acceso para vehículos de mercancías ligeras</string>
+    <string name="poi_access_disabled">Acceso para discapacitados</string>
+    <string name="poi_taxi_office">Oficina de taxis;Remisería</string>
+    <string name="poi_vehicle_yes">Acceso para vehículos: sí</string>
+    <string name="poi_vehicle_private">Acceso para vehículos: privado</string>
+    <string name="poi_vehicle_no">Acceso para vehículos: no</string>
+    <string name="poi_vehicle_destination">Acceso para vehículos: destino</string>
+    <string name="poi_vehicle_permissive">Acceso para vehículos: permisivo</string>
+    <string name="poi_vehicle_customers">Acceso para vehículos: clientes</string>
+    <string name="poi_vehicle_military">Acceso para vehículos: militar</string>
+    <string name="poi_vehicle_delivery">Acceso para vehículos: entregas</string>
+    <string name="poi_vehicle_forestry">Acceso para vehículos: forestal</string>
+    <string name="poi_motorcar_yes">Acceso para automóviles:</string>
+    <string name="poi_motorcar_private">Acceso para automóviles: privado</string>
+    <string name="poi_motorcar_no">Acceso para automóviles: no</string>
+    <string name="poi_motorcar_destination">Acceso para automóviles: destino</string>
+    <string name="poi_motorcar_permissive">Acceso para automóviles: permisivo</string>
+    <string name="poi_motorcar_customers">Acceso para automóviles: clientes</string>
+    <string name="poi_motorcar_forestry">Acceso para automóviles: forestal</string>
+    <string name="poi_motor_vehicle_yes">Acceso para vehículos a motor: sí</string>
+    <string name="poi_motor_vehicle_private">Acceso para vehículos a motor: privado</string>
+    <string name="poi_motor_vehicle_no">Acceso para vehículos a motor: no</string>
+    <string name="poi_motor_vehicle_destination">Acceso para vehículos a motor: destino</string>
+    <string name="poi_motor_vehicle_permissive">Acceso para vehículos a motor: permisivo</string>
+    <string name="poi_motor_vehicle_customers">Acceso para vehículos a motor: clientes</string>
+    <string name="poi_motor_vehicle_military">Acceso para vehículos a motor: militar</string>
+    <string name="poi_motor_vehicle_delivery">Acceso para vehículos a motor: entregas</string>
+    <string name="poi_motor_vehicle_forestry">Acceso para vehículos a motor: forestal</string>
+    <string name="poi_motor_vehicle_agricultural">Acceso para vehículos a motor: agrícola</string>
+    <string name="poi_hgv_private">Acceso para vehículos pesados: privado</string>
+    <string name="poi_hgv_no">Acceso para vehículos pesados: no</string>
+    <string name="poi_hgv_agricultural">Acceso para vehículos pesados: agrícola</string>
+    <string name="poi_hgv_discouraged">Acceso para vehículos pesados: desaconsejado</string>
+    <string name="poi_hgv_unsuitable">Acceso para vehículos pesados: inadecuado</string>
+    <string name="poi_goods_no">Acceso para vehículos de mercancías ligeras: no</string>
+    <string name="poi_motorcycle_private">Acceso para motocicletas: privado</string>
+    <string name="poi_motorcycle_no">Acceso para motocicletas: no</string>
+    <string name="poi_moped_no">Acceso para ciclomotores: no</string>
+    <string name="poi_mofa_no">Acceso para bicimotos: no</string>
+    <string name="poi_bicycle_private">Acceso para bicicletas: privado</string>
+    <string name="poi_bicycle_dismount">Acceso para bicicletas: descender</string>
+    <string name="poi_bicycle_destination">Acceso para bicicletas: destino</string>
+    <string name="poi_bicycle_permissive">Acceso para bicicletas: permisivo</string>
+    <string name="poi_bicycle_customers">Acceso para bicicletas: clientes</string>
+    <string name="poi_horse_private">Acceso para caballos: privado</string>
+    <string name="poi_horse_destination">Acceso para caballos: destino</string>
+    <string name="poi_horse_permissive">Acceso para caballos: permisivo</string>
+    <string name="poi_horse_forestry">Acceso para caballos: forestal</string>
+    <string name="poi_foot_yes">Acceso peatonal: sí</string>
+    <string name="poi_foot_private">Acceso peatonal: privado</string>
+    <string name="poi_foot_no">Acceso peatonal: no</string>
+    <string name="poi_foot_destination">Acceso peatonal: destino</string>
+    <string name="poi_foot_permissive">Acceso peatonal: permisivo</string>
+    <string name="poi_foot_customers">Acceso peatonal: clientes</string>
+    <string name="poi_caravan_no">Acceso para caravanas: no</string>
+    <string name="poi_motorhome_no">Acceso para casas rodantes: no</string>
+    <string name="poi_trailer_no">Acceso con remolque: no</string>
+    <string name="poi_psv_yes">Acceso para transporte público: sí</string>
+    <string name="poi_psv_designated">Acceso para transporte público: designado</string>
+    <string name="poi_psv_no">Acceso para transporte público: no</string>
+    <string name="poi_bus_no">Acceso para autobuses: no</string>
+    <string name="poi_tourist_bus_yes">Acceso para autobuses turísticos: sí</string>
+    <string name="poi_tourist_bus_designated">Acceso para autobuses turísticos: designado</string>
+    <string name="poi_tourist_bus_no">Acceso para autobuses turísticos: no</string>
+    <string name="poi_coach_yes">Acceso para autobuses de larga distancia: sí</string>
+    <string name="poi_coach_no">Acceso para autobuses de larga distancia: no</string>
+    <string name="poi_ski_yes">Acceso para esquís: sí</string>
+    <string name="poi_ski_no">Acceso para esquís: no</string>
+    <string name="poi_snowmobile_private">Acceso para motonieves: privado</string>
+    <string name="poi_snowmobile_no">Acceso para motonieves: no</string>
+    <string name="poi_agricultural_yes">Acceso para vehículos agrícolas: sí</string>
+    <string name="poi_agricultural_no">Acceso para vehículos agrícolas: no</string>
+    <string name="poi_taxi_yes">Acceso para taxis: sí</string>
+    <string name="poi_taxi_designated">Acceso para taxis: designado</string>
+    <string name="poi_taxi_no">Acceso para taxis: no</string>
+    <string name="poi_disabled_no">Acceso para discapacitados: no</string>
+    <string name="poi_snowmobile_yes">Sí</string>
+    <string name="poi_snowmobile_designated">Designado</string>
+    <string name="poi_snowmobile_permissive">Permisivo</string>
+    <string name="poi_bus_yes">Sí</string>
+    <string name="poi_bus_designated">Designado</string>
+    <string name="poi_caravan_yes">Sí</string>
+    <string name="poi_caravan_designated">Designado</string>
+    <string name="poi_motorhome_yes">Sí</string>
+    <string name="poi_motorhome_designated">Designado</string>
+    <string name="poi_trailer_yes">Sí</string>
+    <string name="poi_trailer_designated">Designado</string>
+    <string name="poi_motorcycle_yes">Sí</string>
+    <string name="poi_motorcycle_permissive">Permisivo</string>
+    <string name="poi_motorcycle_destination">Destino</string>
+    <string name="poi_motorcycle_designated">Designado</string>
+    <string name="poi_moped_yes">Sí</string>
+    <string name="poi_moped_designated">Designado</string>
+    <string name="poi_mofa_yes">Sí</string>
+    <string name="poi_mofa_designated">Designado</string>
+    <string name="poi_hgv_yes">Sí</string>
+    <string name="poi_hgv_destination">Destino</string>
+    <string name="poi_hgv_permissive">Permisivo</string>
+    <string name="poi_hgv_designated">Designado</string>
+    <string name="poi_hgv_delivery">Entregas</string>
+    <string name="poi_goods_yes">Sí</string>
+    <string name="poi_goods_designated">Designado</string>
+    <string name="poi_disabled_yes">Sí</string>
+    <string name="poi_disabled_designated">Designado</string>
 </resources>

OsmAnd/res/values-es-rUS/strings.xml

@@ -3216,4 +3216,9 @@ Lon %2$s</string>
     <string name="rendering_attr_showLez_name">Mostrar zonas de baja emisión</string>
     <string name="temporary_conditional_routing">Considerar limitaciones temporales</string>
     <string name="shared_string_default">Predefinido</string>
+    <string name="new_route_calculated_dist_dbg">Ruta: distancia %s, tiempo de navegación %s
+\nCálculo: %.1f seg, %d carreteras, %d teselas)</string>
+    <string name="lang_oc">Occitano</string>
+    <string name="app_mode_wagon">Vagón</string>
+    <string name="app_mode_pickup_truck">Camioneta</string>
 </resources>

OsmAnd/res/values-eu/strings.xml

@@ -3181,4 +3181,5 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="temporary_conditional_routing">Hartu behin behineko mugatzeak aintzat</string>
     <string name="select_base_profile_dialog_message">"Oinarritu zure  profil pertsonala lehenetsitako aplikazio profil  batean, hau da, oinarrizko konfigurazioa, widgeten eta abiadura eta distantziaren lehenetsitako ikusgarritasuna definitzen duena. Hauek dira aplikazio profil lehenetsiak, profil pertsonalizatuen adibideekin batera:"</string>
     <string name="app_mode_scooter">Motoa</string>
+    <string name="shared_string_default">Lehenetsia</string>
 </resources>

OsmAnd/res/values-fa/phrases.xml

@@ -232,7 +232,7 @@
     <string name="poi_town">شهر</string>
     <string name="poi_village">روستا</string>
     <string name="poi_hamlet">دهکده</string>
-    <string name="poi_isolated_dwelling">منطقه مسکونی</string>
+    <string name="poi_isolated_dwelling">سکونتگاه دورافتاده</string>
     <string name="poi_suburb">حومه شهر</string>
     <string name="poi_neighbourhood">محله</string>
     <string name="poi_locality">محل</string>
@@ -1195,7 +1195,7 @@
     <string name="poi_internet_access_yes">دسترسی اینترنت: دارد</string>
     <string name="poi_internet_access_fee_yes">دسترسی اینترنت - پولی</string>
     <string name="poi_smoking_separated">در اتاق جداگانه</string>
-    <string name="poi_smoking_isolated">در اتاق ایزوله</string>
+    <string name="poi_smoking_isolated">در یک اتاق جدا</string>
     <string name="poi_piste_grooming_scooter">اسکوتر</string>
     <string name="poi_piste_grooming_skating">اسکیت</string>
     <string name="poi_rooms">اتاق‌ها</string>

OsmAnd/res/values-fa/strings.xml

@@ -3243,4 +3243,7 @@
     <string name="sett_generic_ext_input">صفحه‌کلید معمولی</string>
     <string name="sett_wunderlinq_ext_input">WunderLINQ</string>
     <string name="sett_parrot_ext_input">Parrot</string>
+    <string name="new_route_calculated_dist_dbg">مسیر: مسافت %s، زمان مسیریاب %s 
+\nمحاسبه: %.1f ثانیه، %d جاده، %d کاشی)</string>
+    <string name="lang_oc">اُکسیتان</string>
 </resources>

OsmAnd/res/values-fr/strings.xml

@@ -772,7 +772,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="avoid_ferries">Éviter les ferries</string>
     <string name="avoid_in_routing_title">Éviter</string>
     <string name="avoid_in_routing_descr">Éviter les routes à péage, les voies non revêtues, les bateaux ferries.</string>
-    <string name="show_warnings_title">Annonces visuelles…</string>
+    <string name="show_warnings_title">Alertes visuelles…</string>
     <string name="show_warnings_descr">Paramétrer les avertissements de circulation (limites de vitesse, stops, ralentisseurs, tunnels), les radars et les informations sur les voies de circulation.</string>
     <string name="map_widget_fluorescent">Itinéraires fluorescents</string>
     <string name="map_widget_show_ruler">Échelle</string>
@@ -1011,12 +1011,12 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="intermediate_items_sort_by_distance">Optimiser</string>
     <string name="please_select_address">Sélectionnez d\'abord une ville ou une rue</string>
     <string name="context_menu_item_destination_point">Définir comme destination</string>
-    <string name="speak_street_names">Noms des rues (TTS)</string>
+    <string name="speak_street_names">Nom des rues (TTS)</string>
     <string name="about_version">Version :</string>
     <string name="driving_region_japan">Japon</string>
     <string name="driving_region_us">États-Unis d\'Amérique</string>
     <string name="driving_region_canada">Canada</string>
-    <string name="speak_speed_limit">Limitation de vitesse</string>
+    <string name="speak_speed_limit">Limitations de vitesse</string>
     <string name="shared_string_about">À propos</string>
     <string name="about_settings_descr">Note de version, licences, membres du projet</string>
     <string name="local_index_tile_data_zooms">Zooms téléchargés : %1$s</string>
@@ -1032,7 +1032,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="driving_region">Région de conduite</string>
     <string name="driving_region_europe_asia">Europe, Asie, Amérique latine et équivalent</string>
     <string name="driving_region_uk">Royaume-Uni, Inde et équivalents</string>
-    <string name="speak_title">Annonce…</string>
+    <string name="speak_title">Annoncer…</string>
     <string name="speak_cameras">Radars</string>
     <string name="speak_traffic_warnings">Alertes de trafic</string>
     <string name="osb_author_or_password_not_specified">Merci d\'indiquer votre nom d\'utilisateur et mot de passe OSM dans les paramètres</string>
@@ -1186,7 +1186,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="keep_informing_descr">Répéter les instructions de navigation à intervalles réguliers.</string>
     <string name="keep_informing">Répéter les instructions de navigation</string>
     <string name="navigation_intent_invalid">Format invalide : %s</string>
-    <string name="arrival_distance">Annonce de l\'arrivée</string>
+    <string name="arrival_distance">Annonce d\'arrivée</string>
     <string name="arrival_distance_descr">Quand souhaitez-vous être informé de l\'arrivée à destination ?</string>
     <string name="shared_string_share">Partager</string>
     <string name="share_fav_subject">Favoris partagés grâce à OsmAnd</string>
@@ -1237,7 +1237,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="sort_by_distance">Trier par distance</string>
     <string name="sort_by_name">Trier par nom</string>
     <string name="no_index_file_to_download">Aucun téléchargement trouvé, veuillez vérifier votre connexion Internet.</string>
-    <string name="none_selected_gpx">Aucun fichier GPX sélectionné. Pressez longuement sur un fichier pour le sélectionner.</string>
+    <string name="none_selected_gpx">"Aucun fichier GPX sélectionné. Appuyez  longuement sur un fichier pour le sélectionner."</string>
     <string name="local_index_select_gpx_file">Sélectionnez pour afficher</string>
     <string name="keep_navigation_service">Conserver</string>
     <string name="stop_navigation_service">Arrêter</string>
@@ -1247,8 +1247,8 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="map_preferred_locale_descr">Langue préférée des libellés sur la carte (en cas d\'indisponibilité affiche les noms anglais ou locaux).</string>
     <string name="map_preferred_locale">Langue préférée pour la carte</string>
     <string name="local_map_names">Noms locaux</string>
-    <string name="lang_sw">swahili</string>
-    <string name="lang_he">hébreux</string>
+    <string name="lang_sw">Swahili</string>
+    <string name="lang_he">Hébreu</string>
     <string name="forward">Suivant</string>
     <string name="home">Tableau de bord</string>
     <string name="live_monitoring_m_descr">Envoyer les positions à un service Web lorsque l\'enregistrement GPX est activé.</string>
@@ -1270,10 +1270,10 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="rendering_attr_showSurfaceGrade_name">Afficher la qualité des routes</string>
     <string name="rendering_attr_showSurfaces_name">Afficher la surface des routes</string>
     <string name="rendering_attr_showCycleRoutes_name">Afficher les itinéraires cyclables</string>
-    <string name="lang_fa">perse</string>
+    <string name="lang_fa">Persan</string>
     <string name="lang_al">albanais</string>
     <string name="lang_ar">Arabe</string>
-    <string name="lang_sc">sarde</string>
+    <string name="lang_sc">Sarde</string>
     <string name="lang_sr">Serbe (cyrillique)</string>
     <string name="lang_zh_cn">Chinois (simplifié)</string>
     <string name="lang_zh_tw">Chinois (traditionnel)</string>
@@ -1460,7 +1460,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
     <string name="location_on_map">Position :\n Lat. %1$s\n Lon. %2$s</string>
     <string name="days_behind">jours passés</string>
     <string name="rename_failed">Échec du renommage.</string>
-    <string name="shared_string_currently_recording_track">Enregistrement de l\'itinéraire en cours</string>
+    <string name="shared_string_currently_recording_track">Enregistrement d\'itinéraire en cours</string>
     <string name="back_to_map">Retour à la carte</string>
     <string name="shared_string_selected">Sélectionné</string>
     <string name="track_points">Points de la trace</string>
@@ -2940,7 +2940,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="rendering_attr_highway_class_footway_name">Passerelle</string>
     <string name="rendering_attr_highway_class_track_name">Piste</string>
     <string name="rendering_attr_highway_class_bridleway_name">Passage piéton</string>
-    <string name="rendering_attr_highway_class_steps_name">Étape</string>
+    <string name="rendering_attr_highway_class_steps_name">Étapes</string>
     <string name="rendering_attr_highway_class_path_name">Chemin</string>
     <string name="rendering_attr_highway_class_cycleway_name">Voie cyclable</string>
     <string name="rendering_attr_undefined_name">Non défini</string>
@@ -3182,4 +3182,9 @@ représentant la zone : %1$s x %2$s</string>
     <string name="app_mode_campervan">Caravane</string>
     <string name="rendering_attr_showLez_description">Afficher les zones à faibles émissions sur la carte (n\'influe pas sur l\'itinéraire).</string>
     <string name="rendering_attr_showLez_name">Afficher les zones à faibles émissions</string>
+    <string name="new_route_calculated_dist_dbg">Itinéraire : distance %s, durée %s 
+\nCalculs : %.1f secondes, %d routes, %d tuiles)</string>
+    <string name="lang_oc">Occitan</string>
+    <string name="app_mode_wagon">Wagon</string>
+    <string name="app_mode_pickup_truck">Camionnette</string>
 </resources>

OsmAnd/res/values-he/strings.xml

@@ -2897,7 +2897,7 @@
     <string name="shared_string_capacity">נפח</string>
     <string name="shared_string_width">רוחב</string>
     <string name="shared_string_height">גובה</string>
-    <string name="routeInfo_roadClass_name">מחלקה</string>
+    <string name="routeInfo_roadClass_name">סוג דרך</string>
     <string name="routeInfo_surface_name">משטח</string>
     <string name="routeInfo_smoothness_name">רכות</string>
     <string name="routeInfo_steepness_name">תלילות</string>
@@ -2911,7 +2911,7 @@
     <string name="tracks_on_map">עקבות מוצגים</string>
     <string name="time_of_day">השעה ביום</string>
     <string name="by_transport_type">עם %1$s</string>
-    <string name="step_by_step">שלב אחר שלב</string>
+    <string name="step_by_step">פנייה אחר פנייה</string>
     <string name="routeInfo_road_types_name">סוגי כבישים</string>
     <string name="exit_at">לצאת ב־</string>
     <string name="quick_action_show_hide_gpx_tracks">הצגה/הסתרה של מסלולי GPX</string>
@@ -3170,4 +3170,40 @@
     <string name="rendering_attr_highway_class_track_grade3_name">רמה 3</string>
     <string name="rendering_attr_highway_class_track_grade4_name">רמה 4</string>
     <string name="rendering_attr_highway_class_track_grade5_name">רמה 5</string>
+    <string name="routing_profile_geocoding">גאוקודינג</string>
+    <string name="routing_attr_piste_type_skitour_name">טיול סקי</string>
+    <string name="routing_attr_piste_type_skitour_description">מסלולי טיולי סקי.</string>
+    <string name="new_route_calculated_dist_dbg">מסלול: מרחק %s, זמן מנתב מסלול %s 
+\nחישוב: %.1f שנ׳, %d מסלולים, %d אריחים)</string>
+    <string name="make_osmand_better_descr">לאפשר ל־OsmAnd לאסוף ולעבד נתונים אלמוניים בנוגע לשימוש ביישומון. אנו לא אוספים או מאחסנים נתונים על המיקום שלך, או על מיקום בהם צפית במפה.
+\n
+\nבאפשרותך לשנות את בחירתך בכל עת דרך הגדרות &gt; פרטיות ואבטחה.</string>
+    <string name="routing_attr_piste_type_nordic_name">סקי למרחקים/נורדי</string>
+    <string name="routing_attr_piste_type_nordic_description">מסלולים לסקי נורדי או למרחקים.</string>
+    <string name="routing_attr_allow_intermediate_description">מסלולים קשים יותר עם מקטעים יותר תלולים. בדרך כלל עם מכשולים שרצוי להימנע מהם.</string>
+    <string name="release_3_4">• פרופילי יישומון: יצירת פרופיל שמותאם אישית לצרכיך, עם סמל וצבע לבחירתך
+\n
+\n • מעתה ניתן להתאים לפרופיל את המהירות המרבית/מזערית ואת בררת המחדל
+\n
+\n • נוסף וידג׳ט לנקודות הציון הנוכחיות
+\n
+\n • נוספו אפשרויות להצגת מצפן וסרגל רדיוס במפה
+\n
+\n • תיקון תיעוד מסלול ברקע
+\n
+\n • שיפור הורדות רקע של מפות
+\n
+\n • הוחזרה האפשרות ‚הפעלת המסך’
+\n
+\n • תוקנה בחירת השפות בוויקיפדיה
+\n
+\n • תוקנה התנהגות כפתור המצפן במהלך ניווט
+\n
+\n • תיקוני תקלות נוספים
+\n
+\n</string>
+    <string name="lang_oc">אוקסיטנית</string>
+    <string name="select_base_profile_dialog_message">באפשרותך לבסס את הפרופיל שלך על אחד מפרופילי בררת המחדל של היישומון, פעולה זו מגדירה את ההגדרות הבסיסיות כמו אופן הצגת וידג׳טים כבררת מחדל ויחידות של מהירות ומרחק. אלו פרופילי בררת המחדל של היישומון, יחד עם דוגמאות של פרופילים מותאמים אישית ניתן להרחיב אותם לכדי:</string>
+    <string name="app_mode_wagon">קרון</string>
+    <string name="app_mode_pickup_truck">טנדר</string>
 </resources>

OsmAnd/res/values-hi/strings.xml

@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
-  <!--
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--
     	 Disclaimer : 
          If you are going to translate strings, please make sure : 
          1. There is no duplicate strings by name
@@ -7,8 +8,158 @@
          If you are making/correcting english translations make sure :
          1. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     -->
-<string name="shared_string_no">नही</string>
-	<string name="shared_string_yes">हा</string>
-	<string name="prefer_motorways">बडी सड़को को प्राधान्य दो</string>
-	<string name="prefer_in_routing_title">प्राधान्य…</string>
-	</resources>
+    <string name="shared_string_no">नही</string>
+    <string name="shared_string_yes">हा</string>
+    <string name="prefer_motorways">बडी सड़को को प्राधान्य दो</string>
+    <string name="prefer_in_routing_title">प्राधान्य…</string>
+    <string name="shared_string_walk">टहल लो</string>
+    <string name="save_poi_value_exceed_length">टैग \"%s\" की अधिकतम लंबाई 255 वर्ण है।कृपया जारी रखने के लिए छोटा करें।</string>
+    <string name="save_poi_value_exceed_length_title">\"%s\" मान की लंबाई</string>
+    <string name="avoid_pt_types_descr">नेविगेशन के लिए बचने के लिए सार्वजनिक परिवहन प्रकारों का चयन करें:</string>
+    <string name="avoid_pt_types">परिवहन प्रकारों से बचें …</string>
+    <string name="quick_action_day_night_mode">%s मोड</string>
+    <string name="shared_string_degrees">डिग्री</string>
+    <string name="shared_string_milliradians">Milliradians</string>
+    <string name="angular_measeurement">कोणीय इकाई</string>
+    <string name="angular_measeurement_descr">बदलें जो azimuth में मापा जाता है।</string>
+    <string name="routing_attr_avoid_tram_name">ट्राम से बचें</string>
+    <string name="routing_attr_avoid_tram_description">ट्राम से बचें</string>
+    <string name="routing_attr_avoid_bus_name">बसों से बचें</string>
+    <string name="routing_attr_avoid_bus_description">बसों और ट्रॉलीबस से बचें</string>
+    <string name="routing_attr_avoid_share_taxi_name">शेयर टैक्सी से बचें</string>
+    <string name="routing_attr_avoid_share_taxi_description">शेयर टैक्सी से बचें</string>
+    <string name="routing_attr_avoid_train_name">ट्रेनों से बचें</string>
+    <string name="routing_attr_avoid_train_description">ट्रेनों से बचें</string>
+    <string name="routing_attr_avoid_subway_name">सबवे से बचें</string>
+    <string name="routing_attr_avoid_subway_description">सबवे और हल्के रेल परिवहन से बचें</string>
+    <string name="routing_attr_avoid_ferry_name">फेरी से बचें</string>
+    <string name="routing_attr_avoid_ferry_description">फेरी से बचें</string>
+    <string name="send_log">लॉग भेजें</string>
+    <string name="files_moved">%1$d फ़ाइलें (%2$s) चली गईं</string>
+    <string name="files_copied">नकल %1$d फाइलें (%2$s)</string>
+    <string name="files_failed">%1$d फ़ाइलों (%2$s) की प्रतिलिपि बनाने में विफल</string>
+    <string name="files_present">%1$d फ़ाइलें (%2$s) पिछले स्थान \'%3$s\' पर मौजूद हैं।</string>
+    <string name="move_maps">नक्शे ले जाएँ</string>
+    <string name="dont_move_maps">हिलना मत</string>
+    <string name="public_transport_no_route_title">दुर्भाग्य से, OsmAnd आपकी सेटिंग के लिए उपयुक्त मार्ग नहीं खोज सका।</string>
+    <string name="public_transport_try_ped">पैदल यात्री नेविगेशन की कोशिश करें।</string>
+    <string name="public_transport_try_change_settings">सेटिंग्स को बदलने का प्रयास करें।</string>
+    <string name="public_transport_calc_pedestrian">पैदल मार्ग की गणना करें</string>
+    <string name="public_transport_type">परिवहन प्रकार</string>
+    <string name="searching_gps">जीपीएस की खोज</string>
+    <string name="coordinates_widget">निर्देशांक विजेट</string>
+    <string name="rate_dialog_descr">कृपया अपनी प्रतिक्रिया साझा करके हमें 30 सेकंड दें और Google Play पर हमारे काम को रेटिंग दें।</string>
+    <string name="button_rate">मूल्यांकन करें</string>
+    <string name="shared_string_privacy_policy">गोपनीयता नीति</string>
+    <string name="help_us_make_osmand_better">हमें OsmAnd को बेहतर बनाने में मदद करें!</string>
+    <string name="choose_data_to_share">चुनें कि आप किस प्रकार का डेटा साझा करना चाहते हैं:</string>
+    <string name="downloaded_maps">मैप्स डाउनलोड किया</string>
+    <string name="visited_screens">स्क्रीन का दौरा किया</string>
+    <string name="collected_data_descr">परिभाषित करें कि आप किस डेटा को ऑस्किंड को साझा करने की अनुमति देते हैं।</string>
+    <string name="downloaded_maps_collect_descr">हमें यह समझने में मदद करें कि कौन से क्षेत्र और देश के नक्शे सबसे लोकप्रिय हैं।</string>
+    <string name="visited_screens_collect_descr">हमें यह समझने में मदद करें कि कौन से ऑस्किंड फीचर सबसे लोकप्रिय हैं।</string>
+    <string name="privacy_and_security_change_descr">\"अनुमति दें\" पर टैप करके आप हमारे %1$s से सहमत होते हैं</string>
+    <string name="settings_privacy_and_security">गोपनीयता और सुरक्षा</string>
+    <string name="settings_privacy_and_security_desc">वह डेटा चुनें जिसे आप हमारे साथ साझा कर रहे हैं</string>
+    <string name="shared_string_no_thank_you">नहीं, धन्यवाद</string>
+    <string name="shared_string_allow">अनुमति दें</string>
+    <string name="profile_name_hint">प्रोफ़ाइल नाम</string>
+    <string name="nav_type_hint">नेविगेशन प्रकार</string>
+    <string name="app_mode_taxi">टैक्सी</string>
+    <string name="app_mode_shuttle_bus">लोकल बस</string>
+    <string name="app_mode_subway">भूमिगत मार्ग</string>
+    <string name="app_mode_horse">घोड़ा</string>
+    <string name="app_mode_helicopter">हेलीकॉप्टर</string>
+    <string name="osmand_routing_promo">आप फ़ाइल का अपना संशोधित संस्करण जोड़ सकते हैं</string>
+    <string name="app_mode_skiing">स्कीइंग</string>
+    <string name="base_profile_descr_ski">स्कीइंग</string>
+    <string name="show_compass_ruler">कम्पास शासक दिखाएँ</string>
+    <string name="hide_compass_ruler">कम्पास शासक छिपाएँ</string>
+    <string name="select_icon_profile_dialog_title">आइकन का चयन करें</string>
+    <string name="settings_routing_mode_string">विधि: %s</string>
+    <string name="settings_derived_routing_mode_string">उपयोगकर्ता मोड, %s से लिया गया है</string>
+    <string name="routing_profile_ski">स्की</string>
+    <string name="profile_type_descr_string">टाइप: %s</string>
+    <string name="profile_type_base_string">आधार प्रोफ़ाइल</string>
+    <string name="profile_alert_need_routing_type_title">नेविगेशन प्रकार का चयन करें</string>
+    <string name="profile_alert_need_routing_type_msg">कृपया नए एप्लिकेशन प्रोफ़ाइल के लिए एक नेविगेशन प्रकार चुनें</string>
+    <string name="profile_alert_need_profile_name_title">प्रोफ़ाइल दर्ज करें</string>
+    <string name="profile_alert_need_profile_name_msg">प्रोफ़ाइल नाम खाली नहीं होना चाहिए!</string>
+    <string name="profile_alert_duplicate_name_title">डुप्लिकेट नाम</string>
+    <string name="profile_alert_duplicate_name_msg">उस नाम के साथ पहले से ही प्रोफ़ाइल है</string>
+    <string name="profile_alert_cant_delete_base">आप OsmAnd का आधार प्रोफ़ाइल नहीं हटा सकते</string>
+    <string name="profile_alert_need_save_title">परिवर्तनों को सुरक्षित करें</string>
+    <string name="profile_alert_need_save_msg">आगे बढ़ने से पहले आपको प्रोफाइल में बदलाव को सहेजना होगा</string>
+    <string name="profile_alert_delete_title">प्रोफ़ाइल हटाएं</string>
+    <string name="profile_alert_delete_msg">क्या आप सुनिश्चित हैं कि आप %s प्रोफ़ाइल हटाना चाहते हैं</string>
+    <string name="select_base_profile_dialog_title">एक आधार प्रोफ़ाइल का चयन करें</string>
+    <string name="select_base_profile_dialog_message">डिफ़ॉल्ट ऐप प्रोफाइल में से एक पर अपने कस्टम प्रोफ़ाइल को आधार बनाएं, यह बुनियादी सेटअप को विगेट्स की डिफ़ॉल्ट दृश्यता और गति और दूरी की इकाइयों को परिभाषित करता है। ये डिफ़ॉल्ट ऐप प्रोफाइल हैं, साथ में कस्टम प्रोफाइल के उदाहरणों के साथ उन्हें निम्न तक बढ़ाया जा सकता है:</string>
+    <string name="select_nav_profile_dialog_title">नेविगेशन प्रकार का चयन करें</string>
+    <string name="base_profile_descr_car">कार, ट्रक, मोटर साइकिल</string>
+    <string name="base_profile_descr_bicycle">एमटीबी, मोपेड, घोड़े</string>
+    <string name="base_profile_descr_pedestrian">घूमना, लंबी पैदल यात्रा, चल</string>
+    <string name="base_profile_descr_public_transport">सभी पीटी प्रकार</string>
+    <string name="base_profile_descr_boat">जहाज, रोइंग, नौकायन</string>
+    <string name="base_profile_descr_aircraft">हवाई जहाज, ग्लाइडिंग</string>
+    <string name="routing_profile_geocoding">जियोकोडिंग</string>
+    <string name="routing_profile_straightline">सीधी रेखा</string>
+    <string name="routing_profile_broutrer">बी राउटर (ऑफ़लाइन)</string>
+    <string name="osmand_default_routing">OsmAnd मार्ग</string>
+    <string name="custom_routing">कस्टम मार्ग प्रोफ़ाइल</string>
+    <string name="special_routing_type">विशेष मार्ग</string>
+    <string name="third_party_routing_type">थर्ड-पार्टी रूटिंग</string>
+    <string name="application_profiles_descr">एप्लिकेशन में दिखाई देने वाली प्रोफ़ाइल का चयन करें।</string>
+    <string name="application_profiles">आवेदन प्रोफ़ाइल</string>
+    <string name="process_downloading_service">OsmAnd डाउनलोडिंग सेवा</string>
+    <string name="shared_string_color_magenta">मैजेंटा</string>
+    <string name="shared_string_icon">चिह्न</string>
+    <string name="collected_data">आकड़ों को एकत्र किया</string>
+    <string name="press_again_to_change_the_map_orientation">मैप ओरिएंटेशन बदलने के लिए फिर से टैप करें</string>
+    <string name="shared_string_min_speed">Min.speed</string>
+    <string name="shared_string_max_speed">मैक्स गति</string>
+    <string name="default_speed_setting_title">डिफ़ॉल्ट गति</string>
+    <string name="default_speed_setting_descr">डिफ़ॉल्ट गति सेटिंग्स बदलें</string>
+    <string name="minmax_speed_dialog_title">न्यूनतम / अधिकतम गति सेट करें</string>
+    <string name="default_speed_dialog_msg">राउटिंग के दौरान अपेक्षित आगमन समय की गणना करने के लिए उपयोग किया जाता है</string>
+    <string name="new_profile">नई प्रोफ़ाइल</string>
+    <string name="shared_string_crash">दुर्घटना</string>
+    <string name="last_launch_crashed">OsmAnd का पिछला लॉन्च विफल रहा। कृपया त्रुटि संदेश साझा करके OsmAnd को बेहतर बनाने में हमारी मदद करें।</string>
+    <string name="app_mode_ufo">उफौ</string>
+    <string name="app_mode_personal_transporter">व्यक्तिगत ट्रांसपोर्टर</string>
+    <string name="app_mode_monowheel">Monowheel</string>
+    <string name="app_mode_scooter">स्कूटर</string>
+    <string name="precision_hdop_and_vdop">परिशुद्धता क्षैतिज: %1$s, लंबवत: %2$s</string>
+    <string name="precision_hdop">सटीक क्षैतिज: %s</string>
+    <string name="app_mode_offroad">सड़क से हटकर</string>
+    <string name="edit_profile_setup_title">सेटअप प्रोफ़ाइल</string>
+    <string name="edit_profile_setup_subtitle">प्रोफ़ाइल अपनी सेटिंग्स रखता है</string>
+    <string name="edit_profile_setup_map_subtitle">प्रोफ़ाइल के लिए डिफ़ॉल्ट मानचित्र विकल्पों का चयन करें</string>
+    <string name="edit_profile_screen_options_subtitle">प्रोफ़ाइल के लिए डिफ़ॉल्ट स्क्रीन विकल्प चुनें</string>
+    <string name="edit_profile_nav_settings_subtitle">प्रोफ़ाइल के लिए डिफ़ॉल्ट नेविगेशन सेटिंग्स चुनें</string>
+    <string name="routing_attr_max_num_changes_description">अधिकतम परिवर्तन निर्दिष्ट करें</string>
+    <string name="routing_attr_max_num_changes_name">परिवर्तनों की संख्या</string>
+    <string name="turn_screen_on_router">बारी आने पर जगाओ</string>
+    <string name="turn_screen_on_time_descr">वह समय सेट करें जिसके लिए स्क्रीन चालू होगी।</string>
+    <string name="turn_screen_on_sensor">निकटता सेंसर का उपयोग करें</string>
+    <string name="turn_screen_on_sensor_descr">नेविगेट करते समय स्क्रीन को चालू करने के लिए स्क्रीन के शीर्ष पर अपना हाथ लहरें।</string>
+    <string name="turn_on_profile_desc">इस सेटिंग का उपयोग करने के लिए कृपया कम से कम एक एप्लिकेशन प्रोफ़ाइल चालू करें।</string>
+    <string name="rendering_attr_winter_road_name">सर्दियों की सड़क</string>
+    <string name="rendering_attr_ice_road_name">बर्फ की सड़क</string>
+    <string name="routeInfo_winter_ice_road_name">सर्दी और बर्फ की सड़क</string>
+    <string name="rendering_attr_tracktype_grade1_name">ठोस (प्रशस्त)</string>
+    <string name="rendering_attr_tracktype_grade2_name">ठोस (कच्चे)</string>
+    <string name="rendering_attr_tracktype_grade3_name">ज्यादातर ठोस</string>
+    <string name="rendering_attr_tracktype_grade4_name">ज्यादातर नरम</string>
+    <string name="rendering_attr_tracktype_grade5_name">मुलायम</string>
+    <string name="routeInfo_tracktype_name">सतह दृढ़ता</string>
+    <string name="shared_string_file_is_saved">%s सहेजा गया है</string>
+    <string name="shared_string_open_track">खुला ट्रैक</string>
+    <string name="shared_string_track_is_saved">ट्रैक %s सहेजा गया है</string>
+    <string name="gpx_join_gaps">अंतराल में शामिल हों</string>
+    <string name="app_mode_camper">पर्यटक</string>
+    <string name="app_mode_campervan">शिविर वैन</string>
+    <string name="rendering_attr_showLez_description">मानचित्र पर कम उत्सर्जन क्षेत्र दिखाएं। रूटिंग को प्रभावित नहीं करता है।</string>
+    <string name="rendering_attr_showLez_name">कम उत्सर्जन क्षेत्र दिखाएं</string>
+    <string name="temporary_conditional_routing">अस्थायी सीमाओं पर विचार करें</string>
+    <string name="shared_string_default">चूक</string>
+</resources>

OsmAnd/res/values-hu/strings.xml

@@ -3095,7 +3095,7 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="rendering_attr_tracktype_grade5_name">Laza</string>
     <string name="routeInfo_tracktype_name">Burkolat szilárdsága</string>
     <string name="shared_string_file_is_saved">%s elmentve</string>
-    <string name="shared_string_open_track">Nyitott nyomvonal</string>
+    <string name="shared_string_open_track">Nyomvonal megnyitása</string>
     <string name="shared_string_track_is_saved">%s nyomvonal elmentve</string>
     <string name="select_nav_profile_dialog_title">Navigációs mód kijelölése</string>
     <string name="base_profile_descr_car">Személyautó, teherautó, motorkerékpár</string>

OsmAnd/res/values-is/phrases.xml

@@ -2695,7 +2695,7 @@
     <string name="poi_aerialway_summer_access_exit">Aðgangur að sumarlagi: einungis útgangur</string>
     <string name="poi_aerialway_summer_access_both">Aðgangur að sumarlagi: út- og inngangur</string>
     <string name="poi_love_hotel">Elskendahótel</string>
-    <string name="poi_payment_pikepass_designated">PIKEPASS (uppgefið)</string>
+    <string name="poi_payment_pikepass_designated">PIKEPASS (sérstakt)</string>
     <string name="poi_payment_routex_yes">Routex</string>
     <string name="poi_payment_routex_no">Ekki tekið við Routex eldsneytiskortum</string>
     <string name="poi_payment_bancomat_yes">Bancomat</string>
@@ -2772,7 +2772,7 @@
     <string name="poi_vending_water">Vatnssjálfsali</string>
     <string name="poi_vending_telephone_vouchers">Símaávísanir</string>
     <string name="poi_vending_vouchers">Greiðsluseðlar</string>
-    <string name="poi_wheelchair_designated">Uppgefið</string>
+    <string name="poi_wheelchair_designated">Sérstakt</string>
     <string name="poi_socket_cee_blue">Rafmagnsinnstunga: CEE blátt</string>
     <string name="poi_socket_cee_blue_current">Rafmagnsinnstunga: CEE blátt: straumur</string>
     <string name="poi_socket_cee_blue_output">Rafmagnsinnstunga: CEE blátt: úttak</string>
@@ -3589,4 +3589,117 @@
     <string name="poi_historic_tank">Sögulegur tankur</string>
     <string name="poi_hookah_lounge">Hookah-skáli</string>
     <string name="poi_source_biomass">Orkugjafi: lífmassi</string>
+    <string name="poi_snowmobile_filter">Aðgangur vélsleða</string>
+    <string name="poi_access_bus">Aðgangur fólksflutningabíla</string>
+    <string name="poi_access_caravan">Aðgangur hjólhýsa</string>
+    <string name="poi_access_motorhome">Aðgangur húsbíla</string>
+    <string name="poi_access_trailer">Aðgangur tengivagna</string>
+    <string name="poi_access_motorcycle">Aðgangur bifhjóla</string>
+    <string name="poi_access_moped">Aðgangur skellinaðra</string>
+    <string name="poi_access_mofa">Aðgangur vélknúinna reiðhjóla</string>
+    <string name="poi_access_hgv">Aðgangur þyngri vöruflutningabifreiða</string>
+    <string name="poi_access_goods">Aðgangur léttra sendibíla</string>
+    <string name="poi_access_disabled">Aðgangur fyrir fatlaða</string>
+    <string name="poi_taxi_office">Leigubílaskrifstofa</string>
+    <string name="poi_vehicle_yes">Aðgangur farartækja: já</string>
+    <string name="poi_vehicle_private">Aðgangur farartækja: einka</string>
+    <string name="poi_vehicle_no">Aðgangur farartækja: nei</string>
+    <string name="poi_vehicle_destination">Aðgangur farartækja: áfangastaður</string>
+    <string name="poi_vehicle_permissive">Aðgangur farartækja: með leyfi</string>
+    <string name="poi_vehicle_customers">Aðgangur farartækja: viðskiptavinir</string>
+    <string name="poi_vehicle_military">Aðgangur farartækja: hernaðarlegur</string>
+    <string name="poi_vehicle_delivery">Aðgangur farartækja: vöruafhending</string>
+    <string name="poi_vehicle_forestry">Aðgangur farartækja: skógrækt</string>
+    <string name="poi_motorcar_yes">Aðgangur bifreiða:</string>
+    <string name="poi_motorcar_private">Aðgangur bifreiða: einka</string>
+    <string name="poi_motorcar_no">Aðgangur bifreiða: nei</string>
+    <string name="poi_motorcar_destination">Aðgangur bifreiða: áfangastaður</string>
+    <string name="poi_motorcar_permissive">Aðgangur bifreiða: með leyfi</string>
+    <string name="poi_motorcar_customers">Aðgangur bifreiða: viðskiptavinir</string>
+    <string name="poi_motorcar_forestry">Aðgangur bifreiða: skógrækt</string>
+    <string name="poi_motor_vehicle_yes">Aðgangur vélknúinna farartækja: já</string>
+    <string name="poi_motor_vehicle_private">Aðgangur vélknúinna farartækja: einka</string>
+    <string name="poi_motor_vehicle_no">Aðgangur vélknúinna farartækja: nei</string>
+    <string name="poi_motor_vehicle_destination">Aðgangur vélknúinna farartækja: áfangastaður</string>
+    <string name="poi_motor_vehicle_permissive">Aðgangur vélknúinna farartækja: með leyfi</string>
+    <string name="poi_motor_vehicle_customers">Aðgangur vélknúinna farartækja: viðskiptavinir</string>
+    <string name="poi_motor_vehicle_military">Aðgangur vélknúinna farartækja: hernaðarlegur</string>
+    <string name="poi_motor_vehicle_delivery">Aðgangur vélknúinna farartækja: vöruafhending</string>
+    <string name="poi_motor_vehicle_forestry">Aðgangur vélknúinna farartækja: skógrækt</string>
+    <string name="poi_motor_vehicle_agricultural">Aðgangur vélknúinna farartækja: landbúnaður</string>
+    <string name="poi_hgv_private">Aðgangur þyngri vöruflutningabifreiða: einka</string>
+    <string name="poi_hgv_no">Aðgangur þyngri vöruflutningabifreiða: nei</string>
+    <string name="poi_hgv_agricultural">Aðgangur þyngri vöruflutningabifreiða: landbúnaður</string>
+    <string name="poi_hgv_discouraged">Aðgangur þyngri vöruflutningabifreiða: ekki ráðlagður</string>
+    <string name="poi_hgv_unsuitable">Aðgangur þyngri vöruflutningabifreiða: óhentugur</string>
+    <string name="poi_goods_no">Aðgangur léttra sendibifreiða: nei</string>
+    <string name="poi_motorcycle_private">Aðgangur bifhjóla: einka</string>
+    <string name="poi_motorcycle_no">Aðgangur bifhjóla: nei</string>
+    <string name="poi_moped_no">Aðgangur skellinaðra: nei</string>
+    <string name="poi_mofa_no">Aðgangur vélknúinna reiðhjóla: nei</string>
+    <string name="poi_bicycle_private">Aðgangur reiðhjóla: einka</string>
+    <string name="poi_bicycle_dismount">Aðgangur reiðhjóla: fara af baki</string>
+    <string name="poi_bicycle_destination">Aðgangur reiðhjóla: áfangastaður</string>
+    <string name="poi_bicycle_permissive">Aðgangur reiðhjóla: með leyfi</string>
+    <string name="poi_bicycle_customers">Aðgangur reiðhjóla: viðskiptavinir</string>
+    <string name="poi_horse_private">Aðgangur ríðandi: einka</string>
+    <string name="poi_horse_destination">Aðgangur ríðandi: áfangastaður</string>
+    <string name="poi_horse_permissive">Aðgangur ríðandi: með leyfi</string>
+    <string name="poi_horse_forestry">Aðgangur ríðandi: skógrækt</string>
+    <string name="poi_foot_yes">Aðgangur fótgangandi: já</string>
+    <string name="poi_foot_private">Aðgangur fótgangandi: einka</string>
+    <string name="poi_foot_no">Aðgangur fótgangandi: nei</string>
+    <string name="poi_foot_destination">Aðgangur fótgangandi: áfangastaður</string>
+    <string name="poi_foot_permissive">Aðgangur fótgangandi: með leyfi</string>
+    <string name="poi_foot_customers">Aðgangur fótgangandi: viðskiptavinir</string>
+    <string name="poi_caravan_no">Aðgangur hjólhýsa: nei</string>
+    <string name="poi_motorhome_no">Aðgangur húsbíla: nei</string>
+    <string name="poi_trailer_no">Aðgangur hjólhýsa: nei</string>
+    <string name="poi_psv_yes">Aðgangur þjónustubifreiða: já</string>
+    <string name="poi_psv_designated">Aðgangur þjónustubifreiða: sérstakur</string>
+    <string name="poi_psv_no">Aðgangur þjónustubifreiða: nei</string>
+    <string name="poi_bus_no">Aðgangur strætisvagna: nei</string>
+    <string name="poi_tourist_bus_yes">Aðgangur hópferðabíla: já</string>
+    <string name="poi_tourist_bus_designated">Aðgangur hópferðabíla: sérstakur</string>
+    <string name="poi_tourist_bus_no">Aðgangur hópferðabíla: nei</string>
+    <string name="poi_coach_yes">Aðgangur langferðabifreiða: já</string>
+    <string name="poi_coach_no">Aðgangur langferðabifreiða: nei</string>
+    <string name="poi_ski_yes">"Aðgangur skíðandi:  já"</string>
+    <string name="poi_ski_no">Aðgangur skíðandi: nei</string>
+    <string name="poi_snowmobile_private">Aðgangur vélsleða: einka</string>
+    <string name="poi_snowmobile_no">Aðgangur vélsleða: nei</string>
+    <string name="poi_agricultural_yes">Aðgangur landbúnaðartækja: já</string>
+    <string name="poi_agricultural_no">Aðgangur landbúnaðartækja: nei</string>
+    <string name="poi_taxi_yes">Aðgangur leigubíla: já</string>
+    <string name="poi_taxi_designated">Aðgangur leigubíla: sérstakur</string>
+    <string name="poi_taxi_no">Aðgangur leigubíla: nei</string>
+    <string name="poi_disabled_no">Aðgangur fyrir fatlaða: nei</string>
+    <string name="poi_snowmobile_yes">Já</string>
+    <string name="poi_snowmobile_designated">Sérstakt</string>
+    <string name="poi_snowmobile_permissive">Með leyfi</string>
+    <string name="poi_bus_yes">Já</string>
+    <string name="poi_bus_designated">Sérstakt</string>
+    <string name="poi_caravan_yes">Já</string>
+    <string name="poi_caravan_designated">Sérstakt</string>
+    <string name="poi_motorhome_yes">Já</string>
+    <string name="poi_motorhome_designated">Sérstakt</string>
+    <string name="poi_trailer_yes">Já</string>
+    <string name="poi_trailer_designated">Sérstakt</string>
+    <string name="poi_motorcycle_yes">Já</string>
+    <string name="poi_motorcycle_permissive">Með leyfi</string>
+    <string name="poi_motorcycle_destination">Áfangastaður</string>
+    <string name="poi_motorcycle_designated">Sérstakt</string>
+    <string name="poi_moped_yes">Já</string>
+    <string name="poi_moped_designated">Sérstakt</string>
+    <string name="poi_mofa_yes">Já</string>
+    <string name="poi_mofa_designated">Sérstakt</string>
+    <string name="poi_hgv_yes">Já</string>
+    <string name="poi_hgv_destination">Áfangastaður</string>
+    <string name="poi_hgv_permissive">Með leyfi</string>
+    <string name="poi_hgv_designated">Sérstakt</string>
+    <string name="poi_hgv_delivery">Vöruafhending</string>
+    <string name="poi_goods_yes">Já</string>
+    <string name="poi_goods_designated">Sérstakt</string>
+    <string name="poi_disabled_yes">Já</string>
+    <string name="poi_disabled_designated">Sérstakt</string>
 </resources>

OsmAnd/res/values-is/strings.xml

@@ -3228,4 +3228,9 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="rendering_attr_showLez_name">Birta svæði með takmörkunum á útblæstri</string>
     <string name="temporary_conditional_routing">Taka tillit til tímabundinna takmarkana</string>
     <string name="shared_string_default">Sjálfgefið</string>
+    <string name="new_route_calculated_dist_dbg">Leið: vegalengd %s, tími leiðsagnar %s 
+\nÚtreikningur: %.1f sek, %d vegir, %d kortaflísar)</string>
+    <string name="lang_oc">Occitanska</string>
+    <string name="app_mode_wagon">Dráttarvagn</string>
+    <string name="app_mode_pickup_truck">Pallbíll</string>
 </resources>

OsmAnd/res/values-it/phrases.xml

@@ -70,7 +70,7 @@
     <string name="poi_public_transport_station">Stazione trasporto pubblico</string>
     <string name="poi_bus_station">Stazione autobus</string>
     <string name="poi_subway_entrance">Entrata metropolitana</string>
-    <string name="poi_subway_station">Sì</string>
+    <string name="poi_subway_station">sì</string>
     <string name="poi_aerodrome">Aeroporto</string>
     <string name="poi_helipad">Eliporto</string>
     <string name="poi_bicycle_rental">Noleggio bici</string>
@@ -931,12 +931,12 @@
     <string name="poi_disused">In disuso</string>
     <string name="poi_operator">Operatore</string>
     <string name="poi_brand">Marchio</string>
-    <string name="poi_fee_yes">Sì</string>
-    <string name="poi_fee_no">No</string>
-    <string name="poi_drinking_water_yes">Sì</string>
-    <string name="poi_drinking_water_no">No</string>
-    <string name="poi_seasonal_yes">Sì</string>
-    <string name="poi_seasonal_no">No</string>
+    <string name="poi_fee_yes">sì</string>
+    <string name="poi_fee_no">no</string>
+    <string name="poi_drinking_water_yes">sì</string>
+    <string name="poi_drinking_water_no">no</string>
+    <string name="poi_seasonal_yes">sì</string>
+    <string name="poi_seasonal_no">no</string>
     <string name="poi_seasonal_dry_season">Stagione secca</string>
     <string name="poi_seasonal_wet_season">Stagione umida</string>
     <string name="poi_seasonal_spring">Primavera</string>
@@ -946,8 +946,8 @@
     <string name="poi_crossing_traffic_signals">Con semaforo</string>
     <string name="poi_crossing_uncontrolled">Non regolato</string>
     <string name="poi_start_date">Data di inizio</string>
-    <string name="poi_wheelchair_yes">Sì</string>
-    <string name="poi_wheelchair_no">No</string>
+    <string name="poi_wheelchair_yes">sì</string>
+    <string name="poi_wheelchair_no">no</string>
     <string name="poi_wheelchair_limited">Limitata</string>
     <string name="poi_access_private">Accesso privato</string>
     <string name="poi_access_no">Nessun accesso</string>
@@ -1008,8 +1008,8 @@
     <string name="poi_rural">Rurale</string>
     <string name="poi_animal_shelter">Rifugio per animali</string>
     <string name="poi_seats">Posti a sedere</string>
-    <string name="poi_backrest_yes">Schienale: Sì</string>
-    <string name="poi_backrest_no">Schienale: nessuna</string>
+    <string name="poi_backrest_yes">Schienale: sì</string>
+    <string name="poi_backrest_no">Schienale: no</string>
     <string name="poi_nat_name">Nome nazionale</string>
     <string name="poi_int_name">Nome internazionale</string>
     <string name="poi_reg_name">Nome regionale</string>
@@ -1019,7 +1019,7 @@
     <string name="poi_pump_manual">Manuale</string>
     <string name="poi_pump_powered">Alimentato</string>
     <string name="poi_pump_no">Nessuna pompa</string>
-    <string name="poi_pump_yes">Sì</string>
+    <string name="poi_pump_yes">sì</string>
     <string name="poi_water_characteristic_mineral">Minerale</string>
     <string name="poi_water_point">Punto acqua</string>
     <string name="poi_cuisine">Cucina</string>
@@ -1041,9 +1041,9 @@
     <string name="poi_board_type_technology">Tecnologia</string>
     <string name="poi_board_type_astronomy">Astronomia</string>
     <string name="poi_commercial">Area commerciale</string>
-    <string name="poi_fireplace_yes">Sì</string>
+    <string name="poi_fireplace_yes">sì</string>
     <string name="poi_fireplace_no">Nessun caminetto</string>
-    <string name="poi_covered_yes">Sì</string>
+    <string name="poi_covered_yes">sì</string>
     <string name="poi_covered_no">Non coperto</string>
     <string name="poi_smoking_no">Non ammessi</string>
     <string name="poi_smoking_outside">Solo all\'esterno</string>
@@ -1054,10 +1054,10 @@
     <string name="poi_toll_yes">Pedaggio</string>
     <string name="poi_toll_no">Nessun pedaggio</string>
     <string name="poi_toll_hgv_yes">Pedaggio camion</string>
-    <string name="poi_tactile_paving_yes">Sì</string>
+    <string name="poi_tactile_paving_yes">sì</string>
     <string name="poi_tactile_paving_no">Senza pavimentazione tattile</string>
-    <string name="poi_traffic_signals_sound_yes">Sì</string>
-    <string name="poi_traffic_signals_sound_no">No</string>
+    <string name="poi_traffic_signals_sound_yes">sì</string>
+    <string name="poi_traffic_signals_sound_no">no</string>
     <string name="poi_traffic_signals_sound_walk">Solo quando è consentito camminare</string>
     <string name="poi_rescue_station">Stazione di soccorso</string>
     <string name="poi_bird_hide">Posto per birdwatching</string>
@@ -1075,9 +1075,9 @@
     <string name="poi_piste_difficulty_expert">Esperto</string>
     <string name="poi_piste_grooming_classic">Naturale</string>
     <string name="poi_piste_grooming_classic_skating">Classic + skating</string>
-    <string name="poi_piste_grooming_no">No</string>
+    <string name="poi_piste_grooming_no">no</string>
     <string name="poi_garden_type_residential">Giardino: residenziale</string>
-    <string name="poi_garden_type_community">Giardino: Comunità</string>
+    <string name="poi_garden_type_community">Tipo di giardino: comunità</string>
     <string name="poi_garden_type_private">Giardino: privato</string>
     <string name="poi_garden_type_botanical">Giardino: botanica</string>
     <string name="poi_garden_style_kitchen">Giardino: cucina</string>
@@ -1085,7 +1085,7 @@
     <string name="poi_garden_style_english">Giardino di stile: inglese</string>
     <string name="poi_garden_style_japanese">Giardino di stile: giapponese</string>
     <string name="poi_capacity">Capacità</string>
-    <string name="poi_capacity_disabled_yes">Sì</string>
+    <string name="poi_capacity_disabled_yes">sì</string>
     <string name="poi_capacity_disabled_no">Nessun luoghi dedicati per disabili</string>
     <string name="poi_capacity_disabled">Luoghi dedicati per disabili</string>
     <string name="poi_capacity_women_yes">Luoghi dedicati per donne</string>
@@ -1097,7 +1097,7 @@
     <string name="poi_capacity_parent_no">Nessun luoghi dedicati per genitori</string>
     <string name="poi_capacity_parent">Luoghi dedicati per genitori</string>
     <string name="poi_aerialway_capacity">Capacità oraria</string>
-    <string name="poi_aerialway_heating_yes">Sì</string>
+    <string name="poi_aerialway_heating_yes">sì</string>
     <string name="poi_aerialway_heating_no">Senza riscaldamento</string>
     <string name="poi_aerialway_bicycle_yes">Ammessi</string>
     <string name="poi_aerialway_bicycle_no">Biciclette: non ammessi</string>
@@ -1269,7 +1269,7 @@
     <string name="poi_bench">Panca</string>
     <string name="poi_food_court">Corte del mangiare</string>
     <string name="poi_cutline">Linea di taglio</string>
-    <string name="poi_toilets">WC</string>
+    <string name="poi_toilets">Toilette, Servizi igienici</string>
     <string name="poi_payment_terminal">Terminale di pagamento</string>
     <string name="poi_stone">Notevole pietra</string>
     <string name="poi_fog_signal">Segnale da nebbia</string>
@@ -1307,7 +1307,7 @@
     <string name="poi_generator_source_geothermal">Fonte di energia: geotermia</string>
     <string name="poi_generator_source_oil">Fonte di energia: olio</string>
     <string name="poi_generator_source_diesel">Fonte di energia: diesel</string>
-    <string name="poi_water_characteristic_sulfuric">Solforico</string>
+    <string name="poi_water_characteristic_sulfuric">Solforica</string>
     <string name="poi_scrub">Macchia</string>
     <string name="poi_level">Livello</string>
     <string name="poi_rtsa_scale">Scala RTSA</string>
@@ -1360,43 +1360,43 @@
     <string name="poi_diet_gluten_free_only">Solo senza glutine</string>
     <string name="poi_diet_gluten_free_yes">Senza glutine</string>
     <string name="poi_diet_gluten_free_no">Dieta senza glutine: no</string>
-    <string name="poi_drive_in_yes">Sì</string>
+    <string name="poi_drive_in_yes">sì</string>
     <string name="poi_drive_in_no">"Drive-in: no "</string>
-    <string name="poi_drive_through_yes">Sì</string>
-    <string name="poi_microbrewery_yes">Sì</string>
-    <string name="poi_takeaway_filter_yes">Sì</string>
+    <string name="poi_drive_through_yes">sì</string>
+    <string name="poi_microbrewery_yes">sì</string>
+    <string name="poi_takeaway_filter_yes">sì</string>
     <string name="poi_takeaway_yes">A portar via</string>
     <string name="poi_takeaway_no">No a portar via</string>
     <string name="poi_takeaway_only">Solo a portar via</string>
-    <string name="poi_delivery_filter_yes">Sì</string>
-    <string name="poi_outdoor_seating_filter_yes">Sì</string>
-    <string name="poi_outdoor_seating_yes">Posti a sedere all\'aperto: Sì</string>
+    <string name="poi_delivery_filter_yes">sì</string>
+    <string name="poi_outdoor_seating_filter_yes">sì</string>
+    <string name="poi_outdoor_seating_yes">Posti a sedere all\'aperto: sì</string>
     <string name="poi_outdoor_seating_no">Nessun posto a sedere all\'aperto</string>
     <string name="poi_outdoor_seating_terrace">Posti a sedere all\'aperto: terrazza</string>
     <string name="poi_outdoor_seating_sidewalk">Posti a sedere all\'aperto: marciapiede</string>
     <string name="poi_outdoor_seating_pedestrian_zone">Posti a sedere all\'aperto: zona pedonale</string>
     <string name="poi_outdoor_seating_garden">Posti a sedere all\'aperto: giardino</string>
-    <string name="poi_cocktails_yes">Sì</string>
+    <string name="poi_cocktails_yes">sì</string>
     <string name="poi_service_parts">Parti</string>
     <string name="poi_service_dealer">Rivenditore</string>
     <string name="poi_service_repair">Riparazione</string>
     <string name="poi_service_repair_no">Nessuna riparazione</string>
     <string name="poi_service_electrical">Riparazione di veicoli elettrici</string>
     <string name="poi_motorcycle_repair">Riparazione Motocicli</string>
-    <string name="poi_self_service_yes">Sì</string>
+    <string name="poi_self_service_yes">sì</string>
     <string name="poi_self_service_no">No Self-Service</string>
-    <string name="poi_automated_yes">Sì</string>
+    <string name="poi_automated_yes">sì</string>
     <string name="poi_automated_no">Non automatizzato</string>
     <string name="poi_full_service_yes">Servizio completo</string>
-    <string name="poi_brushless_yes">Sì</string>
+    <string name="poi_brushless_yes">sì</string>
     <string name="poi_brushless_no">Senza spazzola: no</string>
     <string name="poi_car_wash_no">Lavaggio auto: no</string>
     <string name="poi_public_bath">Bagno pubblico</string>
     <string name="poi_indoor_no">Esterno</string>
-    <string name="poi_toilets_yes">Sì</string>
+    <string name="poi_toilets_yes">sì</string>
     <string name="poi_toilets_access_customers">Accesso a servizi igienici: clienti</string>
     <string name="poi_toilets_access_permissive">Accesso a servizi igienici: permissiva</string>
-    <string name="poi_toilets_access_community">Accesso a servizi igienici: Comunità</string>
+    <string name="poi_toilets_access_community">Accesso a servizi igienici: comunità</string>
     <string name="poi_toilets_access_public">Accesso a servizi igienici: pubblico</string>
     <string name="poi_maxstay">Limite tempo di parcheggio</string>
     <string name="poi_vending_parking_tickets">Biglietti parcheggio</string>
@@ -1464,7 +1464,7 @@
     <string name="poi_chimney">Canna fumaria</string>
     <string name="poi_cypress">Cipresso</string>
     <string name="poi_flagpole">Pennone</string>
-    <string name="poi_bench_yes">Sì</string>
+    <string name="poi_bench_yes">sì</string>
     <string name="poi_bench_no">Senza panca</string>
     <string name="poi_bin_yes">Con cestino</string>
     <string name="poi_bin_no">Senza cestello</string>
@@ -1543,7 +1543,7 @@
     <string name="poi_route_ferry_ref">Traghetto</string>
     <string name="poi_route_railway_ref">Percorso della ferrovia</string>
     <string name="poi_historic_yes">Oggetto storico</string>
-    <string name="poi_surveillance_yes">Sorveglianza: Sì</string>
+    <string name="poi_surveillance_yes">Sorveglianza: sì</string>
     <string name="poi_shop_additional_yes">Con negozio</string>
     <string name="poi_service_bicycle_retail_yes">Vendita al dettaglio</string>
     <string name="poi_service_bicycle_repair_yes">Riparazione</string>
@@ -1554,7 +1554,7 @@
     <string name="poi_service_bicycle_pump_no">Pompa biciclette: no</string>
     <string name="poi_service_bicycle_cleaning_yes">Pulizia</string>
     <string name="poi_service_bicycle_cleaning_no">Pulizia biciclette: no</string>
-    <string name="poi_service_bicycle_charging_yes">Ricarica biciclette: Sì</string>
+    <string name="poi_service_bicycle_charging_yes">Ricarica biciclette: sì</string>
     <string name="poi_service_bicycle_charging_no">Ricarica: no</string>
     <string name="poi_wildlife_hide">Posto per osservare la fauna selvatica</string>
     <string name="poi_monument_yes">Oggetto monumentale</string>
@@ -1628,21 +1628,21 @@
     <string name="poi_tents_no">Tende non ammessi</string>
     <string name="poi_openfire_yes">Caminetto ammessi</string>
     <string name="poi_openfire_no">Caminetto non ammessi</string>
-    <string name="poi_backcountry_yes">Sì</string>
-    <string name="poi_backcountry_no">"No "</string>
-    <string name="poi_washing_machine_yes">Sì</string>
+    <string name="poi_backcountry_yes">sì</string>
+    <string name="poi_backcountry_no">no</string>
+    <string name="poi_washing_machine_yes">sì</string>
     <string name="poi_washing_machine_no">Lavatrice: no</string>
-    <string name="poi_shower_filter_yes">Sì</string>
-    <string name="poi_shower_yes">Doccia: Sì</string>
+    <string name="poi_shower_filter_yes">sì</string>
+    <string name="poi_shower_yes">Doccia: sì</string>
     <string name="poi_shower_no">Doccia: no</string>
     <string name="poi_shower_hot">Doccia: caldo</string>
     <string name="poi_shower_outdoor">Doccia: all\'aperto</string>
     <string name="poi_shower_cold">Doccia: freddo</string>
-    <string name="poi_caravans_yes">Sì</string>
+    <string name="poi_caravans_yes">sì</string>
     <string name="poi_caravans_no">Caravan: no</string>
-    <string name="poi_sanitary_dump_station_yes">Stazione di discarica sanitaria: Sì</string>
+    <string name="poi_sanitary_dump_station_yes">Stazione di discarica sanitaria: sì</string>
     <string name="poi_sanitary_dump_station_no">Stazione di sanitari discarica: no</string>
-    <string name="poi_power_supply_yes">Sì</string>
+    <string name="poi_power_supply_yes">sì</string>
     <string name="poi_power_supply_no">Alimentazione elettrica: no</string>
     <string name="poi_power_supply_cee_17_blue">Tensione di alimentazione (presa): CEE 17 blu</string>
     <string name="poi_power_supply_cee_7_4">Tensione di alimentazione (presa): CEE 7/4</string>
@@ -1673,18 +1673,18 @@
     <string name="poi_product_meat">Prodotto: carne</string>
     <string name="poi_blind_description">Descrizione per non vedenti</string>
     <string name="poi_highway_steps">Scale</string>
-    <string name="poi_handrail_yes">Corrimano: Sì</string>
+    <string name="poi_handrail_yes">Corrimano: sì</string>
     <string name="poi_handrail_no">Corrimano: no</string>
-    <string name="poi_ramp_yes">Rampa: Sì</string>
+    <string name="poi_ramp_yes">Rampa: sì</string>
     <string name="poi_ramp_no">Rampa: no</string>
-    <string name="poi_ramp_stroller_yes">Rampa (passeggino): Sì</string>
+    <string name="poi_ramp_stroller_yes">Rampa (passeggino): sì</string>
     <string name="poi_ramp_stroller_no">Rampa (passeggino): no</string>
-    <string name="poi_ramp_bicycle_yes">Rampa per biciclette: Sì</string>
+    <string name="poi_ramp_bicycle_yes">Rampa per biciclette: sì</string>
     <string name="poi_ramp_bicycle_no">Rampa per biciclette: no</string>
     <string name="poi_step_count">Conteggio dei passi</string>
     <string name="poi_step_condition_uneven">Passo condizione: irregolare</string>
     <string name="poi_defibrillator">Defibrillatore</string>
-    <string name="poi_defibrillator_yes">Defibrillatore: Sì</string>
+    <string name="poi_defibrillator_yes">Defibrillatore: sì</string>
     <string name="poi_tomb_war_grave">Tipo: tomba di guerra</string>
     <string name="poi_tomb_tumulus">Tipo: tumulus</string>
     <string name="poi_tomb_hypogeum">Tipo: ipogeo</string>
@@ -1739,7 +1739,7 @@
     <string name="poi_building_type_synagogue">Tipo di edificio: Sinagoga</string>
     <string name="poi_building_type_shrine">Tipo di edificio: Santuario</string>
     <string name="poi_cross">Croce</string>
-    <string name="poi_summit_cross">Croce di vetta: Sì</string>
+    <string name="poi_summit_cross">Croce di vetta: sì</string>
     <string name="poi_prison_camp">Ex campo di prigionia</string>
     <string name="poi_concentration_camp_nazism">Tipo: nazista</string>
     <string name="poi_concentration_camp_gulag">Tipo: gulag</string>
@@ -1754,9 +1754,9 @@
     <string name="poi_fitness_centre">Centro fitness</string>
     <string name="poi_fitness">"Fitness "</string>
     <string name="poi_billiards">Biliardo</string>
-    <string name="poi_microwave_oven_yes">Forno a microonde: Sì</string>
+    <string name="poi_microwave_oven_yes">Forno a microonde: sì</string>
     <string name="poi_microwave_oven_no">Forno a microonde: no</string>
-    <string name="poi_water_heater_yes">Riscaldatore di acqua: Sì</string>
+    <string name="poi_water_heater_yes">Riscaldatore di acqua: sì</string>
     <string name="poi_water_heater_no">Riscaldatore di acqua: no</string>
     <string name="poi_parking_surface">Tipo: superficie</string>
     <string name="poi_dojo">"Dojo "</string>
@@ -1776,32 +1776,32 @@
     <string name="poi_protection_object_nature">Oggetto di protezione: natura</string>
     <string name="poi_protection_object_water">Oggetto di protezione: acqua</string>
     <string name="poi_addr_housename">Nome casa</string>
-    <string name="poi_compressed_air_yes">Sì</string>
+    <string name="poi_compressed_air_yes">sì</string>
     <string name="poi_compressed_air_no">Aria compressa: no</string>
-    <string name="poi_car_wash_yes">Sì</string>
-    <string name="poi_vacuum_cleaner_yes">Sì</string>
+    <string name="poi_car_wash_yes">sì</string>
+    <string name="poi_vacuum_cleaner_yes">sì</string>
     <string name="poi_vacuum_cleaner_no">Aspirapolvere: no</string>
     <string name="poi_amenity_vacuum_cleaner">Aspirapolvere</string>
-    <string name="poi_button_operated_yes">Sgancio a pulsante: Sì</string>
+    <string name="poi_button_operated_yes">Sgancio a pulsante: sì</string>
     <string name="poi_button_operated_no">Sgancio a pulsante: no</string>
     <string name="poi_tanning_salon">"Solarium "</string>
     <string name="poi_fire_hydrant_type_pillar">Pilastro</string>
     <string name="poi_fire_hydrant_type_pond">Stagno</string>
     <string name="poi_fire_hydrant_type_wall">Parete</string>
     <string name="poi_capacity_beds">Capacità (posti letto)</string>
-    <string name="poi_emergency_yes">Emergenza: Sì</string>
+    <string name="poi_emergency_yes">Emergenza: sì</string>
     <string name="poi_emergency_no">Emergenza: no</string>
-    <string name="poi_home_visit_yes">Sì</string>
+    <string name="poi_home_visit_yes">sì</string>
     <string name="poi_home_visit_no">Visita a domicilio: no</string>
     <string name="poi_fire_hydrant_diameter">Diametro idrante</string>
     <string name="poi_fire_hydrant_position_sidewalk">Marciapiede</string>
     <string name="poi_fire_hydrant_position_street">Strada</string>
     <string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
-    <string name="poi_in_service_yes">In servizio: Sì</string>
+    <string name="poi_in_service_yes">In servizio: sì</string>
     <string name="poi_depth">Profondità</string>
     <string name="poi_salt_yes">Sale</string>
     <string name="poi_salt_no">Sale: no</string>
-    <string name="poi_wheelchair_designated">Indicato</string>
+    <string name="poi_wheelchair_designated">indicato</string>
     <string name="poi_summer_camp">Campo estivo</string>
     <string name="poi_crossing_bell_yes">Campana di attraversamento</string>
     <string name="poi_crossing_bell_no">Campana di attraversamento: no</string>
@@ -1869,7 +1869,7 @@
     <string name="poi_xmas_shop_christmas_tree">Negozio di alberi</string>
     <string name="poi_xmas_tree">Albero di Natale</string>
     <string name="poi_xmas_day_date">Natale: periodo per l\'evento</string>
-    <string name="poi_xmas_note">Natale: Nota</string>
+    <string name="poi_xmas_note">Natale: nota</string>
     <string name="poi_xmas_opening_hours">Natale: Orari di apertura</string>
     <string name="poi_xmas_url">Natale: sito web</string>
     <string name="poi_cuisine_pizza">Pizza</string>
@@ -1994,10 +1994,10 @@
     <string name="poi_photo_studio">Studio fotografico</string>
     <string name="poi_reef">Barriera corallina</string>
     <string name="poi_wheelchair_accessibility">Accessibilità in carrozzina</string>
-    <string name="poi_toilets_wheelchair_yes">Accesso alla toletta in carrozzina: Sì</string>
-    <string name="poi_toilets_wheelchair_no">Accesso alla toletta in carrozzina: No</string>
+    <string name="poi_toilets_wheelchair_yes">Accesso alla toletta in carrozzina: sì</string>
+    <string name="poi_toilets_wheelchair_no">Accesso alla toletta in carrozzina: no</string>
     <string name="poi_wheelchair_description">Descrizione per utenti in carrozzina</string>
-    <string name="poi_ramp_wheelchair_yes">Rampa per carrozzina: Sì</string>
+    <string name="poi_ramp_wheelchair_yes">Rampa per carrozzina: sì</string>
     <string name="poi_ramp_wheelchair_no">Rampa per carrozzina: No</string>
     <string name="poi_feeding_place">Mangiatoia</string>
     <string name="poi_social_facility_for">Gruppo di destinazione</string>
@@ -2017,8 +2017,8 @@
     <string name="poi_lighting">Apparecchi di illuminazione</string>
     <string name="poi_cliff">Falesia</string>
     <string name="poi_railway_yard">Stazione merci</string>
-    <string name="poi_fast_food_cafeteria">Sì</string>
-    <string name="poi_drink_wine_yes">Vino: Sì</string>
+    <string name="poi_fast_food_cafeteria">sì</string>
+    <string name="poi_drink_wine_yes">Vino: sì</string>
     <string name="poi_drink_wine_retail">Vino: vendita in bottiglia</string>
     <string name="poi_drink_wine_served">Vino: servito</string>
     <string name="poi_energy_supplier">Ufficio del fornitore di energia</string>
@@ -2130,7 +2130,7 @@
     <string name="poi_retail">Area commerciale</string>
     <string name="poi_allotments">Orti urbani</string>
     <string name="poi_basin">Bacino</string>
-    <string name="poi_capital">Sì</string>
+    <string name="poi_capital">sì</string>
     <string name="poi_place_allotments">Orti di città</string>
     <string name="poi_ice_hockey">Hockey su ghiaccio</string>
     <string name="poi_denomination_lutheran">Luterana</string>
@@ -2219,7 +2219,7 @@
     <string name="poi_socket_type3_output_filter">Uscita Tipo 3</string>
     <string name="poi_socket_cee_blue_output_filter">Uscita CEE blu</string>
     <string name="poi_socket_schuko_output_filter">Uscita Schuko</string>
-    <string name="poi_operational_status">Stato delle operazioni</string>
+    <string name="poi_operational_status">Stato di servizio</string>
     <string name="poi_via_ferrata">"Via ferrata "</string>
     <string name="poi_via_ferrata_scale">Difficoltà</string>
     <string name="poi_boat_sharing">Condivisione di barche</string>
@@ -2294,8 +2294,8 @@
     <string name="poi_display_no">"Display: no "</string>
     <string name="poi_display_analog_yes">Display analogico</string>
     <string name="poi_display_digital_yes">Display digitale</string>
-    <string name="poi_organic_yes">Sì</string>
-    <string name="poi_organic_no">"No "</string>
+    <string name="poi_organic_yes">sì</string>
+    <string name="poi_organic_no">no</string>
     <string name="poi_organic_only">Solo</string>
     <string name="poi_boat_rental">Noleggio barche</string>
     <string name="poi_boat_motorboat_rental_yes">Barche a motore: sì</string>
@@ -2311,7 +2311,7 @@
     <string name="poi_surface_tartan">"Tartan "</string>
     <string name="poi_checkpoint_type">Tipo Checkpoint</string>
     <string name="poi_bowls">Ciotole</string>
-    <string name="poi_water_place_access">Posto accesso all\'acqua</string>
+    <string name="poi_water_place_access">Accesso all\'acqua</string>
     <string name="poi_resort">"Resort "</string>
     <string name="poi_recreation_ground">Terreno ricreativo</string>
     <string name="poi_cuisine_donut">"Donut "</string>
@@ -2346,7 +2346,7 @@
     <string name="poi_socket_schuko_yes">"Schuko "</string>
     <string name="poi_socket_chademo_output_low">Bassa</string>
     <string name="poi_socket_type2_output_medium">Medio</string>
-    <string name="poi_barbecue_grill">Griglia barbecue: Sì</string>
+    <string name="poi_barbecue_grill">Griglia barbecue: sì</string>
     <string name="poi_service_vehicle_oil_change_yes">Cambio olio</string>
     <string name="poi_service_vehicle_used_car_sales_yes">Vendita auto usate</string>
     <string name="poi_service_vehicle_brakes_yes">Freni</string>
@@ -2397,7 +2397,7 @@
     <string name="poi_inscription_nw">Inscrizione:NO</string>
     <string name="poi_climbing_orientation_sw">Orientamento del muro:SO</string>
     <string name="poi_climbing_orientation_nw">Orientamento del muro: NO</string>
-    <string name="poi_climbing_crag">Si</string>
+    <string name="poi_climbing_crag">si</string>
     <string name="poi_distance_mark">Segno di distanza</string>
     <string name="poi_piste_skitour">Pista Skitour</string>
     <string name="poi_denomination_united_reformed">Riformato unito</string>
@@ -2450,4 +2450,157 @@
     <string name="poi_rtsa_scale_3b_asterisk">3Б*</string>
     <string name="poi_change_delete">Oggetto cancellato</string>
     <string name="poi_defibrillator_location">Posizione</string>
+    <string name="poi_garden_style_rosarium">Tipo di giardino: roseto</string>
+    <string name="poi_aerialway_occupancy">Capacità cabina/sedia/automobile</string>
+    <string name="poi_resource_lead">Piombo</string>
+    <string name="poi_resource_lignite">Lignite</string>
+    <string name="poi_resource_mercury">Mercurio</string>
+    <string name="poi_resource_mica">Mica</string>
+    <string name="poi_resource_nickel">Nichel</string>
+    <string name="poi_resource_opal">Opale</string>
+    <string name="poi_resource_radium">Radio</string>
+    <string name="poi_resource_silica">Silice</string>
+    <string name="poi_resource_tin">Stagno</string>
+    <string name="poi_resource_vanadium">Vanadio</string>
+    <string name="poi_resource_zinc">Zinco</string>
+    <string name="poi_resource_zircon">Zirconio</string>
+    <string name="poi_lit_yes">Luce: sì</string>
+    <string name="poi_lit_no">Luce: no</string>
+    <string name="poi_surface_sett">Superficie: pavé</string>
+    <string name="poi_surface_paving_stones">Superficie: mattonelle per pavimentazione stradale</string>
+    <string name="poi_surface_pebblestone">Superficie: ciottoli</string>
+    <string name="poi_surface_grass_paver">Superficie: erba mista ad altro</string>
+    <string name="poi_route_monorail_ref">Monorotaia</string>
+    <string name="poi_service_bicycle_retail_no">Vendita bici al dettaglio: no</string>
+    <string name="poi_service_bicycle_diy_yes">Attrezzi per le riparazioni fai-da-te</string>
+    <string name="poi_service_bicycle_diy_no">Attrezzi per le riparazioni fai-da-te: no</string>
+    <string name="poi_service_bicycle_chaintool_yes">Utensile per la catena</string>
+    <string name="poi_service_bicycle_chaintool_no">Utensile per la catena: no</string>
+    <string name="poi_service_bicycle_second_hand_yes">Attrezzi per le riparazioni fai-da-te</string>
+    <string name="poi_service_bicycle_second_hand_no">Vendita al dettaglio di bici di seconda mano: no</string>
+    <string name="poi_training_music">Scuola: musica</string>
+    <string name="poi_training_dance">Scuola: danza</string>
+    <string name="poi_training_sport">Scuola: sport</string>
+    <string name="poi_training_art">Scuola: arte</string>
+    <string name="poi_training_cooking">Scuola: cucina</string>
+    <string name="poi_training_computer">Scuola: informatica</string>
+    <string name="poi_training_yoga">Scuola: yoga</string>
+    <string name="poi_training_martial_art">Scuola: arti marziali</string>
+    <string name="poi_training_aviation">Scuola: aviazione</string>
+    <string name="poi_training_hairdressing">Scuola: acconciatura</string>
+    <string name="poi_industrial_oil">Tipo: olio industriale</string>
+    <string name="poi_industrial_water_purification">Tipo: depuratore acqua</string>
+    <string name="poi_animal_boarding">Imbarco animali</string>
+    <string name="poi_animal_boarding_dog">Tipo imbarco: cani</string>
+    <string name="poi_animal_boarding_cat">Tipo imbarco: gatto</string>
+    <string name="poi_animal_boarding_dog_cat">Tipo imbarco: cani, gatti</string>
+    <string name="poi_animal_boarding_horse">Tipo imbarco: cavalli</string>
+    <string name="poi_logistics">Ufficio logistico</string>
+    <string name="poi_crop_wheat">Raccolta: grano</string>
+    <string name="poi_crop_vegetables">Raccolto: vegetali</string>
+    <string name="poi_crop_rape">Raccolto: rape</string>
+    <string name="poi_crop_beet">Raccolto: barbabietola</string>
+    <string name="poi_crop_lavender">Raccolto: lavanda</string>
+    <string name="poi_crop_tobacco">Raccolta: tabacco</string>
+    <string name="poi_crop_strawberry">Raccolta: fragole</string>
+    <string name="poi_crop_vegetables_flowers">Raccolta: verdura, fiori</string>
+    <string name="poi_crop_cassava">"Raccolta:  manioca"</string>
+    <string name="poi_crop_cranberry">Raccolta: mirtillo rosso</string>
+    <string name="poi_surveillance_outdoor">Sorveglianza: esterna</string>
+    <string name="poi_surveillance_public">Sorveglianza: luogo pubblico</string>
+    <string name="poi_clothes_babies">Bambini</string>
+    <string name="poi_clothes_denim">Jeans</string>
+    <string name="poi_clothes_suits">Tute</string>
+    <string name="poi_clothes_vintage">Vintage</string>
+    <string name="poi_clothes_oversize">Taglie forti</string>
+    <string name="poi_clothes_swimwear">Costumi da bagno</string>
+    <string name="poi_historic_manor">Maniero storico</string>
+    <string name="poi_scout_yes">sì</string>
+    <string name="poi_group_only_yes">Solo gruppi: sì</string>
+    <string name="poi_group_only_no">Solo gruppi: no</string>
+    <string name="poi_shower_indoor">Doccia: interno</string>
+    <string name="poi_social_facility_group_home">Casa famiglia</string>
+    <string name="poi_social_facility_food_bank">Banco alimentare</string>
+    <string name="poi_social_facility_shelter">Riparo</string>
+    <string name="poi_social_facility_for_drug_addicted">Tossicodipendenti</string>
+    <string name="poi_product_lime">Prodotto: limone</string>
+    <string name="poi_ramp_luggage_yes">Rampa per bagaglio: sì</string>
+    <string name="poi_ramp_luggage_no">Rampa per bagaglio: no</string>
+    <string name="poi_step_condition_even">Stato della scala: pari</string>
+    <string name="poi_step_condition_rough">Stato della scala: accidentato</string>
+    <string name="poi_material_concrete">Materiale: calcestruzzo</string>
+    <string name="poi_material_composite">Materiale: composito</string>
+    <string name="poi_material_limestone">Materiale: calcare</string>
+    <string name="poi_site_type_megalith">Magalito</string>
+    <string name="poi_site_type_necropolis">Necropoli</string>
+    <string name="poi_cargo_passengers">Passeggeri</string>
+    <string name="poi_cargo_hgv">Mezzi pesanti</string>
+    <string name="poi_health_specialty_gynaecology_yes">Ginecologia</string>
+    <string name="poi_health_specialty_internal_medicine_yes">Medicina interna</string>
+    <string name="poi_health_specialty_orthopaedics_yes">Ortopedia</string>
+    <string name="poi_health_specialty_otolaryngology_yes">Otorinolaringoiatria</string>
+    <string name="poi_health_specialty_paediatrics_yes">Pediatria</string>
+    <string name="poi_health_specialty_paediatrics_no">Specializzazione sanitaria: pediatria: no</string>
+    <string name="poi_health_specialty_dermatology_yes">Dermatologia</string>
+    <string name="poi_health_specialty_urology_yes">Urologia</string>
+    <string name="poi_health_specialty_surgery_yes">Chirurgia generale</string>
+    <string name="poi_health_specialty_radiology_yes">Radiologia</string>
+    <string name="poi_health_specialty_psychiatry_yes">Psichiatria</string>
+    <string name="poi_health_specialty_neurology_yes">Neurologia</string>
+    <string name="poi_health_specialty_cardiology_yes">Cardiologia</string>
+    <string name="poi_health_specialty_trauma_yes">Traumatologia</string>
+    <string name="poi_health_specialty_biology_yes">Biologia clinica</string>
+    <string name="poi_health_specialty_osteopathy_yes">Osteopatia</string>
+    <string name="poi_health_specialty_anaesthetics_yes">Anestesiologia</string>
+    <string name="poi_health_specialty_pulmonology_yes">Pneumologia</string>
+    <string name="poi_bicycle_repair_station">Stazione fai-da-te riparazione bici</string>
+    <string name="poi_counselling_type_family_yes">Consultorio (familiare): si</string>
+    <string name="poi_counselling_type_family_no">Consultorio (familiare): no</string>
+    <string name="poi_pump_status_broken">Stato della pompa: rotta</string>
+    <string name="poi_craft_electronics_repair">Riparazioni elettroniche</string>
+    <string name="poi_operational_status_closed">Chiusa</string>
+    <string name="poi_operational_status_restricted">Privata</string>
+    <string name="poi_operational_status_broken">Rotta</string>
+    <string name="poi_water_purification_none">Nessuno</string>
+    <string name="poi_water_purification_chlorine">Cloro</string>
+    <string name="poi_water_purification_reverse_osmosis">Osmosi inversa</string>
+    <string name="poi_water_purification_aquatabs">Aquatabs</string>
+    <string name="poi_water_supply_pipeline">Acquedotto</string>
+    <string name="poi_water_supply_running_water">Acqua corrente</string>
+    <string name="poi_water_supply_borehole">Pozzo</string>
+    <string name="poi_water_supply_bottled_water">Acqua imbottigliata</string>
+    <string name="poi_water_place_access_community">Comunità</string>
+    <string name="poi_water_place_access_family">Familiare</string>
+    <string name="poi_water_place_access_multifamilies">Multifamiliare</string>
+    <string name="poi_route_subway_ref">Metropolitana</string>
+    <string name="poi_pipeline_substation">Sottostazione acquedotto</string>
+    <string name="poi_health_specialty_radiotherapy_yes">Radioterapia</string>
+    <string name="poi_scooter_yes">Scooter: sì</string>
+    <string name="poi_bulk_purchase_yes">sì</string>
+    <string name="poi_park_ride_yes">sì</string>
+    <string name="poi_snowmobile_yes">sì</string>
+    <string name="poi_snowmobile_designated">indicato</string>
+    <string name="poi_snowmobile_permissive">permissiva</string>
+    <string name="poi_bus_yes">sì</string>
+    <string name="poi_bus_designated">indicato</string>
+    <string name="poi_caravan_yes">sì</string>
+    <string name="poi_caravan_designated">indicato</string>
+    <string name="poi_motorhome_yes">sì</string>
+    <string name="poi_motorhome_designated">indicato</string>
+    <string name="poi_trailer_yes">sì</string>
+    <string name="poi_trailer_designated">indicato</string>
+    <string name="poi_motorcycle_yes">sì</string>
+    <string name="poi_motorcycle_permissive">permissiva</string>
+    <string name="poi_motorcycle_designated">indicato</string>
+    <string name="poi_moped_yes">sì</string>
+    <string name="poi_moped_designated">indicato</string>
+    <string name="poi_mofa_yes">sì</string>
+    <string name="poi_mofa_designated">indicato</string>
+    <string name="poi_hgv_yes">sì</string>
+    <string name="poi_hgv_permissive">permissiva</string>
+    <string name="poi_hgv_designated">indicato</string>
+    <string name="poi_goods_yes">sì</string>
+    <string name="poi_goods_designated">indicato</string>
+    <string name="poi_disabled_yes">sì</string>
+    <string name="poi_disabled_designated">indicato</string>
 </resources>

OsmAnd/res/values-it/strings.xml

@@ -1411,7 +1411,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="shared_string_ellipsis">…</string>
     <string name="shared_string_ok">OK</string>
     <string name="shared_string_cancel">Annulla</string>
-    <string name="shared_string_dismiss">Scarta</string>
+    <string name="shared_string_dismiss">Elimina</string>
     <string name="shared_string_yes">Sì</string>
     <string name="shared_string_no">No</string>
     <string name="shared_string_on">Acceso</string>
@@ -2913,7 +2913,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="routeInfo_road_types_name">Tipi di strade</string>
     <string name="show_more">Mostra di più</string>
     <string name="tracks_on_map">Tracciati visualizzati</string>
-    <string name="quick_action_show_hide_gpx_tracks">Mostra/Nascondi Tracciati GPX</string>
+    <string name="quick_action_show_hide_gpx_tracks">Mostra/Nascondi tracce GPX</string>
     <string name="quick_action_gpx_tracks_hide">Nascondi Tracciati GPX</string>
     <string name="quick_action_gpx_tracks_show">Mostra Tracciati GPX</string>
     <string name="quick_action_day_night_mode">Modalità %s</string>
@@ -3046,9 +3046,9 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="choose_data_to_share">Scegli che tipo di dati vuoi condividere:</string>
     <string name="downloaded_maps">Mappe scaricate</string>
     <string name="visited_screens">Schermi visitati</string>
-    <string name="collected_data_descr">Seleziona i dati che stai condividendo a OsmAnd.</string>
-    <string name="downloaded_maps_collect_descr">Raccogliamo questi dati per capire quali mappe di quali regioni e paesi sono più popolari.</string>
-    <string name="visited_screens_collect_descr">Collezioniamo questi dati per capire quali funzionalità di OSmAnd sono le più popolari.</string>
+    <string name="collected_data_descr">Scegli quali dati permetti a OsmAnd di condividere.</string>
+    <string name="downloaded_maps_collect_descr">Aiutaci a capire quali mappe di quali regioni e paesi sono più popolari.</string>
+    <string name="visited_screens_collect_descr">Aiutaci a capire quali funzionalità di OSmAnd sono le più popolari.</string>
     <string name="privacy_and_security_change_descr">Tappando \"Consenti\" accetti la nostra %1$s</string>
     <string name="settings_privacy_and_security">Privacy e sicurezza</string>
     <string name="shared_string_no_thank_you">No, grazie</string>
@@ -3147,7 +3147,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="routing_attr_piste_type_skitour_name">Scialpinismo</string>
     <string name="routing_attr_piste_type_skitour_description">Percorsi per lo sci alpinismo.</string>
     <string name="routing_attr_piste_type_sled_description">Piste per slittino.</string>
-    <string name="shared_string_crash">Crash</string>
+    <string name="shared_string_crash">Interruzione</string>
     <string name="rate_dialog_descr">Per favore dedicaci 30 secondi del tuo tempo condividendo il tuo feedback e dando un voto al nostro lavoro si Google Play.</string>
     <string name="button_rate">Dai un voto</string>
     <string name="shared_string_privacy_policy">Politica della privacy</string>
@@ -3158,7 +3158,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="show_compass_ruler">Mostra il righello della bussola</string>
     <string name="hide_compass_ruler">Nascondi il righello della bussola</string>
     <string name="settings_derived_routing_mode_string">Modo di utilizzo, derivato da: %s</string>
-    <string name="select_base_profile_dialog_message">Basa il tuo profilo personalizzato su uno di quelli di default dell\'applicazione, questo definisce le impostazioni di base come la visibilità dei widget, e le unità di misura di velocità e distanza.Queste sono i profili di default dell\'applicazione, assieme a esempi di profili personalizzati possono essere estesi a:</string>
+    <string name="select_base_profile_dialog_message">Basa il tuo profilo personalizzato su uno di quelli di default dell\'applicazione, questo definisce le impostazioni di base come la visibilità dei widget, e le unità di misura di velocità e distanza. Questi sono i profili di default dell\'applicazione, assieme a esempi di profili personalizzati possono essere estesi a:</string>
     <string name="base_profile_descr_public_transport">Tutti i tipi di trasporto pubblico</string>
     <string name="special_routing_type">Calcolo del percorso speciale</string>
     <string name="third_party_routing_type">Calcolo del percorso di terze parti</string>
@@ -3176,7 +3176,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="routing_attr_allow_skating_only_name">Permetti percorsi dedicati al pattinaggio</string>
     <string name="routing_attr_difficulty_preference_description">Preferisci percorsi di questa difficoltà, benché percorsi di maggiore o minore difficoltà sono ancora possibili se più brevi.</string>
     <string name="turn_screen_on_router">Accendi alla svolta</string>
-    <string name="turn_screen_on_time_descr">Imposta il tempo di accensione dello schermo alla svolta</string>
+    <string name="turn_screen_on_time_descr">Imposta il tempo di accensione dello schermo.</string>
     <string name="turn_screen_on_sensor">Usa il sensore di prossimità</string>
     <string name="turn_screen_on_sensor_descr">Passa la mano davanti il display per accendere lo schermo durante la navigazione.</string>
     <string name="routing_attr_freeride_policy_description">Freeride e fuoripista sono percorsi e passaggi non ufficiali. Tipicamente non curati, non sguarniti dai funzionari e non controllati la sera. Entrare a proprio rischio e pericolo.</string>
@@ -3208,5 +3208,9 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="app_mode_campervan">Camper</string>
     <string name="rendering_attr_showLez_description">Mostra sulla mappa le zone a Basse Emissioni. Non influisce sul calcolo del percorso.</string>
     <string name="rendering_attr_showLez_name">Mostra le zone a Basse Emissioni</string>
-    <string name="temporary_conditional_routing">Tieni conto delle limitazioni tempooranee</string>
+    <string name="temporary_conditional_routing">Tieni conto delle limitazioni temporanee</string>
+    <string name="app_mode_camper">Camper</string>
+    <string name="shared_string_default">Predefinita</string>
+    <string name="app_mode_wagon">Carrozza</string>
+    <string name="app_mode_pickup_truck">Fuoristrada pickup</string>
 </resources>

OsmAnd/res/values-ja/strings.xml

@@ -1002,7 +1002,7 @@ POIの更新は利用できません</string>
     <string name="search_position_map_view">マップ画面中心</string>
     <string name="select_search_position">検索基点:</string>
     <string name="context_menu_item_search">近隣を検索</string>
-    <string name="shared_string_save_as_gpx">新規としてGPX経路を保存</string>
+    <string name="shared_string_save_as_gpx">GPX経路を新規保存</string>
     <string name="route_successfully_saved_at">ルートを「%1$s」として保存しました。</string>
     <string name="filename_input">ファイル名: </string>
     <string name="file_with_name_already_exist">同じ名前のファイルが既に存在します。</string>
@@ -2544,11 +2544,11 @@ POIの更新は利用できません</string>
     <string name="save_as_line">線として保存</string>
     <string name="route_point">ルートポイント</string>
     <string name="edit_line">線の編集</string>
-    <string name="add_point_before">その前にポイントを追加する</string>
-    <string name="add_point_after">その後にポイントを追加する</string>
+    <string name="add_point_before">選択地点の前に追加</string>
+    <string name="add_point_after">選択地点の後に追加</string>
     <string name="shared_string_options">オプション</string>
     <string name="measurement_tool_snap_to_road_descr">OsmAndは、選択したプロファイルのルートにポイントを接続します。</string>
-    <string name="measurement_tool_save_as_new_track_descr">そのルートポイントを点または線として保存できます。</string>
+    <string name="measurement_tool_save_as_new_track_descr">選択した地点をルートポイントまたは線として保存できます。</string>
     <string name="add_line">線の追加</string>
     <string name="wrong_input">入力が間違っています</string>
     <string name="enter_new_name">新しい名前を入力</string>
@@ -3108,7 +3108,7 @@ POIの更新は利用できません</string>
     <string name="files_copied">%1$d個のファイルをコピーしました。(%2$s)</string>
     <string name="files_failed">%1$d個のファイルのコピーに失敗しました。(%2$s)</string>
     <string name="files_present">%1$d個のファイル(%2$s)は、以前の場所\'%3$s\'に残っています。</string>
-    <string name="move_maps">マップの移動</string>
+    <string name="move_maps">移動させる</string>
     <string name="dont_move_maps">移動しない</string>
     <string name="public_transport_ped_route_title">徒歩でのルートは約%1$sで、公共交通機関の利用よりも速い可能性があります</string>
     <string name="public_transport_no_route_title">残念ながらOsmAndでは設定に即したルートを見つけることができませんでした。</string>

OsmAnd/res/values-nb/strings.xml

@@ -3182,4 +3182,5 @@
     <string name="sett_generic_ext_input">Vanlig tastatur</string>
     <string name="sett_wunderlinq_ext_input">WunderLINQ</string>
     <string name="shared_string_default">Forvalg</string>
+    <string name="shared_string_file_is_saved">% lagret</string>
 </resources>

OsmAnd/res/values-pl/phrases.xml

@@ -693,7 +693,7 @@
     <string name="poi_piste_skitour">Trasa skitour</string>
     <string name="poi_piste_snow_park">Trasa - park śnieżny</string>
     <string name="poi_piste_ice_skate">Trasa łyżwiarska</string>
-    <string name="poi_community_centre">Centrum kultury</string>
+    <string name="poi_community_centre">Centrum społeczności</string>
     <string name="poi_social_centre">Klub towarzyski</string>
     <string name="poi_trail_riding_station">Przejażdżki konne</string>
     <string name="poi_craft_agricultural_engines">Silniki rolnicze (wystawa)</string>
@@ -1519,7 +1519,7 @@
     <string name="poi_piste_grooming_no">Brak</string>
     <string name="poi_piste_grooming_mogul">Kocie łby</string>
     <string name="poi_garden_type_residential">Typ ogrodu: przydomowy</string>
-    <string name="poi_garden_type_community">Typ ogrodu: społeczności</string>
+    <string name="poi_garden_type_community">Typ ogrodu: społecznościowy</string>
     <string name="poi_garden_type_private">Typ ogrodu: prywatny</string>
     <string name="poi_garden_type_botanical">Typ ogrodu: botaniczny</string>
     <string name="poi_garden_style_kitchen">Styl ogrodu: warzywny</string>
@@ -3242,7 +3242,7 @@
     <string name="poi_water_supply_water_trucking">cysterna</string>
     <string name="poi_water_supply_water_tank">zbiornik</string>
     <string name="poi_water_supply_bottled_water">woda butelkowana</string>
-    <string name="poi_water_place_access_community">społeczność</string>
+    <string name="poi_water_place_access_community">Społeczność</string>
     <string name="poi_water_place_access_family">rodzina</string>
     <string name="poi_water_place_access_multifamilies">dla wielu rodzin</string>
     <string name="poi_socket_cee_blue">Wtyczka: CEE niebieska</string>
@@ -3603,4 +3603,117 @@
     <string name="poi_historic_tank">Zbiornik historyczny</string>
     <string name="poi_hookah_lounge">Hookah lounge - Salon fajki wodnej (shisha)</string>
     <string name="poi_source_biomass">Źródło energii: biomasa</string>
+    <string name="poi_snowmobile_filter">Dostęp dla skuterów śnieżnych</string>
+    <string name="poi_access_bus">Dostęp dla autobusów</string>
+    <string name="poi_access_caravan">Dostęp dla przyczepy kempingowej</string>
+    <string name="poi_access_motorhome">Dostęp dla samochodów kempingowych</string>
+    <string name="poi_access_trailer">Dostęp dla przyczep</string>
+    <string name="poi_access_motorcycle">Dostęp dla motocyklów</string>
+    <string name="poi_access_moped">Dostęp dla motorowerów</string>
+    <string name="poi_access_mofa">Dostęp dla mofa</string>
+    <string name="poi_access_hgv">Dostęp dla samochodów ciężarowych</string>
+    <string name="poi_access_goods">Dostęp dla lekkich pojazdów ciężarowych</string>
+    <string name="poi_access_disabled">Dostęp dla niepełnosprawnych</string>
+    <string name="poi_taxi_office">Biuro taksówek</string>
+    <string name="poi_vehicle_yes">Dostęp dla pojazdów: tak</string>
+    <string name="poi_vehicle_private">Dostęp dla pojazdów: prywatny</string>
+    <string name="poi_vehicle_no">Dostęp dla pojazdów: nie</string>
+    <string name="poi_vehicle_destination">Dostęp dla pojazdów: do celu podróży</string>
+    <string name="poi_vehicle_permissive">Dostęp dla pojazdów: dopuszczalny</string>
+    <string name="poi_vehicle_customers">Dostęp dla pojazdów: dla klientów</string>
+    <string name="poi_vehicle_military">Dostęp dla pojazdów: dla wojska</string>
+    <string name="poi_vehicle_delivery">Dostęp dla pojazdów: dla dostaw</string>
+    <string name="poi_vehicle_forestry">Dostęp dla pojazdów: dla leśnictwa</string>
+    <string name="poi_motorcar_yes">Dostęp dla samochodów:</string>
+    <string name="poi_motorcar_private">Dostęp dla samochodów: prywatny</string>
+    <string name="poi_motorcar_no">Dostęp dla samochodów: nie</string>
+    <string name="poi_motorcar_destination">Dostęp dla samochodów: do celu podróży</string>
+    <string name="poi_motorcar_permissive">Dostęp dla samochodów: dopuszczalny</string>
+    <string name="poi_motorcar_customers">Dostęp dla samochodów: dla klientów</string>
+    <string name="poi_motorcar_forestry">Dostęp dla samochodów: dla leśnictwa</string>
+    <string name="poi_motor_vehicle_yes">Dostęp dla pojazdów silnikowych: tak</string>
+    <string name="poi_motor_vehicle_private">Dostęp dla pojazdów silnikowych: prywatny</string>
+    <string name="poi_motor_vehicle_no">Dostęp dla pojazdów silnikowych: nie</string>
+    <string name="poi_motor_vehicle_destination">Dostęp dla pojazdów silnikowych: do celu podróży</string>
+    <string name="poi_motor_vehicle_permissive">Dostęp dla pojazdów silnikowych: dopuszczalny</string>
+    <string name="poi_motor_vehicle_customers">Dostęp dla pojazdów silnikowych: dla klientów</string>
+    <string name="poi_motor_vehicle_military">Dostęp dla pojazdów silnikowych: dla wojska</string>
+    <string name="poi_motor_vehicle_delivery">Dostęp dla pojazdów silnikowych: dla dostawców</string>
+    <string name="poi_motor_vehicle_forestry">Dostęp dla pojazdów silnikowych: dla leśnictwa</string>
+    <string name="poi_motor_vehicle_agricultural">Dostęp dla pojazdów silnikowych: dla pojazdów rolniczych</string>
+    <string name="poi_hgv_private">Dostęp dla ciężarówek: prywatny</string>
+    <string name="poi_hgv_no">Dostęp dla ciężarówek: nie</string>
+    <string name="poi_hgv_agricultural">Dostęp dla ciężarówek: dla pojazdów rolniczych</string>
+    <string name="poi_hgv_discouraged">Dostęp dla ciężarówek: niezalecany</string>
+    <string name="poi_hgv_unsuitable">Dostęp dla ciężarówek: niedostosowany</string>
+    <string name="poi_goods_no">Dostęp dla lekkich pojazdów ciężarowych: nie</string>
+    <string name="poi_motorcycle_private">Dostęp dla motocykli: prywatny</string>
+    <string name="poi_motorcycle_no">Dostęp dla motocykli: nie</string>
+    <string name="poi_moped_no">Dostęp dla motorowerów: nie</string>
+    <string name="poi_mofa_no">Dostęp dla mofa: nie</string>
+    <string name="poi_bicycle_private">Dostęp dla rowerów: prywatny</string>
+    <string name="poi_bicycle_dismount">Dostęp dla rowerów: po zsiądnięciu</string>
+    <string name="poi_bicycle_destination">Dostęp dla rowerów: do celu podróży</string>
+    <string name="poi_bicycle_permissive">Dostęp dla rowerów: dopuszczalny</string>
+    <string name="poi_bicycle_customers">Dostęp dla rowerów: dla klientów</string>
+    <string name="poi_horse_private">Dostęp dla koni: prywatny</string>
+    <string name="poi_horse_destination">Dostęp dla koni: do celu podróży</string>
+    <string name="poi_horse_permissive">Dostęp dla koni: dopuszczalny</string>
+    <string name="poi_horse_forestry">Dostęp dla koni: dla leśnictwa</string>
+    <string name="poi_foot_yes">Dostęp dla pieszych: tak</string>
+    <string name="poi_foot_private">Dostęp dla pieszych: prywatny</string>
+    <string name="poi_foot_no">Dostęp dla pieszych: nie</string>
+    <string name="poi_foot_destination">Dostęp dla pieszych: do celu podróży</string>
+    <string name="poi_foot_permissive">Dostęp dla pieszych: dopuszczalny</string>
+    <string name="poi_foot_customers">Dostęp dla pieszych: dla klientów</string>
+    <string name="poi_caravan_no">Dostęp dla przyczep kempingowych: nie</string>
+    <string name="poi_motorhome_no">Dostęp dla samochodów kempingowych: nie</string>
+    <string name="poi_trailer_no">Dostęp dla przyczep: nie</string>
+    <string name="poi_psv_yes">Dostęp dla komunikacji publicznej: tak</string>
+    <string name="poi_psv_designated">Dostęp dla komunikacji publicznej: przeznaczony</string>
+    <string name="poi_psv_no">Dostęp dla komunikacji publicznej: nie</string>
+    <string name="poi_bus_no">Dostęp dla autobusów: nie</string>
+    <string name="poi_tourist_bus_yes">Dostęp dla autobusów turystycznych: tak</string>
+    <string name="poi_tourist_bus_designated">Dostęp dla autobusów turystycznych: przeznaczony</string>
+    <string name="poi_tourist_bus_no">Dostęp dla autobusów turystycznych: nie</string>
+    <string name="poi_coach_yes">Dostęp dla autokarów: tak</string>
+    <string name="poi_coach_no">Dostęp dla autokarów: nie</string>
+    <string name="poi_ski_yes">Dostęp dla narciarzy: tak</string>
+    <string name="poi_ski_no">Dostęp dla narciarzy: nie</string>
+    <string name="poi_snowmobile_private">Dostęp dla skuterów śnieżnych: prywatny</string>
+    <string name="poi_snowmobile_no">Dostęp dla skuterów śnieżnych: nie</string>
+    <string name="poi_agricultural_yes">Dostęp dla pojazdów rolniczych: tak</string>
+    <string name="poi_agricultural_no">Dostęp dla pojazdów rolniczych: nie</string>
+    <string name="poi_taxi_yes">Dostęp dla taksówek: tak</string>
+    <string name="poi_taxi_designated">Dostęp dla taksówek: przeznaczony</string>
+    <string name="poi_taxi_no">Dostęp dla taksówek: nie</string>
+    <string name="poi_disabled_no">Dostęp dla niepełnosprawnych: nie</string>
+    <string name="poi_snowmobile_yes">Tak</string>
+    <string name="poi_snowmobile_designated">Przeznaczony</string>
+    <string name="poi_snowmobile_permissive">Dopuszczalny</string>
+    <string name="poi_bus_yes">Tak</string>
+    <string name="poi_bus_designated">Przeznaczony</string>
+    <string name="poi_caravan_yes">Tak</string>
+    <string name="poi_caravan_designated">Przeznaczony</string>
+    <string name="poi_motorhome_yes">Tak</string>
+    <string name="poi_motorhome_designated">Przeznaczony</string>
+    <string name="poi_trailer_yes">Tak</string>
+    <string name="poi_trailer_designated">Przeznaczony</string>
+    <string name="poi_motorcycle_yes">Tak</string>
+    <string name="poi_motorcycle_permissive">Dopuszczalny</string>
+    <string name="poi_motorcycle_destination">Do celu podróży</string>
+    <string name="poi_motorcycle_designated">Przeznaczony</string>
+    <string name="poi_moped_yes">Tak</string>
+    <string name="poi_moped_designated">Przeznaczony</string>
+    <string name="poi_mofa_yes">Tak</string>
+    <string name="poi_mofa_designated">Przeznaczony</string>
+    <string name="poi_hgv_yes">Tak</string>
+    <string name="poi_hgv_destination">Do celu podróży</string>
+    <string name="poi_hgv_permissive">Dopuszczalny</string>
+    <string name="poi_hgv_designated">Przeznaczony</string>
+    <string name="poi_hgv_delivery">Dostawa</string>
+    <string name="poi_goods_yes">Tak</string>
+    <string name="poi_goods_designated">Przeznaczony</string>
+    <string name="poi_disabled_yes">Tak</string>
+    <string name="poi_disabled_designated">Przeznaczony</string>
 </resources>

OsmAnd/res/values-pl/strings.xml

@@ -103,7 +103,7 @@
 \tAby jej użyć, proszę wybrać „Menu” → „Skonfiguruj mapę” → „Zasób mapy…” → „Wektorowe mapy offline”.</string>
     <string name="choose_audio_stream">Wyjście dźwięku nawigacji głosowej</string>
     <string name="choose_audio_stream_descr">Wybierz głośnik, aby odtworzyć wskazówki głosowe.</string>
-    <string name="voice_stream_voice_call">Kanał głosowy (także przerywa odtwarzanie muzyki z głośników)</string>
+    <string name="voice_stream_voice_call">Kanał głosowy (przerywa odtwarzanie muzyki z głośników)</string>
     <string name="voice_stream_notification">Kanał powiadomień</string>
     <string name="voice_stream_music">Kanał media/music</string>
     <string name="warning_tile_layer_not_downloadable">Aplikacja nie może pobrać warstwy %1$s, spróbuj ją przeinstalować.</string>
@@ -2908,7 +2908,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="quick_action_switch_day_mode">Tryb Dzienny</string>
     <string name="quick_action_switch_night_mode">Tryb Nocny</string>
     <string name="quick_action_day_night_switch_mode">Zmień tryb Dzienny/Nocny</string>
-    <string name="routeInfo_roadClass_name">Kategoria</string>
+    <string name="routeInfo_roadClass_name">Rodzaj drogi</string>
     <string name="routeInfo_surface_name">Powierzchnia</string>
     <string name="routeInfo_smoothness_name">Wygładzanie</string>
     <string name="routeInfo_steepness_name">Nachylenie</string>
@@ -3156,7 +3156,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="app_mode_personal_transporter">Transporter osobisty</string>
     <string name="precision_hdop_and_vdop">Precyzja w poziomie: %1$s, w pionie: %2$s</string>
     <string name="precision_hdop">Precyzja w poziomie: %s</string>
-    <string name="app_mode_offroad">Poza drogą</string>
+    <string name="app_mode_offroad">off-road</string>
     <string name="edit_profile_setup_subtitle">Profil zachowa własne ustawienia</string>
     <string name="edit_profile_setup_map_subtitle">Wybierz domyślne opcje mapy dla profilu</string>
     <string name="edit_profile_screen_options_subtitle">Wybierz domyślne opcje ekranu dla profilu</string>
@@ -3186,29 +3186,29 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="shared_string_file_is_saved">Zapisano %s</string>
     <string name="shared_string_open_track">Otwórz ślad</string>
     <string name="shared_string_track_is_saved">Ślad %s jest zapisany</string>
-    <string name="release_3_4">• Profile aplikacji: Stwórz własny profil dla własnych potrzeb, z niestandardową ikoną i kolorem
-\n
-\n• Teraz można dostosować domyślne ustawienia dowolnego profilu i prędkości min/max
-\n
-\n• Dodano widget dla bieżących współrzędnych
-\n
-\n• Dodano opcje pokazania kompasu i linijki promienia na mapie
-\n
-\n• Napraw Rejestrowanie śladu tła
-\n
-\n• Ulepszone pliki do pobrania mapy w tle
-\n
-\n• Zwrócona opcja \"Turn Screen on\"
-\n
-\n• Poprawiono wybór języka Wikipedii
-\n
-\n• Poprawiono zachowanie przycisku kompasu podczas nawigacji
-\n
+    <string name="release_3_4">• Profile aplikacji: Stwórz własny profil dla własnych potrzeb, z niestandardową ikoną i kolorem 
+\n 
+\n• Teraz można dostosować domyślne ustawienia dowolnego profilu i prędkości min/max 
+\n 
+\n• Dodano widget dla bieżących współrzędnych 
+\n 
+\n• Dodano opcje pokazania kompasu i linijki promienia na mapie 
+\n 
+\n• Napraw Rejestrowanie śladu tła 
+\n 
+\n• Ulepszone pliki do pobrania mapy w tle 
+\n 
+\n• Zwrócona opcja \"Turn Screen on\" 
+\n 
+\n• Poprawiono wybór języka Wikipedii 
+\n 
+\n• Poprawiono zachowanie przycisku kompasu podczas nawigacji 
+\n 
 \n• Inne poprawki błędów
 \n
 \n</string>
-    <string name="edit_profile_setup_title">Konfiguracja Profilu</string>
-    <string name="rendering_attr_highway_class_track_grade1_name">Stopień 1</string>
+    <string name="edit_profile_setup_title">Konfiguracja profilu</string>
+    <string name="rendering_attr_highway_class_track_grade1_name">Klasa 1</string>
     <string name="rendering_attr_highway_class_track_grade2_name">Klasa 2</string>
     <string name="rendering_attr_highway_class_track_grade3_name">Klasa 3</string>
     <string name="rendering_attr_highway_class_track_grade4_name">Klasa 4</string>
@@ -3222,4 +3222,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="app_mode_monowheel">Monocykl</string>
     <string name="shared_string_default">Domyślnie</string>
     <string name="gpx_join_gaps">Połącz luki</string>
+    <string name="lang_oc">Prowansalski</string>
+    <string name="app_mode_wagon">Wóz</string>
+    <string name="app_mode_pickup_truck">Pickup</string>
 </resources>

OsmAnd/res/values-pt-rBR/phrases.xml

@@ -1246,8 +1246,8 @@
     <string name="poi_passing_place">Lugar de passagem</string>
     <string name="poi_level">Andar</string>
     <string name="poi_bird_hide">Observatório de aves</string>
-    <string name="poi_internet_access_yes">Com acesso à Internet</string>
-    <string name="poi_internet_access_no">Sem acesso à Internet</string>
+    <string name="poi_internet_access_yes">Acesso à Internet: sim</string>
+    <string name="poi_internet_access_no">Acesso à Internet: não</string>
     <string name="poi_wheelchair_no">Não</string>
     <string name="poi_wheelchair_limited">Limitado</string>
     <string name="poi_pump_yes">Sim</string>
@@ -1535,7 +1535,7 @@
     <string name="poi_toilets_wheelchair_yes">Acesso aos banheiros para cadeirantes: sim</string>
     <string name="poi_toilets_wheelchair_no">Acesso aos banheiros para cadeirantes: não</string>
     <string name="poi_toilets_access_customers">Acesso aos banheiros: clientes</string>
-    <string name="poi_toilets_access_permissive">Acesso aos banheiros: permitido</string>
+    <string name="poi_toilets_access_permissive">Acesso aos banheiros: permissivo</string>
     <string name="poi_toilets_access_community">Acesso aos banheiros: comunidade</string>
     <string name="poi_toilets_access_public">Acesso aos banheiros: público</string>
     <string name="poi_diaper_yes">Com trocador de fralda</string>
@@ -2758,8 +2758,8 @@
     <string name="poi_treat_inpatient_only">Serviços de internamento: somente</string>
     <string name="poi_counselling_yes">Aconselhamento: sim</string>
     <string name="poi_counselling_no">Aconselhamento: não</string>
-    <string name="poi_emergency_yes">sim</string>
-    <string name="poi_emergency_no">não</string>
+    <string name="poi_emergency_yes">Emergência: sim</string>
+    <string name="poi_emergency_no">Emergência: não</string>
     <string name="poi_home_visit_yes">Sim</string>
     <string name="poi_home_visit_no">Visita domiciliar: não</string>
     <string name="poi_disease_malaria_yes">Malária: sim</string>
@@ -3604,4 +3604,117 @@
     <string name="poi_historic_tank">Tanque histórico</string>
     <string name="poi_hookah_lounge">Salão do cachimbo de água</string>
     <string name="poi_source_biomass">Fonte de energia: biomassa</string>
+    <string name="poi_access_motorcycle">Acesso de motocicletas</string>
+    <string name="poi_access_mofa">Acesso de bicicleta motorizada</string>
+    <string name="poi_access_hgv">Acesso de veículos pesados</string>
+    <string name="poi_access_goods">Acesso de veículos de cargas leves</string>
+    <string name="poi_access_disabled">Acesso para deficientes físicos</string>
+    <string name="poi_moped_no">Acesso de mobilete: não</string>
+    <string name="poi_disabled_yes">Sim</string>
+    <string name="poi_snowmobile_filter">Acesso de moto de neve</string>
+    <string name="poi_access_bus">Acesso de ônibus</string>
+    <string name="poi_access_caravan">Acesso de caravana</string>
+    <string name="poi_access_motorhome">Acesso de autocaravana</string>
+    <string name="poi_access_trailer">Acesso de trailer</string>
+    <string name="poi_access_moped">Acesso de mobilete</string>
+    <string name="poi_vehicle_yes">Acesso de veículos: sim</string>
+    <string name="poi_vehicle_private">Acesso de veículos: privado</string>
+    <string name="poi_vehicle_no">Acesso de veículos: não</string>
+    <string name="poi_vehicle_destination">Acesso de veículos: para trânsito local</string>
+    <string name="poi_vehicle_permissive">Acesso de veículos: permissivo</string>
+    <string name="poi_vehicle_customers">Acesso de veículos: para clientes</string>
+    <string name="poi_vehicle_military">Acesso de veículos: militar</string>
+    <string name="poi_vehicle_delivery">Acesso de veículos: entrega</string>
+    <string name="poi_vehicle_forestry">Acesso de veículos: florestal</string>
+    <string name="poi_motorcar_yes">Acesso de automóveis:</string>
+    <string name="poi_motorcar_private">Acesso de automóveis: privado</string>
+    <string name="poi_motorcar_no">Acesso de automóveis: não</string>
+    <string name="poi_motorcar_destination">Acesso de automóveis: para trânsito local</string>
+    <string name="poi_motorcar_permissive">Acesso de automóveis: permissivo</string>
+    <string name="poi_motorcar_customers">Acesso de automóveis: para clientes</string>
+    <string name="poi_motorcar_forestry">Acesso de automóveis: florestal</string>
+    <string name="poi_motor_vehicle_yes">Acesso de veículos motorizados: sim</string>
+    <string name="poi_motor_vehicle_private">Acesso de veículos motorizados: privado</string>
+    <string name="poi_motor_vehicle_no">Acesso de veículos motorizados: não</string>
+    <string name="poi_motor_vehicle_destination">Acesso de veículos motorizados: para trânsito local</string>
+    <string name="poi_motor_vehicle_permissive">Acesso de veículos motorizados: para trânsito local</string>
+    <string name="poi_motor_vehicle_customers">Acesso de veículos motorizados: clientes</string>
+    <string name="poi_motor_vehicle_military">Acesso de veículos motorizados: militar</string>
+    <string name="poi_motor_vehicle_delivery">Acesso de veículos motorizados: entrega</string>
+    <string name="poi_motor_vehicle_forestry">Acesso de veículos motorizados: florestal</string>
+    <string name="poi_motor_vehicle_agricultural">Acesso de veículos motorizados: agrícola</string>
+    <string name="poi_motorcycle_private">Acesso de motocicletas: privado</string>
+    <string name="poi_motorcycle_no">Acesso de motocicletas: não</string>
+    <string name="poi_taxi_designated">Acesso de táxi: designado</string>
+    <string name="poi_taxi_no">Acesso de táxi: não</string>
+    <string name="poi_disabled_no">Acesso para deficientes: não</string>
+    <string name="poi_snowmobile_yes">Sim</string>
+    <string name="poi_snowmobile_designated">Designado</string>
+    <string name="poi_snowmobile_permissive">Permissivo</string>
+    <string name="poi_bus_yes">Sim</string>
+    <string name="poi_bus_designated">Designado</string>
+    <string name="poi_caravan_yes">Sim</string>
+    <string name="poi_caravan_designated">Designado</string>
+    <string name="poi_motorhome_yes">Sim</string>
+    <string name="poi_moped_yes">Sim</string>
+    <string name="poi_moped_designated">Designado</string>
+    <string name="poi_mofa_yes">Sim</string>
+    <string name="poi_mofa_designated">Designado</string>
+    <string name="poi_hgv_yes">Sim</string>
+    <string name="poi_hgv_permissive">Permissivo</string>
+    <string name="poi_hgv_designated">Designado</string>
+    <string name="poi_hgv_delivery">Entrega</string>
+    <string name="poi_goods_yes">Sim</string>
+    <string name="poi_goods_designated">Designado</string>
+    <string name="poi_disabled_designated">Designado</string>
+    <string name="poi_taxi_office">Escritório de táxi</string>
+    <string name="poi_hgv_private">Acesso para veículos pesados: privado</string>
+    <string name="poi_hgv_no">Acesso para veículos pesados: não</string>
+    <string name="poi_hgv_agricultural">Acesso para veículos pesados: agrícola</string>
+    <string name="poi_hgv_discouraged">Acesso para veículos pesados: desencorajado</string>
+    <string name="poi_hgv_unsuitable">Acesso para veículos pesados: impróprio</string>
+    <string name="poi_goods_no">Acesso para veículos leves: não</string>
+    <string name="poi_mofa_no">Acesso para bicicletas: não</string>
+    <string name="poi_bicycle_private">Acesso de bicicleta: privado</string>
+    <string name="poi_bicycle_dismount">Acesso de bicicleta: ir a pé</string>
+    <string name="poi_bicycle_destination">Acesso de bicicleta: destino</string>
+    <string name="poi_bicycle_permissive">Acesso de bicicleta: permissivo</string>
+    <string name="poi_bicycle_customers">Acesso de bicicleta: clientes</string>
+    <string name="poi_horse_private">Acesso a cavalo: privado</string>
+    <string name="poi_horse_destination">Acesso a cavalo: destino</string>
+    <string name="poi_horse_permissive">Acesso a cavalo: permissivo</string>
+    <string name="poi_horse_forestry">Acesso a cavalo: florestal</string>
+    <string name="poi_foot_yes">Acesso de pedestre: sim</string>
+    <string name="poi_foot_private">Acesso de pedestre: privada</string>
+    <string name="poi_foot_no">Acesso de pedestre: não</string>
+    <string name="poi_foot_destination">Acesso de pedestre: destino</string>
+    <string name="poi_foot_permissive">Acesso de pedestre: permissivo</string>
+    <string name="poi_foot_customers">Acesso de pedestre: clientes</string>
+    <string name="poi_caravan_no">Acesso de caravana: não</string>
+    <string name="poi_motorhome_no">Acesso de trailer: não</string>
+    <string name="poi_trailer_no">Acesso de trailer: não</string>
+    <string name="poi_psv_yes">Acesso para transporte público: sim</string>
+    <string name="poi_psv_designated">Acesso para transporte público: designado</string>
+    <string name="poi_psv_no">Acesso para transporte público: não</string>
+    <string name="poi_bus_no">Acesso de ônibus: não</string>
+    <string name="poi_tourist_bus_yes">Acesso de ônibus turístico: sim</string>
+    <string name="poi_tourist_bus_designated">Acesso de ônibus turístico: designado</string>
+    <string name="poi_tourist_bus_no">Acesso de ônibus turístico: não</string>
+    <string name="poi_coach_yes">Acesso para ônibus de longa distância: sim</string>
+    <string name="poi_coach_no">Acesso para ônibus de longa distância: não</string>
+    <string name="poi_ski_yes">Acesso de esqui: sim</string>
+    <string name="poi_ski_no">Acesso de esqui: não</string>
+    <string name="poi_snowmobile_private">Acesso de motos de neve: privado</string>
+    <string name="poi_snowmobile_no">Acesso de motos de neve: não</string>
+    <string name="poi_agricultural_yes">Acesso de veículos agrícolas: sim</string>
+    <string name="poi_agricultural_no">Acesso de veículos agrícolas: não</string>
+    <string name="poi_taxi_yes">Acesso de táxi: sim</string>
+    <string name="poi_motorhome_designated">Designado</string>
+    <string name="poi_trailer_yes">Sim</string>
+    <string name="poi_trailer_designated">Designado</string>
+    <string name="poi_motorcycle_yes">Sim</string>
+    <string name="poi_motorcycle_permissive">Permissivo</string>
+    <string name="poi_motorcycle_destination">Destino</string>
+    <string name="poi_motorcycle_designated">Designado</string>
+    <string name="poi_hgv_destination">Destino</string>
 </resources>

OsmAnd/res/values-pt-rBR/strings.xml

@@ -1926,7 +1926,7 @@ Pôr do Sol: %2$s</string>
     <string name="no_update_info_desc">Não verificar se há novas versões ou descontos relacionados ao OsmAnd.</string>
     <string name="no_update_info">Não mostrar novas versões</string>
     <string name="update_all_maps_now">Atualizar todos os mapas agora?</string>
-    <string name="clear_tile_data">Limpar todos os títulos</string>
+    <string name="clear_tile_data">Limpar quadrículas</string>
     <string name="replace_favorite_confirmation">Você tem certeza que deseja substituir o Favorito %1$s?</string>
     <string name="shared_string_change">Mudar</string>
     <string name="coords_search">Busca de coordenadas</string>
@@ -3197,8 +3197,13 @@ Pôr do Sol: %2$s</string>
     <string name="gpx_join_gaps">Mesclar espaços</string>
     <string name="app_mode_camper">Casa móvel (campista)</string>
     <string name="app_mode_campervan">Autocaravana</string>
-    <string name="rendering_attr_showLez_description">"Mostrar zonas de baixa emissão no mapa.  Não afeta o roteamento."</string>
-    <string name="rendering_attr_showLez_name">Mostrar baixas zonas de emissão</string>
+    <string name="rendering_attr_showLez_description">Mostrar zonas de baixa emissão no mapa. Não afeta o roteamento.</string>
+    <string name="rendering_attr_showLez_name">Mostrar zonas de baixa emissão</string>
     <string name="temporary_conditional_routing">Considere limitações temporárias</string>
     <string name="shared_string_default">Predefinido</string>
+    <string name="new_route_calculated_dist_dbg">Rota: distância %s, tempo do rota %s
+\nCálculo: %.1f sec, %d estradas, %d azulejos)</string>
+    <string name="lang_oc">Occitano</string>
+    <string name="app_mode_wagon">Vagão</string>
+    <string name="app_mode_pickup_truck">Caminhonete</string>
 </resources>

OsmAnd/res/values-pt/phrases.xml

@@ -3589,4 +3589,117 @@
     <string name="poi_historic_tank">Tanque histórico</string>
     <string name="poi_hookah_lounge">Salão Hookah</string>
     <string name="poi_source_biomass">Fonte de energia: biomassa</string>
+    <string name="poi_snowmobile_filter">Acesso de moto de neve</string>
+    <string name="poi_access_bus">Acesso de ônibus</string>
+    <string name="poi_access_caravan">Acesso de caravana</string>
+    <string name="poi_access_motorhome">Acesso de autocaravana</string>
+    <string name="poi_access_trailer">Acesso de trailer</string>
+    <string name="poi_access_motorcycle">Acesso de motocicletas</string>
+    <string name="poi_access_moped">Acesso de mobilete</string>
+    <string name="poi_access_mofa">Acesso de bicicleta motorizada</string>
+    <string name="poi_access_hgv">Acesso de veículos pesados</string>
+    <string name="poi_access_goods">Acesso de veículos de cargas leves</string>
+    <string name="poi_access_disabled">Acesso para deficientes físicos</string>
+    <string name="poi_taxi_office">Escritório de táxi</string>
+    <string name="poi_vehicle_yes">Acesso de veículos: sim</string>
+    <string name="poi_vehicle_private">Acesso de veículos: privado</string>
+    <string name="poi_vehicle_no">Acesso de veículos: não</string>
+    <string name="poi_vehicle_destination">Acesso de veículos: para trânsito local</string>
+    <string name="poi_vehicle_permissive">Acesso de veículos: permissivo</string>
+    <string name="poi_vehicle_customers">Acesso de veículos: para clientes</string>
+    <string name="poi_vehicle_military">Acesso de veículos: militar</string>
+    <string name="poi_vehicle_delivery">Acesso de veículos: entrega</string>
+    <string name="poi_vehicle_forestry">Acesso de veículos: florestal</string>
+    <string name="poi_motorcar_yes">Acesso de automóveis:</string>
+    <string name="poi_motorcar_private">Acesso de automóveis: privado</string>
+    <string name="poi_motorcar_no">Acesso de automóveis: não</string>
+    <string name="poi_motorcar_destination">Acesso de automóveis: para trânsito local</string>
+    <string name="poi_motorcar_permissive">Acesso de automóveis: permissivo</string>
+    <string name="poi_motorcar_customers">Acesso de automóveis: para clientes</string>
+    <string name="poi_motorcar_forestry">Acesso de automóveis: florestal</string>
+    <string name="poi_motor_vehicle_yes">Acesso de veículos motorizados: sim</string>
+    <string name="poi_motor_vehicle_private">Acesso de veículos motorizados: privado</string>
+    <string name="poi_motor_vehicle_no">Acesso de veículos motorizados: não</string>
+    <string name="poi_motor_vehicle_destination">Acesso de veículos motorizados: para trânsito local</string>
+    <string name="poi_motor_vehicle_permissive">Acesso de veículos motorizados: para trânsito local</string>
+    <string name="poi_motor_vehicle_customers">Acesso de veículos motorizados: clientes</string>
+    <string name="poi_motor_vehicle_military">Acesso de veículos motorizados: militar</string>
+    <string name="poi_motor_vehicle_delivery">Acesso de veículos motorizados: entrega</string>
+    <string name="poi_motor_vehicle_forestry">Acesso de veículos motorizados: florestal</string>
+    <string name="poi_motor_vehicle_agricultural">Acesso de veículos motorizados: agrícola</string>
+    <string name="poi_hgv_private">Acesso para veículos pesados: privado</string>
+    <string name="poi_hgv_no">Acesso para veículos pesados: não</string>
+    <string name="poi_hgv_agricultural">Acesso para veículos pesados: agrícola</string>
+    <string name="poi_hgv_discouraged">Acesso para veículos pesados: desencorajado</string>
+    <string name="poi_hgv_unsuitable">Acesso para veículos pesados: impróprio</string>
+    <string name="poi_goods_no">Acesso para veículos leves: não</string>
+    <string name="poi_motorcycle_private">Acesso de motocicletas: privado</string>
+    <string name="poi_motorcycle_no">Acesso de motocicletas: não</string>
+    <string name="poi_moped_no">Acesso de mobilete: não</string>
+    <string name="poi_mofa_no">Acesso para bicicletas motorizadas: não</string>
+    <string name="poi_bicycle_private">Acesso de bicicleta: privado</string>
+    <string name="poi_bicycle_dismount">Acesso de bicicleta: ir a pé</string>
+    <string name="poi_bicycle_destination">Acesso de bicicleta: para trânsito local</string>
+    <string name="poi_bicycle_permissive">Acesso de bicicleta: permissivo</string>
+    <string name="poi_bicycle_customers">Acesso de bicicleta: clientes</string>
+    <string name="poi_horse_private">Acesso a cavalo: privado</string>
+    <string name="poi_horse_destination">Acesso a cavalo: para trânsito local</string>
+    <string name="poi_horse_permissive">Acesso a cavalo: permissivo</string>
+    <string name="poi_horse_forestry">Acesso a cavalo: florestal</string>
+    <string name="poi_foot_yes">Acesso de pedestre: sim</string>
+    <string name="poi_foot_private">Acesso de pedestre: privada</string>
+    <string name="poi_foot_no">Acesso de pedestre: não</string>
+    <string name="poi_foot_destination">Acesso de pedestre: para trânsito local</string>
+    <string name="poi_foot_permissive">Acesso de pedestre: permissivo</string>
+    <string name="poi_foot_customers">Acesso de pedestre: clientes</string>
+    <string name="poi_caravan_no">Acesso de caravana: não</string>
+    <string name="poi_motorhome_no">Acesso de trailer: não</string>
+    <string name="poi_trailer_no">Acesso de trailer: não</string>
+    <string name="poi_psv_yes">Acesso para transporte público: sim</string>
+    <string name="poi_psv_designated">Acesso para transporte público: designado</string>
+    <string name="poi_psv_no">Acesso para transporte público: não</string>
+    <string name="poi_bus_no">Acesso de ônibus: não</string>
+    <string name="poi_tourist_bus_yes">Acesso de ônibus turístico: sim</string>
+    <string name="poi_tourist_bus_designated">Acesso de ônibus turístico: designado</string>
+    <string name="poi_tourist_bus_no">Acesso de ônibus turístico: não</string>
+    <string name="poi_coach_yes">Acesso para ônibus de longa distância: sim</string>
+    <string name="poi_coach_no">Acesso para ônibus de longa distância: não</string>
+    <string name="poi_ski_yes">Acesso de esqui: sim</string>
+    <string name="poi_ski_no">Acesso de esqui: não</string>
+    <string name="poi_snowmobile_private">Acesso de motos de neve: privado</string>
+    <string name="poi_snowmobile_no">Acesso de motos de neve: não</string>
+    <string name="poi_agricultural_yes">Acesso de veículos agrícolas: sim</string>
+    <string name="poi_agricultural_no">Acesso de veículos agrícolas: não</string>
+    <string name="poi_taxi_yes">Acesso de táxi: sim</string>
+    <string name="poi_taxi_designated">Acesso de táxi: designado</string>
+    <string name="poi_taxi_no">Acesso de táxi: não</string>
+    <string name="poi_disabled_no">Acesso para deficientes: não</string>
+    <string name="poi_snowmobile_yes">Sim</string>
+    <string name="poi_snowmobile_designated">Designado</string>
+    <string name="poi_snowmobile_permissive">Permissivo</string>
+    <string name="poi_bus_yes">Sim</string>
+    <string name="poi_bus_designated">Designado</string>
+    <string name="poi_caravan_yes">Sim</string>
+    <string name="poi_caravan_designated">Designado</string>
+    <string name="poi_motorhome_yes">Sim</string>
+    <string name="poi_motorhome_designated">Designado</string>
+    <string name="poi_trailer_yes">Sim</string>
+    <string name="poi_trailer_designated">Designado</string>
+    <string name="poi_motorcycle_yes">Sim</string>
+    <string name="poi_motorcycle_permissive">Permissivo</string>
+    <string name="poi_motorcycle_destination">Destino</string>
+    <string name="poi_motorcycle_designated">Designado</string>
+    <string name="poi_moped_yes">Sim</string>
+    <string name="poi_moped_designated">Designado</string>
+    <string name="poi_mofa_yes">Sim</string>
+    <string name="poi_mofa_designated">Designado</string>
+    <string name="poi_hgv_yes">Sim</string>
+    <string name="poi_hgv_destination">Destino</string>
+    <string name="poi_hgv_permissive">Permissivo</string>
+    <string name="poi_hgv_designated">Designado</string>
+    <string name="poi_hgv_delivery">Entrega</string>
+    <string name="poi_goods_yes">Sim</string>
+    <string name="poi_goods_designated">Designado</string>
+    <string name="poi_disabled_yes">Sim</string>
+    <string name="poi_disabled_designated">Designado</string>
 </resources>

OsmAnd/res/values-pt/strings.xml

@@ -623,9 +623,9 @@
 \n\t\n\t Para usar, ative \'Menu\' -&gt; \'Definir Vista\' -&gt; \'Origem de Mapa…\' -&gt; \'Mapas Vetoriais Offline\'.</string>
     <string name="choose_audio_stream">Saída para orientação por voz</string>
     <string name="choose_audio_stream_descr">Selecione o narrador para reproduzir as instruções de voz.</string>
-    <string name="voice_stream_voice_call">Áudio de chamada telefônica (também para interromper os aparelhos de som BT do carro)</string>
+    <string name="voice_stream_voice_call">Áudio de chamada telefônica (para interromper os aparelhos de som BT do carro)</string>
     <string name="voice_stream_notification">Áudio de Notificação</string>
-    <string name="voice_stream_music">Áudio de Media/Música</string>
+    <string name="voice_stream_music">Áudio de Media/GPS</string>
     <string name="warning_tile_layer_not_downloadable">A aplicação não conseguiu descarregar a camada do mapa %1$s, se a tornar a instalar pode resolver o problema.</string>
     <string name="overlay_transparency_descr">Modificar a transparência da sobreposição.</string>
     <string name="overlay_transparency">Transparência da Sobreposição</string>
@@ -2554,7 +2554,7 @@
     <string name="lang_kn">Canarês</string>
     <string name="lang_fa">Persa</string>
     <string name="lang_sc">Sardenho</string>
-    <string name="lang_sr">Sérvio</string>
+    <string name="lang_sr">Sérvio (cirílico)</string>
     <string name="lang_sr_latn">Sérvio (latino)</string>
     <string name="lang_zh_cn">Chinês (simplificado)</string>
     <string name="lang_zh_hk">Chinês (Hong Kong)</string>
@@ -3021,7 +3021,7 @@
     <string name="add_home">Adicionar casa</string>
     <string name="add_work">Adicionar trabalho</string>
     <string name="work_button">Trabalho</string>
-    <string name="routeInfo_roadClass_name">Classe</string>
+    <string name="routeInfo_roadClass_name">Tipo de estrada</string>
     <string name="routeInfo_surface_name">Superfície</string>
     <string name="routeInfo_smoothness_name">Lisura</string>
     <string name="routeInfo_steepness_name">Inclinação</string>
@@ -3209,4 +3209,10 @@
     <string name="rendering_attr_showLez_description">Mostrar zonas de baixa emissão no mapa. Não afeta o roteamento.</string>
     <string name="rendering_attr_showLez_name">Mostrar zonas de baixa emissão</string>
     <string name="temporary_conditional_routing">Considerar limitações temporárias</string>
+    <string name="shared_string_default">Padrão</string>
+    <string name="new_route_calculated_dist_dbg">Rota: distância %s, tempo do roteador %s
+\nCálculo: %.1f seg, %d estradas, %d telhas)</string>
+    <string name="lang_oc">Occitano</string>
+    <string name="app_mode_wagon">Vagão</string>
+    <string name="app_mode_pickup_truck">Caminhonete</string>
 </resources>

OsmAnd/res/values-ru/strings.xml

@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="day">День</string>
+    <string name="days_2_4">Дня</string>
+    <string name="days_5">Дней</string>
+    <string name="week">Неделя</string>
+    <string name="weeks_2_4">Недели</string>
+    <string name="weeks_5">Недель</string>
+    <string name="month">Месяц</string>
+    <string name="months_2_4">Месяца</string>
+    <string name="months_5">Месяцев</string>
+    <string name="year">Год</string>
+    <string name="years_2_4">Года</string>
+    <string name="years_5">Лет</string>
+    <string name="months_3">Три месяца</string>
+    <string name="price_free">Бесплатно</string>
+    <string name="get_discount_title">Получите %1$d %2$s со скидкой %3$s.</string>
+    <string name="get_free_trial_title">Начать бесплатный период в %1$d %2$s.</string>
+    <string name="get_discount_first_part">%1$s за первый %2$s</string>
+    <string name="get_discount_first_few_part">%1$s за первые %2$s</string>
+    <string name="get_discount_second_part">затем %1$s</string>
+    <string name="cancel_subscription">Отменить подписку</string>
+    <string name="price_and_discount">%1$s • Экономия %2$s</string>
     <string name="rendering_attr_winter_road_name">Автозимник</string>
     <string name="rendering_attr_ice_road_name">Ледовый автозимник</string>
     <string name="routeInfo_winter_ice_road_name">Зимники</string>
@@ -3156,4 +3177,25 @@
     <string name="turn_screen_on_sensor">Использовать датчик приближения</string>
     <string name="turn_on_profile_desc">Пожалуйста, включите по крайней мере один профиль приложения, чтобы использовать этот параметр.</string>
     <string name="shared_string_file_is_saved">%s сохранено</string>
+    <string name="osmand_default_routing">Навигация OsmAnd</string>
+    <string name="custom_routing">Пользовательский профиль навигации</string>
+    <string name="special_routing_type">Специальная навигация</string>
+    <string name="third_party_routing_type">Сторонняя навигация</string>
+    <string name="routing_attr_piste_type_nordic_name">Лыжные гонки / северные дисциплины</string>
+    <string name="routing_attr_piste_type_nordic_description">Трассы для северных дисциплин или лыжных гонок.</string>
+    <string name="app_mode_personal_transporter">Сегвей</string>
+    <string name="routing_attr_max_num_changes_name">Количество изменений</string>
+    <string name="turn_screen_on_time_descr">Укажите время до поворота за которое экран будет включен.</string>
+    <string name="turn_screen_on_sensor_descr">Включение экрана во время навигации при проведении рукой в верхней части экрана.</string>
+    <string name="external_input_device">Внешние устройства ввода</string>
+    <string name="external_input_device_descr">Выберите устройство для внешнего управления, например, типовую клавиатуру или WunderLINQ.</string>
+    <string name="sett_no_ext_input">Нет</string>
+    <string name="sett_generic_ext_input">Типовая клавиатура</string>
+    <string name="sett_wunderlinq_ext_input">WunderLINQ</string>
+    <string name="sett_parrot_ext_input">Parrot</string>
+    <string name="shared_string_track_is_saved">Трек %s сохранен</string>
+    <string name="rendering_attr_showLez_name">Отображать зоны с низким уровнем выбросов</string>
+    <string name="temporary_conditional_routing">Учитывать временные ограничения</string>
+    <string name="new_route_calculated_dist_dbg">Маршрут: расстояние %s, время навигации %s 
+\nРасчет: %.1f с, %d дорог, %d тайлов)</string>
 </resources>

OsmAnd/res/values-sc/strings.xml

@@ -2910,7 +2910,7 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="voice_announcements">Annùntzios vocales</string>
     <string name="intermediate_destinations">Destinatziones intermèdias</string>
     <string name="arrive_at_time">Arribada a sas %1$s</string>
-    <string name="routeInfo_roadClass_name">Classe</string>
+    <string name="routeInfo_roadClass_name">Casta de caminu</string>
     <string name="routeInfo_surface_name">Superfìtzie</string>
     <string name="routeInfo_smoothness_name">Uniformidade</string>
     <string name="routeInfo_steepness_name">Ratesa</string>
@@ -3215,9 +3215,16 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="shared_string_file_is_saved">%s est sarvadu</string>
     <string name="shared_string_open_track">Aberi sa rasta</string>
     <string name="shared_string_track_is_saved">Rasta %s sarvada</string>
-    <string name="app_mode_camper">Camper</string>
-    <string name="rendering_attr_showLez_description">Ammustra sas zonas de emissione bassa in sa mapa. No infuentzat su càlculu de s\'àndala.</string>
-    <string name="rendering_attr_showLez_name">Ammustra sas zonas de emissione bassa</string>
+    <string name="app_mode_camper">Caravana</string>
+    <string name="rendering_attr_showLez_description">Ammustra sas zonas de emissione bassa in sa mapa. No influentzat su càlculu de s\'àndala.</string>
+    <string name="rendering_attr_showLez_name">Ammustra sas zonas a emissione bassa</string>
     <string name="temporary_conditional_routing">Mentene in cunsìderu sas limitatziones temporàneas</string>
     <string name="shared_string_default">Predefinidu</string>
+    <string name="gpx_join_gaps">Liga sas separatziones</string>
+    <string name="app_mode_campervan">Camper</string>
+    <string name="new_route_calculated_dist_dbg">Àndala: distàntzia %s, tempus %s 
+\nCàlculu: %.1f seg, %d caminos, %d tasseddos)</string>
+    <string name="lang_oc">Otzitanu</string>
+    <string name="app_mode_wagon">Vagone pro sas mertzes</string>
+    <string name="app_mode_pickup_truck">Camieddu</string>
 </resources>

OsmAnd/res/values-sk/phrases.xml

@@ -3319,4 +3319,56 @@
     <string name="poi_charcoal_pile">Milier na drevné uhlie</string>
     <string name="poi_historic_tank">Historický tank</string>
     <string name="poi_hookah_lounge">Bar s vodnými fajkami</string>
+    <string name="poi_wetland_saltern">Soľná odparovacia pláň</string>
+    <string name="poi_wetland_tidalflat">Prílivová rovina</string>
+    <string name="poi_wetland_saltmarsh">Slanisko</string>
+    <string name="poi_health_specialty_addiction_medicine_yes">Liečenie závislostí</string>
+    <string name="poi_health_specialty_clinical_pathology_yes">Klinická patológia</string>
+    <string name="poi_health_specialty_speech_therapy_yes">Logopédia</string>
+    <string name="poi_health_specialty_adult_psychiatry_yes">Psychiatria pre dospelých</string>
+    <string name="poi_health_facility_type_office">Ordinácia</string>
+    <string name="poi_health_facility_type_field_hospital">Typ zdravotníckeho zariadenia: poľná nemocnica</string>
+    <string name="poi_health_facility_type_counselling_centre">Typ zdravotníckeho zariadenia: poradenské centrum</string>
+    <string name="poi_health_facility_type_laboratory">Typ zdravotníckeho zariadenia: laboratórium</string>
+    <string name="poi_health_facility_type_therapy">Typ zdravotníckeho zariadenia: terapia</string>
+    <string name="poi_health_facility_type_department">Typ zdravotníckeho zariadenia: oddelenie</string>
+    <string name="poi_health_facility_type_dispensary">Typ zdravotníckeho zariadenia: lekáreň</string>
+    <string name="poi_health_facility_type_first_aid">Typ zdravotníckeho zariadenia: prvá pomoc</string>
+    <string name="poi_health_facility_type_nursing_home">Typ zdravotníckeho zariadenia: dom s opatrovateľskou službou</string>
+    <string name="poi_health_facility_type_support_group_home">Typ zdravotníckeho zariadenia: skupinový domov s podporou</string>
+    <string name="poi_mdf">Hlavný rozvádzač</string>
+    <string name="poi_gambling_pachinko">Automaty Pachinko</string>
+    <string name="poi_motorcycle_type_scooter">Skúter</string>
+    <string name="poi_motorcycle_type_sportbike">Závodný</string>
+    <string name="poi_motorcycle_type_offroad">Terénny</string>
+    <string name="poi_motorcycle_type_standard">Štandardný</string>
+    <string name="poi_boat_motorboat_rental_yes">Motorové člny: áno</string>
+    <string name="poi_boat_motorboat_rental_no">Motorové člny: nie</string>
+    <string name="poi_boat_houseboat_rental_yes">Plávajúce domy: áno</string>
+    <string name="poi_boat_houseboat_rental_no">Plávajúce domy: nie</string>
+    <string name="poi_boat_pedalboat_rental_yes">Šlapacie člny: áno</string>
+    <string name="poi_boat_pedalboat_rental_no">Šlapacie člny: nie</string>
+    <string name="poi_boat_jetski_rental_yes">Vodné skútre: áno</string>
+    <string name="poi_boat_jetski_rental_no">Vodné skútre: nie</string>
+    <string name="poi_boat_sailboat_rental_yes">Plachetnice: áno</string>
+    <string name="poi_boat_sailboat_rental_no">Plachetnice: nie</string>
+    <string name="poi_boat_dinghy_rental_rental_yes">Člny: áno</string>
+    <string name="poi_boat_dinghy_rental_rental_no">Člny: nie</string>
+    <string name="poi_boat_kayak_rental_rental_yes">Kajaky: áno</string>
+    <string name="poi_boat_kayak_rental_rental_no">Kajaky: nie</string>
+    <string name="poi_boat_canoe_rental_rental_yes">Kanoe: áno</string>
+    <string name="poi_boat_canoe_rental_rental_no">Kanoe: nie</string>
+    <string name="poi_surface_clay">Antuka</string>
+    <string name="poi_source_biomass">Zdroj energie: biomasa</string>
+    <string name="poi_snowmobile_filter">Prístup snežným skútrom</string>
+    <string name="poi_access_bus">"Prístup  autobusom"</string>
+    <string name="poi_access_caravan">Prístup karavanom</string>
+    <string name="poi_access_motorhome">Prístup obytným autom</string>
+    <string name="poi_access_trailer">Prístup s autom s prívesom</string>
+    <string name="poi_access_motorcycle">Prístup motocyklom</string>
+    <string name="poi_access_moped">Prístup mopedom</string>
+    <string name="poi_access_mofa">Prístup malým motocyklom</string>
+    <string name="poi_access_hgv">Prístup nákladným autom</string>
+    <string name="poi_access_goods">Prístup dodávkovým autom</string>
+    <string name="poi_access_disabled">Prístup pre vozíčkárov</string>
 </resources>

OsmAnd/res/values-sk/strings.xml

@@ -3136,7 +3136,7 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="app_mode_ufo">UFO</string>
     <string name="release_3_4">• Aplikačné profily: vytvorte vlastné profily pre vaše potreby, s vlastnou ikonou a farbou
 \n 
-\n • Predanie nastavenia pre predvolenú a minimálnu a maximálnu rýchlosť v profiloch
+\n • Možnosť nastavenia pre predvolenú a minimálnu a maximálnu rýchlosť v profiloch
 \n 
 \n • Pridaný nástroj s aktuálnymi súradnicami
 \n 
@@ -3145,7 +3145,7 @@ Zodpovedá oblasti: %1$s x %2$s</string>
 \n • Opravené zaznamenávanie stopy na pozadí
 \n 
 \n • Vylepšené sťahovanie máp na pozadí
-\n
+\n 
 \n • Návrat voľby \'Zapnúť obrazovku\'
 \n 
 \n • Opravený výber jazyka Wikipedie
@@ -3203,4 +3203,9 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="rendering_attr_showLez_name">Zobraziť Zóny s nízkymi emisiami</string>
     <string name="temporary_conditional_routing">Zohľadniť dočasné obmedzenia</string>
     <string name="shared_string_default">Predvolené</string>
+    <string name="new_route_calculated_dist_dbg">Trasa: vzdialenosť %s, potrebný čas %s 
+\nVýpočet: %.1f sekúnd, %d ciest, %d dlaždíc)</string>
+    <string name="lang_oc">Okcitánsky</string>
+    <string name="app_mode_wagon">Dodávkové auto</string>
+    <string name="app_mode_pickup_truck">Pickup auto</string>
 </resources>

OsmAnd/res/values-sl/strings.xml

@@ -34,7 +34,7 @@
     <string name="shared_string_no">Ne</string>
     <string name="shared_string_cancel">Prekliči</string>
     <string name="shared_string_add">Dodaj</string>
-    <string name="shared_string_apply">Uporabi</string>
+    <string name="shared_string_apply">Uveljavi</string>
     <string name="context_menu_item_create_poi">Ustvari točko POI</string>
     <string name="context_menu_item_update_map">Osveži zemljevid</string>
     <string name="add_favorite_dialog_default_favourite_name">Priljubljena točka</string>
@@ -186,7 +186,7 @@
     <string name="oclock">uri</string>
     <string name="towards">proti</string>
     <string name="accuracy">Natančnost</string>
-    <string name="altitude">Nadmorska višina</string>
+    <string name="altitude">Višina</string>
     <string name="no_info">Ni podatkov</string>
     <string name="direction_style_sidewise">Bočno (8 sektorjev)</string>
     <string name="direction_style_clockwise">Urno (12 sektorjev)</string>
@@ -402,7 +402,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
     <string name="voice_data_not_supported">Nepodprta različica podatkov govora</string>
     <string name="voice_data_corrupted">Izbrani podatki govora so okvarjeni</string>
     <string name="voice_data_unavailable">Izbrani podatki govora niso na voljo</string>
-    <string name="voice_stream_voice_call">Zvok glasovnega klica (lahko prekine tudi stereo BT)</string>
+    <string name="voice_stream_voice_call">Zvok glasovnega klica (za predvajanje na Bluetooth avtoradiu)</string>
     <string name="voice_provider">Jezik glasovnega vodenja</string>
     <string name="settings_preset_descr">Izbor uporabniškega profila s prilagojenimi nastavitvami navigacije in izrisa zemljevida.</string>
     <string name="process_navigation_service">Navigacijska storitev OsmAnd</string>
@@ -517,7 +517,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
     <string name="accessibility_mode">Način dostopnosti</string>
     <string name="accessibility_mode_descr">Vklopi zmožnosti dostopnosti.</string>
     <string name="shared_string_on">Omogočeno</string>
-    <string name="shared_string_off">Onemogočeno</string>
+    <string name="shared_string_off">Izlključeno</string>
     <string name="accessibility_default">Glede na sistemske nastavitve okolja</string>
     <string name="backToMenu">Nazaj v meni</string>
     <string name="auto_announce_on">Začni s samodejnimi najavami</string>
@@ -560,7 +560,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
     <string name="settings_preset">Privzeti profil</string>
     <string name="global_settings">Splošne nastavitve</string>
     <string name="index_settings">Upravljalnik datotek zemljevidov</string>
-    <string name="osmand_service">Način delovanja v ozadju</string>
+    <string name="osmand_service">Delovanje v ozadju</string>
     <string name="osmand_service_descr">Program se izvaja v ozadju, ko je zaslon izklopljen.</string>
     <string name="daynight_mode_auto">Preklopi ob sončnem vzhodu in zahodu</string>
     <string name="daynight_mode_day">Svetli dnevni izris</string>
@@ -623,7 +623,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
 \n\t
 \n\tMožnosti so na voljo v »Meniju« → »Možnosti zemljevida« → »Vir zemljevida …« → »Vektorski zemljevidi za delo brez povezave«.</string>
     <string name="voice_stream_notification">Zvok obvestila</string>
-    <string name="voice_stream_music">Zvok glasbe</string>
+    <string name="voice_stream_music">Zvok navigacije</string>
     <string name="warning_tile_layer_not_downloadable">Ni mogoče prejeti sloja zemljevida %1$s. Morda je treba program ponovno namestiti.</string>
     <string name="overlay_transparency_descr">Spremeni prozornost prekrivnih plasti.</string>
     <string name="overlay_transparency">Prozornost prekrivnih plasti</string>
@@ -1237,7 +1237,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
 \nSled %2$s</string>
     <string name="shared_string_my_favorites">Shranjeni kraji</string>
     <string name="share_fav_subject">Priljubljene točke, ki so bile objavljene z OsmAnd</string>
-    <string name="shared_string_share">Objavi</string>
+    <string name="shared_string_share">Skupna raba</string>
     <string name="import_file_favourites">Ali želite podatke shrani v datoteko GPX ali uvoziti vmesne točke kot priljubljene\?</string>
     <string name="route_descr_destination">Cilj</string>
     <string name="use_points_as_intermediates">Izračun poti med točkami</string>
@@ -1278,7 +1278,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
     <string name="lang_fa">Perzijščina</string>
     <string name="lang_al">Albanščina</string>
     <string name="lang_ar">Arabščina</string>
-    <string name="lang_sr">Srbščina</string>
+    <string name="lang_sr">Srbščina (cirilica)</string>
     <string name="lang_zh_cn">Kitajščina (poenostavljena)</string>
     <string name="lang_zh_tw">Kitajščina (tradicionalna)</string>
     <string name="lang_sc">Sardinščina</string>
@@ -1504,7 +1504,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
     <string name="shared_string_show_description">Pokaži opis.</string>
     <string name="agps_data_last_downloaded">Zadnja osvežitev podatkov A-GPS: %1$s</string>
     <string name="confirm_usage_speed_cameras">V mnogih državah (na primer v Nemčiji, Franciji, Italiji in drugih) je uporaba kamer za merjenje hitrosti prepovedana z zakonom. Razvijalci programa ne sprejemamo odgovornosti za tako rabo. Potrdite uporabo le, če ste res prepričani v svoje ravnanje.</string>
-    <string name="welmode_download_maps">Posodobitve zemljevidov</string>
+    <string name="welmode_download_maps">Prejmi zemljevide</string>
     <string name="welcome_select_region">Za pravilno prikazovanje prometnih določil mora biti izbran krajevni prometni režim. Trenutno dejaven je način:</string>
     <string name="welcome_text">Program OsmAnd omogoča dostop do zemljevidov in navigacijo v načinu brez povezave.</string>
     <string name="current_route">Trenutna pot</string>
@@ -1647,7 +1647,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
     <string name="routing_attr_avoid_shuttle_train_description">Izogni se vožnji z vlakom</string>
     <string name="offline_maps_and_navigation">Zemljevidi za delo brez\npovezave in navigacijo</string>
     <string name="favourites">Priljubljene</string>
-    <string name="av_locations_descr">Datoteka GPX z opombami.</string>
+    <string name="av_locations_descr">Datoteka GPX z lokacijami.</string>
     <string name="av_locations">Mesta</string>
     <string name="poi_action_delete">izbriši</string>
     <string name="tab_title_basic">Osnovno</string>
@@ -1863,7 +1863,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
     <string name="shared_string_status">Stanje</string>
     <string name="shared_string_save_changes">Shrani spremembe</string>
     <string name="shared_string_email_address">Elektronski naslov</string>
-    <string name="shared_string_read_more">Več o tem ...</string>
+    <string name="shared_string_read_more">Preberite več</string>
     <string name="find_parking">Najdi parkirno mesto</string>
     <string name="select_map_markers">Izbor označb zemljevida</string>
     <string name="shared_string_reverse_order">Obrni razvrstitev</string>
@@ -2023,7 +2023,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
     <string name="skip_map_downloading_desc">Nameščenega ni nobenega zemljevida za delo brez povezave. Izbrati je mogoče zemljevid s seznama, ali pa ga prejeti preko menija »%1$s«.</string>
     <string name="first_usage_wizard_desc">Zemljevidi za prejem so predlagani po podatkih trenutnega mesta.</string>
     <string name="no_update_info_desc">Ne preverjaj za posodobitve programa OsmAnd in drugih ugodnosti.</string>
-    <string name="donation_to_osm">Doniraj skupinosti OpenStreetMap</string>
+    <string name="donation_to_osm">Donacija skupnosti OpenStreetMap</string>
     <string name="get_it">Pridobi</string>
     <string name="get_for">Pridobi za %1$s</string>
     <string name="get_for_month">Pridobi za %1$s na mesec</string>
@@ -2085,18 +2085,18 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
     <string name="legacy_search">Opuščeno iskanje</string>
     <string name="show_legacy_search">Pokaži možnosti opuščenega načina iskanja</string>
     <string name="show_legacy_search_desc">Dodaj opuščeno iskanje v seznamu predala.</string>
-    <string name="lang_sr_latn">Srbščina (v latinici)</string>
+    <string name="lang_sr_latn">Srbščina (latinica)</string>
     <string name="lang_zh_hk">Kitajščina (Hong Kong)</string>
     <string name="routing_attr_allow_motorway_name">Vodenje po avtocestah</string>
     <string name="routing_attr_allow_motorway_description">Dovoli vodenje po cestah rezerviranih za motorna vozila in avtocestah.</string>
     <string name="rendering_attr_hideWaterPolygons_description">Voda</string>
     <string name="rendering_attr_contourDensity_description">Gostota izrisa izohips</string>
-    <string name="rendering_attr_contourDensity_name">Gostota črt izohips</string>
+    <string name="rendering_attr_contourDensity_name">Gostota izohips</string>
     <string name="rendering_value_high_name">Visoka</string>
     <string name="rendering_value_medium_w_name">Običajna</string>
     <string name="rendering_value_low_name">Nizka</string>
     <string name="rendering_attr_contourWidth_description">Širina izrisa izohips</string>
-    <string name="rendering_attr_contourWidth_name">Širina črte izohipse</string>
+    <string name="rendering_attr_contourWidth_name">Debelina izohips</string>
     <string name="rendering_attr_hideWaterPolygons_name">Skrij vodne površine</string>
     <string name="configure_screen_quick_action">Hitro dejanje</string>
     <string name="quick_action_item_action">Dejanje %d</string>
@@ -2313,7 +2313,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="subscribe_email_desc">Naročite se na dopisni seznam o popustih programa in si pridobite tri dodatne prejeme zemljevidov!</string>
     <string name="depth_contour_descr">Izobate morske gladine in navtične točke.</string>
     <string name="sea_depth_thanks">Zahvaljujemo se vam za nakup »Navtičnega zemljevida« z reliefom morskega dna.</string>
-    <string name="index_item_depth_contours_osmand_ext">Navtični relief globine</string>
+    <string name="index_item_depth_contours_osmand_ext">Navtični relief globine (izobate)</string>
     <string name="index_item_depth_points_southern_hemisphere">Navtične globinske točke južne poloble</string>
     <string name="index_item_depth_points_northern_hemisphere">Navtične globinske točke severne poloble</string>
     <string name="download_depth_countours">Navtični relief globine</string>
@@ -2684,7 +2684,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="shared_string_total">Skupaj</string>
     <string name="clear_all_intermediates">Počisti vse vmesne točke</string>
     <string name="group_deleted">Skupina je izbrisana.</string>
-    <string name="rendering_attr_whiteWaterSports_name">Vodni športi</string>
+    <string name="rendering_attr_whiteWaterSports_name">Športi na divjih vodah</string>
     <string name="osmand_team">Skupina OsmAnd</string>
     <string name="popular_destinations">Priljubljeni cilji</string>
     <string name="paid_app">Plačljiv program</string>
@@ -2853,7 +2853,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="wikivoyage_travel_guide_descr">Krajevno shranjeni vodniki po najbolj zanimivih krajih sveta, prikazani v programu OsmAnd, tudi na mestih, kjer ni povezave z internetom.</string>
     <string name="contour_lines_hillshade_maps">Zemljevidi reliefa in senčenje površine</string>
     <string name="unlock_all_features">Odkleni vse zmožnosti programa OsmAnd</string>
-    <string name="purchase_dialog_travel_description">Naročilo na katerokoli od navedenih možnosti omogoči dostop do popotniškega vodnika:</string>
+    <string name="purchase_dialog_travel_description">Kupite katerokoli od naslednjih možnosti za popotniški vodnik brez povezave:</string>
     <string name="shared_string_dont">Ne objavi</string>
     <string name="shared_string_do">Objavi</string>
     <string name="download_wikipedia_description">Prejmite prispevke z Wikipedija o %1$s za pregled brez povezave.</string>
@@ -2940,7 +2940,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="use_osm_live_public_transport">Javni prevozi OsmAnd Live</string>
     <string name="time_of_day">Čas dneva</string>
     <string name="by_transport_type">Do %1$s</string>
-    <string name="step_by_step">Korak po korak</string>
+    <string name="step_by_step">Zavoj za zavojem</string>
     <string name="routeInfo_road_types_name">Vrste poti</string>
     <string name="shared_string_swap">Zamenjaj</string>
     <string name="show_more">Pokaži več</string>
@@ -2977,7 +2977,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="exit_at">Izstopi na postaji</string>
     <string name="sit_on_the_stop">Vstopi na postaji</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">S pritiskom na gumb dejanja se pokažejo ali skrijejo sledi GPX na zemljevidu</string>
-    <string name="routeInfo_roadClass_name">Razred</string>
+    <string name="routeInfo_roadClass_name">Vrsta ceste</string>
     <string name="routeInfo_surface_name">Površina</string>
     <string name="routeInfo_smoothness_name">Gladkost</string>
     <string name="routeInfo_steepness_name">Naklon</string>
@@ -3026,8 +3026,136 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="public_transport_calc_pedestrian">Izračunaj pot za pešačenje</string>
     <string name="public_transport_type">Vrsta transporta</string>
     <string name="files_present">%1$d datotek (%2$s) je na predhodnem mestu »%3$s«.</string>
-    <string name="public_transport_ped_route_title">Pešačenje do cilja traja %1$s in je lahko hitrejše od javnega prevoza.</string>
+    <string name="public_transport_ped_route_title">Pešačenje do cilja traja %1$s in je lahko hitrejše od javnega prevoza</string>
     <string name="public_transport_no_route_title">Po omejitvah nastavitev ni mogoče najti ustrezne poti.</string>
     <string name="searching_gps">Poteka iskanje signalov GPS</string>
     <string name="coordinates_widget">Gradnik za določevanje koordinat</string>
+    <string name="shared_string_privacy_policy">Politika zasebnosti</string>
+    <string name="help_us_make_osmand_better">Pomagajte nam izboljšati OsmAnd!</string>
+    <string name="choose_data_to_share">Izberite katere vrste podatkov želite deliti:</string>
+    <string name="downloaded_maps">Prenešeni zemljevidi</string>
+    <string name="visited_screens">Uporabljeni ekrani</string>
+    <string name="collected_data_descr">Določite katere podatke lahko program OsmAnd deli.</string>
+    <string name="downloaded_maps_collect_descr">Pomagajte nam razumeti kakšni zemljevidi katerih področij so najbolj uporabljeni.</string>
+    <string name="visited_screens_collect_descr">Pomagajte nam razumeti katere možnosti programa so najbolj uporabljene.</string>
+    <string name="privacy_and_security_change_descr">S pritiskom na \"Dovoli\" se strinjate z našim %1$s</string>
+    <string name="settings_privacy_and_security">Zasebnost in varnost</string>
+    <string name="settings_privacy_and_security_desc">Izberite katere podatke delite z nami</string>
+    <string name="shared_string_no_thank_you">Hvala, ne</string>
+    <string name="shared_string_allow">Dovoli</string>
+    <string name="profile_name_hint">Ime profila</string>
+    <string name="nav_type_hint">Vrsta navigacije</string>
+    <string name="app_mode_taxi">Taxi</string>
+    <string name="app_mode_horse">Konj</string>
+    <string name="app_mode_helicopter">Helikopter</string>
+    <string name="osmand_routing_promo">"Svojo spremenjeno verzijo lahko dodate v datoteki  routing.xml v ..osmand/routing"</string>
+    <string name="app_mode_skiing">Smučanje</string>
+    <string name="base_profile_descr_ski">Smučanje</string>
+    <string name="select_icon_profile_dialog_title">Izberite ikono</string>
+    <string name="settings_routing_mode_string">Način: %s</string>
+    <string name="settings_derived_routing_mode_string">Uporabniški način, izpeljan iz: %s</string>
+    <string name="routing_profile_ski">Smučanje</string>
+    <string name="profile_type_descr_string">Vrsta: %s</string>
+    <string name="profile_type_base_string">Osnovni profil</string>
+    <string name="profile_alert_need_routing_type_title">Izberite vrsto navigacije</string>
+    <string name="profile_alert_need_routing_type_msg">Prosim, izberite vrsto navigacije za nov profil aplikacije</string>
+    <string name="profile_alert_need_profile_name_title">Vpišite ime profila</string>
+    <string name="profile_alert_need_profile_name_msg">Ime profila ne sme biti prazno!</string>
+    <string name="profile_alert_duplicate_name_title">Podvojeno ime</string>
+    <string name="profile_alert_duplicate_name_msg">Profil s tem imenom že obstaja</string>
+    <string name="profile_alert_cant_delete_base">Ne morete izbrisati osnovnih profilov aplikacije OsmAnd</string>
+    <string name="profile_alert_need_save_title">Shrani spremembe</string>
+    <string name="profile_alert_need_save_msg">Pred nadaljevanjem morate shraniti spremembe profila</string>
+    <string name="profile_alert_delete_title">Izbriši profil</string>
+    <string name="profile_alert_delete_msg">Ali ste prepričani, da želite izbrisati profil %s</string>
+    <string name="select_base_profile_dialog_title">Izberite osnovni profil</string>
+    <string name="select_base_profile_dialog_message">Vaše lastne profile zasnujte na enem od osnovnih aplikacijskih profilov, ki določijo osnovne nastavitve kot so privzet nabor gradnike, enote za hitrost in razdaljo. To so osnovni profili aplikacije, skupaj s primeri prilagojenih profilov, ki jih lahko naredite z njimi:</string>
+    <string name="select_nav_profile_dialog_title">Izberite vrsto navigacije</string>
+    <string name="base_profile_descr_car">Avto, tovornjak, motor</string>
+    <string name="base_profile_descr_bicycle">Gorsko kolo, kolo z motorjem, konj</string>
+    <string name="base_profile_descr_pedestrian">Hoja, pohodništvo, tek</string>
+    <string name="base_profile_descr_public_transport">Ves javni prevoz</string>
+    <string name="base_profile_descr_boat">Ladja, veslanje, jadranje</string>
+    <string name="base_profile_descr_aircraft">Letalo, jadralno padalo</string>
+    <string name="routing_profile_straightline">Ravna črta</string>
+    <string name="routing_profile_broutrer">BRouter (brez povezave)</string>
+    <string name="osmand_default_routing">OsmAnd usmerjanje</string>
+    <string name="shared_string_icon">Ikona</string>
+    <string name="collected_data">Zbrani podatki</string>
+    <string name="shared_string_min_speed">Min. hitrost</string>
+    <string name="shared_string_max_speed">Max. hitrost</string>
+    <string name="default_speed_setting_title">Privzeta hitrost</string>
+    <string name="default_speed_setting_descr">Spremeni privzete nastavitve hitrosti</string>
+    <string name="minmax_speed_dialog_title">Nastavi min/max hitrost</string>
+    <string name="default_speed_dialog_msg">To se uporabi med izračunom pričakovanega časa prihoda med usmerjanjem</string>
+    <string name="new_profile">Nov profil</string>
+    <string name="last_launch_crashed">Med zadnjo uporabo programa OsmAnd je prišlo do napake. Pomagajte nam izboljšati OsmAnd tako, da nam posredujete sporočilo o napaki.</string>
+    <string name="app_mode_ufo">NLP</string>
+    <string name="release_3_4">"• Profili aplikacije: naredite si profile prilagojene vašim potrebam, s prilagojeno ikono in barvo
+\n
+\n •  Sedaj lahko prilagodite min/max hitrost vsakega profila
+\n
+\n • Dodan gradnik za prikaz trenutnih koordinat
+\n
+\n • Dodana možnost za prikaz kompasa in krožnega merila na zemljevidu
+\n
+\n • Popravljeno beleženje poti v ozadju
+\n
+\n • Izboljšano prenašanje zemljevidov v ozadju
+\n
+\n • Vrnjena možnost \'Ohrani prižgan zaslon\'
+\n
+\n • Popravljen izbor jezika na Wikipediji
+\n
+\n • Popravljeno obnašanje gumba za kompas med navigacijo
+\n
+\n • Drugi popravki
+\n
+\n"</string>
+    <string name="app_mode_monowheel">Monocikel</string>
+    <string name="precision_hdop_and_vdop">Horizontalna natančnost: %1$s, vertikalna: %2$s</string>
+    <string name="precision_hdop">Horizontalna natančnost: %s</string>
+    <string name="app_mode_offroad">Terensko (Offroad)</string>
+    <string name="edit_profile_setup_title">Nastavitev profila</string>
+    <string name="edit_profile_setup_subtitle">Profil ohrani lastne nastavitve</string>
+    <string name="edit_profile_setup_map_subtitle">Izberite privzete možnosti zemljevida za profil</string>
+    <string name="edit_profile_screen_options_subtitle">Izberite privzete možnosti ekrana za profil</string>
+    <string name="edit_profile_nav_settings_subtitle">Izberite privzete možnosti navigacije za profil</string>
+    <string name="routing_attr_max_num_changes_description">Določite največje število sprememb</string>
+    <string name="routing_attr_max_num_changes_name">Število sprememb</string>
+    <string name="turn_screen_on_router">Zbudi za zavoj</string>
+    <string name="turn_screen_on_time_descr">Izberite za koliko časa naj se vklopi ekran.</string>
+    <string name="turn_screen_on_sensor">Uporabi senzor bližine</string>
+    <string name="turn_screen_on_sensor_descr">Za vklop ekrana med navigacijo z roko pomagajte pred ekranom.</string>
+    <string name="turn_on_profile_desc">Za uporabo te nastavitve omogočite vsaj en profil aplikacije.</string>
+    <string name="rendering_attr_winter_road_name">Zimska cesta</string>
+    <string name="rendering_attr_ice_road_name">Ledena cesta</string>
+    <string name="routeInfo_winter_ice_road_name">Zimske in ledene ceste</string>
+    <string name="rendering_attr_tracktype_grade1_name">Utrjena (tlakovana)</string>
+    <string name="rendering_attr_tracktype_grade2_name">Trdna (netlakovana)</string>
+    <string name="rendering_attr_tracktype_grade3_name">Pretežno trdna</string>
+    <string name="rendering_attr_tracktype_grade4_name">Pretežno mehka</string>
+    <string name="rendering_attr_tracktype_grade5_name">Mehka</string>
+    <string name="routeInfo_tracktype_name">Trdnost površine</string>
+    <string name="shared_string_file_is_saved">%s je shranjena</string>
+    <string name="gpx_join_gaps">Združi prekinjene sledi</string>
+    <string name="app_mode_camper">Avtodom</string>
+    <string name="app_mode_campervan">Avtodom (kombi)</string>
+    <string name="rendering_attr_showLez_description">Prikaži področja z omejitvijo izpustov. Ne vpliva na usmerjanje.</string>
+    <string name="rendering_attr_showLez_name">Prikaži področja z omejitvijo izpustov</string>
+    <string name="temporary_conditional_routing">Upoštevaj začasne omejitve</string>
+    <string name="shared_string_default">Privzeto</string>
+    <string name="button_rate">Ocena</string>
+    <string name="app_mode_subway">Podzemna železnica</string>
+    <string name="show_compass_ruler">Pokaži kompas</string>
+    <string name="hide_compass_ruler">Skrij kompas</string>
+    <string name="app_mode_personal_transporter">Osebni prevoznik</string>
+    <string name="app_mode_scooter">Skuter</string>
+    <string name="external_input_device">Zunanja vhodna naprava</string>
+    <string name="sett_no_ext_input">Brez</string>
+    <string name="sett_generic_ext_input">Privzeta tipkovnica</string>
+    <string name="sett_wunderlinq_ext_input">WunderLINQ</string>
+    <string name="sett_parrot_ext_input">Parrot</string>
+    <string name="shared_string_track_is_saved">Sled %s je shranjena</string>
+    <string name="lang_oc">Okcitanščina</string>
 </resources>

OsmAnd/res/values-sr/phrases.xml

@@ -138,7 +138,7 @@
     <string name="poi_boutique">Модни бутик</string>
     <string name="poi_camera">Фотоапарати и сочива</string>
     <string name="poi_carpet">Продавница тепиха</string>
-    <string name="poi_chemist">Апотека</string>
+    <string name="poi_chemist">Дрогерија</string>
     <string name="poi_clothes">Продавница одеће</string>
     <string name="poi_clothes_children">Продавница одеће за децу</string>
     <string name="poi_shoes">Продавница ципела</string>
@@ -1413,7 +1413,7 @@
     <string name="poi_tactile_paving">Додирна поставка</string>
     <string name="poi_brushless">Без четкица</string>
     <string name="poi_observatory_designation">Одредиште</string>
-    <string name="poi_pharmacy_dispensing">Апотека</string>
+    <string name="poi_pharmacy_dispensing">Апотека (на рецепт)</string>
     <string name="poi_denomination">Деноминација</string>
     <string name="poi_backcountry">Рурални део</string>
     <string name="poi_beauty_salon_service">Услуга</string>
@@ -1547,7 +1547,7 @@
     <string name="poi_ice_rink">Клизалиште</string>
     <string name="poi_pitch">Спортски терен</string>
     <string name="poi_base">Скакање</string>
-    <string name="poi_boules">Куглање</string>
+    <string name="poi_boules">Боћање</string>
     <string name="poi_bowls">Куглање</string>
     <string name="poi_equestrian">Коњички</string>
     <string name="poi_ice_stock">Куглање на леду</string>
@@ -2351,4 +2351,9 @@
     <string name="poi_site_type_earthwork">Земљана баријера</string>
     <string name="poi_aerodrome_type_military">Војни аеродром</string>
     <string name="poi_aerodrome_type_military_public">Војни/цивилни</string>
+    <string name="poi_fitness_station">Теретана на отвореном</string>
+    <string name="poi_health_specialty_biochemistry_yes">Биохемија</string>
+    <string name="poi_fitness_centre">Теретана</string>
+    <string name="poi_fitness">Фитнес</string>
+    <string name="poi_car_wash_yes">Да</string>
 </resources>

OsmAnd/res/values-te/strings.xml

@@ -16,4 +16,27 @@
     <string name="shared_string_height">ఎత్తు</string>
     <string name="swap_start_and_destination">గమ్యస్థానము మూలాస్థానమును ఒకదానికి ఒకటి మార్చు</string>
     <string name="add_destination_point">గమ్యస్థానమును జోడించండి</string>
+    <string name="shared_string_min_speed">కనిష్ట వేగం</string>
+    <string name="shared_string_max_speed">ఘరిష్ట వేగం</string>
+    <string name="minmax_speed_dialog_title">కనిష్ట లేదా ఘరిష్ట వేగాన్ని సముదాయం చేయండి</string>
+    <string name="shared_string_crash">కూలీపొవు</string>
+    <string name="app_mode_scooter">మోటారు బండి</string>
+    <string name="app_mode_offroad">దారికి దూరంగ</string>
+    <string name="routing_attr_max_num_changes_description">గరిష్ట సంఖ్యలొ మర్పులను పేర్కొనండి</string>
+    <string name="routing_attr_max_num_changes_name">మార్పుల సంఖ్య</string>
+    <string name="turn_screen_on_router">మలుపులో మెల్కొలపండి</string>
+    <string name="turn_screen_on_time_descr">"తెర  మీద  చేసే సమయన్ని సముదాయం  చేయండి"</string>
+    <string name="rendering_attr_winter_road_name">శీతాకాలపు దారి</string>
+    <string name="rendering_attr_ice_road_name">మంచు దారి</string>
+    <string name="routeInfo_winter_ice_road_name">శీతకాలం మరియు మంచు దారులు</string>
+    <string name="rendering_attr_tracktype_grade1_name">మెరుగైన</string>
+    <string name="rendering_attr_tracktype_grade4_name">ఎక్కువగ మ్రుదువైనది</string>
+    <string name="rendering_attr_tracktype_grade5_name">మ్రుదువైన</string>
+    <string name="routeInfo_tracktype_name">ధ్రుడవైన ఉపరితలం</string>
+    <string name="shared_string_open_track">తెరుచుకున్న మార్గం</string>
+    <string name="gpx_join_gaps">ఖాలీలు నింపుము</string>
+    <string name="app_mode_camper">మకాం వేసే వ్యక్తి</string>
+    <string name="shared_string_default">సమయంలోగా చెల్లించకపోవుట</string>
+    <string name="app_mode_campervan">తాత్కాలిక హడ్డులు ఎంచుకో</string>
+    <string name="temporary_conditional_routing">తాత్కాలిక హద్దులు ఎన్నుకో</string>
 </resources>

OsmAnd/res/values-uk/phrases.xml

@@ -3592,4 +3592,7 @@
     <string name="poi_historic_tank">Старовинний танк</string>
     <string name="poi_hookah_lounge">Кальянна зала</string>
     <string name="poi_source_biomass">Джерело енергії: біомаса</string>
+    <string name="poi_snowmobile_filter">Доступ для снігоходів</string>
+    <string name="poi_access_bus">Доступ для автобусів</string>
+    <string name="poi_access_caravan">Доступ для будинків на колесах</string>
 </resources>

OsmAnd/res/values-uk/strings.xml

@@ -303,9 +303,9 @@
     <string name="shared_string_previous">Назад</string>
     <string name="unit_of_length_descr">Змінити одиниці вимірювання довжини.</string>
     <string name="unit_of_length">Одиниці довжини</string>
-    <string name="si_mi_feet">Милі, фути</string>
-    <string name="si_mi_yard">Милі, ярди</string>
-    <string name="si_km_m">Кілометри, метри</string>
+    <string name="si_mi_feet">Милі/фути</string>
+    <string name="si_mi_yard">Милі/ярди</string>
+    <string name="si_km_m">Кілометри/метри</string>
     <string name="yard">ярд</string>
     <string name="foot">фут</string>
     <string name="mile_per_hour">мл/г</string>
@@ -1031,7 +1031,7 @@
     <string name="av_camera_focus_infinity">Фокус встановлюється на нескінченність</string>
     <string name="av_photo_play_sound">Відтворювати звук затвору камери</string>
     <string name="av_photo_play_sound_descr">Під час фотографування відтворювати звук.</string>
-    <string name="osmand_net_previously_installed">Всі локальні дані зі старого встановленого додатку будуть підтримуватися новим, але Закладки потрібно експортувати зі старого додатку і імпортувати в новий.</string>
+    <string name="osmand_net_previously_installed">Всі локальні дані зі старого встановленого додатку будуть підтримуватися новим, але Закладки потрібно експортувати зі старого додатку та імпортувати в новий.</string>
     <string name="speak_speed_limit">Обмеження швидкості</string>
     <string name="speak_cameras">Камери детектування швидкості</string>
     <string name="speak_traffic_warnings">Попередження про дорожній рух</string>
@@ -2052,7 +2052,7 @@
     <string name="get_for_month">Отримати за %1$s на місяць</string>
     <string name="osm_live_banner_desc">Отримайте необмежені звантаження для мап, а також оновлення мап частіше ніж один раз на місяць: щотижня, щодня або щогодини.</string>
     <string name="osmand_plus_banner_desc">Втулок для необмеженого доступу до мап, їх оновлень та отримання інформації з Wikipedia.</string>
-    <string name="si_mi_meters">Милі, метри</string>
+    <string name="si_mi_meters">Милі/метри</string>
     <string name="skip_map_downloading">Пропустити звантаження мап</string>
     <string name="skip_map_downloading_desc">У Вас немає звантажених мап. Ви можете вибрати мапу зі списку або звантажити її пізніше за допомогою меню — %1$s.</string>
     <string name="search_another_country">Виберіть інший регіон</string>
@@ -3209,4 +3209,9 @@
     <string name="rendering_attr_showLez_name">Показати зони низьких викидів</string>
     <string name="temporary_conditional_routing">Враховувати тимчасові обмеження</string>
     <string name="shared_string_default">Типовий</string>
+    <string name="new_route_calculated_dist_dbg">Маршрут: відстань %s, час навігації %s 
+\nРозрахунок: %.1f с, %d доріг, %d тайлів)</string>
+    <string name="lang_oc">Окситанська</string>
+    <string name="app_mode_wagon">Фургон</string>
+    <string name="app_mode_pickup_truck">Пікап</string>
 </resources>

OsmAnd/res/values-zh-rCN/phrases.xml

@@ -28,8 +28,8 @@
     <string name="poi_hazard_flood">洪水灾害</string>
     <string name="poi_cannabis">大麻商店</string>
     <string name="poi_socket_cee_blue_output_low">低</string>
-    <string name="poi_socket_schuko_output_high">中</string>
-    <string name="poi_socket_schuko_output_medium">高</string>
+    <string name="poi_socket_schuko_output_high">高</string>
+    <string name="poi_socket_schuko_output_medium">中等</string>
     <string name="poi_adult_gaming_centre">成人游戏中心</string>
     <string name="poi_service_vehicle_air_conditioning_yes">空调</string>
     <string name="poi_service_vehicle_insurance_yes">保险</string>
@@ -416,4 +416,321 @@
     <string name="poi_capacity_disabled_yes">是</string>
     <string name="poi_aerialway_heating_yes">是</string>
     <string name="poi_climbing_crag">是</string>
+    <string name="poi_aerialway_heating">加热</string>
+    <string name="poi_power_supply">供电</string>
+    <string name="poi_filling_station">加油站</string>
+    <string name="poi_water_supply">给水</string>
+    <string name="poi_fuel">加油站</string>
+    <string name="poi_fuel_diesel">柴油</string>
+    <string name="poi_parking">停车</string>
+    <string name="poi_motorcycle_parking">摩托车停车</string>
+    <string name="poi_public_transport_platform_trolleybus">无轨电车站</string>
+    <string name="poi_subway_entrance">地铁入口</string>
+    <string name="poi_helipad">直升机停机坪</string>
+    <string name="poi_runway">跑道</string>
+    <string name="poi_ferry_terminal">渡船总站</string>
+    <string name="poi_lighthouse">灯塔</string>
+    <string name="poi_bicycle_parking">自行车停车</string>
+    <string name="poi_turning_circle">回转圈</string>
+    <string name="poi_junction">交叉点</string>
+    <string name="poi_dam">坝</string>
+    <string name="poi_breakwater">防波堤</string>
+    <string name="poi_power_substation">变电站</string>
+    <string name="poi_observation_tower">观测塔</string>
+    <string name="poi_cooling_tower">冷却塔</string>
+    <string name="poi_recycling_container">货柜</string>
+    <string name="poi_recycling_glass">玻璃</string>
+    <string name="poi_recycling_aluminium">铝</string>
+    <string name="poi_recycling_metal">金属</string>
+    <string name="poi_recycling_cork">木栓</string>
+    <string name="poi_recycling_foil">箔</string>
+    <string name="poi_recycling_paint">涂料</string>
+    <string name="poi_recycling_polyester">聚酯</string>
+    <string name="poi_residential">住宅地区</string>
+    <string name="poi_industrial">工业地区</string>
+    <string name="poi_basin">盆地</string>
+    <string name="poi_canal">运河</string>
+    <string name="poi_monitoring_station">监测站</string>
+    <string name="poi_radar">雷达</string>
+    <string name="poi_crane">吊车</string>
+    <string name="poi_survey_point">测点</string>
+    <string name="poi_reservoir">水库</string>
+    <string name="poi_silo">散装筒仓</string>
+    <string name="poi_camp_site">营地</string>
+    <string name="poi_spring">泉</string>
+    <string name="poi_hot_spring">温泉</string>
+    <string name="poi_geyser">间歇泉</string>
+    <string name="poi_community_centre">社区中心</string>
+    <string name="poi_drinking_water">饮用水</string>
+    <string name="poi_craft_plasterer">粉刷工</string>
+    <string name="poi_craft_stonemason">石匠</string>
+    <string name="poi_cave_entrance">洞穴入口</string>
+    <string name="poi_ridge">脊</string>
+    <string name="poi_sinkhole">渗穴</string>
+    <string name="poi_rapids">急湍</string>
+    <string name="poi_cape">岬</string>
+    <string name="poi_bay">海湾</string>
+    <string name="poi_fjord">峡湾</string>
+    <string name="poi_valley">谷</string>
+    <string name="poi_wetland">湿地</string>
+    <string name="poi_nature_reserve">自然保留区</string>
+    <string name="poi_strait">海峽</string>
+    <string name="poi_island">岛屿</string>
+    <string name="poi_distance_mark">里程标</string>
+    <string name="poi_dry_dock">干船坞</string>
+    <string name="poi_floating_dock">浮式船坞</string>
+    <string name="poi_mooring">系泊</string>
+    <string name="poi_military_airfield">军用机场</string>
+    <string name="poi_entrance">入口</string>
+    <string name="poi_highway_crossing">公路交叉口</string>
+    <string name="poi_urban">都市地区</string>
+    <string name="poi_rural">乡村地区</string>
+    <string name="poi_intermittent">间歇</string>
+    <string name="poi_board_type_geology">地质学</string>
+    <string name="poi_board_type_astronomy">天文学</string>
+    <string name="poi_services">服务范围</string>
+    <string name="poi_railway_level_crossing">平交道</string>
+    <string name="poi_grass">草</string>
+    <string name="poi_sand">沙</string>
+    <string name="poi_garden_type_residential">花园类型：住宅</string>
+    <string name="poi_garden_type_community">花园类型：社区</string>
+    <string name="poi_capacity">容量</string>
+    <string name="poi_payment_credit_cards_yes">信用卡</string>
+    <string name="poi_drive_in_yes">是</string>
+    <string name="poi_drive_through_yes">是</string>
+    <string name="poi_microbrewery_yes">是</string>
+    <string name="poi_takeaway_filter_yes">是</string>
+    <string name="poi_takeaway_yes">外带</string>
+    <string name="poi_delivery_filter_yes">是</string>
+    <string name="poi_outdoor_seating_filter_yes">是</string>
+    <string name="poi_cocktails_yes">是</string>
+    <string name="poi_self_service_yes">是</string>
+    <string name="poi_automated_yes">是</string>
+    <string name="poi_brushless_yes">是</string>
+    <string name="poi_toilets_yes">是</string>
+    <string name="poi_vending_sim_cards">SIM卡</string>
+    <string name="poi_memorial_vehicle">车辆</string>
+    <string name="poi_resource_antimony">锑</string>
+    <string name="poi_resource_asbestos">石绵</string>
+    <string name="poi_resource_barite">重晶石</string>
+    <string name="poi_resource_bauxite">铝矾土</string>
+    <string name="poi_resource_beryl">绿柱石</string>
+    <string name="poi_resource_chromite">铬铁矿</string>
+    <string name="poi_resource_dolomite">白云石</string>
+    <string name="poi_resource_gas">气体</string>
+    <string name="poi_resource_graphite">石墨</string>
+    <string name="poi_resource_gypsum">石膏</string>
+    <string name="poi_resource_lignite">褐煤</string>
+    <string name="poi_resource_limestone">石灰石</string>
+    <string name="poi_resource_marble">大理石</string>
+    <string name="poi_resource_mica">云母</string>
+    <string name="poi_resource_opal">蛋白石</string>
+    <string name="poi_resource_peat">泥煤</string>
+    <string name="poi_resource_ruby">红宝石</string>
+    <string name="poi_resource_rutile">金红石</string>
+    <string name="poi_resource_salt">盐</string>
+    <string name="poi_resource_sandstone">砂岩</string>
+    <string name="poi_resource_silica">二氧化硅</string>
+    <string name="poi_resource_slate">板岩</string>
+    <string name="poi_resource_zircon">锆英石</string>
+    <string name="poi_wetland_bog">酸性泥炭沼泽</string>
+    <string name="poi_wetland_mangrove">红树林沼泽</string>
+    <string name="poi_beach_shingle">砾石海滩</string>
+    <string name="poi_beach_rocky">岩的滩</string>
+    <string name="poi_bench_yes">是</string>
+    <string name="poi_bridge_car">道路桥</string>
+    <string name="poi_bridge_pedestrian">行人陆桥</string>
+    <string name="poi_bridge_bicycle">自行车桥</string>
+    <string name="poi_bridge_railway">铁道桥</string>
+    <string name="poi_bridge_structure_arch">拱桥</string>
+    <string name="poi_bridge_structure_floating">浮桥</string>
+    <string name="poi_bridge_movable_bascule">上开桥</string>
+    <string name="poi_route_trolleybus_ref">无轨电车</string>
+    <string name="poi_route_light_rail_ref">轻轨</string>
+    <string name="poi_route_monorail_ref">单轨</string>
+    <string name="poi_route_ferry_ref">渡轮</string>
+    <string name="poi_industrial_factory">类型：工厂</string>
+    <string name="poi_industrial_warehouse">类型：仓库</string>
+    <string name="poi_industrial_agriculture">类型：农业</string>
+    <string name="poi_crop_grass">作物：草</string>
+    <string name="poi_crop_tea">作物：茶</string>
+    <string name="poi_crop_coffee">作物：咖啡</string>
+    <string name="poi_crop_strawberry">作物：草莓</string>
+    <string name="poi_crop_flowers">作物：花</string>
+    <string name="poi_clothes_underwear">内衣</string>
+    <string name="poi_clothes_suits">西装</string>
+    <string name="poi_backcountry_yes">是</string>
+    <string name="poi_backcountry_no">否</string>
+    <string name="poi_scout_yes">是</string>
+    <string name="poi_washing_machine_yes">是</string>
+    <string name="poi_shower_filter_yes">是</string>
+    <string name="poi_caravans_yes">是</string>
+    <string name="poi_power_supply_yes">是</string>
+    <string name="poi_power_supply_no">供电：否</string>
+    <string name="poi_ramp_wheelchair_yes">无障碍坡道：是</string>
+    <string name="poi_ramp_wheelchair_no">无障碍坡道：否</string>
+    <string name="poi_material_wood">材料：木</string>
+    <string name="poi_material_metal">材料：金属</string>
+    <string name="poi_material_reinforced_concrete">材料：钢筋混凝土</string>
+    <string name="poi_material_concrete">材料：混凝土</string>
+    <string name="poi_material_steel">材料：钢</string>
+    <string name="poi_material_stone">材料：石</string>
+    <string name="poi_material_brick">材料：砖</string>
+    <string name="poi_material_sandstone">材料：砂石</string>
+    <string name="poi_material_metal_wood">材料：金属，木</string>
+    <string name="poi_material_glass">材料：玻璃</string>
+    <string name="poi_material_bronze">材料：青铜</string>
+    <string name="poi_material_composite">材料：複合材料</string>
+    <string name="poi_material_limestone">材料：石灰石</string>
+    <string name="poi_material_marble">材料：大理石</string>
+    <string name="poi_material_aluminium">材料：铝</string>
+    <string name="poi_temperature">温度</string>
+    <string name="poi_cargo_vehicle">车辆</string>
+    <string name="poi_cargo_container">货柜</string>
+    <string name="poi_aerialway_length">长度</string>
+    <string name="poi_dyke">岩脉</string>
+    <string name="poi_nuclear_explosion_country">爆炸：国家</string>
+    <string name="poi_nuclear_explosion_type_atmospheric">爆炸类型：大气圈</string>
+    <string name="poi_nuclear_explosion_type_atmospheric_balloon">爆炸类型：大气圈，气球</string>
+    <string name="poi_nuclear_explosion_type_underground">爆炸类型：地下</string>
+    <string name="poi_nuclear_explosion_type_underwater">爆炸类型：水下</string>
+    <string name="poi_nuclear_explosion_crater_diameter">爆炸：火山口直径</string>
+    <string name="poi_compressed_air_yes">是</string>
+    <string name="poi_car_wash_yes">是</string>
+    <string name="poi_vacuum_cleaner_yes">是</string>
+    <string name="poi_fire_hydrant_type_underground">地下消防栓</string>
+    <string name="poi_fire_hydrant_type_pillar">柱式消防栓</string>
+    <string name="poi_home_visit_yes">是</string>
+    <string name="poi_fire_hydrant_position_lane">车道</string>
+    <string name="poi_fire_hydrant_position_parking_lot">停车场</string>
+    <string name="poi_fire_hydrant_position_street">街道</string>
+    <string name="poi_fire_hydrant_position_underground">地下</string>
+    <string name="poi_depth">深度</string>
+    <string name="poi_crossing_barrier_no">道口拦挡：否</string>
+    <string name="poi_crossing_barrier_yes">道口拦挡</string>
+    <string name="poi_dispensing_yes">是</string>
+    <string name="poi_telescope_diameter">直径</string>
+    <string name="poi_barometer_yes">气压计</string>
+    <string name="poi_barometer_no">气压计：否</string>
+    <string name="poi_thermometer_yes">温度计</string>
+    <string name="poi_thermometer_no">温度计：否</string>
+    <string name="poi_hygrometer_yes">湿度计</string>
+    <string name="poi_hygrometer_no">湿度计：否</string>
+    <string name="poi_aquaculture">水产养殖</string>
+    <string name="poi_aquaculture_fish">水产养殖：鱼</string>
+    <string name="poi_organic_yes">是</string>
+    <string name="poi_organic_no">否</string>
+    <string name="poi_cuisine_steak">牛排</string>
+    <string name="poi_cuisine_greek">希腊菜</string>
+    <string name="poi_cuisine_thai">泰菜</string>
+    <string name="poi_cuisine_turkish">土耳其菜</string>
+    <string name="poi_cuisine_vietnamese">越南菜</string>
+    <string name="poi_cuisine_portuguese">葡萄牙菜</string>
+    <string name="poi_cuisine_georgian">格鲁吉亚菜</string>
+    <string name="poi_cuisine_danish">丹麦菜</string>
+    <string name="poi_cuisine_croatian">克罗地亚菜</string>
+    <string name="poi_cuisine_persian">波斯菜</string>
+    <string name="poi_cuisine_hungarian">匈牙利菜</string>
+    <string name="poi_cuisine_lao">老挝菜</string>
+    <string name="poi_cuisine_czech">捷克菜</string>
+    <string name="poi_cuisine_swedish">瑞典菜</string>
+    <string name="poi_cuisine_armenian">亚美尼亚菜</string>
+    <string name="poi_cuisine_english">英菜</string>
+    <string name="poi_cuisine_dutch">荷兰菜</string>
+    <string name="poi_cuisine_bulgarian">保加利亚菜</string>
+    <string name="poi_gambling_type">类型</string>
+    <string name="poi_railway_yard">货运车站</string>
+    <string name="poi_fast_food_cafeteria">是</string>
+    <string name="poi_motorcycle_repair_no">修：否</string>
+    <string name="poi_government_public_service">公共服務</string>
+    <string name="poi_gorge">峡谷</string>
+    <string name="poi_surface_clay">粘土</string>
+    <string name="poi_location_underground">地点：地下</string>
+    <string name="poi_location_underwater">地点：水下</string>
+    <string name="poi_location_bridge">地点：桥</string>
+    <string name="poi_location_entrance">地点：入口</string>
+    <string name="poi_water_purification_none">无</string>
+    <string name="poi_water_purification_chlorine">氯</string>
+    <string name="poi_water_supply_pipeline">管线</string>
+    <string name="poi_water_supply_bottled_water">水瓶</string>
+    <string name="poi_water_place_access_community">社区</string>
+    <string name="poi_car_yes">汽车：是</string>
+    <string name="poi_car_no">汽车：否</string>
+    <string name="poi_bicycle_yes">自行车：是</string>
+    <string name="poi_bicycle_no">自行车：否</string>
+    <string name="poi_map_size_city">地图大小：城市</string>
+    <string name="poi_post_street">街道</string>
+    <string name="poi_ref_post">邮政编码</string>
+    <string name="poi_climbing_ice_yes">冰：是</string>
+    <string name="poi_climbing_ice_no">冰：否</string>
+    <string name="poi_circumference">圆周</string>
+    <string name="poi_shop_boat">船店</string>
+    <string name="poi_socket_chademo_output_high">高</string>
+    <string name="poi_socket_chademo_output_medium">中等</string>
+    <string name="poi_socket_chademo_output_low">低</string>
+    <string name="poi_socket_type2_output_high">高</string>
+    <string name="poi_socket_type2_output_medium">中等</string>
+    <string name="poi_socket_type2_output_low">低</string>
+    <string name="poi_socket_type2_combo_output_high">高</string>
+    <string name="poi_socket_type2_combo_output_medium">中等</string>
+    <string name="poi_socket_type2_combo_output_low">低</string>
+    <string name="poi_socket_type3_output_high">高</string>
+    <string name="poi_socket_type3_output_medium">中等</string>
+    <string name="poi_socket_type3_output_low">低</string>
+    <string name="poi_socket_cee_blue_output_high">高</string>
+    <string name="poi_socket_cee_blue_output_medium">中等</string>
+    <string name="poi_socket_schuko_output_low">低</string>
+    <string name="poi_service_vehicle_car_repair_yes">汽车修</string>
+    <string name="poi_service_vehicle_brakes_yes">制动器</string>
+    <string name="poi_service_vehicle_glass_yes">玻璃</string>
+    <string name="poi_service_vehicle_motor_yes">马达</string>
+    <string name="poi_glacier_type_icecap">冰帽</string>
+    <string name="poi_glacier_type_icefield">冰原</string>
+    <string name="poi_glacier_type_plateau">高原</string>
+    <string name="poi_glacier_type_valley">谷</string>
+    <string name="poi_glacier_type_outlet">溢出冰河</string>
+    <string name="poi_glacier_type_mountain">山地冰川</string>
+    <string name="poi_glacier_type_hanging">悬冰河</string>
+    <string name="poi_glacier_type_icefall">冰瀑</string>
+    <string name="poi_glacier_type_rock">石冰川</string>
+    <string name="poi_glacier_type_shelf">冰棚</string>
+    <string name="poi_rock">岩石</string>
+    <string name="poi_hazard_nuclear">核危害</string>
+    <string name="poi_hazard_erosion">侵蚀危害</string>
+    <string name="poi_hill">丘</string>
+    <string name="poi_bulk_purchase_yes">是</string>
+    <string name="poi_substation_converter">转炉</string>
+    <string name="poi_substation_compression">压缩</string>
+    <string name="poi_substation_valve">瓣膜</string>
+    <string name="poi_books_religion">宗教</string>
+    <string name="poi_atoll">环礁</string>
+    <string name="poi_park_ride">停车转乘</string>
+    <string name="poi_park_ride_yes">是</string>
+    <string name="poi_park_ride_ferry">渡轮</string>
+    <string name="poi_hazard">危害</string>
+    <string name="poi_hazard_additional_erosion">危害：侵蚀</string>
+    <string name="poi_hazard_additional_nuclear">危害：核子</string>
+    <string name="poi_hazard_additional_flood">危害：洪水</string>
+    <string name="poi_hazard_additional_avalanche">危害：雪崩</string>
+    <string name="poi_snowmobile_yes">是</string>
+    <string name="poi_bus_yes">是</string>
+    <string name="poi_caravan_yes">是</string>
+    <string name="poi_motorhome_yes">是</string>
+    <string name="poi_trailer_yes">是</string>
+    <string name="poi_motorcycle_yes">是</string>
+    <string name="poi_motorcycle_destination">目的地</string>
+    <string name="poi_moped_yes">是</string>
+    <string name="poi_mofa_yes">是</string>
+    <string name="poi_hgv_yes">是</string>
+    <string name="poi_hgv_destination">目的地</string>
+    <string name="poi_goods_yes">是</string>
+    <string name="poi_disabled_yes">是</string>
+    <string name="poi_religion_type">宗教</string>
+    <string name="poi_veterinary">兽医的</string>
+    <string name="poi_audiologist">听力师</string>
+    <string name="poi_occupational_therapist">职业治疗师</string>
+    <string name="poi_optometrist">验光师</string>
+    <string name="poi_physiotherapist">物理治疗师</string>
+    <string name="poi_trees_rubber">橡胶</string>
+    <string name="poi_resource_mineral_oil">矿物油</string>
 </resources>

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

@@ -187,7 +187,7 @@
     <string name="city_type_village">村</string>
     <string name="city_type_town">镇</string>
     <string name="city_type_city">城市</string>
-    <string name="shared_string_gpx_route">GPX 路径</string>
+    <string name="shared_string_gpx_route">GPX路径</string>
     <string name="button_upgrade_osmandplus">升级OsmAnd+</string>
     <string name="shared_string_rename">重命名</string>
     <string name="shared_string_save_as_gpx">另存为 GPX 轨迹</string>
@@ -543,7 +543,7 @@
     <string name="fav_export_confirmation">已存在上次导出的收藏夹文件。是否要替换它？</string>
     <string name="routing_settings_descr">指定导航选项。</string>
     <string name="index_settings">数据管理</string>
-    <string name="general_settings_descr">配置应用程序的显示与公用设置</string>
+    <string name="general_settings_descr">配置应用的显示与公用设置。</string>
     <string name="global_app_settings">应用程序全局设置</string>
     <string name="download_files_not_enough_space">可用空间不足以下载 %1$s MB (可用空间：%2$s)。</string>
     <string name="download_files_question_space">下载 {0} 个文件？
@@ -651,7 +651,7 @@
     <string name="filter_existing_indexes">已下载</string>
     <string name="shared_string_select_all">全部选中</string>
     <string name="fast_route_mode">最快路线</string>
-    <string name="fast_route_mode_descr">打开则规划最快路线，关闭则计算最短路线 </string>
+    <string name="fast_route_mode_descr">打开则规划最快路线，关闭则计算最短路线。</string>
     <string name="shared_string_download_map">下载地图</string>
     <string name="maps_could_not_be_downloaded">此地图无法下载</string>
     <string name="rendering_exception">渲染选中区域时发生错误</string>
@@ -961,7 +961,7 @@
     <string name="si_min_m">分钟/英里</string>
     <string name="si_nm_h">海里/小时 (节)</string>
     <string name="nm_h">浬里/时</string>
-    <string name="min_mile">分/米</string>
+    <string name="min_mile"></string>
     <string name="min_km">分/公里</string>
     <string name="m_s">米/秒</string>
     <string name="shared_string_navigation">导航</string>
@@ -1167,7 +1167,7 @@
     <string name="voice_provider_descr">为导航选择语音指引。</string>
     <string name="voice_provider">语音指引</string>
     <string name="choose_audio_stream">语音指引输出</string>
-    <string name="choose_audio_stream_descr">选择播放语音指引的扬声器</string>
+    <string name="choose_audio_stream_descr">选择播放语音指引的扬声器。</string>
     <string name="quick_action_navigation_voice_descr">点击动作按钮将会禁用或启用导航时的语音指引。</string>
     <string name="map_preferred_locale">地图偏好语言</string>
     <string name="map_preferred_locale_descr">地图上标签显示的偏好语言（如果不可用，将会切换至英文或者本地名称）</string>
@@ -1230,7 +1230,7 @@
     <string name="display_zoom_level">显示缩放等级：%1$s</string>
     <string name="online_map">在线地图</string>
     <string name="roads_only">仅道路</string>
-    <string name="device_memory"></string>
+    <string name="device_memory"/>
     <string name="first_usage_item">初次使用</string>
     <string name="tips_and_tricks_descr">常见问题、最近修改和其它内容。</string>
     <string name="faq_item_description">常见问题</string>
@@ -1379,7 +1379,7 @@
     <string name="routing_attr_driving_style_speed_name">更短的路径</string>
     <string name="routing_attr_driving_style_balance_name">平衡</string>
     <string name="routing_attr_driving_style_safety_name">偏好背街小路</string>
-    <string name="relief_smoothness_factor_descr">首选的地形︰ 平坦或丘陵。</string>
+    <string name="relief_smoothness_factor_descr">首选的地形：平坦或丘陵。</string>
     <string name="shared_string_slope">坡度</string>
     <string name="add_new_folder">添加新文件夹</string>
     <string name="route_points_category_name">转到这条路线上</string>
@@ -2398,7 +2398,7 @@
     <string name="shared_string_added">已添加</string>
     <string name="marker_activated">标记%s 已激活。</string>
     <string name="one_tap_active_descr">点击地图上的标记将其移动到活动标记的顶端, 而不打开上下文菜单。</string>
-    <string name="one_tap_active">一个点击激活</string>
+    <string name="one_tap_active">\'一个点击\'激活</string>
     <string name="empty_state_av_notes">做笔记!</string>
     <string name="empty_state_av_notes_desc">使用小部件或上下文菜单, 在地图上的每个点添加音频、视频或照片注释。</string>
     <string name="notes_by_date">按日期说明</string>
@@ -2724,8 +2724,27 @@
     <string name="shared_string_travel_book">旅游书</string>
     <string name="download_images">下载图片</string>
     <string name="rendering_value_black_name">黑色</string>
-    <string name="rendering_attr_surface_wood_name"/>
+    <string name="rendering_attr_surface_wood_name">木</string>
     <string name="app_mode_subway">地铁</string>
     <string name="app_mode_horse">马</string>
     <string name="shared_string_color_magenta">品红色</string>
+    <string name="go_to_next_field">下个栏位</string>
+    <string name="shared_string_dont">别</string>
+    <string name="download_file">下载文件</string>
+    <string name="start_editing">开始编辑</string>
+    <string name="points_of_interests">兴趣点（POI）</string>
+    <string name="shared_string_capacity">容量</string>
+    <string name="rendering_attr_surface_metal_name">金属</string>
+    <string name="rendering_attr_highway_class_path_name">路径</string>
+    <string name="app_mode_helicopter">直升机</string>
+    <string name="app_mode_skiing">滑雪</string>
+    <string name="base_profile_descr_ski">滑雪</string>
+    <string name="routing_profile_ski">滑雪</string>
+    <string name="profile_type_descr_string">类型：%s</string>
+    <string name="profile_alert_need_save_title">保存更改</string>
+    <string name="shared_string_min_speed">最低速率</string>
+    <string name="shared_string_max_speed">最高速率</string>
+    <string name="default_speed_setting_title">默认速率</string>
+    <string name="shared_string_default">默认</string>
+    <string name="transport_nearby_routes">之间</string>
 </resources>

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

@@ -3205,4 +3205,9 @@
     <string name="rendering_attr_showLez_name">顯示低排放區域</string>
     <string name="temporary_conditional_routing">考慮暫時限制</string>
     <string name="shared_string_default">預設</string>
+    <string name="new_route_calculated_dist_dbg">路徑：距離 %s，路徑時間 %s
+\n計算：%.1f 秒，%d 路，%d 圖磚)</string>
+    <string name="lang_oc">Occitan</string>
+    <string name="app_mode_wagon">休旅車</string>
+    <string name="app_mode_pickup_truck">皮卡車</string>
 </resources>

OsmAnd/res/values/strings.xml

@@ -11,6 +11,29 @@
 	Thx - Hardy
 
 -->
+    <string name="day">Day</string>
+    <string name="days_2_4">Days</string>
+    <string name="days_5">Days</string>
+    <string name="week">Week</string>
+    <string name="weeks_2_4">Weeks</string>
+    <string name="weeks_5">Weeks</string>
+    <string name="month">Month</string>
+    <string name="months_2_4">Months</string>
+    <string name="months_5">Months</string>
+    <string name="year">Year</string>
+    <string name="years_2_4">Years</string>
+    <string name="years_5">Years</string>
+    <string name="months_3">Three months</string>
+    <string name="price_free">Free</string>
+    <string name="get_discount_title">Get %1$d %2$s at %3$s off.</string>
+    <string name="get_free_trial_title">Start your %1$d %2$s free trial.</string>
+    <string name="get_discount_first_part">%1$s for first %2$s</string>
+    <string name="get_discount_first_few_part">%1$s for first %2$s</string>
+    <string name="get_discount_second_part">then %1$s</string>
+    <string name="cancel_subscription">Cancel subscription</string>
+    <string name="price_and_discount">%1$s • Save %2$s</string>
+    <string name="app_mode_wagon">Wagon</string>
+    <string name="app_mode_pickup_truck">Pickup truck</string>
     <string name="units_and_formats">Units &amp; formats</string>
     <string name="appearance">Appearance</string>
     <string name="map_look_descr">icons, widgets</string>

OsmAnd/src/com/android/vending/billing/IInAppBillingService.aidl

@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.vending.billing;
-
-import android.os.Bundle;
-
-/**
- * InAppBillingService is the service that provides in-app billing version 3 and beyond.
- * This service provides the following features:
- * 1. Provides a new API to get details of in-app items published for the app including
- *    price, type, title and description.
- * 2. The purchase flow is synchronous and purchase information is available immediately
- *    after it completes.
- * 3. Purchase information of in-app purchases is maintained within the Google Play system
- *    till the purchase is consumed.
- * 4. An API to consume a purchase of an inapp item. All purchases of one-time
- *    in-app items are consumable and thereafter can be purchased again.
- * 5. An API to get current purchases of the user immediately. This will not contain any
- *    consumed purchases.
- *
- * All calls will give a response code with the following possible values
- * RESULT_OK = 0 - success
- * RESULT_USER_CANCELED = 1 - user pressed back or canceled a dialog
- * RESULT_BILLING_UNAVAILABLE = 3 - this billing API version is not supported for the type requested
- * RESULT_ITEM_UNAVAILABLE = 4 - requested SKU is not available for purchase
- * RESULT_DEVELOPER_ERROR = 5 - invalid arguments provided to the API
- * RESULT_ERROR = 6 - Fatal error during the API action
- * RESULT_ITEM_ALREADY_OWNED = 7 - Failure to purchase since item is already owned
- * RESULT_ITEM_NOT_OWNED = 8 - Failure to consume since item is not owned
- */
-interface IInAppBillingService {
-    /**
-     * Checks support for the requested billing API version, package and in-app type.
-     * Minimum API version supported by this interface is 3.
-     * @param apiVersion the billing version which the app is using
-     * @param packageName the package name of the calling app
-     * @param type type of the in-app item being purchased "inapp" for one-time purchases
-     *        and "subs" for subscription.
-     * @return RESULT_OK(0) on success, corresponding result code on failures
-     */
-    int isBillingSupported(int apiVersion, String packageName, String type);
-
-    /**
-     * Provides details of a list of SKUs
-     * Given a list of SKUs of a valid type in the skusBundle, this returns a bundle
-     * with a list JSON strings containing the productId, price, title and description.
-     * This API can be called with a maximum of 20 SKUs.
-     * @param apiVersion billing API version that the Third-party is using
-     * @param packageName the package name of the calling app
-     * @param skusBundle bundle containing a StringArrayList of SKUs with key "ITEM_ID_LIST"
-     * @return Bundle containing the following key-value pairs
-     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
-     *              failure as listed above.
-     *         "DETAILS_LIST" with a StringArrayList containing purchase information
-     *              in JSON format similar to:
-     *              '{ "productId" : "exampleSku", "type" : "inapp", "price" : "$5.00",
-     *                 "title : "Example Title", "description" : "This is an example description" }'
-     */
-    Bundle getSkuDetails(int apiVersion, String packageName, String type, in Bundle skusBundle);
-
-    /**
-     * Returns a pending intent to launch the purchase flow for an in-app item by providing a SKU,
-     * the type, a unique purchase token and an optional developer payload.
-     * @param apiVersion billing API version that the app is using
-     * @param packageName package name of the calling app
-     * @param sku the SKU of the in-app item as published in the developer console
-     * @param type the type of the in-app item ("inapp" for one-time purchases
-     *        and "subs" for subscription).
-     * @param developerPayload optional argument to be sent back with the purchase information
-     * @return Bundle containing the following key-value pairs
-     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
-     *              failure as listed above.
-     *         "BUY_INTENT" - PendingIntent to start the purchase flow
-     *
-     * The Pending intent should be launched with startIntentSenderForResult. When purchase flow
-     * has completed, the onActivityResult() will give a resultCode of OK or CANCELED.
-     * If the purchase is successful, the result data will contain the following key-value pairs
-     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
-     *              failure as listed above.
-     *         "INAPP_PURCHASE_DATA" - String in JSON format similar to
-     *              '{"orderId":"12999763169054705758.1371079406387615",
-     *                "packageName":"com.example.app",
-     *                "productId":"exampleSku",
-     *                "purchaseTime":1345678900000,
-     *                "purchaseToken" : "122333444455555",
-     *                "developerPayload":"example developer payload" }'
-     *         "INAPP_DATA_SIGNATURE" - String containing the signature of the purchase data that
-     *                                  was signed with the private key of the developer
-     *                                  TODO: change this to app-specific keys.
-     */
-    Bundle getBuyIntent(int apiVersion, String packageName, String sku, String type,
-        String developerPayload);
-
-    /**
-     * Returns the current SKUs owned by the user of the type and package name specified along with
-     * purchase information and a signature of the data to be validated.
-     * This will return all SKUs that have been purchased in V3 and managed items purchased using
-     * V1 and V2 that have not been consumed.
-     * @param apiVersion billing API version that the app is using
-     * @param packageName package name of the calling app
-     * @param type the type of the in-app items being requested
-     *        ("inapp" for one-time purchases and "subs" for subscription).
-     * @param continuationToken to be set as null for the first call, if the number of owned
-     *        skus are too many, a continuationToken is returned in the response bundle.
-     *        This method can be called again with the continuation token to get the next set of
-     *        owned skus.
-     * @return Bundle containing the following key-value pairs
-     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
-     *              failure as listed above.
-     *         "INAPP_PURCHASE_ITEM_LIST" - StringArrayList containing the list of SKUs
-     *         "INAPP_PURCHASE_DATA_LIST" - StringArrayList containing the purchase information
-     *         "INAPP_DATA_SIGNATURE_LIST"- StringArrayList containing the signatures
-     *                                      of the purchase information
-     *         "INAPP_CONTINUATION_TOKEN" - String containing a continuation token for the
-     *                                      next set of in-app purchases. Only set if the
-     *                                      user has more owned skus than the current list.
-     */
-    Bundle getPurchases(int apiVersion, String packageName, String type, String continuationToken);
-
-    /**
-     * Consume the last purchase of the given SKU. This will result in this item being removed
-     * from all subsequent responses to getPurchases() and allow re-purchase of this item.
-     * @param apiVersion billing API version that the app is using
-     * @param packageName package name of the calling app
-     * @param purchaseToken token in the purchase information JSON that identifies the purchase
-     *        to be consumed
-     * @return 0 if consumption succeeded. Appropriate error values for failures.
-     */
-    int consumePurchase(int apiVersion, String packageName, String purchaseToken);
-}

OsmAnd/src/net/osmand/AndroidUtils.java

@@ -30,6 +30,8 @@ import android.support.annotation.NonNull;
 import android.support.design.widget.Snackbar;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.content.FileProvider;
+import android.support.v4.text.TextUtilsCompat;
+import android.support.v4.view.ViewCompat;
 import android.text.ParcelableSpan;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -62,6 +64,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import static android.content.Context.POWER_SERVICE;
@@ -598,4 +601,8 @@ public class AndroidUtils {
 			return baseString;
 		}
 	}
+
+	public static boolean isRTL() {
+		return TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == ViewCompat.LAYOUT_DIRECTION_RTL;
+	}
 }

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

@@ -286,7 +286,7 @@ public class NavigationService extends Service implements LocationListener {
 	@Override
 	public void onTaskRemoved(Intent rootIntent) {
 		OsmandApplication app = ((OsmandApplication) getApplication());
-		app.getNotificationHelper().removeNotifications();
+		app.getNotificationHelper().removeNotifications(false);
 		if (app.getNavigationService() != null &&
 				app.getSettings().DISABLE_RECORDING_ONCE_APP_KILLED.get()) {
 			NavigationService.this.stopSelf();

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

@@ -155,9 +155,11 @@ public class NotificationHelper {
 		}
 	}
 
-	public void removeNotifications() {
+	public void removeNotifications(boolean inactiveOnly) {
 		for (OsmandNotification notification : all) {
-			notification.removeNotification();
+			if (!inactiveOnly || !notification.isActive()) {
+				notification.removeNotification();
+			}
 		}
 	}
 

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

@@ -761,6 +761,9 @@ public class OsmAndLocationProvider implements SensorEventListener {
 	
 	
 	public void setLocationFromService(net.osmand.Location location, boolean continuous) {
+		if (locationSimulation.isRouteAnimating()) {
+			return;
+		}
 		// if continuous notify about lost location
 		if (continuous) {
 			scheduleCheckIfGpsLost(location);

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

@@ -242,7 +242,7 @@ public class OsmandApplication extends MultiDexApplication {
         if(RateUsBottomSheetDialog.shouldShow(this)) {
             osmandSettings.RATE_US_STATE.set(RateUsBottomSheetDialog.RateUsState.IGNORED);
         }
-        getNotificationHelper().removeNotifications();
+        getNotificationHelper().removeNotifications(false);
 	}
 
 	public RendererRegistry getRendererRegistry() {