Release v3.7.2

README: added link Transifex.
Cleanup.
2020-05-09 20:21:16 +02:00 · 2020-05-09 20:21:16 +02:00 · 2020-05-09 20:21:16 +02:00 · 2020-05-09 15:44:10 +02:00 · 2020-05-07 18:23:40 +02:00 · 2020-05-01 10:29:27 +02:00
68 changed files with 572 additions and 451 deletions
@@ -5,8 +5,9 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
 <table>
    <tr>
        <th>Free</th>
-        <th>Paid</th>
+        <th>Paid (same as free)</th>
        <th>Donations</th>
+        <th>Translations</th>
    </tr>
    <tr>
        <td>
@@ -24,28 +25,34 @@ _OpenTracks_ is a sport tracking application that completely respects your priva
                <img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="45" align="middle">
            </a>
        </td>
+        <td>
+            <a href="https://www.transifex.com/opentracks/opentracks/">
+                Transifex
+            </a>
+        </td>
    </tr>
 </table>

 ## Features:
 * __Tracking:__ track your sport and outdoor activities 
 * __Photos and Markers:__ mark interesting locations while tracking (also with photos)
-* __Heart rate:__ supports Bluetooth LE sensors
-* __Cycling (speed and cadence)__: supports Bluetooth LE sensors
+* __Bluetooth LE sensors:__ 
+  * heart rate
+  * cycling: speed and cadence
 * __Export data:__ export tracks either as KMZ (incl. photos), KML or GPX
 * __No Internet access:__ Internet is not used
 * __Voice announcements__
 * __No advertising__
 * __Privacy:__
    * _does not contain any in-app analytics_
-    * _does not have Google Play Services_ 
+    * _does not use Google Play Services_ 
    * _has no cloud integration_
    
 __Only required permissions:__
 * _ACCESS_FINE_LOCATION_: required to use the GPS.

 _Please note:_
-_Tracks_ does not contain a _map_ (as this would required Internet access).
+_OpenTracks_ does not contain a _map_ (as this would required Internet access).
 To show your tracks on a map, a 3rd party application (e.g., [OsmAnd](https://play.google.com/store/apps/details?id=net.osmand) or [MAPS.ME](https://play.google.com/store/apps/details?id=com.mapswithme.maps.pro)) needs to be installed.  

 ## Custom Dashboards
@@ -54,10 +61,12 @@ The reference implementation is [OSMDashboard](https://github.com/OpenTracksApp/

 ## Screenshots
 <div>
-    <img width="20%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_1.png">
-    <img width="20%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_2.png">
-    <img width="20%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_3.png">
-    <img width="20%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_4.png">
+    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_1.png">
+    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_2.png">
+    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_3.png">
+    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_4.png">
+    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_5.png">
+    <img width="15%" src="fastlane/metadata/android/en-US/phoneScreenshots/screenshot_6.png">
 </div>

 ## Project history
@@ -59,9 +59,9 @@ android {
                applicationName: "@string/app_name"
        ]

-        versionCode 3372
+        versionCode 3381
        //versionCode getVersionCode() //Useful for debugging.
-        versionName "v3.7.1"
+        versionName "v3.7.2"

        buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""

@@ -0,0 +1,6 @@
+v3.7.2: OpenTracks
+
+Bugfix:
+- Re-added start GPS button
+- Track name is not overwritten at the end of a recording
+- Markers: removing a photo also deletes the file
@@ -3,7 +3,8 @@ OpenTracks is a sport tracking application that completely respects your privacy
 Features:
 * Sport tracking: track your sport and outdoor activities
 * Photos and markers: mark interesting locations while tracking
-* Heart rate: supports Bluetooth LE sensors
-* Cycling (speed and cadence): supports Bluetooth LE sensors
+* Supports Bluetooth LE sensors:
+  * heart rate
+  * cycling: speed and cadence
 * Export data: export tracks either as KML or GPX
 * No Internet access: Internet is not used
@@ -62,6 +62,7 @@ public class CustomContentProviderUtilsTest {
    private static final String MOCK_DESC = "Mock Next Waypoint Desc!";
    private static final String TEST_DESC = "Test Desc!";
    private static final String TEST_DESC_NEW = "Test Desc new!";
+    private static final String TEST_NAME_NEW = "Test Name new!";

    private final Context context = ApplicationProvider.getApplicationContext();
    private ContentProviderUtils contentProviderUtils;
@@ -625,7 +626,7 @@ public class CustomContentProviderUtilsTest {
    }

    /**
-     * Tests the method {@link ContentProviderUtils#updateWaypoint(Waypoint)}.
+     * Tests the method {@link ContentProviderUtils#updateWaypoint(Context, Waypoint)}.
     */
    @Test
    public void testUpdateWaypoint() {
@@ -641,11 +642,120 @@ public class CustomContentProviderUtilsTest {
        // Update
        waypoint = contentProviderUtils.getWaypoint(waypointId);
        waypoint.setDescription(TEST_DESC_NEW);
-        contentProviderUtils.updateWaypoint(waypoint);
+        contentProviderUtils.updateWaypoint(context, waypoint);

        Assert.assertEquals(TEST_DESC_NEW, contentProviderUtils.getWaypoint(waypointId).getDescription());
    }

+    /**
+     * Tests the method {@link ContentProviderUtils#updateWaypoint(Context, Waypoint)}.
+     */
+    @Test
+    public void testUpdateWaypoint_withPhoto() throws IOException {
+        // tests after update waypoint with photo the photo remains in the storage.
+
+        long trackId = System.currentTimeMillis();
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
+
+        // Insert at first.
+        TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
+        Waypoint waypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
+        waypoint.setDescription(TEST_DESC);
+        waypoint.setTrackId(trackId);
+        long waypointId = ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint));
+
+        File dir = new File(FileUtils.getPhotoDir(context), "" + trackId);
+        Assert.assertTrue(dir.exists());
+        Assert.assertTrue(dir.isDirectory());
+        Assert.assertEquals(1, dir.list().length);
+
+        // Update
+        waypoint = contentProviderUtils.getWaypoint(waypointId);
+        waypoint.setName(TEST_NAME_NEW);
+        waypoint.setDescription(TEST_DESC_NEW);
+        contentProviderUtils.updateWaypoint(context, waypoint);
+
+        Assert.assertEquals(TEST_NAME_NEW, contentProviderUtils.getWaypoint(waypointId).getName());
+        Assert.assertEquals(TEST_DESC_NEW, contentProviderUtils.getWaypoint(waypointId).getDescription());
+        Assert.assertTrue(waypoint.hasPhoto());
+        Assert.assertTrue(dir.exists());
+        Assert.assertTrue(dir.isDirectory());
+        Assert.assertEquals(1, dir.list().length);
+    }
+
+    /**
+     * Tests the method {@link ContentProviderUtils#updateWaypoint(Context, Waypoint)}.
+     */
+    @Test
+    public void testUpdateWaypoint_delPhotoAndDir() throws IOException {
+        // tests after update waypoint if user deletes the photo then file photo is deleted from the storage. Also empty directory is deleted.
+
+        long trackId = System.currentTimeMillis();
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
+
+        // Insert at first.
+        TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
+        Waypoint waypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
+        waypoint.setDescription(TEST_DESC);
+        waypoint.setTrackId(trackId);
+        long waypointId = ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint));
+
+        File dir = new File(FileUtils.getPhotoDir(context), "" + trackId);
+        Assert.assertTrue(dir.exists());
+        Assert.assertTrue(dir.isDirectory());
+        Assert.assertEquals(1, dir.list().length);
+
+        // Update
+        waypoint = contentProviderUtils.getWaypoint(waypointId);
+        waypoint.setName(TEST_NAME_NEW);
+        waypoint.setDescription(TEST_DESC_NEW);
+        waypoint.setPhotoUrl(null);
+        contentProviderUtils.updateWaypoint(context, waypoint);
+
+        Assert.assertEquals(TEST_NAME_NEW, contentProviderUtils.getWaypoint(waypointId).getName());
+        Assert.assertEquals(TEST_DESC_NEW, contentProviderUtils.getWaypoint(waypointId).getDescription());
+        Assert.assertFalse(waypoint.hasPhoto());
+        Assert.assertFalse(dir.exists());
+    }
+
+    /**
+     * Tests the method {@link ContentProviderUtils#updateWaypoint(Context, Waypoint)}.
+     */
+    @Test
+    public void testUpdateWaypoint_delPhotoNotDir() throws IOException {
+        // tests after update waypoint if user deletes the photo then file photo is deleted from the storage. Directory remains if there are more photos from other waypoints.
+
+        long trackId = System.currentTimeMillis();
+        TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10);
+
+        // Insert two waypoints with photos.
+        TrackPoint trackPoint = contentProviderUtils.getLastValidTrackPoint(trackId);
+        Waypoint waypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
+        waypoint.setDescription(TEST_DESC);
+        waypoint.setTrackId(trackId);
+        Waypoint otherWaypoint = TestDataUtil.createWaypointWithPhoto(context, trackId, trackPoint.getLocation());
+        otherWaypoint.setDescription(TEST_DESC);
+        otherWaypoint.setTrackId(trackId);
+        long waypointId = ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint));
+        long otherWaypointId = ContentUris.parseId(contentProviderUtils.insertWaypoint(otherWaypoint));
+
+        File dir = new File(FileUtils.getPhotoDir(context), "" + trackId);
+        Assert.assertTrue(dir.exists());
+        Assert.assertTrue(dir.isDirectory());
+        Assert.assertEquals(2, dir.list().length);
+
+        // Update one waypoint deleting photo.
+        waypoint = contentProviderUtils.getWaypoint(waypointId);
+        waypoint.setPhotoUrl(null);
+        contentProviderUtils.updateWaypoint(context, waypoint);
+
+        Assert.assertEquals(TEST_DESC, contentProviderUtils.getWaypoint(waypointId).getDescription());
+        Assert.assertFalse(waypoint.hasPhoto());
+        Assert.assertTrue(dir.exists());
+        Assert.assertTrue(dir.isDirectory());
+        Assert.assertEquals(1, dir.list().length);
+    }
+
    /**
     * Tests the method {@link ContentProviderUtils#bulkInsertTrackPoint(TrackPoint[], long)}.
     */
@@ -315,6 +315,6 @@ public class MarkerEditActivity extends AbstractActivity {
        waypoint.setDescription(waypointDescription.getText().toString());
        waypoint.setPhotoUrl(photoUri != null ? photoUri.toString() : null);

-        new ContentProviderUtils(this).updateWaypoint(waypoint);
+        new ContentProviderUtils(this).updateWaypoint(this, waypoint);
    }
 }
@@ -62,6 +62,7 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA

    public static final String EXTRA_TRACK_ID = "track_id";
    public static final String EXTRA_MARKER_ID = "marker_id";
+    public static final String EXTRA_RECORDING_REQUEST = "request_recording";

    private static final String TAG = TrackDetailActivity.class.getSimpleName();

@@ -78,6 +79,8 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
    // From intent
    private long trackId;

+    private boolean isRecordingRequest = false;
+
    // Preferences
    private long recordingTrackId = PreferencesUtils.RECORDING_TRACK_ID_DEFAULT;
    private boolean recordingTrackPaused;
@@ -99,6 +102,9 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
                    Log.d(TAG, "could not get TrackRecordingService");
                    return;
                }
+                if (!isRecordingRequest) {
+                    return;
+                }

                // Starts or resumes a track.
                int msg;
@@ -119,6 +125,8 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
                trackDataHub.loadTrack(trackId);
                trackController.update(true, false);
                trackController.onResume(true, recordingTrackPaused);
+
+                isRecordingRequest = false;
            }
        }
    };
@@ -384,6 +392,7 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA
                deleteTracks(new long[]{trackId});
                return true;
            case R.id.track_detail_resume_track:
+                isRecordingRequest = true;
                startRecording();
                return true;
            case R.id.track_detail_settings:
@@ -419,6 +428,7 @@ public class TrackDetailActivity extends AbstractListActivity implements ChooseA

    private void handleIntent(Intent intent) {
        trackId = intent.getLongExtra(EXTRA_TRACK_ID, -1L);
+        isRecordingRequest = intent.getBooleanExtra(EXTRA_RECORDING_REQUEST, false);
        long markerId = intent.getLongExtra(EXTRA_MARKER_ID, -1L);
        if (markerId != -1L) {
            // Use the trackId from the marker
@@ -205,7 +205,8 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe
            if (!PreferencesUtils.isRecording(recordingTrackId)) {
                // Not recording -> Recording
                updateMenuItems(false, true);
-                Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackDetailActivity.class);
+                Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackDetailActivity.class)
+                        .putExtra(TrackDetailActivity.EXTRA_RECORDING_REQUEST, true);
                startActivity(newIntent);
            } else if (recordingTrackPaused) {
                // Paused -> Resume
@@ -351,9 +352,7 @@ public class TrackListActivity extends AbstractListActivity implements ConfirmDe

        searchMenuItem = menu.findItem(R.id.track_list_search);
        ActivityUtils.configureSearchWidget(this, searchMenuItem, trackController);
-
-        // Workaround for https://github.com/OpenTracksApp/OpenTracks/issues/200
-        //startGpsMenuItem = menu.findItem(R.id.track_list_start_gps);
+        startGpsMenuItem = menu.findItem(R.id.track_list_start_gps);

        return super.onCreateOptionsMenu(menu);
    }
