diff --git a/MyTracks/res/layout/help.xml b/MyTracks/res/layout/help.xml
index 4324c9a41..6cae24adf 100644
--- a/MyTracks/res/layout/help.xml
+++ b/MyTracks/res/layout/help.xml
@@ -43,10 +43,10 @@ limitations under the License.
         android:text="@string/help_location_precision_answer"
         style="@style/HelpAnswer" />
       <TextView
-        android:text="@string/help_gps_fix_question"
+        android:text="@string/help_gps_signal_question"
         style="@style/HelpQuestion" />
       <TextView
-        android:text="@string/help_gps_fix_answer"
+        android:text="@string/help_gps_signal_answer"
         style="@style/HelpAnswer" />
       <TextView
         android:text="@string/help_data_connection_question"
diff --git a/MyTracks/res/values/arrays_do_not_translate.xml b/MyTracks/res/values/arrays_do_not_translate.xml
index f2fc910ab..781c04a68 100644
--- a/MyTracks/res/values/arrays_do_not_translate.xml
+++ b/MyTracks/res/values/arrays_do_not_translate.xml
@@ -19,11 +19,11 @@ limitations under the License.
   <string-array name="activity_types">
     <item>@string/activity_type_airplane</item>
     <item>@string/activity_type_atv</item>
+    <item>@string/activity_type_biking</item>
     <item>@string/activity_type_blimp</item>
     <item>@string/activity_type_climbing</item>
     <item>@string/activity_type_commercial_airplane</item>
-    <item>@string/activity_type_cross_country_skiing_classic</item>
-    <item>@string/activity_type_cross_country_skiing_skate</item>
+    <item>@string/activity_type_cross_country_skiing</item>
     <item>@string/activity_type_cycling</item>
     <item>@string/activity_type_dirt_bike</item>
     <item>@string/activity_type_donkey_back_riding</item>
@@ -55,8 +55,7 @@ limitations under the License.
     <item>@string/activity_type_rc_helicopter</item>
     <item>@string/activity_type_riding</item>
     <item>@string/activity_type_road_biking</item>
-    <item>@string/activity_type_roller_skiing_classic</item>
-    <item>@string/activity_type_roller_skiing_skate</item>
+    <item>@string/activity_type_roller_skiing</item>
     <item>@string/activity_type_rowing</item>
     <item>@string/activity_type_running</item>
     <item>@string/activity_type_sailing</item>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index dbc46784a..9d88c47d1 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -53,6 +53,11 @@ limitations under the License.
       completion suggestion for ATV (All Terrain Vehicles).">
     ATV
   </string>
+  <string name="activity_type_biking"
+    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+      completion suggestion for biking.">
+    biking
+  </string>
   <string name="activity_type_blimp"
     translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for blimp.">
@@ -68,15 +73,10 @@ limitations under the License.
       completion suggestion for commercial airplane.">
     commercial airplane
   </string>
-  <string name="activity_type_cross_country_skiing_classic"
+  <string name="activity_type_cross_country_skiing"
     translation_description="When entering an 'Activity type', in the auto-complete text box, the
-      completion suggestion for cross-country skiing (classic).">
-    cross-country skiing (classic)
-  </string>
-  <string name="activity_type_cross_country_skiing_skate"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
-      completion suggestion for cross-country skiing (skate).">
-    cross-country skiing (skate)
+      completion suggestion for cross-country skiing.">
+    cross-country skiing
   </string>
   <string name="activity_type_cycling"
     translation_description="When entering an 'Activity type', in the auto-complete text box, the
@@ -233,15 +233,10 @@ limitations under the License.
       completion suggestion for road biking.">
     road biking
   </string>
-  <string name="activity_type_roller_skiing_classic"
+  <string name="activity_type_roller_skiing"
     translation_description="When entering an 'Activity type', in the auto-complete text box, the
