Merge conflicts resolved

Author: tanvidadu

app/src/main/res/values/strings.xml

@@ -258,4 +258,5 @@
   <string name="about_translate_message">Select the langauge you want translations for ?</string>
   <string name="about_translate_proceed">Proceed</string>
   <string name="about_translate_cancel">Cancel</string>
+  <string name="share_coordinates_not_present">Coordinates were not specified during image selection</string>
 </resources>