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

OsmAnd-java/src/net/osmand/router/RoutingConfiguration.java

@@ -114,8 +114,10 @@ public class RoutingConfiguration {
 		}
 		
 		public void addImpassableRoad(RouteDataObject r) {
-			impassableRoadIds.add(r.id);
+			if (!impassableRoadIds.contains(r.id)){
-			impassableRoads.add(r);
+				impassableRoadIds.add(r.id);
+				impassableRoads.add(r);
+			}
 		}
 		
 		

OsmAnd/res/values-be/strings.xml

@@ -46,7 +46,7 @@
 	<string name="driving_region_uk">Вялікабрытанія, Індыія, Аўстралія ды іншыя</string>
 	<string name="osmodroid_mode_on">Спыніць OsMoDroid</string>    
     <string name="osmodroid_mode_off">Запусьціць OsMoDroid</string>
-    <string name="announce_gpx_waypoints">Агалошваць маршрутныя кропкі GPX</string>
+    <string name="announce_gpx_waypoints">Агалошваць маршрутныя пункты GPX</string>
     <string name="speak_title">Агалошваць…</string>
 	<string name="speak_descr">Агалошваць назвы вуліц, дарожныя перасьцярогі (вымушаныя прыпынкі, ляжачыя паліцэйскія), перасьцярогі аб камерах хуткасьці, абмежаваньні хуткасьці</string>
 	<string name="speak_street_names">Агалошваць назвы вуліц (TTS)</string>
@@ -261,7 +261,7 @@
     <string name="safe_mode_description">Працаваць у бясьпечным рэжыме (трохі павольней але бяз свойскіх бібліятэк).</string>
     <string name="safe_mode">Бясьпечны рэжым</string>
     <string name="native_library_not_running">Праграма працуе ў бясьпечным рэжыме (адключыць яго ў наладах).</string>
-    <string name="background_service_is_enabled_question">Спячы рэжым OsmAnd па-ранейшаму працуе. Вы хочаце прыпыніць яго?</string>
+    <string name="background_service_is_enabled_question">Спячы рэжым OsmAnd па-ранейшаму працуе. Хочаце прыпыніць яго?</string>
     <string name="tip_recent_changes_1_0_0_t">Змены ў версіі 1.0.0:
 	\n\t* Палепшана маршрутызацыя: хутчэй, дакладней, да 250 км
 	\n\t* Уведзены карты дарог
@@ -862,11 +862,11 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="download_files_not_enough_space">Няма вольнага месца каб зладаваць %1$s MB (вольна: %2$s).</string>
 	<string name="download_files_question_space">Вольнага месца зараз {2} MB! Зладаваць {0} файлы ({1} MB)?</string>
 	<string name="tip_navigation">Навігацыя</string>
-	<string name="tip_navigation_t">"Каб атрымаць маршрут да патрэбнага месца, вы можаце націснуць і трымаць пальцам карту ў патрэбным месцы (потым выбраць \'Маршрут у\' ў вакенцы маркера) або \'Маршруты\' пасля выбару любога пункта ў выніках пошуку або закладках. ↵
+	<string name="tip_navigation_t">"Каб атрымаць маршрут да патрэбнага месца, вы можаце націснуць і трымаць пальцам карту ў патрэбным месцы (потым выбраць «Маршрут у» ў вакенцы маркера) або «Маршруты» пасля выбару любога пункта ў выніках пошуку або закладках. ↵
-\n\nМесца прызначэньня будзе пазначана сьцягам, таксама OsmAnd пакажа адлегласць да яго і кірунак (аранжавым трыкутнікам). ↵
+\n\nМесца прызначэньня будзе пазначана сьцяжком, таксама OsmAnd пакажа адлегласць да яго і напрамак (аранжавым трохвугольнікам). ↵
-\n\nВы можаце выбраць \'Пачаць навігацыю\' па маршруце і OsmAnd будзе весці вас , прадастаўляючы галасавыя падказкі (калі магчыма) і г.д.. Ці толькі \'Паказаць маршрут\' на карце; будзе паказаны ўвесь маршрут, але не будзе адбывацца пазіцыянаванне карты згодна з бягучым становішчам, і не будзе агалошвання галасавых падказкак падчас руху. ↵
+\n\nВы можаце выбраць «Пачаць навігацыю» па маршруце і OsmAnd будзе весці вас, прадастаўляючы галасавыя падказкі (калі магчыма) і г.д. Ці толькі «Паказаць маршрут» на карце; будзе паказаны ўвесь маршрут, але не будзе адбывацца пазіцыянаванне карты згодна з бягучым становішчам, і не будзе агалошвання галасавых падказкак падчас руху. ↵
-\n\nКаб паказаць маршрут да месца прызначэння з іншага месца, а не з таго, дзе вы знаходзіцеся, пакажыце яго на карце і абярыце \'Маршрут з\'. ↵
+\n\nКаб паказаць маршрут да месца прызначэння з іншага месца, а не з таго, дзе вы знаходзіцеся, пакажыце яго на карце і абярыце «Маршрут з». ↵
-\n\nКалі вы націснеце \'Маршрут з\' разам з \'Пачаць навігацыю\', OsmAnd пакажа бягучую пазіцыю, як толькі знойдзе яе (так гэта можна выкарыстоўваць для пачатку навігацыі да таго, як месца будзе знойдзена); камбінацыя \'Маршрут з\' і \'Паказаць маршрут\' проста пакажа маршрут з любога пункту, які вы вылучыце, без наступнага абнаўлення. "</string>
+\n\nКалі вы націснеце «Маршрут з» разам з «Пачаць навігацыю», OsmAnd пакажа актуальную пазіцыю, як толькі знойдзе яе (так гэта можна выкарыстоўваць для пачатку навігацыі да таго, як месца будзе знойдзена); камбінацыя «Маршрут з» і «Паказаць маршрут» проста пакажа маршрут з любога пункту, які вы вылучыце, без наступнага абнаўлення. "</string>
 	<string name="tip_recent_changes_0_6_9_t">Змены ў 0.6.9: ↵ 
 		\n\t- Палепшана адмалёўка лакальных мапаў 
 		\n\t- Хуткі натыўная адмалёўка мапаў (эксперыментальныя налады - можа працаваць не на ўсіх прыладах) ↵ 
@@ -1051,7 +1051,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 		\n\nВакенца маркера хаваецца доўгім націсканнем на яго. ↵
 	</string>
 	<string name="tip_initial">Дапамога і хітрасьці</string>
-	<string name="tip_initial_t">"OsmAnd - навігацыйная праграма з вялікімі магчымасьцямі.\n\nПачатковыя зьвесткі, парады па выкарыстаньні і разгорнуты дапаможнік знаходзяцца ў \'Меню\' → \'Дапамога\'. "</string>
+	<string name="tip_initial_t">"OsmAnd — навігацыйная праграма з вялікімі магчымасьцямі.\n\nПачатковыя зьвесткі, парады па выкарыстаньні і разгорнуты дапаможнік знаходзяцца ў «Меню» → «Дапамога». "</string>
 	<string name="next_button">Далей</string>
 	<string name="previous_button">Назад</string>
 	<string name="unit_of_length_descr">Зьмяніць адзінкі адлегласьці й хуткасьці</string>
@@ -1360,7 +1360,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="save_current_track_descr">Захаваць бягучы сьлед на SD зараз</string>
 	<string name="save_current_track">Захаваць бягучы GPX сьлед</string>
 	<string name="save_track_interval">Інтэрвал захоўванья падчас навігацыі</string>
-	<string name="save_track_interval_descr">Пазначыць інтэрвал захоўваньня кропак сьледу падчас навігацыі</string>
+	<string name="save_track_interval_descr">Пазначыць інтэрвал захоўваньня пунктаў сьледу падчас навігацыі</string>
 	<string name="save_track_to_gpx_descrp">Сьляды будуць захаваныя ў каталог track падчас навігацыі</string>
 	<string name="save_track_to_gpx">Запісваць сьлед у GPX файл</string>
 	<string name="update_tile">Абнавіць мапу</string>
@@ -1683,15 +1683,14 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 		\n\t* \'Блакітным\' - наяўныя абнаўленні ↵
 		\n\t* Элементы паказаны курсівам - дэактываваныя дадзеныя на прыладзе ↵
 	</string>
-	<string name="tip_search_t">Вы можаце шукаць аб\'екты непасрэдна на карце праз \'Кантэкстнае меню\' → \'Шукаць побач\' ці праз экран пошуку \'Меню\' → \'Пошук\'↵ 
+	<string name="tip_search_t">"Вы можаце шукаць аб\'екты непасрэдна на карце праз «Кантэкстнае меню» → «Шукаць побач» ці праз экран пошуку «Меню» → «Пошук»↵
-		\n\nНа пошукавым экране ёсць шаблоны для пошуку ↵ 
+\n\nНа пошукавым экране ёсць шаблоны для пошуку ↵
-		\n\t * па адрасе ↵ 
+\n\t * па адрасе ↵
-		\n\t * па каардынатах↵ 
+\n\t * па каардынатах↵
-		\n\t * пошук POI (па тыпу ці назве) ↵ 
+\n\t * пошук POI (па тыпу ці назве) ↵
-		\n\t * выкарыстанне вынікаў гісторыі пошуку ↵ 
+\n\t * выкарыстанне вынікаў гісторыі пошуку ↵
-		\n\t * ці выбіраючы з захаваных кропак. ↵ 
+\n\t * ці выбіраючы з захаваных пунктаў. ↵
-		\n\nУ дапамогу да ўсіх падказак, кантэкстнае меню прапануе два варыянты: \'Маршрут\' або \'Паказаць на карце\' ↵
+\n\nУ дапамогу да ўсіх падказак, кантэкстнае меню прапануе два варыянты: «Маршрут» або «Паказаць на карце» ↵ "</string>
-	</string>
 	<string name="tip_favorites_t">"Кропкі, што часта выкарыстоўваюцца могуць быць дададзены ў Закладкі. ↵
 \n\nКаб дадаць кропкі ў закладі, адкрыйце кантэкстнае меню карты, выберыце пункт \'Дадаць у Закладкі\' і дадайце назву закладкі. ↵
 \n\nПасля дадання ў закладі, яна будзе даступная ў \'Меню\' → \'Мае мясьціны\'. Доўгі націск на закладку ў меню \'Закладкі\' дазволіць ўсталяваць яе ў якасці месца прызначэння, рэдагаваць яе або выдаліць. ↵
@@ -1756,13 +1755,13 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="osmo_session_id_share">URL сесіі для адсочваньня прыстасаваньня (%1$s)</string>
     <string name="osmo_track_interval_descr">Выберыце часавы інтэрвал для адпраўкі месцазнаходжаньня</string>
     <string name="int_days">дзён</string>
-    <string name="osmo_connect_menu">Падлучыцца</string>
+    <string name="osmo_connect_menu">Падключыцца</string>
     <string name="osmo_group_description">Апісаньне</string>
     <string name="osmo_group_policy">Палітыка</string>
     <string name="osmo_connect_to_group_id">ID групы</string>
     <string name="osmo_group_name">Назва групы</string>
     <string name="osmo_connect_to_group">Падлучыцца да групы</string>
-    <string name="osmo_connect">Падлучыцца да</string>
+    <string name="osmo_connect">Падключыцца да</string>
     <string name="osmo_create_group">Стварыць групу</string>
     <string name="osmo_server_operation_failed">Памылка аперацыі на сэрвэры OsMo</string>
     <string name="osmo_activity">Маніторынг OpenStreetMap</string>