-      completion suggestion for roller skiing (classic).">
-    roller skiing (classic)
-  </string>
-  <string name="activity_type_roller_skiing_skate"
-    translation_description="When entering an 'Activity type', in the auto-complete text box, the
-      completion suggestion for roller skiing (skate).">
-    roller skiing (skate)
+      completion suggestion for roller skiing.">
+    roller skiing
   </string>
   <string name="activity_type_rowing"
     translation_description="When entering an 'Activity type', in the auto-complete text box, the
@@ -374,47 +369,45 @@ limitations under the License.
     translation_description="For the Android Market (not used in the app), the description text.
 
       Character limit: 4000.">
-    Use My Tracks while you run, bike, hike, or do anything else outdoors, and it will use the GPS
-    sensor in your phone to record the path you took. It will also gather useful statistics such as
-    time, speed, distance, and elevation. You can review all of this data live, or you can save it
-    for use later. While you\'re out, you can insert markers, have split markers inserted
-    automatically, and can ask to hear periodic voice announcements of your progress.\n
+    Use My Tracks while you walk, run, bike, or do anything else outdoors. It uses the GPS sensor
+    in your phone to record your path and gather useful statistics such as time, speed, distance,
+    and elevation. You can review all of this data live or save it for use later. While recording,
+    you can insert markers, have split markers inserted automatically, and hear periodic voice
+    announcements of your progress.\n
     \n
     My Tracks can record data from external sensors:\n
-    - Zephyr Technology Consumer HxM Bluetooth heart rate monitor\n
-    - Polar Bluetooth heart rate monitor\n
+    - Zephyr HxM Bluetooth heart rate monitor\n
+    - Polar WearLink Bluetooth heart rate monitor\n
     - ANT+ heart rate monitors (*)\n
-    - SRM power meters, speed, and cadence sensors (*)\n
-    - More sensor support coming soon\n
+    - Ant+ speed distance monitors (*)\n
     \n
-    * ANT+ and SRM support requires an ANT+ compatible phone\n
+    * Requires an ANT+ compatible phone\n
     \n
     My Tracks can share your track data:\n
-    - As a GPX, KML, CSV, or TCX file\n
-    - Using Google Maps, Google Fusion Tables, or Google Docs\n
     - Via Google+, Facebook, or Twitter\n
+    - Using Google Maps, Google Fusion Tables, or Google Docs\n
+    - As a GPX, KML, CSV, or TCX file\n
     \n
     Other features:\n
-    - Record in Metric or Imperial units (configured from the Recording menu, under Settings)\n
-    - Display your movement in terms of Speed or Pace (configured from the Display menu, under
-    Settings)\n
+    - Record in metric (km, m) or imperial (mi, ft) units\n
+    - Display your movement in terms of speed or pace\n
     \n
-    My Tracks is an open source project, if you would like to contribute, please visit:\n
+    My Tracks is an open source project. If you like to contribute, please visit:\n
     \n
     http://mytracks.googlecode.com\n
   </string>
-  <string name="android_market_recent_changes_text"
-    translation_description="For the Android Market (not used in the app), the recent changes text.
-
-      Character limit: 500.">
-    Please see the English version for more information.
-  </string>
   <string name="android_market_promo_text"
     translation_description="For the Android Market (not used in the app), the promotion text.
 
       Character limit: 80.">
     Record and share your GPS tracks with My Tracks.
   </string>
+  <string name="android_market_recent_changes_text"
+    translation_description="For the Android Market (not used in the app), the recent changes text.
+
+      Character limit: 500.">
+    Please see the English version for more information.
+  </string>
 
   <!-- Description -->
   <string name="description_activity_type"
@@ -451,10 +444,6 @@ limitations under the License.
       %2$.1f speed in miles per hour">
     Average speed: %1$.2f km/h (%2$.1f mi/h)
   </string>
-  <string name="description_elevation_imperial"
-    translation_description="Elevation in imperial units, feet.">
-    Elevation (ft)
-  </string>
   <string name="description_elevation_gain"
     translation_description="Elevation gain description.
 
@@ -462,6 +451,10 @@ limitations under the License.
       %2$d elevation in feet">
     Elevation gain: %1$d m (%2$d ft)
   </string>
