diff --git a/OsmAnd/res/values-af/strings.xml b/OsmAnd/res/values-af/strings.xml
index 400043ab4d..1ee1c8ea9c 100644
--- a/OsmAnd/res/values-af/strings.xml
+++ b/OsmAnd/res/values-af/strings.xml
@@ -620,107 +620,107 @@
   <string name="voice_data_unavailable">gekose stem is nie beskikbaar nie</string>
   <string name="stop_routing">Staak navigasie</string>
   <string name="sd_unmounted">SD kaart is nie toeganklik nie.\nJy sal nie in staat wees om kaarte te sien of dinge te vind nie.</string>
-  <string name="sd_mounted_ro">SD card is read-only.\nYou can only see the preloaded map and can\'t download from the Internet.</string>
-  <string name="unzipping_file">Unzipping file…</string>
-  <string name="route_tr">Turn right and go</string>
-  <string name="route_tshr">Turn sharply right and go</string>
-  <string name="route_tslr">Turn slightly right and go</string>
-  <string name="route_tl">Turn left and go</string>
-  <string name="route_tshl">Turn sharply left and go</string>
-  <string name="route_tsll">Turn slightly left and go</string>
-  <string name="route_tu">Make U-turn and go</string>
-  <string name="route_head">Head</string>
+  <string name="sd_mounted_ro">SD kaart is slegs-lees.\nJy kan net die vooraf geïnstalleerde kaart sien en kan nie van die internet aflaai nie</string>
+  <string name="unzipping_file">Haal  lêer uit argief ...</string>
+  <string name="route_tr">Draai regs en ry</string>
+  <string name="route_tshr">Draai skerp regs en ry</string>
+  <string name="route_tslr">Draai effens regs en ry</string>
+  <string name="route_tl">Draai links en ry</string>
+  <string name="route_tshl">Draai skerp na links en ry</string>
+  <string name="route_tsll">Draai effens links en ry</string>
+  <string name="route_tu">Maak U-draai en ry</string>
+  <string name="route_head">Hoof</string>
   <string name="first_time_continue">Later</string>
-  <string name="first_time_download">Download regions</string>
-  <string name="search_poi_location">Searching for signal…</string>
-  <string name="search_near_map">Search near last map location</string>
-  <string name="search_nearby">Search nearby</string>
-  <string name="map_orientation_default">Same as device</string>
-  <string name="map_orientation_portrait">Portrait</string>
-  <string name="map_orientation_landscape">Landscape</string>
-  <string name="map_screen_orientation">Screen orientation</string>
-  <string name="map_screen_orientation_descr">Portrait, landscape, or device</string>
-  <string name="opening_hours_not_supported">Opening hours format is not supported for editing</string>
-  <string name="add_new_rule">Add new rule</string>
-  <string name="transport_Routes">Routes</string>
-  <string name="transport_Stop">Stop</string>
-  <string name="transport_stops">stops</string>
-  <string name="transport_search_after">Subsequent route</string>
-  <string name="transport_search_before">Prior route</string>
-  <string name="transport_finish_search">Finish search</string>
-  <string name="transport_stop_to_go_out">Choose stop to get off</string>
-  <string name="transport_to_go_after">prior distance</string>
-  <string name="transport_to_go_before">subsequent distance</string>
-  <string name="transport_stops_to_pass">stops to pass</string>
-  <string name="transport_route_distance">Route distance</string>
-  <string name="transport">Transport</string>
+  <string name="first_time_download">laai gebiede af</string>
+  <string name="search_poi_location">Soek vir die sein ...</string>
+  <string name="search_near_map">Soek naby die laaste kaart ligging</string>
+  <string name="search_nearby">Soek naby</string>
+  <string name="map_orientation_default">Dieselfde as toestel.</string>
+  <string name="map_orientation_portrait">Portret</string>
+  <string name="map_orientation_landscape">Landskap</string>
+  <string name="map_screen_orientation">skerm oriëntasie</string>
+  <string name="map_screen_orientation_descr">Portret, landskap, of toestel</string>
+  <string name="opening_hours_not_supported">Openingsure se formaat word nie ondersteun vir wysiging nie</string>
+  <string name="add_new_rule">Voeg nuwe reël by</string>
+  <string name="transport_Routes">Roetes</string>
+  <string name="transport_Stop">Haltes</string>
+  <string name="transport_stops">haltes</string>
+  <string name="transport_search_after">daaropvolgende roete</string>
+  <string name="transport_search_before">vorige roete</string>
+  <string name="transport_finish_search">Voltooi soek</string>
+  <string name="transport_stop_to_go_out">Kies halte om af te klim</string>
+  <string name="transport_to_go_after">vorige afstand</string>
+  <string name="transport_to_go_before">daaropvolgende afstand</string>
+  <string name="transport_stops_to_pass">haltes om verby te gaan</string>
+  <string name="transport_route_distance">Roete afstand</string>
+  <string name="transport">Vervoer</string>
   <string name="default_buttons_ok">OK</string>
