Release: v4.3.5

Fixes #1561.

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0-beta01'
+        classpath 'com.android.tools.build:gradle:8.1.0-beta02'
     }
 }
 
@@ -64,8 +64,8 @@ android {
 
     defaultConfig {
         applicationId "de.dennisguse.opentracks"
-        versionCode 5189
+        versionCode 5211
-        versionName "v4.3.2"
+        versionName "v4.3.5"
 
         buildConfigField "String", "VERSION_NAME_FULL", "\"${getVersionName()}\""
 
@@ -74,8 +74,6 @@ android {
 
         testInstrumentationRunner "de.dennisguse.opentracks.TestRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
-
-        resConfigs "ar", "bg", "ca", "cs", "da", "de", "el", "en", "es", "et", "eu", "fa", "fi", "fr", "ga", "gl", "hi", "hr", "hu", "in", "it", "iw", "ja", "ko", "lt", "lv", "mo", "ms", "nb", "nl", "pl", "pt", "ro", "ru", "sk", "sl", "sr", "sv", "th", "tl", "tr", "uk", "vi", "zh"
     }
     signingConfigs {
         nightly {
@@ -133,17 +131,17 @@ dependencies {
     implementation 'androidx.preference:preference:1.2.0'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.core:core-splashscreen:1.0.1'
-    implementation 'androidx.mediarouter:mediarouter:1.3.1'
+    implementation 'androidx.mediarouter:mediarouter:1.4.0'
 
     androidTestImplementation 'androidx.test:core:1.5.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test:rules:1.5.0'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation 'org.mockito:mockito-android:5.3.0'
+    androidTestImplementation 'org.mockito:mockito-android:5.3.1'
 
     androidTestUtil 'androidx.test:orchestrator:1.4.2'
 }

fastlane/metadata/android/en-US/changelogs/5194.txt

@@ -0,0 +1,5 @@
+v4.3.3: OpenTracks
+
+Bugfixes:
+- Hidden fields were shown (introduced in v4.2.0)
+- Speed was shown instead of pace (introduced in v4.2.0)

fastlane/metadata/android/en-US/changelogs/5196.txt

@@ -0,0 +1,4 @@
+v4.3.4: OpenTracks
+
+Bugfix:
+- Android 13: regional locales could not be selected (introduced in v4.3.0)

fastlane/metadata/android/en-US/changelogs/5211.txt

@@ -0,0 +1,6 @@
+v4.3.5: OpenTracks
+
+Bugfix:
+- Sensor parsing had a overflow one off bug (#1559)
+- Insert marker: don't crash if no camera app is installed (#1561)
+

fastlane/metadata/android/nl/changelogs/4358.txt

@@ -2,13 +2,13 @@ v3.19.0: OpenTracks
 
 Wijzigingen:
 - Ondersteuning voor Running Speed en Cadence (RCS) sensoren
-- Bij het delen van een track wordt een afbeelding gemaakt
+- Bij delen van een track: maakt een deel-afbeelding
 - Niet trillen bij starten van opnemen
-- Bij opnemen: UI toont recentst ontvangen hoogte, snelheid en richting (ook al is deze niet opgeslagen)
+- Bij opnemen: UI toont meest recente hoogte, snelheid en richting (zelfs als niet opgeslagen)
 
 Bugfix:
-- Berekening van totale tijd mag geen pauze-tijd bevatten (vereist opnieuw importeren)
+- Berekening totale tijd mag geen pauze-tijd bevatten (vereist opnieuw importeren)
-- (opnieuw) Gebruik aangepaste overzichten indien aanwezig
+- (opnieuw) Gebruik aanwezige aangepaste overzichten
 
 Ontwikkelaar:
 - Upgrade naar SDK31 en AGP7.0.0 (vereist JDK11)

fastlane/metadata/android/nl/changelogs/4773.txt

@@ -5,4 +5,4 @@ Wijzigingen:
 - Gesproken meldingen van hartslag
 
 Bugfix:
-- Crash due to race condition
+- Vastloper door race condities

src/androidTest/java/de/dennisguse/opentracks/sensors/UintUtilsTest.java

@@ -11,13 +11,44 @@ public class UintUtilsTest {
         assertEquals(0, UintUtils.diff(1, 1, UintUtils.UINT16_MAX));
         assertEquals(1, UintUtils.diff(2, 1, UintUtils.UINT16_MAX));
         assertEquals(3, UintUtils.diff(5, 2, UintUtils.UINT16_MAX));
-        assertEquals(65534, UintUtils.diff(1, 2, UintUtils.UINT16_MAX));
+        assertEquals(65535, UintUtils.diff(1, 2, UintUtils.UINT16_MAX));     /* unsigned 16 arithmetic is modulo UINT16_MAX + 1, not modulo UINT16_MAX */
-
         assertEquals(65530, UintUtils.diff(UintUtils.UINT16_MAX, 5, UintUtils.UINT16_MAX));
+
+        /*   Test modulo arithmetic for arguments that are out of range */
+
+        if (false) {   /*  false means UintUtils.diff() throws if arguments out of range */
+            assertEquals(0, UintUtils.diff(65537, 1, UintUtils.UINT16_MAX));
+            assertEquals(0, UintUtils.diff(1, 65537, UintUtils.UINT16_MAX));
+            assertEquals(0, UintUtils.diff(65537, 65537, UintUtils.UINT16_MAX));
+            assertEquals(0, UintUtils.diff(-65535, 1, UintUtils.UINT16_MAX));
+            assertEquals(0, UintUtils.diff(1, -65535, UintUtils.UINT16_MAX));
+            assertEquals(0, UintUtils.diff(-65535, -65535, UintUtils.UINT16_MAX));
+            assertEquals(0, UintUtils.diff(-65535, 65537, UintUtils.UINT16_MAX));
+            assertEquals(0, UintUtils.diff(65537, -65535, UintUtils.UINT16_MAX));
+        }
+
+        /*  The following tests are the above, but for 32-bit unsigned. */
+
+        assertEquals(0, UintUtils.diff(1, 1, UintUtils.UINT32_MAX));
+        assertEquals(1, UintUtils.diff(2, 1, UintUtils.UINT32_MAX));
+        assertEquals(3, UintUtils.diff(5, 2, UintUtils.UINT32_MAX));
+        assertEquals(4294967295L, UintUtils.diff(1, 2, UintUtils.UINT32_MAX));
+        assertEquals(4294967290L, UintUtils.diff(UintUtils.UINT32_MAX, 5, UintUtils.UINT32_MAX));
+
+        if (false) { /*  false means UintUtils.diff() throws if arguments out of range */
+            assertEquals(0, UintUtils.diff(4294967297L, 1, UintUtils.UINT32_MAX));
+            assertEquals(0, UintUtils.diff(1, 4294967297L, UintUtils.UINT32_MAX));
+            assertEquals(0, UintUtils.diff(4294967297L, 4294967297L, UintUtils.UINT32_MAX));
+            assertEquals(0, UintUtils.diff(-4294967295L, 1, UintUtils.UINT32_MAX));
+            assertEquals(0, UintUtils.diff(1, -4294967295L, UintUtils.UINT32_MAX));
+            assertEquals(0, UintUtils.diff(-4294967295L, -4294967295L, UintUtils.UINT32_MAX));
+            assertEquals(0, UintUtils.diff(-4294967295L, 4294967297L, UintUtils.UINT32_MAX));
+            assertEquals(0, UintUtils.diff(65537, -4294967297L, UintUtils.UINT32_MAX));
+        }
     }
 
     @Test
     public void realData() {
         assertEquals(1, UintUtils.diff(381616, 381615, UintUtils.UINT32_MAX));
     }
-}
+}

src/androidTest/java/de/dennisguse/opentracks/util/StatisticsUtilsTest.java

@@ -52,8 +52,8 @@ public class StatisticsUtilsTest extends TestCase {
         recordingLayout.addField(new DataField("key5", true, true, false));
 
         // when
-        RecordingLayout resultTrue = StatisticsUtils.filterVisible(recordingLayout, true);
+        RecordingLayout resultTrue = recordingLayout.toRecordingLayout(true);
-        RecordingLayout resultFalse = StatisticsUtils.filterVisible(recordingLayout, false);
+        RecordingLayout resultFalse = recordingLayout.toRecordingLayout(false);
 
         // then
         assertEquals(resultTrue.getFields().size(), 3);

src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordingFragment.java

@@ -122,17 +122,15 @@ public class StatisticsRecordingFragment extends Fragment {
         }
         recordingLayout = newRecordingLayout;
 
-        viewBinding.statsLayout.setColumnCount(recordingLayout.getColumnsPerRow());
-
         viewBinding.statsLayout.removeAllViews(); //Let's start from scratch
+        viewBinding.statsLayout.setColumnCount(recordingLayout.getColumnsPerRow());
         viewHolders.clear();
 
         Map<String, Callable<StatisticViewHolder<?>>> m = Mapping.create(getContext());
 
         int rowIndex = 0;
         int columnIndex = 0;
-        for (int i = 0; i < recordingLayout.getFields().size(); i++) {
+        for (DataField dataField : recordingLayout.toRecordingLayout(true).getFields()) {
-            DataField dataField = recordingLayout.getFields().get(i);
             GridLayout.LayoutParams param = new GridLayout.LayoutParams();
             param.setGravity(Gravity.FILL_HORIZONTAL);
             param.width = 0;

src/main/java/de/dennisguse/opentracks/sensors/UintUtils.java

@@ -14,6 +14,7 @@ public class UintUtils {
      * @return diff
      */
     public static long diff(long a, long b, final long UINT_MAX) {
+
         if (a < 0 || b < 0) {
             throw new RuntimeException("a or b cannot be less than zero.");
         }
@@ -25,6 +26,6 @@ public class UintUtils {
             return a - b;
         }
 
-        return (UINT_MAX - b) + a;
+        return (UINT_MAX + 1 - b) + a;
     }
 }

src/main/java/de/dennisguse/opentracks/settings/SettingsCustomLayoutEditActivity.java

@@ -20,7 +20,6 @@ import de.dennisguse.opentracks.ui.customRecordingLayout.DataField;
 import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
 import de.dennisguse.opentracks.ui.customRecordingLayout.SettingsCustomLayoutEditAdapter;
 import de.dennisguse.opentracks.ui.util.ArrayAdapterFilterDisabled;
-import de.dennisguse.opentracks.util.StatisticsUtils;
 
 public class SettingsCustomLayoutEditActivity extends AbstractActivity implements SettingsCustomLayoutEditAdapter.SettingsCustomLayoutItemClickListener {
 
@@ -41,7 +40,7 @@ public class SettingsCustomLayoutEditActivity extends AbstractActivity implement
         // Recycler view with visible stats.
         RecordingLayout recordingLayout = getIntent().getParcelableExtra(EXTRA_LAYOUT);
         profile = recordingLayout.getName();
-        recordingLayoutFieldsVisible = StatisticsUtils.filterVisible(recordingLayout, true);
+        recordingLayoutFieldsVisible = recordingLayout.toRecordingLayout(true);
         adapterFieldsVisible = new SettingsCustomLayoutEditAdapter(this, this, recordingLayoutFieldsVisible);
 
         numColumns = recordingLayout.getColumnsPerRow();
@@ -90,7 +89,7 @@ public class SettingsCustomLayoutEditActivity extends AbstractActivity implement
         viewBinding.rowsOptions.setText(rowsOptionAdapter.getItem(numColumns - 1).toString(), false);
 
         // Recycler view with not visible stats.
-        recordingLayoutFieldsHidden = StatisticsUtils.filterVisible(recordingLayout, false);
+        recordingLayoutFieldsHidden = recordingLayout.toRecordingLayout(false);
         adapterFieldsHidden = new SettingsCustomLayoutEditAdapter(this, this, recordingLayoutFieldsHidden);
         RecyclerView recyclerViewNotVisible = viewBinding.recyclerViewNotVisible;
         recyclerViewNotVisible.setLayoutManager(new LinearLayoutManager(this));

src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/RecordingLayout.java

@@ -66,6 +66,12 @@ public class RecordingLayout implements Parcelable {
         return new ArrayList<>(dataFields);
     }
 
+    public RecordingLayout toRecordingLayout(boolean visibility) {
+        RecordingLayout result = new RecordingLayout(this.getName());
+        result.addFields(dataFields.stream().filter(f -> f.isVisible() == visibility).collect(Collectors.toList()));
+        return result;
+    }
+
     public void moveField(int from, int to) {
         DataField dataFieldToMove = dataFields.remove(from);
         dataFields.add(to, dataFieldToMove);

src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java

@@ -16,6 +16,7 @@
 
 package de.dennisguse.opentracks.ui.markers;
 
+import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
@@ -244,7 +245,12 @@ public class MarkerEditActivity extends AbstractActivity {
     private void createMarkerWithPicture() {
         Pair<Intent, Uri> intentAndPhotoUri = MarkerUtils.createTakePictureIntent(this, getTrackId());
         cameraPhotoUri = intentAndPhotoUri.second;
-        takePictureFromCamera.launch(intentAndPhotoUri.first);
+
+        try {
+            takePictureFromCamera.launch(intentAndPhotoUri.first);
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this, R.string.no_compatible_camera_installed, Toast.LENGTH_LONG).show();
+        }
     }
 
     private void createMarkerWithGalleryImage() {
@@ -256,6 +262,10 @@ public class MarkerEditActivity extends AbstractActivity {
             intent = new Intent(Intent.ACTION_GET_CONTENT);
         }
         intent.setType("image/*");
-        takePictureFromGallery.launch(intent);
+        try {
+            takePictureFromGallery.launch(intent);
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this, R.string.no_compatible_gallery_installed, Toast.LENGTH_LONG).show();
+        }
     }
 }

src/main/java/de/dennisguse/opentracks/util/StatisticsUtils.java

@@ -4,11 +4,8 @@ import android.content.Context;
 
 import androidx.annotation.NonNull;
 
-import java.util.stream.Collectors;
-
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
-import de.dennisguse.opentracks.ui.customRecordingLayout.RecordingLayout;
 
 public class StatisticsUtils {
 
@@ -24,11 +21,4 @@ public class StatisticsUtils {
             return context.getString(R.string.stats_empty_value_integer);
         }
     }
-
-    @Deprecated //Add to Layout?
-    public static RecordingLayout filterVisible(RecordingLayout recordingLayout, boolean visible) {
-        RecordingLayout result = new RecordingLayout(recordingLayout.getName());
-        result.addFields(recordingLayout.getFields().stream().filter(f -> f.isVisible() == visible).collect(Collectors.toList()));
-        return result;
-    }
 }

src/main/java/de/dennisguse/opentracks/viewmodels/GenericStatisticsViewHolder.java

@@ -65,15 +65,20 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder<St
         }
     }
 
-    public static class SpeedOrPace extends GenericStatisticsViewHolder {
+    public abstract static class SpeedOrPace extends GenericStatisticsViewHolder {
+
+        private final boolean reportSpeed;
+
+        public SpeedOrPace(boolean reportSpeed) {
+            this.reportSpeed = reportSpeed;
+        }
 
         @Override
         public void onChanged(UnitSystem unitSystem, RecordingData data) {
-            // TODO Pace wont work for now
-            boolean reportSpeed = true;
             SpeedFormatter localSpeedFormatter = SpeedFormatter.Builder()
                     .setUnit(unitSystem)
-                    .setReportSpeedOrPace(reportSpeed).build(getContext());
+                    .setReportSpeedOrPace(reportSpeed)
+                    .build(getContext());
 
             Pair<String, String> valueAndUnit;
 
@@ -85,7 +90,9 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder<St
             } else {
                 Speed speed = latestTrackPoint != null && latestTrackPoint.hasSpeed() ? latestTrackPoint.getSpeed() : null;
                 valueAndUnit = localSpeedFormatter.getSpeedParts(speed);
-                getBinding().statsDescriptionMain.setText(getContext().getString(R.string.description_speed_source_gps));
+
+                String title = reportSpeed ? getContext().getString(R.string.stats_speed) : getContext().getString(R.string.stats_pace);
+                getBinding().statsDescriptionMain.setText(title);
             }
 
             getBinding().statsValue.setText(valueAndUnit.first);
@@ -93,6 +100,20 @@ public abstract class GenericStatisticsViewHolder extends StatisticViewHolder<St
         }
     }
 
+    public static class SpeedVH extends SpeedOrPace {
+
+        public SpeedVH() {
+            super(true);
+        }
+    }
+
+    public static class PaceVH extends SpeedOrPace {
+
+        public PaceVH() {
+            super(false);
+        }
+    }
+
     public static class AverageMovingSpeed extends GenericStatisticsViewHolder {
 
         @Override

src/main/java/de/dennisguse/opentracks/viewmodels/Mapping.java

@@ -17,8 +17,8 @@ public class Mapping {
 
         m.put(context.getString(R.string.stats_custom_layout_distance_key), GenericStatisticsViewHolder.Distance::new);
 
-        m.put(context.getString(R.string.stats_custom_layout_speed_key), GenericStatisticsViewHolder.SpeedOrPace::new);
+        m.put(context.getString(R.string.stats_custom_layout_speed_key), GenericStatisticsViewHolder.SpeedVH::new);
-        m.put(context.getString(R.string.stats_custom_layout_pace_key), GenericStatisticsViewHolder.SpeedOrPace::new);
+        m.put(context.getString(R.string.stats_custom_layout_pace_key), GenericStatisticsViewHolder.PaceVH::new);
         m.put(context.getString(R.string.stats_custom_layout_average_moving_speed_key), GenericStatisticsViewHolder.AverageMovingSpeed::new);
         m.put(context.getString(R.string.stats_custom_layout_average_speed_key), GenericStatisticsViewHolder.AverageSpeed::new);
         m.put(context.getString(R.string.stats_custom_layout_max_speed_key), GenericStatisticsViewHolder.MaxSpeed::new);

src/main/res/values-cs/strings.xml

@@ -569,4 +569,54 @@ limitations under the License.
     <string name="settings_public_api_dashboard_enabled_summary_off">Zaznamenaná data nebudou automaticky sdílena s jinými aplikacemi.</string>
     <string name="pace">Tempo</string>
     <string name="track_discarding">Mazání trasy</string>
+    <plurals name="voiceSpeedMKnots">
+        <item quantity="one">1 uzel</item>
+        <item quantity="few">%1$.1f uzly</item>
+        <item quantity="other">%1$.1f uzlů</item>
+    </plurals>
+    <string name="error_crash_title">%1$s selhal</string>
+    <string name="share_crash_report">Sdílet hlášení o selhání</string>
+    <string name="voice_on_device_speaker_title">Použít reproduktor zařízení</string>
+    <string name="description_pace_nautical">Tempo (min/NM)</string>
+    <string name="voice_per_nautical_mile">za námořní míli</string>
+    <string name="settings_announcements_average_speed_pace">Průměrná rychlost/tempo</string>
+    <string name="settings_announcements_average_heart_rate">Průměrný srdeční tep</string>
+    <string name="value_float_knots">%1$.1f uzlů</string>
+    <string name="track_delete_number_of_tracks">%1$d stop</string>
+    <string name="image_discard">Vyřadit</string>
+    <string name="show_on_map_format_ask">Zeptat se</string>
+    <string name="settings_stats_units_nautical">Námořní (NM, ft)</string>
+    <string name="report_bug">Nahlásit chybu</string>
+    <string name="settings_announcements_lap_heart_rate">Srdeční tep kola</string>
+    <string name="introduction_osm_dashboard">OpenTracks sám o sobě mapu neposkytuje. Pro zobrazení záznamů na mapě si nainstalujte OSMDashboard.</string>
+    <string name="select_show_on_map_behavior">Zvolte chování \"zobrazit na mapě\"</string>
+    <plurals name="voiceDistanceMiles">
+        <item quantity="one">1 míle</item>
+        <item quantity="few">%1$.1f míle</item>
+        <item quantity="other">%1$.1f mil</item>
+    </plurals>
+    <plurals name="voiceDistanceKilometers">
+        <item quantity="one">1 kilometr</item>
+        <item quantity="few">%1$.1f kilometry</item>
+        <item quantity="other">%1$.1f kilometrů</item>
+    </plurals>
+    <string name="always">Vždy</string>
+    <string name="help_data_google_play_services_content">Ne</string>
+    <string name="description_speed_nautical">Rychlost (uzly)</string>
+    <string name="settings_export_filename_title">Formát názvu souboru</string>
+    <plurals name="voiceDistanceNauticalMiles">
+        <item quantity="one">1 námořní míle</item>
+        <item quantity="few">%1$.1f námořní míle</item>
+        <item quantity="other">%1$.1f námořních mil</item>
+    </plurals>
+    <string name="show_on_dashboard_not_installed">Není nainstalována žádná aplikace podporující OpenTracks Dashboard API.</string>
+    <string name="settings_announcements_lap_speed_pace">Rychlost/tempo kola</string>
+    <string name="settings_sensor_heart_rate_max">Zóny: maximální srdeční tep (bpm)</string>
+    <string name="settings_api_summary">Vzdálené ovládání a rozhraní API pro statistiky pro jiné aplikace</string>
+    <string name="settings_public_api_package_title">Název balíčku pro veřejné rozhraní API</string>
+    <string name="unit_nautical_mile">NM</string>
+    <string name="unit_knots">kn</string>
+    <string name="unit_minute_per_nautical_mile">min/NM</string>
+    <string name="value_integer_knots">%1$d uzlů</string>
+    <string name="value_float_knots_recommended">%1$.1f uzlů (doporučeno)</string>
 </resources>

src/main/res/values-nl/strings.xml

@@ -38,7 +38,7 @@ limitations under the License.
     <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_data_google_play_services_title">Gebruikt/vereist OpenTracks Google Play Service\?</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.
@@ -264,18 +264,18 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="settings_stats_units_metric">Metrisch (km, m)</string>
     <string name="settings_stats_units_title">Voorkeurseenheden</string>
     <!-- Share Track -->
-    <string name="share_track_share_file_body">Ik denk dat u misschien wel geïnteresseerd bent in deze route.
+    <string name="share_track_share_file_body">Misschien ben je geïnteresseerd in deze route.
 \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_pace">Gem. bewegingstempo</string>
-    <string name="stats_average_moving_speed">Gem. verplaatsingssnelheid</string>
+    <string name="stats_average_moving_speed">Gem. bewegingssnelheid</string>
     <string name="stats_average_pace">Gem. tempo</string>
     <string name="stats_average_speed">Gem. snelheid</string>
     <string name="stats_altitude">Hoogte</string>
     <string name="stats_fastest_pace">Snelste tempo</string>
-    <string name="stats_gain">Stijging</string>
+    <string name="stats_gain">Gestegen</string>
     <string name="stats_latitude">Breedtegraad</string>
     <string name="stats_longitude">Lengtegraad</string>
     <string name="stats_max_speed">Maximum snelheid</string>
@@ -287,7 +287,7 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <!-- Track -->
     <string name="track_name_format">Route %1$d</string>
     <string name="track_recording_notification_accuracy">Locatie nauwkeurigheid: %1$s</string>
-    <string name="track_markers">Markeringen voor %1$s</string>
+    <string name="track_markers">%1$s Markeringen</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>
@@ -361,7 +361,7 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="waypoint_type_drinking_water">drinkwater</string>
     <string name="waypoint_type_falling_rocks">vallende stenen</string>
     <string name="waypoint_type_ferry">veerboot</string>
-    <string name="waypoint_type_fire_place">open haard</string>
+    <string name="waypoint_type_fire_place">vuurplaats</string>
     <string name="waypoint_type_fire_station">brandweerkazerne</string>
     <string name="waypoint_type_fishing">vissen</string>
     <string name="waypoint_type_gas_station">tankstation</string>
@@ -369,7 +369,7 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="waypoint_type_grocery_store">kruidenier</string>
     <string name="waypoint_type_hair_dresser">kapper</string>
     <string name="waypoint_type_harbor">haven</string>
-    <string name="waypoint_type_hiking_path">trektochtpad</string>
+    <string name="waypoint_type_hiking_path">wandelroute</string>
     <string name="waypoint_type_hotel">hotel</string>
     <string name="waypoint_type_house">huis</string>
     <string name="waypoint_type_information">informatie</string>
@@ -390,10 +390,10 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="waypoint_type_swimming_pool">zwembad</string>
     <string name="waypoint_type_telephone">telefoon</string>
     <string name="waypoint_type_theater">schouwburg</string>
-    <string name="waypoint_type_toilet">restroom</string>
+    <string name="waypoint_type_toilet">toilet</string>
     <string name="waypoint_type_tourist_information">toeristische informatie</string>
     <string name="waypoint_type_tree">boom</string>
-    <string name="waypoint_type_tunnel">schacht</string>
+    <string name="waypoint_type_tunnel">tunnel</string>
     <string name="waypoint_type_waterfall">waterval</string>
     <string name="waypoint_type_water_fountain">waterfontein</string>
     <string name="waypoint_type_waypoint">routepunt</string>
@@ -416,7 +416,7 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="import_no_kml_file_found">Geen doc.kml bestand gevonden in KMZ</string>
     <string name="settings_recording_fullscreen_on_while_recording_title">Volledig scherm</string>
     <string name="gps_fixed_and_ready">GPS vast en klaar</string>
-    <string name="aggregated_stats_empty_message">Neem uw eerste track op om geaggregeerde statistieken te zien</string>
+    <string name="aggregated_stats_empty_message">Neem uw eerste route op om geaggregeerde statistieken te zien</string>
     <string name="track_detail_intervals_tab">Intervallen</string>
     <string name="settings_sensor_wheel_circumference">Wielomtrek (mm)</string>
     <string name="settings_prevent_reimport_tracks_title">Voorkom herinvoer van tracks</string>
@@ -435,7 +435,7 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="settings_night_mode_option_day">Dag</string>
     <string name="settings_night_mode_option_system">Systeem</string>
     <string name="settings_night_mode_title">UI Thema</string>
-    <string name="stats_loss">Verlies</string>
+    <string name="stats_loss">Gedaald</string>
     <string name="interval_list_empty_message">Er zijn nog geen intervallen</string>
     <string name="stats_split_interval">Gesplitst interval</string>
     <string name="instant_export_enabled_title">Directe uitvoer na de training</string>
@@ -460,7 +460,7 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="import_unable_to_import_file">Kan bestand niet importeren: %1$s</string>
     <string name="import_error_info">%1$s: %2$s</string>
     <string name="import_file_imported">Bestand %1$s geimporteerd</string>
-    <string name="hold_to_stop">Hou vast om te stoppen</string>
+    <string name="hold_to_stop">Indrukken om te stoppen</string>
     <string name="track_speed_notification">Snelheid: %1$s</string>
     <string name="track_distance_notification">Afstand: %1$s</string>
     <string name="track_pace_notification">Tempo: %1$s</string>
@@ -478,7 +478,7 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="settings_announcements_summary">Tijd, afstand, spraaksnelheid</string>
     <string name="generic_yesterday">Gisteren</string>
     <string name="settings_ui_title">User Interface</string>
-    <string name="stats_coordinates">Breedte- /Lengtegraad</string>
+    <string name="stats_coordinates">Coördinaten</string>
     <string name="settings_announcements_distance_frequency">Afstandsinterval</string>
     <string name="settings_recording_idle_speed_title">Drempelwaarde stationair</string>
     <string name="value_float_kilometer_hour">%1$.1f km/u</string>
@@ -494,9 +494,9 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="settings_announcements_totaltime_frequency">Tijdsinterval</string>
     <string name="field_set_secondary">Secondair</string>
     <string name="field_remove_from_layout">Verwijderen</string>
-    <string name="settings_public_api_dashboard_enabled_title">Automatische overdracht van gegevens</string>
+    <string name="settings_public_api_dashboard_enabled_title">Automatische data overdracht</string>
     <string name="settings_public_api_dashboard_enabled_summary_on">Een app die een opname start, heeft ook toegang tot de opgenomen gegevens.</string>
-    <string name="stats_sensors_cadence">Cadans</string>
+    <string name="stats_sensors_cadence">Ritme</string>
     <string name="stats_sensors_heart_rate">Hartslag</string>
     <string name="settings_layout_reset">Aangepaste lay-out terugzetten</string>
     <string name="settings_layout_reset_confirm_message">Alle lay-out instellingen worden teruggezet naar de standaardwaarden. Tracks worden niet gewist.</string>
@@ -538,7 +538,7 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="settings_public_api_disabled_toast">OpenTracks Publieke API is uitgeschakeld: inschakelen kan onder instellingen.</string>
     <string name="stats_clock">Klok</string>
     <string name="aggregated_stats_filter_no_results">Er zijn geen activiteiten voor het aangegeven filter</string>
-    <string name="no_compatible_file_manager_installed">Geen ondersteunde bestandsbeheerder geïnstalleerd</string>
+    <string name="no_compatible_file_manager_installed">Geen geschikte bestandsbeheerder geïnstalleerd</string>
     <string name="generic_undo">Terugzetten</string>
     <string name="settings_sensor_bluetooth_service_filter_enabled">Alleen Bluetooth-apparaten tonen die gevraagde diensten melden</string>
     <string name="settings_activity_defaults_category">Standaardinstellingen van een activiteit</string>
@@ -586,4 +586,27 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="always">Altijd</string>
     <string name="show_on_map_format_ask">Vragen</string>
     <string name="select_show_on_map_behavior">Selecteer \"toon op kaart\"-gedrag</string>
+    <string name="show_on_dashboard_not_installed">Er is geen app geïnstalleerd die OpenTracks Dashboard API ondersteunt.</string>
+    <string name="help_data_google_play_services_content">Nee</string>
+    <string name="introduction_osm_dashboard">OpenTracks zelf biedt geen kaart. Installeer OSMDashboard om uw opnames op een kaart te bekijken.</string>
+    <string name="unit_nautical_mile">NM</string>
+    <plurals name="voiceSpeedMKnots">
+        <item quantity="one">1 knoop</item>
+        <item quantity="other">%1$.1f knopen</item>
+    </plurals>
+    <plurals name="voiceDistanceNauticalMiles">
+        <item quantity="one">1 zeemijl</item>
+        <item quantity="other">%1$.1f zeemijlen</item>
+    </plurals>
+    <string name="value_integer_knots">%1$d knopen</string>
+    <string name="voice_per_nautical_mile">per zeemijl</string>
+    <string name="track_delete_number_of_tracks">%1$d routes</string>
+    <string name="voice_on_device_speaker_title">Gebruik toestelspeaker</string>
+    <string name="settings_public_api_package_title">Pakketnaam voor openbare API</string>
+    <string name="settings_stats_units_nautical">Nautisch (NM, ft)</string>
+    <string name="settings_api_summary">Afstandsbediening en statistieken API voor andere apps</string>
+    <string name="settings_sensor_heart_rate_max">Zones: maximum Hartslag (bpm)</string>
+    <string name="value_float_knots_recommended">%1$.1f knopen (aanbevolen)</string>
+    <string name="value_float_knots">%1$.1f knopen</string>
+    <string name="description_speed_nautical">Snelheid (knopen)</string>
 </resources>

src/main/res/values-zh-rTW/strings.xml

@@ -323,7 +323,7 @@ limitations under the License.
     <string name="sensor_state_power_avg">平均功率</string>
     <string name="sensor_could_not_scan">無法掃描藍牙裝置 (錯誤 %1$i).</string>
     <string name="bluetooth_disabled">請啟用藍芽。</string>
-    <string name="settings_open_tracks_title">開啟蹤跡</string>
+    <string name="settings_open_tracks_title">Open Tracks</string>
     <string name="settings_open_tracks_summary">所有關於 OpenTracks 專案</string>
     <string name="settings_defaults_title">預設單位與活動</string>
     <string name="settings_defaults_summary">首選單位、預設活動、蹤跡預設名稱</string>
@@ -351,11 +351,11 @@ limitations under the License.
     <string name="settings_recording_customize_layout_title">自訂您的紀錄布局</string>
     <string name="settings_recording_customize_layout_select_columns">每列資料欄位</string>
     <string name="settings_recording_show_on_lockscreen_while_recording_title">在鎖定畫面顯示統計資料</string>
-    <string name="settings_recording_show_on_lockscreen_while_recording_summary">當紀錄時，在不解鎖裝置的情況下顯示統計資料。</string>
+    <string name="settings_recording_show_on_lockscreen_while_recording_summary">當記錄時，在不解鎖裝置的情況下顯示統計資料。</string>
     <string name="settings_recording_keep_screen_on_while_recording_title">維持螢幕開啟</string>
-    <string name="settings_recording_keep_screen_on_while_recording_summary">記錄中，維持螢幕開啟。</string>
+    <string name="settings_recording_keep_screen_on_while_recording_summary">當記錄時，維持螢幕開啟。</string>
     <string name="settings_recording_fullscreen_on_while_recording_title">全螢幕</string>
-    <string name="settings_recording_fullscreen_on_while_recording_summary">記錄中，在全螢幕中呈現。</string>
+    <string name="settings_recording_fullscreen_on_while_recording_summary">當記錄時，在全螢幕中呈現。</string>
     <string name="settings_recording_default_activity_title">預設活動類型</string>
     <string name="settings_recording_location_frequency_summary">每 %1$s記錄一次位置資訊</string>
     <string name="settings_recording_max_recording_distance_summary">系統會在兩個地點之間的距離大於 %1$s時建立新的區段</string>

src/main/res/values/strings.xml

@@ -664,6 +664,8 @@ limitations under the License.
     <string name="field_set_secondary">Secondary</string>
     <string name="field_remove_from_layout">Remove</string>
     <string name="no_compatible_file_manager_installed">No compatible file manager installed</string>
+    <string name="no_compatible_camera_installed">No compatible camera application installed</string>
+    <string name="no_compatible_gallery_installed">No compatible image gallery application installed</string>
     <string name="error_crash_title">%1$s crashed</string>
     <string name="share_crash_report">Share crash report</string>
     <string name="report_bug">Report bug</string>