From f4f1b694211a241bcce403b18587f824816a0dda Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Thu, 17 May 2018 01:07:04 +0200
Subject: [PATCH] string rework: Use 'GPX file' where 'track' now needs
 generalization

---
 OsmAnd/res/values/strings.xml | 60 +++++++++++++++++------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 2b5fd1c8d7..a534d6308b 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -175,19 +175,19 @@
     <string name="notes_by_date">Notes by date</string>
     <string name="by_date">By date</string>
     <string name="by_type">By type</string>
-    <string name="looking_for_tracks_with_waypoints">Looking for tracks with waypoints</string>
+    <string name="looking_for_tracks_with_waypoints">Looking for GPX files with waypoints</string>
     <string name="shared_string_more_without_dots">More</string>
     <string name="appearance_on_the_map">Appearance on the map</string>
-    <string name="add_track_to_markers_descr">Waypoints can be added to markers by selecting one of these tracks that has them.</string>
+    <string name="add_track_to_markers_descr">Select a GPX file to add its waypoints to the markers.</string>
     <string name="add_favourites_group_to_markers_descr">Select a favorite category to add to the markers.</string>
-    <string name="track_waypoints">Track waypoints</string>
+    <string name="track_waypoints">GPX waypoints</string>
     <string name="favourites_group">Favorites category</string>
     <string name="add_group">Add a group</string>
-    <string name="add_group_descr">Import groups from favorites or track waypoints.</string>
+    <string name="add_group_descr">Import groups from favorites or GPX waypoints.</string>
     <string name="empty_state_markers_active">Create map markers!</string>
     <string name="empty_state_markers_active_desc">Long or short tap \'Places\', then tap the marker flag button.</string>
     <string name="empty_state_markers_groups">Import groups</string>
-    <string name="empty_state_markers_groups_desc">Import favorite groups or track waypoints as markers.</string>
+    <string name="empty_state_markers_groups_desc">Import favorite groups or GPX waypoints as markers.</string>
     <string name="empty_state_markers_history_desc">Markers marked as passed will appear on this screen.</string>
     <string name="shared_string_two">Two</string>
     <string name="shared_string_one">One</string>
@@ -207,7 +207,7 @@
     <string name="tap_on_map_to_hide_interface_descr">A tap on the map toggles the control buttons and widgets.</string>
     <string name="tap_on_map_to_hide_interface">Fullscreen mode</string>
     <string name="mark_passed">Mark passed</string>
-    <string name="import_gpx_file_description">can be imported as favorite, or track file.</string>
+    <string name="import_gpx_file_description">can be imported as favorite or GPX file.</string>
     <string name="import_as_gpx">Import as GPX file</string>
     <string name="import_as_favorites">Import as favorite</string>
     <string name="import_file">Import file</string>
@@ -243,8 +243,8 @@
     <string name="shared_string_sort">Sort</string>
     <string name="coordinate_input">Coordinate input</string>
     <string name="is_saved">is saved</string>
-    <string name="marker_save_as_track_descr">Export your markers to a file you can specify here:</string>
-    <string name="marker_save_as_track">Save as track</string>
+    <string name="marker_save_as_track_descr">Export your markers to the following GPX file:</string>
+    <string name="marker_save_as_track">Save as GPX file</string>
     <string name="move_to_history">Move to history</string>
     <string name="group_will_be_removed_after_restart">The group will be gone the next time you start the app.</string>
     <string name="show_guide_line">Show directional lines</string>
@@ -417,7 +417,7 @@
     <string name="points_delete_multiple">You are going to delete %1$d point(s). Are you sure?</string>
     <string name="route_points_category_name">Turns to pass on this route</string>
     <string name="track_points_category_name">Waypoints, points of interest, named features</string>
-    <string name="gpx_track">Track</string>
+    <string name="gpx_track">GPX file</string>
     <string name="max_speed">Maximum speed</string>
     <string name="average_speed">Average speed</string>
     <string name="shared_string_time_moving">Time moving</string>
@@ -426,10 +426,10 @@
     <string name="shared_string_start_time">Departure</string>
     <string name="shared_string_end_time">Arrival</string>
     <string name="shared_string_color">Color</string>