@@ -382,17 +382,7 @@ public class ContentProviderUtils {

    public void deleteWaypoint(Context context, long waypointId) {
        final Waypoint waypoint = getWaypoint(waypointId);
-        if (waypoint != null && waypoint.hasPhoto()) {
-            Uri uri = waypoint.getPhotoURI();
-            File file = FileUtils.getPhotoFileIfExists(context, waypoint.getTrackId(), uri);
-            if (file.exists()) {
-                File parent = file.getParentFile();
-                file.delete();
-                if (parent.listFiles().length == 0) {
-                    parent.delete();
-                }
-            }
-        }
+        deleteWaypointPhoto(context, waypoint);
        contentResolver.delete(WaypointsColumns.CONTENT_URI, WaypointsColumns._ID + "=?", new String[]{Long.toString(waypointId)});
    }

@@ -514,14 +504,38 @@ public class ContentProviderUtils {
        return contentResolver.insert(WaypointsColumns.CONTENT_URI, createContentValues(waypoint));
    }

+    /**
+     * Delete waypoint's photo if any.
+     *
+     * @param context  the context object.
+     * @param waypoint the waypoint object.
+     */
+    private void deleteWaypointPhoto(Context context, Waypoint waypoint) {
+        if (waypoint != null && waypoint.hasPhoto()) {
+            Uri uri = waypoint.getPhotoURI();
+            File file = FileUtils.getPhotoFileIfExists(context, waypoint.getTrackId(), uri);
+            if (file.exists()) {
+                File parent = file.getParentFile();
+                file.delete();
+                if (parent.listFiles().length == 0) {
+                    parent.delete();
+                }
+            }
+        }
+    }
+
    /**
     * Updates a waypoint.
     * Returns true if successful.
     *
-     * @param waypoint the waypoint
+     * @param updatedWaypoint the waypoint with updated data.
     */
-    public boolean updateWaypoint(Waypoint waypoint) {
-        int rows = contentResolver.update(WaypointsColumns.CONTENT_URI, createContentValues(waypoint), WaypointsColumns._ID + "=?", new String[]{Long.toString(waypoint.getId())});
+    public boolean updateWaypoint(Context context, Waypoint updatedWaypoint) {
+        Waypoint savedWaypoint = getWaypoint(updatedWaypoint.getId());
+        if (!updatedWaypoint.hasPhoto()) {
+            deleteWaypointPhoto(context, savedWaypoint);
+        }
+        int rows = contentResolver.update(WaypointsColumns.CONTENT_URI, createContentValues(updatedWaypoint), WaypointsColumns._ID + "=?", new String[]{Long.toString(updatedWaypoint.getId())});
        return rows == 1;
    }

@@ -24,7 +24,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.widget.Toast;

 import androidx.annotation.Nullable;
 import androidx.documentfile.provider.DocumentFile;
@@ -43,7 +42,7 @@ import de.dennisguse.opentracks.util.FileUtils;
 */
 public class ExportActivity extends FragmentActivity implements FileTypeDialogFragment.FileTypeCaller {

-    private static final int EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE = 6;
+    private static final int DIRECTORY_PICKER_REQUEST_CODE = 6;

    private static final int DIALOG_PROGRESS_ID = 0;
    private static final int DIALOG_RESULT_ID = 1;
@@ -64,18 +63,17 @@ public class ExportActivity extends FragmentActivity implements FileTypeDialogFr
        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
        intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);

-        startActivityForResult(intent, EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE);
+        startActivityForResult(intent, DIRECTORY_PICKER_REQUEST_CODE);
    }

    @Override
    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent resultData) {
        super.onActivityResult(requestCode, resultCode, resultData);
-        if (requestCode == EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE) {
+        if (requestCode == DIRECTORY_PICKER_REQUEST_CODE) {
            if (resultCode == Activity.RESULT_OK) {
                directoryUri = resultData.getData();
                fileTypeDialogStart();
            } else {
-                Toast.makeText(this, R.string.external_storage_not_writable, Toast.LENGTH_LONG).show();
                finish();
            }
        }
@@ -108,7 +106,7 @@ public class ExportActivity extends FragmentActivity implements FileTypeDialogFr
        switch (id) {
            case DIALOG_PROGRESS_ID:
                progressDialog = DialogUtils.createHorizontalProgressDialog(this,
-                        R.string.export_external_storage_progress_message,
+                        R.string.export_progress_message,
                        new DialogInterface.OnCancelListener() {
                            @Override
                            public void onCancel(DialogInterface dialog) {
@@ -128,11 +126,11 @@ public class ExportActivity extends FragmentActivity implements FileTypeDialogFr
                    iconId = R.drawable.ic_dialog_success_24dp;
                    titleId = R.string.generic_success_title;
                    message = getString(
-                            R.string.export_external_storage_success, totalTracks, directoryDisplayName);
+                            R.string.export_success, totalTracks, directoryDisplayName);
                } else {
                    iconId = R.drawable.ic_dialog_error_24dp;
                    titleId = R.string.generic_error_title;
-                    message = getString(R.string.export_external_storage_error, processedTrackCount, totalTracks, directoryDisplayName);
+                    message = getString(R.string.export_error, processedTrackCount, totalTracks, directoryDisplayName);
                }
                AlertDialog.Builder builder = new AlertDialog.Builder(this).setCancelable(true)
                        .setIcon(iconId).setMessage(message)
@@ -24,7 +24,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.widget.Toast;

 import androidx.annotation.Nullable;
 import androidx.documentfile.provider.DocumentFile;
@@ -43,7 +42,7 @@ import de.dennisguse.opentracks.util.FileUtils;
 */
 public class ImportActivity extends FragmentActivity implements FileTypeDialogFragment.FileTypeCaller {

-    private static final int EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE = 6;
+    private static final int DIRECTORY_PICKER_REQUEST_CODE = 6;

    private static final int DIALOG_PROGRESS_ID = 0;
    private static final int DIALOG_RESULT_ID = 1;
@@ -65,18 +64,17 @@ public class ImportActivity extends FragmentActivity implements FileTypeDialogFr
        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

-        startActivityForResult(intent, EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE);
+        startActivityForResult(intent, DIRECTORY_PICKER_REQUEST_CODE);
    }

    @Override
    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent resultData) {
        super.onActivityResult(requestCode, resultCode, resultData);
-        if (requestCode == EXTERNAL_STORAGE_PERMISSION_REQUEST_CODE) {
+        if (requestCode == DIRECTORY_PICKER_REQUEST_CODE) {
            if (resultCode == Activity.RESULT_OK) {
                directoryUri = resultData.getData();
                fileTypeDialogStart();
            } else {
-                Toast.makeText(this, R.string.external_storage_not_writable, Toast.LENGTH_LONG).show();
                finish();
            }
        }
@@ -16,7 +16,6 @@

 package de.dennisguse.opentracks.io.file.importer;

-import android.content.Context;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.PowerManager.WakeLock;
@@ -46,39 +45,23 @@ class ImportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
    private static final String TAG = ImportAsyncTask.class.getSimpleName();
    private final TrackFileFormat trackFileFormat;
    private final DocumentFile directory;
-    // TODO Can be removed, or?
-    private Context context;
+
    // TODO Use weak reference
    private ImportActivity importActivity;
    private WakeLock wakeLock;

-    // true if the AsyncTask has completed
-    private boolean completed;
-
    private int importTrackCount;
-
    private int totalTrackCount;
+    private long lastSuccessfulTrackId;

-    // the last successfully imported track id
-    private long trackId;
-
-    /**
-     * Creates an AsyncTask.
-     *
-     * @param importActivity  the activity currently associated with this AsyncTask
-     * @param trackFileFormat the track file format
-     * @param directory            path to import GPX files
-     */
    public ImportAsyncTask(ImportActivity importActivity, TrackFileFormat trackFileFormat, DocumentFile directory) {
        this.importActivity = importActivity;
        this.trackFileFormat = trackFileFormat;
        this.directory = directory;
-        context = importActivity.getApplicationContext();

-        completed = false;
        importTrackCount = 0;
        totalTrackCount = 0;
-        trackId = -1L;
+        lastSuccessfulTrackId = -1L;
    }

    @Override
@@ -90,8 +73,6 @@ class ImportAsyncTask extends AsyncTask<Void, Integer, Boolean> {

    /**
     * Gets a list of files.
-     * If importAll is true, returns a list of the files under the path directory.
-     * If importAll is false, returns a list containing just the path file.
     */
    private static List<DocumentFile> getFiles(DocumentFile file, TrackFileFormat trackFileFormat) {
        List<DocumentFile> files = new ArrayList<>();
@@ -119,7 +100,6 @@ class ImportAsyncTask extends AsyncTask<Void, Integer, Boolean> {

    @Override
    protected void onPostExecute(Boolean result) {
-        completed = true;
        if (importActivity != null) {
            importActivity.onAsyncTaskCompleted(importTrackCount, totalTrackCount);
        }
@@ -127,8 +107,6 @@ class ImportAsyncTask extends AsyncTask<Void, Integer, Boolean> {

    @Override
    protected void onCancelled() {
-        context = null;
-        completed = true;
        if (importActivity != null) {
            importActivity.onAsyncTaskCompleted(importTrackCount, totalTrackCount);
            importActivity = null;
@@ -190,9 +168,9 @@ class ImportAsyncTask extends AsyncTask<Void, Integer, Boolean> {
            }
        }

-        try (InputStream inputStream = context.getContentResolver().openInputStream(file.getUri())) {
-            trackId = trackImporter.importFile(inputStream);
-            return trackId != -1L;
+        try (InputStream inputStream = importActivity.getContentResolver().openInputStream(file.getUri())) {
+            lastSuccessfulTrackId = trackImporter.importFile(inputStream);
+            return lastSuccessfulTrackId != -1L;
        } catch (IOException e) {
            Log.e(TAG, "Unable to import file", e);
            return false;
@@ -461,12 +461,6 @@ public class TrackRecordingService extends Service {
                // Update the recording track time
                updateTrackTotalTime(track);
            }
-
-            String trackName = TrackNameUtils.getTrackName(this, trackId, track.getTrackStatistics().getStartTime_ms());
-            if (trackName != null && !trackName.equals(track.getName())) {
-                track.setName(trackName);
-                contentProviderUtils.updateTrack(track);
-            }
        }
        endRecording(true);
    }
@@ -85,7 +85,7 @@ public class DialogUtils {
     * @param formatArgs       the format arguments for the message id
     */
    private static ProgressDialog createProgressDialog(boolean spinner, final Context context, int messageId, DialogInterface.OnCancelListener onCancelListener, Object... formatArgs) {
-        final ProgressDialog progressDialog = new ProgressDialog(context);
+        final ProgressDialog progressDialog = new ProgressDialog(context, R.style.ThemeCustomNotTransparent);
        progressDialog.setCancelable(true);
        progressDialog.setCanceledOnTouchOutside(false);
        progressDialog.setIcon(R.drawable.ic_dialog_info_24dp);
@@ -102,14 +102,11 @@
    <string name="description_track_segment">جزء</string>
    <string name="export_all_option">الكل كـ ‏%1$s‏</string>
    <string name="export_all_title">تصدير إلى وحدة التخزين الخارجية</string>
-    <string name="export_external_storage">وحدة التخزين الخارجية</string>
-    <string name="export_external_storage_error">تم تصدير %1$d‏ من %2$s‏ إلى %3$s</string>
-    <string name="export_external_storage_option">كـ ‏%1$s‏ إلى‏ %2$s</string>
-    <string name="export_external_storage_progress_message">جارٍ التصدير إلى‏ %1$s‏…</string>
-    <string name="export_external_storage_success">تم تصدير‏ %1$s‏ إلى‏ %2$s</string>
+    <string name="export_error">تم تصدير %1$d‏ من %2$s‏ إلى %3$s</string>
+    <string name="export_option">كـ ‏%1$s‏ إلى‏ %2$s</string>
+    <string name="export_progress_message">جارٍ التصدير إلى‏ %1$s‏…</string>
+    <string name="export_success">تم تصدير‏ %1$s‏ إلى‏ %2$s</string>
    <string name="export_title">تصدير إلى…</string>
-    <string name="external_storage_not_available">لا تتوفر وحدة تخزين خارجية</string>
-    <string name="external_storage_not_writable">وحدة التخزين الخارجية غير قابلة للكتابة</string>
    <string name="files_few">%1$d‏ ملفات</string>
    <string name="files_many">%1$d‏ ملفًا</string>
    <string name="files_one">1 ملف</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segment</string>
    <string name="export_all_option">All as %1$s</string>
    <string name="export_all_title">Export to external storage</string>
-    <string name="export_external_storage">External storage</string>
-    <string name="export_external_storage_error">Exported %1$d of %2$s to %3$s</string>
-    <string name="export_external_storage_option">as %1$s to %2$s</string>
-    <string name="export_external_storage_progress_message">Exporting to %1$s…</string>
-    <string name="export_external_storage_success">Exported %1$s to %2$s</string>
+    <string name="export_error">Exported %1$d of %2$s to %3$s</string>
+    <string name="export_option">as %1$s to %2$s</string>
+    <string name="export_progress_message">Exporting to %1$s…</string>
+    <string name="export_success">Exported %1$s to %2$s</string>
    <string name="export_title">Export to…</string>
-    <string name="external_storage_not_available">External storage not available</string>
-    <string name="external_storage_not_writable">External storage not writable</string>
    <string name="files_few">%1$d files</string>
    <string name="files_many">%1$d files</string>
    <string name="files_one">1 file</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segmento</string>
    <string name="export_all_option">Todo como %1$s</string>
    <string name="export_all_title">Exportar a unidad de almacenamiento externa</string>
-    <string name="export_external_storage">Unidad de almacenamiento externa</string>
-    <string name="export_external_storage_error">Se exportaron %1$d de %2$s a %3$s.</string>
-    <string name="export_external_storage_option">como %1$s a %2$s</string>
-    <string name="export_external_storage_progress_message">Exportando a %1$s…</string>
-    <string name="export_external_storage_success">Se exportaron %1$s a %2$s.</string>
+    <string name="export_error">Se exportaron %1$d de %2$s a %3$s.</string>
+    <string name="export_option">como %1$s a %2$s</string>
+    <string name="export_progress_message">Exportando a %1$s…</string>
+    <string name="export_success">Se exportaron %1$s a %2$s.</string>
    <string name="export_title">Exportar a…</string>
-    <string name="external_storage_not_available">El almacenamiento externo no está disponible.</string>
-    <string name="external_storage_not_writable">No se puede escribir en el almacenamiento externo.</string>
    <string name="files_few">%1$d archivos</string>
    <string name="files_many">%1$d archivos</string>
    <string name="files_one">1 archivo</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Сегмент</string>
    <string name="export_all_option">Всичко като %1$s</string>
    <string name="export_all_title">Експортиране във външно хранилище</string>
-    <string name="export_external_storage">Външно хранилище</string>
-    <string name="export_external_storage_error">Експортирахте %1$d от %2$s в/ъв %3$s.</string>
-    <string name="export_external_storage_option">като %1$s в/ъв %2$s</string>
-    <string name="export_external_storage_progress_message">Експортира се в/ъв %1$s…</string>
-    <string name="export_external_storage_success">Експортирахте %1$s в/ъв %2$s.</string>
+    <string name="export_error">Експортирахте %1$d от %2$s в/ъв %3$s.</string>
+    <string name="export_option">като %1$s в/ъв %2$s</string>
+    <string name="export_progress_message">Експортира се в/ъв %1$s…</string>
+    <string name="export_success">Експортирахте %1$s в/ъв %2$s.</string>
    <string name="export_title">Експортиране във…</string>
-    <string name="external_storage_not_available">Външното хранилище не е налице.</string>
-    <string name="external_storage_not_writable">Във външното хранилище не може да се записва.</string>
    <string name="files_few">%1$d файла</string>
    <string name="files_many">%1$d файла</string>
    <string name="files_one">1 файл</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segment</string>
    <string name="export_all_option">Totes com a %1$s</string>
    <string name="export_all_title">Exporta a la unitat d\'emmagatzematge extern</string>
-    <string name="export_external_storage">Emmagatzematge extern</string>
-    <string name="export_external_storage_error">S\'han exportat %1$d de %2$s a %3$s.</string>
-    <string name="export_external_storage_option">com a %1$s a %2$s</string>
-    <string name="export_external_storage_progress_message">S\'està exportant a %1$s…</string>
-    <string name="export_external_storage_success">S\'han exportat %1$s a %2$s.</string>
+    <string name="export_error">S\'han exportat %1$d de %2$s a %3$s.</string>
+    <string name="export_option">com a %1$s a %2$s</string>
+    <string name="export_progress_message">S\'està exportant a %1$s…</string>
+    <string name="export_success">S\'han exportat %1$s a %2$s.</string>
    <string name="export_title">Exportació a…</string>
-    <string name="external_storage_not_available">L\'emmagatzematge extern no està disponible.</string>
-    <string name="external_storage_not_writable">L\'emmagatzematge extern no es pot modificar.</string>
    <string name="files_few">%1$d fitxers</string>
    <string name="files_many">%1$d fitxers</string>
    <string name="files_one">1 fitxer</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segment</string>
    <string name="export_all_option">Vše ve formátu %1$s</string>
    <string name="export_all_title">Export do externího úložiště</string>
-    <string name="export_external_storage">Externí úložiště</string>
-    <string name="export_external_storage_error">Trasy byly exportovány do složky %3$s (%1$d z %2$s).</string>
-    <string name="export_external_storage_option">jako %1$s do složky %2$s</string>
-    <string name="export_external_storage_progress_message">Exportování do složky %1$s…</string>
-    <string name="export_external_storage_success">Trasy (celkem %1$s) byly exportovány do složky %2$s.</string>
+    <string name="export_error">Trasy byly exportovány do složky %3$s (%1$d z %2$s).</string>
+    <string name="export_option">jako %1$s do složky %2$s</string>
+    <string name="export_progress_message">Exportování do složky %1$s…</string>
+    <string name="export_success">Trasy (celkem %1$s) byly exportovány do složky %2$s.</string>
    <string name="export_title">Export do…</string>
-    <string name="external_storage_not_available">Externí úložiště není k dispozici.</string>
-    <string name="external_storage_not_writable">Do externího úložiště nelze zapisovat.</string>
    <string name="files_few">%1$d soubory</string>
    <string name="files_many">%1$d souborů</string>
    <string name="files_one">1 soubor</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segment</string>
    <string name="export_all_option">Alle som %1$s</string>
    <string name="export_all_title">Eksportér til eksternt lager</string>
-    <string name="export_external_storage">Eksternt lager</string>
-    <string name="export_external_storage_error">%1$d af %2$s blev eksporteret til %3$s</string>
-    <string name="export_external_storage_option">som %1$s til %2$s</string>
-    <string name="export_external_storage_progress_message">Eksporterer til %1$s…</string>
-    <string name="export_external_storage_success">%1$s blev eksporteret til %2$s</string>
+    <string name="export_error">%1$d af %2$s blev eksporteret til %3$s</string>
+    <string name="export_option">som %1$s til %2$s</string>
+    <string name="export_progress_message">Eksporterer til %1$s…</string>
+    <string name="export_success">%1$s blev eksporteret til %2$s</string>
    <string name="export_title">Eksportér til…</string>
-    <string name="external_storage_not_available">Det eksterne lager er ikke tilgængeligt</string>
-    <string name="external_storage_not_writable">Det eksterne lager er ikke skrivbart</string>
    <string name="files_few">%1$d filer</string>
    <string name="files_many">%1$d filer</string>
    <string name="files_one">1 fil</string>
@@ -197,16 +197,12 @@ g) das tun, was Deiner Meinung nach OpenTracks hilft.</string>
    <string name="export_all_title">In externen Speicher exportieren</string>
    <string name="export_with_photos">mit Fotos</string>
    <string name="export_without_photos">ohne Fotos</string>
-    <string name="export_external_storage">Externer Speicher</string>
-    <string name="export_external_storage_error">%1$d von %2$s in %3$s exportiert</string>
-    <string name="export_external_storage_option">als %1$s in %2$s</string>
-    <string name="export_external_storage_progress_message">In %1$s exportieren…</string>
-    <string name="export_external_storage_success">%1$s in %2$s exportiert</string>
+    <string name="export_error">%1$d von %2$s in %3$s exportiert</string>
+    <string name="export_option">als %1$s in %2$s</string>
+    <string name="export_progress_message">In %1$s exportieren…</string>
+    <string name="export_success">%1$s in %2$s exportiert</string>
    <string name="export_title">Exportieren in…</string>
    <!-- External Storage -->
-    <string name="external_storage_not_available">Externer Speicher ist nicht verfügbar.</string>
-    <string name="external_storage_not_writable">Externer Speicher ist nicht beschreibbar.</string>
-    <string name="external_storage_not_readable">Externer Speicher nicht lesbar</string>
    <!-- Files -->
    <string name="files_few">%1$d Dateien</string>
    <string name="files_many">%1$d Dateien</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Τμήμα</string>
    <string name="export_all_option">Όλα σε μορφή %1$s</string>
    <string name="export_all_title">Εξαγωγή σε εξωτερικό αποθηκευτικό χώρο</string>
-    <string name="export_external_storage">Εξωτερικός αποθηκευτικός χώρος</string>
-    <string name="export_external_storage_error">Έγινε εξαγωγή %1$d από %2$s διαδρομών στον κατάλογο %3$s</string>
-    <string name="export_external_storage_option">σε μορφή %1$s στο %2$s</string>
-    <string name="export_external_storage_progress_message">Εξαγωγή στο %1$s…</string>
-    <string name="export_external_storage_success">Έγινε εξαγωγή %1$s διαδρομών στον κατάλογο %2$s</string>
+    <string name="export_error">Έγινε εξαγωγή %1$d από %2$s διαδρομών στον κατάλογο %3$s</string>
+    <string name="export_option">σε μορφή %1$s στο %2$s</string>
+    <string name="export_progress_message">Εξαγωγή στο %1$s…</string>
+    <string name="export_success">Έγινε εξαγωγή %1$s διαδρομών στον κατάλογο %2$s</string>
    <string name="export_title">Εξαγωγή σε…</string>
-    <string name="external_storage_not_available">Το εξωτερικό μέσο αποθήκευσης δεν είναι διαθέσιμο</string>
-    <string name="external_storage_not_writable">Δεν είναι δυνατή η εγγραφή στο εξωτερικό μέσο αποθήκευσης</string>
    <string name="files_few">%1$d αρχεία</string>
    <string name="files_many">%1$d αρχεία</string>
    <string name="files_one">1 αρχείο</string>
@@ -104,14 +104,11 @@
    <string name="export_all_title">Exportar a unidad de almacenamiento externa</string>
    <string name="export_with_photos">con fotos</string>
    <string name="export_without_photos">sin fotos</string>
-    <string name="export_external_storage">Unidad de almacenamiento externa</string>
-    <string name="export_external_storage_error">Se exportaron %1$d de %2$s a %3$s</string>
-    <string name="export_external_storage_option">como %1$s a %2$s</string>
-    <string name="export_external_storage_progress_message">Exportando a %1$s…</string>
-    <string name="export_external_storage_success">Se exportaron %1$s a %2$s</string>
+    <string name="export_error">Se exportaron %1$d de %2$s a %3$s</string>
+    <string name="export_option">como %1$s a %2$s</string>
+    <string name="export_progress_message">Exportando a %1$s…</string>
+    <string name="export_success">Se exportaron %1$s a %2$s</string>
    <string name="export_title">Exportar a…</string>
-    <string name="external_storage_not_available">Almacenamiento externo no disponible</string>
-    <string name="external_storage_not_writable">No se puede escribir en el almacenamiento externo</string>
    <string name="files_few">%1$d archivos</string>
    <string name="files_many">%1$d archivos</string>
    <string name="files_one">1 archivo</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Lõik</string>
    <string name="export_all_option">Kõik %1$s-failina</string>
    <string name="export_all_title">Ekspordi välismällu</string>
-    <string name="export_external_storage">Välismälu</string>
-    <string name="export_external_storage_error">Eksporditud %1$d faili %2$s-st kataloogi %3$s</string>
-    <string name="export_external_storage_option">%1$s-failina kataloogi %2$s</string>
-    <string name="export_external_storage_progress_message">Eksportimine kataloogi %1$s…</string>
-    <string name="export_external_storage_success">Eksporditud %1$s rada kataloogi %2$s</string>
+    <string name="export_error">Eksporditud %1$d faili %2$s-st kataloogi %3$s</string>
+    <string name="export_option">%1$s-failina kataloogi %2$s</string>
+    <string name="export_progress_message">Eksportimine kataloogi %1$s…</string>
+    <string name="export_success">Eksporditud %1$s rada kataloogi %2$s</string>
    <string name="export_title">Eksportimine …</string>
-    <string name="external_storage_not_available">Välismälu ei ole saadaval</string>
-    <string name="external_storage_not_writable">Välismälu ei ole kirjutatav</string>
    <string name="files_few">%1$d faili</string>
    <string name="files_many">%1$d faili</string>
    <string name="files_one">1 fail</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segmentua</string>
    <string name="export_all_option">Guztiak %1$s</string>
    <string name="export_all_title">Esportatu kanpoko biltegira</string>
-    <string name="export_external_storage">Kanpoko biltegia</string>
-    <string name="export_external_storage_error">%1$d/%2$s esportatu dira %3$s direktoriora</string>
-    <string name="export_external_storage_option">%1$s gisa %2$s karpetara</string>
-    <string name="export_external_storage_progress_message">%1$s karpetara esportatzen…</string>
-    <string name="export_external_storage_success">%1$s %2$s direktoriora esportatu dira</string>
+    <string name="export_error">%1$d/%2$s esportatu dira %3$s direktoriora</string>
+    <string name="export_option">%1$s gisa %2$s karpetara</string>
+    <string name="export_progress_message">%1$s karpetara esportatzen…</string>
+    <string name="export_success">%1$s %2$s direktoriora esportatu dira</string>
    <string name="export_title">Esportatu hona…</string>
-    <string name="external_storage_not_available">Kanpoko biltegia ez dago erabilgarri</string>
-    <string name="external_storage_not_writable">Ezin da kanpoko biltegian idatzi.</string>
    <string name="files_few">%1$d fitxategi</string>
    <string name="files_many">%1$d fitxategi</string>
    <string name="files_one">1 fitxategi</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">بخش</string>
    <string name="export_all_option">همه به عنوان %1$s</string>
    <string name="export_all_title">صادر کردن به حافظه خارجی</string>
-    <string name="export_external_storage">حافظه خارجی</string>
-    <string name="export_external_storage_error">%1$d مسیر از %2$s مسیر به %3$s صادر شد</string>
-    <string name="export_external_storage_option">به عنوان %1$s به %2$s</string>
-    <string name="export_external_storage_progress_message">در حال صادر کردن به %1$s…</string>
-    <string name="export_external_storage_success">%1$s مسیر به %2$s صادر شد</string>
+    <string name="export_error">%1$d مسیر از %2$s مسیر به %3$s صادر شد</string>
+    <string name="export_option">به عنوان %1$s به %2$s</string>
+    <string name="export_progress_message">در حال صادر کردن به %1$s…</string>
+    <string name="export_success">%1$s مسیر به %2$s صادر شد</string>
    <string name="export_title">صادر کردن به…</string>
-    <string name="external_storage_not_available">حافظه خارجی در دسترس نیست</string>
-    <string name="external_storage_not_writable">ذخیره کردن در حافظه خارجی امکان‌پذیر نیست</string>
    <string name="files_few">%1$d فایل</string>
    <string name="files_many">%1$d فایل</string>
    <string name="files_one">۱ فایل</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segmentti</string>
    <string name="export_all_option">Kaikki %1$s-tiedostot</string>
    <string name="export_all_title">Vie ulkoiseen tallennustilaan</string>
-    <string name="export_external_storage">Ulkoinen tallennustila</string>
-    <string name="export_external_storage_error">Viety %1$d/%2$s kohteeseen %3$s</string>
-    <string name="export_external_storage_option">%1$s-tiedostona kohteeseen %2$s</string>
-    <string name="export_external_storage_progress_message">Viedään kohteeseen %1$s…</string>
-    <string name="export_external_storage_success">%1$s vietiin kohteeseen %2$s</string>
+    <string name="export_error">Viety %1$d/%2$s kohteeseen %3$s</string>
+    <string name="export_option">%1$s-tiedostona kohteeseen %2$s</string>
+    <string name="export_progress_message">Viedään kohteeseen %1$s…</string>
+    <string name="export_success">%1$s vietiin kohteeseen %2$s</string>
    <string name="export_title">Vie kohteeseen…</string>
-    <string name="external_storage_not_available">Ulkoinen tallennustila ei ole käytettävissä</string>
-    <string name="external_storage_not_writable">Ulkoiseen tallennustilaan ei voi kirjoittaa</string>
    <string name="files_few">%1$d tiedostoa</string>
    <string name="files_many">%1$d tiedostoa</string>
    <string name="files_one">1 tiedosto</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segment</string>
    <string name="export_all_option">Tous les parcours au format %1$s</string>
    <string name="export_all_title">Exporter vers la mémoire de stockage externe</string>
-    <string name="export_external_storage">Mémoire de stockage externe</string>
-    <string name="export_external_storage_error">%1$d parcours sur %2$s exporté(s) vers le répertoire %3$s.</string>
-    <string name="export_external_storage_option">au format %1$s vers le répertoire %2$s</string>
-    <string name="export_external_storage_progress_message">Exportation vers le répertoire %1$s en cours…</string>
-    <string name="export_external_storage_success">%1$s parcours bien exporté(s) vers le répertoire %2$s</string>
+    <string name="export_error">%1$d parcours sur %2$s exporté(s) vers le répertoire %3$s.</string>
+    <string name="export_option">au format %1$s vers le répertoire %2$s</string>
+    <string name="export_progress_message">Exportation vers le répertoire %1$s en cours…</string>
+    <string name="export_success">%1$s parcours bien exporté(s) vers le répertoire %2$s</string>
    <string name="export_title">Exporter vers…</string>
-    <string name="external_storage_not_available">Impossible d\'accéder au stockage externe</string>
-    <string name="external_storage_not_writable">Impossible d\'écrire sur le stockage externe</string>
    <string name="files_few">%1$d fichiers</string>
    <string name="files_many">%1$d fichiers</string>
    <string name="files_one">1 fichier</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segment</string>
    <string name="export_all_option">Tous les parcours au format %1$s</string>
    <string name="export_all_title">Exporter vers la mémoire de stockage externe</string>
-    <string name="export_external_storage">Mémoire de stockage externe</string>
-    <string name="export_external_storage_error">%1$d parcours sur %2$s exporté(s) vers le répertoire %3$s.</string>
-    <string name="export_external_storage_option">au format %1$s vers le répertoire %2$s</string>
-    <string name="export_external_storage_progress_message">Exportation vers le répertoire %1$s en cours…</string>
-    <string name="export_external_storage_success">%1$s parcours exporté(s) vers le répertoire %2$s.</string>
+    <string name="export_error">%1$d parcours sur %2$s exporté(s) vers le répertoire %3$s.</string>
+    <string name="export_option">au format %1$s vers le répertoire %2$s</string>
+    <string name="export_progress_message">Exportation vers le répertoire %1$s en cours…</string>
+    <string name="export_success">%1$s parcours exporté(s) vers le répertoire %2$s.</string>
    <string name="export_title">Exporter vers…</string>
-    <string name="external_storage_not_available">Mémoire de stockage externe indisponible.</string>
-    <string name="external_storage_not_writable">Mémoire de stockage externe indisponible en écriture.</string>
    <string name="files_few">%1$d fichiers</string>
    <string name="files_many">%1$d fichiers</string>
    <string name="files_one">1 fichier</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segment</string>
    <string name="export_all_option">Tous les parcours au format %1$s</string>
    <string name="export_all_title">Exporter vers la mémoire de stockage externe</string>
-    <string name="export_external_storage">Mémoire de stockage externe</string>
-    <string name="export_external_storage_error">%1$d parcours sur %2$s exporté(s) vers le répertoire %3$s.</string>
-    <string name="export_external_storage_option">au format %1$s vers le répertoire %2$s</string>
-    <string name="export_external_storage_progress_message">Exportation vers le répertoire %1$s en cours…</string>
-    <string name="export_external_storage_success">%1$s parcours exporté(s) vers le répertoire %2$s.</string>
+    <string name="export_error">%1$d parcours sur %2$s exporté(s) vers le répertoire %3$s.</string>
+    <string name="export_option">au format %1$s vers le répertoire %2$s</string>
+    <string name="export_progress_message">Exportation vers le répertoire %1$s en cours…</string>
+    <string name="export_success">%1$s parcours exporté(s) vers le répertoire %2$s.</string>
    <string name="export_title">Exporter vers…</string>
-    <string name="external_storage_not_available">Mémoire de stockage externe indisponible.</string>
-    <string name="external_storage_not_writable">Mémoire de stockage externe indisponible en écriture.</string>
    <string name="files_few">%1$d fichiers</string>
    <string name="files_many">%1$d fichiers</string>
    <string name="files_one">1 fichier</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segmento</string>
    <string name="export_all_option">Todas como %1$s</string>
    <string name="export_all_title">Exportar a almacenamento externo</string>
-    <string name="export_external_storage">Almacenamento externo</string>
-    <string name="export_external_storage_error">Exportados: %1$d de %2$s a %3$s</string>
-    <string name="export_external_storage_option">como %1$s a %2$s</string>
-    <string name="export_external_storage_progress_message">Exportando a %1$s…</string>
-    <string name="export_external_storage_success">Exportados: %1$s a %2$s</string>
+    <string name="export_error">Exportados: %1$d de %2$s a %3$s</string>
+    <string name="export_option">como %1$s a %2$s</string>
+    <string name="export_progress_message">Exportando a %1$s…</string>
+    <string name="export_success">Exportados: %1$s a %2$s</string>
    <string name="export_title">Exportar a…</string>
-    <string name="external_storage_not_available">O almacenamento externo non está dispoñible</string>
-    <string name="external_storage_not_writable">O almacenamento externo non é gravable</string>
    <string name="files_few">%1$d ficheiros</string>
    <string name="files_many">%1$d ficheiros</string>
    <string name="files_one">1 ficheiro</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">खंड</string>
    <string name="export_all_option">%1$s के रूप वाले सभी को</string>
    <string name="export_all_title">बाह्य संग्रहण पर निर्यात करें</string>
-    <string name="export_external_storage">बाह्य संग्रहण</string>
-    <string name="export_external_storage_error">%2$s में से %1$d को %3$s पर निर्यात गया</string>
-    <string name="export_external_storage_option">%1$s के रूप वालों को %2$s पर</string>
-    <string name="export_external_storage_progress_message">%1$s पर निर्यात किया जा रहा है…</string>
-    <string name="export_external_storage_success">%1$s को %2$s पर निर्यात किया गया</string>
+    <string name="export_error">%2$s में से %1$d को %3$s पर निर्यात गया</string>
+    <string name="export_option">%1$s के रूप वालों को %2$s पर</string>
+    <string name="export_progress_message">%1$s पर निर्यात किया जा रहा है…</string>
+    <string name="export_success">%1$s को %2$s पर निर्यात किया गया</string>
    <string name="export_title">यहां निर्यात करें…</string>
-    <string name="external_storage_not_available">बाह्य संग्रहण उपलब्ध नहीं है</string>
-    <string name="external_storage_not_writable">बाह्य संग्रहण लिखने योग्य नहीं है</string>
    <string name="files_few">%1$d फ़ाइलें</string>
    <string name="files_many">%1$d फ़ाइलें</string>
    <string name="files_one">1 फ़ाइल</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segment</string>
    <string name="export_all_option">Sve kao %1$s</string>
    <string name="export_all_title">Izvoz u vanjsku pohranu</string>
-    <string name="export_external_storage">Vanjska pohrana</string>
-    <string name="export_external_storage_error">Izvezeno u direktorij %3$s: %1$d od %2$s</string>
-    <string name="export_external_storage_option">kao %1$s u direktorij %2$s</string>
-    <string name="export_external_storage_progress_message">Izvoz u direktorij %1$s…</string>
-    <string name="export_external_storage_success">Izvezeno u direktorij %2$s: %1$s</string>
+    <string name="export_error">Izvezeno u direktorij %3$s: %1$d od %2$s</string>
+    <string name="export_option">kao %1$s u direktorij %2$s</string>
+    <string name="export_progress_message">Izvoz u direktorij %1$s…</string>
+    <string name="export_success">Izvezeno u direktorij %2$s: %1$s</string>
    <string name="export_title">Izvoz u…</string>
-    <string name="external_storage_not_available">Vanjska pohrana nije dostupna</string>
-    <string name="external_storage_not_writable">Vanjski pohranu nije dopušteno mijenjati</string>
    <string name="files_few">%1$d datoteke</string>
    <string name="files_many">%1$d datoteka</string>
    <string name="files_one">1 datoteka</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Szakasz</string>
    <string name="export_all_option">Mindent %1$s formátumban</string>
    <string name="export_all_title">Exportálás külső tárhelyre</string>
-    <string name="export_external_storage">Külső tárhely</string>
-    <string name="export_external_storage_error">%1$d/%2$s exportálva ide: %3$s</string>
-    <string name="export_external_storage_option">%1$s formátumban ide: %2$s</string>
-    <string name="export_external_storage_progress_message">Exportálás ide: %1$s…</string>
-    <string name="export_external_storage_success">%1$s exportálva ide: %2$s</string>
+    <string name="export_error">%1$d/%2$s exportálva ide: %3$s</string>
+    <string name="export_option">%1$s formátumban ide: %2$s</string>
+    <string name="export_progress_message">Exportálás ide: %1$s…</string>
+    <string name="export_success">%1$s exportálva ide: %2$s</string>
    <string name="export_title">Exportálás ide:…</string>
-    <string name="external_storage_not_available">Külső tároló nem érhető el</string>
-    <string name="external_storage_not_writable">Külső tároló nem írható</string>
    <string name="files_few">%1$d fájl</string>
    <string name="files_many">%1$d fájl</string>
    <string name="files_one">1 fájl</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segmen</string>
    <string name="export_all_option">Semuanya sebagai %1$s</string>
    <string name="export_all_title">Ekspor ke penyimpanan eksternal</string>
-    <string name="export_external_storage">Penyimpanan eksternal</string>
-    <string name="export_external_storage_error">%1$d dari %2$s diekspor ke %3$s.</string>
-    <string name="export_external_storage_option">sebagai %1$s ke %2$s</string>
-    <string name="export_external_storage_progress_message">Mengekspor ke %1$s…</string>
-    <string name="export_external_storage_success">%1$s dari %2$s terekspor.</string>
+    <string name="export_error">%1$d dari %2$s diekspor ke %3$s.</string>
+    <string name="export_option">sebagai %1$s ke %2$s</string>
+    <string name="export_progress_message">Mengekspor ke %1$s…</string>
+    <string name="export_success">%1$s dari %2$s terekspor.</string>
    <string name="export_title">Ekspor ke…</string>
-    <string name="external_storage_not_available">Penyimpanan eksternal tidak tersedia.</string>
-    <string name="external_storage_not_writable">Penyimpanan eksternal tidak dapat ditulis.</string>
    <string name="files_few">%1$d file</string>
    <string name="files_many">%1$d file</string>
    <string name="files_one">1 file</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segmento</string>
    <string name="export_all_option">Tutto come %1$s</string>
    <string name="export_all_title">Esporta nella memoria esterna</string>
-    <string name="export_external_storage">Memoria esterna</string>
-    <string name="export_external_storage_error">Esportati %1$d di %2$s in %3$s</string>
-    <string name="export_external_storage_option">come %1$s su %2$s</string>
-    <string name="export_external_storage_progress_message">Esportazioni su %1$s…</string>
-    <string name="export_external_storage_success">Esportati %1$s in %2$s.</string>
+    <string name="export_error">Esportati %1$d di %2$s in %3$s</string>
+    <string name="export_option">come %1$s su %2$s</string>
+    <string name="export_progress_message">Esportazioni su %1$s…</string>
+    <string name="export_success">Esportati %1$s in %2$s.</string>
    <string name="export_title">Esporta in…</string>
-    <string name="external_storage_not_available">Dispositivo di memorizzazione esterno non disponibile</string>
-    <string name="external_storage_not_writable">Dispositivo di memorizzazione esterno non scrivibile</string>
    <string name="files_few">%1$d file</string>
    <string name="files_many">%1$d file</string>
    <string name="files_one">1 file</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">קטע</string>
    <string name="export_all_option">הכל כ-%1$s</string>
    <string name="export_all_title">ייצא לאחסון חיצוני</string>
-    <string name="export_external_storage">אחסון חיצוני</string>
-    <string name="export_external_storage_error">יוצאו %1$d מתוך %2$s אל %3$s</string>
-    <string name="export_external_storage_option">כ-%1$s אל %2$s</string>
-    <string name="export_external_storage_progress_message">מייצא אל %1$s…</string>
-    <string name="export_external_storage_success">יוצאו %1$s אל %2$s</string>
+    <string name="export_error">יוצאו %1$d מתוך %2$s אל %3$s</string>
+    <string name="export_option">כ-%1$s אל %2$s</string>
+    <string name="export_progress_message">מייצא אל %1$s…</string>
+    <string name="export_success">יוצאו %1$s אל %2$s</string>
    <string name="export_title">ייצא אל…</string>
-    <string name="external_storage_not_available">שטח אחסון חיצוני לא זמין</string>
-    <string name="external_storage_not_writable">לא ניתן לכתוב בשטח האחסון החיצוני</string>
    <string name="files_few">%1$d קבצים</string>
    <string name="files_many">%1$d קבצים</string>
    <string name="files_one">קובץ אחד</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">セグメント</string>
    <string name="export_all_option">すべてを%1$s形式で</string>
    <string name="export_all_title">外部ストレージにエクスポート</string>
-    <string name="export_external_storage">外部ストレージ</string>
-    <string name="export_external_storage_error">%2$s中%1$d件を「%3$s」にエクスポートしました</string>
-    <string name="export_external_storage_option">%1$s形式で%2$sへ</string>
-    <string name="export_external_storage_progress_message">%1$sにエクスポート中…</string>
-    <string name="export_external_storage_success">%1$sを「%2$s」にエクスポートしました</string>
+    <string name="export_error">%2$s中%1$d件を「%3$s」にエクスポートしました</string>
+    <string name="export_option">%1$s形式で%2$sへ</string>
+    <string name="export_progress_message">%1$sにエクスポート中…</string>
+    <string name="export_success">%1$sを「%2$s」にエクスポートしました</string>
    <string name="export_title">エクスポート先…</string>
-    <string name="external_storage_not_available">外部ストレージをご利用いただけません</string>
-    <string name="external_storage_not_writable">外部ストレージは書き込み可能ではありません</string>
    <string name="files_few">%1$d個のファイル</string>
    <string name="files_many">%1$d個のファイル</string>
    <string name="files_one">1個のファイル</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">세그먼트</string>
    <string name="export_all_option">모두 %1$s 형식으로</string>
    <string name="export_all_title">외부 저장소로 내보내기</string>
-    <string name="export_external_storage">외부 저장소</string>
-    <string name="export_external_storage_error">%2$s개 중 %1$d개를 %3$s(으)로 내보냈습니다.</string>
-    <string name="export_external_storage_option">%1$s 형식으로 %2$s(으)로</string>
-    <string name="export_external_storage_progress_message">%1$s(으)로 내보내기 중…</string>
-    <string name="export_external_storage_success">%1$s개를 %2$s(으)로 내보냈습니다.</string>
+    <string name="export_error">%2$s개 중 %1$d개를 %3$s(으)로 내보냈습니다.</string>
+    <string name="export_option">%1$s 형식으로 %2$s(으)로</string>
+    <string name="export_progress_message">%1$s(으)로 내보내기 중…</string>
+    <string name="export_success">%1$s개를 %2$s(으)로 내보냈습니다.</string>
    <string name="export_title">내보내기…</string>
-    <string name="external_storage_not_available">외부 저장소를 사용할 수 없습니다.</string>
-    <string name="external_storage_not_writable">외부 저장소에 쓸 수 없습니다.</string>
    <string name="files_few">파일 %1$d개</string>
    <string name="files_many">파일 %1$d개</string>
    <string name="files_one">파일 1개</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Atkarpa</string>
    <string name="export_all_option">Visi kaip %1$s</string>
    <string name="export_all_title">Eksportuoti į išorinę saugyklą</string>
-    <string name="export_external_storage">Išorinė saugykla</string>
-    <string name="export_external_storage_error">Eksportuota: %1$d iš %2$s į %3$s.</string>
-    <string name="export_external_storage_option">kaip %1$s į %2$s</string>
-    <string name="export_external_storage_progress_message">Eksportuojama į %1$s…</string>
-    <string name="export_external_storage_success">Eksportuota: %1$s į %2$s.</string>
+    <string name="export_error">Eksportuota: %1$d iš %2$s į %3$s.</string>
+    <string name="export_option">kaip %1$s į %2$s</string>
+    <string name="export_progress_message">Eksportuojama į %1$s…</string>
+    <string name="export_success">Eksportuota: %1$s į %2$s.</string>
    <string name="export_title">Eksportuoti į…</string>
-    <string name="external_storage_not_available">Išorinė saugykla nepasiekiama</string>
-    <string name="external_storage_not_writable">Išorinė saugykla neįrašoma</string>
    <string name="files_few">%1$d failai</string>
    <string name="files_many">%1$d failai</string>
    <string name="files_one">1 failas</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Posms</string>
    <string name="export_all_option">Visus kā %1$s</string>
    <string name="export_all_title">Eksportēšana uz ārējo krātuvi</string>
-    <string name="export_external_storage">Ārējā krātuve</string>
-    <string name="export_external_storage_error">Mapē %3$s eksportēts(-i) %1$d maršruts(-i) no %2$s</string>
-    <string name="export_external_storage_option">kā %1$s uz %2$s</string>
-    <string name="export_external_storage_progress_message">Notiek eksportēšana uz %1$s…</string>
-    <string name="export_external_storage_success">Mapē %2$s eksportēts(-i) %1$s maršruts(-i)</string>
+    <string name="export_error">Mapē %3$s eksportēts(-i) %1$d maršruts(-i) no %2$s</string>
+    <string name="export_option">kā %1$s uz %2$s</string>
+    <string name="export_progress_message">Notiek eksportēšana uz %1$s…</string>
+    <string name="export_success">Mapē %2$s eksportēts(-i) %1$s maršruts(-i)</string>
    <string name="export_title">Eksportēšana uz…</string>
-    <string name="external_storage_not_available">Ārējā atmiņa nav pieejama</string>
-    <string name="external_storage_not_writable">Ārējā atmiņā nav iespējams rakstīt</string>
    <string name="files_few">%1$d faili</string>
    <string name="files_many">%1$d faili</string>
    <string name="files_one">1 fails</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segment</string>
    <string name="export_all_option">Toate ca %1$s</string>
    <string name="export_all_title">Salvați în stocarea externă</string>
-    <string name="export_external_storage">Stocarea externă</string>
-    <string name="export_external_storage_error">S-a(u) exportat %1$d din %2$s în %3$s</string>
-    <string name="export_external_storage_option">ca %1$s în %2$s</string>
-    <string name="export_external_storage_progress_message">Se exportă în %1$s…</string>
-    <string name="export_external_storage_success">S-a(u) exportat %1$s în %2$s</string>
+    <string name="export_error">S-a(u) exportat %1$d din %2$s în %3$s</string>
+    <string name="export_option">ca %1$s în %2$s</string>
+    <string name="export_progress_message">Se exportă în %1$s…</string>
+    <string name="export_success">S-a(u) exportat %1$s în %2$s</string>
    <string name="export_title">Exportați în…</string>
-    <string name="external_storage_not_available">Stocarea externă nu este disponibilă</string>
-    <string name="external_storage_not_writable">Nu se poate scrie în stocarea externă</string>
    <string name="files_few">%1$d fișiere</string>
    <string name="files_many">%1$d (de) fișiere</string>
    <string name="files_one">1 fișier</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segmen</string>
    <string name="export_all_option">Semua sebagai %1$s</string>
    <string name="export_all_title">Eksport ke storan luaran</string>
-    <string name="export_external_storage">Storan luaran</string>
-    <string name="export_external_storage_error">%1$d daripada %2$s dieksport ke %3$s</string>
-    <string name="export_external_storage_option">sebagai %1$s ke %2$s</string>
-    <string name="export_external_storage_progress_message">Mengeksport ke %1$s…</string>
-    <string name="export_external_storage_success">%1$s dieksport ke %2$s</string>
+    <string name="export_error">%1$d daripada %2$s dieksport ke %3$s</string>
+    <string name="export_option">sebagai %1$s ke %2$s</string>
+    <string name="export_progress_message">Mengeksport ke %1$s…</string>
+    <string name="export_success">%1$s dieksport ke %2$s</string>
    <string name="export_title">Eksport ke…</string>
-    <string name="external_storage_not_available">Storan luaran tidak tersedia</string>
-    <string name="external_storage_not_writable">Storan luaran tidak boleh tulis</string>
    <string name="files_few">%1$d fail</string>
    <string name="files_many">%1$d fail</string>
    <string name="files_one">1 fail</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segment</string>
    <string name="export_all_option">Alle som %1$s</string>
    <string name="export_all_title">Eksporter til ekstern lagringsplass</string>
-    <string name="export_external_storage">Ekstern lagringsplass</string>
-    <string name="export_external_storage_error">%1$d av %2$s ble eksportert til %3$s</string>
-    <string name="export_external_storage_option">som %1$s til %2$s</string>
-    <string name="export_external_storage_progress_message">Eksporterer til %1$s…</string>
-    <string name="export_external_storage_success">%1$s ble eksportert til %2$s</string>
+    <string name="export_error">%1$d av %2$s ble eksportert til %3$s</string>
+    <string name="export_option">som %1$s til %2$s</string>
+    <string name="export_progress_message">Eksporterer til %1$s…</string>
+    <string name="export_success">%1$s ble eksportert til %2$s</string>
    <string name="export_title">Eksporter til …</string>
-    <string name="external_storage_not_available">Den eksterne lagringsplassen er ikke tilgjengelig</string>
-    <string name="external_storage_not_writable">Den eksterne lagringsplassen kan ikke skrives til</string>
    <string name="files_few">%1$d filer</string>
    <string name="files_many">%1$d filer</string>
    <string name="files_one">1 fil</string>
@@ -1,5 +1,95 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <resources>
+    <string name="about_preference_title">Over OpenTracks</string>
+    <string name="about_description"><i>OpenTracks</i> is een sporttrackingapplicatie die uw privacy volledig respecteert.</string>
+    <string name="about_url">Project webpagina: <a href="%1$s">%1$s</a></string>
+    <string name="about_version_name">Versie naam: %1$s</string>
+    <string name="about_version_code">Versiecode: %1$d</string>
+    <string name="about_history">OpenTracks is een vork van <a href="https://code.google.com/archive/p/mytracks/"><i>Google\s MyTracks</i></a> (stopgezet in 2016).</string>
+    <string name="about_libraries">Bibliotheken</string>
+    <!-- Help -->
+    <string name="help_feature_title">OpenTracks heeft de volgende kenmerken:</string>
+    <string name="help_feature_content">
+* creëer GPS tracks
+* gebruik een hartslagsensor (alleen Bluetooth LE)...
+* spraakaankondigingen (op tijd of afstand)...
+* creëer markers (incl. fotos)
+* werkt volledig offline
+* toon tracks op een kaart (zie hieronder)</string>
+
+    <string name="help_track_map_title">Hoe toon je een spoor op een kaart?</string>
+    <string name="help_track_map_content">
+Gebruik het kleine kaarticoontje.
+a)
+(live updates) Installeer <a href="https://github.com/OpenTracksApp/OSMDashboard">OSMDashboard</a>.
+Het biedt online of offline kaarten via <a href="https://www.openstreetmap.org">OpenStreetmap</a>.\n
+Eigenlijk is OSMDashboard een aparte app die alleen (tijdelijk) toegang heeft tot de gegevens van track(s) die getoond gaan worden.
+
+\n
+b)
+Via een "normale" kaarttoepassing (bijv. <a href="http://osmand.net/">OsmAnd</a> en <a href="https://maps.me/">MAPS.ME</a>).
+Deze app moet het KMZ-bestandsformaat ondersteunen (alleen locaties en tijdstempels).
+In feite moet een app <i>ACTION_VIEW</i> ondersteunen met MIME <i>application/vnd.google-earth.kmz</i>.
+</string>
+
+    <string name="help_storage_pictures_title">Hoe slaat OpenTracks fotos op die als markers zijn genomen?</string>
+    <string name="help_storage_pictures_content">Deze worden opgeslagen in de interne opslag van de app (d.w.z. alleen toegankelijk binnen OpenTracks).</string>
+
+    <string name="help_track_export_title">Hoe kan ik opgenomen tracks exporteren/delen?</string>
+    <string name="help_track_export_content">
+Tracks kunnen worden geëxporteerd vanuit de instellingen als KMZ, KML of GPX.
+KMZ/KML alle gegevens; GPX alleen locaties.
+Tracks die worden gedeeld via het <i>share-icoontje</i> worden gedeeld als KMZ.</string>
+
+    <string name="help_data_google_play_services_title">Heeft OpenTracks Google Play Service nodig/gebruikt?</string>
+
+    <string name="help_recording_title">Hoe legt OpenTracks gegevens vast?</string>
+    <string name="help_recording_content">
+OpenTracks gebruikt de GPS-sensor van het apparaat om de locatie continu te registreren.
+Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid, hoogte), kan OpenTracks daar niets aan doen.</string>
+
+    <string name="help_data_storage_title">Hoe slaat OpenTracks sensorgegevens op?</string>
+    <string name="help_data_storage_content">
+ De sensorgegevens worden per opgenomen locatie opgeslagen.
+In termen van een hartslagsensor betekent dit dat slechts <i>een</i> hartslagmeting per locatie wordt opgeslagen.
+Als u stilstaat of binnenshuis bent, worden er geen sensorgegevens geregistreerd (maar wel getoond).</string>
+
+    <string name="help_gps_troubleshooting_title">OpenTracks neemt geen locaties op?</string>
+    <string name="help_gps_troubleshooting_content">
+Wat kun je doen?
+a) controleer of de GPS is ingeschakeld.
+b) het verbeteren van de GPS-ontvangst (bijv. naar buiten gaan),\n
+c) controleer of met <a href="https://f-droid.org/en/packages/com.android.gpstest.osmdroid/">GPSTest</a> app, en
+d) schakel stroombesparing uit.
+\n
+Als alles niet helpt, meldt u dan alstublieft een bug.</string>
+
+    <string name="help_support_title">Hoe kan ik OpenTracks ondersteunen?</string>
+    <string name="help_support_content">
+Je kunt...
+a) het woord verspreiden over OpenTracks, en...
+b) <a href="https://github.com/OpenTracksApp/OpenTracks/issues">voorstellen van functies</a>,\n
+c) <a href="https://github.com/OpenTracksApp/OpenTracks/issues">melding van bugs</a>,\n
+d) hulp bij de ontwikkeling van software.
+e) koop in <a href="https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore">Google Play Store</a>,\n
+f) doneert u, en
+g) doe wat je denkt dat OpenTracks helpt.</string>
+
+    <!-- Activity Type -->
    <string name="activity_type_airplane">vliegtuig</string>
    <string name="activity_type_atv">quad</string>
    <string name="activity_type_biking">fietsen</string>
