Clean up remaining preference keys.

MyTracks/res/values/keys.xml

@@ -21,7 +21,7 @@ limitations under the License.
   <string name="ant_cadence_sensor_id_key">antCadenceSensorId</string>
   <string name="ant_cadence_speed_sensor_id_key">antCadenceSpeedSensorId</string>
   <string name="ant_heart_rate_sensor_id_key">antHeartRateSensorId</string>
-  <string name="ant_srm_bridge_sensor_id_key">antSRMBridgeSensorId</string>
+  <string name="ant_srm_bridge_sensor_id_key">antSrmBridgeSensorId</string>
   <string name="auto_resume_track_current_retry_key">autoResumeTrackCurrentRetry</string>
   <string name="auto_resume_track_timeout_key">autoResumeTrackTimeout</string>
   <string name="bluetooth_sensor_key">bluetoothSensor</string>
@@ -62,9 +62,9 @@ limitations under the License.
   <string name="track_color_mode_key">trackColorMode</string>
   <string name="track_name_key">trackName</string>
   <!-- Keys for non-persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
-  <string name="backup_to_sd_key">backupToSd</string>
-  <string name="restore_from_sd_key">restoreFromSd</string>
   <string name="settings_backup_key">settingsBackup</string>
+  <string name="settings_backup_now_key">settingsBackupNow</string>
+  <string name="settings_backup_restore_key">settingsBackupRestore</string>
   <string name="settings_chart_key">settingsChart</string>
   <string name="settings_map_key">settingsMap</string>
   <string name="settings_map_medium_display_key">settingsMapMediumDisplay</string>

MyTracks/res/values/strings.xml

@@ -1956,12 +1956,12 @@ limitations under the License.
   <string name="settings_stats_rate_pace_imperial"
     translation_description="In the 'Stats' settings, the option to display pace, with example in
       imperial units.">
-    Pace (hr/mi).
+    Pace (hr/mi)
   </string>
   <string name="settings_stats_rate_pace_metric"
     translation_description="In the 'Stats' settings, the option to display pace, with example in
       metric units.">
-    Pace (hr/km).
+    Pace (hr/km)
   </string>
   <string name="settings_stats_rate_speed_imperial"
     translation_description="In the 'Stats' settings, the option to display speed, with example in
@@ -1976,12 +1976,12 @@ limitations under the License.
   <string name="settings_stats_rate_title"
     translation_description="In the 'Stats' settings, the option to change the preferred rate,
       either speed (mi/hr) or pace (hr/mi).">
-    Preferred Rate
+    Preferred rate
   </string>
   <string name="settings_stats_time_title"
     translation_description="In the 'Stats' settings, the option to change the time measurement,
       either total time or moving time.">
-    Time Measurement
+    Time measurement
   </string>
   <string name="settings_stats_units_imperial"
     translation_description="In the 'Stats' setttings, the option to use imperial units, with
@@ -1996,7 +1996,7 @@ limitations under the License.
   <string name="settings_stats_units_title"
     translation_description="In the 'Stats' settings page, the option to change the preferred units,
       either metric (km) or imperial (mi).">
-    Preferred Units
+    Preferred units
   </string>
 
   <!-- Share Track -->

MyTracks/res/xml/backup_settings.xml

@@ -17,11 +17,11 @@ limitations under the License.
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
   android:title="@string/settings_backup" >
   <Preference
-    android:key="@string/backup_to_sd_key"
+    android:key="@string/settings_backup_now_key"
     android:persistent="false"
     android:title="@string/settings_backup_now" />
   <Preference
-    android:key="@string/restore_from_sd_key"
+    android:key="@string/settings_backup_restore_key"
     android:persistent="false"
     android:title="@string/settings_backup_restore" />
 </PreferenceScreen>