-  <string name="show_transport_over_map_description">Show public transport stops on map</string>
-  <string name="show_transport_over_map">Show transport stops</string>
-  <string name="hello">Navigation application OsmAnd</string>
-  <string name="update_poi_success">POI data was updated successfully ({0} were loaded)</string>
-  <string name="update_poi_error_local">Error updating local POI list</string>
-  <string name="update_poi_error_loading">Error while loading data from server</string>
-  <string name="update_poi_no_offline_poi_index">No offline POI data available for this area</string>
-  <string name="update_poi_is_not_available_for_zoom">Updating POIs is not available for small zoom levels</string>
-  <string name="context_menu_item_update_poi">Update POI</string>
-  <string name="context_menu_item_update_map_confirm">Update local data via Internet?</string>
-  <string name="search_history_city">City:\n {0}</string>
-  <string name="search_history_street">Street:\n {0}, {1}</string>
-  <string name="search_history_int_streets">Intersection: {0} x {1} in {2}</string>
-  <string name="search_history_building">Building: {0}, {1}, {2}</string>
-  <string name="favorite">Favorite</string>
-  <string name="clear_all">Clear all</string>
-  <string name="history">History</string>
-  <string name="uploading_data">Uploading data…</string>
-  <string name="uploading">Uploading…</string>
-  <string name="search_nothing_found">Nothing found</string>
-  <string name="searching">Searching…</string>
-  <string name="searching_address">Searching address…</string>
-  <string name="search_osm_nominatim">Search address using OSM Nominatim</string>
-  <string name="hint_search_online">House number, street, city</string>
-  <string name="search_offline_address">Offline</string>
+  <string name="show_transport_over_map_description">Wys openbare vervoer haltes op die kaart</string>
+  <string name="show_transport_over_map">Wys vervoer haltes</string>
+  <string name="hello">navigasie toepassing OsmAnd</string>
+  <string name="update_poi_success">POI data is suksesvol opgedateer ({0} is gelaai)</string>
+  <string name="update_poi_error_local">Fout met die bywerk van die plaaslike POI lys</string>
+  <string name="update_poi_error_loading">Fout tydens die laai van data vanaf internet</string>
+  <string name="update_poi_no_offline_poi_index">Geen aflyn POI data beskikbaar vir hierdie area</string>
+  <string name="update_poi_is_not_available_for_zoom">opgradering van POIs is nie beskikbaar vir klein vergrotingsvlakke nie</string>
+  <string name="context_menu_item_update_poi">Opdateer POI</string>
+  <string name="context_menu_item_update_map_confirm">Werk plaaslike data by deur die internet?</string>
+  <string name="search_history_city">Stad:\n {0}</string>
+  <string name="search_history_street">Straat:\n {0}, {1}</string>
+  <string name="search_history_int_streets">Kruising: {0} x {1} in {2}</string>
+  <string name="search_history_building">Gebou: {0}, {1}, {2}</string>
+  <string name="favorite">Gunsteling</string>
+  <string name="clear_all">Vee alles uit</string>
+  <string name="history">Geskiedenis</string>
+  <string name="uploading_data">Besig om inligting op te laai…</string>
+  <string name="uploading">Besig met oplaai…</string>
+  <string name="search_nothing_found">Niks gevind nie</string>
+  <string name="searching">Besig om te soek…</string>
+  <string name="searching_address">Besig om die adres te soek...</string>
+  <string name="search_osm_nominatim">Soek adres met OSM Nominatim</string>
+  <string name="hint_search_online">Huis nommer, straat, stad</string>
+  <string name="search_offline_address">Aflyn</string>
   <string name="search_online_address">Internet</string>