@@ -66,6 +156,8 @@
    <string name="activity_type_walking">wandelen</string>
    <string name="activity_type_water_skiing">waterskiën</string>
    <string name="activity_type_wind_surfing">windsurfen</string>
+    <string name="app_not_installed_show_on_map">Installeer een app die de presentatie van kaartgegevens ondersteunt.</string>
+    <!-- Description -->
    <string name="description_activity_type">Type activiteit: %1$s</string>
    <string name="description_average_moving_pace_in_minute">Gemiddeld verplaatsingstempo: %1$s min/km (%2$s min/mi)</string>
    <string name="description_average_moving_speed">Gemiddelde verplaatsingssnelheid: %1$.2f km/u (%2$.1f mi/u)</string>
@@ -93,6 +185,7 @@
    <string name="description_sensor_cadence">Cadans (tpm)</string>
    <string name="description_sensor_heart_rate">Hartslag (spm)</string>
    <string name="description_sensor_power">Vermogen (W)</string>
+    <string name="description_default_speed_or_pace">By activity type</string>
    <string name="description_speed_imperial">Snelheid (mi/u)</string>
    <string name="description_speed_metric">Snelheid (km/u)</string>
    <string name="description_time">Tijd</string>
@@ -100,22 +193,25 @@
    <string name="description_total_time">Totale tijd: %1$s</string>
    <string name="description_track_point">Punt</string>
    <string name="description_track_segment">Segment</string>
