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

OsmAnd/res/values-ca/phrases.xml

@@ -785,4 +785,53 @@
 	<string name="poi_signal_station_warning">Semàfor d\'advertiment nàutic</string>
 	<string name="poi_small_craft_facility">Instal·lacions per naus petites</string>
 	<string name="poi_topmark">Boia amb format IALA</string>
-	</resources>
+	<string name="poi_wiki_place">Viquipèdia</string>
+	<string name="poi_wiki_lang_en">Wiki en anglès</string>
+	<string name="poi_wiki_lang_ar">Wiki en àrab</string>
+	<string name="poi_wiki_lang_be">Wiki en bielorús</string>
+	<string name="poi_wiki_lang_bg">Wiki en búlgar</string>
+	<string name="poi_wiki_lang_ca">Wiki en català</string>
+	<string name="poi_wiki_lang_ceb">Wiki en cebuà</string>
+	<string name="poi_wiki_lang_cs">Wiki en txec</string>
+	<string name="poi_wiki_lang_da">Wiki en danès</string>
+	<string name="poi_wiki_lang_de">Wiki en alemany</string>
+	<string name="poi_wiki_lang_el">Wiki en grec</string>
+	<string name="poi_wiki_lang_et">Wiki en estonià</string>
+	<string name="poi_wiki_lang_es">Wiki en espanyol</string>
+	<string name="poi_wiki_lang_fi">Wiki en finès</string>
+	<string name="poi_wiki_lang_fr">Wiki en francès</string>
+	<string name="poi_wiki_lang_gl">Wiki en gallec</string>
+	<string name="poi_wiki_lang_he">Wiki en hebreu</string>
+	<string name="poi_wiki_lang_hi">Wiki hindi</string>
+	<string name="poi_wiki_lang_hr">Wiki en croat</string>
+	<string name="poi_wiki_lang_ht">Wiki en crioll haitià</string>
+	<string name="poi_wiki_lang_hu">Wiki en hongarès</string>
+	<string name="poi_wiki_lang_id">Wiki en indonesi</string>
+	<string name="poi_wiki_lang_it">Wiki en italià</string>
+	<string name="poi_wiki_lang_ja">Wiki en japonès</string>
+	<string name="poi_wiki_lang_ko">Wiki en coreà</string>
+	<string name="poi_wiki_lang_lt">Wiki en lituà</string>
+	<string name="poi_wiki_lang_lv">Wiki en letó</string>
+	<string name="poi_wiki_lang_ms">Wiki en malai</string>
+	<string name="poi_wiki_lang_new">Wiki en newar</string>
+	<string name="poi_wiki_lang_nl">"Wiki en  holandès"</string>
+	<string name="poi_wiki_lang_nn">"Wiki en  noruec (nynorsk)"</string>
+	<string name="poi_wiki_lang_no">Wiki en noruec</string>
+	<string name="poi_wiki_lang_pl">Wiki en polonès</string>
+	<string name="poi_wiki_lang_pt">Wiki en portuguès</string>
+	<string name="poi_wiki_lang_ro">Wiki en romanès</string>
+	<string name="poi_wiki_lang_ru">Wiki en rus</string>
+	<string name="poi_wiki_lang_sk">Wiki en eslovac</string>
+	<string name="poi_wiki_lang_sl">Wiki en eslovè</string>
+	<string name="poi_wiki_lang_sr">Wiki en serbi</string>
+	<string name="poi_wiki_lang_sv">Wiki en suec</string>
+	<string name="poi_wiki_lang_sw">Wiki en suahili</string>
+	<string name="poi_wiki_lang_te">Wiki en telugu</string>
+	<string name="poi_wiki_lang_th">Wiki en tailandès</string>
+	<string name="poi_wiki_lang_tr">Wiki en turc</string>
+	<string name="poi_wiki_lang_uk">Wiki en ucraïnès</string>
+	<string name="poi_wiki_lang_vi">Wiki en vietnamita</string>
+	<string name="poi_wiki_lang_vo">Wiki en volapük</string>
+	<string name="poi_wiki_lang_zh">Wiki en xinès</string>
+
+</resources>

OsmAnd/res/values-ca/strings.xml

@@ -2030,4 +2030,6 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="lang_gl">Gallec</string>
     <string name="lang_et">Estonià</string>
     <string name="lang_ceb">Cebuà</string>
+    <string name="lang_es_ar">Espanyol argentí</string>
+    <string name="lang_nb">Noruec bokmål</string>
     </resources>

OsmAnd/res/values-da/strings.xml

@@ -2045,4 +2045,6 @@
     <string name="lang_gl">Galicisk</string>
     <string name="lang_et">Estisk</string>
     <string name="lang_ceb">Cebuano</string>
+    <string name="lang_nb">Norsk</string>
+    <string name="lang_es_ar">Argentinsk spansk</string>
     </resources>

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

@@ -1960,4 +1960,6 @@
     <string name="lang_nn">Noruego (Nynorsk)</string>
     <string name="lang_new">Newar / Nepal Bhasa</string>
     <string name="lang_ceb">Cebuano</string>
+    <string name="lang_es_ar">Español Argentino</string>
+    <string name="lang_nb">Noruego Bokmål</string>
     </resources>

OsmAnd/res/values-fr/strings.xml

@@ -2057,4 +2057,5 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="lang_ht">Haïtien</string>
     <string name="lang_gl">Galicien</string>
     <string name="lang_et">Estonien</string>
+    <string name="lang_es_ar">Espagnol argentin</string>
     </resources>

OsmAnd/res/values-hu/strings.xml

@@ -1980,4 +1980,6 @@
     <string name="lang_ceb">Szebuano</string>
     <string name="archive_wikipedia_data">Régi, összeférhetetlen Wikipédia adatok lettek letöltve. Szeretné archiválni?</string>
     <string name="download_wikipedia_files">Szeretne további Wikipédia adatokat letölteni (%1$s MB)?</string>
