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

2015-01-12 02:02:50 +01:00 · 2015-01-12 02:02:50 +01:00 · 4eb799499d
commit 4eb799499d
parent 50804ae0ce 22161a6470
21 changed files with 344 additions and 98 deletions
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@ -26,8 +26,8 @@
    <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_name">Зьвесткі квадрата: %1$s</string>
-    <string name="edit_tilesource_successfully">Крыніца квадратаў мапы %1$s пасьпяхова захаваная</string>
+    <string name="local_index_tile_data_name">Зьвесткі фрагмэнту: %1$s</string>
+    <string name="edit_tilesource_successfully">Крыніца фрагмэнтаў мапы %1$s пасьпяхова захаваная</string>
    <string name="edit_tilesource_elliptic_tile">Эліптычны меркатар</string>
    <string name="edit_tilesource_maxzoom">Максімальнае павелічэньне</string>
    <string name="edit_tilesource_expiration_time">Тэрмін дзеяньня (у хвілінах)</string>
@ -611,12 +611,12 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="index_settings_descr">Сьцягваньне і кіраваньне файламі мапаў, што захоўваюцца на вашым прыстасаваньні</string>
 	<string name="map_online_plugin_is_not_installed">Актывуйце модуль онлайн мапаў, каб выбіраць розныя крыніцы для мапаў</string>
 	<string name="map_online_data">Сеціўныя і растравыя мапы</string>
-	<string name="map_online_data_descr">Карыстацца сеціўнымі мапамі (cьцягнуць і захоўваць на картцы SD)</string>
+	<string name="map_online_data_descr">Карыстацца сеціўнымі мапамі (cьцягнуць і захоўваць фрагмэнты на картцы SD)</string>
 	<string name="online_map_settings">Сеціўныя мапы</string>
-	<string name="online_map_settings_descr">Настройка крыніц анлайн або кэшаваных растравых мапаў</string>
+	<string name="online_map_settings_descr">Настройка крыніц сеціўных або кэшаваных растравых мапаў</string>
 	<string name="map_settings">Налады мапы</string>
 	<string name="map_settings_descr">Налады адлюстраваньня мапы</string>
-	<string name="osmand_rastermaps_plugin_description">Паказаць налады для канфігураваньня сеткавых ці кэшаваных мапаў як базавых мапаў ці як overlay/underlay мапаў. Гэтыя мапы могуць быць падрыхтаваныя папярэдне й скапіяваныя ў каталёг зьвестак OsmAnd.</string>
+	<string name="osmand_rastermaps_plugin_description">Паказаць налады для канфігураваньня сеткавых ці кэшаваных растравых мапаў у якасьці асноўнай мапы ці дадатковым слоем. Гэтыя мапы могуць быць падрыхтаваныя папярэдне й скапіяваныя ў каталёг зьвестак OsmAnd.</string>
 	
 	<string name="osmand_accessibility_description">Паказаць налады для спэцыяльных магчымасьцяў даступнасьці.</string>
 	<string name="extra_settings">Пашыраныя налады</string>
@ -978,7 +978,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="map_overlay">Мапа для накладаньня</string>
 	<string name="map_overlay_descr">Абраць мапу для накладаньня</string>
 	<string name="tile_source_already_installed">Мапа ўжо ўсталявана, налады будуць абноўлены</string>
-	<string name="select_tile_source_to_install">Выберыце (растравыя) мапы для ўстаноўкі або абнаўленьня</string>
+	<string name="select_tile_source_to_install">Выберыце (растравыя) мапы для ўсталёўкі або абнаўленьня</string>
 	<string name="internet_not_available">Патрабуецца падключэнне да Інтэрнэту для выкананьня аперацыі, але яго няма</string>
 	<string name="install_more">Усталяваць яшчэ…</string>
 	<string name="level_to_switch_vector_raster_descr">Мінімальнае павелічэньне для выкарыстаньня вектарных мапаў</string>
@ -992,7 +992,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="search_offline_geo_error">Немагчыма апрацаваць запыт \'%s\'</string>
 	<string name="search_osm_offline">Пошук ў лакальных картах</string>
 	<string name="system_locale">Сістэма</string>
-	<string name="preferred_locale_descr">Абраць мову інтэрфэйсу</string>
+	<string name="preferred_locale_descr">Выбар мовы інтэрфэйсу (перазапусьціце OsmAnd пасьля зьмены)</string>
 	<string name="preferred_locale">Мова інтэрфэйсу</string>
 	<string name="incomplete_locale">няскончана</string>
 	<string name="tip_map_switch">Абраць крыніцу мапы</string>
@ -1060,7 +1060,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="poi_filter_closest_poi">Бліжэйшыя POI</string>
 	<string name="poi_filter_custom_filter">Свой фільтар</string>
 	<string name="poi_filter_namefinder">Сеткавы NameFinder</string>
-	<string name="reading_cached_tiles">Чытаньне кэшаваных растравых мапаў…</string>
+	<string name="reading_cached_tiles">Чытаньне захаваных фрагмэнтаў…</string>
 	<string name="version_index_is_big_for_memory">Недастаткова памяці для лакальнай мапы \'\'{0}\'\'</string>
 	<string name="version_index_is_not_supported">Версія індэкса \'\'{0}\'\' не падтрымліваецца</string>
 	<string name="use_osmand_routing_service">Навігацыя OsmAnd &gt; 20 км</string>
@ -1076,7 +1076,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="loading_builds_failed">Не ўдалося атрымаць сьпіс зборак OsmAnd</string>
 	<string name="loading_builds">Загружаюцца зборкі OsmAnd…</string>
 	<string name="select_build_to_install">Выберыце зборку OsmAnd для ўстаноўкі</string>
-	<string name="gps_status_app_not_found">Праграма статуса GPS не ўсталяваная. Пашукаць яе ў Market?</string>
+	<string name="gps_status_app_not_found">Праграма стану GPS не ўсталяваная. Шукаць яе ў Google Play?</string>
 	<string name="voice_is_not_available_msg">Галасавыя каманды не даступныя. Калі ласка, перайдзіце ў \"Налады\" → \"Агульныя\" → \"Галасавыя дадзеныя\" і абярыце ці сьцягніце пакет галасавых падказак.</string>
 	<string name="voice_is_not_available_title">Галасавыя падказкі не абраныя</string>
 	<string name="daynight_mode_day">Дзень</string>
@ -1109,7 +1109,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="poi_context_menu_call">Паказаць тэлефон POI</string>
 	<string name="download_type_to_filter">набярыце каб фільтраваць</string>
 	<string name="use_high_res_maps">Дысплей высокай рэзалюцыі</string>
-	<string name="use_high_res_maps_descr">Не расьцягваць (з размыццём) растравыя мапы на дысплеях з высокай шчыльнасьцю</string>
+	<string name="use_high_res_maps_descr">Не расьцягваць (з размыццём) фрагмэнты мапы на дысплеях з высокай шчыльнасьцю</string>
 	<string name="download_files">Сьцягнуць</string>
 	<string name="context_menu_item_search_transport">Шукаць грамадзкi транспарт</string>
 	<string name="transport_searching_transport">Вынiк пошуку транспарту (няма цэлі):</string>
@ -1249,7 +1249,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="search_offline_address">Пазасеціўны пошук</string>
 	<string name="search_online_address">Сеціўны пошук</string>
 	<string name="max_level_download_tile">Максімальнае павелічэньне онлайн мапаў</string>
-	<string name="max_level_download_tile_descr">Выберыце максімальны ўзровень павелічэньня для сьцягваньня растравых мапаў з Інтэрнэту</string>
+	<string name="max_level_download_tile_descr">Выберыце максімальны ўзровень павелічэньня для сьцягваньня фрагмэнтаў мапы з Інтэрнэту</string>
 	<string name="route_general_information">Агульная адлегласьць %1$s, час у дарозе %2$d г. %3$d хв.</string>
 	<string name="router_service_descr">Абраць сеціўны ці пазасеціўны сэрвіс навігацыі</string>
 	<string name="router_service">Сэрвіс навігацыі</string>