+    <!-- Export -->
    <string name="export_all_option">Alles als %1$s</string>
    <string name="export_all_title">Exporteren naar externe opslag</string>
-    <string name="export_external_storage">Externe opslag</string>
-    <string name="export_external_storage_error">%1$d van %2$s geëxporteerd naar %3$s</string>
-    <string name="export_external_storage_option">als %1$s naar %2$s</string>
-    <string name="export_external_storage_progress_message">Exporteren naar %1$s…</string>
-    <string name="export_external_storage_success">%1$s geëxporteerd naar %2$s</string>
+    <string name="export_with_photos">met fotos</string>
+    <string name="export_without_photos">zonder fotos</string>
+    <string name="export_error">%1$d van %2$s geëxporteerd naar %3$s</string>
+    <string name="export_option">als %1$s naar %2$s</string>
+    <string name="export_progress_message">Exporteren naar %1$s…</string>
+    <string name="export_success">%1$s geëxporteerd naar %2$s</string>
    <string name="export_title">Exporteren naar…</string>
-    <string name="external_storage_not_available">Externe opslag is niet beschikbaar</string>
-    <string name="external_storage_not_writable">Kan niet schrijven naar externe opslag</string>
+    <!-- External Storage -->
+    <!-- Files -->
    <string name="files_few">%1$d bestanden</string>
    <string name="files_many">%1$d bestanden</string>
    <string name="files_one">1 bestand</string>
    <string name="files_other">%1$d bestanden</string>
    <string name="files_two">2 bestanden</string>
    <string name="files_zero">0 bestanden</string>
