diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
index c3a75e5..9b41ee5 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
@@ -34,6 +34,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hpostesting.R
 import `in`.sminnovations.hpostesting.databinding.FragmentHomeBinding
 import java.text.SimpleDateFormat
+import java.util.Calendar
 import java.util.Date
 import java.util.Locale
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4ee8fe7..ec5b9d3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -67,7 +67,6 @@
     <!--    <string name="step4"><b><u>Step 1</u>  : </b> Place the cuvette containing sample for experiment.</string>-->
     <string name="step4"><b><u>Step 1</u>  : </b> Place the cuvette containing blood sample mixed with kit solution.</string>
     <string name="step5"><b><u>Step 2</u>  : </b> Press the button below to start the device reading values.</string>
-
     <string name="login_id">Login ID</string>
     <string name="password">Password</string>
     <string name="login">Login</string>
@@ -80,7 +79,6 @@
     <string name="age_error">Age can\'t be empty</string>
     <string name="gender_error">Gender can\'t be empty</string>
     <string name="age_error_out_of_bound">Age should be valid</string>
-
     <string name="yob_error">Year of birth can\'t be empty</string>
     <string name="yob_error_2">Invalid Year of Birth</string>
     <string name="mobile_error">Mobile Number can\'t be empty</string>
@@ -113,7 +111,7 @@
     <string name="sickle_find">Sickle Find</string>
     <string name="submit">Submit</string>
     <string name="diagnostics">Device Diagnostics</string>
-    <string name="place_buffer">Start Buffer</string>
+    <string name="place_buffer">Start</string>
     <string name="Start_Sample">Start Sample</string>
     <string name="new_kit">New Kit</string>
     <string name="new_buffer">New Buffer</string>
@@ -121,7 +119,7 @@
     <string name="recommended">\*Result to be confirmed with laboratory test</string>
     <string name="recommended_age">\*Result to be confirmed with laboratory test as age of the patient is less than 5 years</string>
     <string name="positive_borderline">Positive Borderline</string>
-    <string name="negative_borderline">Negative Borderline</string>
+    <string name="negative_borderline">Negative Borderline, Repeat Test</string>
     <string name="is_patient_under_any_medication">Is Patient under any medication or treatment?</string>
     <string name="is_patient_undergoing_any_blood_transfusion">Is Patient undergoing any blood transfusion?</string>
     <string name="scan_aadhaar_card">Scan Aadhaar\nCard</string>
@@ -147,7 +145,6 @@
     <string name="nav_header_subtitle">sminnovations.in</string>
     <string name="nav_header_desc">Navigation header</string>
     <string name="action_settings">Settings</string>
-
     <string name="menu_home">Home</string>
     <string name="show_hemocube_result">Show Result</string>
     <string name="menu_gallery">Gallery</string>
@@ -158,6 +155,8 @@
     <string name="is_patient_married_yes_no">Is Patient Married? (Yes/No)</string>
     <string name="category">Category</string>
     <string name="blood_group">Blood Group</string>
+    <string name="add_blood_group">Add Blood Group</string>
+    <string name="digital_card">Digital Counselling Card</string>
     <string name="patient_medical_records">Patient Medical Records</string>
     <string name="patient_address_details">Patient Address Details</string>
     <string name="district">District</string>
@@ -183,13 +182,18 @@
     <string name="user_list">User List</string>
     <string name="user_id">User ID</string>
     <string name="aadhar_id">Aadhar ID</string>
-    <string name="internet_not_available_please_enter_the_user_id_manually">Internet not available, please enter the user ID manually</string>
-    <string name="user_id_error_message">User ID should be 18 digits</string>
-    <string name="upload_db_registration_title">Upload DB Registration</string>
-    <string name="upload_db_registration_message">Do you want to upload the local DB Registration to the cloud?</string>
+    <string name="internet_not_available_please_enter_the_user_id_manually">Please enter the user ID and blood group manually</string>
+    <string name="user_id_error_message">User ID should be 18 digits and please select the blood group</string>
+    <string name="upload_db_registration_title">Upload DB Tests</string>
+    <string name="upload_db_registration_message">Do you want to upload the local DB tests to the cloud?</string>
     <string name="upload">Upload</string>
     <string name="cancel">Cancel</string>
     <string name="upload_success_message">Upload done successfully</string>