@ -1271,7 +1271,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="follow">Пачаць навігацыю</string>
 	<string name="mark_final_location_first">Абярыце спачатку месца прызначэньня</string>
 	<string name="get_directions">Навігацыя</string>
-	<string name="show_gps_status">Паказаць статус GPS</string>
+	<string name="show_gps_status">Паказаць стан GPS</string>
 	<string name="opening_hours">Гадзіны працы</string>
 	<string name="opening_changeset">Адкрыцьцё пакета паправак…</string>
 	<string name="closing_changeset">Закрыцьцё пакета паправак…</string>
@ -1320,7 +1320,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="save_track_to_gpx_descrp">Сьляды будуць захаваныя ў каталог track падчас навігацыі</string>
 	<string name="save_track_to_gpx">Запісваць сьлед у GPX файл</string>
 	<string name="update_tile">Абнавіць мапу</string>
-	<string name="reload_tile">Абнавіць частку мапы</string>
+	<string name="reload_tile">Абнавіць фрагмэнт мапы</string>
 	<string name="mark_point">Цэль</string>
 	<string name="show_osm_bugs_descr">Адлюстроўваць OpenStreetBugs на мапе</string>
 	<string name="show_osm_bugs">Паказаць OpenStreetBugs</string>
@ -1339,7 +1339,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="map_view_3d">3D від</string>
 	<string name="show_poi_over_map_description">Паказаць POI на мапе (выкарыстаць апошні абраны фільтар)</string>
 	<string name="show_poi_over_map">Паказаць POI</string>
-	<string name="map_tile_source_descr">Выберыце крыніцу анлайн або кэшаваных растравых мапаў</string>
+	<string name="map_tile_source_descr">Выберыце крыніцу анлайн або кэшаваных фрагмэнтаў мапы</string>
 	<string name="map_tile_source">Крыніца растравых мапаў</string>
 	<string name="map_source">Крыніца мапы</string>
 	<string name="use_internet">Выкарыстоўваць Інтэрнэт</string>
@ -1539,7 +1539,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
    <string name="osmodroid_refresh">Абнавіць каналы</string>
    <string name="default_or">ці</string>
 	<string name="default_and">і</string>
-    <string name="gps_status_eclipsim">Статус GPS</string>
+    <string name="gps_status_eclipsim">Стан GPS</string>
    <string name="remember_choice">Запомніць мой выбар</string>
    <string name="index_item_world_basemap">Сусьветная аглядная мапа</string>
    <string name="index_item_world_ski">Сусьветная лыжная мапа</string>
@ -1927,7 +1927,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
    <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>
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@ -761,7 +761,7 @@
 	<string name="search_offline_geo_error">Kunne ikke fortolke geografisk hensigt \'%s\'</string>
 	<string name="search_osm_offline">Søg geografisk placering</string>
 	<string name="system_locale">System</string>
-	<string name="preferred_locale_descr">Vælg sprog</string>
+	<string name="preferred_locale_descr">Vælg sprog (genstart OsmAnd efter skift)</string>
 	<string name="preferred_locale">Sprog</string>
 	<string name="incomplete_locale">ufuldstændig</string>
 	<string name="tip_map_switch">Vælg kortkilde</string>
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@ -42,7 +42,7 @@
 	<string name="poi_australian_football">Australischer Fußball</string>
 	<string name="poi_baby_goods">Babyartikel</string>
 	<string name="poi_baby_hatch">Babyklappe</string>
-	<string name="poi_bag_shop">Taschen</string>
+	<string name="poi_bag_shop">Taschengeschäft</string>
 	<string name="poi_bailiff">Gerichtsvollzieher</string>
 	<string name="poi_bakery">Bäckerei</string>
 	<string name="poi_bank">Bank</string>
@ -62,7 +62,7 @@
 	<string name="poi_bed_shop">Badezimmereinrichtung</string>
 	<string name="poi_bedding_shop">Bettwarengeschäft</string>
 	<string name="poi_beekeeper">Bienenzüchter</string>
-	<string name="poi_beverages">Getränke</string>
+	<string name="poi_beverages">Getränkegeschäft</string>
 	<string name="poi_bicycle_parking">Fahrradständer</string>
 	<string name="poi_bicycle_rental">Fahrradvermietung</string>
 	<string name="poi_bicycle_shop">Fahrradgeschäft</string>
@ -107,7 +107,7 @@
 	<string name="poi_caterer">Partyservice</string>
 	<string name="poi_cave_entrance">Höhleneingang</string>
 	<string name="poi_cemetery">Friedhof</string>
-	<string name="poi_chalet">Chalet</string>
+	<string name="poi_chalet">Berghütte</string>
 	<string name="poi_charging_station">Ladestation</string>
 	<string name="poi_chemist_shop">Drogerie</string>
 	<string name="poi_chess">Schach</string>
@ -146,7 +146,7 @@
 	<string name="poi_club_theatre">Theaterklub</string>
 	<string name="poi_club_tourism">Tourismusverein</string>
 	<string name="poi_club_veterans">Veteranenklub</string>
-	<string name="poi_college">College</string>
+	<string name="poi_college">Hochschule</string>
 	<string name="poi_communication_tower">Kommunikationstumr</string>
 	<string name="poi_community_centre">Gemeindezentrum</string>
 	<string name="poi_company">Firma</string>
@ -155,7 +155,7 @@
 	<string name="poi_computer_shop">Computer-Geschäft</string>
 	<string name="poi_confectionery">Süßwaren</string>
 	<string name="poi_construction">Anlage</string>
-	<string name="poi_convenience">Lebensmittel</string>
+	<string name="poi_convenience">Lebensmittelgeschäft</string>
 	<string name="poi_copyshop">Copy-Shop</string>
 	<string name="poi_cosmetics_shop">Kosmetik</string>
 	<string name="poi_courthouse">Gerichtsgebäude</string>
@ -209,10 +209,10 @@
 	<string name="poi_fjord">Fjord</string>
 	<string name="poi_florist">Blumenhandlung</string>
 	<string name="poi_food_court">Markthalle</string>
-	<string name="poi_ford">Ford</string>
-	<string name="poi_fort">Fort</string>
+	<string name="poi_ford">Furt</string>
+	<string name="poi_fort">Festung</string>
 	<string name="poi_fountain">Brunnen</string>
-	<string name="poi_frame_shop">Rahmen</string>
+	<string name="poi_frame_shop">Bilderrahmen-Geschäft</string>
 	<string name="poi_fuel">Tankstelle</string>
 	<string name="poi_funeral_directors">Bestatter</string>
 	<string name="poi_funicular">Seilbahn</string>
@ -307,7 +307,7 @@
 	<string name="poi_military_nuclear_explosion_site">Atombombenexplosionsgebiet</string>
 	<string name="poi_military_range">Militärbereich</string>
 	<string name="poi_mine_historic">Historisches Bergwerk</string>
-	<string name="poi_mineshaft">Mineshaft</string>
+	<string name="poi_mineshaft">Grubenschacht</string>
 	<string name="poi_miniature_golf">Minigolf</string>
 	<string name="poi_mobile_phone_shop">Handy-Geschäft</string>
 	<string name="poi_monastery">Kloster</string>
@ -372,7 +372,7 @@
 	<string name="poi_place_of_worship_shinto">Shintoistische Kultstätte</string>
 	<string name="poi_place_of_worship_sikh">Sikh Kultstätte</string>
 	<string name="poi_place_of_worship_taoist">Taoistische Kultstätte</string>
-	<string name="poi_plasterer">Plasterer</string>
+	<string name="poi_plasterer">Stuckateur</string>
 	<string name="poi_playground">Spielplatz</string>
 	<string name="poi_plumber">Installateur</string>
 	<string name="poi_podiatrist">Fußpfleger</string>
@ -497,7 +497,7 @@
 	<string name="poi_sports_centre">Sportzentrum</string>
 	<string name="poi_sports_shop">Sportartikel</string>
 	<string name="poi_spring">Quelle</string>