@@ -1821,11 +1820,12 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="gpx_timespan">Прамежак часу: %1$s</string>
 	<string name="gpx_timemoving">Час руху: %1$s</string>
     <string name="gpx_selection_segment_title">Сегмент</string>
-    <string name="gpx_selection_number_of_points"> %1$s кропак</string>
+    <string name="gpx_selection_number_of_points">" %1$s пунктаў"</string>
-    <string name="gpx_selection_point">Кропка %1$s</string>
+    <string name="gpx_selection_point">Пункт %1$s</string>
     <string name="gpx_selection_current_track">запіс</string>
     <string name="gpx_selection_route_points">%1$s \nПунктаў маршруту %2$s</string>
-    <string name="gpx_selection_points">%1$s \nКропкі</string>
+    <string name="gpx_selection_points">%1$s
+\nПункты</string>
     <string name="gpx_selection_track">%1$s \nСьлед %2$s</string>
     <string name="gpx_info_subtracks">Частак сьледу: %1$s </string>
 	<string name="gpx_split_interval">Інтэрвал нарэзкі</string>
@@ -1833,31 +1833,31 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="gpx_info_asc_altitude">Пад’ём/спад: %1$s</string>
     <string name="loading_smth">Загрузка %1$s…</string>
     <string name="map_widget_plain_time">Бягучы час</string>
-    <string name="gpx_wpt">Кропка шляху</string>
+    <string name="gpx_wpt">Пункт шляху</string>
     <string name="selected_gpx_info_show">\n\nНацісьніце і ўтрымлівайце, каб убачыць на мапе</string>
     <string name="delay_navigation_start">Аўтаматычна пачаць навігацыю</string>
     <string name="gpx_info_diff_altitude">Перапад вышынь: %1$s</string>
 	<string name="save_as_favorites_points">Захаваць як групу упадабаных</string>
-    <string name="select_destination_and_intermediate_points">Абраць кропкі шляху</string>
+    <string name="select_destination_and_intermediate_points">Абраць пункты шляху</string>
-    <string name="layer_amenity_label">Назвы кропак</string>
+    <string name="layer_amenity_label">Назвы пунктаў</string>
     <string name="show_zoom_buttons_navigation">Паказваць кнопкі маштабаваньня</string>
     <string name="show_zoom_buttons_navigation_descr">Паказваць кнопкі маштабаваньня падчас навігацыі</string>
     <string name="visible_element">Паказваць на мапе</string>
-    <string name="sort_by_distance">Сартаваць па адлегласьці</string>
+    <string name="sort_by_distance">Сартаваць паводле адлегласьці</string>
-    <string name="sort_by_name">Сартаваць па назьве</string>
+    <string name="sort_by_name">Сартаваць паводле назвы</string>
     <string name="none_selected_gpx">GPX файлы ня выбраныя. Каб выбраць націсьніце і ўтрымлівайце наяўны сьлед.</string>
     <string name="local_index_unselect_gpx_file">Ачысьціць</string>
     <string name="local_index_select_gpx_file">Выбраць для паказу</string>
     <string name="no_index_file_to_download">Няма чаго сьцягваць, калі-ласка, праверце Інтэрнэт злучэньне.</string>
     <string name="osmo_not_signed_in">Не ўдалося ўвайсьці ў OsMo</string>
     <string name="osmo_gpx_points_downloaded">Загружана %1$s кропак OsMo.</string>
-    <string name="osmo_auto_connect_descr">Аўтаматычнае падлучэньне да службы пасьля запуску праграмы</string>
+    <string name="osmo_auto_connect_descr">Аўтаматычнае падключэньне да службы пасьля запуску праграмы</string>
-    <string name="osmo_auto_connect">Аўтаматычнае падлучэньне</string>
+    <string name="osmo_auto_connect">Аўтаматычнае падключэньне</string>
     <string name="osmo_start_service">Служба OsMo</string>
     <string name="osmo_gpx_track_downloaded">Загружаны %1$s сьлед OsMo.</string>
     <string name="osmo_group_by_invite">Уваход па запрашэньнi</string>
     <string name="osmo_group_information">Калі ласка, прачытайце перад стварэньнем групы!</string>
-    <string name="osmo_group_information_desc">" - Усе створаныя групы з\\\'яўляюцца агульнымі! Калі вы хочаце заставацца ананімным, падлучайце прыладу наўпрост праз Tracker-ідэнтыфікатар.
+    <string name="osmo_group_information_desc">" - Усе створаныя групы з\'яўляюцца агульнымі! Калі вы хочаце заставацца ананімным, падключайце прыладу наўпрост праз Tracker-ідэнтыфікатар.
 \n - Група мажа быць зарэгістраваная на 16 чалавек.
 \n - У выпадку бяздзейнасці або актыўнасці толькі 1 чалавека на працягу 2 тыдняў, група будзе выдаленая.
 \n - Вы можаце абмежаваць ўваход у групу, напрыклад па запрашэнні, але для кантрольню групай, вам неабходна скарыстацца кансольлю адміністратара.
@@ -1947,7 +1947,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="save_track_to_gpx_globally_descr">Агульны запіс месцазнаходжаньня ў GPX файл можа быць уключаны або выключаны з дапамогай кнопкі запісу GPX на экране з мапай</string>
 	<string name="confirm_every_run">Пытацца заўсёды</string>
 	<string name="save_global_track_interval_descr">Выберыце інтэрвал рэгістравання для запісвання агульнага шляху (ўмыкаецца віджэтам запісу GPX на мапе)</string>
-	<string name="save_global_track_interval">Агульны інтарвал запісвання</string>
+	<string name="save_global_track_interval">Агульны інтэрвал запісвання</string>
 	<string name="traffic_warning_speed_limit">Абмежаваньне хуткасьці</string>
     <string name="traffic_warning_border_control">Памежны кантроль</string>
     <string name="traffic_warning_payment">Платны праезд</string>
@@ -1955,35 +1955,35 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="traffic_warning_calming">Зьнізьце хуткасьць</string>
     <string name="traffic_warning_speed_camera">Фотарадар</string>
     <string name="traffic_warning">Абмежаваньне руху</string>
-	<string name="text_size_descr">Абраць памер тэксту на мапе.</string>
+	<string name="text_size_descr">Зьмяніць памер тэксту на мапе.</string>
     <string name="text_size">Памер тэксту</string>
     <string name="speed_limit_exceed">Дапушчальнае значэньне перавышэньня хуткасьці</string>
 	<string name="speed_limit_exceed_message">Задаць дапушчальнае значэньне перавышэньня хуткасьці, пры якім вы атрымаеце галасавое паведамленьне.</string>
 	<string name="fav_point_emoticons_message">Назва ўлюбёнай кропкі была зьменена на %1$s для магчымасьці захаваньня радка з эматыконам ў файл.</string>
-    <string name="print_route">Друк маршруту</string>
+    <string name="print_route">Паказаць маршрут</string>
     <string name="test_native_render">Тэст натыўнай візуалізацыі</string>
-    <string name="fav_point_dublicate">Дубляваньне назвы ўлюбёнай кропкі</string>
+    <string name="fav_point_dublicate">Дубляваньне назвы ўлюбёнага пункту</string>
-    <string name="fav_point_dublicate_message">Назва ўлюбёнай кропкі %1$s была зьменена для прадухіленьня дубляваньня імёнаў.</string>
+    <string name="fav_point_dublicate_message">Назва ўлюбёнага пункту %1$s была зьменена для прадухіленьня дубляваньня імёнаў.</string>
     <string name="use_native_render">Выкарыстоўваць натыўную візуалізацыю</string>
     <string name="use_native_render_descr">Выкарыстоўваць С++ візуалізацыю замест Java</string>
     <string name="local_index_description">Націсьніце на любы элемент сьпісу для прагляду больш падрабязнай інфармацыі, націсьніце і ўтрымлівайце, каб зьмясціць у архіў ці выдаліць. Бягучыя дадзеныя на прыстасаваньні (%1$s вольна):</string>
-	<string name="osmo_device_not_found">Прыстасаваньне не знойдзена</string>
+	<string name="osmo_device_not_found">Прыстасаваньне ня знойдзенае</string>
     <string name="anonymous_user">Ананімны карыстальнік</string>
     <string name="logged_as">Вы ўвайшлі як %1$s</string>
-	<string name="osmo_no_connection_msg">Сэрвіс OsMo не даступны:\n- Праверце злучэньне;\n- Праверце налады;\n- Праверце наш Twitter: https://twitter.com/OsMomobi</string>
+	<string name="osmo_no_connection_msg">Сэрвіс OsMo не даступны:\n- Праверце спалучэньне;\n- Праверце налады;\n- Праверце наш Twitter: https://twitter.com/OsMomobi</string>
-    <string name="anonymous_user_hint">Ананімнаму карыстальніку недаступна:\n- Стварэньне групаў;\n- Сінхранізацыя групаў і прыстасаваньняў з серверам;\n- Кіраваньне групамі і прыстасаваньнямі ў асабістым кабінеце.</string>
+    <string name="anonymous_user_hint">Ананімнаму карыстальніку недаступныя:\n- Вытварэньне груп;\n- Сінхранізацыя груп і прыстасаваньняў з серверам;\n- Кіраваньне групамі і прыстасаваньнямі ў асабістым кабінеце.</string>
     <string name="test_native_render_msg">Пачаць працу з натыўнай візуалізацыяй</string>
     <string name="configure_map">Настройка мапы</string>
     <string name="search_radius_proximity">Паблізу ад</string>
     <string name="rendering_category_details">Падрабязнасьці</string>
     <string name="rendering_category_transport">Транспарт</string>
     <string name="layers_category_show">Паказаць</string>
-	<string name="map_widget_top">Радок стану</string>
+	<string name="map_widget_top">Статусны радок</string>
 	<string name="map_widget_right">Правая панэль</string>
 	<string name="map_widget_left">Левая панэль</string>
     <string name="rendering_category_others">Іншыя атрыбуты мапы</string>
     <string name="map_widget_appearance_rem">Астатнія элементы</string>
-    <string name="tip_recent_changes_1_9_t">"Зьмены ў 1.9: * Абноўлены стылі мапы з паказам пакрыцьця дарог, транспартным слоем і пешаходнымі сімваламі * Пошук POI ўздоўж маршруту * Пазнака дарогі як непраходнай * Лягчэй спампоўваць і абнаўляць мапы * Атрыманьне візуальнага і гукавага апавяшчэньня пры набліжэньні да кропкі маршруту * Друк маршруту і інфармацыі пра паваторы * Падтрымка палос для павароту * Падтрымка Android Wear * Шмат зьменаў інтэрфейсу * Асобны зум для тэксту на мапе * Спецыяльныя аўдыё апавяшчэньні ў выпадку, калі вы знаходзіцеся па-за маршрутам * Функцыя аўтарызацыі OsMo * Выпраўлена несумяшчальнасьць версій OsMo "</string>
+    <string name="tip_recent_changes_1_9_t">"Зьмены ў 1.9: * Абноўленыя стылі мапы з паказам пакрыцьця дарог, транспартным слоем і пешаходнымі сімваламі * Пошук POI ўздоўж маршруту * Пазначэньне дарогі як непраходнай * Лягчэй спампоўваць і абнаўляць мапы * Атрыманьне візуальнага і гукавага апавяшчэньня пры набліжэньні да пункту маршруту * Паказ маршруту і інфармацыі пра павароты * Падтрымка палос для павароту * Падтрымка Android Wear * Шмат зьменаў інтэрфейсу * Асобны зум для тэксту на мапе * Спецыяльныя аўдыёапавяшчэньні ў выпадку, калі вы знаходзіцеся па-за маршрутам * Функцыя аўтарызацыі OsMo * Выпраўлена несумяшчальнасьць версій OsMo "</string>
     <string name="rendering_category_routes">Маршруты</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Чыгуначныя маршруты</string>
     <string name="rendering_attr_tramRoutes_name">Трамвайныя маршруты</string>