+  <string name="description_elevation_imperial"
+    translation_description="Elevation in imperial units, feet.">
+    Elevation (ft)
+  </string>
   <string name="description_elevation_metric"
     translation_description="Elevation in metric units, meters.">
     Elevation (m)
@@ -505,10 +498,11 @@ limitations under the License.
     Max elevation: %1$d m (%2$d ft)
   </string>
   <string name="description_max_grade"
-    translation_description="Max grade description.
+    translation_description="Max grade description. \u0025 is the unicode value for the percent
+      symbol.
 
       %1$d grade in percentage">
-    Max grade: %1$d %%
+    Max grade: %1$d \u0025
   </string>
   <string name="description_max_speed"
     translation_description="Max speed description.
@@ -525,10 +519,11 @@ limitations under the License.
     Min elevation: %1$d m (%2$d ft)
   </string>
   <string name="description_min_grade"
-    translation_description="Min grade description.
+    translation_description="Min grade description. \u0025 is the unicode value for the percent
+      symbol.
 
       %1$d grade in percentage">
-    Min grade: %1$d %%
+    Min grade: %1$d \u0025
   </string>
   <string name="description_moving_time"
     translation_description="Moving time description.
@@ -578,14 +573,6 @@ limitations under the License.
     translation_description="Label for time.">
     Time
   </string>
-  <string name="description_track_point"
-    translation_description="Label for a track point">
-    Point
-  </string>
-  <string name="description_track_segment"
-    translation_description="Label for a track segment">
-    Segment
-  </string>
   <string name="description_total_distance"
     translation_description="Total distance description.
 
@@ -599,34 +586,20 @@ limitations under the License.
       %1$s time. E.g., '1:08:59'">
     Total time: %1$s
   </string>
+  <string name="description_track_point"
+    translation_description="Label for a track point">
+    Point
+  </string>
+  <string name="description_track_segment"
+    translation_description="Label for a track segment">
+    Segment
+  </string>
 
   <!-- EULA -->
   <string name="eula_accept"
     translation_description="In the 'Terms of Service' dialog, the button to accept.">
     Accept
   </string>
-  <string name="eula_copyright_year"
-    translation_description="The copyright year in the 'Terms of Service'. See
-      http://m.google.com/toscountry. \u00A9 is the unicode value for the copyright symbol."> 
-    \u00A92012
-  </string>
-  <string name="eula_decline"
-    translation_description="In the 'Terms of Service' dialog, the button to decline.">
-    Decline
-  </string>
-  <string name="eula_date"
-    translation_description="The date in the 'Terms of Service'. See
-      http://m.google.com/toscountry.">
-    March 1, 2012
-  </string>
-  <string name="eula_footer"
-    translation_description="The footer in the 'Terms of Service'. See
-      http://m.google.com/toscountry.
-
-      %1$s: host name, 'm.google.com'">
-    Any required attribution or notice for the third party content may be found at
-    %1$s/legalnotices.
-  </string>
   <string name="eula_body"
     translation_description="The body in the 'Terms of Service. See http://m.google.com/toscountry.
 
@@ -637,6 +610,28 @@ limitations under the License.
     Books Terms of Service (%1$s/tos_books) for Books-related Services, and e) the Google Terms of
     Service (%1$s/utos) for all other Services, as updated from time to time.
   </string>
+  <string name="eula_copyright_year"
+    translation_description="The copyright year in the 'Terms of Service'. See
+      http://m.google.com/toscountry. \u00A9 is the unicode value for the copyright symbol.">
+    \u00A92012
+  </string>
+  <string name="eula_date"
+    translation_description="The date in the 'Terms of Service'. See
+      http://m.google.com/toscountry.">
+    March 1, 2012
+  </string>
+  <string name="eula_decline"
+    translation_description="In the 'Terms of Service' dialog, the button to decline.">
+    Decline
+  </string>
+  <string name="eula_footer"
+    translation_description="The footer in the 'Terms of Service'. See
+      http://m.google.com/toscountry.
+
+      %1$s: host name, 'm.google.com'">
+    Any required attribution or notice for the third party content may be found at
+    %1$s/legalnotices.
+  </string>
   <string name="eula_title"
     translation_description="The title for the 'Terms of Service' dialog.">
     Terms of Service
