Merge branch 'master' into ysy_temp_f

2017-01-19 15:08:53 +05:30
parent 92cf9904a8 bcd5e2a1bd
commit 89d5fe28c2
14 changed files with 321 additions and 106 deletions
@@ -50,7 +50,7 @@
    <string name="select_language">Please select language</string>
    <string name="title_activity_select_language">Select Language</string>

-    <string name="title_activity_store_list_geotag">Store List</string>
+    <string name="title_activity_store_list">Store List</string>

    <string name="title_activity_store_geotag">Geo Tag</string>

@@ -216,6 +216,8 @@
    <string name="DataNot"> Data Not Uploaded ,</string>
    <string name="displayname">Display Name</string>
    <string name="adddatatoclick">Click Yes To Add Data</string>
+    <string name="Remark">Remark</string>
+    <string name="pleaseenterRemarks">Please fill Remark</string>

    <string name="title_activity_service">Service</string>