+    <string name="lang_es_ar">Argentin spanyol</string>
+    <string name="lang_nb">Norvég bokmål</string>
     </resources>

OsmAnd/res/values-it/strings.xml

@@ -2072,4 +2072,10 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
     <string name="shared_string_show_details">Mostra i dettagli</string>
     <string name="local_recordings_delete_all_confirm">Stai per cancellare %1$d nota/e. Sei sicuro?</string>
 	<string name="download_wikipedia_maps">Wikipedia</string>
+    <string name="lang_es_ar">Spagnolo argentino</string>
+    <string name="lang_nb">Norvegese Bokmål</string>
+    <string name="lang_vo">Volapuk</string>
+    <string name="lang_th">Thailandese</string>
+    <string name="lang_te">Telugu</string>
+    <string name="lang_nn">Norwegian (Nynorsk)</string>
     </resources>

OsmAnd/res/values-kn/strings.xml

@@ -0,0 +1,178 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="lang_es_ar">ಅರ್ಜಿಂಟಿನೆಯಾದ ಸ್ಪೇನಿಷ್</string>
+    <string name="lang_th">ಥಾಯಿ</string>
+    <string name="lang_te">ತೆಲುಗು</string>
+    <string name="lang_nn"/>
+    <string name="lang_new">ನೇಪಾಳಿ</string>
+    <string name="lang_ms">ಮಲೇಷ್ಯಾ</string>
+    <string name="download_wikipedia_files">ನೀವು ಅಧಿಕ ವಿಕಿಪೀಡಿಯ ದತ್ತಾಂಶವನ್ನು (%1$s MB) ಡೌನ್ ಲೋಡ್ ಮಾಡಲು ಇಚ್ಚಿಸುವಿರಾ?</string>
+    <string name="read_full_article">ಪೂರ್ಣ ಲೇಖನ ಓದಿ(ಮಿಂಬಲೆಯೊಳಗೆ)</string>
+    <string name="download_wikipedia_item">ವಿಕಿಪೀಡಿಯ</string>
+    <string name="local_indexes_cat_wiki">ವಿಕಿಪೀಡಿಯ</string>
+    <string name="shared_string_show_details">ವಿವರಣೆ ತೋರಿಸಿ</string>
+    <string name="osm_edit_context_menu_delete">ಒಎಸ್ಎಂ ಸಂಪಾದನೆಯನ್ನು ಅಳಿಸು</string>
+    <string name="rendering_value_disabled_name">ಹೆಳವುಗೊಳಿಸು</string>
+    <string name="osmo_share_my_location">ನನ್ನ ಜಾಗವನ್ನು ಇತರರೊಡನೆ ಹಂಚು</string>
+    <string name="shared_string_logoff">ಹೊರನಡೆ</string>
+    <string name="rendering_attr_hideHouseNumbers_name">ಮನೆ ಸಂಖ್ಯಯನ್ನು ಅಡಗಿಸು</string>
+    <string name="shared_string_copy">ಪ್ರತಿ</string>
+    <string name="filter_poi_hint">ಹೆಸರಿನಿಂದ ಶೋಧಿಸು</string>
+    <string name="search_poi_category_hint">ಎಲ್ಲವನ್ನು ಹುಡುಕಲು ಟೈಪಿಸಿ</string>
+    <string name="shared_string_open">ತೆರೆ</string>
+    <string name="agps_info">ಎ-ಜಿಪಿಎಸ್ ಮಾಹಿತಿ</string>
+	<string name="shared_string_manage">ನಿಭಾಯಿಸು</string>
+	<string name="shared_string_edit">ಸಂಪಾದಿಸು</string>
+	<string name="shared_string_places">ಸ್ಥಳಗಳು</string>
+	<string name="shared_string_search">ಹುಡುಕು</string>
+	<string name="shared_string_show_description">ವಿವರಣೆ ತೋರಿಸು</string>
+	<string name="shared_string_message">ಸಂದೇಶ</string>
+	<string name="welmode_download_maps">ನಕ್ಷೆಗಳನ್ನು ಡೌನ್ ಲೋಡ್ ಮಾಡಿ</string>
+	<string name="welcome_select_region"/>
+	<string name="welcome_header">ಸುಸ್ವಾಗತ</string>
+    <string name="current_route">ಈಗಿನ ದಾರಿ</string>
+    <string name="mark_to_delete">ಅಳಿಸಲು ಗುರುತುಮಾಡಿ</string>
+	<string name="confirmation_to_clear_history">ಇತಿಹಾಸವನ್ನು ಅಳಿಸಲು ಇಚ್ಛಿಸುವಿರಾ?</string>
+    <string name="shared_string_go">ಹೋಗು</string>
+	<string name="osmand_parking_overdue">ಕಾಲಮೀರಿದ</string>
+	<string name="osmand_parking_hour">ಗಂಟೆ</string>
+	<string name="osmand_parking_minute">ನಿಮಿಷ</string>
+	<string name="osmand_parking_time_left">ಉಳಿದ ಸಮಯ</string>
+	<string name="your_edits">ನಿಮ್ಮ ಸಂಪಾದನೆಗಳು</string>
+    <string name="tips_and_tricks_descr">ಹೆಚ್ಚಾಗಿ ಕೆಳಲಾಗುವ ಪ್ರಶ್ನೆಗಳು, ಇತ್ತೀಚಿನ ಬದಲಾವಣೆಗಳು, ಮತ್ತು ಇತರೆ</string>
+    <string name="routing_settings_2">ಸಂಚಾರ ಉಪಕರಣೆಗಳು</string>
+    <string name="general_settings_2">ಸಾಮಾನ್ಯ ಉಪಕರಣೆಗಳು</string>
+	<string name="shared_string_ellipsis">…</string>
+	<string name="shared_string_ok">ಸರಿ</string>
+	<string name="shared_string_cancel">ರದ್ದುಮಾಡು</string>
+	<string name="shared_string_dismiss">ತಳ್ಳಿಹಾಕು</string>
+	<string name="shared_string_yes">ಹೌದು</string>
+	<string name="shared_string_do_not_use">ಬಳಸಬೇಡಿ</string>
+	<string name="shared_string_no">ಇಲ್ಲ</string>
+	<string name="shared_string_previous">ಹಿಂದಿನ</string>
+	<string name="shared_string_next">ಮುಂದಿನ</string>
+	<string name="shared_string_enable">ಸಕ್ರಿಯಗೊಳಿಸು</string>
+	<string name="shared_string_disable">ಹೆಳವುಗೊಳಿಸು</string>
+	<string name="shared_string_enabled">ಅಳವುಗೊಳಿಸಲಾಗಿದೆ</string>
+	<string name="shared_string_disabled">ಹೆಳವುಗೊಳಿಸಲಾಗಿದೆ</string>
+	<string name="shared_string_selected">ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ</string>
+	<string name="shared_string_selected_lowercase">ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ</string>
+	<string name="shared_string_and">ಮತ್ತು</string>
+	<string name="shared_string_or">ಅಥವಾ</string>
+	<string name="shared_string_help">ಸಹಾಯ</string>
+	<string name="shared_string_settings">ಉಪಕರಣಗಳು</string>
+	<string name="shared_string_history">ಇತಿಹಾಸ</string>
+	<string name="shared_string_select_on_map">ನಕ್ಷೆಯಲ್ಲಿ ಆಯ್ಕೆಮಾಡಿ</string>
+	<string name="shared_string_select_all">ಎಲ್ಲವನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
+	<string name="shared_string_deselect">ನಿರಾಕರಿಸು</string>
+	<string name="shared_string_deselect_all">ಎಲ್ಲವನ್ನು ನಿರಾಕರಿಸು</string>
+	<string name="shared_string_clear">ತೆಳಿಸಿ</string>
+	<string name="shared_string_clear_all">ಎಲ್ಲವನ್ನು ತೆಳಿಸಿ</string>
+	<string name="shared_string_save">ಉಳಿಸಿ</string>
+	<string name="shared_string_save_as_gpx">ಜಿಪಿಎಕ್ಸ್ ಟ್ರ್ಯಾಕ್ಆಗಿ ಉಳಿಸಿ</string>
+	<string name="shared_string_rename">ಮರುಹೆಸರಿಸಿ</string>
+	<string name="shared_string_delete">ಅಳಿಸಿ</string>
+	<string name="shared_string_delete_all">ಎಲ್ಲವನ್ನು ಅಳಿಸಿ</string>
+	<string name="shared_string_share">ಹಂಚಿಕೊ</string>
+	<string name="shared_string_control_start">ಶುರುಮಾಡು</string>
+	<string name="shared_string_control_stop">ನಿಲ್ಲಿಸು</string>
+	<string name="shared_string_import">ಒಳತರು</string>
+	<string name="shared_string_export">ಹೊರಕಳಿಸು</string>
+	<string name="shared_string_more">ಹೆಚ್ಚು…</string>
+	<string name="shared_string_more_actions">ಹೆಚ್ಚು ಕಾರ್ಯಗಳು</string>
+	<string name="shared_string_do_not_show_again">ಮತ್ತೆ ತೋರಿಸಬೇಡ</string>
+	<string name="shared_string_remember_my_choice">ನನ್ನ ಆಯ್ಕೆಯನ್ನು ನೆನಪಿಡು</string>
+	<string name="shared_string_download">ನಕಲಿಳಿಸು</string>
+	<string name="shared_string_downloading">ನಕಲಿಳಿಸಲಾಗುತ್ತಿದೆ</string>
+	<string name="shared_string_download_successful">ನಕಲಿಳಿಸುವುದು ಮುಗಿದಿದೆ</string>
+	<string name="shared_string_io_error">I/O ತಪ್ಪು ಕಂಡತ್ತಿದೆ</string>
+	<string name="shared_string_unexpected_error">ಅಪೇಕ್ಷಿಸಲಾಗದ ತಪ್ಪು ಕಂಡಿದೆ</string>
+	<string name="shared_string_action_template">ಕಾರ್ಯ {೦}</string>
+	<string name="shared_string_close">ಮುಚ್ಚು</string>
+	<string name="shared_string_exit">ನಿರ್ಗಮಿಸು</string>
+	<string name="shared_string_show">ತೋರಿಸು</string>
+	<string name="shared_string_show_all">ಎಲ್ಲಾವನ್ನು ತೋರಿಸು</string>
+	<string name="shared_string_show_on_map">ನಕ್ಷೆಯಲ್ಲಿ ತೋರಿಸು</string>
+	<string name="shared_string_map">ನಕ್ಷೆ</string>
+	<string name="shared_string_favorite">ಇಷ್ಟವಾದ</string>
+	<string name="shared_string_favorites">ಇಷ್ಟವಾದವುಗಳು</string>
+	<string name="shared_string_address">ಒಕ್ಕಣೆ</string>
+	<string name="shared_string_add">ಸೇರಿಸು</string>
+	<string name="shared_string_add_to_favorites">ಇಷ್ಟವಾದವುಗಳಿಗೆ ಸೇರಿಸು</string>
+	<string name="shared_string_my_location">ನನ್ನ ಜಾಗ</string>
+	<string name="shared_string_my_places">ನನ್ನ ಸ್ಥಳಗಳು</string>
+	<string name="shared_string_my_favorites">ನನ್ನ ಇಷ್ಟವಾದವುಗಳು</string>
+	<string name="shared_string_my_tracks">ನನ್ನ ಟ್ರ್ಯಾಕ್ ಗಳು</string>
+	<string name="shared_string_currently_recording_track">ಈಗ ದಾಖಲಿಸಿಕೊಳ್ಳುತ್ತಿರುವ ಟ್ರ್ಯಾಕ್</string>
+	<string name="shared_string_audio">ಶ್ರಾವ್ಯ</string>
+	<string name="shared_string_video">ದೃಶ್ಯ</string>
+	<string name="shared_string_photo">ಛಾಯಾಚಿತ್ರ</string>
+	<string name="online_map_settings">ಮಿಂಬಲೆ ನಕ್ಷೆಗಳು</string>
+	<string name="record_plugin_name">ಪ್ರಯಾಣ ದಾಖಲಿಸಿಕೊಳ್ಳುವುದು</string>
+	<string name="osmo_plugin_name">ಒಸ್ಮೊ (ಒಎಸ್ಎಂ ಪರಿವೀಕ್ಷಿಸುವಿಕೆ)</string>
+	<string name="plugin_nautical_name">ಹಡಗಿನ ನಕ್ಷೆ ವೀಕ್ಷಣೆ</string>
+	<string name="plugin_ski_name">ಆಕಾಶ ನಕ್ಷೆ ವೀಕ್ಷಣೆ</string>
+	<string name="audionotes_plugin_name">ದೃಶ್ಯ / ಶ್ರಾವ್ಯ ಟಿಪ್ಪಣೆಗಳು</string>
+	<string name="osmand_parking_plugin_name">ನಿಲುಗಡೆ ಸ್ಥಾನ</string>
+	<string name="accessibility_preferences">ಲಭ್ಯಾರ್ಹತೆ</string>
+	<string name="osm_settings">ಒಎಸ್ಎಂ ಸಂಪಾದನೆ</string>
+	<string name="debugging_and_development">ಒಸ್ಮಾಂಡ್ ತಂತ್ರಾಶ ಅಭಿವೃದ್ಧಿ</string>
+	<string name="rename_failed">ಮರುನಾಮಕರಣ ವಿಫಲವಾಗಿದೆ</string>
+	<string name="days_behind">ದಿನಗಳು ಹಿಂದುಗಡೆಗೆ</string>
+	<string name="back_to_map">ನಕ್ಷೆಗೆ ಹಿಂದುರುಗಿ</string>
+	<string name="share_note">ಟಿಪ್ಪಣಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
+    <string name="watch">ನೋಡಿ</string>
+	<string name="notes">ಟಿಪ್ಪಣಿಗಳು</string>
+	<string name="online_map">ಮಿಂಬಲೆ ನಕ್ಷೆ</string>
+	<string name="roads_only">ಕೇವಲ ರಸ್ತೆಗಳು</string>
+    <string name="edit_group">ಗುಂಪನ್ನು ಸಂಪಾದಿಸಿ</string>
+    <string name="parking_place">ನಿಲುಗಡೆ ಸ್ಥಳ</string>
+    <string name="remove_the_tag"/>
+    <string name="gps_status">ಜಿಪಿಎಸ್ ಮಟ್ಟ</string>
+    <string name="rendering_attr_streetLighting_name">ದಾರಿ ದೀಪಗಳು</string>
+    <string name="settings_privacy">ಗುಪ್ತತೆ</string>
+    <string name="rendering_attr_roadStyle_name">ರಸ್ತೆ ಶೈಲಿ</string>
+    <string name="rendering_value__name">ಮೊದಲ್ಗಾಣುವ</string>
+    <string name="rendering_value_default_name">ಮೊದಲ್ಗಾಣುವ</string>
+    <string name="rendering_value_orange_name">ಕಿತ್ತಲೆ</string>
+    <string name="dash_download_msg_none">ನೀವು ಮಿನ್ಮರೆ ನಕ್ಷೆಗಳನ್ನು ನಕಲಿಳಿಸಲು ಬಯಸುವಿರಾ?</string>
+    <string name="dash_download_msg">ನೀವು %1$s ನಕ್ಷೆಗಳನ್ನು ನಕಲಿಳಿಸಿದ್ದೀರಿ</string>
+    <string name="dash_download_new_one">ಹೊಸ ನಕ್ಷೆಯನ್ನು ನಕಲಿಳಿಸಿ</string>
+    <string name="dash_download_manage">ನಿರ್ವಹಿಸಿ</string>
+    <string name="map_locale">ನಕ್ಷೆಯ ಭಾಷೆ</string>
+    <string name="rendering_attr_transportStops_name">ಸಾರಿಗೆ ನಿಲುಗಡೆಗಳು</string>
+
+    <string name="navigate_point_zone">ವಲಯ</string>
+    <string name="navigate_point_northing">ಉತ್ತರದಿಕ್ಕಿನೆಡೆಗೆ</string>
+    <string name="navigate_point_easting">ಪೂರ್ವದಿಕ್ಕಿನೆಡೆಗೆ</string>
+    <string name="download_tab_downloads">ಎಲ್ಲಾ ನಕಲಿಳಿಸುಗಳು</string>
+    <string name="download_tab_updates">ಇಂದಿನವುಗಳು</string>
+    <string name="download_tab_local">ಸ್ಥಳಿಯ</string>
+	<string name="everything_up_to_date">ಎಲ್ಲಾ ಕಡತಗಳು ಇಂದಿನವಾಗಿವೆ</string>
+    <string name="home_button">ಆಗರ</string>
+    <string name="osmo_use_https">HTTPS ಅನ್ನು ಬಳಸಿ</string>
+	<string name="search_for">ಇದನ್ನು ಹುಡುಕಿ</string>
+	<string name="coordinates">ನಿರ್ದೇಶಾಂಕಗಳು</string>
+	<string name="impassable_road">ರಸ್ತೆಗಳನ್ನು ತಪ್ಪಿಸಿ…</string>
+    <string name="rendering_attr_trainLightrailRoutes_name">ರೈಲು ಮಾರ್ಗಗಳು</string>
+    <string name="rendering_attr_tramRoutes_name">ಹಾದಿಬಂಡಿ ಮಾರ್ಗಗಳು</string>
+    <string name="rendering_attr_shareTaxiRoutes_name">ಬಾಡಿಗೆಬಂಡಿ ಮಾರ್ಗಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
+    <string name="rendering_attr_trolleybusRoutes_name">ಕೈಬಂಡಿ ಮಾರ್ಗಗಳು</string>
+    <string name="rendering_attr_busRoutes_name">ಬಸ್ ಮಾರ್ಗಗಳು</string>
+    <string name="rendering_category_hide">ಅಡಗಿಸಿ</string>
+    <string name="rendering_category_routes">ಮಾರ್ಗಗಳು</string>
+    <string name="rendering_category_details">ವಿವರಣೆಗಳು</string>
+    <string name="rendering_category_transport">ಸಾರಿಗೆ</string>
+    <string name="rendering_category_others">ಇತರೆ ನಕ್ಷೆ ಗುಣವಿಶೇಷಗಳು</string>
+    <string name="map_widget_appearance_rem">ಇತರೆ ಅಂಶಗಳು</string>
+    <string name="map_widget_right">ಬಲ ಪಡಿ</string>
+	<string name="map_widget_left">ಎಡ ಪಡಿ</string>
+	<string name="configure_map">ನಕ್ಷೆ ವಿನ್ಯಾಸ</string>
+    <string name="anonymous_user">ಅನಾಮಿಕ ಬಳಕೆದಾರ</string>
+    <string name="logged_as">%1$s ರರಾಗಿ ಒಳಬಂದಿದ್ದೀರ</string>
+	<string name="speed_limit_exceed">ವೇಗ ನಿಗದಿತ ತಾಳಿಕೆ</string>
+	<string name="print_route">ಮಾರ್ಗವನ್ನು ಮುದ್ರಿಸಿ</string>
+    <string name="text_size">ಪಠ್ಯದ ಗಾತ್ರ</string>
+    <string name="traffic_warning_speed_limit">ವೇಗದ ಮಿತಿ</string>
+    <string name="traffic_warning_payment">ದಾಟುಸುಂಕ</string>
+    <string name="traffic_warning_stop">ನಿಲುಗಡೆ ಫಲಕ</string>
+    </resources>

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

