diff --git a/.idea/misc.xml b/.idea/misc.xml
index b8dc4d6..b15ecee 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -41,7 +41,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle
index 992c541..213644a 100644
--- a/GSKMTOrange/build.gradle
+++ b/GSKMTOrange/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "cpm.com.gskmtorange"
         minSdkVersion 15
         targetSdkVersion 22
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml
index d63a2dd..9a6bced 100644
--- a/GSKMTOrange/src/main/AndroidManifest.xml
+++ b/GSKMTOrange/src/main/AndroidManifest.xml
@@ -150,6 +150,7 @@
             android:name=".upload.UploadActivity"
             android:configChanges="screenSize|orientation|keyboardHidden"
             android:label="@string/title_activity_upload"
+            android:theme="@style/AppTheme.NoActionBar"
             android:screenOrientation="portrait" />
         <activity
             android:name=".dailyentry.SettingsActivity"
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
index 066167d..142c03f 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
@@ -84,8 +84,6 @@ public class MainActivity extends AppCompatActivity
         db = new GSKOrangeDB(MainActivity.this);
         db.open();
 
-        coverageList = db.getCoverageData(date);
-
         webView.setWebViewClient(new MyWebViewClient());
 
         webView.getSettings().setJavaScriptEnabled(true);
@@ -128,6 +126,10 @@ public class MainActivity extends AppCompatActivity
     @Override
     protected void onResume() {
         super.onResume();
+
+        db.open();
+        coverageList = db.getCoverageData(date);
+
         preferences = PreferenceManager.getDefaultSharedPreferences(this);
         updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
         toolbar.setTitle(getString(R.string.main_menu_activity_name));
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java
index e8909fc..9ae5d11 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java
@@ -105,7 +105,7 @@ public class CheckoutActivity extends AppCompatActivity {
 
             dialog = new Dialog(context);
             dialog.setContentView(R.layout.custom);
-            dialog.setTitle("Sending Checkout Data");
+            dialog.setTitle(getString(R.string.title_activity_checkout));
             dialog.setCancelable(false);
             dialog.show();
             pb = (ProgressBar) dialog.findViewById(R.id.progressBar1);
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
index 7b5ec8d..d41b982 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
@@ -247,8 +247,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
                                     + "[APP_VERSION]" + app_version + "[/APP_VERSION]"
                                     + "[LONGITUDE]" + coverageList.get(i).getLongitude() + "[/LONGITUDE]"
                                     + "[IN_TIME]" + coverageList.get(i).getInTime() + "[/IN_TIME]"
-                                    //+ "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]"
-                                    + "[OUT_TIME]" + "00:00" + "[/OUT_TIME]"
+                                    + "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]"
                                     + "[UPLOAD_STATUS]" + "N" + "[/UPLOAD_STATUS]"
                                     + "[USER_ID]" + userId + "[/USER_ID]"
                                     + "[IMAGE_URL]" + coverageList.get(i).getImage() + "[/IMAGE_URL]"
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
index 10871b5..fdd6098 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
@@ -13,6 +13,7 @@ import android.os.AsyncTask;
 import android.preference.PreferenceManager;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
 import android.view.WindowManager;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -79,10 +80,13 @@ public class UploadActivity extends AppCompatActivity {
     private int factor, k = 0;
     Object result = "";
 
+    Toolbar toolbar;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_upload);
+        setContentView(R.layout.activity_main);
+        toolbar = (Toolbar) findViewById(R.id.toolbar);
 
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
@@ -199,7 +203,7 @@ public class UploadActivity extends AppCompatActivity {
             super.onPreExecute();
             dialog = new Dialog(context);
             dialog.setContentView(R.layout.custom);
-            dialog.setTitle("Uploading Data");
+            dialog.setTitle(getString(R.string.uploaddata));
             dialog.setCancelable(false);
             dialog.show();
 
@@ -250,8 +254,7 @@ public class UploadActivity extends AppCompatActivity {
                                     + "[APP_VERSION]" + app_version + "[/APP_VERSION]"
                                     + "[LONGITUDE]" + coverageList.get(i).getLongitude() + "[/LONGITUDE]"
                                     + "[IN_TIME]" + coverageList.get(i).getInTime() + "[/IN_TIME]"
-                                    //+ "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]"
-                                    + "[OUT_TIME]" + "00:00" + "[/OUT_TIME]"
+                                    + "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]"
                                     + "[UPLOAD_STATUS]" + "N" + "[/UPLOAD_STATUS]"
                                     + "[USER_ID]" + userId + "[/USER_ID]"
                                     + "[IMAGE_URL]" + coverageList.get(i).getImage() + "[/IMAGE_URL]"
@@ -342,7 +345,7 @@ public class UploadActivity extends AppCompatActivity {
                                 }
                             }
                             data.value = 10;
-                            data.name = "MSL_Availability Uploading";
+                            data.name = getString(R.string.availability_data_uploading);
                             publishProgress(data);
 
 
@@ -467,7 +470,7 @@ public class UploadActivity extends AppCompatActivity {
                                 }
                             }
                             data.value = 20;
-                            data.name = "Stock Facing Uploading";
+                            data.name = getString(R.string.stock_data_uploading);
                             publishProgress(data);
 
 
@@ -526,7 +529,7 @@ public class UploadActivity extends AppCompatActivity {
                                 }
                             }
                             data.value = 30;
-                            data.name = "Promotion Data Uploading";
+                            data.name = getString(R.string.promo_data_uploading);
                             publishProgress(data);
 
 
@@ -585,7 +588,7 @@ public class UploadActivity extends AppCompatActivity {
                                 }
                             }
                             data.value = 35;