@@ -1998,5 +1998,5 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="wake_on_voice_descr">Уключаць экран тэлефона пры набліжэньні да павароту</string>
     <string name="wake_on_voice_never">Ніколі</string>
     <string name="lock_screen_request_explanation">%1$s патрабуе дазвол на выключэньне экрану для энергазберажэньня.</string>
-    <string name="advanced_settings">Пашыраны</string>
+    <string name="advanced_settings">Дадатковыя</string>
 	</resources>

OsmAnd/res/values-cs/bidforfix.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
     <string name="bidforfix_loading">Nahrávám</string>
-    <string name="bidforfix_supporters">%1$d sponzorů</string>
+    <string name="bidforfix_supporters">%1$d Příznivců</string>
 	<string name="bidforfix_funded">sponzorováno: %d%%</string>    
-</resources>
+</resources>

OsmAnd/res/values-cs/phrases.xml

@@ -0,0 +1,199 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="poi_bakery">Pekařství</string>
+	<string name="poi_alcohol">Obchod s alkoholem</string>
+	<string name="poi_convenience">Samoobsluha</string>
+	<string name="poi_mall">Obchodní dům</string>
+	<string name="poi_beverages">Obchod s nápoji</string>
+	<string name="poi_butcher">Masna</string>
+	<string name="poi_deli">Delikatesy</string>
+	<string name="poi_shop_farm"/>
+	<string name="poi_greengrocer"/>
+	<string name="poi_seafood"/>
+	<string name="poi_supermarket">Supermarket</string>
+	<string name="poi_bookshop">Knihkupectví</string>
+	<string name="poi_bicycle_shop"/>
+	<string name="poi_anime_shop"/>
+	<string name="poi_antiques_shop">Starožitnosti</string>
+	<string name="poi_art_shop"/>
+	<string name="poi_baby_goods">Dětské zboží</string>
+	<string name="poi_bag_shop"/>
+	<string name="poi_bathroom_furnishing_shop"/>
+	<string name="poi_bed_shop"/>
+	<string name="poi_boutique">Módní butik</string>
+	<string name="poi_carpet_shop"/>
+	<string name="poi_chemist_shop">Drogerie</string>
+	<string name="poi_clothes_shop"/>
+	<string name="poi_children_clothes_shop"/>
+	<string name="poi_shoes">Obuv</string>
+	<string name="poi_computer_shop"/>
+	<string name="poi_copyshop"/>
+	<string name="poi_hardware_shop">Železářství</string>
+	<string name="poi_tobacco_shop">Tabák</string>
+	<string name="poi_dive_shop">Potapěčské vybavení</string>
+	<string name="poi_hunting_shop">Lovecké vybavení</string>
+	<string name="poi_jewelry_shop">Klenotnictví</string>
+	<string name="poi_kiosk">Kiosek</string>
+	<string name="poi_kitchen_shop">Kuchyňské náčiní</string>
+	<string name="poi_musical_instrument_shop">Hudební nástroje</string>
+	<string name="poi_optician_shop">Optik</string>
+	<string name="poi_pet_shop">Zverimex</string>
+	<string name="poi_sports_shop">Sportovní vybavení</string>
+	<string name="poi_toys_shop">Hračkářství</string>
+	<string name="poi_cosmetics_shop">Kosmetika</string>
+	<string name="poi_marketplace">Tržiště</string>
+	<string name="poi_police">Policie</string>
+	<string name="poi_fire_station">Hasiči</string>
+	<string name="poi_emergency_phone">Nouzový telefon</string>
+	<string name="poi_fire_hydrant">Hydrant</string>
+	<string name="poi_fire_extinguisher">Hasicí přístroj</string>
+	<string name="poi_ambulance_station">Ambulance</string>
+	<string name="poi_ford">Brod</string>
+	<string name="poi_mountain_pass">Horské sedlo</string>
+	<string name="poi_gate">Brána</string>
+	<string name="poi_toll_booth">Mýtné</string>
+	<string name="poi_border_control">Hraniční kontrola</string>
+	<string name="poi_traffic_signals">Semafor</string>
+
+	<string name="poi_car_repair">Opravna aut</string>
+	<string name="poi_service_tyres">Pneu</string>
+	<string name="poi_car_wash">Myčka</string>
+	<string name="poi_fuel">Čerpací stanice</string>
+	<string name="poi_charging_station">Dobíjecí stanice</string>
+	<string name="poi_parking">Parkování</string>
+	<string name="poi_garages">Garáže</string>
+
+	<string name="poi_public_transport_platform">Zastávka veřejné dopravy</string>
+	<string name="poi_public_transport_platform_bus">Autobusová zastávka</string>
+	<string name="poi_public_transport_platform_trolleybus">Zastávka trolejbusu</string>
+	<string name="poi_bus_stop">Zastávka autobusu (zastaralé)</string>
+	<string name="poi_public_transport_platform_tram">Tramvajová zastávka</string>
+	<string name="poi_public_transport_station">Zastávka veřejné dopravy</string>
+	<string name="poi_airport">Letiště</string>
+	<string name="poi_lighthouse">Maják</string>
+
+	<string name="poi_bicycle_rental">Půjčovna kol</string>
+	<string name="poi_tunnel">Tunel</string>
+	<string name="poi_bridge">Most</string>
+
+	<string name="poi_turning_circle">Kruhový objezd</string>
+
+	<string name="poi_post_office">Pošta</string>
+	<string name="poi_post_box">Poštovní schránka</string>
+	<string name="poi_telephone">Telefon</string>
+	<string name="poi_communication_tower">Komunikační věž</string>
+	<string name="poi_windmill">Větrný mlýn</string>
+	<string name="poi_vineyard">Vinohrad</string>
+	<string name="poi_school">Škola</string>
+	<string name="poi_kindergarten">Školka</string>
+	<string name="poi_college">Kolej</string>
+	<string name="poi_university">Univerzita</string>
+
+	<string name="poi_prison">Vězení</string>
+	<string name="poi_embassy">Ambasáda</string>
+	<string name="poi_first_aid">První pomoc</string>
+	<string name="poi_dentist">Zubař</string>
+	<string name="poi_veterinary">Veterinář</string>
+	<string name="healthcare_alternative"/>
+	<string name="blood_bank">Krevní banka</string>
+	<string name="optometrist">Optik</string>
+	<string name="physiotherapist">Fyzioterapeut</string>
+	<string name="psychotherapist">Psychoterapeut</string>
+	<string name="healthcare_yes"/>
+
+	<string name="poi_company">Společnost</string>
+	<string name="poi_insurance">Pojištění</string>
+	<string name="poi_lawyer">Právník</string>
+	<string name="poi_archery">Lukostřelba</string>
+	<string name="poi_athletics">Atletika</string>
+	<string name="poi_baseball">Baseball</string>
+	<string name="poi_basketball">Basketbal</string>
+	<string name="poi_beachvolleyball">Plážový volejbal</string>
+	<string name="poi_chess">Šachy</string>
+	<string name="poi_cricket">Kriket</string>
+	<string name="poi_croquet">Kroket</string>
+	<string name="poi_dog_racing">Psí závody</string>
+	<string name="poi_golf">Golf</string>
+	<string name="poi_hockey">Hokej</string>
+	<string name="poi_skiing">Lyžování</string>
+	<string name="poi_soccer">Fotbal</string>
+	<string name="poi_swimming">Plavání</string>
+	<string name="poi_table_tennis">Stolní tenis</string>
+	<string name="poi_tennis">Tenis</string>
+	<string name="poi_volleyball">Volejbal</string>
+
+	<string name="poi_attraction">Turistická atrakce</string>
+	<string name="poi_memorial">Památník</string>
+	<string name="poi_castle">Hrad</string>
+	<string name="poi_city_gate">Městská brána</string>
+	<string name="poi_fort">Pevnost</string>
+	<string name="poi_fountain">Fontána</string>
+	<string name="poi_wreck">Vrak lodi</string>
+	<string name="poi_monument">Památník</string>
+	<string name="poi_zoo">Zoo</string>
+	<string name="poi_hotel">Hotel</string>
+	<string name="poi_motel">Motel</string>
+	<string name="poi_hostel">Hostel</string>
+	<string name="poi_monastery">Klášter</string>
+	<string name="poi_clock">Hodiny</string>
+	<string name="poi_cemetery">Hřbitov</string>
+	<string name="poi_grave_yard">Pohřebiště</string>
+	<string name="poi_club_chess">Šachový klub</string>
+	<string name="poi_club_linux">Linux klub</string>
+	<string name="poi_library">Knihovna</string>
+	<string name="poi_cinema">Kino</string>
+	<string name="poi_theatre">Divadlo</string>
+	<string name="poi_circus">Cirkus</string>
+	<string name="poi_miniature_golf">Mini golf</string>
+	<string name="poi_park">Park</string>
+
+	<string name="poi_cafe">Kavárna</string>
+	<string name="poi_restaurant">Restaurace</string>
+	<string name="poi_fast_food">Rychlé občerstvení</string>
+	<string name="poi_bar">Bar</string>
+	<string name="poi_drinking_water">Pitná voda</string>
+	<string name="poi_barbecue"/>
+
+	<string name="poi_beekeeper">Včelař</string>
+	<string name="poi_blacksmith">Kovář</string>
+	<string name="poi_brewery">Pivovar</string>
+	<string name="poi_clockmaker">Hodinář</string>
+	<string name="poi_electrician">Elektrikář</string>
+	<string name="poi_gardener">Zahradník</string>
+	<string name="poi_jeweller">Klenotník</string>
+	<string name="poi_locksmith">Zámečník</string>
+	<string name="poi_optician">Optik</string>
+	<string name="poi_painter">Malíř</string>
+	<string name="poi_parquet_layer">Parketář</string>
+	<string name="poi_photographer">Fotograf</string>
+	<string name="poi_plumber">Instalatér</string>
+	<string name="poi_sculptor">Sochař</string>
+	<string name="poi_shoemaker">Obuvník</string>
+	<string name="poi_stonemason">Kameník</string>
+	<string name="poi_tailor">Krejčí</string>
+	<string name="poi_tiler">Pokrývač</string>
+	<string name="poi_tinsmith">Klempíř</string>
+	<string name="poi_beauty_salon">Salón krásy</string>
+	<string name="poi_hairdresser">Kadeřník</string>
+	<string name="poi_tattoo">Tetovací studio</string>
+	<string name="poi_car_rental">Půjčovna aut</string>
+	<string name="poi_sauna">Sauna</string>
+	<string name="poi_mortuary">Márnice</string>
+	<string name="poi_crematorium">Krematorium</string>
+	<string name="poi_bank">Banka</string>
+	<string name="poi_atm">Bankomat</string>
+	<string name="poi_accountant">Účetní</string>
+	<string name="poi_saddle">Sedlo</string>
+	<string name="poi_volcano">Vulkán</string>
+	<string name="poi_crater">Kráter</string>
+	<string name="poi_waterfall">Vodopád</string>
+	<string name="poi_beach">Pláž</string>
+	<string name="poi_bay">Záliv</string>
+	<string name="poi_fjord">Fjord</string>
+	<string name="poi_nature_reserve">Přírodní rezervace</string>
+	<string name="poi_island">Ostrov</string>
+	<string name="poi_seamark_anchorage">Kotviště</string>
+	<string name="poi_seamark_dry_dock">Suchý dok</string>
+	<string name="poi_seamark_harbour">Přístav</string>
+	<string name="poi_military_barracks">Kasárna</string>
+	<string name="poi_military_danger_area">Nebezpečná oblast</string>
+	</resources>