@@ -707,10 +702,10 @@ limitations under the License.
     translation_description="On application start, message when there is no GPS on the device.">
     No GPS is found on the device.
   </string>
-  <string name="gps_wait_for_fix"
+  <string name="gps_wait_for_signal"
     translation_description="In the main view, the message on the top indicating My Tracks is
-      waiting for a better GPS fix.">
-    Waiting for a better GPS fix. Make sure the sky is visible.
+      waiting for a better GPS signal.">
+    Waiting for a better GPS signal. Make sure the sky is visible.
   </string>
 
   <!-- Help page -->
@@ -774,16 +769,16 @@ limitations under the License.
     translation_description="In the 'Help' page, the question on elevation precision.">
     How precise is the elevation measurement?
   </string>
-  <string name="help_gps_fix_answer"
-    translation_description="In the 'Help' page, the answer on the GPS fix message.">
+  <string name="help_gps_signal_answer"
+    translation_description="In the 'Help' page, the answer on the GPS signal message.">
     For My Tracks to work, your phone needs to be in line-of-sight contact with the GPS satellites.
     If the line-of-sight is obstructed by trees, buildings or canyon walls, you may not get an
-    accurate fix. If you see the message, wait a minute or two. If your device does not achieve a
-    fix, move to an area clear of obstructions and try again.
+    accurate signal. If you see the message, wait a minute or two. If your device still does not
+    find a signal, move to an area clear of obstructions and try again.
   </string>
-  <string name="help_gps_fix_question"
-    translation_description="In the 'Help' page, the question on the GPS fix message.">
-    Why does the application sometimes display \"Waiting for a better GPS fix.\"?
+  <string name="help_gps_signal_question"
+    translation_description="In the 'Help' page, the question on the GPS signal message.">
+    Why does the application sometimes display \"Waiting for a better GPS signal.\"?
   </string>
   <string name="help_location_precision_answer"
     translation_description="In the 'Help' page, the answer on location precision.">
@@ -806,7 +801,7 @@ limitations under the License.
   </string>
   <string name="help_my_tracks_answer"
     translation_description="In the 'Help' page, the answer on what is My Tracks.">
-    My Tracks allows you to record GPS tracks and visualize your hiking, running, biking or any
+    My Tracks allows you to record GPS tracks and visualize your walking, running, biking or any
     other activity while watching live performance statistics. My Tracks makes it easy to archive
     your training history with Google Maps, Google Fusion Tables, and Google Docs, and share your
     activities with friends and the world.
@@ -825,8 +820,7 @@ limitations under the License.
   </string>
   <string name="help_share_friends_answer"
     translation_description="In the 'Help' page, the answer on sharing with friends.">
-    You can share a track as a link to Google Map or Google Fusion Table (you will be prompted to
-    upload the track first) or as a GPX, KML, CSV, or TCX file in an e-mail attachment.
+    You can share a track as a link to Google Map. Your track will first get uploaded to Google Map.
   </string>
   <string name="help_share_friends_question"
     translation_description="In the 'Help' page, the question on sharing with friends.">
@@ -834,13 +828,13 @@ limitations under the License.
   </string>
   <string name="help_share_visibility_answer"
     translation_description="In the 'Help' page, the answer on share visibility.">
-    By default, tracks sent to Google Maps and Google Fusion Tables are public. You can change the
-    visibility of your tracks in Google Maps and Google Fusion. For Google Maps, you can change the
-    default from public to unlisted in Settings -> Sharing.
+    By default, tracks sent to Google Maps and Google Fusion Tables are public, while tracks sent to
+    Google Docs are private. You can change the visibility of your tracks in Google Maps, Google
+    Fusion, and Google Docs.
   </string>
   <string name="help_share_visibility_question"
     translation_description="In the 'Help' page, the question on share visibility.">
