Merge heads

MyTracks/res/values/strings.xml

@@ -582,7 +582,7 @@ limitations under the License.
     By using Google\'s mobile products and services (“Services”), you agree to be bound
     by a) the YouTube Terms of Use (%1$s/tos_youtube) for YouTube-related Services, b) the Google
     Maps Terms and Conditions (%1$s/tos_maps) for mapping, local and location-based Services, c) the
-    Google Books Terms of Service (%1$s/tos_books) for Books-related Services, and e) the Google
+    Google Books Terms of Service (%1$s/tos_books) for Books-related Services, and d) the Google
     Terms of Service (%1$s/utos) for all other Services, as updated from time to time.
   </string>
   <string name="eula_copyright_year"
@@ -617,9 +617,9 @@ limitations under the License.
     translation_description="Error message when the external storage is not available.">
     External storage not available.
   </string>
-  <string name="external_storage_not_writeable"
-    translation_description="Error message when the external storage is not writeable.">
-    External storage not writeable.
+  <string name="external_storage_not_writable"
+    translation_description="Error message when the external storage is not writable.">
+    External storage not writable.
   </string>
 
   <!-- Files -->
@@ -974,6 +974,12 @@ limitations under the License.
       Character limit: ~20 (1 line)">
     Edit
   </string>
+  <string name="menu_feedback"
+    translation_description="In the menu, to enter feedback.
+
+      Character limit: ~20 (1 line)">
+    Feedback
+  </string>
   <string name="menu_help"
     translation_description="In the menu, to go to the help page.
 
@@ -1478,7 +1484,7 @@ limitations under the License.
     Backup now
   </string>
   <string name="settings_backup_now_error"
-    translation_description="When backing up to the external storage, the error messag.">
+    translation_description="When backing up to the external storage, the error message.">
     Unable to backup.
   </string>
   <string name="settings_backup_now_progress_message"
@@ -1660,7 +1666,8 @@ limitations under the License.
 
       Character limit: ~23 (1 line)">
     Top medium speed
-  </string><string name="settings_map_percentage"
+  </string>
+  <string name="settings_map_percentage"
     translation_description="In the 'Map' settings, under the 'Dynamic thresholds' section, the
       option to configure the medium speed range as a percentage from the average speed.
 
@@ -1744,7 +1751,7 @@ limitations under the License.
       when a time value is selected.
 
       %1$s time value. E.g., '5 min'.">
-    Resume a recording after reboot if the last recorded loation was within the last %1$s
+    Resume a recording after reboot if the last recorded location was within the last %1$s
   </string>
   <string name="settings_recording_auto_resume_track_timeout_title"
     translation_description="In the 'Recording' settings, the title to configure automatically
@@ -1817,14 +1824,14 @@ limitations under the License.
     Date (ISO 8601)
   </string>
   <string name="settings_recording_track_name_date_local_option"
-    translation_description="In the 'Recording' settings, the option in the 'Defaul track name'
+    translation_description="In the 'Recording' settings, the option in the 'Default track name'
      setting to use the track starting time in the local format as the default track name.
 
       Character limit: ~20 (1 line)">
     Date (local)
   </string>
   <string name="settings_recording_track_name_location_option"
-    translation_description="In the 'Recording' settings, the option in the 'Defaul track name'
+    translation_description="In the 'Recording' settings, the option in the 'Default track name'
       setting to use the track starting location as the default track name.
 
       Character limit: ~20 (1 line)">
@@ -2058,8 +2065,9 @@ limitations under the License.
 
   <!-- Share Track -->
   <string name="share_track_add_emails_title"
-    translation_description="The dialog title for adding emails to share a track with.">
-    Add emails
+    translation_description="The dialog title for entering email addresses for sharing a track
+      with.">
+    Share track with
   </string>
   <string name="share_track_add_emails_hint"
     translation_description="The hint in the auto complete text box for entering email addresses.">