OsmAnd/res/values-da/phrases.xml

@@ -0,0 +1,624 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+        <string name="poi_bakery">Bager</string>
+        <string name="poi_alcohol">Vinhandel</string>
+        <string name="poi_convenience">Nærbutik</string>
+        <string name="poi_mall">Butikscenter</string>
+        <string name="poi_beverages">Drikkevarebutik</string>
+        <string name="poi_butcher">Kødmarked</string>
+        <string name="poi_deli">Delikatesser</string>
+        <string name="poi_shop_farm">Gårdbutik</string>
+        <string name="poi_greengrocer">Grønthandler</string>
+        <string name="poi_seafood">Fiskehandler</string>
+        <string name="poi_confectionery">Konfektureforretning</string>
+        <string name="poi_ice_cream">Isbar</string>
+        <string name="poi_supermarket">Supermarked</string>
+        <string name="poi_shop_tea">Tebutik</string>
+        <string name="poi_dairy">Mejeriudsalg</string>
+        <string name="poi_vending_machine">Automat</string>
+
+        <string name="poi_bookshop">Boghandel</string>
+        <string name="poi_bicycle_shop">Cykelhandler</string>
+        <string name="poi_anime_shop">Anime butik</string>
+        <string name="poi_antiques_shop">Antikviteter</string>
+        <string name="poi_art_shop">Kunsthandler</string>
+        <string name="poi_baby_goods">Babyudstryr</string>
+        <string name="poi_bag_shop">Tasker</string>
+        <string name="poi_bathroom_furnishing_shop">Badeværelser</string>
+        <string name="poi_bed_shop">Senge</string>
+        <string name="poi_boutique">Modebutik</string>
+        <string name="poi_carpet_shop">Tæppeforretning</string>
+        <string name="poi_chemist_shop">Materialist</string>
+        <string name="poi_clothes_shop">Tøjbutik</string>
+        <string name="poi_children_clothes_shop">Børnetøj</string>
+        <string name="poi_shoes">Skobutik</string>
+        <string name="poi_computer_shop">Computerbutik</string>
+        <string name="poi_copyshop">Kopicenter</string>
+        <string name="poi_curtain_shop">Gardinforretning</string>
+        <string name="poi_fabric_shop">Stofbutik</string>
+        <string name="poi_bedding_shop">Sengetøj</string>
+        <string name="poi_dive_shop">Dykkerudstyr</string>
+        <string name="poi_doityourself_shop">Byggemarked</string>
+        <string name="poi_erotic_shop">Sexshop</string>
+        <string name="poi_fishing_shop">Fiskegrej</string>
+        <string name="poi_florist">Blomsterhandler</string>
+        <string name="poi_frame_shop">Rammer</string>
+        <string name="poi_furniture_shop">Møbelforretning</string>
+        <string name="poi_garden_centre">Havecenter</string>
+        <string name="poi_gas_shop">Flaskegas</string>
+        <string name="poi_general_shop">Landhandel</string>
+        <string name="poi_gift_shop">Gavebutik</string>
+        <string name="poi_glaziery_shop">Glarmester</string>
+        <string name="poi_hardware_shop">Værktøj</string>
+        <string name="poi_hearing_aids_shop">Høreapparater</string>
+        <string name="poi_herbalist">Urter</string>
+        <string name="poi_hifi_shop">HiFi</string>
+        <string name="poi_houseware_shop">Isenkræmmer</string>
+        <string name="poi_hunting_shop">Jagtudstyr</string>
+        <string name="poi_interior_decoration_shop">Boligindretning</string>
+        <string name="poi_jewelry_shop">Smykkeforretning</string>
+        <string name="poi_kiosk">Kiosk</string>
+        <string name="poi_kitchen_shop">Køkkengrej</string>
+        <string name="poi_mobile_phone_shop">Mobiltelefoner</string>
+        <string name="poi_motorcycle_shop">Motorcykler</string>
+        <string name="poi_musical_instrument_shop">Musikinstrumenter</string>
+        <string name="poi_newsagent_shop">Nyhedsbureau</string>
+        <string name="poi_optician_shop">Optiker</string>
+        <string name="poi_organic_shop">Økologiske fødevarer</string>
+        <string name="poi_outdoor_shop">Fritidsbeklædning</string>
+        <string name="poi_paint_shop">Maling</string>
+        <string name="poi_pet_shop">Dyrehandel</string>
+        <string name="poi_radiotechnics_shop">Radiodele</string>
+        <string name="poi_second_hand">Genbrugsbutik</string>
+        <string name="poi_ship_chandler">Skibsproviantere</string>
+        <string name="poi_sports_shop">Sportsforretning</string>
+        <string name="poi_stationery_shop">Papirvare</string>
+        <string name="poi_tableware_shop">Isenkræmmer</string>
+        <string name="poi_ticket_shop">Biletter</string>
+        <string name="poi_tobacco_shop">Tobak</string>
+        <string name="poi_toys_shop">Legetøj</string>
+        <string name="poi_trade_shop">Handelsplads</string>
+        <string name="poi_vacuum_cleaner_shop">Støvsuger</string>
+        <string name="poi_variety_store">Fastpris butik</string>
+        <string name="poi_video_shop">Video</string>
+        <string name="poi_window_blind_shop">Persienner</string>
+        <string name="poi_department_store">Stormagasin</string>
+        <string name="poi_electronics_shop">Elektronik</string>
+        <string name="poi_car_shop">Autohandel</string>
+        <string name="poi_car_parts_shop">Biltilbehør</string>
+        <string name="poi_atv_shop">ATV</string>
+        <string name="poi_cosmetics_shop">Kosmetik</string>
+        <string name="poi_marketplace">Markedsplads</string>
+        <string name="poi_sewing_shop">Konfektion</string>
+
+        <string name="poi_police">Politi</string>
+        <string name="poi_fire_station">Brandstation</string>
+        <string name="poi_emergency_phone">Nødtelefon</string>
+        <string name="poi_fire_hydrant">Brandhane</string>
+        <string name="poi_fire_extinguisher">Brandslukker</string>
+        <string name="poi_fire_flapper">Branddasker</string>
+        <string name="poi_fire_hose">Brandslange</string>
+        <string name="poi_fire_water_pond">Branddam</string>
+        <string name="poi_grit_bin">Grusbeholder</string>
+        <string name="poi_ambulance_station">Ambulance station</string>
+        <string name="poi_ses_station">SES station</string>
+        <string name="poi_emergency_access_point">Nødstilfælde punkt</string>
+
+        <string name="poi_ford">Vadested</string>
+        <string name="poi_mountain_pass">Bjergpas</string>
+        <string name="poi_gate">Port</string>
+        <string name="poi_city_wall">Bymur</string>
+        <string name="poi_lift_gate">Vippebom</string>
+        <string name="poi_toll_booth">Betalingsanlæg</string>
+        <string name="poi_border_control">Grænsekontrol</string>
+        <string name="poi_traffic_calming_bump">Trafikdæmpning, bump</string>
+        <string name="poi_traffic_calming_hump">Trafikdæmpning, hump</string>
+        <string name="poi_traffic_calming_cushion">Trafikdæmpning, pude</string>
+        <string name="poi_traffic_calming_chicane">Trafikdæmpning, chikane</string>
+        <string name="poi_traffic_calming_rumble_strip">Rumlestriber</string>
+        <string name="poi_traffic_calming_table">Trafikdæmpning, bord</string>
+        <string name="poi_traffic_calming_choker">Indsnævring</string>
+        <string name="poi_traffic_signals">Trafiksignal</string>
+
+        <string name="poi_car_repair">Autoværksted</string>
+        <string name="poi_service_tyres">Dækservice</string>
+        <string name="poi_vehicle_inspection">Bilsyn</string>
+        <string name="poi_car_wash">Bilvask</string>
+        <string name="poi_fuel">Benzintank</string>
+        <string name="poi_charging_station">Ladestation</string>
+        <string name="poi_vehicle_ramp">Kørerampe</string>
+        <string name="poi_compressed_air">Trykluft</string>
+        <string name="poi_parking">Parkering</string>
+        <string name="poi_motorcycle_parking">Motorcykelparkering</string>
+        <string name="poi_parking_entrance">Parkering indgang</string>
+        <string name="poi_garages">Garager</string>
+
+        <string name="poi_public_transport_platform">Offentlig transport stoppested</string>
+        <string name="poi_public_transport_platform_bus">Busstoppested</string>
+        <string name="poi_public_transport_platform_trolleybus">Trolley busstoppested</string>
+        <string name="poi_bus_stop">Busstoppested</string>
+        <string name="poi_public_transport_platform_tram">Sporvognsstoppested</string>
+        <string name="poi_tram_stop">Sporvognsstoppestedet</string>
+        <string name="poi_public_transport_station">Offentlig transport station</string>
+        <string name="poi_bus_station">Busstation</string>
+        <string name="poi_railway_station">Banegård (forældet)</string>
+        <string name="poi_railway_platform">Perron (forældet)</string>
+        <string name="poi_railway_halt">Trinbrædt</string>
+        <string name="poi_subway_entrance">Metro indgang</string>
+        <string name="poi_subway_station">Metrostation</string>
+        <string name="poi_taxi">Taxaholdeplads</string>
+
+        <string name="poi_airport">Lufthavn</string>
+        <string name="poi_helipad">Helikopterlandingsplads</string>
+        <string name="poi_runway">Landingsbane</string>
+        <string name="poi_aeroway_terminal">Lufthavnsterminal</string>
+        <string name="poi_aeroway_gate">Gate</string>
+
+        <string name="poi_slipway">Slæbested</string>
+        <string name="poi_ferry_terminal">Færgeterminal</string>
+        <string name="poi_lighthouse">Fyrtårn</string>
+
+        <string name="poi_bicycle_rental">Cykeludlejning</string>
+        <string name="poi_bicycle_parking">Cykelparkering</string>
+
+        <string name="poi_aerialway_station">Liftstation</string>
+        <string name="poi_aerialway_cable_car">Svævebane</string>
+        <string name="poi_aerialway_gondola">Gondol</string>
+        <string name="poi_aerialway_chair_lift">Stolelift</string>
+        <string name="poi_aerialway_t_bar">T-bar lift</string>
+        <string name="poi_aerialway_j_bar">J-bar lift</string>
+        <string name="poi_aerialway_platter">Tallerken lift</string>
+        <string name="poi_aerialway_mixed_lift">Blandet lift</string>
+        <string name="poi_aerialway_drag_lift">Træklift</string>
+        <string name="poi_aerialway_rope_tow">Reblift</string>
+        <string name="poi_aerialway_goods">Varelift</string>
+        <string name="poi_aerialway_magic_carpet">Tæppelift</string>
+
+        <string name="poi_tunnel">Tunnel</string>
+        <string name="poi_bridge">Bro</string>
+
+        <string name="poi_speed_camera">Fartkamera</string>
+        <string name="poi_turning_circle">Vendecirkel</string>
+
+        <string name="poi_water_well">Brønd</string>
+        <string name="poi_standpipe">Standrør</string>
+        <string name="poi_water_works">Vandværker</string>
+        <string name="poi_boatyard">Værft</string>
+        <string name="poi_wastewater_plant">Renseanlæg</string>
+        <string name="poi_water_tower">Vandtårn</string>
+        <string name="poi_lock_gate">Sluseport</string>
+        <string name="poi_waterway_turning_point">Vendepunkt på vandet</string>
+        <string name="poi_weir">Stemmeværk</string>
+        <string name="poi_dam">Dæmning</string>
+        <string name="poi_water_mill">Vandmølle</string>
+
+        <string name="poi_power_substation">Transformerstation</string>
+        <string name="poi_power_transformer">Transformator</string>
+        <string name="poi_power_plant">Kraftværk</string>
+        <string name="poi_power_generator">Strømgenerator</string>
+
+        <string name="poi_post_office">Posthus</string>
+        <string name="poi_post_box">Postkasse</string>
+        <string name="poi_telephone">Telefon</string>
+        <string name="poi_communication_tower">Kommunikation tårn</string>
+        <string name="poi_telephone_exchange">Telefoncentral</string>
+
+        <string name="poi_recycling">Genbrugsplads</string>
+        <string name="poi_landfill">Losseplads</string>
+        <string name="poi_waste_disposal">Bortskaffelse af affald</string>
+        <string name="poi_waste_basket">Skraldespand</string>
+
+        <string name="poi_surveillance">Overvågning</string>
+        <string name="poi_construction">Byggeri</string>
+        <string name="poi_works">Værker</string>
+        <string name="poi_mineshaft">Mineskakt</string>
+        <string name="poi_adit">Stoll</string>
+        <string name="poi_petroleum_well">Oliebrønd</string>
+        <string name="poi_survey_point">Landmålings punkt</string>
+        <string name="poi_windmill">Vindmølle</string>
+        <string name="poi_quarry">Stenbrud</string>
+        <string name="poi_vineyard">Vingård</string>
+        <string name="poi_orchard">Frugtplantage</string>
+        <string name="poi_salt_pond">Saltdam</string>
+        <string name="poi_cricket_nets">Cricket øvebane</string>
+
+        <string name="poi_driving_school">Køreskole</string>
+        <string name="poi_school">Skole</string>
+        <string name="poi_kindergarten">Børnehave</string>
+        <string name="poi_college">Læreanstalt</string>
+        <string name="poi_university">Universitet</string>
+
+        <string name="poi_social_facility">Socialinstitution</string>
+        <string name="poi_courthouse">Retsbygning</string>
+        <string name="poi_prison">Fængsel</string>
+        <string name="poi_register_office">Civilregistrering</string>
+        <string name="poi_embassy">Ambassade</string>
+        <string name="poi_government">Regering</string>
+        <string name="poi_bailiff">Foged</string>
+        <string name="poi_prosecutor">Anklager</string>
+        <string name="poi_pension_fund">Pensionskasse</string>
+        <string name="poi_migration">Migration</string>
+        <string name="poi_tax_inspection">Skattekontrol</string>
+        <string name="poi_administrative_office">Administrationskontor</string>
+        <string name="poi_customs">Told</string>
+
+        <string name="poi_pharmacy">Apotek</string>
+        <string name="poi_hospital">Hospital</string>
+        <string name="poi_doctors">Læger</string>
+        <string name="poi_clinic">Klinik</string>
+        <string name="poi_first_aid">Førstehjælp</string>
+        <string name="poi_dentist">Tandlæge</string>
+        <string name="poi_nursing_home">Plejehjem</string>
+        <string name="poi_baby_hatch">Babyluge</string>
+        <string name="poi_veterinary">Dyrlæge</string>
+        <string name="poi_sanatorium">Sanatorium</string>
+        <string name="healthcare_alternative">Sundhedspleje alternativ</string>
+        <string name="audiologist">Audiolog</string>
+        <string name="blood_bank">Blodbank</string>
+        <string name="healthcare_centre">Sundhedspleje alternativ</string>
+        <string name="midwife">Jordemoder</string>
+        <string name="occupational_therapist">Ergoterapeut</string>
+        <string name="optometrist">Optometrist</string>
+        <string name="physiotherapist">Fysioterapeut</string>
+        <string name="podiatrist">Ortopæd</string>
+        <string name="psychotherapist">Psykoterapeut</string>
+        <string name="healthcare_rehabilitation">Rehabilitering</string>
+        <string name="speech_therapist">Talepædagog</string>
+        <string name="healthcare_yes">Sundhedspleje</string>
+
+        <string name="poi_company">Firma</string>
+        <string name="poi_insurance">Forsikring</string>
+        <string name="poi_estate_agent">Ejendomsmægler</string>
+        <string name="poi_lawyer">Advokat</string>
+        <string name="poi_telecommunication_office">Teleselvskab</string>
+        <string name="poi_ngo">NGO</string>
+        <string name="poi_town_hall">Rådhus</string>
+        <string name="poi_employment_agency">Arbejdsformidling</string>
+        <string name="poi_research_office">Forskning</string>
+        <string name="poi_it_office">IT kontor</string>
+        <string name="poi_newspaper_office">Avisredaktion</string>
+        <string name="poi_architect_office">Arkitekt</string>
+        <string name="poi_advertising_agency">Reklamebureau</string>
+        <string name="poi_educational_institution">Uddannelsesinstitution</string>
+        <string name="poi_studio">Studio</string>
+        <string name="poi_bookmaker">Bookmaker</string>
+
+        <string name="poi_stadium">Stadium</string>
+        <string name="poi_sports_centre">Sportscenter</string>
+        <string name="poi_golf_course">Golfbane</string>
+        <string name="poi_ice_rink">Skøjtebane</string>
+        <string name="poi_pitch">Boldbane</string>
+        <string name="poi_running_track">Løbebane</string>
+        <string name="poi_bicycle_track">Cykelbane</string>
+        <string name="poi_horse_track">Travbane</string>
+        <string name="poi_raceway">Vædeløbsbane</string>
+        <string name="poi_9pin">Keglespil</string>
+        <string name="poi_10pin">Bowling</string>
+        <string name="poi_archery">Bueskydning</string>
+        <string name="poi_athletics">Atletik</string>
+        <string name="poi_australian_football">Australsk fodbold</string>
+        <string name="poi_baseball">Baseball</string>
+        <string name="poi_basketball">Basketball</string>
+        <string name="poi_beachvolleyball">Beachvolley</string>
+        <string name="poi_boules">Boules</string>
+        <string name="poi_bowls">Kuglespil</string>
+        <string name="poi_canoe">Kano</string>
+        <string name="poi_chess">Skak</string>
+        <string name="poi_climbing">Klatring</string>
+        <string name="poi_cricket">Cricket</string>
+        <string name="poi_croquet">Kroket</string>
+        <string name="poi_cycling">Cykling</string>
+        <string name="poi_diving">Dykning</string>
+        <string name="poi_scuba_diving">Scuba dykning</string>
+        <string name="poi_dog_racing">Hundevæddeløb</string>
+        <string name="poi_equestrian">Hestesport</string>
+        <string name="poi_golf">Golf</string>
+        <string name="poi_gymnastics">Gymnastik</string>
+        <string name="poi_handball">Håndbold</string>
+        <string name="poi_hockey">Hockey</string>
+        <string name="poi_horse_racing">Hestevæddeløb</string>
+        <string name="poi_ice_skating">Skøjteløb</string>
+        <string name="poi_ice_stock">Isstok</string>
+        <string name="poi_korfbal">Korfbal</string>
+        <string name="poi_motor_sport">Motorsport</string>
+        <string name="poi_multi_sport">Multisport</string>
+        <string name="poi_orienteering">Orienteringsløb</string>
+        <string name="poi_paddle_tennis">Padel tennis</string>
+        <string name="poi_paragliding">Paragliding</string>
+        <string name="poi_pelota">Pelota</string>
+        <string name="poi_racquet">Ketsjer</string>
+        <string name="poi_roller_skating">Rulleskøjteløb</string>
+        <string name="poi_rowing">Roning</string>
+        <string name="poi_rugby_union">Rugby union</string>
+        <string name="poi_rugby_league">Rugby league</string>
+        <string name="poi_shooting">Skydning</string>
+        <string name="poi_skating">Skating</string>
+        <string name="poi_skateboard">Skateboard</string>
+        <string name="poi_skiing">Skiløb</string>
+        <string name="poi_soccer">Fodbold</string>
+        <string name="poi_swimming">Svømning</string>
+        <string name="poi_table_tennis">Bordtennis</string>
+        <string name="poi_tennis">Tennis</string>
+        <string name="poi_toboggan">Kælk</string>
+        <string name="poi_volleyball">Volleyball</string>
+
+        <string name="poi_museum">Museum</string>
+        <string name="poi_attraction">Turistattraktion</string>
+        <string name="poi_memorial">Mindesmærke</string>
+        <string name="poi_artwork">Kunstværk</string>
+        <string name="poi_archaeological_site">Arkæologiske område</string>
+        <string name="poi_battlefield">Slagmark</string>
+        <string name="poi_boundary_stone">Grænsesten</string>
+        <string name="poi_castle">Slot</string>
+        <string name="poi_city_gate">Byport</string>
+        <string name="poi_fort">Fort</string>
+        <string name="poi_fountain">Springvand</string>
+        <string name="poi_ruins_historic">Historiske ruiner</string>
+        <string name="poi_rune_stone">Runesten</string>
+        <string name="poi_wreck">Skibsvrag</string>
+        <string name="poi_ship_historic">Historisk skib</string>
+        <string name="poi_mine_historic">Historisk mine</string>
+        <string name="poi_monument">Monument</string>
+        <string name="poi_zoo">Zoologisk have</string>
+        <string name="poi_theme_park">Forlystelsespark</string>
+
+        <string name="poi_hotel">Hotel</string>
+        <string name="poi_guest_house">Pensionat</string>
+        <string name="poi_hostel">Vandrerhjem</string>
+        <string name="poi_motel">Motel</string>
+        <string name="poi_alpine_hut">Alpehytte</string>
+        <string name="poi_chalet">Udlejningshytte</string>
+
+        <string name="poi_place_of_worship">Sted for tilbedelse</string>
+        <string name="poi_place_of_worship_christian">Sted for tilbedelse: Kristen</string>
+        <string name="poi_place_of_worship_jewish">Sted for tilbedelse: Jødisk</string>
+        <string name="poi_place_of_worship_muslim">Sted for tilbedelse: Muslim</string>
+        <string name="poi_place_of_worship_sikh">Sted for tilbedelse: Sikh</string>
+        <string name="poi_place_of_worship_buddhist">Sted for tilbedelse: Buddhist</string>
+        <string name="poi_place_of_worship_hindu">Sted for tilbedelse: Hindu</string>
+        <string name="poi_place_of_worship_shinto">Sted for tilbedelse: Shinto</string>
+        <string name="poi_place_of_worship_taoist">Sted for tilbedelse: Taoistisk</string>
+        <string name="poi_monastery">Kloster</string>
+        <string name="poi_historic_monastery">Historisk kloster</string>
+        <string name="poi_wayside_cross">Vejside kors</string>
+        <string name="poi_wayside_shrine">Vejkants alter</string>
+        <string name="poi_tourism_information">Turistinformation</string>
+        <string name="poi_clock">Ur</string>
+        <string name="poi_travel_agent">Rejsebureau</string>
+        <string name="poi_viewpoint">Udsigtspunkt</string>
+        <string name="poi_camp_site">Campingplads</string>
+        <string name="poi_caravan_site">campingvognsplads</string>
+        <string name="poi_picnic_site">Skovtur/rasteplads</string>
+        <string name="poi_spring">Kilde</string>
+        <string name="poi_cemetery">Kirkegård</string>
+        <string name="poi_grave_yard">Gravplads</string>
+        <string name="poi_shelter">Shelter</string>
+        <string name="poi_funicular">Kabelbane</string>
+        <string name="poi_resort">Feriested</string>
+
+        <string name="poi_club_art">Kunstforening</string>
+        <string name="poi_club_astronomy">Astronomiklub</string>
+        <string name="poi_club_computer">Computerklub</string>
+        <string name="poi_club_board_games">Brætspilsklub</string>
+        <string name="poi_club_motorcycle">Motorcykelklub</string>
+        <string name="poi_club_sport">Sportsklub</string>
+        <string name="poi_club_game">Spilleklub</string>
+        <string name="poi_club_automobile">Automobilklub</string>
+        <string name="poi_club_chess">Skakklub</string>
+        <string name="poi_club_cinema">Filmklub</string>
+        <string name="poi_club_fan">Fanklub</string>
+        <string name="poi_club_fishing">Lystfiskerklub</string>
+        <string name="poi_club_veterans">Veteranklub</string>
+        <string name="poi_club_linux">Linux klub</string>
+        <string name="poi_club_theatre">Teaterklub</string>
+        <string name="poi_club_history">Historieklub</string>
+        <string name="poi_club_music">Musikklub</string>
+        <string name="poi_club_ethnic">Etniskforening</string>
+        <string name="poi_club_nature">Naturklub</string>
+        <string name="poi_club_photography">Fotoklub</string>
+        <string name="poi_club_hunting">Jagtklub</string>
+        <string name="poi_club_shooting">Skytteforeningen</string>
+        <string name="poi_club_tourism">Turistklub</string>
+        <string name="poi_club_charity">Velgørenhedsklub</string>
+
+        <string name="poi_library">Bibliotek</string>
+        <string name="poi_arts_centre">Kunstcenter</string>
+        <string name="poi_cinema">Biograf</string>
+        <string name="poi_casino">Casino</string>
+        <string name="poi_community_centre">Medborgerhus</string>
+        <string name="poi_social_centre">Socialcenter</string>
+        <string name="poi_theatre">Teater</string>
+        <string name="poi_circus">Cirkus</string>
+        <string name="poi_dance_floor">Dansegulv</string>
+        <string name="poi_nightclub">Natklub</string>
+        <string name="poi_stripclub">Stripklub</string>
+        <string name="poi_beach_resort">Badeby</string>
+        <string name="poi_dog_park">Hundeskov</string>
+        <string name="poi_fishing_place">Fiskested</string>
+        <string name="poi_hunting_stand">Jagtstand</string>
+        <string name="poi_marina">Marina</string>
+        <string name="poi_miniature_golf">Minigolf</string>
+        <string name="poi_playground">Legeplads</string>
+        <string name="poi_swimming_pool">Svømmebassin</string>
+        <string name="poi_water_park">Vandland</string>
+        <string name="poi_park">Park</string>
+
+        <string name="poi_cafe">Café</string>
+        <string name="poi_biergarten">Biergarten</string>
+        <string name="poi_restaurant">Restaurant</string>
+        <string name="poi_fast_food">Fastfood</string>
+        <string name="poi_bar">Bar</string>
+        <string name="poi_pub">Pub</string>
+        <string name="poi_food_court">Fødevaremarked</string>
+        <string name="poi_drinking_water">Drikkevand</string>
+        <string name="poi_barbecue">Barbecue</string>
+
+        <string name="poi_agricultural_engines_craft">Landbrugsmaskiner</string>
+        <string name="poi_basket_maker">Kurvemager</string>
+        <string name="poi_beekeeper">Biavler</string>
+        <string name="poi_blacksmith">Smed</string>
+        <string name="poi_brewery">Bryggeri</string>
+        <string name="poi_boatbuilder">Bådebygger</string>
+        <string name="poi_bookbinder">Bogbinder</string>
+        <string name="poi_carpenter">Tømrer</string>
+        <string name="poi_carpet_layer">Tæppemontør</string>
+        <string name="poi_caterer">Catering</string>
+        <string name="poi_clockmaker">Urmager</string>
+        <string name="poi_dressmaker">Skrædder</string>
+        <string name="poi_electrician">Elektriker</string>
+        <string name="poi_gardener">Gartner</string>
+        <string name="poi_glaziery_craft">Glarmester</string>
+        <string name="poi_handicraft">Håndværker</string>
+        <string name="poi_hvac">VVS</string>
+        <string name="poi_insulation_craft">Isolering</string>
+        <string name="poi_jeweller">Juvelér</string>
+        <string name="poi_locksmith">Låsesmed</string>
+        <string name="poi_key_cutter">Nøglebar</string>
+        <string name="poi_metal_construction_craft">Metalarbejder</string>
+        <string name="poi_optician">Optiker</string>
+        <string name="poi_painter">Maler</string>
+        <string name="poi_parquet_layer">Gulvlægger</string>
+        <string name="poi_photographer">Fotograf</string>
+        <string name="poi_photographic_laboratory">Fotolaboratorium</string>
+        <string name="poi_plasterer">Stukatør</string>
+        <string name="poi_plumber">Blikkenslager</string>
+        <string name="poi_pottery_craft">Pottemager</string>
+        <string name="poi_rigger">Rigger</string>
+        <string name="poi_roofer">Tagdækker</string>
+        <string name="poi_saddler">Sadelmager</string>
+        <string name="poi_sailmaker">Sejlmager</string>
+        <string name="poi_sawmill">Savværk</string>
+        <string name="poi_scaffolder">Stilladsarbejder</string>
+        <string name="poi_sculptor">Billedhugger</string>
+        <string name="poi_shoemaker">Skomager</string>
+        <string name="poi_stand_builder">Udstillingsbygger</string>
+        <string name="poi_stonemason">Stenhugger</string>
+        <string name="poi_sun_protection_craft">Solbeskyttelse håndværk</string>
+        <string name="poi_sweep">Skorstensfejer</string>
+        <string name="poi_tailor">Skrædder</string>
+        <string name="poi_tiler">Fliselægger</string>
+        <string name="poi_tinsmith">Blikkenslager</string>
+        <string name="poi_upholsterer">Møbelpolstrer</string>
+        <string name="poi_watchmaker">Urmager</string>
+        <string name="poi_window_construction">Vinduer</string>
+
+        <string name="poi_funeral_directors">Bedemand</string>
+        <string name="poi_computer_craft">Computerværksted</string>
+        <string name="poi_beauty_salon">Skønhedssalon</string>
+        <string name="poi_beauty_salon_nails">Neglesalon</string>
+        <string name="poi_hairdresser">Frisør</string>
+        <string name="poi_massage">Massage</string>
+        <string name="poi_tattoo">Tatovør</string>
+        <string name="poi_dry_cleaning">Renseri</string>
+        <string name="poi_laundry">Vaskeri</string>
+        <string name="poi_car_rental">Biludlejning</string>
+        <string name="poi_car_sharing">Delebiler</string>
+        <string name="poi_boat_sharing">Delebåd</string>
+        <string name="poi_toilets">Toilet</string>
+        <string name="poi_sauna">Sauna</string>
+        <string name="poi_brothel">Bordel</string>
+        <string name="poi_mortuary">Ligkapel</string>
+        <string name="poi_crematorium">Krematorium</string>
+        <string name="poi_internet_cafe">Internet cafe</string>
+
+        <string name="poi_bank">Bank</string>
+        <string name="poi_atm">Hæveautomat</string>
+        <string name="poi_money_lender">Pengeudlåner</string>
+        <string name="poi_pawnbroker">Pantelåner</string>
+        <string name="poi_currencyexchange">Vekselkontor</string>
+        <string name="poi_accountant">Revisor</string>
+        <string name="poi_bitcoin_yes">Bitcoin betaling</string>
+
+        <string name="poi_cave_entrance">Hule indgang</string>
+        <string name="poi_peak">Bjergtinde</string>
+        <string name="poi_saddle">Bjergsadel</string>
+        <string name="poi_volcano">Vulkan</string>
+        <string name="poi_crater">Krater</string>
+        <string name="poi_sinkhole">Jordfaldshul</string>
+        <string name="poi_waterfall">Vandfald</string>
+        <string name="poi_rapids">Strømfald</string>
+        <string name="poi_stone">Bemærkelsesværdig sten</string>
+        <string name="poi_cape">Forbjerg</string>
+        <string name="poi_beach">Strand</string>
+        <string name="poi_bay">Bugt</string>
+        <string name="poi_fjord">Fjord</string>
+        <string name="poi_reef">Rev</string>
+        <string name="poi_wetland">Vådområde</string>
+        <string name="poi_nature_reserve">Naturreservat</string>
+        <string name="poi_strait">Stræde</string>
+        <string name="poi_island">Ø</string>
+        <string name="poi_islet">Holm</string>
+
+        <string name="poi_seamark_anchorage">Ankringsområde</string>
+        <string name="poi_seamark_anchor_berth">Ankerplads</string>
+        <string name="poi_seamark_beacon">Båke</string>
+        <string name="poi_seamark_beacon_cardinal">Cardinal båke</string>
+        <string name="poi_seamark_beacon_lateral">Lateral båke</string>
+        <string name="poi_seamark_beacon_safe_water">Sikkervand båke</string>
+        <string name="poi_seamark_beacon_special_purpose">Speciel formål båke</string>
+        <string name="poi_seamark_berth">Kajplads</string>
+        <string name="poi_seamark_building">Sømærke bygning</string>
+        <string name="poi_seamark_bridge">Sømærke bro</string>
+        <string name="poi_seamark_buoy_cardinal">Cardinal tønde</string>
+        <string name="poi_seamark_buoy_installation">Installation tønde</string>
+        <string name="poi_seamark_buoy_isolated_danger">Tønde, isoleret fare</string>
+        <string name="poi_seamark_buoy_lateral">Lateral tønde</string>
+        <string name="poi_seamark_buoy_safe_water">Sikkervand tønde</string>
+        <string name="poi_seamark_buoy_special_purpose">Speciel formål tønde</string>
+        <string name="poi_seamark_daymark">Dagmærke</string>
+        <string name="poi_seamark_distance_mark">Distance mærke</string>
+        <string name="poi_seamark_dry_dock">Tørdock</string>
+        <string name="poi_seamark_dyke">Dige</string>
+        <string name="poi_seamark_floating_dock">Flydedok</string>
+        <string name="poi_seamark_fog_signal">Tågesignal</string>
+        <string name="poi_seamark_harbour_basin">Havnebasin</string>
+        <string name="poi_seamark_harbour">Havn</string>
+        <string name="poi_seamark_landmark">Vartegn</string>
+        <string name="poi_seamark_light">Lys, sømærke</string>
+        <string name="poi_seamark_light_major">Stor lys, sømærke</string>
+        <string name="poi_seamark_light_minor">Mindre lys, sømærke</string>
+        <string name="poi_seamark_light_float">Flydelys, sømærke</string>
+        <string name="poi_seamark_light_vessel">Fartøjslys, sømærke</string>
+        <string name="poi_seamark_mooring">Fortøjning</string>
+        <string name="poi_seamark_notice">Varsel, sømærke</string>
+        <string name="poi_seamark_pile">Pæl</string>
+        <string name="poi_seamark_radar_transponder">Radartransponder, sømærke</string>
+        <string name="poi_seamark_radio_station">Radiostation, sømærke</string>
+        <string name="poi_seamark_signal_station_traffic">Signalstation, trafik</string>
+        <string name="poi_seamark_signal_station_warning">Signalstation, advarsel</string>
+        <string name="poi_seamark_small_craft_facility">Faciliteter for lystbåde</string>
+        <string name="poi_seamark_topmark">Topbetegnelse, sømærke</string>
+        <string name="poi_seamark_rock">Klippe, sømærke</string>
+        <string name="poi_seamark_wreck">Vrag, sømærke</string>
+
+        <string name="poi_military_airfield">Militærflyveplads</string>
+        <string name="poi_military_bunker">Militærbunker</string>
+        <string name="poi_military_barracks">Kaserne</string>
+        <string name="poi_military_danger_area">Farezone</string>
+        <string name="poi_military_range">Militærsøvelsesområde</string>
+        <string name="poi_military_naval_base">Militærflådebase</string>
+        <string name="poi_military_nuclear_explosion_site">Nuklear eksplosion område</string>
+<string name="poi_city">Stor by</string>
+	<string name="poi_town">By</string>
+	<string name="poi_village">Landsby</string>
+	<string name="poi_hamlet">Lille landsby</string>
+	<string name="poi_isolated_dwelling">Bebyggelse</string>
+	<string name="poi_suburb">Forstad</string>
+	<string name="poi_neighbourhood">Kvarter</string>
+	<string name="poi_locality">Lokalitet</string>
+
+	<string name="poi_healthcare_alternative">Alternativ sundhedspleje</string>
+	<string name="poi_audiologist">Audiolog</string>
+	<string name="poi_blood_bank">Blodbank</string>
+	<string name="poi_healthcare_centre">Sundhedscenter</string>
+	<string name="poi_midwife">Jordemoder</string>
+	<string name="poi_occupational_therapist">Ergoterapeut</string>
+	<string name="poi_optometrist">Optiker</string>
+	<string name="poi_physiotherapist">Fysioterapeut</string>
+	<string name="poi_podiatrist">Ortopæd</string>
+	<string name="poi_psychotherapist">Psykoterapeut</string>
+	<string name="poi_healthcare_rehabilitation">Rehabilitering</string>
+	<string name="poi_speech_therapist">Talepædagog</string>
+	<string name="poi_healthcare_yes">Sundhedspleje</string>
+
+	</resources>

