Resolved conflicts

This commit is contained in:
rajesh
2024-08-28 15:38:56 +05:30
85 changed files with 2713 additions and 578 deletions

View File

@@ -44,8 +44,13 @@ file.deleted.successfully=File deleted successfully.
document.not.found=Document not found.
document.id.not.found=Document ID not found.
call.invalid.date=Invalid start or end date.
call.not.found=Call not found.
call.id.not.null=Call id cannot be null.
call.update.successfully=Call updated successfully.
call.fetch.success=Call details fetched successfully.
call.not.found=Call not found.
score.not.null=Score cannot be null or cannot be zero.
field.not.null={0} cannot be null.
field.not.empty={0} cannot be empty.
# Login-related messages
login.successfully=Login successfully.
@@ -66,6 +71,23 @@ form.deleted.successfully=Form deleted successfully.
form.fetched.successfully=Form fetched successfully.
required.parameter.not.found.for.form=Label, content, or orderNo cannot be null.
form.not.found.for.call.id=Form not found for corresponding call.
#EvaluationCriteria-related messages
evaluation.criteria.not.found=EvaluationCriteria not found.
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.
#Form-field-related messages
@@ -83,4 +105,21 @@ form.template.created.successfully=Form template created successfully.
form.template.updated.suucessfully=Form template updated successfully.
form.template.deleted.successfully=Form template deleted successfully.
form.template.fetched.successfully=Form template fetched successfully.
required.parameter.not.found.for.form.template=Label or content cannot be null.
required.parameter.not.found.for.form.template=Label or content cannot be null.
#Faq-related messages
faq.not.found=Faq not found.
faq.created.successfully=Faq created successfully.
faq.fetched.successfully=Faq fetched successfully.
faq.updated.successfully=Faq updated successfully.
faq.deleted.successfully=Faq deleted successfully.
#LookUpData-related message
lookupdata.not.found=LookUpData not found.
lookupdata.created.successfully=LookUpData created successfully.
lookupdata.fetched.successfully=LookUpData fetched successfully.
lookupdata.updated.successfully=LookUpData updated successfully.
lookupdata.deleted.successfully=LookUpData deleted successfully.
#Document-related message
document.updated.successfully=Document updated successfully.
document.fetched.successfully=Document fetched successfully.