-  <string name="max_level_download_tile">Max. online zoom</string>
-  <string name="max_level_download_tile_descr">Choose maximum zoom level to download for online map tiles</string>
-  <string name="route_general_information">Total distance %1$s, travelling time %2$d h %3$d m.</string>
-  <string name="router_service_descr">Choose an online or offline navigation service</string>
-  <string name="router_service">Navigation service</string>
+  <string name="max_level_download_tile">Maksimum aanlyn vergroting</string>
+  <string name="max_level_download_tile_descr">Kies maksimum vergrotingsvlak om af te laai vir aanlyn teëls</string>
+  <string name="route_general_information">Totale afstand %1$s, reistyd %2$d h %3$d m.</string>
+  <string name="router_service_descr">Kies \'n aanlyn of aflyn navigasie diens</string>
+  <string name="router_service">Navigasie diens</string>
   <string name="sd_dir_not_accessible">Save directory on SD card not accessible</string>
   <string name="download_question">Download {0} - {1} ?</string>
   <string name="download_question_exist">Offline data for {0} already exists ({1}). Do you want to update it ({2}) ?</string>
-  <string name="address">Address</string>
-  <string name="download_index_success">Download successful</string>
-  <string name="error_io_error">I/O error occured</string>
-  <string name="downloading_file">Downloading file…</string>
-  <string name="downloading">Downloading…</string>
+  <string name="address">Adres</string>
+  <string name="download_index_success">Aflaai suksesvol</string>
+  <string name="error_io_error">I/O fout het voorgekom</string>
+  <string name="downloading_file">Besig om lêer af te laai…</string>
+  <string name="downloading">Besig om af te laai…</string>
   <string name="downloading_list_indexes">Downloading list of available regions…</string>
   <string name="list_index_files_was_not_loaded">The list of regions was not retrieved from osmand.net.</string>
-  <string name="show_poi_on_map">Show on map</string>
-  <string name="fav_points_edited">Favorite point was edited</string>
-  <string name="fav_points_not_exist">No favorite points exist</string>
-  <string name="update_existing">Replace</string>
-  <string name="only_show">Only show</string>
-  <string name="follow">Follow</string>
-  <string name="recalculate_route_to_your_location">Select mode of transportation (optional):</string>
-  <string name="mark_final_location_first">Please select destination first</string>
-  <string name="get_directions">Directions</string>
-  <string name="show_gps_status">Show GPS Status</string>
-  <string name="opening_hours">Opening hours</string>
-  <string name="opening_changeset">Opening changeset…</string>
-  <string name="closing_changeset">Closing changeset…</string>
+  <string name="show_poi_on_map">Wys op die kaart</string>
+  <string name="fav_points_edited">Gunstelingpunt was gewysig</string>
+  <string name="fav_points_not_exist">Geen gunstelingpunte bestaan nie</string>
+  <string name="update_existing">Vervang</string>
+  <string name="only_show">Wys slegs</string>
+  <string name="follow">Volg</string>
+  <string name="recalculate_route_to_your_location">Kies vervoerwyse (opsioneel)</string>
+  <string name="mark_final_location_first">Kies asseblief eers die bestemming</string>
+  <string name="get_directions">Aanwysings</string>
+  <string name="show_gps_status">Wys GPS status</string>
+  <string name="opening_hours">Openingsure</string>
+  <string name="opening_changeset">Besig om wysiging-stel te open…</string>
+  <string name="closing_changeset">Besig om wysiging-stel te sluit...</string>
   <string name="commiting_node">Committing node…</string>