-	<string name="poi_stadium">Stadium</string>
+	<string name="poi_stadium">Stadion</string>
 	<string name="poi_stand_builder">Baumeister</string>
 	<string name="poi_standpipe">Brunnen</string>
 	<string name="poi_stationery_shop">Bürobedarf</string>
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
 	<string name="traffic_warning_speed_limit">Geschwindigkeitsbegrenzung</string>
 	<string name="traffic_warning_border_control">Grenzkontrolle</string>
@ -125,30 +125,7 @@
 	<string name="snap_to_road">Auf Straße einrasten</string>
 	<string name="osmand_play_title_30_chars">OsmAnd Karten &amp; Navigation</string>
 	<string name="osmand_short_description_80_chars">Globale Landkarten- und Navigations-Applikation für Offline und Online-Karten</string>
-	<string name="osmand_long_description_1000_chars">
-		OsmAnd (OSM Automated Navigation Directions)
-
-		OsmAnd ist eine Open-Source-Navigationsapplikation mit Zugriff auf eine große Vielfalt öffentlich zugänglicher OpenStreetMap (OSM) Karten weltweit. Alle Karten (Vektor- oder Kachelformate) können lokal auf der Speicherkarte abgelegt und offline verwendet werden. OsmAnd bietet ferner eine offline und online Routing-Funktion inklusive Sprachnavigation.
-
-		Einige der Kernfunktionen:
-		- Komplette Offline-Funktionalität (Kartenmaterial kann auf dem Gerät abgelegt werden)
-		- Kompakte Vektorkarten für die ganze Welt verfügbar
-		- Direktes Herunterladen von Länder- oder Regionenkarten aus der App heraus
-		- Darstellung mehrerer überlagerter Kartenschichten wie GPX oder Navigations-Tracks, POIs (Points of Interest), Favoriten, Höhenlinien, ÖPNV-Haltestellen, zusätzliche Karten mit wählbarer Transparenz
-		- Offline Adress- und POI-Suche
-		- Offlinenavigation für kurze Distanzen (experimentell)
-		- Auto-, Fahrrad- und Fußgänger-Modus mit
-		-  optionaler automatischer Tag-Nacht-Umschaltung der Anzeige
-		-  optionalem geschwindigkeitsabhängigem Kartenmaßstab
-		-  optionaler Kartenausrichtung nach Kompass oder Bewegungsrichtung
-		-  optionaler Fahrspuranzeige, Geschwindigkeitswarnung, aufgenommene oder TTS Sprachansagen
-
-		Einschränkungen dieser kostenlosen Version von OsmAnd:
-		- Anzahl der Kartendownloads
-		- Kein Zugriff auf Wikipedia Offline-POIs
-
-		OsmAnd wird aktiv weiterentwickelt und das Projekt benötigt Mittel für die Entwicklung, die Komplettierung und den Test (Fahrten) neuer Funktionen. Bitte erwägen Sie den Kauf von OsmAnd+, die Förderung spezieller Funktionen oder eine allgemeine Spende auf osmand.net.
-	</string>
+	<string name="osmand_long_description_1000_chars">" OsmAnd (OSM Automated Navigation Directions) OsmAnd ist eine Open-Source-Navigationsapplikation mit Zugriff auf eine große Vielfalt öffentlich zugänglicher OpenStreetMap (OSM) Karten weltweit. Alle Karten (Vektor- oder Kachelformate) können lokal auf der Speicherkarte abgelegt und offline verwendet werden. OsmAnd bietet ferner eine offline und online Routing-Funktion inklusive Sprachnavigation. Einige der Kernfunktionen: - Komplette Offline-Funktionalität (Kartenmaterial kann auf dem Gerät abgelegt werden) - Kompakte Vektorkarten für die ganze Welt verfügbar - Direktes Herunterladen von Länder- oder Regionenkarten aus der App heraus - Darstellung mehrerer überlagerter Kartenschichten wie GPX oder Navigations-Tracks, POIs (Points of Interest), Favoriten, Höhenlinien, ÖPNV-Haltestellen, zusätzliche Karten mit wählbarer Transparenz - Offline Adress- und POI-Suche - Offlinenavigation für kurze Distanzen (experimentell) - Auto-, Fahrrad- und Fußgänger-Modus mit - optionaler automatischer Tag-Nacht-Umschaltung der Anzeige - optionalem geschwindigkeitsabhängigem Kartenmaßstab - optionaler Kartenausrichtung nach Kompass oder Bewegungsrichtung - optionaler Fahrspuranzeige, Geschwindigkeitswarnung, aufgenommene oder TTS Sprachansagen Einschränkungen dieser kostenlosen Version von OsmAnd: - Anzahl der Kartendownloads - Kein Zugriff auf Wikipedia Offline-POIs OsmAnd wird aktiv weiterentwickelt und das Projekt benötigt Mittel für die Entwicklung, die Komplettierung und den Test (Fahrten) neuer Funktionen. Bitte erwägen Sie den Kauf von OsmAnd+, die Förderung spezieller Funktionen oder eine allgemeine Spende auf osmand.net. "</string>
 	
 	<string name="osmand_plus_play_title_30_chars">OsmAnd+ Karten &amp; Navigation</string>
 	<string name="osmand_plus_short_description_80_chars">Globale Landkarten- und Navigations-Applikation für Offline und Online-Karten</string>
@ -966,9 +943,9 @@
 	<string name="transport_to_go_before">vorherige Strecke</string>
 	<string name="transport_stops_to_pass">zu passierende Haltestellen</string>
 	<string name="transport_route_distance">Streckenlänge</string>
-	<string name="transport">Öffentlicher Personenverkehr</string>
+	<string name="transport">ÖPNV</string>
 	<string name="default_buttons_ok">OK</string>
-	<string name="show_transport_over_map_description">Öffentl. Haltestellen auf der Karte anzeigen</string>
+	<string name="show_transport_over_map_description">ÖPNV-Haltestellen auf der Karte anzeigen</string>
 	<string name="show_transport_over_map">Haltestellen anzeigen</string>
 	<string name="hello">Navigationsanwendung OsmAnd</string>
 	<string name="update_poi_success">POI-Daten wurden erfolgreich aktualisiert ({0} wurden geladen)</string>
@ -1538,9 +1515,9 @@
 \n Hinweis 1: Die ursprünglichen Dateien bleiben hiervon unberührt, können aber nachfolgend manuell gelöscht werden.
 \n Hinweis 2: Die Dateien können dann nicht mehr von OsmAnd und OsmAnd+ gemeinsam genutzt werden."</string>
 	<string name="application_dir_change_warning2">Soll OsmAnd auch die Dateien an den neuen Speicherort verschieben? Mit \'Nein\' wird OsmAnd den neuen Speicherort nur anlegen und als Standard verwenden.</string>
-	<string name="copying_osmand_one_file_descr">Datei (%s) wird an den neuen Speicherort kopiert&#8230;</string>
-	<string name="copying_osmand_files_descr">OsmAnd-Dateien werden zum neuen Speicherort (%s) kopiert&#8230;</string>
-	<string name="copying_osmand_files">OsmAnd-Dateien werden kopiert&#8230;</string>
+	<string name="copying_osmand_one_file_descr">Datei (%s) wird an den neuen Speicherort kopiert…</string>
+	<string name="copying_osmand_files_descr">OsmAnd-Dateien werden zum neuen Speicherort (%s) kopiert…</string>
+	<string name="copying_osmand_files">OsmAnd-Dateien werden kopiert…</string>
 	<string name="calculate_osmand_route_gpx">OsmAnd-Offline-Route berechnen</string>
 	<string name="app_mode_truck">LKW</string>
 	<string name="guidance_preferences_descr">Navigations-Einstellungen</string>
@ -1838,7 +1815,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an

 	<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>
