Merge branch 'master' into JioAC
This commit is contained in:
@@ -68,7 +68,6 @@
|
||||
<string name="title_activity_t2_pcompliance">T2P Compliance</string>
|
||||
|
||||
<!--Gagan start code-->
|
||||
|
||||
<string name="title_activity_category_list">Category List</string>
|
||||
<string name="title_activity_category_wise_performance">Categorywise Performance</string>
|
||||
<string name="title_activity_daily_main_menu">Daily Data Menu</string>
|
||||
@@ -93,7 +92,6 @@
|
||||
<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-->
|
||||
|
||||
<string name="title_geo_tag_activity_upload_data">Store Uploaded</string>
|
||||
@@ -195,8 +193,8 @@
|
||||
<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="stock_facing_planogram_dialog_title">Reference Image</string>
|
||||
<string name="title_activity_settings">Settings</string>
|
||||
|
||||
<string name="ok">OK</string>
|
||||
<string name="check_save_message">Are you sure you want to save</string>
|
||||
@@ -205,7 +203,6 @@
|
||||
<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>
|
||||
@@ -214,6 +211,7 @@
|
||||
<string name="hello_blank_fragment">Hello blank fragment</string>
|
||||
<string name="title_activity_checkout">CheckoutActivity</string>
|
||||
<string name="checkout_successful">Checkout Success</string>
|
||||
|
||||
<string name="NetworkError">Network Error ,</string>
|
||||
<string name="DataNot"> Data Not Uploaded ,</string>
|
||||
<string name="displayname">Display Name</string>
|
||||
@@ -221,5 +219,10 @@
|
||||
<string name="Remark">Remark</string>
|
||||
<string name="pleaseenterRemarks">Please fill Remark</string>
|
||||
|
||||
<string name="title_activity_service">Service</string>
|
||||
|
||||
<string name="data_downloaded_successfully">Data downloaded successfully</string>
|
||||
<string name="export_database">Export Database</string>
|
||||
<string name="data_exported_successfully">Database Exported Successfully</string>
|
||||
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user