@@ -1729,4 +1729,6 @@
     <string name="lang_gl">Galego</string>
     <string name="lang_et">Estoniano</string>
     <string name="lang_ceb">Cebuano</string>
+    <string name="lang_es_ar">Espanhol Argentino</string>
+    <string name="lang_nb">Norueguês Bokmål</string>
     </resources>

OsmAnd/res/values-ru/strings.xml

@@ -1036,7 +1036,7 @@
   
   
   <string name="map_widget_parking">Парковка</string>
-  <string name="map_widget_monitoring">Мониторинг</string>
+  <string name="map_widget_monitoring">Запись GPX</string>
   <string name="map_widget_speed">Скорость</string>
   <string name="map_widget_distance">Цель</string>
   <string name="map_widget_altitude">Высота</string>
@@ -1130,7 +1130,7 @@
 	<string name="no_route">Нет маршрута</string>
 	<string name="gps_not_available">Включите GPS в настройках</string>
     <string name="map_widget_show_destination_arrow">Отображать направление к точке назначения</string>
-    <string name="enable_plugin_monitoring_services">Активировать плагины мониторинга (сопровождение, сопровождение в реальном времени) для использования сервисов мониторинга</string>
+    <string name="enable_plugin_monitoring_services">"Включите плагин \"Запись поездки\" для использования сервисов мониторинга  (запись GPX, сопровождение в реальном времени)"</string>
     <string name="rendering_attr_roadColors_description">Выберите цветовую схему дорог:</string>
 	<string name="rendering_attr_roadColors_name">Цветовая схема дорог</string>
     <string name="route_descr_current_location">Текущая позиция</string>