-	<string name="osmo_plugin_description">"Erweiterte OpenStreetMap-basierte Live-Überwachung, siehe http://osmo.mobi … Ermöglicht die Positionsdarstellung in von einzelnen Geräten in Echtzeit. Bei anonym erstellten Gruppen sind die Optionen etwas eingeschränkt: Lebensdauer der Gruppe nur für einige Tage, auch ist keine zentrale Steuerung der Gruppe möglich. Es gibt verschiedene Einstellungen für zeitlich begrenzte oder Dauer-Aufzeichnung. Voll funktionsfähige Gruppen müssen auf der genannten Internetseite erstellt werden, auf die Gruppe haben nur registrierte Nutzer Zugriff."</string>
+	<string name="osmo_plugin_description">"Erweiterte OpenStreetMap-basierte Live-Überwachung, siehe http://osmo.mobi … Ermöglicht die Positionsdarstellung in von einzelnen Geräten in Echtzeit. Bei anonym erstellten Gruppen sind die Optionen etwas eingeschränkt: Lebensdauer der Gruppe nur für einige Tage, auch ist keine zentrale Steuerung der Gruppe möglich. Es gibt verschiedene Einstellungen für zeitlich begrenzte oder Dauer-Aufzeichnung. Voll funktionsfähige Gruppen müssen auf der genannten Internetseite erstellt werden, auf die Gruppe haben nur registrierte Nutzer Zugriff. "</string>
 	<string name="osmo_plugin_name">OsMo (Erweiterte Live-Überwachung)</string>
 	<string name="osmo_settings">OsMo OpenStreetMap-Überwachung</string>
 	<string name="osmo_io_error">OsMo Verbindungsproblem: </string>
@ -1999,7 +1976,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
    <string name="wake_on_voice">Bildschirm aktivieren</string>
    <string name="wake_on_voice_descr">Bildschirm bei Navigationsanweisung aktivieren</string>
    <string name="wake_on_voice_never">Niemals</string>
-    <string name="select_impassable_road">Auf Karte auswählen&#8230;</string>
+    <string name="select_impassable_road">Auf Karte auswählen…</string>
    <string name="impassable_road">Straße blockieren…</string>
    <string name="rendering_attr_tramTrainRoutes_name">Straßen- und Eisenbahnlinien</string>
    <string name="rendering_attr_trainLightrailRoutes_name">Stadtbahnlinien</string>
@ -2044,7 +2021,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
    <string name="show_railway_warnings">Eisenbahnübergänge anzeigen</string>
    <string name="show_pedestrian_warnings">Fußgängerübergänge anzeigen</string>
    <string name="rendering_value_americanRoadAtlas_name">Amerikanischer Straßenatlas</string>
-    <string name="routing_attr_no_new_routing_name">Routing v1.9 nicht verwenden</string>
+    <string name="routing_attr_no_new_routing_name">Routing-Regeln v1.9 nicht verwenden</string>
    <string name="routing_attr_no_new_routing_description">Neuen Routenalgorithmus nicht verwenden</string>
    <string name="speak_pedestrian">Fußgängerübergänge ankündigen</string>
    </resources>
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@ -578,7 +578,7 @@
 	<string name="search_offline_geo_error">Δεν ήταν δυνατή η ανάλυση της γεωγρ πρόθεσης \'%s\'</string>
 	<string name="search_osm_offline">Αναζήτηση γεωγραφικής τοποθεσίας</string>
 	<string name="system_locale">Σύστημα</string>
-	<string name="preferred_locale_descr">Επιλέξτε γλώσσα εμφάνισης</string>
+	<string name="preferred_locale_descr">Επιλέξτε γλώσσα εμφάνισης (επανεκκινήστε τον OsmAnd μετά την αλλαγή)</string>
 	<string name="preferred_locale">Γλώσσα εμφάνισης</string>
 	<string name="tip_map_switch">Επιλογή Πηγής Χάρτη</string>
 	<string name="tip_map_switch_t_v2">"Η πηγή χάρτη και οι στρώσεις χάρτη που εμφανίζονται αλλάζουν μέσω του \'Μενού\' → \'Διαμόρφωση χάρτη\'.
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@ -272,7 +272,7 @@
  <string name="search_offline_geo_error">No se pudo analizar el filtro \'%s\'</string>
  <string name="search_osm_offline">Buscar dirección usando mapas sin conexión</string>
  <string name="system_locale">Sistema</string>
-  <string name="preferred_locale_descr">Selecciona el idioma de visualización</string>
+  <string name="preferred_locale_descr">Selecciona el idioma de visualización (por favor, reinicie OsmAnd después del cambio)</string>
  <string name="preferred_locale">Idioma de la pantalla</string>
  <string name="tip_map_switch">Elige una Fuente de mapa</string>
  
@ -1832,7 +1832,7 @@
    <string name="search_radius_proximity">En las proximidades de</string>
    <string name="tip_recent_changes_1_9_t">"Cambios en 1.9: * Actualizados los estilos de los mapas con renderizado de la superficie de la carretera, capas de transporte y símbolos de senderismo * Búsqueda de puntos de interés a lo largo de la ruta * Marcar carretera como intransitable por sesión * Más sencillo la descarga y actualización de mapas * Recibir notificaciones visuales y sonoras al acercarse a un punto de la ruta * Imprimir itinerario e información de giros * Soporte de carriles de giro * Soporte a  Android Wear * Muchos cambios en la IU * Acercamiento separado por tamaño de texto en el mapa * Notificación de audio especial en caso de que esté fuera de la ruta * Funcionalidad de inicio de sesión en OsMo * Corregidas incompatibilidades de versión de OsMo "</string>
    <string name="rendering_category_routes">Rutas</string>
-    <string name="select_impassable_road">Seleccionar en el mapa</string>
+    <string name="select_impassable_road">Seleccionar en el mapa…</string>
    <string name="impassable_road">Evitar carreteras…</string>
    <string name="rendering_attr_tramTrainRoutes_name">Rutas de tranvía y tren</string>
    <string name="rendering_attr_trainLightrailRoutes_name">Rutas de tren</string>
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@ -283,7 +283,7 @@
  <string name="search_offline_geo_error">Ne peut interpréter le geo intent:\'%s\'</string>
  <string name="search_osm_offline">Recherche d\'adresses dans les cartes hors-ligne</string>
  <string name="system_locale">Système</string>
-  <string name="preferred_locale_descr">Sélectionnez la langue d\'affichage (veuillez redémarrer OsmAnd après modification)</string>
+  <string name="preferred_locale_descr">Sélectionnez la langue à afficher (veuillez redémarrer OsmAnd après votre modification)</string>
  <string name="preferred_locale">Langue de l\'application</string>
  <string name="tip_map_switch">Sélectionner une source de carte</string>
  
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@ -275,7 +275,7 @@
  <string name="search_offline_geo_error">Impossibile leggere geo intent \'%s\'</string>
  <string name="search_osm_offline">Ricerca indirizzo usando le mappe offline</string>
  <string name="system_locale">Sistema</string>
-  <string name="preferred_locale_descr">Seleziona lingua interfaccia</string>
+  <string name="preferred_locale_descr">Seleziona lingua interfaccia (si prega di riavviare OsmAnd dopo il cambio)</string>
  <string name="preferred_locale">Lingua interfaccia</string>
  <string name="tip_map_switch">Scegli una Fonte della Mappa</string>
  
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@ -387,7 +387,7 @@
 	<string name="search_osm_offline">지오 위치 검색</string>

 	<string name="system_locale">시스템 언어</string>
-	<string name="preferred_locale_descr">표시 언어를 선택합니다</string>
+	<string name="preferred_locale_descr">언어 선택 (OsmAnd를 재시작해 주세요)</string>
 	<string name="preferred_locale">언어 표시</string>

 	<string name="tip_map_switch">지도 소스를 선택</string>
@ -2058,7 +2058,7 @@
    <string name="rendering_attr_shareTaxiRoutes_name">택시 노선 공유</string>
    <string name="rendering_attr_trolleybusRoutes_name">무궤도 전차 노선</string>
    <string name="rendering_attr_busRoutes_name">버스 노선</string>