OsmAnd/res/values-es/strings.xml

@@ -1918,4 +1918,5 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
     <string name="wake_on_voice_descr">Encender pantalla al aproximarse a un giro</string>
     <string name="lock_screen_request_explanation">%1$s necesita este permiso para apagar la pantalla para la característica de ahorro energético.</string>
     <string name="wake_on_voice_never">Nunca</string>
-    </resources>
+    <string name="advanced_settings">Avanzado</string>
+	</resources>

OsmAnd/res/values-it/strings.xml

@@ -249,7 +249,7 @@
   <string name="layer_overlay">Mappa sovrapposta…</string>
   <string name="default_none">Nessuno</string>
   <string name="map_overlay">Mappa sovrapposta</string>
-  <string name="map_overlay_descr">Scegli mappa di sovrapposizione</string>
+  <string name="map_overlay_descr">Scegli la mappa sovrapposta</string>
   <string name="tile_source_already_installed">La mappa è già installata, le impostazioni verranno aggiornate</string>
   <string name="select_tile_source_to_install">Seleziona le mappe (mattonella) da installare o aggiornare</string>
   <string name="internet_not_available">La connessione internet è richiesta per questa operazione ma non è disponibile</string>
@@ -1972,7 +1972,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="save_track_to_gpx_globally">Registra la traccia in un file GPX</string>
 	<string name="save_track_to_gpx_globally_descr">La registrazione della posizione in un file GPX può essere accesa o spenta dal widget registrazione GPX sulla schermata della mappa</string>
 	<string name="save_track_interval_globally">Intervallo registrazione</string>
-	<string name="rendering_attr_publicTransportMode_name">Percorsi bus, tram, filubus, servizi navetta</string>
+	<string name="rendering_attr_publicTransportMode_name">Percorsi bus, filubus, servizi navetta</string>
 	<string name="confirm_every_run">Chiedi sempre</string>
 	<string name="save_global_track_interval_descr">Scegli l\'intervallo di tempo generale per la registrazione del percorso (abilitata attraverso il widget registrazione GPX sulla mappa)</string>
 	<string name="save_global_track_interval">Intervallo generale di registrazione</string>
@@ -2026,4 +2026,5 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="wake_on_voice_descr">Accendi lo schermo all\'approssimarsi di una svolta</string>
     <string name="wake_on_voice_never">Mai</string>
     <string name="lock_screen_request_explanation">%1$s necessita di questa autorizzazione per spegnere lo schermo per la funzionalità di risparmio energetico.</string>
-    </resources>
+    <string name="advanced_settings">Avanzato</string>
+	</resources>

OsmAnd/res/values-ru/phrases.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
 	<string name="poi_bakery">Булочная</string>
 	<string name="poi_alcohol">Винно-водочный магазин</string>
@@ -253,6 +253,19 @@
 	<string name="poi_baby_hatch">Бэби-бокс</string>
 	<string name="poi_veterinary">Ветеринарная лечебница</string>
 	<string name="poi_sanatorium">Санаторий</string>
+	<string name="poi_healthcare_alternative">Альтернативная медицина</string>
+	<string name="poi_audiologist">Отоларинголог</string>
+	<string name="poi_blood_bank">Банк крови</string>
+	<string name="poi_healthcare_centre">Медицинский центр</string>
+	<string name="poi_midwife">Акушерка</string>
+	<string name="poi_occupational_therapist">Профессиональный врач</string>
+	<string name="poi_optometrist">Оптометрист</string>
+	<string name="poi_physiotherapist">Физиотерапевт</string>
+	<string name="poi_podiatrist">Ортопед</string>
+	<string name="poi_psychotherapist">Психотерапевт</string>
+	<string name="poi_healthcare_rehabilitation">Реабилитация</string>
+	<string name="poi_speech_therapist">Логопед</string>
+	<string name="poi_healthcare_yes">Медицинское учреждение</string>
 
 	<string name="poi_company">Фирма</string>
 	<string name="poi_insurance">Страховая компания</string>
@@ -328,7 +341,7 @@
 	<string name="poi_swimming">Плавание</string>
 	<string name="poi_table_tennis">Пинг-понг</string>
 	<string name="poi_tennis">Теннис</string>
-	<string name="poi_toboggan"></string>
+	<string name="poi_toboggan"/>
 	<string name="poi_volleyball">Воллейбол</string>
 
 	<string name="poi_museum">Музей</string>
@@ -376,7 +389,7 @@
 	<string name="poi_travel_agent">Турагенство</string>
 	<string name="poi_viewpoint">Место с хорошим видом</string>
 	<string name="poi_camp_site">Место для лагеря</string>
-	<string name="poi_caravan_site"></string>
+	<string name="poi_caravan_site"/>
 	<string name="poi_picnic_site">Место для пикника</string>
 	<string name="poi_spring">Родник</string>
 	<string name="poi_cemetery">Кладбище</string>
@@ -538,47 +551,47 @@
 	<string name="poi_island">Остров</string>
 	<string name="poi_islet">Остров (небольшой)</string>
 
-	<string name="poi_seamark_anchorage"></string>
+	<string name="poi_seamark_anchorage">Якорная стоянка</string>
-	<string name="poi_seamark_anchor_berth"></string>
+	<string name="poi_seamark_anchor_berth"/>
-	<string name="poi_seamark_beacon"></string>
+	<string name="poi_seamark_beacon"/>
-	<string name="poi_seamark_beacon_cardinal"></string>
+	<string name="poi_seamark_beacon_cardinal"/>
-	<string name="poi_seamark_beacon_lateral"></string>
+	<string name="poi_seamark_beacon_lateral"/>
-	<string name="poi_seamark_beacon_safe_water"></string>
+	<string name="poi_seamark_beacon_safe_water"/>
-	<string name="poi_seamark_beacon_special_purpose"></string>
+	<string name="poi_seamark_beacon_special_purpose"/>
-	<string name="poi_seamark_berth"></string>
+	<string name="poi_seamark_berth"/>
-	<string name="poi_seamark_building"></string>
+	<string name="poi_seamark_building"/>
-	<string name="poi_seamark_bridge"></string>
+	<string name="poi_seamark_bridge"/>
-	<string name="poi_seamark_buoy_cardinal"></string>
+	<string name="poi_seamark_buoy_cardinal"/>
-	<string name="poi_seamark_buoy_installation"></string>
+	<string name="poi_seamark_buoy_installation"/>
-	<string name="poi_seamark_buoy_isolated_danger"></string>
+	<string name="poi_seamark_buoy_isolated_danger"/>
-	<string name="poi_seamark_buoy_lateral"></string>
+	<string name="poi_seamark_buoy_lateral"/>
-	<string name="poi_seamark_buoy_safe_water"></string>
+	<string name="poi_seamark_buoy_safe_water"/>
-	<string name="poi_seamark_buoy_special_purpose"></string>
+	<string name="poi_seamark_buoy_special_purpose">Специальный буй</string>
-	<string name="poi_seamark_daymark"></string>
+	<string name="poi_seamark_daymark"/>
-	<string name="poi_seamark_distance_mark"></string>
+	<string name="poi_seamark_distance_mark"/>
-	<string name="poi_seamark_dry_dock"></string>
+	<string name="poi_seamark_dry_dock"/>
-	<string name="poi_seamark_dyke"></string>
+	<string name="poi_seamark_dyke"/>
-	<string name="poi_seamark_floating_dock"></string>
+	<string name="poi_seamark_floating_dock"/>
-	<string name="poi_seamark_fog_signal"></string>
+	<string name="poi_seamark_fog_signal">Сигнал при тумане</string>
-	<string name="poi_seamark_harbour_basin"></string>
+	<string name="poi_seamark_harbour_basin"/>
-	<string name="poi_seamark_harbour"></string>
+	<string name="poi_seamark_harbour"/>
-	<string name="poi_seamark_landmark"></string>
+	<string name="poi_seamark_landmark"/>
-	<string name="poi_seamark_light"></string>
+	<string name="poi_seamark_light"/>
-	<string name="poi_seamark_light_major"></string>
+	<string name="poi_seamark_light_major"/>
-	<string name="poi_seamark_light_minor"></string>
+	<string name="poi_seamark_light_minor"/>
-	<string name="poi_seamark_light_float"></string>
+	<string name="poi_seamark_light_float"/>
-	<string name="poi_seamark_light_vessel"></string>
+	<string name="poi_seamark_light_vessel"/>
-	<string name="poi_seamark_mooring"></string>
+	<string name="poi_seamark_mooring"/>
-	<string name="poi_seamark_notice"></string>
+	<string name="poi_seamark_notice"/>
-	<string name="poi_seamark_pile"></string>
+	<string name="poi_seamark_pile"/>
-	<string name="poi_seamark_radar_transponder"></string>
+	<string name="poi_seamark_radar_transponder"/>
-	<string name="poi_seamark_radio_station"></string>
+	<string name="poi_seamark_radio_station"/>
-	<string name="poi_seamark_signal_station_traffic"></string>
+	<string name="poi_seamark_signal_station_traffic"/>
-	<string name="poi_seamark_signal_station_warning"></string>
+	<string name="poi_seamark_signal_station_warning"/>
-	<string name="poi_seamark_small_craft_facility"></string>
+	<string name="poi_seamark_small_craft_facility"/>
-	<string name="poi_seamark_topmark"></string>
+	<string name="poi_seamark_topmark"/>
-	<string name="poi_seamark_rock"></string>
+	<string name="poi_seamark_rock"/>
-	<string name="poi_seamark_wreck"></string>
+	<string name="poi_seamark_wreck"/>
 
 	<string name="poi_military_airfield">Военный аэродром</string>
 	<string name="poi_military_bunker">Военный бункер</string>