+    <!-- Generic -->
    <string name="generic_add">Toevoegen</string>
    <string name="generic_cancel">Annuleren</string>
    <string name="generic_delete_all_confirm_title">Alles verwijderen?</string>
@@ -134,6 +230,7 @@
    <string name="generic_success_title">Geslaagd</string>
    <string name="generic_tracks">Routes</string>
    <string name="generic_yes">Ja</string>
+    <!-- Gps -->
    <string name="gps_location_access">\'Locatietoegang\'</string>
    <string name="gps_disabled">GPS is niet ingeschakeld. Tik hier om naar %1$s te gaan. Druk op de knop \'Terug\' om terug te keren.</string>
    <string name="gps_disabled_location_mode">Selecteer de locatiemodus met hoge nauwkeurigheid. Tik hier om naar %1$s te gaan. Druk op de knop \'Terug\' om terug te keren.</string>
@@ -145,6 +242,7 @@
    <string name="gps_stopping">GPS stoppen</string>
    <string name="gps_wait_for_better_signal">Wachten op een beter GPS-signaal</string>
    <string name="gps_wait_for_signal">Wachten op GPS-signaal</string>
+    <!-- Image -->
    <string name="image_application">App</string>
    <string name="image_arrow">Pijl</string>
    <string name="image_marker">Markering</string>
