Merge branch 'master' into GG_StorePerformance

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

@@ -34,8 +34,6 @@
     <string name="select">Select</string>
     <string name="add">Add</string>
     <string name="cancel">Cancel</string>
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
 
     <string name="select_language">Please select language</string>
     <string name="title_activity_select_language">SelectLanguageActivity</string>
@@ -98,9 +96,14 @@
 
     <string name="title_store_list_checkout_current">Please checkout from current store</string>
     <string name="title_store_list_checkout_Already_filled">Data already filled</string>
+
     <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>
@@ -132,4 +135,17 @@
     <!--Gagan end new code 1-->
 
 
+    <string name="AdditionalDisplay">Is there any Additional Display</string>
+    <string name="Display">Display</string>
+    <string name="Photo">Photo</string>
+    <string name="title_activity_Additional_visibility">Additional Visibility</string>
+    <string name="title_activity_Non_Work">Non-Work Reason</string>
+    <string name="closed">Close</string>
+
+    <string name="click_image">Please click image</string>
+    <string name="fill_sku_data">Please fill SKU data</string>
+    <string name="fill_gaps_data">Please fill GAP data</string>
+    <string name="data_will_be_lost">Want to proceed usaved data will be deleted</string>
+
+
 </resources>