Merge branch 'master' into YSY_t2p_updated

2017-01-20 12:55:37 +05:30
parent 1bebe6d0f9 dc2d5a4b31
commit 5677d6df11
9 changed files with 1250 additions and 44 deletions
@@ -189,6 +189,8 @@
    <string name="dialog_title">Parinaam</string>
    <!--Gagan end new code 2-->

+    <string name="previous_data_upload">Lütfen Önceki Verileri Paylaşın</string>
+
 </resources>


@@ -220,10 +220,13 @@
    <string name="pleaseenterRemarks">Please fill Remark</string>

    <string name="title_activity_service">Service</string>
-  
+
    <string name="data_downloaded_successfully">Data downloaded successfully</string>
    <string name="export_database">Export Database</string>
    <string name="data_exported_successfully">Database Exported Successfully</string>
+
    <string name="uploadeddata">Uploaded Data</string>

+    <string name="previous_data_upload">Please Upload Previous Data First</string>
+
 </resources>