@@ -155,6 +253,7 @@
    <string name="image_record">Opnemen</string>
    <string name="image_stop">Stoppen</string>
    <string name="image_track">Route</string>
+    <!-- Import -->
    <string name="import_error">%1$d van %2$s geïmporteerd uit %3$s</string>
    <string name="import_no_directory">%1$s bestaat niet</string>
    <string name="import_no_file">Er zijn geen bestanden om te importeren. Verbind uw apparaat met uw computer en plaats de bestanden die u wilt importeren in %1$s.</string>
@@ -163,9 +262,11 @@
    <string name="import_selection_option">Alle %1$s-bestanden</string>
    <string name="import_selection_title">Importeren uit externe opslag</string>
    <string name="import_success">%1$s geïmporteerd uit %2$s</string>
+    <!-- Marker -->
    <string name="marker_add_error">Kan geen markering invoegen. Er is geen GPS-signaal. Probeer het opnieuw.</string>
    <string name="marker_add_success">Markering is ingevoegd</string>
    <string name="marker_add_canceled">Geannuleerd, geen markering toegevoegd</string>
+    <string name="marker_add_photo_canceled">Geannuleerd, geen fotomarker toegevoegd</string>
    <string name="marker_delete_all_confirm_message">Alle markeringen voor deze route worden definitief verwijderd van het apparaat</string>
    <string name="marker_delete_one_confirm_message">De markering wordt definitief verwijderd van het apparaat</string>
    <string name="marker_delete_one_confirm_title">Markering verwijderen?</string>
@@ -175,10 +276,14 @@
    <string name="marker_name_format">Markering %1$d</string>
    <string name="marker_split_name_format">Splitsing %1$d</string>
    <string name="marker_title">%1$d van %2$d</string>
+    <!-- Marker Detail -->
    <string name="marker_detail_statistics_title">Sinds laatste splitsmarkering:</string>
+    <!-- Marker Edit -->
    <string name="marker_edit_marker_type">Type markering (bijv. waterval)</string>
    <string name="marker_edit_marker_type_hint">Type markering</string>
+    <!-- Marker List -->
    <string name="marker_list_empty_message">U heeft geen markeringen</string>
+    <!-- Menu -->
    <string name="menu_aggregated_statistics">Statistieken</string>
    <string name="menu_delete">Verwijderen</string>
    <string name="menu_delete_all">Alles verwijderen</string>
@@ -192,6 +297,7 @@
    <string name="menu_import_all">Alles importeren</string>
    <string name="menu_insert_marker">Markering invoegen</string>
    <string name="menu_insert_photo">Foto invoegen</string>
+    <string name="menu_insert_gallery_img">Galerijafbeelding invoegen</string>
    <string name="menu_map">Kaart</string>
    <string name="menu_markers">Markeringen</string>
    <string name="menu_play">Afspelen</string>
@@ -206,12 +312,18 @@
    <string name="menu_stop_gps">GPS stoppen</string>
    <string name="menu_view_photo">Foto weergeven</string>
    <string name="menu_voice_frequency">Frequentie voor gesproken berichten</string>
+    <string name="menu_resume_track">Hervat spoor</string>
+    <!-- OpenTracks -->
    <string name="app_name">OpenTracks</string>
    <string name="recording_service">Opnameservice</string>
+    <!-- Permission -->
+    <string name="permission_gps_failed">Voor OpenTracks is toestemming nodig om GPS te gebruiken.</string>
+    <!-- Search -->
    <string name="search_global_description">Routes en markeringen</string>
    <string name="search_list_empty_message">Er zijn geen routes of markeringen gevonden die overeenkomen met uw zoekopdracht</string>
    <string name="search_list_marker_track_location">In route \'%1$s\'.</string>
    <string name="search_voice_prompt">Spreek de naam van een route of markering in</string>
+    <!-- Sensor State -->
    <string name="sensor_state_battery">Accuniveau</string>
    <string name="sensor_state_cadence">Cadans</string>
    <string name="sensor_state_cadence_value">%1$d tpm</string>
@@ -224,12 +336,22 @@
    <string name="sensor_state_power">Vermogen</string>
    <string name="sensor_state_power_value">%1$d W</string>
    <string name="sensor_state_sending">Bezig met verzenden</string>
+    <string name="sensor_not_known">Sensor %1$s is onbekend. Controleer de instellingen.</string>
+    <string name="sensor_could_not_scan">Kon niet scannen naar Bluetooth-apparaten (fout %1$i).</string>
+    <string name="bluetooth_disabled">Schakel Bluetooth in.</string><!-- Settings -->
    <string name="settings_not_while_recording">Niet beschikbaar tijdens het opnemen van een route</string>
    <string name="settings_show">Weergeven</string>
+    <!-- Settings Advanced -->
    <string name="settings_advanced">Geavanceerd</string>
+    <!-- Settings Chart -->
    <string name="settings_chart_by_distance">Op afstand</string>
    <string name="settings_chart_by_time">Op tijd</string>
    <string name="settings_chart_x_axis">X-as</string>
+    <!-- Settings Recording -->
+    <string name="settings_recording_show_on_lockscreen_while_recording_title">Toon de statistieken op het slotscherm.</string>
+    <string name="settings_recording_show_on_lockscreen_while_recording_summary">Toon tijdens de opname de statistieken zonder het apparaat te ontgrendelen.</string>
+    <string name="settings_recording_keep_screen_on_while_recording_title">Houd het scherm aan</string>
+    <string name="settings_recording_keep_screen_on_while_recording_summary">Houd tijdens de opname het scherm aan.</string>
    <string name="settings_recording">Opname</string>
    <string name="settings_recording_auto_resume_track_timeout_always_summary">Een opname altijd hervatten nadat het apparaat opnieuw is opgestart</string>
    <string name="settings_recording_auto_resume_track_timeout_never_summary">Een opname nooit hervatten nadat het apparaat opnieuw is opgestart</string>
@@ -247,10 +369,13 @@
    <string name="settings_recording_track_name_date_local_option">Datum (lokaal)</string>
    <string name="settings_recording_track_name_number_option">Nummer</string>
    <string name="settings_recording_track_name_title">Standaardroutenaam</string>
+    <!-- Settings Reset -->
    <string name="settings_reset">Opnieuw instellen</string>
    <string name="settings_reset_confirm_message">Alle instellingen worden teruggezet op de standaardwaarden.</string>
    <string name="settings_reset_confirm_title">Nu opnieuw instellen?</string>
    <string name="settings_reset_done">Voor alle instellingen zijn de standaardwaarden teruggezet</string>
+    <string name="settings_error_initial_values_restored">Sorry, maar er is een fout gemaakt. Alle instellingen zijn teruggezet naar de standaardwaarden.</string>
+    <!-- Settings Sensor -->
    <string name="settings_sensor">Sensor</string>
    <string name="settings_sensor_ant_reset_bike_cadence_sensor">Cadans opnieuw instellen</string>
    <string name="settings_sensor_ant_reset_combined_bike_sensor">Cad/snel opnieuw instellen</string>
@@ -260,17 +385,25 @@
    <string name="settings_sensor_bluetooth_pairing">Koppelen via Bluetooth</string>
    <string name="settings_sensor_bluetooth_pairing_summary">Bluetooth-instellingen voor Android openen om een sensor te koppelen</string>
    <string name="settings_sensor_bluetooth_sensor">Bluetooth-sensor</string>
+    <string name="settings_sensor_connecting">Verbonden met %1$s</string>
    <string name="settings_sensor_connected">Verbonden met %1$s</string>
+    <string name="settings_sensor_disconnected">Ontkoppeld van %1$s</string>
+
+    <string name="settings_sensor_wheel_circumference">Wielmaat (ETRTO)</string>
+
+    <!-- Settings Stats -->
    <string name="settings_stats_coordinate">Breedte-/lengtegraad</string>
    <string name="settings_stats_rate_title">Voorkeursverhouding</string>
    <string name="settings_stats_units_imperial">Engels (mi, ft)</string>
    <string name="settings_stats_units_metric">Metrisch (km, m)</string>
    <string name="settings_stats_units_title">Voorkeurseenheden</string>
+    <!-- Share Track -->
    <string name="share_track_emails_hint">E-mailadressen</string>
    <string name="share_track_picker_title">App selecteren</string>
    <string name="share_track_share_file">Routebestand delen</string>
    <string name="share_track_share_file_body">Ik denk dat u misschien wel geïnteresseerd bent in deze route.\n\nAls u deze route wilt weergeven, kunt u Google Earth of andere kaartsoftware gebruiken.\n\n%1$s</string>
    <string name="share_track_subject">Ik wil graag een route met u delen</string>
+    <!-- Stats -->
    <string name="stats_average_moving_pace">Gem. verplaatsingstempo</string>
    <string name="stats_average_moving_speed">Gem. verplaatsingssnelheid</string>
    <string name="stats_average_pace">Gem. tempo</string>
@@ -289,28 +422,39 @@
    <string name="stats_speed">Snelheid</string>
    <string name="stats_distance">Afstand</string>
    <string name="stats_total_time">Totale tijd</string>
+    <!-- Track -->
    <string name="track_name_format">Route %1$d</string>
    <string name="track_record_notification">Uw route wordt opgenomen…</string>
+    <string name="track_recording_notification_accuracy">Locatie nauwkeurigheid: %1$s</string>
    <string name="track_markers">Markeringen voor %1$s</string>
+    <!-- Track Delete -->
    <string name="track_delete_one_confirm_message">De route en de bijbehorende markeringen worden definitief verwijderd van het apparaat.</string>
    <string name="track_delete_one_confirm_title">Route verwijderen?</string>
    <string name="track_delete_multiple_confirm_message">De geselecteerde routes en de bijbehorende markeringen worden definitief verwijderd van het apparaat.</string>
    <string name="track_delete_progress_message">Verwijderen…</string>
+    <!-- Track Detail -->
    <string name="track_detail_chart_tab">Grafiek</string>
    <string name="track_detail_stats_tab">Statistieken</string>
+    <string name="track_detail_record_success">Nieuwe route wordt nu opgenomen</string>
+    <string name="track_detail_resume_success">Nu hervatting van de baan</string>
+    <!-- Track Edit -->
    <string name="track_edit_activity_type">Type activiteit (bijv. trektocht)</string>
    <string name="track_edit_activity_type_hint">Type activiteit</string>
    <string name="track_edit_new_track_title">Nieuwe route</string>
+    <!-- Track List -->
    <string name="track_list_empty_message">Neem uw volgende avontuur hier op</string>
    <string name="track_list_record_error">Kan opname niet starten. Er is geen GPS-signaal. Probeer het opnieuw.</string>
    <string name="track_list_record_success">Nieuwe route wordt nu opgenomen</string>
+    <!-- Track Widget -->
    <string name="track_widget_config_title">Widget-items configureren</string>
+    <!-- Tracks -->
    <string name="tracks_few">%1$d routes</string>
    <string name="tracks_many">%1$d routes</string>
    <string name="tracks_one">1 route</string>
    <string name="tracks_other">%1$d routes</string>
    <string name="tracks_two">2 routes</string>
    <string name="tracks_zero">0 routes</string>
+    <!-- Unit -->
    <string name="unit_feet">ft</string>
    <string name="unit_kilometer">km</string>
    <string name="unit_kilometer_per_hour">km/h</string>
@@ -319,6 +463,7 @@
    <string name="unit_mile_per_hour">mi/h</string>
    <string name="unit_minute_per_kilometer">min/km</string>
    <string name="unit_minute_per_mile">min/mi</string>
+    <!-- Value -->
    <string name="value_adapt_accuracy">Aanpassen voor nauwkeurigheid</string>
    <string name="value_adapt_battery_life">Aanpassen voor resterende accutijd</string>
    <string name="value_always">Altijd</string>
@@ -348,6 +493,7 @@
    <string name="value_off">Uit</string>
    <string name="value_smallest">Kleinste</string>
    <string name="value_smallest_recommended">Kleinste (aanbevolen)</string>
+    <!-- Voice -->
    <string name="voice_hours_few">%1$d uur</string>
    <string name="voice_hours_many">%1$d uur</string>
    <string name="voice_hours_one">1 uur</string>