@@ -1998,4 +1998,18 @@
 	<string name="gps_network_not_enabled">Служба определения координат не включена. Вы хотите включить её?</string>
     <string name="disable_recording_once_app_killed_descrp">Если отмечено, то после завершения приложения (через последние приложений) запись GPX будет поставлена на паузу. (Индикация режима сна OsmAnd исчезнет с панели уведомлений Android.)</string>
 	<string name="download_wikipedia_files">Хотите загрузить дополнительные данные Википедии (%1$s Мб) ?</string>
+    <string name="lang_es_ar">Аргентинский испанский</string>
+    <string name="lang_nb">Норвежский букмол</string>
+    <string name="lang_vo">Волапюк</string>
+    <string name="lang_th">Тайский</string>
+    <string name="lang_te">Телугу</string>
+    <string name="lang_nn">Норвежский (нюнорск)</string>
+    <string name="lang_new">Неварский / непал-бхаса</string>
+    <string name="lang_ms">Малайский</string>
+    <string name="lang_ht">Гаитянский</string>
+    <string name="lang_gl">Галисийский</string>
+    <string name="lang_et">Эстонский</string>
+    <string name="lang_ceb">Себуанский</string>
+    <string name="archive_wikipedia_data">У вас загружены старые несовместимые данные из Википедии. Вы хотите их заархивировать?</string>
+    <string name="disable_recording_once_app_killed">Остановить автономную запись</string>
     </resources>