+    <string name="test_completed">Test Completed</string>
+    <string name="select_blood_group">Select Blood Group</string>
+    <string name="all_registered_user_are_tested_successfully">All registered user are tested successfully</string>
+    <string name="start_incubation">Incubate</string>
+    <string name="check_buffer">Check Buffer</string>
     <string name="low_battery_warning">Battery level is low than 40%, please charge the device to continue testing</string>
     <string name="test_already_conducted">Test has been already conducted for this user</string>
     <string name="incubation_not_completed">Incubation has not completed 15 minutes</string>
@@ -209,6 +213,51 @@
     <string name="internt_not_local">Internet not available, test details stored locally</string>
     <string name="error_local">Error uploading data, test details stored locally</string>
     <string name="error_exist">error while getting existing buffer</string>
-    <string name="select_blood_group">Select Blood Group</string>
-    <string name="all_registered_user_are_tested_successfully">All registered user are tested successfully</string>
+    <string name="do_exist">Do you want to continue with existing buffer?</string>
+    <string name="kit_uploaded">Kit result uploaded successfully</string>
+    <string name="kit_upload_failed">Kit result uploading failed, note it down manually</string>
+    <string name="test_ongoing">test is going on</string>
+    <string name="test_go_noback">test is going on, can\'t go back</string>
+    <string name="error_classification">error while performing classification</string>
+    <string name="test_upload">Test Results Uploaded Successfully</string>
+    <string name="test_upload_failed">Test Results Upload Failed</string>
+    <string name="log_out">LOG OUT</string>
+    <string name="do_log_out">Do you want to LogOut the Application?</string>
+    <string name="cancelled_unable_scan">Cancelled: Unable to scan, Try Again!!</string>
+    <string name="kit_updated">Kit number is updated, Please Select user before starting test</string>
+    <string name="select_patient">Please Select patient before starting test</string>
+    <string name="enable_location">Please enable location services</string>
+    <string name="location_denied">Fine location permission denied</string>
+    <string name="coarse_location_denied">Coarse location permission denied</string>
+    <string name="permission_grant">You must grant permission to access all files to use the app</string>
+    <string name="permission_required">All permissions are required to use the app.</string>
+    <string name="device_not">Device Not Connected.</string>
+    <string name="enter_proper_login_id">Please enter a proper Login ID</string>
+    <string name="enter_proper_password">Please enter a proper password</string>
+    <string name="wrong_password">Wrong Password</string>
+    <string name="wrong_user_id">Wrong UserID</string>
+    <string name="error_invalid_test">Invalid Test. Problem with de-oxygenation</string>
+    <string name="error_negative_abs">Error: Negative Abs. Retake Blank Reading</string>
+    <string name="error_improper_buffer_high">Error: Invalid Test. Improper buffer reading (high)</string>
+    <string name="error_improper_buffer_low">Error: Invalid Test. Improper buffer reading (low)</string>
+    <string name="error_processing_device_data">error while processing device data</string>
+    <string name="error_repeat_test_lower_volume">Inconclusive. Repeat with test with lower volume of blood</string>
+    <string name="error_repeat_test_higher_volume">Inconclusive. Very low Absorbance - Repeat test with Higher Blood Volume</string>
+    <string name="positive_for_sickle_cell">Positive for Sickle Cell. HPLC for Confirmation</string>
+    <string name="something_wrong_with_device">Something is wrong with the device, please disconnect and reconnect the device and test the user again</string>
+    <string name="processing_result">processing result</string>
+    <string name="data_collected_processing_data">Data collected, Processing data</string>
+    <string name="sample_completed">Sample Completed</string>
+    <string name="gathering_data">Gathering data</string>
+    <string name="sample_started">Sample Started</string>
+    <string name="buffer_completed">Buffer Completed</string>
+    <string name="buffer_started">Buffer Started</string>
+    <string name="start">Start</string>
+    <string name="place_sample">Place Sample</string>
+    <string name="invalid">Invalid</string>
+    <string name="error">Error</string>
+    <string name="language_update">Language updated successfully</string>
+    <string name="select_language">Select your preferred language</string>
+    <string name="app_language">App Language</string>
+    <string name="ok">OK</string>
 </resources>
\ No newline at end of file