Conflict resolved

This commit is contained in:
harish
2024-08-27 14:29:13 +05:30
18 changed files with 399 additions and 36 deletions

View File

@@ -65,6 +65,20 @@ evaluation.criteria.created.successfully=EvaluationCriteria created successfully
evaluation.criteria.fetch.successfully=EvaluationCriteria fetched successfully.
evaluation.criteria.updated.successfully=EvaluationCriteria updated successfully.
evaluation.criteria.deleted.successfully=EvaluationCriteria deleted successfully.
# Password reset messages
password.reset.initiated=Password reset initiated.
password.reset.success=Password has been successfully reset.
#Change Password
invalid.token.msg=The token provided is invalid or expired. Please request a new token.
current.password.incorrect = Current password is incorrect.
success.password.changed=Password changed successfully.
#Logout
logout.successful.msg=Logout successful. You have been logged out successfully.
#Update user Active or Deactive status
update.user.status.success=User status has been successfully updated.
#Faq-related messages
faq.not.found=Faq not found.