OsmAnd/res/values-sk/strings.xml

@@ -2184,4 +2184,16 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="disable_recording_once_app_killed_descrp">Zastaví záznam GPX keď je aplikácia ukončená (cez nedávne aplikácie). (Ikona režimu spánku OsmAnd zmizne z notifikačnej oblasti Androidu.)</string>
 	<string name="archive_wikipedia_data">Máte stiahnuté staré nekompatibilné dáta z Wikipedie. Chcete ich archivovať?</string>
     <string name="download_wikipedia_files">Chcete stiahnuť ďalšie dáta z Wikipedie (%1$s MB) ?</string>
+    <string name="lang_es_ar">Argentínska Španielčina</string>
+    <string name="lang_nb">Nórsky Bokmål</string>
+    <string name="lang_vo">Volapuk</string>
+    <string name="lang_th">Thajsky</string>
+    <string name="lang_te">Telugsky</string>
+    <string name="lang_nn">Nórsky (Nynorsk)</string>
+    <string name="lang_new">Newar / Nepálsky Bhasa</string>
+    <string name="lang_ms">Malajsky</string>
+    <string name="lang_ht">Haitsky</string>
+    <string name="lang_gl">Galícijsky</string>
+    <string name="lang_et">Estónsky</string>
+    <string name="lang_ceb">Cebuano</string>
     </resources>

