diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java
index 1fecee1..2cbca02 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java
@@ -24,7 +24,7 @@ public class SplashScreenActivity extends AppCompatActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_splash_screen);
+ setContentView(R.layout.activity_splash_main_layout);
StartAnimations();
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
index 902f405..8e78bc4 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
@@ -482,7 +482,7 @@ public class StoreListActivity extends AppCompatActivity {
if (checkout_status.equals(CommonString.KEY_INVALID) || checkout_status.equals(CommonString.KEY_VALID)) {
AlertDialog.Builder builder = new AlertDialog.Builder(StoreListActivity.this);
- builder.setMessage(CommonString.DATA_DELETE_ALERT_MESSAGE)
+ builder.setMessage(R.string.DELETE_ALERT_MESSAGE)
.setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes),
new DialogInterface.OnClickListener() {
diff --git a/GSKMTOrange/src/main/res/layout/activity_splash_main_layout.xml b/GSKMTOrange/src/main/res/layout/activity_splash_main_layout.xml
new file mode 100644
index 0000000..08d4874
--- /dev/null
+++ b/GSKMTOrange/src/main/res/layout/activity_splash_main_layout.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GSKMTOrange/src/main/res/layout/custom.xml b/GSKMTOrange/src/main/res/layout/custom.xml
index d289b4a..3ff50fa 100644
--- a/GSKMTOrange/src/main/res/layout/custom.xml
+++ b/GSKMTOrange/src/main/res/layout/custom.xml
@@ -35,7 +35,7 @@
android:layout_marginTop="15dp"
android:paddingBottom="20dp"
android:paddingLeft="5dp"
- android:text="Uploading Data"
+ android:text="@string/uploaddata"
android:textSize="@dimen/text_size_small" />
Lütfen Önceki Verileri Paylaşın
Hata! paylaşılıyor
Veri kaydedilmedi. İlerlemek
+ Veri başarıyla indirildi
+ Kaydedilen veriler kaybolacak - Devam etmek istiyor musunuz?
+
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index 4c7d323..2dc2b42 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -101,7 +101,7 @@
Store Already Uploaded
Store Data Uploaded
Store Already Checkout
- Please Store data again Uploaded
+ Please Upload data again
Store Closed
Store Already Closed
@@ -181,7 +181,7 @@
Please click image
Please fill SKU data
Please fill GAP data
- Want to proceed usaved data will be deleted
+ Want to proceed unsaved data will be deleted
Downloading Data
Store Visited
@@ -229,4 +229,7 @@
Please Upload Previous Data First
Error Uploading
+ Saved data will be lost - Do you want to continue?
+
+