-                            data.name = "Additional Promotion Data Uploading";
+                            data.name = getString(R.string.additional_data_uploading);
                             publishProgress(data);
 
 
@@ -700,9 +703,8 @@ public class UploadActivity extends AppCompatActivity {
                                 }
                             }
 
-
                             data.value = 35;
-                            data.name = "Additional Visibility Data";
+                            data.name = getString(R.string.additional_data_uploading);
                             publishProgress(data);
 
                             /////ashish close
@@ -845,7 +847,7 @@ public class UploadActivity extends AppCompatActivity {
                             }
 
                             data.value = 40;
-                            data.name = "T2P Data Uploading";
+                            data.name = getString(R.string.t2p_data_uploading);
                             publishProgress(data);
 
                             //Image Upload
@@ -1069,6 +1071,7 @@ public class UploadActivity extends AppCompatActivity {
     protected void onResume() {
         super.onResume();
         updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+        toolbar.setTitle(getString(R.string.title_activity_upload));
     }
 
 
diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml
index 0acbfa3..cd8faa3 100644
--- a/GSKMTOrange/src/main/res/values-tr/string.xml
+++ b/GSKMTOrange/src/main/res/values-tr/string.xml
@@ -216,6 +216,16 @@
     <string name="select_promo">Seçiniz</string>
     <!--Gagan end code 3-->
 
+    //text for uploading screen
+
+    <string name="coverage_data_uploading">Kapsam yükleniyor</string>
+    <string name="availability_data_uploading">Bulunurluk verisi paylaşılıyor</string>
+    <string name="stock_data_uploading">Stok verisi paylaşılıyor</string>
+    <string name="t2p_data_uploading">Kalıcı teşhir verisi paylaşılıyor</string>
+    <string name="additional_data_uploading">Ek teşhir verisi paylaşılıyor</string>
+    <string name="promo_data_uploading">Promosyon verisi paylaşılıyor</string>
+    <string name="no_data_for_upload">Yükleme İçin Veri Yok</string>
+    <string name="title_activity_checkout">Çıkış yapmak</string>
 
 </resources>
 
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index 20e6089..f216113 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -209,7 +209,7 @@
 
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
-    <string name="title_activity_checkout">CheckoutActivity</string>
+    <string name="title_activity_checkout">Checkout Activity</string>
     <string name="checkout_successful">Checkout Success</string>
 
     <string name="NetworkError">Network Error ,</string>
@@ -251,5 +251,13 @@
     <string name="select_promo">Select</string>
 
     <!--Gagan end code 3-->
+    
+    //text for uploading screen
+    <string name="coverage_data_uploading">Coverage Uploading</string>
+    <string name="availability_data_uploading">Availability Data Uploading</string>
+    <string name="stock_data_uploading">Stock Data Uploading</string>
+    <string name="t2p_data_uploading">T2P Data Uploading</string>
+    <string name="additional_data_uploading">Additional Visibility Data Uploading</string>
+    <string name="promo_data_uploading">Promo Data Uploading</string>
 
 </resources>