diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
index 7b8ed8411..e863bfb28 100644
--- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
@@ -529,7 +529,7 @@ public class TrackRecordingService extends Service {
 
         // Update database
         track.setId(trackId);
-        track.setName(TrackNameUtils.getTrackName(this, trackId, now, null));
+        track.setName(TrackNameUtils.getTrackName(this, trackId, now));
 
         String category = PreferencesUtils.getString(
                 this, R.string.default_activity_key, PreferencesUtils.DEFAULT_ACTIVITY_DEFAULT);
@@ -667,7 +667,7 @@ public class TrackRecordingService extends Service {
                 updateRecordingTrack(track, contentProviderUtils.getLastTrackPointId(trackId), false);
             }
 
-            String trackName = TrackNameUtils.getTrackName(this, trackId, track.getTripStatistics().getStartTime(), contentProviderUtils.getFirstValidTrackPoint(trackId));
+            String trackName = TrackNameUtils.getTrackName(this, trackId, track.getTripStatistics().getStartTime());
             if (trackName != null && !trackName.equals(track.getName())) {
                 track.setName(trackName);
                 contentProviderUtils.updateTrack(track);
diff --git a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
index 9f553a0f8..37d24613c 100644
--- a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
@@ -82,7 +82,7 @@ public class PreferencesUtils {
     public static final boolean STATS_SHOW_GRADE_ELEVATION_DEFAULT = false;
     public static final String STATS_UNITS_DEFAULT = "METRIC";
 
-    public static final String TRACK_NAME_DEFAULT = "DATE_ISO_8601_LOCATION";
+    public static final String TRACK_NAME_DEFAULT = "DATE_ISO_8601";
 
     // Track widget
     public static final int TRACK_WIDGET_ITEM1_DEFAULT = 3; // moving time
diff --git a/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java
index a1ae7811d..357d2452c 100644
--- a/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java
@@ -49,70 +49,16 @@ public class TrackNameUtils {
      * @param context   the context
      * @param trackId   the track id
      * @param startTime the track start time
-     * @param location  the track location, can be null
      */
-    public static String getTrackName(Context context, long trackId, long startTime, Location location) {
+    public static String getTrackName(Context context, long trackId, long startTime) {
         String trackName = PreferencesUtils.getString(context, R.string.track_name_key, PreferencesUtils.TRACK_NAME_DEFAULT);
 
-        if (trackName.equals(context.getString(R.string.settings_recording_track_name_location_value))) {
-            // Use the startTime if location is null
-            return location != null ? getReverseGeoCoding(context, location) : StringUtils.formatDateTime(context, startTime);
-        } else if (trackName.equals(context.getString(R.string.settings_recording_track_name_date_local_value))) {
+        if (trackName.equals(context.getString(R.string.settings_recording_track_name_date_local_value))) {
             return StringUtils.formatDateTime(context, startTime);
         } else if (trackName.equals(context.getString(R.string.settings_recording_track_name_date_iso_8601_value))) {
             return new SimpleDateFormat(ISO_8601_FORMAT, Locale.US).format(startTime);
-        } else if (trackName.equals(context.getString(R.string.settings_recording_track_name_date_iso_8601_location_value))) {
-            StringBuilder builder = new StringBuilder(new SimpleDateFormat(ISO_8601_FORMAT, Locale.US).format(startTime));
-
-            if (location != null) {
-                String address = getReverseGeoCoding(context, location);
-                if (address != null && !address.equals("")) {
-                    builder.append(" ").append(address);
-                }
-            }
-            return builder.toString();
         } else {
-            // R.string.settings_recording_track_name_number_value)
             return context.getString(R.string.track_name_format, trackId);
         }
     }
-
-    /**
-     * Gets the reverse geo coding string for a location.
-     *
-     * @param context  the context
-     * @param location the location
-     */
-    private static String getReverseGeoCoding(Context context, Location location) {
-        if (location == null || !Geocoder.isPresent()) {
-            return null;
-        }
-        Geocoder geocoder = new Geocoder(context);
-        try {
-            List<Address> addresses = geocoder.getFromLocation(
-                    location.getLatitude(), location.getLongitude(), 1);
-            if (addresses.size() > 0) {
-                Address address = addresses.get(0);
-                int lines = address.getMaxAddressLineIndex();
-                if (lines > 0) {
-                    return address.getAddressLine(0);
-                }
-                String featureName = address.getFeatureName();
-                if (featureName != null) {
-                    return featureName;
-                }
-                String thoroughfare = address.getThoroughfare();
-                if (thoroughfare != null) {
-                    return thoroughfare;
-                }
-                String locality = address.getLocality();
-                if (locality != null) {
-                    return locality;
-                }
-            }
-        } catch (IOException e) {
-            // Can safely ignore
-        }
-        return null;
-    }
 }
diff --git a/src/main/res/values-ar-rXB/strings.xml b/src/main/res/values-ar-rXB/strings.xml
index 6277373ef..74c50765d 100644
--- a/src/main/res/values-ar-rXB/strings.xml
+++ b/src/main/res/values-ar-rXB/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">‏‮Recording‬‏ ‏‮time‬‏ ‏‮interval‬‏</string>
     <string name="settings_recording_min_required_accuracy_summary">‏‮Location‬‏ ‏‮is‬‏ ‏‮ignored‬‏ ‏‮if‬‏ ‏‮its‬‏ ‏‮accuracy‬‏ ‏‮is‬‏ ‏‮less‬‏ ‏‮than‬‏ %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">‏‮GPS‬‏ ‏‮accuracy‬‏</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">‏‮Date‬‏ (‏‮ISO‬‏ 8601) + ‏‮Location‬‏</string>
     <string name="settings_recording_track_name_date_iso_8601_option">‏‮Date‬‏ (‏‮ISO‬‏ 8601)</string>
     <string name="settings_recording_track_name_date_local_option">‏‮Date‬‏ (‏‮local‬‏)</string>
-    <string name="settings_recording_track_name_location_option">‏‮Location‬‏</string>
     <string name="settings_recording_track_name_number_option">‏‮Number‬‏</string>
     <string name="settings_recording_track_name_title">‏‮Default‬‏ ‏‮track‬‏ ‏‮name‬‏</string>
     <string name="settings_reset">‏‮Reset‬‏</string>
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 80f196ea6..32662f942 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">تسجيل الفاصل الزمني</string>
     <string name="settings_recording_min_required_accuracy_summary">يتم تجاهل الموقع إذا كانت دقته أقل من %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">دقة نظام تحديد المواقع العالمي (GPS)</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">التاريخ + الموقع</string>
     <string name="settings_recording_track_name_date_iso_8601_option">التاريخ (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">التاريخ (المحلي)</string>
-    <string name="settings_recording_track_name_location_option">الموقع</string>
     <string name="settings_recording_track_name_number_option">عدد</string>
     <string name="settings_recording_track_name_title">اسم المسار الافتراضي</string>
     <string name="settings_reset">إعادة تعيين</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index f330210c0..001c1fb98 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -248,10 +248,8 @@
     <string name="settings_recording_min_recording_interval_title">Време между записите</string>
     <string name="settings_recording_min_required_accuracy_summary">Местоположението се пренебрегва, ако точността му е по-малка от %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Точност на GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Дата (ISO 8601) + местоположение</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Дата (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Дата (местна)</string>
-    <string name="settings_recording_track_name_location_option">Местоположение</string>
     <string name="settings_recording_track_name_number_option">Число</string>
     <string name="settings_recording_track_name_title">Стандартен маршрут: Име</string>
     <string name="settings_reset">Нулиране</string>
diff --git a/src/main/res/values-bn/strings.xml b/src/main/res/values-bn/strings.xml
index 8023764b7..f9858c64f 100644
--- a/src/main/res/values-bn/strings.xml
+++ b/src/main/res/values-bn/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">Recording time interval</string>
     <string name="settings_recording_min_required_accuracy_summary">Location is ignored if its accuracy is less than %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">GPS accuracy</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Date (ISO 8601) + Location</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Dato (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Dato (lokal)</string>
-    <string name="settings_recording_track_name_location_option">Location</string>
     <string name="settings_recording_track_name_number_option">Tall</string>
     <string name="settings_recording_track_name_title">Default track name</string>
     <string name="settings_reset">Tilbakestill</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 356288326..97a743c7d 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -250,10 +250,8 @@ es vegi el cel. Torneu-ho a provar més tard.</string>
     <string name="settings_recording_min_recording_interval_title">Interval de temps</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicació s\'ignora si la seva precisió és inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisió del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Data (ISO 8601) + ubicació</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Data (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Data (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicació</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nom de la ruta</string>
     <string name="settings_reset">Restableix</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 091c27df9..167a8ae93 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Časový interval záznamu</string>
     <string name="settings_recording_min_required_accuracy_summary">Pokud je přesnost polohy menší než %1$s, je poloha ignorována.</string>
     <string name="settings_recording_min_required_accuracy_title">Přesnost GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Datum (ISO 8601) a poloha</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Datum (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Datum (místní)</string>
-    <string name="settings_recording_track_name_location_option">Poloha</string>
     <string name="settings_recording_track_name_number_option">Číslo</string>
     <string name="settings_recording_track_name_title">Výchozí název trasy</string>
     <string name="settings_reset">Resetovat</string>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index 4cc238016..421698efb 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">Reg. af tidsinterval</string>
     <string name="settings_recording_min_required_accuracy_summary">Placering ignoreres, hvis dens nøjagtighed er lavere end %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">GPS-nøjagtighed</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Dato (ISO 8601) + placering</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Dato (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Dato (lokal)</string>
-    <string name="settings_recording_track_name_location_option">Placering</string>
     <string name="settings_recording_track_name_number_option">Nummer</string>
     <string name="settings_recording_track_name_title">Standardnavn på spor</string>
     <string name="settings_reset">Nulstil</string>
diff --git a/src/main/res/values-de-rAT/strings.xml b/src/main/res/values-de-rAT/strings.xml
index 5c8a166e8..713441e46 100644
--- a/src/main/res/values-de-rAT/strings.xml
+++ b/src/main/res/values-de-rAT/strings.xml
@@ -248,10 +248,8 @@
     <string name="settings_recording_min_recording_interval_title">Zeitintervall aufz.</string>
     <string name="settings_recording_min_required_accuracy_summary">Der Standort wird ignoriert, wenn die Genauigkeit weniger als %1$s beträgt.</string>
     <string name="settings_recording_min_required_accuracy_title">GPS-Genauigkeit</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Datum (ISO 8601) + Ort</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Datum (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Datum (lokal)</string>
-    <string name="settings_recording_track_name_location_option">Standort</string>
     <string name="settings_recording_track_name_number_option">Nummer</string>
     <string name="settings_recording_track_name_title">Standard-Trackname</string>
     <string name="settings_reset">Zurücksetzen</string>
diff --git a/src/main/res/values-de-rCH/strings.xml b/src/main/res/values-de-rCH/strings.xml
index 5c8a166e8..713441e46 100644
--- a/src/main/res/values-de-rCH/strings.xml
+++ b/src/main/res/values-de-rCH/strings.xml
@@ -248,10 +248,8 @@
     <string name="settings_recording_min_recording_interval_title">Zeitintervall aufz.</string>
     <string name="settings_recording_min_required_accuracy_summary">Der Standort wird ignoriert, wenn die Genauigkeit weniger als %1$s beträgt.</string>
     <string name="settings_recording_min_required_accuracy_title">GPS-Genauigkeit</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Datum (ISO 8601) + Ort</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Datum (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Datum (lokal)</string>
-    <string name="settings_recording_track_name_location_option">Standort</string>
     <string name="settings_recording_track_name_number_option">Nummer</string>
     <string name="settings_recording_track_name_title">Standard-Trackname</string>
     <string name="settings_reset">Zurücksetzen</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 5c8a166e8..713441e46 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -248,10 +248,8 @@
     <string name="settings_recording_min_recording_interval_title">Zeitintervall aufz.</string>
     <string name="settings_recording_min_required_accuracy_summary">Der Standort wird ignoriert, wenn die Genauigkeit weniger als %1$s beträgt.</string>
     <string name="settings_recording_min_required_accuracy_title">GPS-Genauigkeit</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Datum (ISO 8601) + Ort</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Datum (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Datum (lokal)</string>
-    <string name="settings_recording_track_name_location_option">Standort</string>
     <string name="settings_recording_track_name_number_option">Nummer</string>
     <string name="settings_recording_track_name_title">Standard-Trackname</string>
     <string name="settings_reset">Zurücksetzen</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index bdc7ae78f..abc8a9645 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -248,10 +248,8 @@
     <string name="settings_recording_min_recording_interval_title">Διάστημα καταγραφής χρόνου</string>
     <string name="settings_recording_min_required_accuracy_summary">Η τοποθεσία αγνοείται εάν η ακρίβεια είναι μικρότερη από %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Ακρίβεια GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Ημερομηνία (ISO 8601) + Τοποθεσία</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Ημερομηνία (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Ημερομηνία (τοπική)</string>
-    <string name="settings_recording_track_name_location_option">Τοποθεσία</string>
     <string name="settings_recording_track_name_number_option">Αριθμός</string>
     <string name="settings_recording_track_name_title">Προεπιλεγμένο όνομα ίχνους</string>
     <string name="settings_reset">Επαναφορά</string>
diff --git a/src/main/res/values-en-rGB/strings.xml b/src/main/res/values-en-rGB/strings.xml
index cae0ec36b..7cf983f76 100644
--- a/src/main/res/values-en-rGB/strings.xml
+++ b/src/main/res/values-en-rGB/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Recording time interval</string>
     <string name="settings_recording_min_required_accuracy_summary">Location is ignored if its accuracy is less than %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">GPS accuracy</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Date (ISO 8601) + Location</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Date (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Date (local)</string>
-    <string name="settings_recording_track_name_location_option">Location</string>
     <string name="settings_recording_track_name_number_option">Number</string>
     <string name="settings_recording_track_name_title">Default track name</string>
     <string name="settings_reset">Reset</string>
diff --git a/src/main/res/values-en-rIE/strings.xml b/src/main/res/values-en-rIE/strings.xml
index cae0ec36b..7cf983f76 100644
--- a/src/main/res/values-en-rIE/strings.xml
+++ b/src/main/res/values-en-rIE/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Recording time interval</string>
     <string name="settings_recording_min_required_accuracy_summary">Location is ignored if its accuracy is less than %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">GPS accuracy</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Date (ISO 8601) + Location</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Date (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Date (local)</string>
-    <string name="settings_recording_track_name_location_option">Location</string>
     <string name="settings_recording_track_name_number_option">Number</string>
     <string name="settings_recording_track_name_title">Default track name</string>
     <string name="settings_reset">Reset</string>
diff --git a/src/main/res/values-en-rIN/strings.xml b/src/main/res/values-en-rIN/strings.xml
index cae0ec36b..7cf983f76 100644
--- a/src/main/res/values-en-rIN/strings.xml
+++ b/src/main/res/values-en-rIN/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Recording time interval</string>
     <string name="settings_recording_min_required_accuracy_summary">Location is ignored if its accuracy is less than %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">GPS accuracy</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Date (ISO 8601) + Location</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Date (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Date (local)</string>
-    <string name="settings_recording_track_name_location_option">Location</string>
     <string name="settings_recording_track_name_number_option">Number</string>
     <string name="settings_recording_track_name_title">Default track name</string>
     <string name="settings_reset">Reset</string>
diff --git a/src/main/res/values-en-rSG/strings.xml b/src/main/res/values-en-rSG/strings.xml
index cae0ec36b..7cf983f76 100644
--- a/src/main/res/values-en-rSG/strings.xml
+++ b/src/main/res/values-en-rSG/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Recording time interval</string>
     <string name="settings_recording_min_required_accuracy_summary">Location is ignored if its accuracy is less than %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">GPS accuracy</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Date (ISO 8601) + Location</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Date (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Date (local)</string>
-    <string name="settings_recording_track_name_location_option">Location</string>
     <string name="settings_recording_track_name_number_option">Number</string>
     <string name="settings_recording_track_name_title">Default track name</string>
     <string name="settings_reset">Reset</string>
diff --git a/src/main/res/values-en-rXA/strings.xml b/src/main/res/values-en-rXA/strings.xml
index a83ce4d09..46820f5b1 100644
--- a/src/main/res/values-en-rXA/strings.xml
+++ b/src/main/res/values-en-rXA/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">[Ŕéçöŕðîñĝ ţîmé îñţéŕvåļ one two three]</string>
     <string name="settings_recording_min_required_accuracy_summary">[Ļöçåţîöñ îš îĝñöŕéð îƒ îţš åççûŕåçý îš ļéšš ţĥåñ ᐅ%1$sᐊ one two three four five six seven eight nine ten eleven]</string>
     <string name="settings_recording_min_required_accuracy_title">[ĜÞŠ åççûŕåçý one two]</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">[Ðåţé (ÎŠÖ 8601) + Ļöçåţîöñ one two three four five six]</string>
     <string name="settings_recording_track_name_date_iso_8601_option">[Ðåţé (ÎŠÖ 8601) one two]</string>
     <string name="settings_recording_track_name_date_local_option">[Ðåţé (ļöçåļ) one two]</string>
-    <string name="settings_recording_track_name_location_option">[Ļöçåţîöñ one]</string>
     <string name="settings_recording_track_name_number_option">[Ñûmɓéŕ one]</string>
     <string name="settings_recording_track_name_title">[Ðéƒåûļţ ţŕåçķ ñåmé one two three]</string>
     <string name="settings_reset">[Ŕéšéţ one]</string>
diff --git a/src/main/res/values-en-rXC/strings.xml b/src/main/res/values-en-rXC/strings.xml
index 2d6ba40a3..78a1874a1 100644
--- a/src/main/res/values-en-rXC/strings.xml
+++ b/src/main/res/values-en-rXC/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‎‎Recording time interval‎‏‎‎‏‎</string>
     <string name="settings_recording_min_required_accuracy_summary">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎Location is ignored if its accuracy is less than ‎‏‎‎‏‏‎%1$s‎‏‎‎‏‏‏‎‎‏‎‎‏‎</string>
     <string name="settings_recording_min_required_accuracy_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎GPS accuracy‎‏‎‎‏‎</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎Date (ISO 8601) + Location‎‏‎‎‏‎</string>
     <string name="settings_recording_track_name_date_iso_8601_option">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎Date (ISO 8601)‎‏‎‎‏‎</string>
     <string name="settings_recording_track_name_date_local_option">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‎‎‏‎‎Date (local)‎‏‎‎‏‎</string>
-    <string name="settings_recording_track_name_location_option">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‎Location‎‏‎‎‏‎</string>
     <string name="settings_recording_track_name_number_option">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎Number‎‏‎‎‏‎</string>
     <string name="settings_recording_track_name_title">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎Default track name‎‏‎‎‏‎</string>
     <string name="settings_reset">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‏‎‎‎‎Reset‎‏‎‎‏‎</string>
diff --git a/src/main/res/values-en-rZA/strings.xml b/src/main/res/values-en-rZA/strings.xml
index cae0ec36b..7cf983f76 100644
--- a/src/main/res/values-en-rZA/strings.xml
+++ b/src/main/res/values-en-rZA/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Recording time interval</string>
     <string name="settings_recording_min_required_accuracy_summary">Location is ignored if its accuracy is less than %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">GPS accuracy</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Date (ISO 8601) + Location</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Date (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Date (local)</string>
-    <string name="settings_recording_track_name_location_option">Location</string>
     <string name="settings_recording_track_name_number_option">Number</string>
     <string name="settings_recording_track_name_title">Default track name</string>
     <string name="settings_reset">Reset</string>
diff --git a/src/main/res/values-es-rAR/strings.xml b/src/main/res/values-es-rAR/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rAR/strings.xml
+++ b/src/main/res/values-es-rAR/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rBO/strings.xml b/src/main/res/values-es-rBO/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rBO/strings.xml
+++ b/src/main/res/values-es-rBO/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rCL/strings.xml b/src/main/res/values-es-rCL/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rCL/strings.xml
+++ b/src/main/res/values-es-rCL/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rCO/strings.xml b/src/main/res/values-es-rCO/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rCO/strings.xml
+++ b/src/main/res/values-es-rCO/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rCR/strings.xml b/src/main/res/values-es-rCR/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rCR/strings.xml
+++ b/src/main/res/values-es-rCR/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rDO/strings.xml b/src/main/res/values-es-rDO/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rDO/strings.xml
+++ b/src/main/res/values-es-rDO/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rEC/strings.xml b/src/main/res/values-es-rEC/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rEC/strings.xml
+++ b/src/main/res/values-es-rEC/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rGT/strings.xml b/src/main/res/values-es-rGT/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rGT/strings.xml
+++ b/src/main/res/values-es-rGT/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rHN/strings.xml b/src/main/res/values-es-rHN/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rHN/strings.xml
+++ b/src/main/res/values-es-rHN/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rMX/strings.xml
+++ b/src/main/res/values-es-rMX/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rNI/strings.xml b/src/main/res/values-es-rNI/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rNI/strings.xml
+++ b/src/main/res/values-es-rNI/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rPA/strings.xml b/src/main/res/values-es-rPA/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rPA/strings.xml
+++ b/src/main/res/values-es-rPA/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rPE/strings.xml b/src/main/res/values-es-rPE/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rPE/strings.xml
+++ b/src/main/res/values-es-rPE/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rPR/strings.xml b/src/main/res/values-es-rPR/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rPR/strings.xml
+++ b/src/main/res/values-es-rPR/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rPY/strings.xml b/src/main/res/values-es-rPY/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rPY/strings.xml
+++ b/src/main/res/values-es-rPY/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rSV/strings.xml b/src/main/res/values-es-rSV/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rSV/strings.xml
+++ b/src/main/res/values-es-rSV/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rUS/strings.xml b/src/main/res/values-es-rUS/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rUS/strings.xml
+++ b/src/main/res/values-es-rUS/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rUY/strings.xml b/src/main/res/values-es-rUY/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rUY/strings.xml
+++ b/src/main/res/values-es-rUY/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es-rVE/strings.xml b/src/main/res/values-es-rVE/strings.xml
index 0ebb14f7b..bef831bee 100644
--- a/src/main/res/values-es-rVE/strings.xml
+++ b/src/main/res/values-es-rVE/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">La ubicación se ignora si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601) + ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de rec. predet.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 2dd6d4474..51396158f 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -248,10 +248,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalo de tiempo</string>
     <string name="settings_recording_min_required_accuracy_summary">Esta opción permite ignorar la ubicación si su precisión es inferior a %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Exactitud del GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Fecha (ISO 8601)/ubic.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Fecha (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Fecha (local)</string>
-    <string name="settings_recording_track_name_location_option">Ubicación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nombre de la ruta</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 00121c0ac..8aa37f62c 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Salvestamisaja intervall</string>
     <string name="settings_recording_min_required_accuracy_summary">Asukohta eiratakse, kui selle täpsus on väiksem kui %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">GPS-i täpsus</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Kp. (ISO 8601) + koht</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Kuupäev (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Kuupäev (kohalik)</string>
-    <string name="settings_recording_track_name_location_option">Asukoht</string>
     <string name="settings_recording_track_name_number_option">Number</string>
     <string name="settings_recording_track_name_title">Raja vaikenimi</string>
     <string name="settings_reset">Lähtesta</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index fb7e228c5..f3cb4301e 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Denbora-tarteak</string>
     <string name="settings_recording_min_required_accuracy_summary">Zehaztasuna %1$s baino gutxiagokoa bada kokapenari ez ikusi egiten zaio</string>
     <string name="settings_recording_min_required_accuracy_title">GPS zehaztasuna</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Data (ISO 8601) + kokapena</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Data (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Data (tokikoa)</string>
-    <string name="settings_recording_track_name_location_option">Kokapena</string>
     <string name="settings_recording_track_name_number_option">Zenbakia</string>
     <string name="settings_recording_track_name_title">Ibilbidearen izen lehenetsia</string>
     <string name="settings_reset">Berrezarri</string>
diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml
index 9bd3a87ee..7abdddd24 100644
--- a/src/main/res/values-fa/strings.xml
+++ b/src/main/res/values-fa/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">فاصله زمانی میان دو ضبط</string>
     <string name="settings_recording_min_required_accuracy_summary">چنانچه دقت یک موقعیت مکانی کمتر از %1$s باشد، نادیده گرفته شود</string>
     <string name="settings_recording_min_required_accuracy_title">دقت GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">تاریخ (ISO 8601) + مکان</string>
     <string name="settings_recording_track_name_date_iso_8601_option">تاریخ (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">تاریخ (محلی)</string>
-    <string name="settings_recording_track_name_location_option">موقعیت مکانی</string>
     <string name="settings_recording_track_name_number_option">شماره</string>
     <string name="settings_recording_track_name_title">نام پیش‌فرض گذر</string>
     <string name="settings_reset">بازنشانی</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 7bfc2352d..f3ab1af8f 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -250,10 +250,8 @@ jotta ne voidaan tuoda kohteeseen %1$s.</string>
     <string name="settings_recording_min_recording_interval_title">Aikavälin tallennus</string>
     <string name="settings_recording_min_required_accuracy_summary">Sijainti ohitetaan, jos sen tarkkuus on pienempi kuin %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">GPS-tarkkuus</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Pvm (ISO 8601) + sijainti</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Päiväys (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Päiväys (paikallinen)</string>
-    <string name="settings_recording_track_name_location_option">Sijainti</string>
     <string name="settings_recording_track_name_number_option">Numero</string>
     <string name="settings_recording_track_name_title">Reitin oletusnimi</string>
     <string name="settings_reset">Palauta</string>
diff --git a/src/main/res/values-fr-rCA/strings.xml b/src/main/res/values-fr-rCA/strings.xml
index 0bd51f78b..d6f7b7699 100644
--- a/src/main/res/values-fr-rCA/strings.xml
+++ b/src/main/res/values-fr-rCA/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalle fréq. enreg.</string>
     <string name="settings_recording_min_required_accuracy_summary">Ignorer la position si la précision est inférieure à %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Précision du GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Date (ISO 8601) + position</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Date (format ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Date (format local)</string>
-    <string name="settings_recording_track_name_location_option">Position</string>
     <string name="settings_recording_track_name_number_option">Numéro</string>
     <string name="settings_recording_track_name_title">Nom par défaut du parcours</string>
     <string name="settings_reset">Réinitialiser</string>
diff --git a/src/main/res/values-fr-rCH/strings.xml b/src/main/res/values-fr-rCH/strings.xml
index 04ad4ec9f..516af4441 100644
--- a/src/main/res/values-fr-rCH/strings.xml
+++ b/src/main/res/values-fr-rCH/strings.xml
@@ -249,10 +249,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalle temps enreg.</string>
     <string name="settings_recording_min_required_accuracy_summary">La position est ignorée si sa précision est inférieure à %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Précision du GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Date (ISO 8601) + position</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Date (format ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Date (format local)</string>
-    <string name="settings_recording_track_name_location_option">Position</string>
     <string name="settings_recording_track_name_number_option">Numéro</string>
     <string name="settings_recording_track_name_title">Nom parcours par défaut</string>
     <string name="settings_reset">Réinitialiser</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 41adf03ca..bc6617815 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -249,10 +249,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalle temps enreg.</string>
     <string name="settings_recording_min_required_accuracy_summary">La position est ignorée si sa précision est inférieure à %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Précision du GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Date (ISO 8601) + position</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Date (format ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Date (format local)</string>
-    <string name="settings_recording_track_name_location_option">Position</string>
     <string name="settings_recording_track_name_number_option">Numéro</string>
     <string name="settings_recording_track_name_title">Nom parcours par défaut</string>
     <string name="settings_reset">Réinitialiser</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 9742b4c5b..c5a3cfb70 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Tempo entre situacións</string>
     <string name="settings_recording_min_required_accuracy_summary">Descoñécese se a precisión é inferior a %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Precisión do GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Data (ISO 8601) + localización</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Data (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Data (local)</string>
-    <string name="settings_recording_track_name_location_option">Situación</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nome de ruta predeterm.</string>
     <string name="settings_reset">Restablecer</string>
diff --git a/src/main/res/values-hi/strings.xml b/src/main/res/values-hi/strings.xml
index 40c8d00f5..9814fff66 100644
--- a/src/main/res/values-hi/strings.xml
+++ b/src/main/res/values-hi/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">रिकॉर्डिंग समय अंतराल</string>
     <string name="settings_recording_min_required_accuracy_summary">यदि स्थान की सटीकता %1$s से कम होती है तो इसपर ध्यान नहीं दिया जाता</string>
     <string name="settings_recording_min_required_accuracy_title">GPS सटीकता</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">दिनांक (ISO 8601) + स्थान</string>
     <string name="settings_recording_track_name_date_iso_8601_option">तिथि (आईएसओ 8601)</string>
     <string name="settings_recording_track_name_date_local_option">तिथि (स्थानीय)</string>
-    <string name="settings_recording_track_name_location_option">स्थान</string>
     <string name="settings_recording_track_name_number_option">नंबर</string>
     <string name="settings_recording_track_name_title">डिफ़ॉल्ट ट्रैक नाम</string>
     <string name="settings_reset">रीसेट करें</string>
diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml
index 39cd57a1e..69de6adb4 100644
--- a/src/main/res/values-hr/strings.xml
+++ b/src/main/res/values-hr/strings.xml
@@ -248,10 +248,8 @@
     <string name="settings_recording_min_recording_interval_title">Vremenski interval</string>
     <string name="settings_recording_min_required_accuracy_summary">Lokacija se ignorira ako joj je preciznost manja od %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Točnost GPS-a</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Datum (ISO 8601) i lokacija</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Datum (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Datum (lokalno)</string>
-    <string name="settings_recording_track_name_location_option">Lokacija</string>
     <string name="settings_recording_track_name_number_option">Broj</string>
     <string name="settings_recording_track_name_title">Zadani naziv staze</string>
     <string name="settings_reset">Poništiti</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 1dc253504..64b1dcd77 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -248,10 +248,8 @@
     <string name="settings_recording_min_recording_interval_title">Rögz. időintervallum</string>
     <string name="settings_recording_min_required_accuracy_summary">Hely figyelmen kívül hagyása, ha a pontosság kisebb, mint %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">GPS pontossága</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Dátum (ISO 8601), hely</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Dátum (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Dátum (helyi)</string>
-    <string name="settings_recording_track_name_location_option">Helyszín</string>
     <string name="settings_recording_track_name_number_option">Szám</string>
     <string name="settings_recording_track_name_title">Pálya alapértelmezett neve</string>
     <string name="settings_reset">Visszaállítás</string>
diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml
index 7c9d17de5..09f1ccb47 100644
--- a/src/main/res/values-in/strings.xml
+++ b/src/main/res/values-in/strings.xml
@@ -249,10 +249,8 @@
     <string name="settings_recording_min_recording_interval_title">Interval waktu rekaman</string>
     <string name="settings_recording_min_required_accuracy_summary">Lokasi diabaikan jika akurasinya kurang dari %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Akurasi GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Tanggal (ISO 8601) + Lokasi</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Tanggal (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Tanggal (lokal)</string>
-    <string name="settings_recording_track_name_location_option">Lokasi</string>
     <string name="settings_recording_track_name_number_option">Angka</string>
     <string name="settings_recording_track_name_title">Nama trek default</string>
     <string name="settings_reset">Setel ulang</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index c601116e5..fc57f0f84 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">Interv. tempo tra registr.</string>
     <string name="settings_recording_min_required_accuracy_summary">La posizione viene ignorata se la sua precisione è inferiore a %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Precisione GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Data (ISO 8601) + Posizione</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Data (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Data (locale)</string>
-    <string name="settings_recording_track_name_location_option">Posizione</string>
     <string name="settings_recording_track_name_number_option">Numero</string>
     <string name="settings_recording_track_name_title">Nome percorso predefinito</string>
     <string name="settings_reset">Reimposta</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index b21c042e9..c7bd3cd9c 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -249,10 +249,8 @@
     <string name="settings_recording_min_recording_interval_title">זמן בין הקלטות</string>
     <string name="settings_recording_min_required_accuracy_summary">אין התייחסות למיקום אם הוא פחות מ-%1$s</string>
     <string name="settings_recording_min_required_accuracy_title">דיוק של GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">תאריך (ISO 8601) + מיקום</string>
     <string name="settings_recording_track_name_date_iso_8601_option">תאריך (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">תאריך (מקומי)</string>
-    <string name="settings_recording_track_name_location_option">מיקום</string>
     <string name="settings_recording_track_name_number_option">מספר</string>
     <string name="settings_recording_track_name_title">ברירת המחדל של שם מסלול</string>
     <string name="settings_reset">אפס</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 35f65e04e..c8bb22800 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">記録する時間の間隔</string>
     <string name="settings_recording_min_required_accuracy_summary">精度が%1$s以下の場合は現在地を無視します</string>
     <string name="settings_recording_min_required_accuracy_title">GPSの精度</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">日付（ISO 8601）と場所</string>
     <string name="settings_recording_track_name_date_iso_8601_option">日付（ISO 8601）</string>
     <string name="settings_recording_track_name_date_local_option">日付（ローカル）</string>
-    <string name="settings_recording_track_name_location_option">現在地</string>
     <string name="settings_recording_track_name_number_option">番号</string>
     <string name="settings_recording_track_name_title">デフォルトのトラック名</string>
     <string name="settings_reset">リセット</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 8e006924e..ff4b62fd0 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -249,10 +249,8 @@
     <string name="settings_recording_min_recording_interval_title">시간 간격 기록하기</string>
     <string name="settings_recording_min_required_accuracy_summary">정확도가 %1$s 미만인 경우 위치는 무시됩니다.</string>
     <string name="settings_recording_min_required_accuracy_title">GPS 정확도</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">날짜(ISO 8601) + 위치</string>
     <string name="settings_recording_track_name_date_iso_8601_option">날짜 (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">날짜 (현지)</string>
-    <string name="settings_recording_track_name_location_option">위치</string>
     <string name="settings_recording_track_name_number_option">숫자</string>
     <string name="settings_recording_track_name_title">기본 운동기록 이름</string>
     <string name="settings_reset">재설정</string>
diff --git a/src/main/res/values-ln/strings.xml b/src/main/res/values-ln/strings.xml
index 41adf03ca..bc6617815 100644
--- a/src/main/res/values-ln/strings.xml
+++ b/src/main/res/values-ln/strings.xml
@@ -249,10 +249,8 @@
     <string name="settings_recording_min_recording_interval_title">Intervalle temps enreg.</string>
     <string name="settings_recording_min_required_accuracy_summary">La position est ignorée si sa précision est inférieure à %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">Précision du GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Date (ISO 8601) + position</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Date (format ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Date (format local)</string>
-    <string name="settings_recording_track_name_location_option">Position</string>
     <string name="settings_recording_track_name_number_option">Numéro</string>
     <string name="settings_recording_track_name_title">Nom parcours par défaut</string>
     <string name="settings_reset">Réinitialiser</string>
diff --git a/src/main/res/values-lt/strings.xml b/src/main/res/values-lt/strings.xml
index 241d15a9a..811e26333 100644
--- a/src/main/res/values-lt/strings.xml
+++ b/src/main/res/values-lt/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">Įrašymo laiko interv.</string>
     <string name="settings_recording_min_required_accuracy_summary">Vieta nepaisoma, jei jos tikslumas mažesnis nei %1$s.</string>
     <string name="settings_recording_min_required_accuracy_title">GPS tikslumas</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Data (ISO 8601) + vieta</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Data (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Data (vietos)</string>
-    <string name="settings_recording_track_name_location_option">Vieta</string>
     <string name="settings_recording_track_name_number_option">Skaičius</string>
     <string name="settings_recording_track_name_title">Numatyt. maršruto pav.</string>
     <string name="settings_reset">Nustatyti iš naujo</string>
diff --git a/src/main/res/values-lv/strings.xml b/src/main/res/values-lv/strings.xml
index 5528d9ec3..dc9eb9cce 100644
--- a/src/main/res/values-lv/strings.xml
+++ b/src/main/res/values-lv/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Laika intervāla ierakstīšana</string>
     <string name="settings_recording_min_required_accuracy_summary">Atrašanās vieta tiek ignorēta, ja tās precizitāte ir zemāka par %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">GPS precizitāte</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Dat. (ISO 8601)/vieta</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Datums (ISO 8601 form.)</string>
     <string name="settings_recording_track_name_date_local_option">Datums (vietējā form.)</string>
-    <string name="settings_recording_track_name_location_option">Atrašanās vieta</string>
     <string name="settings_recording_track_name_number_option">Numurs</string>
     <string name="settings_recording_track_name_title">Noklusējuma maršruta nosaukums</string>
     <string name="settings_reset">Atiestatīt</string>
diff --git a/src/main/res/values-mo/strings.xml b/src/main/res/values-mo/strings.xml
index 2ad0f2fde..9b5f3837d 100644
--- a/src/main/res/values-mo/strings.xml
+++ b/src/main/res/values-mo/strings.xml
@@ -248,10 +248,8 @@
     <string name="settings_recording_min_recording_interval_title">Înreg. interval de timp</string>
     <string name="settings_recording_min_required_accuracy_summary">Locația este ignorată în cazul în care exactitatea este mai mică decât %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Precizia sistemului GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Data (ISO 8601) + Locația</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Data (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Data (local)</string>
-    <string name="settings_recording_track_name_location_option">Locație</string>
     <string name="settings_recording_track_name_number_option">Număr</string>
     <string name="settings_recording_track_name_title">Nume prestabilit traseu</string>
     <string name="settings_reset">Resetaţi</string>
diff --git a/src/main/res/values-ms/strings.xml b/src/main/res/values-ms/strings.xml
index c49f7475a..8aa5401ae 100644
--- a/src/main/res/values-ms/strings.xml
+++ b/src/main/res/values-ms/strings.xml
@@ -248,10 +248,8 @@
     <string name="settings_recording_min_recording_interval_title">Selang masa rakaman</string>
     <string name="settings_recording_min_required_accuracy_summary">Lokasi diabaikan jika ketepatannya kurang daripada %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Ketepatan GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Tarikh (ISO 8601) + Lokasi</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Tarikh (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Tarikh (setempat)</string>
-    <string name="settings_recording_track_name_location_option">Lokasi</string>
     <string name="settings_recording_track_name_number_option">Nombor</string>
     <string name="settings_recording_track_name_title">Nama lalai laluan</string>
     <string name="settings_reset">Tetapkan semula</string>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index 583ef0d37..c0532505e 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">Spiller inn tidsintervall</string>
     <string name="settings_recording_min_required_accuracy_summary">Posisjonen ignoreres hvis nøyaktigheten er under %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">GPS-nøyaktighet</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Dato (ISO 8601) + Posisjon</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Dato (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Dato (lokal)</string>
-    <string name="settings_recording_track_name_location_option">Posisjon</string>
     <string name="settings_recording_track_name_number_option">Tall</string>
     <string name="settings_recording_track_name_title">Standardnavn på sti</string>
     <string name="settings_reset">Tilbakestill</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index cd789a59b..080c4e0ca 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Tijd tussen opnamen</string>
     <string name="settings_recording_min_required_accuracy_summary">Locatie wordt genegeerd als de nauwkeurigheid minder is dan %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">GPS-nauwkeurigheid</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Datum (ISO 8601) + locatie</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Datum (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Datum (lokaal)</string>
-    <string name="settings_recording_track_name_location_option">Locatie</string>
     <string name="settings_recording_track_name_number_option">Nummer</string>
     <string name="settings_recording_track_name_title">Standaardroutenaam</string>
     <string name="settings_reset">Opnieuw instellen</string>
diff --git a/src/main/res/values-no/strings.xml b/src/main/res/values-no/strings.xml
index 583ef0d37..c0532505e 100644
--- a/src/main/res/values-no/strings.xml
+++ b/src/main/res/values-no/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">Spiller inn tidsintervall</string>
     <string name="settings_recording_min_required_accuracy_summary">Posisjonen ignoreres hvis nøyaktigheten er under %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">GPS-nøyaktighet</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Dato (ISO 8601) + Posisjon</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Dato (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Dato (lokal)</string>
-    <string name="settings_recording_track_name_location_option">Posisjon</string>
     <string name="settings_recording_track_name_number_option">Tall</string>
     <string name="settings_recording_track_name_title">Standardnavn på sti</string>
     <string name="settings_reset">Tilbakestill</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 204071cbb..fe1ddae8f 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">Rejestrowanie interwału</string>
     <string name="settings_recording_min_required_accuracy_summary">Lokalizacja jest ignorowana przy dokładności poniżej %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Dokładność GPS-u</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Data (ISO 8601) + lokalizacja</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Data (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Data (lokalnie)</string>
-    <string name="settings_recording_track_name_location_option">Lokalizacja</string>
     <string name="settings_recording_track_name_number_option">Numer</string>
     <string name="settings_recording_track_name_title">Domyślna nazwa trasy</string>
     <string name="settings_reset">Zresetuj</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 5b9d16006..9b71f9cfa 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">Interv. tempo de grav.</string>
     <string name="settings_recording_min_required_accuracy_summary">O local será ignorado se a precisão for menor que %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Precisão do GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Data (ISO 8601) + local</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Data (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Data (local)</string>
-    <string name="settings_recording_track_name_location_option">Local</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nome padrão para trilhas</string>
     <string name="settings_reset">Redefinir</string>
diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml
index 1d7205ece..b92fc249d 100644
--- a/src/main/res/values-pt-rPT/strings.xml
+++ b/src/main/res/values-pt-rPT/strings.xml
@@ -248,10 +248,8 @@
     <string name="settings_recording_min_recording_interval_title">Tempo entre gravações</string>
     <string name="settings_recording_min_required_accuracy_summary">A localização é ignorada se a precisão for inferior a %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Precisão do GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Data (ISO 8601) + Localização</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Data (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Data (local)</string>
-    <string name="settings_recording_track_name_location_option">Localização</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nome de percurso predefinido</string>
     <string name="settings_reset">Repor</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 5b9d16006..9b71f9cfa 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">Interv. tempo de grav.</string>
     <string name="settings_recording_min_required_accuracy_summary">O local será ignorado se a precisão for menor que %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Precisão do GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Data (ISO 8601) + local</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Data (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Data (local)</string>
-    <string name="settings_recording_track_name_location_option">Local</string>
     <string name="settings_recording_track_name_number_option">Número</string>
     <string name="settings_recording_track_name_title">Nome padrão para trilhas</string>
     <string name="settings_reset">Redefinir</string>
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index 2ad0f2fde..9b5f3837d 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -248,10 +248,8 @@
     <string name="settings_recording_min_recording_interval_title">Înreg. interval de timp</string>
     <string name="settings_recording_min_required_accuracy_summary">Locația este ignorată în cazul în care exactitatea este mai mică decât %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Precizia sistemului GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Data (ISO 8601) + Locația</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Data (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Data (local)</string>
-    <string name="settings_recording_track_name_location_option">Locație</string>
     <string name="settings_recording_track_name_number_option">Număr</string>
     <string name="settings_recording_track_name_title">Nume prestabilit traseu</string>
     <string name="settings_reset">Resetaţi</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 6fcc1d662..847c3960f 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Интервал времени</string>
     <string name="settings_recording_min_required_accuracy_summary">Местоположение не записывается, если точность GPS составляет менее %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Точность GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Дата (ISO 8601) и место</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Дата (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Дата (по умолчанию)</string>
-    <string name="settings_recording_track_name_location_option">Местоположение</string>
     <string name="settings_recording_track_name_number_option">Номер</string>
     <string name="settings_recording_track_name_title">Название по умолчанию</string>
     <string name="settings_reset">Сброс настроек</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 63f6e9d01..b529514a4 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Časový interval záznamu</string>
     <string name="settings_recording_min_required_accuracy_summary">Poloha je ignorovaná, ak je jej presnosť nižšia než %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Presnosť systému GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Dátum (ISO 8601) + miesto</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Dátum (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Dátum (miestny)</string>
-    <string name="settings_recording_track_name_location_option">Poloha</string>
     <string name="settings_recording_track_name_number_option">Číslovanie</string>
     <string name="settings_recording_track_name_title">Predvolený názov trasy</string>
     <string name="settings_reset">Obnoviť</string>
diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml
index 2f2391d55..f12a5eef5 100644
--- a/src/main/res/values-sl/strings.xml
+++ b/src/main/res/values-sl/strings.xml
@@ -249,10 +249,8 @@
     <string name="settings_recording_min_recording_interval_title">Časovni interval snemanja</string>
     <string name="settings_recording_min_required_accuracy_summary">Lokacija ne bo upoštevana, če bo določena z manjšo natančnostjo kot %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Natančnost GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Datum (ISO 8601) + lokacija</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Datum (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Datum (lokalni)</string>
-    <string name="settings_recording_track_name_location_option">Lokacija</string>
     <string name="settings_recording_track_name_number_option">Številka</string>
     <string name="settings_recording_track_name_title">Privzeto ime poti</string>
     <string name="settings_reset">Ponastavi</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 7b0e4c70a..e6a2c5b50 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Интервал времена</string>
     <string name="settings_recording_min_required_accuracy_summary">Локација се игнорише ако је прецизност мања од %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">GPS прецизност</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Датум (ISO 8601) + лок.</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Датум (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Датум (локални)</string>
-    <string name="settings_recording_track_name_location_option">Локација</string>
     <string name="settings_recording_track_name_number_option">Број</string>
     <string name="settings_recording_track_name_title">Подразумевано име</string>
     <string name="settings_reset">Ресетуј</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index b33aed730..737be448b 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Inspelningens tidsintervall</string>
     <string name="settings_recording_min_required_accuracy_summary">Platsen ignoreras om dess noggrannhet är mindre än %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Exakthet för GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Datum (ISO 8601) + plats</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Datum (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Datum (lokalt)</string>
-    <string name="settings_recording_track_name_location_option">Plats</string>
     <string name="settings_recording_track_name_number_option">Siffra</string>
     <string name="settings_recording_track_name_title">Standardnamn</string>
     <string name="settings_reset">Återställ</string>
diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml
index f57afa7e7..0ba43407b 100644
--- a/src/main/res/values-th/strings.xml
+++ b/src/main/res/values-th/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">ช่วงเวลาการบันทึก</string>
     <string name="settings_recording_min_required_accuracy_summary">ตำแหน่งจะถูกละเว้นถ้าความแม่นยำน้อยกว่า %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">ความแม่นยำของ GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">วันที่ (ISO 8601) + ตำแหน่ง</string>
     <string name="settings_recording_track_name_date_iso_8601_option">วันที่ (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">วันที่ (ท้องถิ่น)</string>
-    <string name="settings_recording_track_name_location_option">ตำแหน่ง</string>
     <string name="settings_recording_track_name_number_option">หมายเลข</string>
     <string name="settings_recording_track_name_title">ชื่อเส้นการเดินทางเริ่มต้น</string>
     <string name="settings_reset">รีเซ็ต</string>
diff --git a/src/main/res/values-tl/strings.xml b/src/main/res/values-tl/strings.xml
index febfcaf55..4cdeca698 100644
--- a/src/main/res/values-tl/strings.xml
+++ b/src/main/res/values-tl/strings.xml
@@ -247,10 +247,8 @@
     <string name="settings_recording_min_recording_interval_title">Itinatala ang agwat ng oras</string>
     <string name="settings_recording_min_required_accuracy_summary">Binabalewala ang lokasyon kung mas mababa sa %1$s ang katumpakan nito</string>
     <string name="settings_recording_min_required_accuracy_title">Katumpakan ng GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Petsa (ISO 8601) + Lokasyon</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Petsa (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Petsa (lokal)</string>
-    <string name="settings_recording_track_name_location_option">Lokasyon</string>
     <string name="settings_recording_track_name_number_option">Numero</string>
     <string name="settings_recording_track_name_title">Default na pangalan ng track</string>
     <string name="settings_reset">I-reset</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 5022146c5..bd8e86e59 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -248,10 +248,8 @@
     <string name="settings_recording_min_recording_interval_title">Kayıt zaman aralığı</string>
     <string name="settings_recording_min_required_accuracy_summary">Doğruluğu şundan düşükse konum yoksayılır: %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">GPS doğruluğu</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Tarih(ISO 8601)+Konum</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Tarih (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Tarih (yerel)</string>
-    <string name="settings_recording_track_name_location_option">Konum</string>
     <string name="settings_recording_track_name_number_option">Sayı</string>
     <string name="settings_recording_track_name_title">Varsayılan parkur adı</string>
     <string name="settings_reset">Sıfırla</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 769518b5d..ba425c2fe 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -248,10 +248,8 @@
     <string name="settings_recording_min_recording_interval_title">Тривалість відрізка</string>
     <string name="settings_recording_min_required_accuracy_summary">Якщо точність менша за %1$s, місцезнаходження не враховується</string>
     <string name="settings_recording_min_required_accuracy_title">Точність GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Дата (ISO 8601) і місце</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Дата (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Дата (локаль. формат)</string>
-    <string name="settings_recording_track_name_location_option">Місцезнаходження</string>
     <string name="settings_recording_track_name_number_option">Номер</string>
     <string name="settings_recording_track_name_title">Назва шляху за умовчанням</string>
     <string name="settings_reset">Скинути</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 38e5694c0..dd7299800 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -248,10 +248,8 @@
     <string name="settings_recording_min_recording_interval_title">Khoảng thời gian ghi</string>
     <string name="settings_recording_min_required_accuracy_summary">Vị trí được bỏ qua nếu độ chính xác của vị trí nhỏ hơn %1$s</string>
     <string name="settings_recording_min_required_accuracy_title">Độ chính xác của GPS</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">Ngày (ISO 8601) + Vị trí</string>
     <string name="settings_recording_track_name_date_iso_8601_option">Ngày (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">Ngày (địa phương)</string>
-    <string name="settings_recording_track_name_location_option">Vị trí</string>
     <string name="settings_recording_track_name_number_option">Số</string>
     <string name="settings_recording_track_name_title">Tên mặc định của tuyến đường</string>
     <string name="settings_reset">Đặt lại</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 3d3c480d5..249347922 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">记录时间间隔</string>
     <string name="settings_recording_min_required_accuracy_summary">如果位置的精度小于%1$s，则忽略该位置</string>
     <string name="settings_recording_min_required_accuracy_title">GPS 精度</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">日期(ISO 8601) +位置</string>
     <string name="settings_recording_track_name_date_iso_8601_option">日期 (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">日期（本地）</string>
-    <string name="settings_recording_track_name_location_option">位置</string>
     <string name="settings_recording_track_name_number_option">编号</string>
     <string name="settings_recording_track_name_title">默认路线名称</string>
     <string name="settings_reset">重置</string>
diff --git a/src/main/res/values-zh-rHK/strings.xml b/src/main/res/values-zh-rHK/strings.xml
index d604bb5b3..226965180 100644
--- a/src/main/res/values-zh-rHK/strings.xml
+++ b/src/main/res/values-zh-rHK/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">記錄位置的時間間隔</string>
     <string name="settings_recording_min_required_accuracy_summary">系統會忽略準確度小於 %1$s的位置</string>
     <string name="settings_recording_min_required_accuracy_title">GPS 精度</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">日期 (ISO 8601) + 位置</string>
     <string name="settings_recording_track_name_date_iso_8601_option">日期 (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">日期 (當地)</string>
-    <string name="settings_recording_track_name_location_option">位置</string>
     <string name="settings_recording_track_name_number_option">數字</string>
     <string name="settings_recording_track_name_title">預設足跡名稱</string>
     <string name="settings_reset">重設</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index d604bb5b3..226965180 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">記錄位置的時間間隔</string>
     <string name="settings_recording_min_required_accuracy_summary">系統會忽略準確度小於 %1$s的位置</string>
     <string name="settings_recording_min_required_accuracy_title">GPS 精度</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">日期 (ISO 8601) + 位置</string>
     <string name="settings_recording_track_name_date_iso_8601_option">日期 (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">日期 (當地)</string>
-    <string name="settings_recording_track_name_location_option">位置</string>
     <string name="settings_recording_track_name_number_option">數字</string>
     <string name="settings_recording_track_name_title">預設足跡名稱</string>
     <string name="settings_reset">重設</string>
diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 3d3c480d5..249347922 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -250,10 +250,8 @@
     <string name="settings_recording_min_recording_interval_title">记录时间间隔</string>
     <string name="settings_recording_min_required_accuracy_summary">如果位置的精度小于%1$s，则忽略该位置</string>
     <string name="settings_recording_min_required_accuracy_title">GPS 精度</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option">日期(ISO 8601) +位置</string>
     <string name="settings_recording_track_name_date_iso_8601_option">日期 (ISO 8601)</string>
     <string name="settings_recording_track_name_date_local_option">日期（本地）</string>
-    <string name="settings_recording_track_name_location_option">位置</string>
     <string name="settings_recording_track_name_number_option">编号</string>
     <string name="settings_recording_track_name_title">默认路线名称</string>
     <string name="settings_reset">重置</string>
diff --git a/src/main/res/values/arrays_do_not_translate.xml b/src/main/res/values/arrays_do_not_translate.xml
index 6e0c76033..02046fc92 100644
--- a/src/main/res/values/arrays_do_not_translate.xml
+++ b/src/main/res/values/arrays_do_not_translate.xml
@@ -187,17 +187,13 @@ limitations under the License.
         <item>@string/stats_units_imperial</item>
     </string-array>
     <string-array name="track_name_options">
-        <item>@string/settings_recording_track_name_location_option</item>
         <item>@string/settings_recording_track_name_date_local_option</item>
         <item>@string/settings_recording_track_name_date_iso_8601_option</item>
-        <item>@string/settings_recording_track_name_date_iso_8601_location_option</item>
         <item>@string/settings_recording_track_name_number_option</item>
     </string-array>
     <string-array name="track_name_values">
-        <item>@string/settings_recording_track_name_location_value</item>
         <item>@string/settings_recording_track_name_date_local_value</item>
         <item>@string/settings_recording_track_name_date_iso_8601_value</item>
-        <item>@string/settings_recording_track_name_date_iso_8601_location_value</item>
         <item>@string/settings_recording_track_name_number_value</item>
     </string-array>
     <string-array name="waypoint_types">
diff --git a/src/main/res/values/do_not_translate.xml b/src/main/res/values/do_not_translate.xml
index 83da4ef05..ceeffb645 100644
--- a/src/main/res/values/do_not_translate.xml
+++ b/src/main/res/values/do_not_translate.xml
@@ -25,9 +25,7 @@ limitations under the License.
     <string name="sensor_unit_rounds_per_minute" translatable="false">RPM</string>
     <string name="sensor_unit_beats_per_minute" translatable="false">BPM</string>
     <string name="settings_recording_track_name_date_iso_8601_value" translatable="false">DATE_ISO_8601</string>
-    <string name="settings_recording_track_name_date_iso_8601_location_value" translatable="false">DATE_ISO_8601_LOCATION</string>
     <string name="settings_recording_track_name_date_local_value" translatable="false">DATE_LOCAL</string>
-    <string name="settings_recording_track_name_location_value" translatable="false">LOCATION</string>
     <string name="settings_recording_track_name_number_value" translatable="false">NUMBER</string>
     <string name="stats_rate_pace" translatable="false">PACE</string>
     <string name="stats_rate_speed" translatable="false">SPEED</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 013492fab..55cbd5128 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1148,14 +1148,7 @@ limitations under the License.
       Character limit: ~23 (1 line)">
     GPS accuracy
   </string>
-    <string name="settings_recording_track_name_date_iso_8601_location_option" translation_description="In the 'Recording' settings, the option in the 'Default track name'
-      setting to use the track starting time in the ISO-8601 format and the track starting location
-      as the default track name.
-
-      Character limit: ~20 (1 line)">
-    Date (ISO 8601) + Location
-  </string>
-    <string name="settings_recording_track_name_date_iso_8601_option" translation_description="In the 'Recording' settings, the option in the 'Default track name'
+  <string name="settings_recording_track_name_date_iso_8601_option" translation_description="In the 'Recording' settings, the option in the 'Default track name'
       setting to use the track starting time in the ISO-8601 format as the default track name.
 
       Character limit: ~20 (1 line)">
@@ -1167,13 +1160,7 @@ limitations under the License.
       Character limit: ~20 (1 line)">
     Date (local)
   </string>
-    <string name="settings_recording_track_name_location_option" translation_description="In the 'Recording' settings, the option in the 'Default track name'
-      setting to use the track starting location as the default track name.
-
-      Character limit: ~20 (1 line)">
-    Location
-  </string>
-    <string name="settings_recording_track_name_number_option" translation_description="In the 'Recording' settings, the option in the 'Default track name'
+  <string name="settings_recording_track_name_number_option" translation_description="In the 'Recording' settings, the option in the 'Default track name'
       setting to use number as the default track name.
 
       Character limit: ~20 (1 line)">
diff --git a/src/main/res/xml/settings_recording.xml b/src/main/res/xml/settings_recording.xml
index 03a3a9f43..ee5524c28 100644
--- a/src/main/res/xml/settings_recording.xml
+++ b/src/main/res/xml/settings_recording.xml
@@ -24,7 +24,7 @@ limitations under the License.
         android:key="@string/split_frequency_key"
         android:title="@string/menu_split_frequency" />
     <ListPreference
-        android:defaultValue="@string/settings_recording_track_name_date_iso_8601_location_value"
+        android:defaultValue="@string/settings_recording_track_name_date_iso_8601_value"
         android:key="@string/track_name_key"
         android:title="@string/settings_recording_track_name_title" />
     <de.dennisguse.opentracks.settings.ActivityTypePreference