-    Who can see the tracks I send to Google Maps and Google Fusion Tables?
+    Who can see the tracks I send to Google Maps, Google Fusion Tables, and Google Docs?
   </string>
   <string name="help_split_marker_answer"
     translation_description="In the 'Help' page, the answer on split markers.">
@@ -965,21 +959,21 @@ limitations under the License.
       user that the marker will be permanently deleted from the phone.">
     The marker will be permanently deleted from the phone.
   </string>
-  <string name="marker_detail_marker_type"
-    translation_description="In the marker detail page, the label for the marker type.
-
-      %1$s marker type. E.g., 'building'.">
-    Marker type: %1$s
-  </string>
   <string name="marker_detail_statistics_title"
     translation_description="In the marker detail page, the title for the statistics section
       indicating that the data below are since the last split marker.">
     Since last split marker:
   </string>
+  <string name="marker_detail_waypoint_marker_type"
+    translation_description="In the marker detail page, the label for the marker type.
+
+      %1$s marker type. E.g., 'building'.">
+    Marker type: %1$s
+  </string>
   <string name="marker_edit_marker_type"
     translation_description="In the marker edit page, the label for the marker type, including some
       examples.">
-    Marker type (e.g. building, pothole...)
+    Marker type (e.g. building, waterfall...)
   </string>
   <string name="marker_edit_marker_type_hint"
     translation_description="In the marker edit page, the hint in the marker type text field when it
@@ -1022,14 +1016,14 @@ limitations under the License.
     translation_description="In the menu, to go to the aggregated statistics page.">
     Aggregated statistics
   </string>
-  <string name="menu_delete_all"
-    translation_description="In the menu, to delete all the tracks.">
-    Delete all
-  </string>
   <string name="menu_delete"
     translation_description="In the menu, to delete a track or a marker.">
     Delete
   </string>
+  <string name="menu_delete_all"
+    translation_description="In the menu, to delete all the tracks.">
+    Delete all
+  </string>
   <string name="menu_edit"
     translation_description="In the menu, to edit a track or a marker.">
     Edit