-    <string name="select_impassable_road">지도에서 선택</string>
+    <string name="select_impassable_road">지도에서 선택…</string>
    <string name="impassable_road">도로 회피…</string>
    <string name="rendering_attr_tramTrainRoutes_name">전차 및 기차 노선</string>
    <string name="rendering_category_hide">숨기기</string>
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@ -477,7 +477,7 @@
  <string name="search_offline_geo_error">Nepavyko suprasti geo poreikio \'%s\'</string>
  <string name="search_osm_offline">Ieškoti adreso parsiųstuose žemėlapiuose</string>
  <string name="system_locale">Sistemos</string>
-  <string name="preferred_locale_descr">Pasirinkite programos kalbą</string>
+  <string name="preferred_locale_descr">Pasirinkite programos kalbą (pakeitę kalbą iš naujo aktyvuokite OsmAnd)</string>
  <string name="preferred_locale">Programos kalba</string>
  <string name="tip_map_switch">Pasirinkti žemėlapių šaltinį</string>
  
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@ -267,7 +267,7 @@
 	<string name="search_position_undefined">Udefinert</string>
 	<string name="search_position_fixed">Fast</string>
 	<string name="search_position_current_location">Gjeldende posisjon…</string>
-	<string name="search_position_map_view">Siste kartvisning</string>
+	<string name="search_position_map_view">Gjeldende kartsenter</string>
 	<string name="select_search_position">Utgangspunkt:</string>
 	<string name="context_menu_item_search">Søk nær her</string>
 	<string name="save_route_dialog_title">Lagre rute som GPX-spor</string>
@ -324,7 +324,7 @@
 \n\nFor å vise alle favorittpunkter direkte på kartet, aktiver på kartskjermen laget \'Favoritter\' i \'Meny\' → \'Still inn kart\'. "</string>
 	<string name="search_osm_offline">Søk geografisk plassering</string>
 	<string name="system_locale">System</string>
-	<string name="preferred_locale_descr">Velg visningsspråk</string>
+	<string name="preferred_locale_descr">Velg visningsspråk (start OsmAnd på nytt etter endring)</string>
 	<string name="preferred_locale">Visningsspråk</string>
 	<string name="tip_map_switch">Velg en kartkilde</string>
 	<string name="tip_map_switch_t_v2">"Kartkilden og kartlag som vises endres via \'Meny\' → \'Still inn kart\'.
@ -391,7 +391,7 @@
 	<string name="km_h">km/t</string>
 	<string name="m">m</string>
 	<string name="old_map_index_is_not_supported">Foreldet kartdataformat \'\'{0}\'\' støttes ikke</string>
-	<string name="poi_filter_closest_poi">Nærmeste interessepunkt</string>
+	<string name="poi_filter_closest_poi">Nærmeste interessepunkter</string>
 	<string name="poi_filter_custom_filter">Egendefinert filter</string>
 	<string name="specified_dir_doesnt_exist">Kan ikke finne den spesifiserte mappen.</string>
 	<string name="application_dir">Datalagringsmappe</string>
@ -463,7 +463,7 @@
 	<string name="search_poi_filter">Filter</string>
 	<string name="voice_provider_descr">Velg taleveiledning for navigering</string>
 	<string name="voice_provider">Taleveiledning</string>
-	<string name="search_near_map">Søk i nærheten av siste kartplassering</string>
+	<string name="search_near_map">Søk i nærheten av gjeldende kartsenter</string>
 	<string name="search_nearby">Søk i nærheten</string>
 	<string name="map_orientation_default">Samme som enhet</string>
 	<string name="map_orientation_portrait">Portrett</string>
@ -798,7 +798,7 @@
 	<string name="prefs_plugins">Programtillegg</string>
 	<string name="show_point_options">Bruk posisjon…</string>
 	<string name="wake_on_voice">Slå på skjermen</string>
-    <string name="select_impassable_road">Velg på kart</string>
+    <string name="select_impassable_road">Velg på kart…</string>
    <string name="impassable_road">Unngå veier…</string>
    <string name="rendering_attr_busRoutes_name">Bussruter</string>
    <string name="rendering_category_hide">Skjul</string>
@ -894,7 +894,7 @@
 	<string name="routing_attr_weight_description">Angi kjøretøyets vekt som er tillatt på ruter</string>
    <string name="copying_osmand_files_descr">Kopierer OsmAnd-datafiler til det nye stedet (%s)…</string>
    <string name="distance_measurement_clear_route">Slett alle punkter</string>
-    <string name="use_kalman_filter_compass_descr">Bruk Kalmanfilter for å unngå kompassavvik</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="available_downloads_left">Er tilgjengelig %1$d filer til nedlasting</string>
@ -1190,4 +1190,5 @@
 	<string name="lock_screen_request_explanation">%1$s trenger denne tillatelsen til å slå av skjermen (Strømsparingsfunksjon).</string>
    <string name="show_all">VIS ALLE</string>
 	<string name="speak_pedestrian">Meld om fotgjengeroverganger</string>
-    </resources>
+    <string name="rendering_value__name">Standard</string>
+	</resources>
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="poi_mine_historic">Historische mijn</string>
+	<string name="poi_palaeontological_site">Paleontologische site</string>
+
+	<string name="poi_bakery">Bakkerij</string>
+	<string name="poi_alcohol">Drankwinkel</string>
+	<string name="poi_convenience">Supermarkt</string>
+	<string name="poi_mall">Winkelcentrum</string>
+	<string name="poi_beverages">Drankwinkel</string>
+	<string name="poi_butcher">Vleesmarkt</string>
+	<string name="poi_deli">Delicatessenwinkel</string>
+	<string name="poi_shop_farm">Boerderijwinkel</string>
+	<string name="poi_greengrocer">Groentewinkel</string>
+	<string name="poi_seafood">Viswinkel</string>
+	<string name="poi_confectionery">Banketbakkerij</string>
+	<string name="poi_military_nuclear_explosion_site">Kernexplosiesite</string>
+<string name="poi_ice_cream">IJssalon</string>
+	<string name="poi_supermarket">Supermarkt</string>
+	<string name="poi_shop_tea">Theewinkel</string>
+	<string name="poi_dairy">Zuivelwinkel</string>
+	<string name="poi_vending_machine">Verkoopautomaat</string>
+
+	<string name="poi_bookshop">Boekhandel</string>
+	<string name="poi_bicycle_shop">Fietswinkel</string>
+	<string name="poi_anime_shop">Animewinkel</string>
+	<string name="poi_antiques_shop">Antiekwinkel</string>
+	<string name="poi_art_shop">Kunstwinkel</string>
+	<string name="poi_baby_goods">Babywinkel</string>
+	<string name="poi_bag_shop">Tassenwinkel</string>
+	<string name="poi_bathroom_furnishing_shop">Badkamermeubelwinkel</string>
+	<string name="poi_bed_shop">Slaapkamermeubelwinkel</string>
+	<string name="poi_boutique">Modezaak</string>
+	<string name="poi_carpet_shop">Tapijtwinkel</string>
+	<string name="poi_chemist_shop">Apotheek</string>
+	<string name="poi_clothes_shop">Kledingwinkel</string>
+	<string name="poi_children_clothes_shop">Kinderkledingwinkel</string>
+	<string name="poi_shoes">Schoenenwinkel</string>
+	<string name="poi_computer_shop">Computerwinkel</string>
+	<string name="poi_copyshop">Kopieerzaak</string>
+	<string name="poi_curtain_shop">Gordijnwinkel</string>
+	<string name="poi_fabric_shop">Stoffenwinkel</string>
+	<string name="poi_bedding_shop">Beddenwinkel</string>
+	<string name="poi_dive_shop">Duikbenodigdheden</string>
+	<string name="poi_doityourself_shop">Bouwmarkt</string>
+	<string name="poi_erotic_shop">Sex-shop</string>
+	<string name="poi_florist">Bloemenwinkel</string>
+	<string name="poi_garden_centre">Tuincentrum</string>
+	<string name="poi_gas_shop">Gasflessen</string>
+	<string name="poi_gift_shop">Cadeauwinkel</string>
+	<string name="poi_glaziery_shop">Glashandel</string>
+	<string name="poi_hardware_shop">IJzerhandel</string>
+	<string name="poi_hearing_aids_shop">Hoorapparaten</string>
+	</resources>
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@ -376,7 +376,7 @@
  <string name="search_offline_geo_error">Kan de geo intent \'%s\' niet verwerken</string>
  <string name="search_osm_offline">Zoek adres in de offline kaarten</string>
  <string name="system_locale">Systeem</string>
