Merge branch 'master' into ACVisibilityDone

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

@@ -1,5 +1,6 @@
 <resources>
-    <string name="app_name">GSKMTOrange</string>
+    <string name="app_name">GSK MT Orange</string>
+    <string name="main_menu_activity_name">GSK Orange Stores</string>
 
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
@@ -9,9 +10,9 @@
 
     <!-- Strings related to login -->
     <string name="prompt_email">E Mail</string>
-    <string name="prompt_userid">User Id</string>
-    <string name="prompt_password">Password</string>
-    <string name="action_sign_in">Login</string>
+    <string name="prompt_userid">Username/Kullanıcı Adı</string>
+    <string name="prompt_password">Password/Şifre</string>
+    <string name="action_sign_in">Login/Giriş Yap</string>
     <string name="action_sign_in_short">Sign in</string>
     <string name="error_invalid_email">This email address is invalid</string>
     <string name="error_invalid_password">This password is too short</string>
@@ -34,6 +35,7 @@
     <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="brandname">Brand Name</string>
@@ -45,11 +47,8 @@
     <string name="address">C 126, Okhla II,</string>
     <string name="storefront">Click Store Front Image</string>
 
-
-
-
     <string name="select_language">Please select language</string>
-    <string name="title_activity_select_language">SelectLanguageActivity</string>
+    <string name="title_activity_select_language">Select Language</string>
 
     <string name="title_activity_store_list_geotag">Store List</string>
 
@@ -93,6 +92,7 @@
     <string name="stock_facing_stock">Stock</string>
     <string name="stock_facing_faceup">Facing</string>
     <string name="stock_facing_sos_target">SOS Target</string>
+    <string name="stock_facing_sos">SOS</string>
 
     <!--Gagan end code-->
 
@@ -109,9 +109,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>
@@ -128,6 +133,18 @@
     <string name="promo_compliance_runningPOS">Running on POS</string>
     <string name="promo_compliance_add">Add</string>
 
+    <string name="category_performance_period">Period</string>
+    <string name="category_performance_msl_availability">MSL Availability</string>
+    <string name="category_performance_sos">SOS</string>
+    <string name="category_performance_t2p">T2P</string>
+    <string name="category_performance_promo">Promo</string>
+    <string name="category_performance_oss">OSS</string>
+
+    <string name="category_performance_ltm">LTM</string>
+    <string name="category_performance_mtd">MTD</string>
+    <string name="category_performance_lsv">LSV</string>
+
+    <string name="title_activity_store_wise_performance">Store wise Performance</string>
     <!--Gagan end new code 1-->
 
 
@@ -135,7 +152,7 @@
     <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="title_activity_Want_save"> Do You Want To Save</string>
     <string name="title_activity_Want_add"> Please Add Data</string>
     <string name="title_activity_Want_to_add">Do You Want To Add</string>
@@ -164,5 +181,40 @@
     <string name="wantcheckout">Are you sure you want to Checkout</string>
     <string name="nonetwork"> No Network</string>
 
+    <string name="title_activity_Non_Work">Non Working 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>
+
+    <string name="download_data">Downloading Data</string>
+    <string name="store_visited">Store Visited</string>
+    <string name="store_image">Click Store Front Image</string>
+
+    <string name="title_activity_store_image">Store Front Image</string>
+    <string name="reason">Reason</string>
+    <string name="select_reason">Select Reason</string>
+    <string name="daily_activity_menu">Daily Data Menu</string>
+
+    <!--Gagan start new code 2-->
+    <string name="stock_facing_planogram_dialog_title">Planogram</string>
+    <string name="title_activity_settings">SettingsActivity</string>
+
+    <string name="ok">OK</string>
+    <string name="check_save_message">Are you sure you want to save</string>
+    <string name="save_message">Data has been saved</string>
+    <string name="update_message">Data has been updated</string>
+    <string name="empty_field">Fill the value </string>
+    <string name="fill_data">Please fill all the data</string>
+    <string name="dialog_title">Parinaam</string>
+
+    <!--Gagan end new code 2-->
+
+    <string name="select_language_item">Select language</string>
+
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
 
 </resources>