@@ -1132,7 +1126,7 @@ limitations under the License.
     translation_description="When displaying the user's current location, a status message
       indicating that the current location cannot be determined.">
     GPS is not available. Current location cannot be determined. Enable more location sources (see
-    \'Location &amp; security\' settings) &amp; make sure the sky is visible. Try again later.
+    \'Location services\' settings) &amp; make sure the sky is visible. Try again later.
   </string>
 
   <!-- My Tracks -->
@@ -1202,7 +1196,7 @@ limitations under the License.
 
       %1$s: the SD card directory. E.g., '/mnt/sdcard/MyTracks/gpx/'.">
     No file found in %1$s.
-  </string>  
+  </string>
   <string name="sd_card_import_progress_message"
     translation_description="When importing from the SD card, the progress message.">
     Importing from SD card...
@@ -1242,7 +1236,7 @@ limitations under the License.
     <string name="sd_card_save_success"
     translation_description="When saving to the SD card, the success message">
     Finished saving to SD card.
-  </string> 
+  </string>
 
   <!-- Search -->
   <string name="search_global_description"
@@ -1561,11 +1555,7 @@ limitations under the License.
     The way to color a track based on slow, medium, and fast speed.
   </string>
 
-  <!-- Settings Others -->
-  <string name="settings_show"
-    translation_description="In settings, the section label to show additional values.">
-    Show
-  </string>
+  <!-- Settings Not While Recording -->
   <string name="settings_not_while_recording"
     translation_description="In settings, the summary for an option that is not available during a
       track recording.">
@@ -1738,7 +1728,7 @@ limitations under the License.
      device. Note that ANT+ is a radio standard.
 
       %1$d: device id number. E.g., '1'.">
-    Paired with: %1$d.
+    Paired with: %1$d
   </string>
   <string name="settings_sensor_ant_reset_heart_rate_monitor"
     translation_description="In the 'Sensor' settings, under the 'ANT+ options', the option to reset
@@ -1789,7 +1779,7 @@ limitations under the License.
   </string>
   <string name="settings_sensor_connected"
     translation_description="The message when connected to a sensor.
-    
+
       %1$s: sensor name. E.g., 'polar bluetooth'.">
    Connected to %1$s
   </string>
@@ -1853,7 +1843,7 @@ limitations under the License.
   </string>
   <string name="settings_sharing_account_summary"
     translation_description="In the 'Sharing' settings, the summary for 'Switch account'.">
-    Switch account used when sending a track to Google.
+    Account used when sending a track to Google.
   </string>
   <string name="settings_sharing_allow_access"
     translation_description="In the 'Sharing' settings, the checkbox option to allow third party
@@ -1887,19 +1877,25 @@ limitations under the License.
       created in Google Maps public.
 
       Character limit: ~23 (1 line)">
-    New maps public
+    Make new maps public
   </string>
   <string name="settings_sharing_map_public_summary_off"
-    translation_description="In the 'Sharing' settings, the summary for the 'New maps public'
+    translation_description="In the 'Sharing' settings, the summary for the 'Make new maps public'
       checkbox option when it is unchecked explaining that new maps created in Google Maps will
       be unlisted, as opposed to public.">
-    Make new maps created in Google Maps unlisted.
+    New maps created in Google Maps will be unlisted.
   </string>
   <string name="settings_sharing_map_public_summary_on"
-    translation_description="In the 'Sharing' settings, the summary for the 'New maps public'
+    translation_description="In the 'Sharing' settings, the summary for the 'Make new maps public'
       checkbox option when it is checked explaining that new maps created in Google Maps will
       be public, as opposed to unlisted.">
-    Make new maps created in Google Maps public.
+    New maps created in Google Maps will be public.
+  </string>
+
+  <!-- Settings Show -->
+  <string name="settings_show"
+    translation_description="In settings, the section label to show additional values.">
+    Show
   </string>
 
   <!-- Settings Split -->
@@ -1963,7 +1959,7 @@ limitations under the License.
   </string>
   <string name="share_track_share_file_body"
     translation_description="When sharing a track file with friends, the body of the message.
-    
+
     %1$s: track description.">
     I think you might be interested in this track.\n\nTo view this track, use Google Earth or other
     mapping software.\n\n%1$s
@@ -2118,7 +2114,7 @@ limitations under the License.
   <string name="track_list_record_error"
     translation_description="When starting a new track recording, the error message informing the
       user not able to record and asking the user to try again.">
-    Unable to start recording. No GPS location. Try again.
+    Unable to start recording. No GPS signal. Try again.
   </string>
   <string name="track_list_record_success"
     translation_description="When starting a new track recording, a status message indicating
@@ -2142,10 +2138,6 @@ limitations under the License.
     translation_description="Abbreviation for feet. E.g., '2 ft'.">
     ft
   </string>
-  <string name="unit_hour"
-    translation_description="Abbreviation for hours. E.g, '2 hr'.">
-    hr
-  </string>
   <string name="unit_kilometer"
     translation_description="Abbreviation for kilometers. E.g., '2 km'.">
     km
@@ -2166,10 +2158,6 @@ limitations under the License.
     translation_description="Abbreviation for miles per hour. E.g, '5 mi/h'.">
     mi/h
   </string>
-  <string name="unit_minute"
-    translation_description="Abbreviation for minutes. E.g, '2 min'.">
-    min
-  </string>
 
   <!-- Value -->
   <string name="value_adapt_accuracy"
@@ -2184,6 +2172,13 @@ limitations under the License.
     translation_description="In a setting picker, the value to always enable the option.">
     Always
   </string>
+  <string name="value_coordinate_degree"
+    translation_description="To display a latitude or longitude coordinate in degree. E.g.,
+      2.2 \u00B0. \u00B0 is the unicode value for the degree symbol.
+
+    %1$s: a string value of the coordinate. E.g., '2.2'">
+    %1$s \u00B0
+  </string>
   <string name="value_float_feet"
     translation_description="Display a float value in feet (ft).
 
@@ -2220,6 +2215,13 @@ limitations under the License.
       %1$.2f: a float number. E.g., '2.22'">
     %1$.2f mi/h
   </string>
+  <string name="value_float_mile_poor_gps"
+    translation_description="In a setting picker, the string format to display a float value in
+      miles (mi), recommended when having poor GPS signal.
+
+      %1$.1f: a float number. E.g., '2.2'">
+    %1$.1f mi (poor GPS)
+  </string>
   <string name="value_float_minute_kilometer"
     translation_description="Display a float value in minutes per kilometer (min/km).
 
@@ -2232,13 +2234,6 @@ limitations under the License.
       %1$.2f: a float number. E.g., '2.22'">
     %1$.2f min/mi
   </string>
-  <string name="value_float_mile_poor_gps"
-    translation_description="In a setting picker, the string format to display a float value in
-      miles (mi), recommended when having poor GPS signal.
-
-      %1$.1f: a float number. E.g., '2.2'">
-    %1$.1f mi (poor GPS)
-  </string>
   <string name="value_integer_feet"
     translation_description="In a setting picker, the string format to display an integer value in
       feet (ft).
@@ -2322,10 +2317,11 @@ limitations under the License.
     %1$d min
   </string>
   <string name="value_integer_percent"
-     translation_description="To display a value in percent like 2 %.
+     translation_description="To display a value in percent like 2 %. \u0025 is the unicode value
+      for the percent symbol.
 
      %1$d: an integer value. E.g., '2'">
-    %1$d %%
+    %1$d \u0025
   </string>
   <string name="value_integer_second"
     translation_description="In a setting picker, the string format to display an integer value in
@@ -2347,13 +2343,6 @@ limitations under the License.
       recommended value.">
     Smallest (recommended)
   </string>
-  <string name="value_coordinate_degree"
-    translation_description="To display a latitude or longitude coordinate in degree. E.g.,
-      2.2 \u00B0. \u00B0 is the unicode value for the degree symbol.
-
-    %1$s: a string value of the coordinate. E.g., '2.2'">
-    %1$s \u00B0
-  </string>
 
   <!-- Voice -->
   <string name="voice_hours_few"
@@ -2863,7 +2852,7 @@ limitations under the License.
   <!-- Welcome -->
   <string name="welcome_message"
     translation_description="The message of the welcome dialog.">
-    Use My Tracks while you run, bike, hike, or do anything outdoor to record your path. While
+    Use My Tracks while you walk, run, bike, or do anything else outdoors to record your path. While
     recording, you can visualize your track and watch live statistics. You can also add markers,
     have split markers inserted periodically, or hear periodic announcements of your progress.
     For recorded tracks, you can play them on Google Earth, share with friends, or upload to Google
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MarkerDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MarkerDetailActivity.java
index f293a494a..280accfe7 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MarkerDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MarkerDetailActivity.java
@@ -79,7 +79,8 @@ public class MarkerDetailActivity extends AbstractMyTracksActivity {
       statisticsSection.setVisibility(View.GONE);
 
       TextView markerType = (TextView) findViewById(R.id.marker_detail_waypoint_marker_type);
-      markerType.setText(getString(R.string.marker_detail_marker_type, waypoint.getCategory()));
+      markerType.setText(getString(
+          R.string.marker_detail_waypoint_marker_type, waypoint.getCategory()));
       TextView description = (TextView) findViewById(R.id.marker_detail_waypoint_description);
       description.setText(getString(R.string.generic_description_line, waypoint.getDescription()));
     } else {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java
index 592793a87..3b02a22ac 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java
@@ -275,7 +275,7 @@ public class MapFragment extends Fragment
         break;
       case NO_FIX:
       case BAD_FIX:
-        messageId = R.string.gps_wait_for_fix;
+        messageId = R.string.gps_wait_for_signal;
         isGpsDisabled = false;
         break;
       case GOOD_FIX: