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

OsmAnd/res/values-af/strings.xml

@@ -1278,9 +1278,9 @@ OsmAnd (OSM Automated Navigation Directions) is \\\'n kaart en navigasie toepass
 	<string name="lang_hy">Armeens</string>
 	<string name="lang_eu">Baskies</string>
 	<string name="color_red">rooi</string>
-	<string name="color_pink">pienk</string>
+	<string name="rendering_value_pink_name">pienk</string>
 	<string name="color_orange">oranje</string>
-	<string name="color_brown">bruin</string>
+	<string name="rendering_value_brown_name">bruin</string>
 	<string name="color_yellow">geel</string>
 	<string name="color_lightblue">ligblou</string>
 	<string name="color_blue">blou</string>

OsmAnd/res/values-ar/strings.xml

@@ -1144,9 +1144,9 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
     <string name="loading_smth">جاري التحميل %1$s …</string>
     <string name="selected_gpx_info_show">\n\nاضغط باستمرار للرؤية على الخريطة</string>
     <string name="color_red">أحمر</string>
-	<string name="color_pink">وردي</string>
+	<string name="rendering_value_pink_name">وردي</string>
 	<string name="color_orange">برتقالي</string>
-	<string name="color_brown">بني</string>
+	<string name="rendering_value_brown_name">بني</string>
 	<string name="color_yellow">أصفر</string>
 	<string name="color_lightblue">أزرق فاتح</string>
 	<string name="color_blue">أزرق</string>

OsmAnd/res/values-be-rBY/strings.xml

@@ -249,9 +249,9 @@
     <string name="osmo_connect_to_my_nickname">Moj nіk</string>
     <string name="osmo_user_name">Karystaĺnіk</string>
 	<string name="color_red">čyrvony</string>
-	<string name="color_pink">ružovy</string>
+	<string name="rendering_value_pink_name">ružovy</string>
 	<string name="color_orange">aranžavy</string>
-	<string name="color_brown">karyčnievy</string>
+	<string name="rendering_value_brown_name">karyčnievy</string>
 	<string name="color_yellow">žoŭty</string>
 	<string name="color_lightblue">blakіtny</string>
 	<string name="color_blue">sіnі</string>

OsmAnd/res/values-be/strings.xml

@@ -1332,9 +1332,9 @@
     <string name="osmo_session_not_available">Сэсыя не даступная, калі ласка, пераканайцеся, што пункт \'Адсылаць месцазнаходжаньне\' уключаны.</string>
     <string name="osmo_tracker_id_share">Каб падключыцца да патрэбнага прыстасаваньня %2$s націсьніце на спасылку %3$s альбо задайце ідэнтыфікатар трэкеру (%1$s)</string>
     <string name="color_red">чырвоны</string>
-	<string name="color_pink">ружовы</string>
+	<string name="rendering_value_pink_name">ружовы</string>
 	<string name="color_orange">аранжавы</string>
-	<string name="color_brown">карычневы</string>
+	<string name="rendering_value_brown_name">карычневы</string>
 	<string name="color_yellow">жоўты</string>
 	<string name="color_lightblue">блакітны</string>
 	<string name="color_blue">сіні</string>

OsmAnd/res/values-bg/strings.xml

@@ -12,12 +12,12 @@
     <string name="route_from">От:</string>
     
 	
-    <string name="speak_speed_limit">Обявяване на ограничения за скоростта</string>
-    <string name="speak_cameras">Обявяване на камери за скорост</string>
-	<string name="speak_traffic_warnings">Обявяване на предупреждения за трафика</string>
+    <string name="speak_speed_limit">Ограничения на скоростта</string>
+    <string name="speak_cameras">Камери за скорост</string>
+	<string name="speak_traffic_warnings">Предупреждения за трафика</string>
 	
 	
-	<string name="app_mode_default">Разглеждане на картата</string>
+	<string name="app_mode_default">Карта</string>
 	<string name="settings_preset">Текущ профил</string>
 	<string name="settings_preset_descr">Изгледът на картата и настройките за навигация се запомнят за всеки потребителски профил. Настройте своя профил по подразбиране тук.</string>
     <string name="destination_point">Крайна цел %1$s</string>
@@ -52,7 +52,7 @@
     
     <string name="distance_measurement_load_gpx">Отвори съществуващ GPX</string>
     <string name="wait_current_task_finished">Моля, почакайте докато свърши текущата задача</string>
-    <string name="use_kalman_filter_compass_descr">Използване на филтър на Kalman за избягване трептенето на компаса</string>
+    <string name="use_kalman_filter_compass_descr">Намалява трептенето на компаса, но го прави по-бавен</string>
     <string name="access_mark_final_location_first">Режим на достъпност: Моля, изберете първо крайната цел</string> 
     <string name="use_magnetic_sensor_descr">Използвай магнитния сензор за определяне на компасната посока вместо сензора за ориентиране</string>
     <string name="use_magnetic_sensor">Използвай магнитния сензор</string>
@@ -97,18 +97,18 @@
     <string name="max_speed_none">няма</string>
     <string name="index_name_openmaps">OpenMaps - Европа</string>
     
-    <string name="download_hillshade_maps">Карти с релеф</string>
+    <string name="download_hillshade_maps">Оцветяване на релефа</string>
     
     
     
-    <string name="local_indexes_cat_srtm">Данни за контури</string>
+    <string name="local_indexes_cat_srtm">Контурни линии</string>
     <string name="local_indexes_cat_av">Аудио/видео данни</string>
     <string name="stop_routing_confirm">Наистина ли искате да спрете навигацията?</string>
     <string name="clear_dest_confirm">Наистина ли искате да изтриете крайната цел (и междинните точки)?</string>
-    <string name="precise_routing_mode_descr">Прецизното рутиране. Все още е ограничено по дистанция и е по-бавно.</string>
+    <string name="precise_routing_mode_descr">Прецизното изчисляване на маршрута. Все още е ограничено по дистанция и е по-бавно.</string>
     <string name="precise_routing_mode">Прецизно изчисляване на маршрута (алфа)</string>
     <string name="recording_context_menu_show">Покажи</string>
-    <string name="recording_photo_description">Снимка %1$s от %2$s</string>
+    <string name="recording_photo_description">Снимка %1$s %2$s</string>
     <string name="av_def_action_picture">Направете снимка</string>
     <string name="recording_context_menu_precord">Направете снимка</string>
     <string name="dropbox_plugin_description">Dropbox приставката ви позволява да синхронизирате следите и аудио/видео бележките с вашия dropbox акаунт.</string>
@@ -144,7 +144,7 @@
     <string name="recording_can_not_be_played">Записът не може да бъде изпълнен</string>
     <string name="recording_context_menu_delete">Изтриване на запис</string>
     <string name="recording_context_menu_play">Старт</string>
-    <string name="recording_description">Запис %1$s %2$s от %3$s</string>
+    <string name="recording_description">Запис %1$s %3$s %2$s</string>
     <string name="recording_default_name">Запис</string>
     <string name="shared_string_control_stop">Стоп</string>
     <string name="shared_string_control_start">Старт</string>
@@ -165,8 +165,8 @@
     <string name="download_select_map_types">Други карти</string>
     <string name="download_roads_only_item">Само пътища</string>
     <string name="download_srtm_maps">Контури</string>
-    <string name="download_regular_maps">Нормални карти</string>
-    <string name="download_roads_only_maps">Карти само с пътища</string>
+    <string name="download_regular_maps">Стандартна карта</string>
+    <string name="download_roads_only_maps">Карта само с пътища</string>
     
 	<string name="rendering_attr_noAdminboundaries_name">Скриване на границите</string>
 	<string name="rendering_attr_noAdminboundaries_description">Не показвай административни граници (admin нива 5–9)</string>
@@ -182,7 +182,7 @@
 
     <string name="no_buildings_found">Няма намерени сгради.</string>
     <string name="incremental_search_city">Търсене на град възходящо</string>
-    <string name="search_villages_and_postcodes">Населено място/пощенски код</string>
+    <string name="search_villages_and_postcodes">Търсене на повече селища/пощенски кодове</string>
 	<string name="rendering_attr_showRoadMaps_description">Ако е избрано ще се показват карти съдържащи само пътища:</string>
 	<string name="rendering_attr_showRoadMaps_name">Карти само с пътища</string>
     <string name="safe_mode_description">Стартиране на приложението в сервизен режим (safe mode) - използване на по-бавен Android код.</string>
@@ -196,7 +196,7 @@
 	<string name="rendering_attr_roadColors_description">Избор на схема за оцветяване на пътищата:</string>
 	<string name="rendering_attr_roadColors_name">Схема на оцветяването на пътищата</string>
     <string name="map_widget_show_destination_arrow">Покажи посоката към крайната цел</string>
-    <string name="enable_plugin_monitoring_services">Включете добавката за проследяване за да ползвате запис на GPX или онлайн проследяване</string>
+    <string name="enable_plugin_monitoring_services">Включете добавката за запис на следа за да ползвате онлайн проследяване (онлайн GPX проследяване)</string>
     <string name="non_optimal_route_calculation">Изчисляване на вероятно не най-оптималния маршрут при дълги разстояния</string>
 	<string name="gps_not_available">Моля, включете GPS-а в настройките</string>
     
@@ -230,7 +230,7 @@
 	<string name="poi_filter_food_shop">Хранителни стоки</string>
 	<string name="poi_filter_for_tourists">За туристи</string>
 	<string name="poi_filter_fuel">Бензиностанции</string>
-	<string name="show_warnings_title">Показвай предупреждения…</string>
+	<string name="show_warnings_title">Показване на предупреждения</string>
 	<string name="show_warnings_descr">Настройка на предупрежденията (Ограничения на скоростта, задължително спиране, легнали полицаи), камери за скорост, информация за пътни ленти</string>
 	<string name="use_compass_navigation_descr">Използване на компаса, ако посоката не е определена по друг начин</string>
 	<string name="use_compass_navigation">Използване на компаса</string>
@@ -462,8 +462,8 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="map_widget_transparent">Прозрачна кожа</string>
 	
 	
-	<string name="bg_service_sleep_mode_off">Включване на\n спящ режим</string>
-	<string name="bg_service_sleep_mode_on">Изключване на\n спящия режим</string>
+	<string name="bg_service_sleep_mode_off">Работа\n във фонов режим</string>
+	<string name="bg_service_sleep_mode_on">Изключване на\n фоновия режим</string>
 	<string name="gps_wakeup_interval">Интервал за задействане на GPS: %s</string>
 	<string name="int_continuosly">Без прекъсване</string>
 	<string name="screen_is_locked">За да отключите екрана натиснете закл. икона</string>
@@ -478,10 +478,10 @@ OsmAnd е с отворен код и активно да се развива.
 	
 	
 	<string name="map_widget_parking">Паркинг</string>
-	<string name="map_widget_monitoring">GPX запис</string>
+	<string name="map_widget_monitoring">GPX проследяване</string>
 	<string name="map_widget_speed">Скорост</string>
 	<string name="map_widget_distance">Крайна цел</string>
-	<string name="map_widget_altitude">Височина</string>
+	<string name="map_widget_altitude">Надм. височина</string>
 	<string name="map_widget_time">Време на пристигане</string>
 	<string name="map_widget_next_turn">Следващ завой</string>
 	<string name="map_widget_next_turn_small">Следващ завой (малка икона)</string>
@@ -498,7 +498,7 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="route_updated_loc_found">Маршрутът ще бъде изчислен след намиране на вашето място</string>
 	<string name="osmand_parking_hours">Часа</string>
 	<string name="osmand_parking_minutes">Минути</string>
-	<string name="osmand_parking_position_description_add_time">Паркирахте в:</string>
+	<string name="osmand_parking_position_description_add_time">Паркирахте на</string>
 	
 	<string name="select_animate_speedup">Изберете скорост за симулацията</string>
     	<string name="global_app_allocated_memory_descr">Памет за приложението %1$s MB (Ограничение за Android: %2$s MB, Dalvik: %3$s MB).</string>
@@ -552,7 +552,7 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="poi_search_desc">POI () търсене</string>
 	<string name="address_search_desc">Търсене по адрес</string>
 	<string name="navpoint_search_desc">Координати</string>
-	<string name="transport_search_desc">Търсене в \'транспорт\'</string>
+	<string name="transport_search_desc">Търсене в обществен транспорт</string>
 	<string name="favourites_search_desc">Търсене в \'любими\'</string>
 	
 	<string name="offline_navigation_not_available">OsmAnd офлайн навигацията временно не е достъпна.</string>
@@ -565,9 +565,9 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="confirm_interrupt_download">Да се прекъсне ли тегленето?</string>
 	<string name="first_time_msg">Благодарим Ви, че изтеглихте OsmAnd. Необходими са също и карти, които можете да изтеглите сега или по-късно от \'Настройки\'/\'Управление на карти\'. След това ще можете да използвате пълната функционалност на програмата.</string>    
 	<string name="basemap_was_selected_to_download">Базовата карта се изисква за правилна работа на приложението и тя беше автоматично избрана за сваляне.</string>