-  <string name="preferred_locale_descr">Kies de taal van het menu</string>
+  <string name="preferred_locale_descr">Kies de taal van het menu (gelieve OsmAnd daarna te herstarten)</string>
  <string name="preferred_locale">Taal</string>
  <string name="tip_map_switch">Kies een kaartbron</string>
  
@ -1998,7 +1998,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
    <string name="rendering_attr_tramTrainRoutes_name">Tram- en treinverbindingen</string>
    <string name="wake_on_voice">Zet het scherm aan</string>
    <string name="wake_on_voice_descr">Zet het scherm aan bij het naderen van een bocht</string>
-    <string name="select_impassable_road">Selecteer op kaart</string>
+    <string name="select_impassable_road">Selecteer op kaart…</string>
    <string name="impassable_road">Vermijd wegen…</string>
    <string name="rendering_category_hide">Verberg</string>
    <string name="wake_on_voice_never">Nooit</string>
@ -2017,7 +2017,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
    <string name="use_opengl_render_descr">Gebruik snelle, hardware-gebaseerde OpenGL weergave (werkt niet op alle apparaten)</string>
    <string name="error_avoid_specific_road">Er is geen alternatieve weg gevonden</string>
    <string name="dismiss">Sluiten</string>
-    <string name="no_internet_connection">Kan niet downloaden. Maak verbinding met internet om verder te gaan.</string>
+    <string name="no_internet_connection">Kan niet downloaden, gelieve uw internetverbinding na te kijken.</string>
    <string name="download_tab_downloads">Alle downloads</string>
    <string name="download_tab_updates">Updates</string>
    <string name="download_tab_local">Geïnstalleerd</string>
@ -2043,4 +2043,5 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 	<string name="show_railway_warnings">Toon spoorwegovergangen</string>
 	<string name="show_pedestrian_warnings">Toon voetgangers oversteekplaatsen</string>
    <string name="speak_pedestrian">Meld oversteekplaatsen</string>
-    </resources>
+    <string name="rendering_value__name">Standaard</string>
+	</resources>
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@ -247,4 +247,212 @@
 	<string name="poi_town">Miasto</string>
 	<string name="poi_village">Wieś</string>
 	<string name="poi_hamlet">Wioska</string>