-  <string name="loading_poi_obj">Loading POI…</string>
-  <string name="auth_failed">Authorization failed</string>
-  <string name="failed_op">failed</string>
-  <string name="converting_names">Converting native/English names…</string>
+  <string name="loading_poi_obj">Besig om  POI te laai…</string>
+  <string name="auth_failed">Magtiging het misluk</string>
+  <string name="failed_op">misluk</string>
+  <string name="converting_names">omskakeling van inheemse/Engelse name…</string>
   <string name="loading_streets_buildings">Loading streets/buildings…</string>
-  <string name="loading_postcodes">Loading postcodes…</string>
-  <string name="loading_streets">Loading streets…</string>
-  <string name="loading_cities">Loading cities…</string>
-  <string name="loading">Loading…</string>
-  <string name="poi">POI</string>
-  <string name="error_occurred_saving_gpx">Error while saving GPX</string>
+  <string name="loading_postcodes">Besig om poskodes te laai...</string>
+  <string name="loading_streets">Besig om strate te laai...</string>
+  <string name="loading_cities">Besig om stede te laai...</string>
+  <string name="loading">Besig om te laai...</string>
+  <string name="poi">POI (interessante punt)</string>
+  <string name="error_occurred_saving_gpx">Fout tydes GPX berging</string>
   <string name="error_calculating_route">Error calculating route</string>
   <string name="error_calculating_route_occured">Error occurred while calculating route</string>
   <string name="empty_route_calculated">Error: Calculated route is empty</string>
@@ -728,108 +728,108 @@
   <string name="arrived_at_destination">You have arrived at your destination</string>
   <string name="invalid_locations">Coordinates are invalid!</string>
   <string name="go_back_to_osmand">Go back to OsmAnd map</string>
-  <string name="close">Close</string>
+  <string name="close">Sluit</string>
   <string name="loading_data">Loading data…</string>
   <string name="reading_indexes">Reading local data…</string>
   <string name="previous_run_crashed">Last OsmAnd run crashed. Log file is at {0}. Please report the issue and attach the log file.</string>
   <string name="saving_gpx_tracks">Saving GPX tracks to SD…</string>
-  <string name="finished_task">Finished</string>
+  <string name="finished_task">Klaar</string>
   <string name="reload_indexes_descr">Re-read offline vector maps and data from SD card</string>
   <string name="reload_indexes">Re-read offline data</string>
   <string name="download_indexes_descr">Download or update data for offline use from the Internet</string>
-  <string name="download_indexes">Download offline data</string>
+  <string name="download_indexes">Laai aflyn inligting af</string>
   <string name="use_online_routing_descr">Use Internet to calculate route</string>
   <string name="use_online_routing">Use online navigation</string>
   <string name="osm_settings_descr">Specify Openstreetmap.org (OSM) settings needed for OSM submissions</string>
   <string name="data_settings_descr">Specify language, download/reload data</string>
-  <string name="data_settings">Data</string>
+  <string name="data_settings">Inligting</string>
   <string name="map_preferences_descr">Specify map settings: map source, rotation, marker position, screen orientation</string>
-  <string name="osm_settings">OSM Editing</string>
+  <string name="osm_settings">OSM wysiging</string>
   <string name="auto_zoom_map_descr">Auto zoom map according to your speed</string>
-  <string name="auto_zoom_map">Auto zoom map</string>
-  <string name="additional_settings">Additional settings</string>
-  <string name="settings">Settings</string>
+  <string name="auto_zoom_map">Vergroot kaart outomaties</string>
+  <string name="additional_settings">Bykomende stellings</string>
+  <string name="settings">Stellings</string>
   <string name="save_current_track_descr">Save current track to SD now</string>
-  <string name="save_current_track">Save current track</string>
+  <string name="save_current_track">Berg huidige spoor</string>
   <string name="save_track_interval">Logging interval</string>
   <string name="save_track_interval_descr">Choose positioning interval for tracks</string>
   <string name="save_track_to_gpx_descrp">Tracks will be saved to track directory grouped by days</string>
   <string name="save_track_to_gpx">Log track to GPX file</string>