@@ -394,6 +540,7 @@
    <string name="voice_total_distance_miles_two">totale afstand 2 mijl</string>
    <string name="voice_total_distance_miles_zero">totale afstand 0 mijl</string>
    <string name="voice_total_distance_zero">Totale afstand van OpenTracks is nul.</string>
+    <!-- Waypoint Type -->
    <string name="waypoint_type_atm">Pinautomaat</string>
    <string name="waypoint_type_bank">bank</string>
    <string name="waypoint_type_bar">bar</string>
@@ -445,4 +592,7 @@
    <string name="waypoint_type_waterfall">waterval</string>
    <string name="waypoint_type_water_fountain">waterfontein</string>
    <string name="waypoint_type_waypoint">routepunt</string>
+    <!-- Share image -->
+    <string name="share_image_subject">Ik wil graag een beeld met u delen</string>
+    <string name="share_image_body">Ik denk dat je misschien geïnteresseerd bent in dit beeld.</string>
 </resources>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segment</string>
    <string name="export_all_option">Alle som %1$s</string>
    <string name="export_all_title">Eksporter til ekstern lagringsplass</string>
-    <string name="export_external_storage">Ekstern lagringsplass</string>
-    <string name="export_external_storage_error">%1$d av %2$s ble eksportert til %3$s</string>
-    <string name="export_external_storage_option">som %1$s til %2$s</string>
-    <string name="export_external_storage_progress_message">Eksporterer til %1$s…</string>
-    <string name="export_external_storage_success">%1$s ble eksportert til %2$s</string>
+    <string name="export_error">%1$d av %2$s ble eksportert til %3$s</string>
+    <string name="export_option">som %1$s til %2$s</string>
+    <string name="export_progress_message">Eksporterer til %1$s…</string>
+    <string name="export_success">%1$s ble eksportert til %2$s</string>
    <string name="export_title">Eksporter til …</string>
-    <string name="external_storage_not_available">Den eksterne lagringsplassen er ikke tilgjengelig</string>
-    <string name="external_storage_not_writable">Den eksterne lagringsplassen kan ikke skrives til</string>
    <string name="files_few">%1$d filer</string>
    <string name="files_many">%1$d filer</string>
    <string name="files_one">1 fil</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segment</string>
    <string name="export_all_option">Wszystko jako pliki %1$s</string>
    <string name="export_all_title">Eksport do pamięci zewnętrznej</string>
-    <string name="export_external_storage">Pamięć zewnętrzna</string>
-    <string name="export_external_storage_error">Wyeksportowano %1$d z %2$s do folderu %3$s</string>
-    <string name="export_external_storage_option">jako pliki %1$s do folderu %2$s</string>
-    <string name="export_external_storage_progress_message">Eksportuję do %1$s…</string>
-    <string name="export_external_storage_success">Wyeksportowano %1$s do folderu %2$s</string>
+    <string name="export_error">Wyeksportowano %1$d z %2$s do folderu %3$s</string>
+    <string name="export_option">jako pliki %1$s do folderu %2$s</string>
+    <string name="export_progress_message">Eksportuję do %1$s…</string>
+    <string name="export_success">Wyeksportowano %1$s do folderu %2$s</string>
    <string name="export_title">Wyeksportuj do…</string>
-    <string name="external_storage_not_available">Pamięć zewnętrzna nie jest dostępna</string>
-    <string name="external_storage_not_writable">Pamięć zewnętrzna nie umożliwia zapisu.</string>
    <string name="files_few">%1$d pliki</string>
    <string name="files_many">%1$d plików</string>
    <string name="files_one">1 plik</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segmento</string>
    <string name="export_all_option">Todas como %1$s</string>
    <string name="export_all_title">Exportar para o armazenamento externo</string>
-    <string name="export_external_storage">Armazenamento externo</string>
-    <string name="export_external_storage_error">Exportação: %1$d de %2$s para %3$s</string>
-    <string name="export_external_storage_option">como %1$s em %2$s</string>
-    <string name="export_external_storage_progress_message">Exportando para %1$s…</string>
-    <string name="export_external_storage_success">Exportação: %1$s para %2$s</string>
+    <string name="export_error">Exportação: %1$d de %2$s para %3$s</string>
+    <string name="export_option">como %1$s em %2$s</string>
+    <string name="export_progress_message">Exportando para %1$s…</string>
+    <string name="export_success">Exportação: %1$s para %2$s</string>
    <string name="export_title">Exportar para…</string>
-    <string name="external_storage_not_available">Armazenamento externo indisponível</string>
-    <string name="external_storage_not_writable">Armazenamento externo não gravável</string>
    <string name="files_few">%1$d arquivos</string>
    <string name="files_many">%1$d arquivos</string>
    <string name="files_one">1 arquivo</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segmento</string>
    <string name="export_all_option">Todos como %1$s</string>
    <string name="export_all_title">Exportar para armazenamento externo</string>
-    <string name="export_external_storage">Armazenamento externo</string>
-    <string name="export_external_storage_error">%1$d de %2$s exportados para %3$s</string>
-    <string name="export_external_storage_option">como %1$s para %2$s</string>
-    <string name="export_external_storage_progress_message">A exportar para %1$s …</string>
-    <string name="export_external_storage_success">%1$s exportados para %2$s</string>
+    <string name="export_error">%1$d de %2$s exportados para %3$s</string>
+    <string name="export_option">como %1$s para %2$s</string>
+    <string name="export_progress_message">A exportar para %1$s …</string>
+    <string name="export_success">%1$s exportados para %2$s</string>
    <string name="export_title">Exportar para…</string>
-    <string name="external_storage_not_available">Armazenamento externo indisponível</string>
-    <string name="external_storage_not_writable">Armazenamento externo não regravável</string>
    <string name="files_few">%1$d ficheiros</string>
    <string name="files_many">%1$d ficheiros</string>
    <string name="files_one">1 ficheiro</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segmento</string>
    <string name="export_all_option">Todas como %1$s</string>
    <string name="export_all_title">Exportar para o armazenamento externo</string>
-    <string name="export_external_storage">Armazenamento externo</string>
-    <string name="export_external_storage_error">Exportação: %1$d de %2$s para %3$s</string>
-    <string name="export_external_storage_option">como %1$s em %2$s</string>
-    <string name="export_external_storage_progress_message">Exportando para %1$s…</string>
-    <string name="export_external_storage_success">Exportação: %1$s para %2$s</string>
+    <string name="export_error">Exportação: %1$d de %2$s para %3$s</string>
+    <string name="export_option">como %1$s em %2$s</string>
+    <string name="export_progress_message">Exportando para %1$s…</string>
+    <string name="export_success">Exportação: %1$s para %2$s</string>
    <string name="export_title">Exportar para…</string>
-    <string name="external_storage_not_available">Armazenamento externo indisponível</string>
-    <string name="external_storage_not_writable">Armazenamento externo não gravável</string>
    <string name="files_few">%1$d arquivos</string>
    <string name="files_many">%1$d arquivos</string>
    <string name="files_one">1 arquivo</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segment</string>
    <string name="export_all_option">Toate ca %1$s</string>
    <string name="export_all_title">Salvați în stocarea externă</string>
-    <string name="export_external_storage">Stocarea externă</string>
-    <string name="export_external_storage_error">S-a(u) exportat %1$d din %2$s în %3$s</string>
-    <string name="export_external_storage_option">ca %1$s în %2$s</string>
-    <string name="export_external_storage_progress_message">Se exportă în %1$s…</string>
-    <string name="export_external_storage_success">S-a(u) exportat %1$s în %2$s</string>
+    <string name="export_error">S-a(u) exportat %1$d din %2$s în %3$s</string>
+    <string name="export_option">ca %1$s în %2$s</string>
+    <string name="export_progress_message">Se exportă în %1$s…</string>
+    <string name="export_success">S-a(u) exportat %1$s în %2$s</string>
    <string name="export_title">Exportați în…</string>
-    <string name="external_storage_not_available">Stocarea externă nu este disponibilă</string>
-    <string name="external_storage_not_writable">Nu se poate scrie în stocarea externă</string>
    <string name="files_few">%1$d fișiere</string>
    <string name="files_many">%1$d (de) fișiere</string>
    <string name="files_one">1 fișier</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Сегмент</string>
    <string name="export_all_option">Все как %1$s-файлы</string>
    <string name="export_all_title">Экспортировать на внешний накопитель</string>
-    <string name="export_external_storage">Внешний накопитель</string>
-    <string name="export_external_storage_error">Экспортировано: %1$d из %2$s (в %3$s)</string>
-    <string name="export_external_storage_option">как %1$s-файлы в %2$s</string>
-    <string name="export_external_storage_progress_message">Экспорт в папку %1$s…</string>
-    <string name="export_external_storage_success">Экспортировано: %1$s (в %2$s)</string>
+    <string name="export_error">Экспортировано: %1$d из %2$s (в %3$s)</string>
+    <string name="export_option">как %1$s-файлы в %2$s</string>
+    <string name="export_progress_message">Экспорт в папку %1$s…</string>
+    <string name="export_success">Экспортировано: %1$s (в %2$s)</string>
    <string name="export_title">Экспорт в…</string>
-    <string name="external_storage_not_available">Внешний накопитель недоступен</string>
-    <string name="external_storage_not_writable">Не удается сохранить данные на внешний накопитель</string>
    <string name="files_few">%1$d файла</string>
    <string name="files_many">%1$d файлов</string>
    <string name="files_one">1 файл</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segment</string>
    <string name="export_all_option">Všetky vo formáte %1$s</string>
    <string name="export_all_title">Exportovať do externého úložiska</string>
-    <string name="export_external_storage">Externé úložisko</string>
-    <string name="export_external_storage_error">Do adresára %3$s bol exportovaný nasledujúci počet trás: %1$d z %2$s</string>
-    <string name="export_external_storage_option">vo formáte %1$s do adresára %2$s</string>
-    <string name="export_external_storage_progress_message">Prebieha exportovanie do adresára %1$s…</string>
-    <string name="export_external_storage_success">Do adresára %2$s bol exportovaný nasledujúci počet trás: %1$s</string>
+    <string name="export_error">Do adresára %3$s bol exportovaný nasledujúci počet trás: %1$d z %2$s</string>
+    <string name="export_option">vo formáte %1$s do adresára %2$s</string>
+    <string name="export_progress_message">Prebieha exportovanie do adresára %1$s…</string>
+    <string name="export_success">Do adresára %2$s bol exportovaný nasledujúci počet trás: %1$s</string>
    <string name="export_title">Exportovať do…</string>
-    <string name="external_storage_not_available">Externé úložisko nie je k dispozícii</string>
-    <string name="external_storage_not_writable">Do externého úložiska nie je možné zapisovať údaje</string>
    <string name="files_few">%1$d súbory</string>
    <string name="files_many">%1$d súborov</string>
    <string name="files_one">1 súbor</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Odsek</string>
    <string name="export_all_option">Vse kot %1$s</string>
    <string name="export_all_title">Izvozi v zunanji pomnilnik</string>
-    <string name="export_external_storage">Zunanji pomnilnik</string>
-    <string name="export_external_storage_error">Izvoženih %1$d od %2$s v %3$s</string>
-    <string name="export_external_storage_option">kot %1$s v %2$s</string>
-    <string name="export_external_storage_progress_message">Izvažanje v %1$s …</string>
-    <string name="export_external_storage_success">Izvoženih %1$s v %2$s</string>
+    <string name="export_error">Izvoženih %1$d od %2$s v %3$s</string>
+    <string name="export_option">kot %1$s v %2$s</string>
+    <string name="export_progress_message">Izvažanje v %1$s …</string>
+    <string name="export_success">Izvoženih %1$s v %2$s</string>
    <string name="export_title">Izvozi v …</string>
-    <string name="external_storage_not_available">Zunanji pomnilnik ni na voljo</string>
-    <string name="external_storage_not_writable">V zunanji pomnilnik ni mogoče pisati</string>
    <string name="files_few">št. datotek: %1$d</string>
    <string name="files_many">št. datotek: %1$d</string>
    <string name="files_one">1 datoteka</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Сегмент</string>
    <string name="export_all_option">Све као %1$s</string>
    <string name="export_all_title">Извоз у спољну меморију</string>
-    <string name="export_external_storage">Спољна меморија</string>
-    <string name="export_external_storage_error">Датотеке (%1$d од %2$s) су извезене у %3$s</string>
-    <string name="export_external_storage_option">као %1$s у %2$s</string>
-    <string name="export_external_storage_progress_message">Извоз у %1$s…</string>
-    <string name="export_external_storage_success">Датотеке (%1$s) су извезене у %2$s</string>
+    <string name="export_error">Датотеке (%1$d од %2$s) су извезене у %3$s</string>
+    <string name="export_option">као %1$s у %2$s</string>
+    <string name="export_progress_message">Извоз у %1$s…</string>
+    <string name="export_success">Датотеке (%1$s) су извезене у %2$s</string>
    <string name="export_title">Извоз у…</string>
-    <string name="external_storage_not_available">Спољна меморија није доступна</string>
-    <string name="external_storage_not_writable">Није могуће уписивати у спољну меморију</string>
    <string name="files_few">%1$d датотеке</string>
    <string name="files_many">%1$d датотека</string>
    <string name="files_one">1 датотека</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Sträcka</string>
    <string name="export_all_option">Alla som %1$s</string>
    <string name="export_all_title">Exportera till extern lagringsenhet</string>
-    <string name="export_external_storage">Extern lagringsenhet</string>
-    <string name="export_external_storage_error">Exporterade %1$d av %2$s till %3$s</string>
-    <string name="export_external_storage_option">som %1$s till %2$s</string>
-    <string name="export_external_storage_progress_message">Exporterar till %1$s …</string>
-    <string name="export_external_storage_success">Exporterade %1$s till %2$s</string>
+    <string name="export_error">Exporterade %1$d av %2$s till %3$s</string>
+    <string name="export_option">som %1$s till %2$s</string>
+    <string name="export_progress_message">Exporterar till %1$s …</string>
+    <string name="export_success">Exporterade %1$s till %2$s</string>
    <string name="export_title">Exportera till …</string>
-    <string name="external_storage_not_available">Extern lagring är inte tillgänglig</string>
-    <string name="external_storage_not_writable">Extern lagring inte skrivbar</string>
    <string name="files_few">%1$d filer</string>
    <string name="files_many">%1$d filer</string>
    <string name="files_one">1 fil</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">ส่วน</string>
    <string name="export_all_option">ทั้งหมดเป็น %1$s</string>
    <string name="export_all_title">ส่งออกไปยังที่จัดเก็บข้อมูลภายนอก</string>