-    <string name="select_gpx_folder">Select track folder</string>
+    <string name="select_gpx_folder">Select GPX file folder</string>
     <string name="file_can_not_be_moved">File can not be moved.</string>
     <string name="shared_string_move">Move</string>
-    <string name="shared_string_tracks">Tracks</string>
+    <string name="shared_string_tracks">GPX files</string>
     <string name="routing_attr_driving_style_name">Driving style</string>
     <string name="route_altitude">Route elevation</string>
     <string name="altitude_descent">Descent</string>
@@ -501,9 +501,9 @@
     <string name="route_roundabout_short">Take %1$d exit and go</string>
     <string name="upload_poi">Upload POI</string>
     <string name="route_calculation">Route calculation</string>
-    <string name="gpx_no_tracks_title">You do not have any tracks yet</string>
-    <string name="gpx_no_tracks_title_folder">You may also add tracks to the folder</string>
-    <string name="gpx_add_track">Add track</string>
+    <string name="gpx_no_tracks_title">You do not have any GPX files yet</string>
+    <string name="gpx_no_tracks_title_folder">You may also add GPX files to the folder</string>
+    <string name="gpx_add_track">Add GPX file</string>
     <string name="gpx_appearance">Appearance</string>
     <string name="trip_rec_notification_settings">Enable recording quick start</string>
     <string name="trip_rec_notification_settings_desc">Display a system notification allowing to start trip recording.</string>
@@ -572,7 +572,7 @@
     <string name="no_inet_connection_desc_map">Required to download maps.</string>
     <string name="search_location">Searching for location…</string>
     <string name="storage_free_space">Free space</string>
-    <string name="storage_place_description">OsmAnd\'s data storage (for maps, tracks, etc.): %1$s.</string>
+    <string name="storage_place_description">OsmAnd\'s data storage (for maps, GPX files, etc.): %1$s.</string>
     <string name="give_permission">Grant permission</string>
     <string name="allow_access_location">Allow location access</string>
     <string name="first_usage_greeting">Get directions and discover new places without a connection to the Internet</string>
@@ -1064,7 +1064,7 @@
     <string name="shared_string_clear">Clear</string>
     <string name="shared_string_clear_all">Clear all</string>
     <string name="shared_string_save">Save</string>
-    <string name="shared_string_save_as_gpx">Save as new GPX track</string>
+    <string name="shared_string_save_as_gpx">Save as new GPX file</string>
     <string name="shared_string_rename">Rename</string>
     <string name="shared_string_delete">Delete</string>
     <string name="shared_string_delete_all">Delete all</string>
@@ -1100,7 +1100,7 @@
     <string name="shared_string_my_location">My Position</string>
     <string name="shared_string_my_places">My Places</string>
     <string name="shared_string_my_favorites">Favorites</string>
-    <string name="shared_string_my_tracks">Tracks</string>
+    <string name="shared_string_my_tracks">GPX files</string>
     <string name="shared_string_currently_recording_track">Currently recording track</string>
     <string name="shared_string_audio">Audio</string>
     <string name="shared_string_video">Video</string>
@@ -1278,8 +1278,8 @@
     <string name="save_track_to_gpx_globally">Log track to GPX file</string>
     <string name="save_track_to_gpx_globally_headline">On demand track logging</string>
     <string name="save_track_to_gpx_globally_descr">General position logging to a GPX file can be turned on or off using the GPX logging widget on the map screen.</string>
-    <string name="save_current_track_descr">Save current track to memory card now.</string>
-    <string name="save_current_track">Save current GPX track</string>
+    <string name="save_current_track_descr">Save current track as GPX file now.</string>
+    <string name="save_current_track">Save current track</string>
     <string name="save_track_to_gpx">Auto-record track during navigation</string>
     <string name="save_track_to_gpx_descrp">A GPX track is automatically saved to the tracks folder during navigation.</string>
     <string name="save_track_interval_globally">Logging interval</string>
@@ -1346,7 +1346,7 @@
     <string name="rendering_attr_showCycleRoutes_name">Show cycle routes</string>
     <string name="no_index_file_to_download">Downloads not found, please check your connection to the Internet.</string>
     <string name="select_index_file_to_download">Nothing was found. If you can\'t find your region, you can make it yourself (see https://osmand.net).</string>
