conflicts resolved

This commit is contained in:
harish
2024-08-26 12:29:18 +05:30
35 changed files with 341 additions and 190 deletions

View File

@@ -7,6 +7,7 @@ update_user_error_msg=An error occurred while updating the user.
delete_user_error_msg=An error occurred while deleting the user.
get_user_success_msg=User retrieved successfully.
get_user_error_msg=An error occurred while retrieving the user.
user.not.active=User is not active. Please contact support.
# Role-related messages
role.created.success=Role created successfully.
role.updated.success=Role updated successfully.
@@ -42,6 +43,8 @@ call.created.successfully=Call created successfully.
file.deleted.successfully=File deleted successfully.
document.not.found=Document not found.
document.id.not.found=Document ID not found.
call.created.successfully=Call created successfully.
call.invalid.date=Invalid start or end date.
# Login-related messages
login.successfully=Login successfully.