-	<string name="select_index_file_to_download">Нищо не е намерено. Ако не намирате вашия район, можете да си направите сами карти (виж http://osmand.net).</string>
-	<string name="local_indexes_cat_tile">Карти онлайн</string>
-	<string name="local_indexes_cat_map">Карти офлайн (векторни)</string>
+	<string name="select_index_file_to_download">Нищо не е намерено. Ако не намирате Вашия регион, можете да си направите сами карти (виж http://osmand.net).</string>
+	<string name="local_indexes_cat_tile">Онлайн и кеширани карти</string>
+	<string name="local_indexes_cat_map">Стандартни карти (векторни)</string>
 	<string name="index_settings_descr">Сваляне и управление на свалените данни във Вашето устройство</string>
 	<string name="map_online_plugin_is_not_installed">Включете добавката за онлайн карти и ще можете да избирате различни източници на карти</string>
 	<string name="map_online_data">Онлайн карти</string>
@@ -621,7 +621,7 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="backToMenu">Назад към менюто</string>
 	<string name="zoomOut">Отдалечи картата</string>
 	<string name="zoomIn">Приближи карата</string>
-	<string name="zoomIs">Мащаб</string>
+	<string name="zoomIs">Мащабът е</string>
 	<string name="north">север</string>
 	<string name="north_north_east">север-север-изток</string>
 	<string name="north_east">север-изток</string>
@@ -638,18 +638,18 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="west_north_west">запад-северозапад</string>
 	<string name="north_west">северозапад</string>
 	<string name="north_north_west">север-северозапад</string>
-	<string name="front">Напред</string>
-	<string name="front_right">Напред вдясно</string>
-	<string name="right">Надясно</string>
-	<string name="back_right">Назад вдясно</string>
-	<string name="back">Назад</string>
-	<string name="back_left">Назад вляво</string>
-	<string name="left">Наляво</string>
-	<string name="front_left">Напред вляво</string>
+	<string name="front">напред</string>
+	<string name="front_right">напред и вдясно</string>
+	<string name="right">надясно</string>
+	<string name="back_right">вдясно и назад</string>
+	<string name="back">назад</string>
+	<string name="back_left">наляво и назад</string>
+	<string name="left">наляво</string>
+	<string name="front_left">наляво и напред</string>
 	<string name="oclock">часа</string>
 	<string name="towards">към</string>
 	<string name="accuracy">Точност</string>
-	<string name="altitude">Височина</string>
+	<string name="altitude">Надм. височина</string>
 	<string name="no_info">Няма инфо</string>
 	<string name="direction_style_sidewise">По посоките на света (8 сектора)</string>
 	<string name="direction_style_clockwise">По часовника (12 сектора)</string>
@@ -674,7 +674,7 @@ OsmAnd е с отворен код и активно да се развива.
 	
 	<string name="update_poi_does_not_change_indexes">Промените в забележителностите (POI) вътре в приложението не влияят върху изтеглените карти. Тези промени се записват в отделен файл.</string>
 	<string name="local_openstreetmap_uploading">Качване…</string>
-	<string name="local_openstreetmap_were_uploaded">{0} POI/поправки бяха качени</string>
+	<string name="local_openstreetmap_were_uploaded">{0} POI/Бележки бяха качени</string>
 	<string name="local_openstreetmap_uploadall">Качи всичко</string>
 	
 	
@@ -702,10 +702,10 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="index_name_europe">Европа</string>
 	<string name="index_name_france">Европа - Франция</string>
 	<string name="index_name_germany">Европа - Германия</string>
-	<string name="index_name_russia">Европа/Азия - Русия</string>
+	<string name="index_name_russia">Русия</string>
 	<string name="index_name_africa">Африка</string>
 	<string name="index_name_asia">Азия</string>
-	<string name="index_name_oceania">Океания</string>
+	<string name="index_name_oceania">Австралия и Океания</string>
 	<string name="index_name_other">Географски и тематични карти</string>
 	<string name="index_name_wiki">Уикипедия POI</string>
 	<string name="index_name_voice">Гласова навигация (предварително записана, непълна функционалност)</string>
@@ -725,8 +725,8 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="user_name_descr">Необходимо за изпращане към openstreetmap.org</string>
 	<string name="user_password">Вашата парола в OSM</string>
 	<string name="user_password_descr">Необходими за изпращане към openstreetmap.org</string>
-	<string name="osmand_service">Спящ режим</string>
-	<string name="osmand_service_descr">Използвайте го за да ползвате OsmAnd и при изключен екран</string>
+	<string name="osmand_service">Фонов режим</string>
+	<string name="osmand_service_descr">OsmAnd работи във фонов режим, докато на екранът е изключен</string>
 	
 	
 	
@@ -743,9 +743,9 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="native_library_not_supported">Нативната библиотека не е достъпна за това устройство.</string>
 	<string name="init_native_library">Стартиране на приложението…</string>
 	<string name="choose_auto_follow_route">Автоматично центриране</string>
-	<string name="choose_auto_follow_route_descr">Време за автоматично центриране на картата</string>
+	<string name="choose_auto_follow_route_descr">Изчакване преди картата да се върне на текущата позиция</string>
 	<string name="auto_follow_route_never">Никога (докоснете \'Старт\' за начало на указанията)</string>
-	<string name="auto_follow_route_navigation">Автоматично центриране при навигация</string>
+	<string name="auto_follow_route_navigation">Автоматично центриране само при навигация</string>
 	<string name="auto_follow_route_navigation_descr">Автоматично центриране само по време на навигация.</string>
 	<string name="auto_follow_location_enabled">Автоматичното центриране е включено.</string>
 	<string name="pref_vector_rendering">Специфични настройки за векторното изчертаване</string>
@@ -832,7 +832,7 @@ OsmAnd е с отворен код и активно да се развива.
 	
 	<string name="local_indexes_cat_backup">Изключен</string>
 	<string name="local_indexes_cat_tts">Гласова навигация (синтезирана)</string>
-	<string name="local_indexes_cat_voice">Гласова навигация (записана)</string>
+	<string name="local_indexes_cat_voice">Гласова навигация (предварително записана)</string>
 	
 	<string name="local_indexes_cat_poi">POI данни</string>
 	<string name="ttsvoice">Синтезиран глас</string>
@@ -869,7 +869,7 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="map_underlay">Карта подложка</string>
 	<string name="map_underlay_descr">Изберете карта за подложка</string>
 	<string name="layer_overlay">Допълнителна карта отгоре…</string>
-	<string name="shared_string_none">Нищо</string>
+	<string name="shared_string_none">Няма</string>
 	<string name="map_overlay">Карта отгоре</string>
 	<string name="map_overlay_descr">Избор на карта за горния слой</string>
 	<string name="tile_source_already_installed">Картата вече е инсталирана, настройките ще бъдат обновени</string>
@@ -965,7 +965,7 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="osmand_net_previously_installed">Инсталирана е предна версия на OsmAnd. Всички записани данни ще бъдат достъпни за новото приложение. Единствено записаните в любими места ще трябва да бъдат ре-импортирани.</string>
 	<string name="build_installed">Версия {0} беше успешно инсталирана ({1}).</string>
 	<string name="downloading_build">Сваляне на версия…</string>
-	<string name="install_selected_build">Искате ли да инсталирате OsmAnd - {0} from {1} {2} MB ?</string>
+	<string name="install_selected_build">Искате ли да инсталирате OsmAnd - {0} от {1} {2} МБ?</string>
 	<string name="loading_builds_failed">Свалянето на списъка с версиите на OsmAnd се провали</string>
 	<string name="loading_builds">Зареждане на списъка с версиите на OsmAnd…</string>
 	<string name="select_build_to_install">Изберете версия на OsmAnd за инсталиране</string>
@@ -1039,7 +1039,7 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="none_region_found">На SD картата няма данни за този район. Свалете от интернет.</string>
 	<string name="poi_namefinder_query_empty">Въведете израз за търсене на забележителност</string>
 	<string name="any_poi">Всички</string>
-	<string name="layer_transport_route">Маршрут на транспорта</string>
+	<string name="layer_transport_route">Маршрут на общ.транспорт</string>
 	<string name="thanks_yandex_traffic">Информацията за трафика е любезно предоставена от Яндекс.</string>
 	<string name="layer_yandex_traffic">Яндекс трафик</string>
 	<string name="layer_route">Маршрут</string>
@@ -1062,13 +1062,13 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="gps_provider">GPS</string>
 	<string name="int_seconds">сек</string>
 	<string name="int_min">мин</string>
-	<string name="background_service_int_descr">Настройване на интервала за събуждане ползван при спящ режим</string>
+	<string name="background_service_int_descr">Настройване на интервала за събуждане при фонов режим</string>
 	<string name="background_service_int">Интервал за събуждане на GPS</string>
-	<string name="background_service_provider_descr">Избор на доставчик на позиция за ползване в спящ режим</string>
+	<string name="background_service_provider_descr">Избор на доставчик на позиция за ползване в фонов режим</string>
 	<string name="background_service_provider">Доставчик на позиция</string>
 	<string name="background_router_service_descr">Стартира OsmAnd във фонов режим за запис на пътуването при изключен екран</string>
-	<string name="background_router_service">Работа при изключен екран</string>
-	<string name="off_router_service_no_gps_available">Навигацията в спящ режим изисква да бъде посочен доставчик на позиция.</string>
+	<string name="background_router_service">Работа на OsmAnd във фонов режим</string>
+	<string name="off_router_service_no_gps_available">Навигацията във фонов режим изисква да бъде включено определянето на мястото.</string>
 	<string name="hide_poi_filter">Скрий филтъра</string>
 	<string name="show_poi_filter">Покажи филтъра</string>
 	<string name="search_poi_filter">Филтър</string>
@@ -1144,7 +1144,7 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="search_online_address">Търсене онлайн</string>
 	<string name="max_level_download_tile">Максимален мащаб при онлайн</string>
 	<string name="max_level_download_tile_descr">Изберете максимален мащаб за сваляне на онлайн картни фрагменти</string>
-	<string name="route_general_information">Дистанция: %1$s,\nвреме: %2$d ч. %3$d мин.</string>
+	<string name="route_general_information">Дистанция: %1$s,\nВреме до целта: %2$d ч. %3$d мин.</string>
 	<string name="router_service_descr">Изберете онлайн или офлайн услуга за навигация</string>
 	<string name="router_service">Услуга за навигация</string>
 	<string name="sd_dir_not_accessible">Папката за запис на SD картата не е достъпна!</string>
@@ -1348,7 +1348,7 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="av_photo_play_sound_descr">Възпроизвеждане на звук или мелодия при снимане</string>
 <string name="announce_gpx_waypoints">GPX точки</string>
     <string name="speak_title">Обявяване…</string>
-	<string name="speak_street_names">Обявяване на имена на улици (синтезиран глас)</string>
+	<string name="speak_street_names">Имена на улици (синтезиран глас)</string>
         
     
     <string name="use_kalman_filter_compass">Използване на филтър на Kalman</string>
@@ -1389,15 +1389,15 @@ OsmAnd е с отворен код и активно да се развива.
     <string name="shared_string_remember_my_choice">Запомни моя избор</string>
     
     <string name="auto_zoom_none">Без автоматичен зуум</string>
-	<string name="auto_zoom_close">Приближаване</string>
-	<string name="auto_zoom_far">Среден мащаб</string>
-	<string name="auto_zoom_farthest">Отдалечаване</string>
-	<string name="map_magnifier">Лупа</string>
+	<string name="auto_zoom_close">По-едър план</string>
+	<string name="auto_zoom_far">Нормално</string>
+	<string name="auto_zoom_farthest">За далечни разстояния</string>
+	<string name="map_magnifier">Лупа за картата</string>
 	<string name="local_osm_changes_delete_all_confirm">Ще изтриете %1$d промени в картата OSM. Сигурни ли сте?</string>
     
 	
     <string name="local_index_tile_data_expire">Изтича след %1$s минути</string>
-    <string name="local_index_tile_data_downloadable">Свалими: %1$s</string>
+    <string name="local_index_tile_data_downloadable">Разрешени за теглене: %1$s</string>
     <string name="local_index_tile_data_maxzoom">Максимален мащаб: %1$s</string>
     <string name="local_index_tile_data_minzoom">Минимален мащаб: %1$s</string>
     <string name="local_index_tile_data_zooms">Заредени мащаби: %1$s</string>
@@ -1616,7 +1616,7 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="show_railway_warnings">Покажи ЖП прелези</string>
 	<string name="show_pedestrian_warnings">Покажи пешеходни пътеки</string>
     <string name="osmo_show_group_notifications">Покажи групови известия</string>
-    <string name="osmo_show_group_notifications_descr">Показвай, когато потребителят се включва или напуска група</string>
+    <string name="osmo_show_group_notifications_descr">Показване на съобщение, когато потребител се включва или напуска групата</string>
     <string name="rendering_attr_streetLighting_name">Улично осветление</string>
     <string name="osmo_activity">Наблюдение на OpenStreetMap</string>
     <string name="rendering_attr_roadStyle_name">Оцветяване на пътищата</string>
@@ -1768,7 +1768,7 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="import_file_favourites">Запис като GPX файл или внасяне в \'Любими места\'?</string>
 	<string name="voices">Гласови напътствия</string>
 	<string name="color_red">червен</string>
-	<string name="color_pink">розов</string>
+	<string name="rendering_value_pink_name">розов</string>
 	<string name="speed_limit_exceed">Толеранс за скоростта</string>
 	<string name="delay_navigation_start">Автоматично стартиране на напътствията</string>
     <string name="gpx_info_waypoints">"Точки: %1$s "</string>
@@ -1803,7 +1803,7 @@ OsmAnd е с отворен код и активно да се развива.
     <string name="osmo_use_server_name">Регистрирано име</string>
     <string name="osmo_connect_to_my_nickname">Моят псевдоним</string>
     <string name="osmo_user_name">Потребител</string>
-	<string name="color_brown">кафяв</string>
+	<string name="rendering_value_brown_name">кафяв</string>
 	<string name="color_yellow">жълт</string>
 	<string name="color_lightblue">светло синьо</string>
 	<string name="color_blue">синьо</string>
@@ -1919,8 +1919,8 @@ OsmAnd е с отворен код и активно да се развива.
 	<string name="lang_sr">Сръбски</string>
 	<string name="lang_es">Испански</string>
 	<string name="lang_tr">Турски</string>
-	<string name="routing_attr_height_name">Максимална височина</string>
-	<string name="routing_attr_height_description">Определете максимално допустимата височи на средството за пътя</string>
+	<string name="routing_attr_height_name">Ограничение по височина</string>
+	<string name="routing_attr_height_description">Въведете височина на МПС (за камиони и извън-габаритни товари)</string>
     <string name="download_wikipedia_maps">Wikipedia</string>
     <string name="do_you_like_osmand">Харесвате ли OsmAnd?</string>
 	<string name="rate_this_app">Оценете приложението</string>
@@ -1931,37 +1931,37 @@ OsmAnd е с отворен код и активно да се развива.
     <string name="restart_is_required">Приложението трябва да бъде рестартирано за да бъдат приложени всички промени.</string>
     <string name="osmo_settings_debug">Дебъг информация</string>
     <string name="voice_pref_title">Глас</string>
-    <string name="always_center_position_on_map">Винаги показвай позицията вцентъра</string>
-    <string name="lang_pt_br">португалски (Бразилия)</string>
-    <string name="lang_af">африканс</string>
-	<string name="lang_eu">баски</string>
-	<string name="lang_be">беларуски</string>
-	<string name="lang_bs">босненски</string>
-	<string name="lang_ca">каталански</string>
-	<string name="lang_hr">хърватски</string>
-	<string name="lang_da">датски</string>
-	<string name="lang_nl">нидерландски</string>
-	<string name="lang_fi">фински</string>
-	<string name="lang_ka">грузински</string>
-	<string name="lang_iw">иврит</string>
-	<string name="lang_hu">унгарски</string>
-	<string name="lang_ko">корейски</string>
-	<string name="lang_id">индонезийски</string>
-	<string name="lang_hi">хинди</string>
-	<string name="lang_lv">латвийски</string>
+    <string name="always_center_position_on_map">Винаги показвай позицията в центъра</string>
+    <string name="lang_pt_br">Португалски (Бразилия)</string>
+    <string name="lang_af">Африканс</string>
+	<string name="lang_eu">Баски</string>
+	<string name="lang_be">Беларуски</string>
+	<string name="lang_bs">Босненски</string>
+	<string name="lang_ca">Каталунски</string>
+	<string name="lang_hr">Хърватски</string>
+	<string name="lang_da">Датски</string>
+	<string name="lang_nl">Холандски</string>
+	<string name="lang_fi">Финландски</string>
+	<string name="lang_ka">Грузински</string>
+	<string name="lang_iw">Иврит</string>
+	<string name="lang_hu">Унгарски</string>
+	<string name="lang_ko">Корейски</string>
+	<string name="lang_id">Индонезийски</string>
+	<string name="lang_hi">Хинди</string>
+	<string name="lang_lv">Латвийски</string>
 	<string name="lang_lt">литовски</string>
 	<string name="lang_mr">маратхи</string>
-	<string name="lang_no">норвежки</string>
-	<string name="lang_fa">персийски</string>
-	<string name="lang_pl">полски</string>
-	<string name="lang_pt">португалски</string>
-	<string name="lang_sc">сардински</string>
-	<string name="lang_zh_CN">опростен китайски</string>
-	<string name="lang_sk">словашки</string>
-	<string name="lang_sl">словенски</string>
-	<string name="lang_sv">шведски</string>
-	<string name="lang_uk">украински</string>
-	<string name="lang_zh_TW">традиционен китайски</string>
+	<string name="lang_no">Норвежки</string>
+	<string name="lang_fa">Персийски</string>
+	<string name="lang_pl">Полски</string>
+	<string name="lang_pt">Португалски</string>
+	<string name="lang_sc">Сардински</string>
+	<string name="lang_zh_CN">Китайски (опростен)</string>
+	<string name="lang_sk">Словашки</string>
+	<string name="lang_sl">Словенски</string>
+	<string name="lang_sv">Шведски</string>
+	<string name="lang_uk">Украински</string>
+	<string name="lang_zh_TW">Китайски (традиционен)</string>
 	<string name="error_message_pattern">Грешка: {0}</string>
 	<string name="app_name_osmand">OsmAnd</string>
 	
@@ -1999,8 +1999,8 @@ OsmAnd е с отворен код и активно да се развива.
     <string name="srtm_plugin_disabled">Контурните линии са изключени</string>
     <string name="favorite_category_add_new">Добавяне на нов</string>
     <string name="favorite_category_select">Изберете категория</string>
-    <string name="default_speed_system_descr">Определяне на системата за измерване на скоростта</string>
-    <string name="default_speed_system">Измерване скоростта</string>
+    <string name="default_speed_system_descr">Изберете мерна единица за скоростта (км/ч, м/с, ...)</string>
+    <string name="default_speed_system">Мерна единица за скоростта</string>
     <string name="nm">nm</string>
     <string name="si_nm">Морски мили</string>
     <string name="si_kmh">Км в час</string>
@@ -2023,7 +2023,8 @@ OsmAnd е с отворен код и активно да се развива.
     <string name="favourites_edit_dialog_title">Предпочитана информация</string>
     <string name="show_on_start">Да се показва при стартиране</string>
     <string name="copied_to_clipboard">Копирано</string>
-    <string name="release_2_2">" • Нов контекстно-ориентиран интерфейс\n\n • При стартиране на приложението се извежда картата, освен ако не е избрано  \'Показване на таблото при стартиране\'\n\n • Настройване на контролите върху таблото за управление\n\n • Пропускане на таблото, ако предпочитате приложение с меню\n\n • To download maps, regions can be directly selected by tapping on the world map\n\n • POI Search now supports more specific queries\n\n • Improved POI and OSM editing functionality\n\n • Map data download structure and interface reworked\n\n и още... "</string>
+    <string name="release_2_2">" • Нов контекстно-ориентиран интерфейс\n\n • При стартиране на приложението се извежда картата, освен ако не е избрано  \'Показване на таблото при стартиране\'\n\n • Настройване на контролите върху таблото за управление\n\n • Пропускане на таблото, ако предпочитате приложение с меню\n\n • За сваляне на карти, регионите могат да бъдат директно избирани чрез докосване на световната карта\n\n • Търсенето на POI сега може да стане с подробни заявки\n\n • Подобрено редактиране на  POI и OSM\n\n • Преработен е интерфейса и свалянето на карти
+\n\n и още... "</string>
     <string name="osm_save_offline">Запази офлайн</string>
     <string name="osm_edit_modified_poi">Модифицирани OSM POI</string>
     <string name="osm_edit_deleted_poi">Изтрити OSM POI</string>
@@ -2123,4 +2124,87 @@ OsmAnd е с отворен код и активно да се развива.
     <string name="features_menu_group">Функции</string>
     <string name="osmo_session_id_share">URL сесия за проследяване на устройството (%1$s)</string>
     <string name="osmo_auto_send_locations">Автоматично стартиране на трекер сесия</string>
-    </resources>
+    <string name="later">По-късно</string>
+    <string name="begin_with_osmand_menu_group">Първи стъпки с OsmAnd</string>
+    <string name="new_version">Нова версия</string>
+    <string name="enter_country_name">Въведете име на държава</string>
+    <string name="application_dir_description">Изберете къде искате да запазите файловете с карти.</string>
+    
+    <string name="update_all">Актуализиране на всички (%1$s МБ)</string>
+    <string name="free_downloads_used">Използвани безплатни сваляния</string>
+    <string name="file_size_in_mb">%.1f МБ</string>
+    <string name="value_downloaded_of_max">%1$.1f от %2$.1f МБ</string>
+    <string name="confirm_download_roadmaps">Сигурни ли сте, че искате да изтеглите карта само с пътища, въпреки че вече имате стандартната карта?</string>
+    <string name="downloads">Изтегляния</string>
+    <string name="get_full_version">Пълна версия</string>
+    <string name="activate_srtm_plugin">Моля, активирайте добавката SRTM</string>
+    <string name="activate_seamarks_plugin">Моля, активирайте добавката за морски карти</string>
+    <string name="buy">Купи</string>
+    <string name="downloading_number_of_files">Изтегляне - %1$d файла</string>
+    <string name="roads">Пътища</string>
+    <string name="downloads_left_template">Остават %1$s изтегляния</string>
+	<string name="are_you_sure">Сигурни ли сте?</string>
+	<string name="count_of_lines">Брой редове</string>
+	<string name="show_gpx">Покажи GPX</string>
+	<string name="saved_at_time">Успешно записано в: %1$s</string>
+	<string name="please_specify_poi_type">Задайте тип на POI.</string>
+	<string name="recent_places">Последни места</string>
+	<string name="osmo_conn_successfull">"Установена връзка: %1$s "</string>
+    <string name="osmo_io_error">"Проблем с връзката към OsMo: "</string>
+    <string name="osmo_settings_uuid">Уникално ID на устройство</string>
+    <string name="use_points_as_intermediates">Изчисляване на маршрут между точки</string>
+    <string name="osmo_mode_restart">Рестартиране на OsMo сесия</string>
+    <string name="osmo_mode_on">Спиране на OsMo сесия</string>
+    <string name="osmo_mode_off">Стартиране на OsMo сесия</string>
+    <string name="route_descr_destination">Крайна цел</string>
+    <string name="rendering_attr_alpineHiking_name">Скала на Алпийски туризъм (SAC)</string>
+    <string name="rendering_attr_alpineHiking_description">Оцветяване на пътеките по скалата на SAC</string>
+    <string name="rendering_attr_hikingRoutesOSMC_name">Наслагване на туристически символи</string>
+    <string name="interrupt_music_descr">Прекъсване на музиката при гласово анонсиране</string>
+	<string name="interrupt_music">Прекъсване на музика</string>
+	<string name="share_route_as_gpx">Споделете маршрута като GPX файл</string>
+	<string name="share_route_subject">Маршрутът беше споделен като GPX файл</string>
+	<string name="arrival_distance_factor_early">По-рано</string>
+    <string name="arrival_distance_factor_normally">Нормално</string>
+    <string name="arrival_distance_factor_late">По-късно</string>
+    <string name="arrival_distance_factor_at_last">В последните метри</string>
+    <string name="arrival_distance">Обявяване при пристигане</string>
+    <string name="arrival_distance_descr">По кое време желаете да се обяви пристигането?</string>
+    <string name="add_opening_hours">Добавяне на работно време</string>
+	<string name="contact_info">За контакти</string>
+	<string name="closing_at">Затваря в</string>
+	<string name="opening_at">Отваря в</string>
+	<string name="next_proceed">Следващ</string>
+	<string name="building_number">Номер на сграда</string>
+	<string name="tab_title_advanced">Разширени</string>
+	<string name="tab_title_basic">Основни</string>
+	<string name="commit_poi">Изпрати POI</string>
+	<string name="offline_maps_and_navigation">Офлайн карти\n &amp; навигация</string>
+	<string name="shared_string_skip">Пропусни</string>
+	<string name="shared_string_undo">ОТМЕНИ</string>
+	<string name="shared_string_card_was_hidden">Картата беше скрита</string>
+	<string name="dahboard_options_dialog_title">Табло за управление</string>
+	
+	<string name="successfully_uploaded_pattern">Успешно качено {0}/{1}</string>
+	<string name="delete_change">Изтриване на промяната</string>
+	<string name="failed_to_upload">Неуспешно качване</string>
+	<string name="use_fast_recalculation">Преизчисляване на маршрута</string>
+	<string name="poi_dialog_reopen">Повторно отваряне</string>
+	<string name="poi_action_delete">изтриване</string>
+	<string name="favourites_context_menu_add">Добавяне на любим</string>
+	<string name="plugin_ski_descr">"Тази добавка за OsmAnd показва ски писти, алпийски маршрути, кабинкови лифтове и ски лифтове. Маршрутите и пистите са оцветени съобразно тяхната трудност. Можете да ползвате специален картен стил \"Зима\", който оцветява пейзажа в съответните цветове.
+\n\nТози стил може да бъде деактивиран го отново от тук, или чрез промяна на \"Стил на картата\" в \"Настройки на картата\". "</string>
+	<string name="osmo_session_not_available">Сесията не е налична, проверете, че \"Изпращане на места\" е включено.</string>
+    <string name="copying_osmand_one_file_descr">Копиране на файл (%s) на новата дестинация…</string>
+    <string name="copying_osmand_files_descr">Копиране на файлове с данни на OsmAnd към ново местоназначение (%s)…</string>
+    <string name="calculate_osmand_route_gpx">Изчисляване OsmAnd офлайн маршрут</string>
+    <string name="poi_context_menu_modify_osm_change">Промяна на OSM редакцията</string>
+    <string name="show_free_version_banner_description">Дори ако имате платена версия, можете да видите банера на безплатната версия</string>
+    <string name="show_free_version_banner">Покажи банера на безплатната версия</string>
+    <string name="unsaved_changes_will_be_lost">Всички незаписани промени ще бъдат загубени. Ще продължите ли?</string>
+	<string name="poi_deleted_localy">POI ще бъдат изтрити, след като качите Вашите промени</string>
+	<string name="user_hates_app_get_feedback_long">Моля, кажете ни какви промени искате в това приложение.</string>
+	<string name="we_really_care_about_your_opinion">Вашето мнение е важно за нас.</string>
+	<string name="use_fast_recalculation_desc">Преизчисляване само началната част от дълги маршрути</string>
+	<string name="create_poi_link_to_osm_doc"><u>Онлайн OSM</u> класификация на картите с изображения</string>
+	</resources>

OsmAnd/res/values-ca/phrases.xml

@@ -1999,4 +1999,5 @@
 	<string name="poi_historic_period_old_kingdom">Període històric: antic regnat (2686-2181 aC)</string>
 	<string name="poi_historic_period_first_intermediate_period">Període històric: primer període intermedi (2181-2055 aC)</string>
 	<string name="poi_historic_period_second_intermediate_period">Període històric: segon període intermedi (1650 – 1550 aC)</string>
+	<string name="poi_clothes_socks">Mitjons</string>
 	</resources>

OsmAnd/res/values-ca/strings.xml

@@ -1247,9 +1247,9 @@
     <string name="osmo_connect_to_my_nickname">El vostre àlies</string>
     <string name="osmo_user_name">Usuari</string>
     <string name="color_red">vermell</string>
-    <string name="color_pink">rosa</string>
+    <string name="rendering_value_pink_name">rosa</string>
     <string name="color_orange">taronja</string>
-    <string name="color_brown">marró</string>
+    <string name="rendering_value_brown_name">marró</string>
     <string name="color_yellow">groc</string>
     <string name="color_lightblue">blau clar</string>
     <string name="color_blue">blau</string>

OsmAnd/res/values-cs/strings.xml

@@ -1175,9 +1175,9 @@
     <string name="use_points_as_intermediates">Vypočítat trasu mezi body</string>
     <string name="osmo_plugin_description">"Tento modul poskytuje funkcionalitu pro takzvané OsMo pokročilé živé sledování, podívejte se na http://osmo.mobi.\n\nMůžete sledovat všechna zařízení spolupracující skupiny v reálném čase a vzájemně spolu komunikovat. Jsou dostupné různé možnosti nastavení krátkodobého nebo trvalého sledování.\n\nAnonymní skupiny lze vytvářet spontáně na určený počet dní a jsou omezené na vybrané funkce, nemají například dálkové ovládání a skupinového správce. Plně funkční skupiny se vytvářejí na webové stránce a jsou přístupné pouze pro registrované uživatele. "</string>
     <string name="color_red">červená</string>
-    <string name="color_pink">růžová</string>
+    <string name="rendering_value_pink_name">růžová</string>
     <string name="color_orange">oranžová</string>
-    <string name="color_brown">hnědá</string>
+    <string name="rendering_value_brown_name">hnědá</string>
     <string name="color_yellow">žlutá</string>
     <string name="color_lightblue">světle modrá</string>
     <string name="color_blue">modrá</string>
@@ -1771,7 +1771,7 @@
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Aktualizovat vše (%1$s MB)</string>
     <string name="free_downloads_used">Použito volných stáhnutí</string>
-    <string name="free_downloads_used_description">Můžete nastavit, kolik volných stáhnutí jste použili</string>
+    <string name="free_downloads_used_description">Zobrazuje počet využitých volných stáhnutí</string>
     <string name="simulate_initial_startup">Simulovat první start aplikace</string>
     <string name="share_geo">geo:</string>
     <string name="share_menu_location">Sdílet polohu</string>
@@ -1858,4 +1858,7 @@
     <string name="use_drawer_btn">Použít menu</string>
     <string name="dashboard_or_drawer_title">Domovská obrazovka nebo menu</string>
     <string name="dashboard_or_drawer_description">Je zde nová možnost výběru ovládání aplikace přes flexibilní domovskou obrazovku nebo statické menu. Váš výběr může být vždy změněn v nastavení domovské obrazovky.</string>
-</resources>
+<string name="routing_attr_avoid_stairs_name">Vyhnout se schodům</string>
+	<string name="routing_attr_avoid_stairs_description">Vyhnout se schodům</string>
+	<string name="routing_attr_avoid_borders_name">Vyhnout se hraničním přechodům</string>
+	</resources>

OsmAnd/res/values-da/strings.xml

@@ -1386,13 +1386,13 @@
 
     <string name="import_file_favourites">Gem punkter som en GPX-fil eller importer dem til favoritter?</string>
 
-    <string name="color_red">rød</string>
-    <string name="color_pink">lyserød</string>
-    <string name="color_orange">orange</string>
-    <string name="color_brown">brun</string>
-    <string name="color_yellow">gul</string>
-    <string name="color_lightblue">lyseblå</string>
-    <string name="color_blue">blå</string>
+    <string name="color_red">Rød</string>
+    <string name="rendering_value_pink_name">Lyserød</string>
+    <string name="color_orange">Orange</string>
+    <string name="rendering_value_brown_name">Brun</string>
+    <string name="color_yellow">Gul</string>
+    <string name="color_lightblue">Lyseblå</string>
+    <string name="color_blue">Blå</string>
 
 
     <string name="osmo_edit_device">Ændre brugeregenskaber</string>
@@ -1408,7 +1408,7 @@
     <string name="osmo_use_server_name">Registreret navn</string>
     <string name="osmo_connect_to_my_nickname">Kaldenavn</string>
     <string name="osmo_user_name">Bruger</string>
-    <string name="color_green">grøn</string>
+    <string name="color_green">Grøn</string>
 
     <string name="osmo_follow">Følg</string>
     <string name="osmo_show_group_notifications">Vis gruppemeddelelser</string>
@@ -2109,8 +2109,10 @@
     <string name="use_drawer_btn">Brug menuen</string>
     <string name="access_from_map_description">Menuknappen viser betjeningspanel, ikke menuen</string>
     <string name="access_from_map">Adgang fra kort</string>
-    <string name="please_specify_poi_type_only_from_list">"Angiv korrekt IP type eller spring over. "</string>
+    <string name="please_specify_poi_type_only_from_list">"Angiv en korrekt IP type eller spring over. "</string>
     <string name="routing_attr_avoid_stairs_name">Undgå trapper</string>
 	<string name="routing_attr_avoid_stairs_description">Undgå trapper</string>
 	<string name="routing_attr_avoid_borders_name">Undgå grænseovergang</string>
+	<string name="color_lightgreen">Lysegrøn</string>
+	<string name="color_purple">Lilla</string>
 	</resources>

OsmAnd/res/values-de/strings.xml

@@ -1583,23 +1583,16 @@ Liste der Unterstützten Länder (annähernd Weltweit!):
 Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua and Barbuda, Äquatorialguinea, Arabische Republik Sahara, Argentinien, Armenien, Aruba, Aserbaidschan, Äthiopien, Australien, Bahamas, Bahrain, Bangladesch, Barbados, Belgien, Belize, Benin, Bermuda, Bhutan, Bolivien, Bonaire, Bosnien und Herzegowina, Botswana, Brasilien, Brunei, Bulgarien, Burkina Faso, Burundi, Chile, China, Costa Rica, Curaçao, Dänemark, Deutschland, Dominica, Dominikanische Republik, Dschibuti, Ecuador, El Salvador, Elfenbeinküste, Eritrea, Estland, Fidschi, Finnland, Frankreich, Französisch-Guayana, Französisch-Polynesien, Gabun, Gambia, Georgien, Ghana, Gibraltar, Grenada, Griechenland, Grönland, Großbritannien, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Honduras, Hong Kong, Indien, Indonesien, Insel Man, Irak, Iran, Irland, Island, Israel, Italien, Jamaika, Japan, Jemen, Jersey, Jordanien, Jungferninseln, Kambodscha, Kamerun, Kanada, Kap Verde, Kasastan, Katar, Kenia, Kirgistan, Kiribati, Kolumbien, Komoren, Kongo, Kroatien, Kuba, Kuwait, Laos, Lesotho, Lettland, Libanon, Liberia, Libyen, Liechtenstein, Litauen, Luxemburg, Macao, Madagaskar, Malawi, Malaysia, Malediven, Mali, Malta, Marokko, Martinique, Mauretanien, Mauritius, Mayotte, Mazedonien, Mexiko, Mikronesien, Moldau, Monaco, Mongolei, Montenegro, Montserrat, Mosambik, Myanmar, Namibia, Nauru, Nepal, Neukaledonien, Neuseeland, Nicaragua, Niederlande, Niederländische Antillen, Niger, Nigeria, Nordkorea, Norwegen, Oman, Österreich, Osttimor, Pakistan, Palau, Palästinensische Autonomiegebiete, Panama, Papua-Neuguinea, Paraquay, Peru, Philippinen, Polen, Portugal, Puerto Rico, Ruanda, Rumänien, Russland, Saint-Barthélemy, Saint Helena, Saint Helena, Ascension und Tristan da Cunha, Saint Kitts und Nevis, Saint Lucia, Saint Martin, Saint-Pierre und Miquelon, Saint Vincent und die Grenadinen, Sambia, Samoa, San Marino, Saudi Arabien, Schweden, Schweiz, Senegal, Serbien, Seychellen, Sierra Leona Singapur, Simbabwe, Slovakei, Slowenien, Somalia, Spanien, Sri Lanka, Südafrika, Sudan, Südgeorgien, Südkorea, Südsudan, Suriname, Swasiland, Syrien, Taiwan, Tadschikistan, Tansania, Thailand, Togo, Trinidad und Tobago, Tschad, Tschechische Republik, Tunesien, Türkei, Turkmenistan, Tuvalu, Uganda, Ukraine, Ungarn, Uruguay, Usbekistan, Vanuatu, Vatikan, Venezuela, Vereinigte Arabische Emirate, Vereinigte Staaten von Amerika, Vietnam, Wallis und Futuna, Weißrussland, Zentralafrikanische Republik, Zypern.
 	</string>
 
-	<string name="color_blue">Blau</string>
-	<string name="color_brown">Braun</string>
+	<string name="color_red">Rot</string>
+	<string name="color_orange">Orange</string>
+	<string name="color_yellow">Gelb</string>
+	<string name="color_lightgreen">Hellgrün</string>
 	<string name="color_green">Grün</string>
 	<string name="color_lightblue">Hellblau</string>
-	<string name="color_orange">Orange</string>
-	<string name="color_pink">Pink</string>
-	<string name="color_red">Rot</string>
-	<string name="color_yellow">Gelb</string>
-
-	
-	
-	
-	
-	
-	
-	
-	
+	<string name="color_blue">Blau</string>
+	<string name="color_purple">Lila</string>
+	<string name="rendering_value_pink_name">Pink</string>
+	<string name="rendering_value_brown_name">Braun</string>
 
 	<string name="osmo_settings_uuid">Geräte-ID</string>
 	<string name="osmo_settings_descr">Konfigurieren der Überwachungs-Einstellungen und des persönlichen Überwachungs-Kanals</string>
@@ -1783,7 +1776,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="shared_string_show_all">ALLE ZEIGEN</string>
     <string name="coordinates">Koordinaten</string>
     <string name="error_avoid_specific_road">Es konnte keine alternative Streckenführung gefunden werden</string>
-    <string name="shared_string_dismiss">Ablehnen</string>
+    <string name="shared_string_dismiss">Verwerfen</string>
     <string name="everything_up_to_date">Alle Daten aktuell</string>
     <string name="use_opengl_render">OpenGL-Rendering verwenden</string>
     <string name="use_opengl_render_descr">Hardware beschleunigtes OpenGL-Rendering verwenden (Funktioniert nicht auf allen Geräten)</string>
@@ -2025,10 +2018,10 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="rendering_value_walkingRoutesScopeOSMC_name">Einfärbung gemäß Routenbereich</string>
     <string name="rendering_value_walkingRoutesOSMC_name">Routenfarbe gemäß OSMC</string>
     <string name="do_you_like_osmand">Gefällt Ihnen OsmAnd?</string>
-	<string name="rate_this_app">Bewerten Sie diese App</string>
-	<string name="rate_this_app_long">Bitte bewerten Sie OsmAnd auf Google Play</string>
-	<string name="user_hates_app_get_feedback">Sagen Sie uns warum.</string>
-	<string name="user_hates_app_get_feedback_long">Bitte teilen Sie uns mit, was Sie an dieser App ändern würden.</string>
+	<string name="rate_this_app">Bewerte diese App</string>
+	<string name="rate_this_app_long">Bitte gib OsmAnd eine Bewertung auf Google Play</string>
+	<string name="user_hates_app_get_feedback">Erzähle uns warum.</string>
+	<string name="user_hates_app_get_feedback_long">Bitte erzähle uns, was du gerne an dieser App ändern würdest.</string>
 
 	<string name="no_updates_available">Keine Aktualisierungen verfügbar</string>
     <string name="download_live_updates">Live-Aktualisierungen</string>
@@ -2111,11 +2104,11 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="m_s">m/s</string>
     <string name="shared_string_trip_recording">Streckenaufzeichnung</string>
     <string name="osmand_running_in_background">Hintergrundbetrieb</string>
-    <string name="favourites_edit_dialog_title">Favoriten-Information</string>
+    <string name="favourites_edit_dialog_title">Favoriten Informationen</string>
     <string name="simulate_your_location_stop_descr">Stoppen der Positions-Simulation</string>
     <string name="simulate_your_location_descr">Simulieren durch eine berechnete Route oder einer aufgezeichneten GPX-Spur</string>
     <string name="recent_places">Letzte Orte</string>
-	<string name="saved_at_time">Erfolgreich gespeichert unter: %1$s</string>
+	<string name="saved_at_time">Erfolgreich gespeichert um: %1$s</string>
 	<string name="count_of_lines">Anzahl der Reihen</string>
 	<string name="buy">ERWERBEN</string>
     <string name="later">Später</string>
@@ -2170,7 +2163,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
 	<string name="tab_title_basic">Basis</string>
 	<string name="tab_title_advanced">Fortgeschritten</string>
 	<string name="contact_info">Kontakt-Informationen</string>
-	<string name="poi_dialog_poi_type">Art-des POI</string>
+	<string name="poi_dialog_poi_type">Art des POI</string>
 	<string name="number_of_rows_in_dash">Anzahl der Zeilen im Dashboard %1$s</string>
 	<string name="downloads_left_template">%1$s Downloads übrig</string>
 	<string name="downloading_number_of_files">Herunterladen - %1$d Datei</string>

OsmAnd/res/values-el/strings.xml

@@ -1185,9 +1185,9 @@
 	<string name="gpx_info_maximum_speed">Μέγιστη ταχύτητα: %1$s </string>
 	<string name="gpx_info_avg_altitude">Μέσο υψόμετρο: %1$s</string>
     <string name="color_red">κόκκινο</string>
-	<string name="color_pink">ροζ</string>
+	<string name="rendering_value_pink_name">ροζ</string>
 	<string name="color_orange">πορτοκαλί</string>
-	<string name="color_brown">καφέ</string>
+	<string name="rendering_value_brown_name">καφέ</string>
 	<string name="color_yellow">κίτρινο</string>
 	<string name="color_lightblue">γαλάζιο</string>
 	<string name="color_blue">μπλε</string>

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

@@ -158,7 +158,7 @@
 	<string name="poi_toll_booth">Peaje</string>
 	<string name="poi_border_control">Control fronterizo</string>
 	<string name="poi_traffic_calming_bump">Lomo de burro</string>
-	<string name="poi_traffic_calming_hump">Tope</string>
+	<string name="poi_traffic_calming_hump">Resalte</string>
 	<string name="poi_traffic_calming_cushion">Cojín</string>
 	<string name="poi_traffic_calming_chicane">Chicana</string>
 	<string name="poi_traffic_calming_rumble_strip">Banda sonora</string>

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

@@ -316,9 +316,9 @@
     <string name="color_blue">azul</string>
     <string name="color_lightblue">azul claro</string>
     <string name="color_yellow">amarillo</string>
-    <string name="color_brown">marrón</string>
+    <string name="rendering_value_brown_name">marrón</string>
     <string name="color_orange">anaranjado</string>
-    <string name="color_pink">rosa</string>
+    <string name="rendering_value_pink_name">rosa</string>
     <string name="color_red">rojo</string>
     <string name="osmo_user_name">Usuario</string>
     <string name="osmo_connect_to_my_nickname">Mi apodo</string>
@@ -599,8 +599,8 @@
     <string name="app_mode_aircraft">Avión</string>
     <string name="local_osm_changes_delete_all_confirm">Borrará %1$d cambio(s) OSM. ¿Estás seguro?</string>
     <string name="animate_routing_route_not_calculated">Primero calcule la ruta</string>
-    <string name="animate_routing_route">"Simular usando la ruta calculada "</string>
-    <string name="animate_routing_gpx">Simular usando traza GPX</string>
+    <string name="animate_routing_route">"Simular, usando la ruta calculada "</string>
+    <string name="animate_routing_gpx">Simular, usando la traza GPX</string>
     <string name="route_is_too_long">El cálculo de ruta sin conexión de OsmAnd, podría tardar mucho tiempo (o a veces no funcionar) para tramos mayores de 200km. Tal vez quieras añadir puntos de ruta intermedios para un mejor rendimiento.</string>
     <string name="auto_zoom_none">Sin ampliación automático</string>
     <string name="auto_zoom_close">Para corto alcance</string>
@@ -1904,14 +1904,14 @@
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Actualizar todo (%1$s MB)</string>
     <string name="free_downloads_used">Descargas gratis usadas</string>
-    <string name="free_downloads_used_description">Configure cuántas descargas gratis usará</string>
+    <string name="free_downloads_used_description">Muestra las descargas gratis utilizadas</string>
     <string name="simulate_initial_startup_descr">Muestra la pantalla del primer arranque y mantiene los demás ajustes sin cambios</string>
     <string name="simulate_initial_startup">Simular el arranque inicial</string>
     <string name="share_geo">geo:</string>
     <string name="share_menu_location">Compartir ubicación</string>
     <string name="shared_string_send">Enviar</string>
     <string name="application_dir_description">Elija donde guardar los archivos de los mapas.</string>
-    <string name="show_on_start_description">\'No\', inicia directamente la pantalla del mapa</string>
+    <string name="show_on_start_description">Si se desactiva, inicia directamente la pantalla del mapa</string>
     <string name="map_downloaded">Mapa descargado</string>
     <string name="map_downloaded_descr">Se descargó el mapa de %1$s. Vuelve al mapa para empezar a usarlo.</string>
     <string name="go_to_map">Ir al mapa</string>

OsmAnd/res/values-es/phrases.xml

@@ -114,7 +114,7 @@
 	<string name="poi_lift_gate">Barrera levadiza</string>
 	<string name="poi_toll_booth">Peaje</string>
 	<string name="poi_border_control">Control fronterizo</string>
-	<string name="poi_traffic_calming_bump">Protuberancia</string>
+	<string name="poi_traffic_calming_bump">Resalto (chico)</string>
 	<string name="poi_traffic_signals">Semáforo</string>
 
 	<string name="poi_car_repair">Taller mecánico</string>
@@ -447,7 +447,7 @@
 	<string name="poi_fire_flapper">Aleta de fuego</string>
 	<string name="poi_fire_water_pond">Estanque de agua contra incendios</string>
 	<string name="poi_ford">Vado</string>
-	<string name="poi_traffic_calming_hump">Tope</string>
+	<string name="poi_traffic_calming_hump">Resalto (grande)</string>
 	<string name="poi_traffic_calming_chicane">Chicana</string>
 	<string name="poi_traffic_calming_table">Peatonal elevada</string>
 	<string name="poi_fuel_hgv_diesel">Diésel de vehículos pesados</string>

OsmAnd/res/values-es/strings.xml

@@ -209,7 +209,7 @@
     <string name="shared_string_next">Siguiente</string>
     <string name="shared_string_previous">Anterior</string>
     <string name="unit_of_length_descr">Cambia las unidades de longitud y velocidad</string>
-    <string name="unit_of_length">Unidad de longitud</string>
+    <string name="unit_of_length">Unidad de medida</string>
     <string name="si_mi_foots">Millas/pies</string>
     <string name="si_mi_yard">Millas/yardas</string>
     <string name="si_km_m">Kilómetros/metros</string>
@@ -293,7 +293,7 @@
     <string name="shared_string_select_all">Marcar todo</string>
     <string name="shared_string_refresh">Actualizar</string>
     <string name="fast_route_mode">Ruta más rápida</string>
-    <string name="fast_route_mode_descr">"Habilitar para calcular la ruta más rápida o deshabilitar para la ruta más corta "</string>
+    <string name="fast_route_mode_descr">"Activar, para calcular la ruta más rápida o desactivar, para la ruta más corta "</string>
     <string name="tiles_to_download_estimated_size">En acercamiento {0} descarga {1} teselas ({2} MB)</string>
     <string name="shared_string_download_map">Descargar mapa</string>
     <string name="select_max_zoom_preload_area">Seleccione el acercamiento máximo para precargar</string>
@@ -524,7 +524,7 @@
     <string name="choose_city">Elija la ciudad</string>
     <string name="ChooseCountry">Elija el país</string>
     <string name="show_view_angle">Mostrar dirección de la vista</string>
-    <string name="map_view_3d_descr">Habilita visión 3D del mapa</string>
+    <string name="map_view_3d_descr">Activa la vista 3D del mapa</string>
     <string name="map_view_3d">Visión 3D del mapa</string>
     <string name="show_poi_over_map_description">Muestra el PDI sobre el mapa (utilizando el último filtro seleccionado)</string>
     <string name="show_poi_over_map">Mostrar PDI</string>
@@ -617,7 +617,7 @@
     <string name="unknown_from_location">Todavía no se determinó el punto de partida</string>
     <string name="confirm_interrupt_download">¿Quiere interrumpir la descarga de archivos?</string>
     <string name="basemap_was_selected_to_download">El Mapa Base (World Basemap) se necesita para el correcto funcionamiento de la aplicación y se seleccionó para su descarga.</string>
-    <string name="map_online_plugin_is_not_installed">Habilita el complemento mapas en línea para seleccionar diferentes fuentes de mapas</string>
+    <string name="map_online_plugin_is_not_installed">Activa el complemento «Mapas en línea», para seleccionar diferentes fuentes de mapas</string>
     <string name="map_online_data">Mapas en línea y teselas</string>
     <string name="map_online_data_descr">Usa mapas en línea (teselas descargadas y almacenadas localmente en la tarjeta SD)</string>
     <string name="shared_string_online_maps">Mapas en línea</string>
@@ -625,8 +625,8 @@
     <string name="osmand_rastermaps_plugin_description">"Con este complemento puede acceder a muchos tipos de mapas en línea (llamados de teselas o ráster), desde teselas de OpenStreetMap predefinidas (como Mapnik) a imágenes de satélite y capas de propósito especial como mapas del tiempo, mapas del clima, mapas geológicos, capas de sombreado, etc.
 \n\nCualquiera de estos mapas se puede utilizar como el mapa (base) principal, que se mostrará en la pantalla del mapa de OsmAnd, o como una superposición o subyacente de otro mapa base (como los mapas estándares en línea de OsmAnd). Para hacer cualquier mapa subyacente más visible, ciertos elementos de los mapas vectoriales de OsmAnd, se pueden ocultar fácilmente a través del menú \'Configurar mapa\' cuando desee.
 \n\nLas teselas de mapas, se pueden obtener directamente a través de fuentes en línea o pueden prepararse para su uso sin conexión (y copiarse manualmente en la carpeta de datos de OsmAnd) como una base de datos SQLite, que puede ser producida por una variedad de herramientas de preparación de mapas de terceros. "</string>
-    <string name="osmand_background_plugin_description">Muestra los ajustes para habilitar el seguimiento y la navegación en segundo plano (pantalla apagada) activando periódicamente el dispositivo GPS.</string>
-    <string name="osmand_accessibility_description">Este complemento habilita las características de accesibilidad del dispositivo directamente en OsmAnd.
+    <string name="osmand_background_plugin_description">Muestra los ajustes para activar el seguimiento y la navegación en segundo plano (pantalla apagada) activando periódicamente el dispositivo GPS.</string>
+    <string name="osmand_accessibility_description">Este complemento activa las características de accesibilidad del dispositivo directamente en OsmAnd.
 \n\nFacilita, por ejemplo, el ajuste de la velocidad de la voz para voces TTS, la configuración de navegación de pantalla con el panel direccional, utilizando la bola de desplazamiento para el control del acercamiento, el uso de comentarios para la conversión de texto a voz, o para el anuncio automático de su posición.</string>
     <string name="osmand_development_plugin_description">Este complemento muestra los ajustes de características de desarrollo y depuración para probar la simulación de rutas, el rendimiento del renderizado en pantalla, o los avisos de voz.
 \n\nEstos ajustes están destinados para los desarrolladores y no son necesarios para el usuario general.</string>
@@ -849,9 +849,9 @@
     <string name="no_route">Sin ruta</string>
     <string name="delete_target_point">Quitar punto de ruta</string>
     <string name="intermediate_point">Punto de ruta %1$s</string>
-    <string name="gps_not_available">Habilite el GPS en los ajustes</string>
+    <string name="gps_not_available">Active el GPS en los ajustes</string>
     <string name="map_widget_show_destination_arrow">Mostrar dirección de destino</string>
-    <string name="enable_plugin_monitoring_services">Habilita el complemento de grabación de viajes para que use el servicio de registro de posición (registro GPX, seguimiento en línea)</string>
+    <string name="enable_plugin_monitoring_services">Activa el complemento de grabación de viajes, para que use el servicio de registro de posición (registro GPX, seguimiento en línea)</string>
     <string name="non_optimal_route_calculation">Calcular una ruta posiblemente no óptima en largas distancias</string>
     <string name="rendering_attr_roadColors_description">Seleccione un esquema de color de carreteras:</string>
     <string name="rendering_attr_roadColors_name">Esquema de color de carreteras</string>
@@ -929,7 +929,7 @@
     <string name="recording_context_menu_precord">Tomar una foto</string>
     <string name="stop_routing_confirm">¿Está seguro que quiere parar la navegación?</string>
     <string name="clear_dest_confirm">¿Seguro que quiere borrar su punto de destino (y puntos de ruta)?</string>
-    <string name="precise_routing_mode_descr">Habilitar para calcular rutas precisas sin interferencias. Aún está limitado por la distancia y es lento.</string>
+    <string name="precise_routing_mode_descr">Activar para calcular rutas precisas sin interferencias. Aún está limitado por la distancia y es lento.</string>
     <string name="precise_routing_mode">Navegación precisa (alfa)</string>
     <string name="local_indexes_cat_av">Datos multimedia</string>
     <string name="support_new_features_descr">Dona para ver nuevas características implementadas en la aplicación</string>
@@ -1184,7 +1184,7 @@
     <string name="auto_zoom_farthest">Para largo alcance</string>
     <string name="animate_routing_route_not_calculated">Primero calcule la ruta</string>
     <string name="animate_routing_route">"Simular, utilizando la ruta calculada "</string>
-    <string name="animate_routing_gpx">Simular utilizando traza GPX</string>
+    <string name="animate_routing_gpx">Simular, utilizando la traza GPX</string>
     <string name="app_mode_hiking">Senderismo</string>
     <string name="app_mode_motorcycle">Moto</string>
     <string name="app_mode_boat">Barco</string>
@@ -1204,8 +1204,8 @@
     <string name="copying_osmand_files">Copiando archivos de datos de OsmAnd…</string>
     <string name="app_mode_truck">Camión</string>
     <string name="complex_route_calculation_failed">Fallo en el cálculo rápido de la ruta (%s), regresando a cálculo lento.</string>
-    <string name="disable_complex_routing_descr">Deshabilitar la planificación de ruta de dos fases para la navegación con automóvil</string>
-    <string name="disable_complex_routing">Deshabilitar navegación compleja</string>
+    <string name="disable_complex_routing_descr">Desactivar la planificación de ruta de dos fases, para la navegación en automóvil</string>
+    <string name="disable_complex_routing">Desactivar navegación compleja</string>
     <string name="calculate_osmand_route_gpx">Calcular la ruta OsmAnd sin conexión</string>
     <string name="routing_attr_prefer_motorway_name">Preferir autopistas</string>
     <string name="routing_attr_prefer_motorway_description">Preferir autopistas</string>
@@ -1320,9 +1320,9 @@
     <string name="osmo_groups">Grupos/Dispositivos OsMo</string>
     <string name="osmo_group_info">Información</string>
     <string name="color_red">rojo</string>
-    <string name="color_pink">rosa</string>
+    <string name="rendering_value_pink_name">rosa</string>
     <string name="color_orange">anaranjado</string>
-    <string name="color_brown">marrón</string>
+    <string name="rendering_value_brown_name">marrón</string>
     <string name="color_yellow">amarillo</string>
     <string name="color_lightblue">azul claro</string>
     <string name="color_blue">azul</string>
@@ -1449,8 +1449,8 @@
     <string name="osmo_gpx_track_downloaded">Traza OsMo %1$s descargada.</string>
     <string name="keep_navigation_service">Mantener</string>
     <string name="stop_navigation_service">Interrumpir</string>
-    <string name="enable_sleep_mode">Habilita el modo de fondo del GPS</string>
-    <string name="gps_wake_up_timer">Intervalo para despertar GPS</string>
+    <string name="enable_sleep_mode">Activa el modo de fondo del GPS</string>
+    <string name="gps_wake_up_timer">Intervalo de activación del GPS</string>
     <string name="sleep_mode_stop_dialog">¿Interrumpir el modo de fondo del GPS?</string>
     <string name="map_preferred_locale_descr">Idioma preferido para las etiquetas en el mapa (si no está disponible se cambiará a inglés o a nombres locales)</string>
     <string name="map_preferred_locale">Idioma preferido del mapa</string>
@@ -1459,7 +1459,7 @@
     <string name="lang_he">Hebreo</string>
     <string name="forward">Siguiente</string>
     <string name="home">Panel de control</string>
-    <string name="live_monitoring_m_descr">Envía los datos de seguimiento a un servicio web específico si el registro GPX está habilitada.</string>
+    <string name="live_monitoring_m_descr">Envía los datos de seguimiento a un servicio web específico si el registro GPX está activado.</string>
     <string name="live_monitoring_m">Seguimiento en línea (requiere GPX)</string>
     <string name="live_monitoring_start">Iniciar seguimiento en línea</string>
     <string name="live_monitoring_stop">Parar seguimiento en línea</string>
@@ -1514,7 +1514,7 @@
     <string name="save_track_interval_globally">Intervalo de registro</string>
     <string name="save_track_to_gpx_globally_descr">Registra la posición general en un archivo GPX pudiendo activar o desactivar utilizando el control de registro GPX en la pantalla del mapa</string>
     <string name="confirm_every_run">Preguntar siempre</string>
-    <string name="save_global_track_interval_descr">Elegir el intervalo de registro para la grabación de trazas en general (habilitar a través del control de registro GPX en el mapa)</string>
+    <string name="save_global_track_interval_descr">Elegir el intervalo de registro para la grabación de trazas en general (activado a través del control de registro GPX en el mapa)</string>
     <string name="save_global_track_interval">Intervalo de registro general</string>
     <string name="traffic_warning_speed_limit">Límite de velocidad</string>
     <string name="traffic_warning_border_control">Control fronterizo</string>
@@ -1902,7 +1902,7 @@
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Actualizar todo (%1$s MB)</string>
     <string name="free_downloads_used">Descargas gratis usadas</string>
-    <string name="free_downloads_used_description">Puedes configurar cuántas descargas gratis ha usado</string>
+    <string name="free_downloads_used_description">Muestra las descargas libres utilizadas</string>
     <string name="simulate_initial_startup_descr">Muestra la pantalla del primer arranque y mantiene los demás ajustes sin cambios</string>
     <string name="simulate_initial_startup">Simular arranque inicial</string>
     <string name="share_geo">geo:</string>

OsmAnd/res/values-eu/strings.xml

@@ -1319,9 +1319,9 @@
     <string name="osmo_follow">Jarraitu</string>
     <string name="osmo_user_name">Erabiltzailea</string>
 	<string name="color_red">gorria</string>
-	<string name="color_pink">arrosa</string>
+	<string name="rendering_value_pink_name">arrosa</string>
 	<string name="color_orange">laranja</string>
-	<string name="color_brown">marroia</string>
+	<string name="rendering_value_brown_name">marroia</string>
 	<string name="color_yellow">horia</string>
 	<string name="color_lightblue">urdin argia</string>
 	<string name="color_blue">urdina</string>

OsmAnd/res/values-fa/strings.xml

@@ -1554,9 +1554,9 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است.
     <string name="osmo_connect_to_my_nickname">نام مستعار</string>
     <string name="osmo_user_name">کاربر</string>
 	<string name="color_red">قرمز</string>
-	<string name="color_pink">صورتی</string>
+	<string name="rendering_value_pink_name">صورتی</string>
 	<string name="color_orange">نارنجی</string>
-	<string name="color_brown">قهوه ای</string>
+	<string name="rendering_value_brown_name">قهوه ای</string>
 	<string name="color_yellow">زرد</string>
 	<string name="color_lightblue">آبی روشن</string>
 	<string name="color_blue">آبی</string>

OsmAnd/res/values-fr/strings.xml

@@ -1452,9 +1452,9 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="import_file_favourites">Enregistrer les points comme fichier GPX ou les transformer en favoris ?</string>
 
     <string name="color_red">Rouge</string>
-    <string name="color_pink">Rose</string>
+    <string name="rendering_value_pink_name">Rose</string>
     <string name="color_orange">Orange</string>
-    <string name="color_brown">Brun</string>
+    <string name="rendering_value_brown_name">Brun</string>
     <string name="color_yellow">Jaune</string>
     <string name="color_lightblue">Bleu clair</string>
     <string name="color_blue">Bleu</string>
@@ -2128,4 +2128,6 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="routing_attr_avoid_stairs_name">Éviter les escaliers</string>
 	<string name="routing_attr_avoid_borders_name">Éviter le franchissement de frontières</string>
 	<string name="routing_attr_avoid_stairs_description">Éviter les escaliers</string>
-	</resources>
+	<string name="release_2_2">" • Nouveaux menus contextuels sur un point de la carte\n\n • Choix de l\'affichage au démarrage (tableau de bord ou carte)\n\n • Personnalisation du contenu du tableau de bord\n\n • Possibilité d\'ignorer le tableau de bord et de n\'utiliser que les menus\n\n • Téléchargement des cartes des régions en appuyant directement sur la carte mondiale\n\n • Amélioration de la recherche des PI (Point d\'Intérêt)\n\n • Amélioration des PI (Point d\'Intérêt) et des contributions OSM (Open Street Map)\n\n • Refonte du téléchargement des cartes\n\n et bien plus encore ... "</string>
+    <string name="poi_context_menu_modify_osm_change">Modifier la contribution OSM</string>
+    </resources>

OsmAnd/res/values-gl/strings.xml

@@ -174,9 +174,9 @@
     <string name="osmo_connect_to_my_nickname">O meu alcume</string>
     <string name="osmo_user_name">Usuario</string>
 	<string name="color_red">vermello</string>
-	<string name="color_pink">rosa</string>
+	<string name="rendering_value_pink_name">rosa</string>
 	<string name="color_orange">laranxa</string>
-	<string name="color_brown">marrón</string>
+	<string name="rendering_value_brown_name">marrón</string>
 	<string name="color_yellow">amarelo</string>
 	<string name="color_lightblue">azul claro</string>
 	<string name="color_blue">azul</string>

OsmAnd/res/values-hr/strings.xml

@@ -1224,9 +1224,9 @@
     <string name="osmo_connect_to_my_nickname">Moj nadimak</string>
     <string name="osmo_user_name">Korisnik</string>
 	<string name="color_red">crvena</string>
-	<string name="color_pink">roza</string>
+	<string name="rendering_value_pink_name">roza</string>
 	<string name="color_orange">narančasta</string>
-	<string name="color_brown">smeđa</string>
+	<string name="rendering_value_brown_name">smeđa</string>
 	<string name="color_yellow">žuta</string>
 	<string name="color_lightblue">svijetloplava</string>
 	<string name="color_blue">plava</string>

OsmAnd/res/values-hu/strings.xml

@@ -1320,9 +1320,9 @@
     <string name="keep_informing">Navigációs utasítások ismétlése</string>
     <string name="navigation_intent_invalid">Érvénytelen formátum: %s</string>
     <string name="color_red">piros</string>
-    <string name="color_pink">rózsaszín</string>
+    <string name="rendering_value_pink_name">rózsaszín</string>
     <string name="color_orange">narancs</string>
-    <string name="color_brown">barna</string>
+    <string name="rendering_value_brown_name">barna</string>
     <string name="color_yellow">sárga</string>
     <string name="color_lightblue">világoskék</string>
     <string name="color_blue">kék</string>

OsmAnd/res/values-it/strings.xml

@@ -1364,9 +1364,9 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="import_file_favourites">Salvare i punti come file GPX o importarli nei favoriti?</string>
 
     <string name="color_red">rosso</string>
-    <string name="color_pink">rosa</string>
+    <string name="rendering_value_pink_name">rosa</string>
     <string name="color_orange">arancione</string>
-    <string name="color_brown">marrone</string>
+    <string name="rendering_value_brown_name">marrone</string>
     <string name="color_yellow">giallo</string>
     <string name="color_lightblue">blu chiaro</string>
     <string name="color_blue">blu</string>

OsmAnd/res/values-ja/strings.xml

@@ -1449,9 +1449,9 @@ POIの更新は利用できません</string>
     <string name="osmo_connect_to_my_nickname">ニックネーム</string>
     <string name="osmo_user_name">ユーザー</string>
 	<string name="color_red">レッド</string>
-	<string name="color_pink">ピンク</string>
+	<string name="rendering_value_pink_name">ピンク</string>
 	<string name="color_orange">オレンジ</string>
-	<string name="color_brown">ブラウン</string>
+	<string name="rendering_value_brown_name">ブラウン</string>
 	<string name="color_yellow">イエロー</string>
 	<string name="color_lightblue">ライトブルー</string>
 	<string name="color_blue">ブルー</string>
@@ -2045,7 +2045,7 @@ POIの更新は利用できません</string>
     <string name="show_on_start_description">OFFの場合、起動時マップのみ表示します</string>
     <string name="copied_to_clipboard">クリップボードにコピーしました</string>
     <string name="release_2_2">" • マップ画面や他の画面で項目をタップした場合のコンテキストメニューの刷新\n\n • ダッシュボード設定で\'起動時に表示\'をOFFにすることで今まで通りにマップ画面が直接表示出来る様に、選択式に変更\n\n • ダッシュボード設定で任意の項目だけ表示できる様に変更可能\n\n • ダッシュボード設定で今まで通りメニューボタンでメニューが開ける様に設定可能\n\n • マップ画面で世界地図表示状態から任意の地点のマップデータをダウンロード可能に\n\n • POI検索時より具体的に検索できる様に変更\n\n • POIやOSMの項目編集機能を改善\n\n • マップやその他データのダウンロード構造とUIを刷新\n\n他多数... "</string>
-    <string name="osm_save_offline">オフラインで保存</string>
+    <string name="osm_save_offline">ｵﾌﾗｲﾝで保存</string>
     <string name="osm_edit_modified_poi">OSMのPOIが変更されました</string>
     <string name="osm_edit_deleted_poi">OSMのPOIが削除されました</string>
     <string name="context_menu_item_open_note">OSMでの注釈を開く</string>
@@ -2062,7 +2062,7 @@ POIの更新は利用できません</string>
 	<string name="osn_add_dialog_error">例外事項の発生:メモは作成されませんでした</string>
 	<string name="osn_close_dialog_success">注釈は正常に閉じられました</string>
 	<string name="osn_close_dialog_error">例外事項の発生:注釈は閉じられませんでした</string>
-	<string name="shared_string_commit">コミット</string>
+	<string name="shared_string_commit">ｺﾐｯﾄ</string>
 	
     <string name="context_menu_item_delete_waypoint">GPX経由地点を削除しますか？</string>
     <string name="context_menu_item_edit_waypoint">GPX経由地点の編集</string>

OsmAnd/res/values-ko/strings.xml

@@ -1590,9 +1590,9 @@
 	<string name="import_file_favourites">장소를 GPX 파일로 저장 할까요? 또는 즐겨찾기로 가져오기 할까요?</string>
 	
 	<string name="color_red">빨강</string>
-	<string name="color_pink">분홍</string>
+	<string name="rendering_value_pink_name">분홍</string>
 	<string name="color_orange">오렌지</string>
-	<string name="color_brown">갈색</string>
+	<string name="rendering_value_brown_name">갈색</string>
 	<string name="color_yellow">노랑</string>
 	<string name="color_lightblue">밝은 청색</string>
 	<string name="color_blue">파랑</string>

OsmAnd/res/values-lt/strings.xml

@@ -1393,9 +1393,9 @@
     <string name="osmo_connect_to_my_nickname">Mano slapyvardis</string>
     <string name="osmo_user_name">Vartotojas</string>
     <string name="color_red">raudona</string>
-    <string name="color_pink">rožinė</string>
+    <string name="rendering_value_pink_name">rožinė</string>
     <string name="color_orange">oranžinė</string>
-    <string name="color_brown">ruda</string>
+    <string name="rendering_value_brown_name">ruda</string>
     <string name="color_yellow">geltona</string>
     <string name="color_lightblue">žydra</string>
     <string name="color_blue">mėlyna</string>

OsmAnd/res/values-lv/strings.xml

@@ -1561,9 +1561,9 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	
 	<string name="seconds_ago">sekundes atpakaļ</string>
     <string name="color_red">sarkans</string>
-	<string name="color_pink">rozā</string>
+	<string name="rendering_value_pink_name">rozā</string>
 	<string name="color_orange">oranžs</string>
-	<string name="color_brown">brūns</string>
+	<string name="rendering_value_brown_name">brūns</string>
 	<string name="color_yellow">dzeltens</string>
 	<string name="color_lightblue">gaiši zils</string>
 	<string name="color_blue">zils</string>

OsmAnd/res/values-nb/phrases.xml

@@ -214,4 +214,31 @@
 	<string name="poi_bathing_yes">Bading: ja</string>
 	<string name="poi_aerialway_length">Lengde</string>
 
-</resources>
+<string name="poi_seasonal_spring">Vår</string>
+	<string name="poi_seasonal_summer">Sommer</string>
+	<string name="poi_seasonal_autumn">Høst</string>
+	<string name="poi_seasonal_winter">Vinter</string>
+	<string name="poi_start_date">Startdato</string>
+	<string name="poi_wheelchair">Rullestol</string>
+	<string name="poi_wheelchair_no">Rullestol: ikke tillatt</string>
+	<string name="poi_wheelchair_limited">Rullestol: begrenset</string>
+	<string name="poi_building_type_shrine">Bygningstype: helligdom</string>
+
+	<string name="poi_building_type_church">Bygningstype: kirke</string>
+	<string name="poi_building_type_chapel">Bygningstype: kapell</string>
+	<string name="poi_building_type_mosque">Bygningstype: moské</string>
+	<string name="poi_building_type_temple">Bygningstype: tempel</string>
+	<string name="poi_building_type_cathedral">Bygningstype: katedral</string>
+	<string name="poi_building_type_monastery">Bygningstype: kloster</string>
+	<string name="poi_building_type_basilica">Bygningstype: basilika</string>
+	<string name="poi_building_type_synagogue">Bygningstype: synagoge</string>
+	<string name="poi_megalith_type_stone_circle">Megalittype: steinsirkel</string>
+	<string name="poi_megalith_type_dolmen">Megalittype: dysse</string>
+	<string name="poi_megalith_type_nuraghe">Megalittype: nurage</string>
+	<string name="poi_megalith_type_passage_grave">Megalittype: ganggrav</string>
+	<string name="poi_megalith_type_menhir">Megalittype: bautastein</string>
+	<string name="poi_site_type_petroglyph">Type: helleristning</string>
+	<string name="poi_site_type_city">Type: by</string>
+	<string name="poi_site_type_settlement">Type: bosetting</string>
+	<string name="poi_site_type_megalith">Type: megalitt</string>
+	</resources>

OsmAnd/res/values-nb/strings.xml

@@ -534,7 +534,7 @@
     <string name="search_address_building">Bygning</string>
     <string name="search_address_building_option">Bygning</string>
     <string name="search_address_street_option">Kryssende gate</string>
-    <string name="search_tabs_location">Sted</string>
+    <string name="search_tabs_location">Posisjon</string>
 
     <string name="context_menu_item_update_map">Oppdater kart</string>
     
@@ -821,7 +821,7 @@
     <string name="distance_measurement_clear_route">Slett alle punkter</string>
     <string name="use_kalman_filter_compass_descr">Reduserer støy i kompassavlesninger, men legger til treghet</string>
     <string name="use_kalman_filter_compass">Bruk Kalmanfilter</string>
-    <string name="other_location">Annen</string>
+    <string name="other_location">Andre</string>
     <string name="available_downloads_left">Er tilgjengelig %1$d filer til nedlasting</string>
     <string name="install_paid">Fullversjon</string>
     <string name="clear_destination">Slett reisemål</string>
@@ -891,9 +891,9 @@
     <string name="gpx_selection_point">Punkt %1$s</string>
     <string name="osmo_center_location">Sentrer på skjermen</string>
     <string name="color_red">rød</string>
-    <string name="color_pink">rosa</string>
+    <string name="rendering_value_pink_name">rosa</string>
     <string name="color_orange">orange</string>
-    <string name="color_brown">brun</string>
+    <string name="rendering_value_brown_name">brun</string>
     <string name="color_yellow">gul</string>
     <string name="color_lightblue">lyseblå</string>
     <string name="color_blue">blå</string>
@@ -1434,7 +1434,7 @@
     
     <string name="versions_item">Versjoner</string>
     <string name="contact_us">Kontakt oss</string>
-    <string name="planning_trip_item">Planlegge en tur</string>
+    <string name="planning_trip_item">Turplanlegging</string>
 <string name="read_more">Les mer</string>
     <string name="rendering_attr_hideProposed_name">Skjul foreslåtte objekter</string>
     <string name="techical_articles_item">Tekniske artikler</string>
@@ -1457,4 +1457,22 @@
     <string name="show_on_start_description">\'Av\' starter direkte med kartskjermen</string>
     <string name="tab_title_basic">Grunnleggende</string>
 	<string name="tab_title_advanced">Avansert</string>
-	</resources>
+	<string name="shared_string_location">Posisjon</string>
+    <string name="default_speed_system_descr">Bestem system for hastighetsmåling</string>
+    <string name="default_speed_system">Hastighetsmåling</string>
+    <string name="si_kmh">Kilometer i timen</string>
+    <string name="si_m_s">Meter per sekund</string>
+    <string name="si_min_km">Minutter per kilometer</string>
+    <string name="av_locations">Posisjoner</string>
+    <string name="plugin_settings">Programtillegg</string>
+	<string name="rendering_value_boldOutline_name">Tykke omriss</string>
+    <string name="rendering_attr_roadStyle_description">Veistil</string>
+    <string name="routing_attr_avoid_borders_name">Unngå grensepassering</string>
+	<string name="routing_attr_height_name">Høydegrense</string>
+	<string name="routing_attr_height_description">Spesifiser kjøretøyhøyde som tillates på ruter</string>
+    <string name="rendering_attr_alpineHiking_name">Alpin vandringsskala (SAC)</string>
+    <string name="voices">Talemeldinger</string>
+	<string name="downloads_left_template">%1$s nedlastinger igjen</string>
+	<string name="other_menu_group">Annet</string>
+    <string name="instalation_troubleshooting_item">Installering og problemløsing</string>
+    </resources>

OsmAnd/res/values-nl/strings.xml

@@ -1536,9 +1536,9 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="import_file_favourites">Punten bewaren als GPX-bestand of importeren in favorieten?</string>
 	
 	<string name="color_red">rood</string>
-	<string name="color_pink">roze</string>
+	<string name="rendering_value_pink_name">roze</string>
 	<string name="color_orange">oranje</string>
-	<string name="color_brown">bruin</string>
+	<string name="rendering_value_brown_name">bruin</string>
 	<string name="color_yellow">geel</string>
 	<string name="color_lightblue">lichtblauw</string>
 	<string name="color_blue">blauw</string>
@@ -2166,7 +2166,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Alles updaten (%1$s MB)</string>
     <string name="free_downloads_used">Gebruikte gratis downloads</string>
-    <string name="free_downloads_used_description">Bekijk hoeveel gratis downloads er zijn gebruikt</string>
+    <string name="free_downloads_used_description">Bekijk hoeveel gratis downloads er al gebruikt zijn</string>
 
     <string name="application_dir_description">Kies waar kaartbestanden bewaard worden.</string>
     <string name="show_on_start_description">\'Uit\' toont direct de kaart</string>
@@ -2241,4 +2241,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="access_from_map">Toegang vanaf kaart</string>
     <string name="use_dashboard_btn">Gebruik dashboard</string>
     <string name="use_drawer_btn">Gebruik menu</string>
-    </resources>
+    <string name="routing_attr_avoid_stairs_name">Vermijd trappen</string>
+	<string name="routing_attr_avoid_stairs_description">Vermijd trappen</string>
+	<string name="routing_attr_avoid_borders_name">Vermijd grensovergangen</string>
+	</resources>

OsmAnd/res/values-nn/strings.xml

@@ -66,9 +66,9 @@
     <string name="osmo_connect_to_my_nickname">Kallenamnet mitt</string>
     <string name="osmo_user_name">Brukarnamn</string>
 	<string name="color_red">raud</string>
-	<string name="color_pink">rosa</string>
+	<string name="rendering_value_pink_name">rosa</string>
 	<string name="color_orange">oransje</string>
-	<string name="color_brown">brun</string>
+	<string name="rendering_value_brown_name">brun</string>
 	<string name="color_yellow">gul</string>
 	<string name="color_lightblue">lyseblå</string>
 	<string name="color_blue">blå</string>

OsmAnd/res/values-pl/strings.xml

@@ -1463,9 +1463,9 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
 	Używając identyfikatora trackera podłączone urządzenia będą mogły śledzić każdy ruch tego urządzenia! Aby się rozłączyć, wybierz opcję: Generuj ponownie.</string>
     <string name="osmo_locations_sent">Położenie wysłane %1$d (w buforze %2$d) </string>
     <string name="color_red">czerwony</string>
-	<string name="color_pink">różowy</string>
+	<string name="rendering_value_pink_name">różowy</string>
 	<string name="color_orange">pomarańczowy</string>
-	<string name="color_brown">brązowy</string>
+	<string name="rendering_value_brown_name">brązowy</string>
 	<string name="color_yellow">żółty</string>
 	<string name="color_lightblue">jasnoniebieski</string>
 	<string name="color_blue">niebieski</string>

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

@@ -507,7 +507,7 @@
 	<string name="poi_hotel">Hotel</string>
 	<string name="poi_guest_house">Guesthouse</string>
 	<string name="poi_hostel">Hostel</string>
-	<string name="poi_motel">Motel</string>
+	<string name="poi_motel">Hotel de estrada</string>
 	<string name="poi_alpine_hut">Abrigo de montanha</string>
 	<string name="poi_chalet">Chalé</string>
 	<string name="poi_apartment">Apartamento</string>
@@ -1399,4 +1399,243 @@
 	<string name="poi_aerialway_heating_yes">Calefação</string>
 	<string name="poi_aerialway_heating_no">Sem calefação</string>
 	<string name="poi_aerialway_bicycle_yes">Bicicleta: permitido</string>
+	<string name="poi_aerialway_bicycle_no">Bicicleta: proibido</string>
+	<string name="poi_aerialway_bicycle_summer">Bicicleta: permitido somente no verão</string>
+	<string name="poi_aerialway_access_entry">Apenas entrada</string>
+	<string name="poi_aerialway_access_exit">Apenas saída</string>
+	<string name="poi_aerialway_access_both">Entrada e saída</string>
+	<string name="poi_aerialway_summer_access_entry">Acesso de verão: apenas entrada</string>
+	<string name="poi_aerialway_summer_access_exit">Acesso de verão: apenas saída</string>
+	<string name="poi_aerialway_summer_access_both">Acesso de verão: entrada e saída</string>
+
+	<string name="poi_stars_1">Estrelas: 1 (Turista)</string>
+	<string name="poi_stars_1s">Estrelas: 1S (Turista Superior)</string>
+	<string name="poi_stars_2">Estrelas: 2 (Standard)</string>
+	<string name="poi_stars_2s">Estrelas: 2S (Superior Standard)</string>
+	<string name="poi_stars_3">Estrelas: 3 (Conforto)</string>
+	<string name="poi_stars_3s">Estrelas: 3S (Conforto Superior)</string>
+	<string name="poi_stars_4">Estrelas: 4 (Primeira Classe)</string>
+	<string name="poi_stars_4s">Estrelas: 4S (Primeira Classe Superior)</string>
+	<string name="poi_stars_5">Estrelas: 5 (Luxo)</string>
+	<string name="poi_stars_5s">Estrelas: 5S (Luxo Superior)</string>
+	<string name="poi_stars_6">Estrelas: 6</string>
+	<string name="poi_stars_7">Estrelas: 7</string>
+	<string name="poi_rooms">Quartos</string>
+
+	<string name="poi_love_hotel">Motel</string>
+
+	<string name="poi_payment_coins_yes">Aceita moedas</string>
+	<string name="poi_payment_coins_no">Não aceita moedas</string>
+	<string name="poi_payment_coins_0.5">Aceita moedas de $0,5</string>
+	<string name="poi_payment_coins_50c12">Aceita moedas de 50c, $1 e $2</string>
+	<string name="poi_payment_telephone_cards_yes">Aceita cartão telefônico</string>
+	<string name="poi_payment_telephone_cards_no">Não aceita cartão telefônico</string>
+	<string name="poi_payment_credit_cards_yes">Aceita cartão de crédito</string>
+	<string name="poi_payment_credit_cards_no">Não aceita cartão de crédito</string>
+	<string name="poi_payment_notes_yes">Aceita nota promissória</string>
+	<string name="poi_payment_notes_no">Não aceita nota promissória</string>
+	<string name="poi_traffic_calming_island">Ilha de trânsito</string>
+	<string name="poi_bicycle_parking_anchors">Âncora</string>
+	<string name="poi_windfall">Windfall</string>
+	<string name="poi_payment_electronic_purses_yes">Aceita carteira eletrônica</string>
+	<string name="poi_payment_electronic_purses_no">Não aceita carteira eletrônica</string>
+	<string name="poi_payment_cash_yes">Aceita dinheiro</string>
+	<string name="poi_payment_cash_no">Não aceita dinheiro</string>
+	<string name="poi_payment_debit_cards_yes">Aceita cartão de débito</string>
+	<string name="poi_payment_debit_cards_no">Não aceita cartão de débito</string>
+	<string name="poi_payment_bitcoin_yes">Aceita Bitcoin</string>
+	<string name="poi_payment_bitcoin_no">Não aceita Bitcoin</string>
+	<string name="poi_payment_visa_yes">Aceita cartão Visa</string>
+	<string name="poi_payment_visa_no">Não aceita cartão Visa</string>
+	<string name="poi_payment_mastercard_yes">Aceita cartão MasterCard</string>
+	<string name="poi_payment_mastercard_no">Não aceita cartão MasterCard</string>
+	<string name="poi_payment_none">Grátis</string>
+	<string name="poi_payment_account_cards_yes">Aceita cartão de crédito</string>
+	<string name="poi_payment_account_cards_no">Não aceita cartão de crédito</string>
+	<string name="poi_payment_maestro_yes">Aceita cartão Maestro</string>
+	<string name="poi_payment_maestro_no">Não aceita cartão Maestro</string>
+	<string name="poi_payment_american_express_yes">Aceita cartão American Express (AMEX)</string>
+	<string name="poi_payment_american_express_no">Não aceita cartão American Express (AMEX)</string>
+	<string name="poi_payment_diners_club_yes">Aceita cartão Diners Club</string>
+	<string name="poi_payment_diners_club_no">Não aceita cartão Diners Club</string>
+	<string name="poi_payment_dkv_yes">Aceita DKV</string>
+	<string name="poi_payment_dkv_no">Não aceita DKV</string>
+	<string name="poi_payment_uta_yes">Aceita cartão UTA</string>
+	<string name="poi_payment_uta_no">Não aceita cartão UTA</string>
+	<string name="poi_payment_efectivo_yes">Aceita efetivo</string>
+	<string name="poi_payment_efectivo_no">Não aceita efetivo</string>
+	<string name="poi_payment_girocard_yes">Aceita Girocard</string>
+	<string name="poi_payment_girocard_no">Não aceita Girocard</string>
+	<string name="poi_payment_discover_card_yes">Aceita Discover Card</string>
+	<string name="poi_payment_discover_card_no">Não aceita Discover Card</string>
+	<string name="poi_payment_visa_electron_yes">Aceita Visa Electron</string>
+	<string name="poi_payment_visa_electron_no">Não aceita Visa Electron</string>
+	<string name="poi_payment_litecoin_yes">Aceita Litecoin</string>
+	<string name="poi_payment_litecoin_no">Não aceita Litecoin</string>
+	<string name="poi_payment_cheque_yes">Aceita cheque</string>
+	<string name="poi_payment_cheque_no">Não aceita cheque</string>
+	<string name="poi_payment_pikepass_yes">Aceita PIKEPASS</string>
+	<string name="poi_payment_pikepass_no">Não aceita PIKEPASS</string>
+	<string name="poi_payment_pikepass_designated">Aceita PIKEPASS (designated)</string>
+	<string name="poi_payment_visa_debit_yes">Aceita cartão Visa Débito</string>
+	<string name="poi_payment_visa_debit_no">Não aceita cartão Visa Débito</string>
+	<string name="poi_payment_cryptocurrencies_no">Não aceita criptomoedas</string>
+	<string name="poi_payment_others_yes">Aceita outras formas de pagamento</string>
+	<string name="poi_payment_others_no">Não aceita outras formas de pagamento</string>
+	<string name="poi_payment_routex_yes">Aceita cartão de combustível Routex</string>
+	<string name="poi_payment_routex_no">Não aceita cartão de combustível Routex</string>
+	<string name="poi_payment_bancomat_yes">Aceita Bancomat</string>
+	<string name="poi_payment_bancomat_no">Não aceita Bancomat</string>
+	<string name="poi_payment_icsf_yes">Aceita cartão IC Stored Fare</string>
+	<string name="poi_payment_icsf_no">Não aceita cartão IC Stored Fare</string>
+	<string name="poi_payment_prepaid_ticket_yes">Aceita bilhetes pré-pagos</string>
+	<string name="poi_payment_jcb_yes">Aceita cartão JCB</string>
+	<string name="poi_payment_jcb_no">Não aceita cartão JCB</string>
+	<string name="poi_payment_laser_yes">Aceita cartão Laser</string>
+	<string name="poi_payment_laser_no">Não aceita cartão Laser</string>
+	<string name="poi_payment_ep_quick_yes">Aceita cartão Quick</string>
+	<string name="poi_payment_ep_quick_no">Não aceita cartão Quick</string>
+	<string name="poi_payment_eurowag_yes">Aceita cartão Eurowag</string>
+	<string name="poi_payment_eurowag_no">Não aceita cartão Eurowag</string>
+	<string name="poi_payment_e_zpass_yes">Aceita E-ZPass</string>
+	<string name="poi_payment_e_zpass_no">Não aceita E-ZPass</string>
+	<string name="poi_payment_euroshell_yes">Aceita cartão de combustível Euroshell</string>
+	<string name="poi_payment_euroshell_no">Não aceita cartão de combustível Euroshell</string>
+	<string name="poi_payment_kitcard_yes">Aceita KITCard</string>
+	<string name="poi_payment_kitcard_no">Não aceita KITCard</string>
+	<string name="poi_payment_westfalen_card_yes">Aceita cartão Westfalen</string>
+	<string name="poi_payment_westfalen_card_no">Não aceita cartão Westfalen</string>
+	<string name="poi_payment_v_pay_yes">Aceita cartão V PAY</string>
+	<string name="poi_payment_v_pay_no">Não aceita cartão V PAY</string>
+	<string name="poi_payment_dogecoin_yes">Aceita Dogecoin</string>
+	<string name="poi_payment_dogecoin_no">Não aceita Dogecoin</string>
+	<string name="poi_payment_cibus_yes">Aceita cartão Cibus</string>
+	<string name="poi_payment_cibus_no">Não aceita cartão Cibus</string>
+	<string name="poi_payment_wire_transfer_yes">Aceita transferência eletrônica</string>
+	<string name="poi_payment_wire_transfer_no">Não aceita transferência eletrônica</string>
+	<string name="poi_payment_ep_cash_yes">Aceita cartão de dinheiro (Geldkarte)</string>
+	<string name="poi_payment_ep_cash_no">Não aceita cartão de dinheiro (Geldkarte)</string>
+	<string name="poi_payment_ep_proton_yes">Aceita cartão Proton</string>
+	<string name="poi_payment_ep_proton_no">Não aceita cartão Proton</string>
+	<string name="poi_payment_ep_avant_yes">Aceita AvantCard</string>
+	<string name="poi_payment_ep_avant_no">Não aceita cartão AvantCard</string>
+	<string name="poi_payment_ep_mep_yes">Aceita MEP</string>
+	<string name="poi_payment_ep_mep_no">Não aceita MEP</string>
+	<string name="poi_payment_ep_minipay_yes">Aceita Minipay</string>
+	<string name="poi_payment_ep_minipay_no">Não aceita Minipay</string>
+	<string name="poi_payment_ep_minicash_yes">Aceita MiniCash</string>
+	<string name="poi_payment_ep_minicash_no">Não aceita MiniCash</string>
+	<string name="poi_payment_ep_moneo_yes">Aceita Moneo</string>
+	<string name="poi_payment_ep_moneo_no">Não aceita Moneo</string>
+	<string name="poi_payment_ep_monedero4b_yes">Aceita Monedero 4B</string>
+	<string name="poi_payment_ep_monedero4b_no">Não aceita Monedero 4B</string>
+	<string name="poi_payment_ep_monedero_yes">Aceita Monedero</string>
+	<string name="poi_payment_ep_monedero_no">Não aceita Monedero</string>
+	<string name="poi_payment_bankaxess_yes">Aceita BankAxess</string>
+	<string name="poi_payment_bankaxess_no">Não aceita BankAxess</string>
+	<string name="poi_payment_coinkite_yes">Aceita Coinkite</string>
+	<string name="poi_payment_coinkite_no">Não aceita Coinkite</string>
+	<string name="poi_payment_roadrunner_yes">Aceita cartão Roadrunner</string>
+	<string name="poi_payment_roadrunner_no">Não aceita cartão Roadrunner</string>
+	<string name="poi_payment_svg_yes">Aceita SVG</string>
+	<string name="poi_payment_svg_no">Não aceita SVG</string>
+	<string name="poi_payment_sms_yes">Aceita pagamento por SMS</string>
+	<string name="poi_payment_sms_no">Não aceita pagamento por SMS</string>
+	<string name="poi_payment_ov_chipkaart_yes">Aceita OV-Chipkaart</string>
+	<string name="poi_payment_ov_chipkaart_no">Não aceita OV-Chipkaart</string>
+	<string name="poi_payment_oyster_yes">Aceita cartão Oyster</string>
+	<string name="poi_payment_oyster_no">Não aceita cartão Oyster</string>
+	<string name="poi_payment_paypal_yes">Aceita PayPal</string>
+	<string name="poi_payment_paypal_no">Não aceita PayPal</string>
+	<string name="poi_payment_gift_card_yes">Aceita cartões de presente</string>
+	<string name="poi_payment_gift_card_no">Não aceita cartão presente</string>
+	<string name="poi_description_payment">Detalhes de pagamento</string>
+
+	<string name="poi_internet_access_fee_yes">Acesso à Internet pago</string>
+	<string name="poi_internet_access_fee_no">Acesso à Internet grátis</string>
+
+	<string name="poi_events_venue">Salão de eventos</string>
+
+	<string name="poi_diet_vegetarian_only">Apenas dieta vegetariana</string>
+	<string name="poi_diet_vegetarian_yes">Dieta vegetariana</string>
+	<string name="poi_diet_vegetarian_no">Dieta vegetariana: não</string>
+	<string name="poi_diet_vegetarian_few">Dieta vegetariana: alguns</string>
+	<string name="poi_diet_vegan_only">Apenas dieta vegana</string>
+	<string name="poi_diet_vegan_yes">Dieta vegana</string>
+	<string name="poi_diet_vegan_no">Dieta vegana: não</string>
+	<string name="poi_diet_gluten_free_only">Apenas dieta livre de glúten</string>
+	<string name="poi_diet_gluten_free_yes">Dieta livre de glúten</string>
+	<string name="poi_payment_sube_yes">Aceita cartão SUBE</string>
+	<string name="poi_payment_sube_no">Não aceita cartão SUBE</string>
+	<string name="poi_payment_via_verde_yes">Aceita Via Verde</string>
+	<string name="poi_payment_via_verde_no">Não aceita Via Verde</string>
+	<string name="poi_payment_meal_voucher_yes">Aceita vale refeição</string>
+	<string name="poi_payment_meal_voucher_no">Não aceita vale refeição</string>
+	<string name="poi_payment_u_key_yes">Aceita U-Key</string>
+	<string name="poi_payment_u_key_no">Não aceita U-Key</string>
+	<string name="poi_payment_token_yes">Aceita Token</string>
+	<string name="poi_payment_token_no">Não aceita Token</string>
+	<string name="poi_payment_golden_crown_yes">Aceita cartão Golden Crown</string>
+	<string name="poi_payment_golden_crown_no">Não aceita cartão Golden Crown</string>
+	<string name="poi_payment_pro100_yes">Aceita cartão PRO100</string>
+	<string name="poi_payment_pro100_no">Não aceita cartão PRO100</string>
+	<string name="poi_payment_union_card_yes">Não aceita Union Card</string>
+	<string name="poi_payment_union_card_no">Não aceita Union Card</string>
+	<string name="poi_payment_mtsmoney_yes">Aceita MTS-Money</string>
+	<string name="poi_payment_mtsmoney_no">Não aceita cartão MTS-Money</string>
+	<string name="poi_payment_yandexmoney_yes">Aceita Yandex.Money</string>
+	<string name="poi_payment_yandexmoney_no">Não aceita Yandex.Money</string>
+	<string name="poi_diet_gluten_free_no">Dieta livre de glúten: não</string>
+	<string name="poi_diet_kosher_only">Apenas dieta kosher</string>
+	<string name="poi_diet_kosher_yes">Dieta kosher</string>
+	<string name="poi_diet_kosher_no">Dieta kosher: não</string>
+	<string name="poi_diet_halal_only">Apenas dieta halal</string>
+	<string name="poi_diet_halal_yes">Dieta halal</string>
+	<string name="poi_diet_halal_no">Dieta halal: não</string>
+	<string name="poi_diet_lactose_free_only">Apenas dieta livre de lactose</string>
+	<string name="poi_diet_lactose_free_yes">Dieta livre de lactose</string>
+	<string name="poi_diet_lactose_free_no">Dieta livre de lactose: não</string>
+	<string name="poi_diet_pescetarian_yes">Dieta piscitariana</string>
+
+	<string name="poi_drive_in_yes">Drive-in: sim</string>
+	<string name="poi_drive_in_no">Drive-in: não</string>
+	<string name="poi_drive_through_yes">Drive-thru: sim</string>
+	<string name="poi_drive_through_no">Drive-thru: não</string>
+
+	<string name="poi_brewery_additional">Nome da cervejaria</string>
+	<string name="poi_microbrewery_yes">Microcervejaria</string>
+	<string name="poi_microbrewery_no">Sem microcervejaria</string>
+
+	<string name="poi_takeaway_yes">Encomenda</string>
+	<string name="poi_takeaway_no">Sem encomenda</string>
+	<string name="poi_takeaway_only">Apenas encomenda</string>
+
+	<string name="poi_delivery_yes">Entrega</string>
+	<string name="poi_delivery_no">Sem entrega</string>
+	<string name="poi_delivery_only">Apenas entrega</string>
+
+	<string name="poi_outdoor_seating_yes">Lugar ao ar livre</string>
+	<string name="poi_outdoor_seating_no">Sem lugar ao ar livre</string>
+	<string name="poi_outdoor_seating_terrace">Lugar ao ar livre: terraço</string>
+	<string name="poi_outdoor_seating_sidewalk">Lugar ao ar livre: calçada</string>
+	<string name="poi_outdoor_seating_pedestrian_zone">Lugar ao ar livre: calçadão</string>
+	<string name="poi_outdoor_seating_garden">Lugar ao ar livre: jardim</string>
+	<string name="poi_outdoor_seating_patio">Lugar ao ar livre: pátio</string>
+
+	<string name="poi_cocktails_yes">Coquetéis</string>
+
+	<string name="poi_second_hand_yes">Artigos de segunda mão</string>
+	<string name="poi_second_hand_no">Sem artigos de segunda mão</string>
+	<string name="poi_second_hand_only">Apenas artigos de segunda mão</string>
+
+	<string name="poi_service_parts">Peças</string>
+	<string name="poi_service_dealer">Representante</string>
+	<string name="poi_service_repair">Retífica</string>
+	<string name="poi_service_repair_no">Sem retífica</string>
+	<string name="poi_service_electrical">Retífica de veículos elétricos</string>
+	<string name="poi_motorcycle_repair">Retífica de motos</string>
+	<string name="poi_self_service_yes">Autoatendimento</string>
+	<string name="poi_self_service_no">Sem autoatendimento</string>
+	<string name="poi_automated_yes">Automatizado</string>
+	<string name="poi_automated_no">Não automatizado</string>
 	</resources>

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

@@ -462,9 +462,9 @@
     <string name="osmo_connect_to_my_nickname">Meu apelido</string>
     <string name="osmo_user_name">Usuário</string>
 	<string name="color_red">vermelho</string>
-	<string name="color_pink">rosa</string>
+	<string name="rendering_value_pink_name">rosa</string>
 	<string name="color_orange">laranja</string>
-	<string name="color_brown">marrom</string>
+	<string name="rendering_value_brown_name">marrom</string>
 	<string name="color_yellow">amarelo</string>
 	<string name="color_lightblue">azul claro</string>
 	<string name="color_blue">azul</string>
@@ -790,7 +790,7 @@
     <string name="map_widget_distancemeasurement">Medição de distância</string>
     <string name="audionotes_location_not_defined">Local para associar com a nota ainda não está definido. \"Usar posição...\" para atribuir uma nota para o local especificado</string>
     <string name="map_widget_audionotes">Notas de áudio</string>
-    <string name="index_srtm_parts">partes</string>
+    <string name="index_srtm_parts">peças</string>
     <string name="download_select_map_types">Outros mapas</string>
     <string name="download_roads_only_item">Apenas estradas</string>
     <string name="download_regular_maps">Mapa padrão</string>
@@ -975,7 +975,7 @@
 	<string name="route_kl">Mantenha à esquerda e siga</string>
 	<string name="route_kr">Mantenha à direita e siga</string>
 	<string name="rendering_attr_noPolygons_description">Tornar transparente todas as características de terra no mapa</string>
-	<string name="rendering_attr_noPolygons_name">Polígonos</string>
+	<string name="rendering_attr_noPolygons_name">Polígonos de áreas</string>
 	<string name="rendering_attr_appMode_name">Modo de renderização</string>
 	<string name="rendering_attr_appMode_description">Otimizar o mapa para</string>
 	<string name="rendering_attr_contourLines_description">Exibir a partir do nível de zoom (requer dados de contorno):</string>
@@ -1699,7 +1699,7 @@
     <string name="lang_th">Tailandês</string>
     <string name="lang_te">Telugu</string>
     <string name="lang_nn">Norueguês (Nynorsk)</string>
-    <string name="lang_new">Newar / Nepal Bhasa</string>
+    <string name="lang_new">Neuari / Nepalbhasa</string>
     <string name="lang_ms">Malásio</string>
     <string name="lang_ht">Haitiano</string>
     <string name="lang_gl">Galego</string>
@@ -1880,7 +1880,7 @@
     <string name="shared_string_trip_recording">Gravação de viagem</string>
     <string name="shared_string_navigation">Navegação</string>
     <string name="osmand_running_in_background">Rodando em segundo plano</string>
-    <string name="lang_fy">Frysk</string>
+    <string name="lang_fy">Frisão</string>
     <string name="favourites_edit_dialog_title">Informação do favorito</string>
     <string name="simulate_your_location_stop_descr">Parar simulação de rota</string>
     <string name="simulate_your_location_descr">Simular usando a rota calculada ou um GPX gravado</string>
@@ -1908,7 +1908,7 @@
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Atualizar tudo (%1$s MB)</string>
     <string name="free_downloads_used">Transferências gratuitas usadas</string>
-    <string name="free_downloads_used_description">Você pode definir quantas transferências gratuitas você usou</string>
+    <string name="free_downloads_used_description">Exibe as transferências gratuitas usadas</string>
 
     <string name="application_dir_description">Escolha onde deseja salvar os arquivos de mapa.</string>
     
@@ -1934,7 +1934,7 @@
     <string name="contact_us">Fale conosco</string>
     <string name="map_legend">Legenda do mapa</string>
     <string name="save_poi_without_poi_type_message">Você realmente quer salvar o POI sem especificar o tipo?</string>
-    <string name="poi_context_menu_modify_osm_change">Modificação alteração no OSM</string>
+    <string name="poi_context_menu_modify_osm_change">Modificar alteração no OSM</string>
     <string name="use_dashboard_btn">Usar painel de controle</string>
     <string name="use_drawer_btn">Usar menu</string>
     <string name="dashboard_or_drawer_title">Painel de controle ou controle por menu</string>

OsmAnd/res/values-pt/strings.xml

@@ -1360,9 +1360,9 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="osmo_connect_to_my_nickname">Minha alcunha</string>
     <string name="osmo_user_name">Utilizador</string>
 	<string name="color_red">vermelho</string>
-	<string name="color_pink">rosa</string>
+	<string name="rendering_value_pink_name">rosa</string>
 	<string name="color_orange">laranja</string>
-	<string name="color_brown">castanho</string>
+	<string name="rendering_value_brown_name">castanho</string>
 	<string name="color_yellow">amarelo</string>
 	<string name="color_lightblue">azul claro</string>
 	<string name="color_blue">azul</string>

OsmAnd/res/values-ro/strings.xml

@@ -1329,9 +1329,9 @@
     <string name="osmo_connect_to_my_nickname">Porecla mea</string>
     <string name="osmo_user_name">Utilizator</string>
 	<string name="color_red">roșu</string>
-	<string name="color_pink">roz</string>
+	<string name="rendering_value_pink_name">roz</string>
 	<string name="color_orange">portocaliu</string>
-	<string name="color_brown">maro</string>
+	<string name="rendering_value_brown_name">maro</string>
 	<string name="color_yellow">galben</string>
 	<string name="color_lightblue">albastru deschis</string>
 	<string name="color_blue">albastru</string>

OsmAnd/res/values-ru/strings.xml

@@ -220,7 +220,7 @@
     <string name="local_index_items_restored">%1$d из %2$d объектов успешно активированы.</string>
     <string name="local_index_no_items_to_do">Нет объектов, чтобы %1$s</string>
     <string name="local_index_action_do">Вы собираетесь %1$s %2$s объектов. Вы уверены?</string>
-    <string name="local_index_descr_title">Загрузить карты</string>
+    <string name="local_index_descr_title">Управление картами</string>
     <string name="local_index_mi_restore">Активировать</string>
     <string name="local_index_mi_backup">Архивировать</string>
     <string name="local_index_mi_reload">Перечитать с SD-накопителя</string>
@@ -360,7 +360,7 @@
     <string name="filter_existing_indexes">Загруженные</string>
     <string name="general_settings_descr">Настройки экрана, локализации, единиц измерения и другие</string>
     <string name="general_settings">Общие</string>
-    <string name="index_settings">Загрузить карты</string>
+    <string name="index_settings">Управление картами</string>
     <string name="osmand_service">Фоновый режим</string>
     <string name="osmand_service_descr">Запустить OsmAnd в фоновом режиме для записи трека и навигации</string>
     <string name="fast_route_mode">Скоростной маршрут</string>
@@ -1230,9 +1230,9 @@
     <string name="osmo_server_operation_failed">OsMo: не удалось правильно обработать команду</string>
     <string name="import_file_favourites">Сохранить точки как файл GPX или импортировать их в избранное?</string>
     <string name="color_red">красный</string>
-    <string name="color_pink">розовый</string>
+    <string name="rendering_value_pink_name">розовый</string>
     <string name="color_orange">оранжевый</string>
-    <string name="color_brown">коричневый</string>
+    <string name="rendering_value_brown_name">коричневый</string>
     <string name="color_yellow">жёлтый</string>
     <string name="color_lightblue">голубой</string>
     <string name="color_blue">синий</string>

OsmAnd/res/values-sc/strings.xml

@@ -533,9 +533,9 @@
     <string name="osmo_connect_to_my_nickname">Zistru meu</string>
     <string name="osmo_user_name">Impitadore</string>
     <string name="color_red">ruju</string>
-    <string name="color_pink">rosa</string>
+    <string name="rendering_value_pink_name">rosa</string>
     <string name="color_orange">arantzu</string>
-    <string name="color_brown">castàngiu</string>
+    <string name="rendering_value_brown_name">castàngiu</string>
     <string name="color_yellow">grogu</string>
     <string name="color_lightblue">blu lepiu</string>
     <string name="color_blue">blu</string>

OsmAnd/res/values-sk/strings.xml

@@ -1236,9 +1236,9 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="osmo_settings_debug">Informácie pre ladenie</string>
     <string name="import_file_favourites">Uložiť body ako súbor GPX alebo ich importovať do obľúbených?</string>
     <string name="color_red">červená</string>
-    <string name="color_pink">ružová</string>
+    <string name="rendering_value_pink_name">ružová</string>
     <string name="color_orange">oranžová</string>
-    <string name="color_brown">hnedá</string>
+    <string name="rendering_value_brown_name">hnedá</string>
     <string name="color_yellow">žltá</string>
     <string name="color_lightblue">svetlomodrá</string>
     <string name="color_blue">modrá</string>
@@ -1847,7 +1847,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Aktualizovať všetko (%1$s MB)</string>
     <string name="free_downloads_used">Počet použitých voľných stiahnutí</string>
-    <string name="free_downloads_used_description">Môžete nastaviť, koľko voľných stiahnutí ste už použili</string>
+    <string name="free_downloads_used_description">Zobrazuje počet využitých stiahnutí</string>
     <string name="simulate_initial_startup_descr">Nastaví príznak indikujúci prvý štart aplikácie, ostatné nastavenia ponechá nezmenené</string>
     <string name="simulate_initial_startup">Simulovať prvé spustenie aplikácie</string>
     <string name="share_geo">geo:</string>
@@ -1937,4 +1937,6 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="routing_attr_avoid_stairs_name">Vyhnúť sa schodom</string>
 	<string name="routing_attr_avoid_stairs_description">Vyhnúť sa schodom</string>
 	<string name="routing_attr_avoid_borders_name">Vyhnúť sa hraničným priechodom</string>
+	<string name="color_lightgreen">svetlozelená</string>
+	<string name="color_purple">fialová</string>
 	</resources>

OsmAnd/res/values-sl/strings.xml

@@ -1324,9 +1324,9 @@
     <string name="osmo_connect_to_my_nickname">Vzdevek</string>
     <string name="osmo_user_name">Uporabnik</string>
     <string name="color_red">rdeča</string>
-    <string name="color_pink">rožnata</string>
+    <string name="rendering_value_pink_name">rožnata</string>
     <string name="color_orange">oranžna</string>
-    <string name="color_brown">rjava</string>
+    <string name="rendering_value_brown_name">rjava</string>
     <string name="color_yellow">rumena</string>
     <string name="color_lightblue">svetlo modra</string>
     <string name="color_blue">modra</string>

OsmAnd/res/values-sv/strings.xml

@@ -1311,9 +1311,9 @@
     <string name="osmo_mode_restart">Starta om OsMo-session</string>
     <string name="osmo_settings_debug">Felsökningsinformation</string>
     <string name="color_red">röd</string>
-    <string name="color_pink">skär</string>
+    <string name="rendering_value_pink_name">skär</string>
     <string name="color_orange">brandgul</string>
-    <string name="color_brown">brun</string>
+    <string name="rendering_value_brown_name">brun</string>
     <string name="color_yellow">gul</string>
     <string name="color_lightblue">ljusblå</string>
     <string name="color_blue">blå</string>

OsmAnd/res/values-tr/strings.xml

@@ -1305,9 +1305,9 @@
 	<string name="gpx_info_maximum_speed">"Maksimum hız: %1$s "</string>
 	<string name="gpx_info_avg_altitude">Ortalama yükseklik: %1$s</string>
 	<string name="color_red">kırmızı</string>
-	<string name="color_pink">pembe</string>
+	<string name="rendering_value_pink_name">pembe</string>
 	<string name="color_orange">turuncu</string>
-	<string name="color_brown">kahverengi</string>
+	<string name="rendering_value_brown_name">kahverengi</string>
 	<string name="color_yellow">sarı</string>
 	<string name="color_lightblue">açık mavi</string>
 	<string name="color_blue">mavi</string>

OsmAnd/res/values-uk/strings.xml

@@ -1401,9 +1401,9 @@ OsmAnd має відкриті сирці і активно розвиваєть
     <string name="osmo_connect_to_my_nickname">Моє призьвісько</string>
     <string name="osmo_user_name">Користувач</string>
 	<string name="color_red">червоний</string>
-	<string name="color_pink">рожевий</string>
+	<string name="rendering_value_pink_name">рожевий</string>
 	<string name="color_orange">помаранчевий</string>
-	<string name="color_brown">коричневий</string>
+	<string name="rendering_value_brown_name">коричневий</string>
 	<string name="color_yellow">жовтий</string>
 	<string name="color_lightblue">блакитний</string>
 	<string name="color_blue">синій</string>

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

@@ -2258,4 +2258,100 @@
 	<string name="poi_historic_civilization_ancient_egyptian">文明：古埃及 (到西元前332年爲止)</string>
 	<string name="poi_historic_civilization_celtic">文明：凱爾特</string>
 	<string name="poi_historic_civilization_western_roman">文明：西方羅馬 (西元285年 – 西元476年)</string>
-	</resources>
+	<string name="poi_historic_civilization_mycenaean">文明：美錫尼</string>
+	<string name="poi_historic_civilization_dacian">文明：達基亞</string>
+	<string name="poi_historic_civilization_hernici">文明：hernici</string>
+	<string name="poi_historic_civilization_greek_egyptian">文明：希臘埃及 (西元前332年 – 西元前30年)</string>
+	<string name="poi_historic_civilization_roman_and_byzantine_egyptian">文明：羅馬和拜占庭、埃及</string>
+	<string name="poi_historic_civilization_helladic">文明：希臘青銅期</string>
+	<string name="poi_historic_civilization_cycladic">文明：基克拉澤斯</string>
+	<string name="poi_historic_civilization_minoan">文明：米諾</string>
+	<string name="poi_historic_civilization_tiahuanacota">文明：蒂亞瓦納科</string>
+
+	<string name="poi_animal_training">動物訓練</string>
+	<string name="poi_animal_training_dog">訓狗</string>
+	<string name="poi_animal_training_horse">訓馬</string>
+
+	<string name="poi_horse_yes">准許馬進出</string>
+	<string name="poi_horse_no">不准許馬進出</string>
+	<string name="poi_animal_yes">准許動物進出</string>
+	<string name="poi_animal_no">不准許動物進出</string>
+
+	<string name="poi_stone_type_conciliation_cross">類型：和解十字架</string>
+	<string name="poi_stone_type_coat_of_arms">類型：紋章</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_masonry">原材料：磚石</string>
+	<string name="poi_material_brick">原材料：磚</string>
+	<string name="poi_material_plastic">原材料：塑膠</string>
+	<string name="poi_material_sandstone">原材料：砂岩</string>
+	<string name="poi_material_granite_stone">原材料：花崗石</string>
+	<string name="poi_material_metal_wood">原材料：金屬、木頭</string>
+	<string name="poi_material_glass">原材料：玻璃</string>
+	<string name="poi_material_bronze">原材料：青銅</string>
+	<string name="poi_material_earth">原材料：土</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_site_type_megalith">類型：巨石</string>
+	<string name="poi_site_type_tumulus">類型：古墳</string>
+	<string name="poi_site_type_fortification">類型：防禦</string>
+	<string name="poi_site_type_settlement">類型：居地</string>
+	<string name="poi_site_type_city">類型：城市</string>
+	<string name="poi_wiki_lang_af">南非文維基</string>
+	<string name="poi_wiki_lang_als">阿爾薩斯文維基</string>
+	<string name="poi_wiki_lang_az">亞塞拜然文維基</string>
+	<string name="poi_wiki_lang_bn">孟加拉文維基</string>
+	<string name="poi_wiki_lang_bpy">比什奴普萊利亞文維基</string>
+	<string name="poi_wiki_lang_br">布列塔尼文維基</string>
+	<string name="poi_wiki_lang_bs">波士尼亞文維基</string>
+	<string name="poi_wiki_lang_cy">威爾斯文維基</string>
+	<string name="poi_wiki_lang_eo">世界語維基</string>
+	<string name="poi_wiki_lang_eu">巴斯克文維基</string>
+	<string name="poi_wiki_lang_fa">波斯文維基</string>
+	<string name="poi_wiki_lang_fy">菲士蘭文維基</string>
+	<string name="poi_wiki_lang_ga">愛爾蘭文維基</string>
+	<string name="poi_wiki_lang_hy">亞美尼亞文維基</string>
+	<string name="poi_wiki_lang_is">冰島文維基</string>
+	<string name="poi_wiki_lang_ka">喬治亞文維基</string>
+	<string name="poi_wiki_lang_ku">庫德文維基</string>
+	<string name="poi_wiki_lang_la">拉丁文維基</string>
+	<string name="poi_wiki_lang_lb">盧森堡文維基</string>
+	<string name="poi_wiki_lang_mk">馬其頓文維基</string>
+	<string name="poi_wiki_lang_ml">馬拉雅拉姆文維基</string>
+	<string name="poi_wiki_lang_mr">馬拉地文維基</string>
+	<string name="poi_wiki_lang_nds">下撒克遜文維基</string>
+	<string name="poi_wiki_lang_nv">納瓦荷文維基</string>
+	<string name="poi_wiki_lang_os">奧塞提亞文維基</string>
+	<string name="poi_wiki_lang_pms">皮埃蒙特文維基</string>
+	<string name="poi_wiki_lang_sc">薩丁尼亞島文維基</string>
+	<string name="poi_wiki_lang_sh">塞爾維亞-克羅埃西亞文維基</string>
+	<string name="poi_wiki_lang_sq">阿爾巴尼亞文維基</string>
+	<string name="poi_wiki_lang_ta">坦米爾文維基</string>
+	<string name="poi_wiki_lang_tl">菲律賓語維基</string>
+
+	<string name="poi_wiki_lang_war">瓦瑞語維基</string>
+	<string name="poi_wiki_lang_min">米南佳保語維基</string>
+	<string name="poi_wiki_lang_kk">哈薩克文維基</string>
+	<string name="poi_wiki_lang_uz">烏茲別克文維基</string>
+	<string name="poi_wiki_lang_ce">車臣語維基</string>
+	<string name="poi_wiki_lang_ur">烏爾都語維基</string>
+	<string name="poi_wiki_lang_oc">奧克語維基</string>
+	<string name="poi_wiki_lang_zhminnan">閩南語維基</string>
+	<string name="poi_wiki_lang_mg">馬拉加斯語維基</string>
+	<string name="poi_wiki_lang_tt">韃靼語維基</string>
+	<string name="poi_wiki_lang_jv">爪哇語維基</string>
+	<string name="poi_wiki_lang_ky">吉爾吉斯語維基</string>
+	<string name="poi_wiki_lang_zhyue">粵語維基</string>
+	<string name="poi_fireworks">煙火商店</string>
+
+	<string name="poi_aerialway_length">長度</string>
+
+</resources>

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

@@ -1241,7 +1241,7 @@
     <string name="index_name_canada">北美洲 - 加拿大</string>
     <string name="always_center_position_on_map">位置顯示始終處於中心</string>
     <string name="voice_pref_title">聲音</string>
-    <string name="localization_pref_title">所在地</string>
+    <string name="localization_pref_title">在地化</string>
     <string name="interrupt_music_descr">當語音預告時中斷音樂</string>
     <string name="interrupt_music">中斷音樂</string>
     <string name="misc_pref_title">雜項</string>
@@ -1313,9 +1313,9 @@
     <string name="import_file_favourites">儲存標點為 GPX 檔案或把它匯入到我的最愛？</string>
 
     <string name="color_red">紅色</string>
-    <string name="color_pink">粉紅色</string>
+    <string name="rendering_value_pink_name">粉紅色</string>
     <string name="color_orange">橙色</string>
-    <string name="color_brown">棕色</string>
+    <string name="rendering_value_brown_name">棕色</string>
     <string name="color_yellow">黃色</string>
     <string name="color_lightblue">淺藍色</string>
     <string name="color_blue">藍色</string>

OsmAnd/res/values/strings.xml

@@ -10,7 +10,7 @@
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
     
-    <string name="please_specify_poi_type_only_from_list">Please specify correct POI type or skip it. </string>
+    <string name="please_specify_poi_type_only_from_list">Please specify the correct POI type or skip it. </string>
     <string name="access_from_map_description">Menu button launches dashboard, not menu</string>
     <string name="access_from_map">Access from map</string>
     <string name="show_on_start_description">\'Off\' directly launches the map screen</string>
@@ -138,6 +138,8 @@
     <string name="rendering_value_blue_name">Blue</string>
     <string name="rendering_value_translucent_blue_name">Translucent blue</string>
     <string name="rendering_value_purple_name">Purple</string>
+    <string name="rendering_value_pink_name">Pink</string>
+    <string name="rendering_value_brown_name">Brown</string>
     <string name="rendering_value_translucent_purple_name">Translucent purple</string>
     <string name="restart_is_required">In order to fully apply the changes, a manual application restart is required.</string>
     <string name="light_theme">Light</string>
@@ -637,15 +639,6 @@
     <string name="osmo_use_server_name">Registered name</string>
     <string name="osmo_connect_to_my_nickname">My nickname</string>
     <string name="osmo_user_name">User</string>
-	<string name="color_red">red</string>
-	<string name="color_pink">pink</string>
-	<string name="color_orange">orange</string>
-	<string name="color_brown">brown</string>
-	<string name="color_yellow">yellow</string>
-	<string name="color_lightblue">light blue</string>
-	<string name="color_blue">blue</string>
-	<string name="color_green">green</string>
-
     <string name="osmo_edit_device">Change user properties</string>
     <string name="osmo_edit_color">Display color</string>
     <string name="osmo_group_info">Info</string>

OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java

@@ -28,25 +28,29 @@ import static android.util.TypedValue.COMPLEX_UNIT_DIP;
 
 public class ColorDialogs {
 	public static int[] paletteColors = new int[] {
-			R.string.color_red,
-			R.string.color_pink,
-			R.string.color_orange,
-			R.string.color_brown,
-			R.string.color_yellow,
-			R.string.color_lightblue,
-			R.string.color_blue,
-			R.string.color_green
+			R.string.rendering_value_red_name,
+			R.string.rendering_value_orange_name,
+			R.string.rendering_value_yellow_name,
+			R.string.rendering_value_lightgreen_name,
+			R.string.rendering_value_green_name,
+			R.string.rendering_value_lightblue_name,
+			R.string.rendering_value_blue_name,
+			R.string.rendering_value_purple_name,
+			R.string.rendering_value_pink_name,
+			R.string.rendering_value_brown_name
 	};
 	
 	public static int[] pallette = new int[] {
 			0xb4d00d0d,
-			0xb4e044bb,
 			0xb4ff5020,
-			0xb48e2512,
 			0xb4eeee10,
+			0xb488e030,
+			0xb400842b,
 			0xb410c0f0,
 			0xb41010a0,
-			0xb488e030
+			0xb4a71de1,
+			0xb4e044bb,
+			0xb48e2512
 	};
 
 	

OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java

@@ -229,13 +229,17 @@ public class MapContextMenu extends MenuTitleController {
 
 	public void show() {
 		if (!isVisible()) {
-			MapContextMenuFragment.showInstance(mapActivity);
+			if (!MapContextMenuFragment.showInstance(this, mapActivity)) {
+				active = false;
+			}
 		}
 	}
 
 	public void show(LatLon latLon, PointDescription pointDescription, Object object) {
 		if (init(latLon, pointDescription, object)) {
-			MapContextMenuFragment.showInstance(mapActivity);
+			if (!MapContextMenuFragment.showInstance(this, mapActivity)) {
+				active = false;
+			}
 		}
 	}
 
@@ -374,7 +378,7 @@ public class MapContextMenu extends MenuTitleController {
 				}
 			});
 			bld.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
-				
+
 				@Override
 				public void onClick(DialogInterface dialog, int which) {
 					if(defaultVls[0] == 0) {