Merge branch 'master' into gg_login_change

This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-20 16:52:49 +05:30
committed by GitHub
9 changed files with 63 additions and 42 deletions
+1 -1
View File
@@ -12,7 +12,7 @@
<dimen name="text_size_normal">20sp</dimen>
<dimen name="text_size_small">16sp</dimen>
<dimen name="store_entry_text_size">20sp</dimen>
<dimen name="store_entry_text_size">15sp</dimen>
<dimen name="text_size_xsmall">12sp</dimen>
+4 -1
View File
@@ -165,7 +165,7 @@
<string name="clickimage">Please click the image</string>
<string name="gps">GPS IS DISABLED...</string>
<string name="gpsebale">Click ok to enable GPS.</string>
<string name="takeimage"> Please Take Image Before Save</string>
<string name="takeimage"> Please Take Image</string>
<string name="notsuppoted">This device is not supported.</string>
<string name="uploaddata">Uploading Data</string>
<string name="geotagdata">Uploading Geotag Data...</string>
@@ -228,6 +228,9 @@
<string name="uploadeddata">Uploaded Data</string>
<string name="previous_data_upload">Please Upload Previous Data First</string>
<string name="error_incorrect_username">This username is incorrect</string>
<string name="error">Error Uploading</string>
</resources>