-    <string name="none_selected_gpx">No GPX files selected. To select one long-tap an available track.</string>
+    <string name="none_selected_gpx">No GPX files selected. Select one by long-tapping.</string>
     <string name="local_index_select_gpx_file">Select to show</string>
     <string name="gpx_split_interval">Split interval</string>
     <string name="sort_by_distance">Sort by distance</string>
@@ -1381,7 +1381,7 @@
     <string name="gpx_selection_route_points">%1$s \nRoute points %2$s</string>
     <string name="gpx_selection_points">%1$s \nPoints</string>
     <string name="gpx_selection_track">%1$s \nTrack %2$s</string>
-    <string name="gpx_file_is_empty">Empty GPX track</string>
+    <string name="gpx_file_is_empty">Empty GPX file</string>
     <string name="osmo_edit_color">Display color</string>
     <string name="osmo_connect_menu">Connect</string>
     <string name="osmo_group_description">Description</string>
@@ -1591,7 +1591,7 @@
     <string name="distance_measurement_finish_editing">Finish editing</string>
     <string name="distance_measurement_finish_subtrack">Begin a new subtrack</string>
     <string name="distance_measurement_clear_route">Clear all points</string>
-    <string name="distance_measurement_load_gpx">Open existing GPX track</string>
+    <string name="distance_measurement_load_gpx">Open existing GPX file</string>
     <string name="wait_current_task_finished">Please wait until current task is finished</string>
     <string name="use_kalman_filter_compass_descr">Reduces noise in compass readings but adds inertia.</string>
     <string name="use_kalman_filter_compass">Use Kalman filter</string>
@@ -2421,7 +2421,7 @@
     <string name="no_vector_map_loaded">Vector maps were not loaded</string>
     <!-- string name="map_route_by_gpx">Navigate using GPX</string-->
     <string name="gpx_files_not_found">No GPX files found in the tracks folder</string>
-    <string name="layer_gpx_layer">GPX track…</string>
+    <string name="layer_gpx_layer">GPX files…</string>
     <string name="error_reading_gpx">Could not read GPX data</string>
     <string name="vector_data">Offline vector maps</string>
     <string name="transport_context_menu">Search transport at stop</string>
@@ -2567,7 +2567,7 @@
     <string name="loading_streets">Loading streets…</string>
     <string name="loading_cities">Loading cities…</string>
     <string name="poi">POI</string>
-    <string name="error_occurred_saving_gpx">Could not save GPX track</string>
+    <string name="error_occurred_saving_gpx">Could not save GPX file</string>
     <string name="error_calculating_route">Could not calculate route</string>
     <string name="error_calculating_route_occured">Could not calculate route</string>
     <string name="empty_route_calculated">Calculated route is empty</string>
@@ -2578,7 +2578,7 @@
     <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="saving_gpx_tracks">Saving GPX files…</string>
     <string name="finished_task">Finished</string>
     <string name="use_online_routing_descr">Use the Internet to calculate a route.</string>
     <string name="use_online_routing">Use online navigation</string>
@@ -2880,14 +2880,14 @@
     <string name="save_route_point">Save Route Point</string>
     <string name="waypoint_one">Waypoint 1</string>
     <string name="route_point_one">Route Point 1</string>
-    <string name="empty_state_my_tracks">Add and Record Tracks</string>
-    <string name="empty_state_my_tracks_desc">Record or import tracks to view.</string>
+    <string name="empty_state_my_tracks">Add GPX Files</string>
+    <string name="empty_state_my_tracks_desc">Import GPX files, or record tracks.</string>
     <string name="empty_state_favourites">Add Favorites</string>
-    <string name="empty_state_favourites_desc">Import or mark favorites on the map.</string>
-    <string name="import_track">Import track</string>
+    <string name="empty_state_favourites_desc">Import favorites, or add via marking points on the map.</string>
+    <string name="import_track">Import GPX file</string>
     <string name="import_track_desc">File %1$s does not contain waypoints, import it as a track?</string>
     <string name="move_point">Move Point</string>
-    <string name="add_segment_to_the_track">Add to a GPX track</string>
+    <string name="add_segment_to_the_track">Add to a GPX file</string>
     <string name="osm_recipients_label">OSM recipients</string>
     <string name="total_donations">Total donations</string>
     <string name="day_off_label">off</string>