OsmAnd/res/values-sl/strings.xml

@@ -1863,7 +1863,7 @@
 <string name="osmo_share_my_location">Deli mojo lokacijo</string>
     <string name="shared_string_logoff">Odjava</string>
     <string name="rendering_value_disabled_name">Onemogočeno</string>
-    <string name="rendering_value_walkingRoutesScopeOSMC_name">Barvanje poti po vrsti</string>
+    <string name="rendering_value_walkingRoutesScopeOSMC_name">Barvanje poti po vrsti poti</string>
     <string name="rendering_value_walkingRoutesOSMC_name">Barvanje poti po OSMC</string>
     <string name="osm_edit_context_menu_delete">Izbriši urejanje OSM</string>    
     <string name="read_full_article">Pokaži celoten prispevek</string>
@@ -1888,4 +1888,6 @@
     <string name="lang_et">Estonščina</string>
     <string name="lang_ceb">Cebuanščina</string>
     <string name="archive_wikipedia_data">Nameščeni so zastareli in nepodprti podatki iz Wikipedije. Ali jih želite arhivirati?</string>
+    <string name="lang_es_ar">Argentinska španščina</string>
+    <string name="lang_nb">Norveščina (Bokmål)</string>
     </resources>

OsmAnd/res/values-sv/strings.xml

@@ -1896,14 +1896,16 @@
     <string name="disable_recording_once_app_killed_descrp">Gör paus i GPX-loggningen när appen stängs (via tidigare appar). (OsmAnds vilolägesindikation försvinner från Androids aviseringsfält.)</string>
 	<string name="archive_wikipedia_data">Du har hämtat gamla och inkompatibla data från Wikipedia. Vill du arkivera dem?</string>
     <string name="download_wikipedia_files">Vill du hämta ytterligare data från Wikipedia (%1$s MB)?</string>
-    <string name="lang_vo">Volapuk</string>
+    <string name="lang_vo">Volapük</string>
     <string name="lang_th">Thai</string>
     <string name="lang_te">Telugu</string>
-    <string name="lang_nn">Nynorska</string>
+    <string name="lang_nn">Norska (nynorska)</string>
     <string name="lang_new">Newar/Nepal Bhasa</string>
     <string name="lang_ms">Malajiska</string>
     <string name="lang_ht">Haitiska</string>
     <string name="lang_gl">Galiciska</string>
     <string name="lang_et">Estniska</string>
     <string name="lang_ceb">Cebuano/Visaya</string>
+    <string name="lang_es_ar">Argentisk spanska</string>
+    <string name="lang_nb">Norska (bokmål)</string>
     </resources>

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

@@ -2017,4 +2017,6 @@
     <string name="lang_gl">加利西亞語</string>
     <string name="lang_et">愛沙尼亞語</string>
     <string name="lang_ceb">宿霧語</string>
+    <string name="lang_es_ar">阿根廷的西班牙文</string>
+    <string name="lang_nb">挪威布克莫爾語</string>
     </resources>

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

@@ -70,31 +70,31 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 		String[] entrieValues;
 		PreferenceScreen screen = getPreferenceScreen();
 		settings = getMyApplication().getSettings();
-		
+
-		
+
-		
+
 		ApplicationMode[] appModes = ApplicationMode.values(settings).toArray(new ApplicationMode[0]);
 		entries = new String[appModes.length];
 		for(int i=0; i<entries.length; i++){
 			entries[i] = appModes[i].toHumanString(getMyApplication());
 		}
 		registerListPreference(settings.APPLICATION_MODE, screen, entries, appModes);
-		
+
 		// List preferences
-		registerListPreference(settings.ROTATE_MAP, screen, 
+		registerListPreference(settings.ROTATE_MAP, screen,
 				new String[]{getString(R.string.rotate_map_none_opt), getString(R.string.rotate_map_bearing_opt), getString(R.string.rotate_map_compass_opt)},
 				new Integer[]{OsmandSettings.ROTATE_MAP_NONE, OsmandSettings.ROTATE_MAP_BEARING, OsmandSettings.ROTATE_MAP_COMPASS});
-		
+
-		registerListPreference(settings.MAP_SCREEN_ORIENTATION, screen, 
+		registerListPreference(settings.MAP_SCREEN_ORIENTATION, screen,
 				new String[] {getString(R.string.map_orientation_portrait), getString(R.string.map_orientation_landscape), getString(R.string.map_orientation_default)},
 				new Integer[] {ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED});
-		
+
 		addLocalPrefs((PreferenceGroup) screen.findPreference("localization"));
 		addVoicePrefs((PreferenceGroup) screen.findPreference("voice"));
 		addProxyPrefs((PreferenceGroup) screen.findPreference("proxy"));
 		addMiscPreferences((PreferenceGroup) screen.findPreference("misc"));
 
-		
+
 		applicationModePreference = (ListPreference) screen.findPreference(settings.APPLICATION_MODE.getId());
 		applicationModePreference.setOnPreferenceChangeListener(this);
 		drivingRegionPreference = (ListPreference) screen.findPreference(settings.DRIVING_REGION.getId());
@@ -129,26 +129,26 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 		}
 	}
 