-  <string name="navigate_to">Set as destination</string>
-  <string name="update_tile">Update map</string>
-  <string name="reload_tile">Reload tile</string>
-  <string name="mark_point">Target</string>
+  <string name="navigate_to">Stel as bestemming</string>
+  <string name="update_tile">Opgradeer kaart</string>
+  <string name="reload_tile">Laai teël weer af</string>
+  <string name="mark_point">Teiken</string>
   <string name="show_osm_bugs_descr">Show OpenStreetBugs on map</string>
-  <string name="show_osm_bugs">Show OpenStreetBugs</string>
-  <string name="favourites_activity">Favorites</string>
-  <string name="add_to_favourite">Add to Favorites</string>
+  <string name="show_osm_bugs">Wys OpenStreetBugs</string>
+  <string name="favourites_activity">Gunstelinge</string>
+  <string name="add_to_favourite">Voeg by gunstelinge</string>
   <string name="use_english_names_descr">Select between native and English names</string>
-  <string name="use_english_names">Use English names in maps</string>
-  <string name="app_settings">Application settings</string>
-  <string name="search_address">Search address</string>
-  <string name="choose_building">Choose building</string>
-  <string name="choose_street">Choose street</string>
-  <string name="choose_city">Choose city</string>
-  <string name="ChooseCountry">Choose country</string>
-  <string name="position_on_map_descr">Choose location of position marker on the map</string>
-  <string name="position_on_map">Position marker</string>
-  <string name="map_specify_point">Set as destination</string>
+  <string name="use_english_names">Gebruik Engelse name in die kaart</string>
+  <string name="app_settings">Toepassing stellings</string>
+  <string name="search_address">Soek adres</string>
+  <string name="choose_building">Kies gebou</string>
+  <string name="choose_street">Kies straat</string>
+  <string name="choose_city">Kies stad</string>
+  <string name="ChooseCountry">Kies land</string>
+  <string name="position_on_map_descr">Kies die plaasing van die posisie merker op die kaart</string>
+  <string name="position_on_map">Posisie merker</string>
+  <string name="map_specify_point">Stel as bestemming</string>
   <string name="show_view_angle_descr">Display viewing direction on the map</string>
-  <string name="show_view_angle">Display viewing direction</string>
-  <string name="stop_navigation">Clear destin.</string>
-  <string name="navigate_to_point">Set as dest.</string>
-  <string name="map_view_3d_descr">Enable 3D view of the map</string>
-  <string name="map_view_3d">Map View 3D</string>
+  <string name="show_view_angle">Wys uitsig rigting</string>
+  <string name="stop_navigation">Maak bestemming skoon</string>
+  <string name="navigate_to_point">Stel as bestemming</string>
+  <string name="map_view_3d_descr">Skakel 3D kaart aan</string>
+  <string name="map_view_3d">"Kaart 3D "</string>
   <string name="show_poi_over_map_description">Show POI over map (use last chosen filter)</string>
-  <string name="show_poi_over_map">Show POI</string>
+  <string name="show_poi_over_map">Wys POI</string>
   <string name="map_tile_source_descr">Choose the source of online or cached map tiles</string>
-  <string name="map_tile_source">Tile map source</string>
-  <string name="map_source">Map source</string>
-  <string name="use_internet">Use Internet</string>
-  <string name="show_location">Show location</string>
-  <string name="map_preferences">Map</string>
-  <string name="settings_activity">Settings</string>
+  <string name="map_tile_source">Teël kaart bron</string>
+  <string name="map_source">Kaartbron</string>
+  <string name="use_internet">Gebruik Internet</string>
+  <string name="show_location">Wys ligging</string>
+  <string name="map_preferences">Kaart</string>
+  <string name="settings_activity">Stellings</string>
   <string name="show_gps_coordinates_text">Show GPS coordinates on map</string>
   <string name="use_internet_to_download_tile">Use Internet to download missing map tiles</string>
-  <string name="app_description">Navigation application</string>
-  <string name="exit_Button">Exit</string>
-  <string name="map_Button">Map</string>
-  <string name="settings_Button">Settings</string>
-  <string name="favorites_Button">Favorites</string>
-  <string name="search_button">Search</string>
-  <string name="search_activity">Search</string>
-  <string name="searchpoi_activity">Choose POI</string>
-  <string name="search_POI_level_btn">Find more</string>
+  <string name="app_description">Navigasie toepassing</string>
+  <string name="exit_Button">Verlaat</string>
+  <string name="map_Button">Kaart</string>
+  <string name="settings_Button">Stellings</string>
+  <string name="favorites_Button">Gunstelinge</string>
+  <string name="search_button">Soek</string>
+  <string name="search_activity">Soek</string>
+  <string name="searchpoi_activity">Kies POI</string>
+  <string name="search_POI_level_btn">Vind mer</string>
   <string name="incremental_search_city">Search city incrementally. To find towns/postcodes, enter the first 3 or more characters.</string>
   <string name="incremental_search_street">Search street incrementally</string>
-  <string name="incremental_search_building">Search building incrementally</string>
-  <string name="choose_available_region">Choose region from list</string>
-  <string name="choose_intersected_street">Choose intersecting street</string>
+  <string name="incremental_search_building">Soek gebou toenemend</string>
+  <string name="choose_available_region">Kies gebied vanaf die lys</string>
+  <string name="choose_intersected_street">Kies kruisende straat</string>
   <string name="Closest_Amenities">Closest amenities</string>
-  <string name="app_mode_default">Default</string>
+  <string name="app_mode_default">Verstek</string>
   <string name="app_mode_car">Motor</string>
   <string name="app_mode_bicycle">Fiets</string>
   <string name="app_mode_pedestrian">Voetganger</string>
   <string name="position_on_map_center">Senter</string>
   <string name="position_on_map_bottom">Onder</string>
   <string name="navigate_point_top_text">Input latitude &amp; longitude in the selected format (D - degrees, M - minutes, S - seconds)</string>
-  <string name="navigate_point_latitude">Latitude</string>
-  <string name="navigate_point_longitude">Longitude</string>
+  <string name="navigate_point_latitude">Breedtegraad</string>
+  <string name="navigate_point_longitude">Lengtegraad</string>
   <string name="navigate_point_format_D">DDD.DD</string>
   <string name="navigate_point_format_DM">DDD MM.MM</string>
   <string name="navigate_point_format_DMS">DDD MM SS.SS</string>
-  <string name="search_shown_on_map">Show on map</string>
+  <string name="search_shown_on_map">Wys op kaart</string>
   <string name="navigate_point_cancel">Kanseleer</string>
-  <string name="search_address_top_text">Select address</string>
+  <string name="search_address_top_text">Kies adres</string>
   <string name="search_address_region">Streek</string>
   <string name="search_address_city">Stad</string>
   <string name="search_address_street">Straat</string>
   <string name="search_address_building">Gebou</string>
   <string name="search_address_building_option">Gebou</string>
-  <string name="search_address_street_option">Intersecting street</string>
-  <string name="search_tabs_location">Location</string>
-  <string name="context_menu_item_navigate_point">Set as destination</string>
-  <string name="context_menu_item_add_favorite">Add to favorites</string>
+  <string name="search_address_street_option">Kruisende straat</string>
+  <string name="search_tabs_location">Ligging</string>
+  <string name="context_menu_item_navigate_point">Stel as bestemming</string>
+  <string name="context_menu_item_add_favorite">Voeg by gunstelinge</string>
   <string name="context_menu_item_update_map">opgradeer kaart</string>
   <string name="context_menu_item_open_bug">Open OSM fout</string>
   <string name="context_menu_item_create_poi">skep interessante plek</string>
@@ -844,7 +844,7 @@
   <string name="favourites_context_menu_navigate">Stel as bestemming</string>
   <string name="favourites_context_menu_edit">Verander gunsteling</string>
   <string name="favourites_context_menu_delete">verwyder gunsteling</string>
-  <string name="favourites_remove_dialog_msg">Verwyder gunsteling punt \'% s\'?</string>
+  <string name="favourites_remove_dialog_msg">Verwyder gunsteling punt \'%s\'?</string>
   <string name="favourites_remove_dialog_success">Gunsteling punt {0} is suksesvol verwyder.</string>
   <string name="osb_add_dialog_title">Tik fout teks in</string>
   <string name="osb_add_dialog_success">fout suksesvol geskep</string>