sync from main

MyTracks/AndroidManifest.xml

@@ -17,8 +17,8 @@ limitations under the License.
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.android.maps.mytracks"
           android:installLocation="auto"
-          android:versionCode="36"
-          android:versionName="1.1.13">
+          android:versionCode="37"
+          android:versionName="1.1.14">
 
   <!-- Permissions to initialize service -->
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

MyTracks/res/values/strings.xml

@@ -729,7 +729,7 @@ limitations under the License.
       list page, the label next to the maps that are unlisted, as opposed to being public.">
     Unlisted
   </string>
-  
+
   <!-- Marker -->
   <string name="marker_detail_marker_description"
     translation_description="In the detail page for a waypoint marker, the text field for the marker
@@ -780,14 +780,14 @@ limitations under the License.
   <string name="marker_label_end"
     translation_description="When inserting a marker to indicate the end of a track, the marker's
       name. E.g., 'track_name (End)'.
-      
+
       %1$s track name. E.g., 'track_name'.">
     %1$s (End)
   </string>
   <string name="marker_label_start"
     translation_description="When inserting a marker to indicate the start of a track, the marker's
       name. E.g., 'track_name (Start)'.
-      
+
       %1$s track name. E.g., 'track_name'.">
      %1$s (Start)
   </string>
@@ -911,6 +911,10 @@ limitations under the License.
       Screenshot: menu_record_track.png">
     Record track
   </string>
+  <string name="menu_search"
+    translation_description="In the menu, to start a textual search for tracks or waypoints.">
+    Search
+  </string>
   <string name="menu_sensor_state"
     translation_description="In the menu, to go to the sensor state page.
 
@@ -935,10 +939,6 @@ limitations under the License.
       Screenshot: menu_record_track.png">
     Tracks
   </string>
-  <string name="menu_search"
-    translation_description="In the menu, to start a textual search for tracks or waypoints.">
-    Search
-  </string>
 
   <!-- My Location -->
   <string name="my_location_approximate_location"
@@ -1097,20 +1097,20 @@ limitations under the License.
   </string>
 
   <!-- Search interface -->
+  <string name="search_global_description"
+    translation_description="Description of what is searched in My Tracks, to be displayed in the
+      global system search settings.">
+    My Tracks tracks and waypoints
+  </string>
   <string name="search_hint"
     translation_description="The hint shown on the search box until the user types a search query.
       See suggestion at http://developer.android.com/guide/topics/search/search-dialog.html about
       keeping this consistent with other Android apps.">
     Search My Tracks tracks and waypoints
   </string>
-  <string name="search_global_description"
-    translation_description="Description of what is searched in My Tracks, to be displayed in the
-      global system search settings.">
-    My Tracks tracks and waypoints
-  </string>
   <string name="search_voice_prompt"
-    translation_description="Prompt shown when the user activates voice search, asking him to
-      speak what will be searched for.">
+    translation_description="Prompt shown when the user activates voice search, asking him to speak
+      what will be searched for.">
     Speak the name of a track or waypoint.
   </string>
 
@@ -1700,28 +1700,28 @@ limitations under the License.
   <string name="settings_recording_track_name"
     translation_description="In the 'Recording' settings, the title for the dropdown list to choose
       the default track name.
-      
+
       Character limit: ~23 (1 line)">
     Track name
   </string>
   <string name="settings_recording_track_name_date_iso_8601_option"
-    translation_description="In the 'Recording' settings, the option in the 'Track name' dropdown 
+    translation_description="In the 'Recording' settings, the option in the 'Track name' dropdown
       list to use the track start time in ISO-8601 date format as the track name.
-      
+
       Character limit: ~21 (1 line)">
     Date (ISO 8601)
   </string>
   <string name="settings_recording_track_name_date_local_option"
     translation_description="In the 'Recording' settings, the option in the 'Track name' dropdown
       list to use the track start time in local date format as the track name.
-      
+
       Character limit: ~21 (1 line)">
     Date (local)
   </string>
   <string name="settings_recording_track_name_number_option"
     translation_description="In the 'Recording' settings, the option in the 'Track name' dropdown
       list to use a number as the track name.
-      
+
       Character limit: ~21 (1 line)">
     Number
   </string>