-	
+
 
 	private void addLocalPrefs(PreferenceGroup screen) {
 		String[] entries;
 		String[] entrieValues;
-		
+
 		DrivingRegion[] drs  = DrivingRegion.values();
 		entries = new String[drs.length];
 		for (int i = 0; i < entries.length; i++) {
 			entries[i] = getString(drs[i].name); // + " (" + drs[i].defMetrics.toHumanString(this) +")" ;
 		}
 		registerListPreference(settings.DRIVING_REGION, screen, entries, drs);
-		
+
 		MetricsConstants[] mvls  = MetricsConstants.values();
 		entries = new String[mvls.length];
 		for(int i=0; i<entries.length; i++){
 			entries[i] = mvls[i].toHumanString(getMyApplication());
 		}
 		registerListPreference(settings.METRIC_SYSTEM, screen, entries, mvls);
-		
+
 		// See language list and statistics at: https://hosted.weblate.org/projects/osmand/main/
 		String incompleteSuffix = " (" + getString(R.string.incomplete_locale) + ")";
 		// Add this in Latin also so it can be more easily identified if foreign language has been selected by mistake
@@ -191,18 +191,14 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 				"fa",
 				"pl",
 				"pt",
-				"pt_br",
 				"ro",
 				"ru",
 				"sc",
 				"sr",
-				"zh_CN",
 				"sk",
 				"sl",
 				"es",
-				"es_ar",
 				"sv",
-				"zh_TW",
 				"tr",
 				"uk",
 				"vi",
@@ -243,18 +239,14 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 				getString(R.string.lang_fa),
 				getString(R.string.lang_pl),
 				getString(R.string.lang_pt),
-				getString(R.string.lang_pt_br),
 				getString(R.string.lang_ro),
 				getString(R.string.lang_ru),
 				getString(R.string.lang_sc),
 				getString(R.string.lang_sr) + incompleteSuffix,
-				getString(R.string.lang_zh_CN) + incompleteSuffix,
 				getString(R.string.lang_sk),
 				getString(R.string.lang_sl),
 				getString(R.string.lang_es),
-				getString(R.string.lang_es_ar),
 				getString(R.string.lang_sv),
-				getString(R.string.lang_zh_TW),
 				getString(R.string.lang_tr) + incompleteSuffix,
 				getString(R.string.lang_uk),
 				getString(R.string.lang_vi) + incompleteSuffix,
@@ -312,8 +304,8 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 			}
 		});
 	}
-	
+
-	
+
 	public void showAppDirDialog(){
 		if(Build.VERSION.SDK_INT >= 19) {
 			 showAppDirDialogV19();
@@ -338,9 +330,9 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 		    }
 		});
 		editalert.show();
-		
+
 	}
-	
+
 	private void showAppDirDialogV19() {
 		Builder bld = new AlertDialog.Builder(this);
 		ChooseAppDirFragment frg = new DashChooseAppDirFragment.ChooseAppDirFragment(this, (Dialog) null);
@@ -357,7 +349,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 			applicationDir.setTitle(R.string.application_dir);
 			applicationDir.setKey("external_storage_dir");
 			applicationDir.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-				
+
 				@Override
 				public boolean onPreferenceClick(Preference preference) {
 					showAppDirDialog();
@@ -373,26 +365,26 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 				nativeCheckbox.setChecked(true);
 			}
 			misc.addPreference(nativeCheckbox);
-			
+
 			final CheckBoxPreference openGlRender = createCheckBoxPreference(settings.USE_OPENGL_RENDER, R.string.use_opengl_render,R.string.use_opengl_render_descr);
 			misc.addPreference(openGlRender);
-			
+
 			int nav = getResources().getConfiguration().navigation;
-			if (nav == Configuration.NAVIGATION_DPAD || nav == Configuration.NAVIGATION_TRACKBALL || 
+			if (nav == Configuration.NAVIGATION_DPAD || nav == Configuration.NAVIGATION_TRACKBALL ||
-					nav == Configuration.NAVIGATION_WHEEL || 
+					nav == Configuration.NAVIGATION_WHEEL ||
 					nav == Configuration.NAVIGATION_UNDEFINED) {
 				misc.addPreference(createCheckBoxPreference(settings.USE_TRACKBALL_FOR_MOVEMENTS, R.string.use_trackball,
 						R.string.use_trackball_descr));
 			}
 		}
-		
+
 		registerListPreference(
 				settings.OSMAND_THEME, misc,
 				new String[] { "Dark", "Light" }, new Integer[] { OsmandSettings.OSMAND_DARK_THEME,
 						OsmandSettings.OSMAND_LIGHT_THEME});
-		
+
 		misc.addPreference(createCheckBoxPreference(settings.USE_KALMAN_FILTER_FOR_COMPASS, R.string.use_kalman_filter_compass, R.string.use_kalman_filter_compass_descr));
-		
+
 	}
 
 
@@ -455,14 +447,14 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 		}
 		return true;
 	}
-	
+
-	
+
 
 	private void warnAboutChangingStorage(final String newValue) {
 		String newDir = newValue != null ? newValue.trim() : newValue;
 		if(!newDir.replace('/', ' ').trim().
 				toLowerCase().endsWith(IndexConstants.APP_DIR.replace('/', ' ').trim())) {
-			newDir += "/" +IndexConstants.APP_DIR; 
+			newDir += "/" +IndexConstants.APP_DIR;
 		}
 		final File path = new File(newDir);
 		path.mkdirs();
@@ -476,28 +468,28 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				MoveFilesToDifferentDirectory task =
-						new MoveFilesToDifferentDirectory(SettingsGeneralActivity.this, 
+						new MoveFilesToDifferentDirectory(SettingsGeneralActivity.this,
 						settings.getExternalStorageDirectory(), path);
 				task.setRunOnSuccess(new Runnable() {
 					@Override
 					public void run() {
-						updateSettingsToNewDir(path.getParentFile().getAbsolutePath());						
+						updateSettingsToNewDir(path.getParentFile().getAbsolutePath());
 					}
 				});
 				task.execute();
 			}
 		});
 		builder.setNeutralButton(R.string.shared_string_no, new OnClickListener() {
-			
+
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
-				updateSettingsToNewDir(path.getParentFile().getAbsolutePath());								
+				updateSettingsToNewDir(path.getParentFile().getAbsolutePath());
 			}
 		});
 		builder.setNegativeButton(R.string.shared_string_cancel, null);
 		builder.show();
 	}
-	
+
 	private void updateSettingsToNewDir(final String newDir) {
 		// edit the preference
 		settings.setExternalStorageDirectoryPre19(newDir);
@@ -515,17 +507,17 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 
 			@Override
 			protected List<String> doInBackground(Void... params) {
-				return getMyApplication().getResourceManager().reloadIndexes(IProgress.EMPTY_PROGRESS, 
+				return getMyApplication().getResourceManager().reloadIndexes(IProgress.EMPTY_PROGRESS,
 						new ArrayList<String>());
 			}
-			
+
 			protected void onPostExecute(List<String> result) {
 				showWarnings(result);
 				getToolbar().setTitle(oldTitle);
 				getToolbar().setSubtitle("");
 				setProgressVisibility(false);
 			}
-			
+
 		}.execute();
 	}
 
@@ -600,7 +592,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 		entries[k] = getString(R.string.install_more);
 		registerListPreference(settings.VOICE_PROVIDER, screen, entries, entrieValues);
 	}
-	
+
 
 	private Set<String> getVoiceFiles() {
 		// read available voice data

OsmAnd/src/net/osmand/plus/myplaces/SelectedGPXFragment.java

@@ -271,8 +271,7 @@ public class SelectedGPXFragment extends OsmAndListFragment {
 		
 		final TIntArrayList list = new TIntArrayList();
         final Spinner colorSpinner = (Spinner) view.findViewById(R.id.ColorSpinner);
-        //ColorDialogs.setupColorSpinner(getActivity(), getGpx().getColor(0), colorSpinner, list);
+        ColorDialogs.setupColorSpinner(getActivity(), getGpx().getColor(0), colorSpinner, list);
-        ColorDialogs.setupColorSpinner(getActivity(), getMyActivity().getResources().getColor(R.color.gpx_track_fluorescent), colorSpinner, list);
 		
 		final Spinner sp = (Spinner) view.findViewById(R.id.Spinner);
 		Builder bld = new AlertDialog.Builder(getMyActivity());

OsmAnd/src/net/osmand/plus/views/GPXLayer.java

@@ -52,7 +52,6 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 	private int cachedHash;
 	private int cachedColor;
 
-	private Path path;
 	private static final int startZoom = 7;
 
 	
@@ -92,7 +91,6 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 		paint_1.setAntiAlias(true);
 		
 
-		path = new Path();
 		
 		paintBmp = new Paint();
 		paintBmp.setAntiAlias(true);
@@ -302,35 +300,40 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 	private void drawSegments(Canvas canvas, RotatedTileBox tileBox, List<TrkSegment> points) {
 		final QuadRect latLonBounds = tileBox.getLatLonBounds();
 		for (TrkSegment l : points) {
-			path.rewind();
 			int startIndex = -1;
 			int endIndex = -1;
 		    int prevCross = 0;
-		    boolean intersect = false;
+		    double shift = 0.1;
-
 			for (int i = 0; i < l.points.size(); i++) {
 				WptPt ls = l.points.get(i);
 				int cross = 0;
-				cross |= (ls.lon < latLonBounds.left - 0.1 ? 1 : 0);
+				cross |= (ls.lon < latLonBounds.left - shift ? 1 : 0);
-				cross |= (ls.lon > latLonBounds.right + 0.1 ? 2 : 0);
+				cross |= (ls.lon > latLonBounds.right + shift ? 2 : 0);
-				cross |= (ls.lat > latLonBounds.top + 0.1 ? 4 : 0);
+				cross |= (ls.lat > latLonBounds.top + shift ? 4 : 0);
-				cross |= (ls.lat < latLonBounds.bottom - 0.1 ? 8 : 0);
+				cross |= (ls.lat < latLonBounds.bottom - shift ? 8 : 0);
 				if (i > 0) {
 					if ((prevCross & cross) == 0) {
-						if (prevCross != 0 || !intersect) {
+						if(prevCross == 0 && endIndex != -1) {
+							// continue previous line
+						} else {
+							// start new segment
 							if (startIndex > 0) {
 								drawSegment(canvas, tileBox, l, startIndex, endIndex);
 							}
 							startIndex = i - 1;
 						}
 						endIndex = i;
-						intersect = true;
+					} else {
+						if (startIndex != -1) {
+							drawSegment(canvas, tileBox, l, startIndex, endIndex);
+							startIndex = -1;
+						}
 					}
 				}
 				prevCross = cross;
 			}
 			if (startIndex != -1) {
-				drawSegment(canvas, tileBox, l, startIndex, l.points.size() - 1);
+				drawSegment(canvas, tileBox, l, startIndex, endIndex);
 			}
 		}
 	}
@@ -345,7 +348,7 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 		TIntArrayList tx = new TIntArrayList();
 		TIntArrayList ty = new TIntArrayList();
 		canvas.rotate(-tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY());
-
+		Path path = new Path();
 		for (int i = startIndex; i <= endIndex; i++) {
 			WptPt p = l.points.get(i);
 			int x = (int) tb.getPixXFromLatLon(p.lat, p.lon);