+	<string name="poi_hospital">Szpital</string>
+	<string name="poi_doctors">Przychodnia</string>
+	<string name="poi_clinic">Klinika</string>
+	<string name="poi_dentist">Dentysta</string>
+	<string name="poi_nursing_home">Dom opieki</string>
+	<string name="poi_baby_hatch">Okno życia</string>
+	<string name="poi_veterinary">Weterynarz</string>
+	<string name="poi_sanatorium">Sanatorium</string>
+	<string name="poi_healthcare_alternative">Medycyna alternatywna</string>
+	<string name="poi_audiologist">Audiolog</string>
+	<string name="poi_blood_bank">Bank krwi</string>
+	<string name="poi_healthcare_centre">Centrum medyczne</string>
+	<string name="poi_optometrist">Okulista</string>
+	<string name="poi_physiotherapist">Fizjoterapeuta</string>
+	<string name="poi_psychotherapist">Psychoterapeuta</string>
+	<string name="poi_speech_therapist">Logopeda</string>
+	<string name="poi_healthcare_yes">Placówka medyczna</string>
+
+	<string name="poi_company">Firma</string>
+	<string name="poi_insurance">Ubezpieczenia</string>
+	<string name="poi_estate_agent">Agent nieruchomości</string>
+	<string name="poi_lawyer">Prawnik</string>
+	<string name="poi_ngo">Organizacja pozarządowa</string>
+	<string name="poi_town_hall">Ratusz</string>
+	<string name="poi_employment_agency">Urząd pracy</string>
+	<string name="poi_advertising_agency">Agencja reklamowa</string>
+	<string name="poi_educational_institution">Instytucja edukacyjna</string>
+	<string name="poi_studio">Studio</string>
+	<string name="poi_bookmaker">Bukmacher</string>
+
+	<string name="poi_stadium">Stadion</string>
+	<string name="poi_sports_centre">Centrum sportowe</string>
+	<string name="poi_golf_course">Pole golfowe</string>
+	<string name="poi_ice_rink">Lodowisko</string>
+	<string name="poi_pitch">Boisko</string>
+	<string name="poi_running_track">Bieżnia</string>
+	<string name="poi_horse_track">Tor wyścigów konnych</string>
+	<string name="poi_raceway">Tor wyścigowy</string>
+	<string name="poi_archery">Łucznictwo</string>
+	<string name="poi_athletics">Lekkoatletyka</string>
+	<string name="poi_american_football">Futbol amerykański</string>
+	<string name="poi_australian_football">Futbol australijski</string>
+	<string name="poi_baseball">Baseball</string>
+	<string name="poi_basketball">Koszykówka</string>
+	<string name="poi_beachvolleyball">Siatkówka plażowa</string>
+	<string name="poi_canadian_football">Futbol kanadyjski</string>
+	<string name="poi_chess">Szachy</string>
+	<string name="poi_cricket">Krykiet</string>
+	<string name="poi_cycling">Jazda na rowerze</string>
+	<string name="poi_diving">Nurkowanie</string>
+	<string name="poi_scuba_diving">Nurkowanie z akwalungiem</string>
+	<string name="poi_dog_racing">Wyścigi psów</string>
+	<string name="poi_golf">Golf</string>
+	<string name="poi_gymnastics">Gimnastyka</string>
+	<string name="poi_handball">Piłka ręczna</string>
+	<string name="poi_hockey">Hokej</string>
+	<string name="poi_horse_racing">Wyścigi konne</string>
+	<string name="poi_orienteering">Biegi na orientację</string>
+	<string name="poi_paragliding">Paralotniarstwo</string>
+	<string name="poi_rowing">Wioślarstwo</string>
+	<string name="poi_skating">Łyżwiarstwo</string>
+	<string name="poi_skiing">Jazda na nartach</string>
+	<string name="poi_soccer">Piłka nożna</string>
+	<string name="poi_surfing">Surfing</string>
+	<string name="poi_swimming">Pływanie</string>
+	<string name="poi_table_tennis">Tenis stołowy</string>
+	<string name="poi_tennis">Tenis</string>
+	<string name="poi_volleyball">Siatkówka</string>
+
+	<string name="poi_museum">Muzeum</string>
+	<string name="poi_memorial">Pomnik</string>
+	<string name="poi_archaeological_site">Wykopalisko archeologiczne</string>
+	<string name="poi_boundary_stone">Kamień graniczny</string>
+	<string name="poi_cannon">Historyczne armaty</string>
+	<string name="poi_castle">Zamek</string>
+	<string name="poi_city_gate">Brama miasta</string>
+	<string name="poi_fort">Fort</string>
+	<string name="poi_fountain">Fontanna</string>
+	<string name="poi_ruins_historic">Zabytkowe ruiny</string>
+	<string name="poi_rune_stone">Kamień runiczny</string>
+	<string name="poi_wreck">Wrak statku</string>
+	<string name="poi_ship_historic">Zabytkowy statek</string>
+	<string name="poi_monument">Monument</string>
+	<string name="poi_zoo">Zoo</string>
+	<string name="poi_aquarium">Akwarium</string>
+	<string name="poi_theme_park">Park rozrywki</string>
+	
+	<string name="poi_attraction">Atrakcja turystyczna</string>
+	<string name="poi_ferris_wheel">Diabelski młyn</string>
+	<string name="poi_carousel">Karuzela</string>
+	<string name="poi_maze">Labirynt</string>
+	<string name="poi_roller_coaster">Roller coaster</string>
+	<string name="poi_water_slide">Zjeżdżalnia wodna</string>
+
+	<string name="poi_hotel">Hotel</string>
+	<string name="poi_guest_house">Pensjonat</string>
+	<string name="poi_hostel">Hostel</string>
+	<string name="poi_motel">Motel</string>
+	<string name="poi_place_of_worship">Miejsce kultu</string>
+	<string name="poi_monastery">Klasztor</string>
+	<string name="poi_historic_monastery">Zabytkowy klasztor</string>
+	<string name="poi_wayside_cross">Przydrożny krzyż</string>
+	<string name="poi_wayside_shrine">Przydrożna kapliczka</string>
+	<string name="poi_tourism_information">Informacja turystyczna</string>
+	<string name="poi_clock">Zegar</string>
+	<string name="poi_geyser">Gejzer</string>
+	<string name="poi_cemetery">Cmentarz</string>
+	<string name="poi_grave_yard">Cmentarzyk</string>
+	<string name="poi_library">Biblioteka</string>
+	<string name="poi_arts_centre">Centrum sztuki</string>
+	<string name="poi_cinema">Kino</string>
+	<string name="poi_casino">Kasyno</string>
+	<string name="poi_theatre">Teatr</string>
+	<string name="poi_circus">Cyrk</string>
+	<string name="poi_dance_floor">Parkiet taneczny</string>
+	<string name="poi_nightclub">Klub nocny</string>
+	<string name="poi_fishing_place">Miejsce połowów</string>
+	<string name="poi_harbour">Port</string>
+	<string name="poi_miniature_golf">Miniaturowy golf</string>
+	<string name="poi_playground">Plac zabaw</string>
+	<string name="poi_swimming_pool">Basen</string>
+	<string name="poi_water_park">Park wodny</string>
+	<string name="poi_park">Park</string>
+
+	<string name="poi_restaurant">Restauracja</string>
+	<string name="poi_bar">Bar</string>
+	<string name="poi_pub">Pub</string>
+	<string name="poi_drinking_water">Woda pitna</string>
+	<string name="poi_barbecue">Grill</string>
+
+	<string name="poi_basket_maker">Wikliniarz</string>
+	<string name="poi_beekeeper">Pszczelarz</string>
+	<string name="poi_blacksmith">Kowal</string>
+	<string name="poi_brewery">Browar</string>
+	<string name="poi_bookbinder">Introligator</string>
+	<string name="poi_carpenter">Cieśla</string>
+	<string name="poi_clockmaker">Zegarmistrz</string>
+	<string name="poi_dressmaker">Krawiec</string>
+	<string name="poi_electrician">Elektryk</string>
+	<string name="poi_gardener">Ogrodnik</string>
+	<string name="poi_hvac">Ogrzewanie, wentylacja, klimatyzacja</string>
+	<string name="poi_locksmith">Ślusarz</string>
+	<string name="poi_optician">Optyk</string>
+	<string name="poi_painter">Malarz</string>
+	<string name="poi_photographer">Fotograf</string>
+	<string name="poi_photographic_laboratory">Laboratorium fotograficzne</string>
+	<string name="poi_plasterer">Tynkarz</string>
+	<string name="poi_plumber">Hydraulik</string>
+	<string name="poi_roofer">Dekarz</string>
+	<string name="poi_saddler">Rymarz</string>
+	<string name="poi_sawmill">Tartak</string>
+	<string name="poi_scaffolder">Monter rusztowań</string>
+	<string name="poi_sculptor">Rzeźbiarz</string>
+	<string name="poi_shoemaker">Szewc</string>
+	<string name="poi_stonemason">Kamieniarz</string>
+	<string name="poi_tailor">Krawiec</string>
+	<string name="poi_tiler">Glazurnik</string>
+	<string name="poi_tinsmith">Blacharz</string>
+	<string name="poi_upholsterer">Tapicer</string>
+	<string name="poi_watchmaker">Zegarmistrz</string>
+	<string name="poi_beauty_salon">Salon piękności</string>
+	<string name="poi_beauty_salon_nails">Salon paznokci</string>
+	<string name="poi_hairdresser">Salon fryzjerski</string>
+	<string name="poi_massage">Salon masażu</string>
+	<string name="poi_tattoo">Salon tatuażu</string>
+	<string name="poi_dry_cleaning">Pralnia chemiczna</string>
+	<string name="poi_laundry">Pralnia</string>
+	<string name="poi_car_rental">Wypożyczalnia samochodów</string>
+	<string name="poi_dock">Dok</string>
+	<string name="poi_toilets">Toalety</string>
+	<string name="poi_sauna">Sauna</string>
+	<string name="poi_brothel">Dom publiczny</string>
+	<string name="poi_mortuary">Kostnica</string>
+	<string name="poi_crematorium">Krematorium</string>
+	<string name="poi_internet_cafe">Kawiarenka internetowa</string>
+
+	<string name="poi_bank">Bank</string>
+	<string name="poi_atm">Bankomat</string>
+	<string name="poi_currencyexchange">Kantor</string>
+	<string name="poi_accountant">Księgowy</string>
+	<string name="poi_bitcoin_yes">Płatność bitcoinami</string>
+
+	<string name="poi_peak">Szczyt</string>
+	<string name="poi_volcano">Wulkan</string>
+	<string name="poi_crater">Krater</string>
+	<string name="poi_waterfall">Wodospad</string>
+	<string name="poi_river">Rzeka</string>
+	<string name="poi_stream">Strumień</string>
+	<string name="poi_beach">Plaża</string>
+	<string name="poi_bay">Zatoka</string>
+	<string name="poi_fjord">Fiord</string>
+	<string name="poi_reef">Rafa</string>
+	<string name="poi_nature_reserve">Rezerwat przyrody</string>
+	<string name="poi_strait">Cieśnina</string>
+	<string name="poi_island">Wyspa</string>
+	<string name="poi_islet">Wysepka</string>
+
+	<string name="poi_seamark_beacon">Latarnia</string>
+	<string name="poi_seamark_berth">Miejsce do cumowania</string>
+	<string name="poi_seamark_dry_dock">Suchy dok</string>
+	<string name="poi_seamark_floating_dock">Dok pływający</string>
+	<string name="poi_seamark_harbour">Port</string>
+	<string name="poi_seamark_landmark">Punkt orientacyjny</string>
+	<string name="poi_military">Strefa wojskowa</string>
+	<string name="poi_military_airfield">Lotnisko wojskowe</string>
+	<string name="poi_military_bunker">Bunkier wojskowy</string>
+	<string name="poi_military_barracks">Koszary</string>
+	<string name="poi_military_range">Poligon</string>
 	</resources>
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@ -177,7 +177,7 @@
  <string name="search_offline_geo_error">Nie można zinterpretować \'%s\'</string>
  <string name="search_osm_offline">Wyszukaj adres korzystając z map offline</string>
  <string name="system_locale">Systemowy</string>
-  <string name="preferred_locale_descr">Wybierz język interfejsu</string>
+  <string name="preferred_locale_descr">Wybierz język interfejsu (zrestartuj OsmAnd po zmianie)</string>
  <string name="preferred_locale">Język interfejsu</string>
  <string name="tip_map_switch">Wybierz źródło mapy</string>
  
@ -1949,7 +1949,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
    <string name="osmo_use_https_descr">Użyj bezpiecznego połączenia z serwerem</string>
    <string name="osmo_use_https">Użyj HTTPS</string>
 	<string name="advanced_settings">Zaawansowane</string>
