Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml

GSKMTOrange/src/main/res/layout/activity_upload.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_upload"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="cpm.com.gskmtorange.upload.UploadActivity">
+
+</RelativeLayout>

GSKMTOrange/src/main/res/values-tr/string.xml

@@ -42,4 +42,9 @@
 
     <string name="title_activity_t2_pcompliance">Kalıcı Teşhir</string>
 
+    <string name="yes">Evet</string>
+    <string name="no">Hayır</string>
+
+    <string name="title_activity_upload">Veri Paylaş</string>
+
 </resources>

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

@@ -101,6 +101,12 @@
     <string name="title_store_list_download_data">Please Download Data First</string>
     <string name="enter_the_values">Enter the values</string>
 
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+
+    <string name="title_activity_upload">Upload Data</string>
+    <string name="no_data_for_upload">No Data For Upload</string>
+    <string name="first_checkout_store">First checkout of store</string>
 
     <!--Gagan start new code 1-->
     <string name="title_activity_promo_compliance">Promotion Compliance</string>