Merge heads

MyTracks/res/values/strings.xml

@@ -1005,6 +1005,10 @@ limitations under the License.
     translation_description="When deleting multiple markers, the confirmation message.">
     All markers for this track will be permanently deleted from the device.
   </string>
+  <string name="marker_insert_photo_error"
+    translation_description="The error message when unable to insert a photo marker.">
+    Unable to insert a photo marker. Try again.
+  </string>
   <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)'.
@@ -1124,6 +1128,12 @@ limitations under the License.
       Character limit: ~20 (1 line)">
     Insert marker
   </string>
+  <string name="menu_insert_photo"
+    translation_description="In the menu, to insert a photo.
+
+      Character limit: ~20 (1 line)">
+    Insert photo
+  </string>
   <string name="menu_map"
     translation_description="In the menu, under the map layer option, the submenu to display normal
       map.