@@ -587,4 +600,4 @@
 	<string name="poi_military_range">Военное стрельбище</string>
 	<string name="poi_military_naval_base">Военно-морская база</string>
 	<string name="poi_military_nuclear_explosion_site">Место ядерного взрыва</string>
-</resources>
+</resources>

OsmAnd/res/values-ru/strings.xml

@@ -1814,4 +1814,5 @@
     <string name="lock_screen_request_explanation">%1$s необходимо это разрешение, чтобы выключить экран для экономии энергии.</string>
     <string name="wake_on_voice">Включать экран</string>
     <string name="wake_on_voice_descr">Включать экран телефона при приближении к повороту</string>
-    </resources>
+    <string name="advanced_settings">Расширенные</string>
+	</resources>

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

@@ -1854,4 +1854,5 @@
     <string name="wake_on_voice_descr">當接近轉彎時，開啟手機螢幕</string>
     <string name="lock_screen_request_explanation">為了節電作用 %1$s 需要此許可權才能關閉螢幕。</string>
     <string name="wake_on_voice_never">永不</string>
-    </resources>
+    <string name="advanced_settings">進階</string>
+	</resources>

OsmAnd/res/values/phrases.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <resources>
 	<string name="poi_bakery">Bakery</string>
-	<string name="poi_alcohol">liquor store</string>
+	<string name="poi_alcohol">Liquor store</string>
 	<string name="poi_convenience">Convenience store</string>
 	<string name="poi_mall">Mall</string>
 	<string name="poi_beverages">Beverage store</string>
@@ -241,6 +241,14 @@
 	<string name="poi_tax_inspection">Tax inspection</string>
 	<string name="poi_administrative_office">Administrative office</string>
 	<string name="poi_customs">Customs</string>
+	<string name="poi_city">City</string>
+	<string name="poi_town">Town</string>
+	<string name="poi_village">Village</string>
+	<string name="poi_hamlet">Hamlet</string>
+	<string name="poi_isolated_dwelling">Isolated dwelling</string>
+	<string name="poi_suburb">Suburb</string>
+	<string name="poi_neighbourhood">Neighbourhood</string>
+	<string name="poi_locality">Locality</string>
 
 	<string name="poi_pharmacy">Pharmacy</string>
 	<string name="poi_hospital">Hospital</string>
@@ -252,6 +260,19 @@
 	<string name="poi_baby_hatch">Baby hatch</string>
 	<string name="poi_veterinary">Veterinary</string>
 	<string name="poi_sanatorium">Sanatorium</string>
+	<string name="poi_healthcare_alternative"></string>
+	<string name="poi_audiologist">Audiologist</string>
+	<string name="poi_blood_bank">Blood bank</string>
+	<string name="poi_healthcare_centre"></string>
+	<string name="poi_midwife">Midwife</string>
+	<string name="poi_occupational_therapist">Occupational therapist</string>
+	<string name="poi_optometrist">Optometrist</string>
+	<string name="poi_physiotherapist">Physiotherapist</string>
+	<string name="poi_podiatrist">Podiatrist</string>
+	<string name="poi_psychotherapist">Psychotherapist</string>
+	<string name="poi_healthcare_rehabilitation">Rehabilitation</string>
+	<string name="poi_speech_therapist">Speech therapist</string>
+	<string name="poi_healthcare_yes"></string>
 
 	<string name="poi_company">Company</string>
 	<string name="poi_insurance">Insurance</string>

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

@@ -792,7 +792,7 @@ public class OsmandSettings {
 		SNAP_TO_ROAD.setModeDefaultValue(ApplicationMode.BICYCLE, true);
 	}
 	
-	public final CommonPreference<Boolean> INTERRUPT_MUSIC = new BooleanPreference("interrupt_music", true).makeGlobal();
+	public final CommonPreference<Boolean> INTERRUPT_MUSIC = new BooleanPreference("interrupt_music", false).makeGlobal();
 
 
 	// this value string is synchronized with settings_pref.xml preference name

OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java

@@ -298,6 +298,8 @@ public class MapActivityLayers {
 						if (!settings.SAVE_TRACK_TO_GPX.get() && !
 								settings.SAVE_GLOBAL_TRACK_TO_GPX.get()) {
 							AccessibleToast.makeText(activity, R.string.gpx_monitoring_disabled_warn, Toast.LENGTH_SHORT).show();
+						} else {
+							g.path = getString(R.string.show_current_gpx_title);
 						}
 						break;
 					}

OsmAnd/src/net/osmand/plus/api/AudioFocusHelperImpl.java

@@ -19,31 +19,19 @@ public class AudioFocusHelperImpl implements AudioManager.OnAudioFocusChangeList
     private static final Log log = PlatformUtil.getLog(AudioFocusHelperImpl.class);
 
     @Override
-    public boolean requestFocus(Context context, int streamType)
+    public boolean requestFocus(Context context, int streamType) {
-    {
         AudioManager mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        if (((OsmandApplication) context.getApplicationContext()).getSettings().INTERRUPT_MUSIC.get())
+        return AudioManager.AUDIOFOCUS_REQUEST_GRANTED == mAudioManager.requestAudioFocus(this, streamType, 
-        {
+              ((OsmandApplication) context.getApplicationContext()).getSettings().INTERRUPT_MUSIC.get()?
-            return AudioManager.AUDIOFOCUS_REQUEST_GRANTED == mAudioManager.requestAudioFocus(this, streamType, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
+              AudioManager.AUDIOFOCUS_GAIN_TRANSIENT: 
-        }
+              AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK );
-        else
-        {
-            return true;
-        }
     }
 
     @Override
     public boolean abandonFocus(Context context, int streamType)
     {
         AudioManager mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        if (((OsmandApplication) context.getApplicationContext()).getSettings().INTERRUPT_MUSIC.get())
+        return AudioManager.AUDIOFOCUS_REQUEST_GRANTED == mAudioManager.abandonAudioFocus(this);
-        {
-            return AudioManager.AUDIOFOCUS_REQUEST_GRANTED == mAudioManager.abandonAudioFocus(this);
-        }
-        else
-        {
-            return true;
-        }
     }
 
     @Override
@@ -54,4 +42,4 @@ public class AudioFocusHelperImpl implements AudioManager.OnAudioFocusChangeList
         // reason to change this strategy.
         log.error("MediaCommandPlayerImpl.onAudioFocusChange(): Unexpected audio focus change: " + focusChange);
     }
-}
+}

OsmAnd/src/net/osmand/plus/download/DownloadActivity.java

@@ -18,6 +18,7 @@ import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Window;
 import net.osmand.IndexConstants;
 import net.osmand.access.AccessibleAlertBuilder;
+import net.osmand.map.OsmandRegions;
 import net.osmand.plus.*;
 import net.osmand.plus.activities.FavouritesActivity;
 import net.osmand.plus.activities.LocalIndexInfo;
@@ -596,4 +597,20 @@ public class DownloadActivity extends SherlockFragmentActivity {
 		}
 	}
 
+	public static String getFullName(IndexItem e, OsmandApplication app, OsmandRegions osmandRegions) {
+		String eName;
+		List<IndexItem> forCat = new ArrayList<IndexItem>();
+		forCat.add(e);
+		List<IndexItemCategory> category = IndexItemCategory.categorizeIndexItems(app, forCat);
+		if (category.size() != 0){
+			eName = e.getVisibleDescription(app) + "\n"
+					+ category.get(0).name + " "
+					+ e.getVisibleName(app, osmandRegions);
+		} else {
+			eName = e.getVisibleDescription(app) + "\n"
+					+ e.getVisibleName(app, osmandRegions);
+		}
+		return eName;
+	}
+
 }

OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java

@@ -477,6 +477,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 				listAdapter.addLocalIndexInfo(info);
 			}
 			listAdapter.sortData();
+			getExpandableListView().setAdapter(listAdapter);
 		}
 		ActionBar actionBar = getDownloadActivity().getSupportActionBar();
 		//hide action bar from downloadindexfragment
@@ -961,8 +962,9 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
 
 		private String getNameToDisplay(LocalIndexInfo child) {
 			String mapDescr = getMapDescription(child.getFileName());
-			String mapName = FileNameTranslationHelper.getFileName(ctx, ((OsmandApplication) getDownloadActivity().getApplication()).getResourceManager().getOsmandRegions(), child.getFileName());
+			String mapName = FileNameTranslationHelper.getFileName(ctx,
-
+					((OsmandApplication) getDownloadActivity().getApplication()).getResourceManager().getOsmandRegions(),
+					child.getFileName());
 			if (mapDescr.length() > 0){
 				 return mapDescr + " - " + mapName;
 			} else {

OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java

@@ -202,7 +202,8 @@ public class UpdatesIndexFragment extends SherlockListFragment {
 			TextView name = (TextView) v.findViewById(R.id.download_item);
 			TextView description = (TextView) v.findViewById(R.id.download_descr);
 			IndexItem e = items.get(position);
-			String eName = e.getVisibleDescription(getMyApplication()) + "\n" + e.getVisibleName(getMyApplication(), osmandRegions);
+			String eName = DownloadActivity.getFullName(e, getMyApplication(), osmandRegions);
+
 			name.setText(eName.trim()); //$NON-NLS-1$
 			String d = e.getDate(format) + "\n" + e.getSizeDescription(getMyApplication());
 			description.setText(d);

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

@@ -141,7 +141,8 @@ public class GpxUiHelper {
 			if(showCurrentGpx){
 				allGpxList.add(0, activity.getString(R.string.show_current_gpx_title));
 			}
-			final ContextMenuAdapter adapter = createGpxContextMenuAdapter(activity,allGpxList, selectedGpxList, multipleChoice);
+			final ContextMenuAdapter adapter = createGpxContextMenuAdapter(activity, allGpxList, selectedGpxList, multipleChoice);
+
 			return createDialog(activity, showCurrentGpx, multipleChoice, callbackWithObject, allGpxList, adapter);
 		}
 		return null;
@@ -166,7 +167,8 @@ public class GpxUiHelper {
 		return null;
 	}
 
-	private static ContextMenuAdapter createGpxContextMenuAdapter(Activity activity, List<String> allGpxList, List<String> selectedGpxList, boolean multipleChoice) {
+	private static ContextMenuAdapter createGpxContextMenuAdapter(Activity activity, List<String> allGpxList,
+																  List<String> selectedGpxList, boolean multipleChoice) {
 		final ContextMenuAdapter adapter = new ContextMenuAdapter(activity);
 		//element position in adapter
 		int i = 0;