-    <string name="export_external_storage">ที่จัดเก็บข้อมูลภายนอก</string>
-    <string name="export_external_storage_error">ส่งออกแล้ว %1$d จาก %2$s ไปยัง %3$s</string>
-    <string name="export_external_storage_option">เป็น %1$s ลงใน %2$s</string>
-    <string name="export_external_storage_progress_message">ส่งออกลงใน %1$s…</string>
-    <string name="export_external_storage_success">ส่งออก %1$s ไปยัง %2$s แล้ว</string>
+    <string name="export_error">ส่งออกแล้ว %1$d จาก %2$s ไปยัง %3$s</string>
+    <string name="export_option">เป็น %1$s ลงใน %2$s</string>
+    <string name="export_progress_message">ส่งออกลงใน %1$s…</string>
+    <string name="export_success">ส่งออก %1$s ไปยัง %2$s แล้ว</string>
    <string name="export_title">ส่งออกลงใน…</string>
-    <string name="external_storage_not_available">ที่จัดเก็บข้อมูลภายนอกไม่พร้อมใช้งาน</string>
-    <string name="external_storage_not_writable">ที่จัดเก็บข้อมูลภายนอกไม่สามารถเขียนได้</string>
    <string name="files_few">%1$d ไฟล์</string>
    <string name="files_many">%1$d ไฟล์</string>
    <string name="files_one">1 ไฟล์</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segment</string>
    <string name="export_all_option">Lahat bilang %1$s</string>
    <string name="export_all_title">I-export sa external storage</string>
-    <string name="export_external_storage">External storage</string>
-    <string name="export_external_storage_error">In-export ang %1$d ng %2$s patungo sa %3$s.</string>
-    <string name="export_external_storage_option">bilang %1$s patungo sa %2$s</string>
-    <string name="export_external_storage_progress_message">Ine-export sa %1$s…</string>
-    <string name="export_external_storage_success">In-export ang %1$s patungo sa %2$s</string>
+    <string name="export_error">In-export ang %1$d ng %2$s patungo sa %3$s.</string>
+    <string name="export_option">bilang %1$s patungo sa %2$s</string>
+    <string name="export_progress_message">Ine-export sa %1$s…</string>
+    <string name="export_success">In-export ang %1$s patungo sa %2$s</string>
    <string name="export_title">I-export sa…</string>
-    <string name="external_storage_not_available">Hindi available ang panlabas na storage</string>
-    <string name="external_storage_not_writable">Hindi writable ang panlabas na storage</string>
    <string name="files_few">%1$d (na) file</string>
    <string name="files_many">%1$d (na) file</string>
    <string name="files_one">1 file</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Segment</string>
    <string name="export_all_option">Tümünü %1$s biçiminde</string>
    <string name="export_all_title">Harici depolama ortamına aktar</string>
-    <string name="export_external_storage">Harici depolama ortamı</string>
-    <string name="export_external_storage_error">%1$d/%2$s %3$s hedefine dışa aktarıldı</string>
-    <string name="export_external_storage_option">%1$s biçiminde %2$s dizinine</string>
-    <string name="export_external_storage_progress_message">%1$s dizinine aktarılıyor…</string>
-    <string name="export_external_storage_success">%1$s %2$s hedefine dışa aktarıldı</string>
+    <string name="export_error">%1$d/%2$s %3$s hedefine dışa aktarıldı</string>
+    <string name="export_option">%1$s biçiminde %2$s dizinine</string>
+    <string name="export_progress_message">%1$s dizinine aktarılıyor…</string>
+    <string name="export_success">%1$s %2$s hedefine dışa aktarıldı</string>
    <string name="export_title">Şuraya aktar…</string>
-    <string name="external_storage_not_available">Harici depolama ortamı kullanılamıyor</string>
-    <string name="external_storage_not_writable">Harici depolama ortamına yazılamıyor</string>
    <string name="files_few">%1$d dosya</string>
    <string name="files_many">%1$d dosya</string>
    <string name="files_one">1 dosya</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Відрізок</string>
    <string name="export_all_option">Усе як %1$s</string>
    <string name="export_all_title">Експортувати в зовнішню пам’ять</string>
-    <string name="export_external_storage">Зовнішня пам’ять</string>
-    <string name="export_external_storage_error">Файли експортовано в папку %3$s: %1$d з %2$s</string>
-    <string name="export_external_storage_option">як %1$s в %2$s</string>
-    <string name="export_external_storage_progress_message">Триває експорт у %1$s…</string>
-    <string name="export_external_storage_success">Експортовано в папку %2$s: %1$s</string>
+    <string name="export_error">Файли експортовано в папку %3$s: %1$d з %2$s</string>
+    <string name="export_option">як %1$s в %2$s</string>
+    <string name="export_progress_message">Триває експорт у %1$s…</string>
+    <string name="export_success">Експортовано в папку %2$s: %1$s</string>
    <string name="export_title">Експорт у…</string>
-    <string name="external_storage_not_available">Зовнішня пам’ять недоступна</string>
-    <string name="external_storage_not_writable">Зовнішня пам’ять недоступна для запису</string>
    <string name="files_few">%1$d файли</string>
    <string name="files_many">%1$d файлів</string>
    <string name="files_one">1 файл</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">Đoạn đường</string>
    <string name="export_all_option">Tất cả dưới dạng %1$s</string>
    <string name="export_all_title">Xuất sang bộ nhớ ngoài</string>
-    <string name="export_external_storage">Bộ nhớ ngoài</string>
-    <string name="export_external_storage_error">Đã xuất %1$d / %2$s sang %3$s</string>
-    <string name="export_external_storage_option">dưới dạng %1$s sang %2$s</string>
-    <string name="export_external_storage_progress_message">Đang xuất sang %1$s…</string>
-    <string name="export_external_storage_success">Đã xuất %1$s sang %2$s</string>
+    <string name="export_error">Đã xuất %1$d / %2$s sang %3$s</string>
+    <string name="export_option">dưới dạng %1$s sang %2$s</string>
+    <string name="export_progress_message">Đang xuất sang %1$s…</string>
+    <string name="export_success">Đã xuất %1$s sang %2$s</string>
    <string name="export_title">Xuất sang…</string>
-    <string name="external_storage_not_available">Bộ nhớ ngoài không có sẵn</string>
-    <string name="external_storage_not_writable">Bộ nhớ ngoài không thể ghi được</string>
    <string name="files_few">%1$d tệp</string>
    <string name="files_many">%1$d tệp</string>
    <string name="files_one">1 tệp</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">路段</string>
    <string name="export_all_option">全部以 %1$s 格式匯</string>
    <string name="export_all_title">匯出至外部儲存空間</string>
-    <string name="export_external_storage">外部儲存空間</string>
-    <string name="export_external_storage_error">已將 %2$s 中的 %1$d 個匯出至 %3$s</string>
-    <string name="export_external_storage_option">以 %1$s 格式匯出至 %2$s</string>
-    <string name="export_external_storage_progress_message">正在匯出至 %1$s…</string>
-    <string name="export_external_storage_success">已將 %1$s 匯出至 %2$s</string>
+    <string name="export_error">已將 %2$s 中的 %1$d 個匯出至 %3$s</string>
+    <string name="export_option">以 %1$s 格式匯出至 %2$s</string>
+    <string name="export_progress_message">正在匯出至 %1$s…</string>
+    <string name="export_success">已將 %1$s 匯出至 %2$s</string>
    <string name="export_title">匯出至…</string>
-    <string name="external_storage_not_available">無法使用外部儲存空間</string>
-    <string name="external_storage_not_writable">無法寫入外部儲存空間</string>
    <string name="files_few">%1$d 個檔案</string>
    <string name="files_many">%1$d 個檔案</string>
    <string name="files_one">1 個檔案</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">路段</string>
    <string name="export_all_option">全部以 %1$s 格式匯</string>
    <string name="export_all_title">匯出至外部儲存空間</string>
-    <string name="export_external_storage">外部儲存空間</string>
-    <string name="export_external_storage_error">已將 %2$s 中的 %1$d 個匯出至 %3$s</string>
-    <string name="export_external_storage_option">以 %1$s 格式匯出至 %2$s</string>
-    <string name="export_external_storage_progress_message">正在匯出至 %1$s…</string>
-    <string name="export_external_storage_success">已將 %1$s 匯出至 %2$s</string>
+    <string name="export_error">已將 %2$s 中的 %1$d 個匯出至 %3$s</string>
+    <string name="export_option">以 %1$s 格式匯出至 %2$s</string>
+    <string name="export_progress_message">正在匯出至 %1$s…</string>
+    <string name="export_success">已將 %1$s 匯出至 %2$s</string>
    <string name="export_title">匯出至…</string>
-    <string name="external_storage_not_available">無法使用外部儲存空間</string>
-    <string name="external_storage_not_writable">無法寫入外部儲存空間</string>
    <string name="files_few">%1$d 個檔案</string>
    <string name="files_many">%1$d 個檔案</string>
    <string name="files_one">1 個檔案</string>
@@ -102,14 +102,11 @@
    <string name="description_track_segment">路段</string>
    <string name="export_all_option">全部以 %1$s 格式导</string>
    <string name="export_all_title">导出到外部存储设备</string>
-    <string name="export_external_storage">外部存储设备</string>
-    <string name="export_external_storage_error">已将%1$d条路线（共%2$s条）导出到%3$s</string>
-    <string name="export_external_storage_option">以 %1$s 格式导出到 %2$s</string>
-    <string name="export_external_storage_progress_message">正在导出到 %1$s…</string>
-    <string name="export_external_storage_success">已将%1$s导出到%2$s</string>
+    <string name="export_error">已将%1$d条路线（共%2$s条）导出到%3$s</string>
+    <string name="export_option">以 %1$s 格式导出到 %2$s</string>
+    <string name="export_progress_message">正在导出到 %1$s…</string>
+    <string name="export_success">已将%1$s导出到%2$s</string>
    <string name="export_title">导出到…</string>
-    <string name="external_storage_not_available">外部存储设备不可用</string>
-    <string name="external_storage_not_writable">外部存储设备无法写入</string>
    <string name="files_few">%1$d个文件</string>
    <string name="files_many">%1$d个文件</string>
    <string name="files_one">1个文件</string>
@@ -204,16 +204,12 @@ limitations under the License.
    <string name="export_all_title">Export to external storage</string>
    <string name="export_with_photos">with photos</string>
    <string name="export_without_photos">without photos</string>
-    <string name="export_external_storage">External storage</string>
-    <string name="export_external_storage_error">Exported %1$d of %2$s to %3$s</string>
-    <string name="export_external_storage_option">as %1$s to %2$s</string>
-    <string name="export_external_storage_progress_message">Exporting to %1$s&#8230;</string>
-    <string name="export_external_storage_success">Exported %1$s to %2$s</string>
+    <string name="export_error">Exported %1$d of %2$s to %3$s</string>
+    <string name="export_option">as %1$s to %2$s</string>
+    <string name="export_progress_message">Exporting to %1$s&#8230;</string>
+    <string name="export_success">Exported %1$s to %2$s</string>
    <string name="export_title">Export to&#8230;</string>
    <!-- External Storage -->
-    <string name="external_storage_not_available">External storage not available</string>
-    <string name="external_storage_not_writable">External storage not writable</string>
-    <string name="external_storage_not_readable">External storage not readable</string>
    <!-- Files -->
    <string name="files_few">%1$d files</string>
    <string name="files_many">%1$d files</string>
@@ -9,10 +9,11 @@
    <style name="ProgressBarCustom" parent="android:Widget.Holo.ProgressBar.Horizontal">
        <item name="android:progressTint">@color/holo_orange_dark</item>
        <item name="android:indeterminateTint">@color/holo_orange_dark</item>
+        <item name="android:indeterminateTintMode">src_in</item>
    </style>

    <style name="SpinnerCustom" parent="android:Widget.Holo.Spinner">
        <item name="android:background">@drawable/spinner_background_holo_dark</item>
        <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
    </style>
-</resources>
+</resources>
@@ -35,6 +35,14 @@ limitations under the License.
        <item name="android:colorAccent">@color/holo_orange_dark</item>
        <item name="windowActionModeOverlay">true</item>
    </style>
+     
+    <style name="ThemeCustomNotTransparent" parent="ThemeCustom">
+        <!-- TODO Remove when moving to settings to fragments. -->
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>

    <style name="ThemeCustomTransparent" parent="ThemeCustom">
        <!-- TODO Remove when moving to settings to fragments. -->
@@ -45,4 +53,4 @@ limitations under the License.
        <item name="android:windowIsFloating">true</item>
        <item name="android:backgroundDimEnabled">false</item>
    </style>
-</resources>
+</resources>
Author	SHA1	Message	Date
Dennis Guse	23175902fb	Release v3.7.2	2020-05-09 20:21:16 +02:00
Dennis Guse	706bd8b01f	README: added link Transifex.	2020-05-09 20:21:16 +02:00
Dennis Guse	dc4ac07e11	Cleanup.	2020-05-09 20:21:16 +02:00
Román	5be4129ba9	Edit marker: if user deletes photo then photo is deleted from internal storage too. Fixes #208 .	2020-05-09 15:44:10 +02:00
Román	f75a48ccab	TrackRecordingService doesn't change the track's name when recording ends. Fixes #209 .	2020-05-07 18:23:40 +02:00
Román Martínez	2815aa4b62	Merge pull request #203 from OpenTracksApp/starting_gps#200 Manually starting GPS and opening a recorded track bug fixed. Fixes #200.	2020-05-01 10:29:27 +02:00
transifex-integration[bot]	0383b0e1c7	Translate /src/main/res/values/strings.xml in nl translation completed for the source file '/src/main/res/values/strings.xml' on the 'nl' language.	2020-04-30 19:08:22 +02:00
Román	1601741495	Manually starting GPS and opening a recorded track bug fixed. Fixes #200 .	2020-04-30 18:57:12 +02:00
john2020star	be1fae956b	Fix compatibility issue in styles_custom.xml (#201 ) * Adding indeterminateTintMode="src_in" * Add a new ThemeCustomNotTransparentto change the color of ProgressBar	2020-04-30 12:36:26 +02:00