-	<string name="home_button">Dom</string>
+	<string name="home_button">Ekran startowy</string>
    <string name="map_update">Dostępne aktualizacje dla %1$s map</string>
 	<string name="search_for">Wyszukaj</string>
 	<string name="show_map">POKAŻ MAPĘ</string>
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@ -1228,7 +1228,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="search_offline_geo_error">Impossìbile lèghere geo intent \'%s\'</string>
 	<string name="search_osm_offline">Chirca indiritzu impreande sas mapas non in lìnia</string>
 	<string name="system_locale">Sistema</string>
-	<string name="preferred_locale_descr">Ischerta limba interfàtzia</string>
+	<string name="preferred_locale_descr">Ischerta limba interfàtzia (pro piaghere torra a allùere OsmAnd a pustis de su càmbiu)</string>
 	<string name="preferred_locale">Limba interfàtzia</string>
 	<string name="incomplete_locale">non cumpridu</string>
 	<string name="tip_map_switch">Issèbera una Mitza pro sa Mapa</string>
@ -1773,7 +1773,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
    <string name="rendering_attr_tramTrainRoutes_name">Àndalas tram e trenu</string>
    <string name="wake_on_voice">Allughe s\'ischermu</string>
    <string name="wake_on_voice_descr">Allughe s\'ischermu cando b\'est una bortada a curtzu</string>
-    <string name="select_impassable_road">Ischerta in sa mapa</string>
+    <string name="select_impassable_road">Ischerta in sa mapa…</string>
    <string name="impassable_road">Istransi istradas…</string>
    <string name="rendering_category_hide">Cua</string>
    <string name="wake_on_voice_never">Mai</string>
@ -1818,4 +1818,5 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
 	<string name="show_railway_warnings">Ammustra sas rugradas ferroviàrias</string>
 	<string name="show_pedestrian_warnings">Ammustra sas istrìscias pedonales</string>
    <string name="speak_pedestrian">Annùntzia sos atraessamentos pedonales</string>
-    </resources>
+    <string name="rendering_value__name">Predefinidu</string>
+	</resources>
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@ -472,7 +472,7 @@
  <string name="search_offline_geo_error">Nedá sa parsovať geo obsah: "%s"</string>
  <string name="search_osm_offline">Nájsť adresu použitím stiahnutých máp</string>
  <string name="system_locale">Systémový</string>
-  <string name="preferred_locale_descr">Zmeniť zobrazovaný jazyk</string>
+  <string name="preferred_locale_descr">Zmeniť zobrazovaný jazyk (po zmene je potrebné reštartovať OsmAnd)</string>
  <string name="preferred_locale">Jazyk zobrazenia</string>
  <string name="tip_map_switch">Vyberte zdroj mapy</string>
  
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@ -528,7 +528,7 @@
 <string name="search_offline_geo_error">Det gick inte att tolka geo uppsåt \'%s\'</string>
 <string name="search_osm_offline">Sök adress med hjälp av offline-kartor</string>
 <string name="system_locale">System</string>
-<string name="preferred_locale_descr">Välj visningsspråk</string>
+<string name="preferred_locale_descr">Välj visningsspråk (starta om OsmAnd efter språkbyte)</string>
 <string name="preferred_locale">Visningsspråk</string>
 <string name="tip_map_switch">Kartkälla</string>
 <string name="tip_app_mode">Användarprofil</string>
--- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
@ -107,6 +107,8 @@ public class ConfigureMapMenu {
 				return false;
 			} else if(itemId == R.string.layer_gpx_layer && cm.getSelection(pos) == 1) {
 				ma.getMapLayers().showGPXFileLayer(getAlreadySelectedGpx(), ma.getMapView());
+				//sync tick mark
+				cm.item(R.string.layer_gpx_layer).selected(ma.getMyApplication().getSelectedGpxHelper().isShowingAnyGpxFiles() ? 1 : 0).reg();
 				return false;
 			} else  {
 				return super.onRowItemClick(adapter, view, itemId, pos);
@ -131,6 +133,8 @@ public class ConfigureMapMenu {
 				} else {
 					ma.getMapLayers().showGPXFileLayer(getAlreadySelectedGpx(), ma.getMapView());
 				}
+				//sync tick mark
+				cm.item(R.string.layer_gpx_layer).selected(ma.getMyApplication().getSelectedGpxHelper().isShowingAnyGpxFiles() ? 1 : 0).reg();
 			} else if (itemId == R.string.layer_transport_route) {
 				ma.getMapLayers().getTransportInfoLayer().setVisible(isChecked);
 			}
@ -148,9 +152,9 @@ public class ConfigureMapMenu {
 		// String appMode = " [" + settings.getApplicationMode().toHumanString(view.getApplication()) +"] ";
 		adapter.item(R.string.layer_poi).selected(settings.SHOW_POI_OVER_MAP.get() ? 1 : 0)
 				.icons(R.drawable.ic_action_info_dark, R.drawable.ic_action_info_light).listen(l).reg();
-		adapter.item(R.string.layer_amenity_label).selected(settings.SHOW_POI_LABEL.get() ? 1 : 0) 
+		adapter.item(R.string.layer_amenity_label).selected(settings.SHOW_POI_LABEL.get() ? 1 : 0)
 				.icons(R.drawable.ic_action_text_dark, R.drawable.ic_action_text_light).listen(l).reg();
-		adapter.item(R.string.layer_favorites).selected(settings.SHOW_FAVORITES.get() ? 1 : 0) 
+		adapter.item(R.string.layer_favorites).selected(settings.SHOW_FAVORITES.get() ? 1 : 0)
 				.icons(R.drawable.ic_action_fav_dark, R.drawable.ic_action_fav_light).listen(l).reg();
 		adapter.item(R.string.layer_gpx_layer).selected(
 				app.getSelectedGpxHelper().isShowingAnyGpxFiles() ? 1 : 0)
--- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
@ -796,8 +796,12 @@ public class RoutingHelper {
 	public void recalculateRouteDueToSettingsChange() {
 		//This should fix route-recalculation if settings change during ongoing calculation
 		clearCurrentRoute(finalLocation, intermediatePoints);
-		recalculateRouteInBackground(true, lastFixedLocation, finalLocation, intermediatePoints, currentGPXRoute, route, 
-				true, false);
+		//Issue 2515 test only: Try re-initialize start point here: No impact on Issue 2515
+		//if (settings.getPointToStart() != null) {
+		//	lastFixedLocation.setLatitude(settings.getPointToStart().getLatitude());
+		//	lastFixedLocation.setLongitude(settings.getPointToStart().getLongitude());
+		//}
+		recalculateRouteInBackground(true, lastFixedLocation, finalLocation, intermediatePoints, currentGPXRoute, route, true, false);
 	}
 	
 	private void recalculateRouteInBackground(boolean force, final Location start, final LatLon end, final List<LatLon> intermediates,
--- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
@ -79,16 +79,13 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 				getTargets().navigateToPoint(latlon, true, -1);
 			} else {
 				getTargets().setStartPoint(latlon, true, null);
-				//TODO: Hardy: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.)
+	//TODO: Issue 2515: Re-selecting the "From" or "To" point, or any other route preference during an ongoing route calculation (and only then), and if the "From" point is not "Current position" (and only then), always correctly interrupts the ongoing route calculation, but restarts it exactly EVERY OTHER time only.
 			}
 			contextMenu.setLocation(latlon, null);
 			showDialog();
-				//-Test code only--
-				//Try force resuming route re-caculation if stopped due to Issue2515
-				// interesting: putting one or more of the next lines here destroys the alternating "interrupted route calculation won't re-start" behavior and causes the route calculation to NEVER re-start!
-				//routingHelper.recalculateRouteDueToSettingsChange();
-				//routingHelper.recalculateRouteDueToSettingsChange();
-				//-----------------
+	//Issue 2515 test code: Try force resuming route re-caculation here if stopped due to Issue 2515
+	// interesting: putting one or more of the next lines here destroys the alternating "interrupted route calculation won't re-start" behavior and causes the route calculation to NEVER re-start!
+	//routingHelper.recalculateRouteDueToSettingsChange();
 			return true;
 		}
 		return super.onSingleTap(point, tileBox);