diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index 4b1e7667b..5313cfe12 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -381,7 +381,7 @@ limitations under the License. %1$s activity type. E.g., 'hiking'."> Activity type: %1$s - Average moving speed: %1$.2f km/h (%2$.1f mi/h) - Elevation (m) - Unable to restore from backup. - diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java b/MyTracks/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java index 42cbeae64..1be60953a 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java +++ b/MyTracks/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java @@ -126,14 +126,15 @@ public class DescriptionGeneratorImpl implements DescriptionGenerator { writeSpeed(stats.getMaxSpeed(), builder, R.string.description_max_speed, lineBreak); // Average pace - writePace(stats.getAverageSpeed(), builder, R.string.description_average_pace, lineBreak); + writePace( + stats.getAverageSpeed(), builder, R.string.description_average_pace_in_minute, lineBreak); // Average moving pace - writePace(stats.getAverageMovingSpeed(), builder, R.string.description_average_moving_pace, - lineBreak); + writePace(stats.getAverageMovingSpeed(), builder, + R.string.description_average_moving_pace_in_minute, lineBreak); // Fastest pace - writePace(stats.getMaxSpeed(), builder, R.string.description_fastest_pace, lineBreak); + writePace(stats.getMaxSpeed(), builder, R.string.description_fastest_pace_in_minute, lineBreak); // Max elevation writeElevation(stats.getMaxElevation(), builder, R.string.description_max_elevation, lineBreak); diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java index 0556911c3..3d287feb1 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java @@ -123,7 +123,7 @@ public class RestoreChooserActivity extends Activity { * Shows a no backup message. */ private void showNoBackupMessage() { - String message = getString(R.string.settings_backup_restore_no_backup, + String message = getString(R.string.settings_backup_restore_no_backups, FileUtils.getDirectoryDisplayName(FileUtils.BACKUPS_DIR)); Toast.makeText(this, message, Toast.LENGTH_LONG).show(); } diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java index bc67e1012..de4a3c77e 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java @@ -161,7 +161,7 @@ public class DescriptionGeneratorImplTest extends AndroidTestCase { */ public void testWritePace() { StringBuilder builder = new StringBuilder(); - descriptionGenerator.writePace(1.1, builder, R.string.description_average_pace, "\n"); + descriptionGenerator.writePace(1.1, builder, R.string.description_average_pace_in_minute, "\n"); assertEquals("Average pace: 15:09 min/km (24:23 min/mi)\n", builder.toString()); }