Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master (1.4.0) to develop (1.5.0) #892

Merged
merged 3 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/api/content/client/client.json
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,10 @@
"correction.certificate.corrector.idCheckVerify": "Verified",
"correction.certificate.corrector.idCheckWithoutVerify": "Identity does not match",
"correction.certificate.corrector.otherIdCheck": "Check proof of ID",
"correction.correctionForApprovalDialog.actions.cancel": "Cancel",
"correction.correctionForApprovalDialog.actions.send": "Confirm",
"correction.correctionForApprovalDialog.description": "The Registrar will be notified of this correction request and a record of this request will be recorded",
"correction.correctionForApprovalDialog.title": "Send record correction for approval ?",
"correction.corrector.anotherAgent": "Another registration agent or field agent",
"correction.corrector.birth.note": "Note: In the case that the child is now of legal age (18) then only they should be able to request a change to their birth record.",
"correction.corrector.bride": "Bride",
Expand Down Expand Up @@ -544,12 +548,15 @@
"correction.summary.idCheck": "ID check",
"correction.summary.idCheckForCorrection": "Correct without proof of ID?",
"correction.summary.item": "Item",
"correction.summary.office": "Office",
"correction.summary.original": "Original",
"correction.summary.proofOfPayment": "Proof of payment",
"correction.summary.proofOfPaymentRequired": "Proof of payment is required",
"correction.summary.reasonForRequest": "Reason for request",
"correction.summary.requestedBy": "Requested by",
"correction.summary.requestedOn": "Requested on",
"correction.summary.required": "Required for correction",
"correction.summary.submitter": "Submitter",
"correction.summary.supportingDocuments": "Supporting documents",
"correction.summary.title": "Correction summary",
"correction.summary.totalPaymentLabel": "Total {currency}",
Expand Down Expand Up @@ -1767,12 +1774,16 @@
"register.form.modal.desc.deleteDeclarationConfirm": "Are you certain you want to delete this draft declaration form? Please note, this action cant be undone.",
"register.form.modal.desc.exitWithoutSavingDeclarationConfirm": "You have unsaved changes on your declaration form. Are you sure you want to exit without saving?",
"register.form.modal.desc.exitWithoutSavingModalForCorrection": "Are you sure you want to exit? Any corrections you have made will not be saved.",
"register.form.modal.desc.saveCorrectionConfirm": "The declarant will be notified of this correction and a record of this decision will be recorded",
"register.form.modal.desc.saveCorrectionReject": "The declarant will be notified of this decision and a record of this decision will be recorded",
"register.form.modal.desc.saveDeclarationConfirm": "All inputted data will be kept secure for future editing. Are you ready to save any changes to this declaration form?",
"register.form.modal.desc.validateConfirmation": "This declaration will be sent for approval prior to registration.",
"register.form.modal.submitDescription": "By clicking “Submit” you confirm that the informant has read and reviewed the information and understands that this information will be shared with Civil Registration authorities.",
"register.form.modal.title.deleteDeclarationConfirm": "Delete draft?",
"register.form.modal.title.exitWithoutSavingDeclarationConfirm": "Exit without saving changes?",
"register.form.modal.title.exitWithoutSavingModalForCorrection": "Exit correct record?",
"register.form.modal.title.saveCorrectionConfirm": "Approve correction?",
"register.form.modal.title.saveCorrectionReject": "Reject correction?",
"register.form.modal.title.saveDeclarationConfirm": "Save & exit?",
"register.form.modal.title.submitConfirmation": "{completeDeclaration, select, true {Send for review?} other {Send for review?}}",
"register.form.modal.title.validateConfirmation": "Send for approval?",
Expand Down Expand Up @@ -1852,6 +1863,7 @@
"review.rejection.form.commentInstruction": "",
"review.rejection.form.commentLabel": "Comments",
"review.rejection.form.instruction": "Please describe the updates required to this record for follow up action.",
"review.rejection.form.reasonLabel": "Reason",
"review.rejection.form.reasons": "Reason(s) for rejection:",
"review.rejection.form.reasons.duplicate": "Duplicate declaration",
"review.rejection.form.reasons.markDuplicate": "Mark as a duplicate",
Expand Down Expand Up @@ -1990,6 +2002,7 @@
"user.profile.audit.description.validated": "Sent for approval",
"user.profile.audit.description.waiting_validation": "Sent declaration for external system validation",
"user.profile.audit.list.noDataFound": "No audits to display",
"user.profile.auditList.approvedCorrectionAuditAction": "Approved correction request",
"user.profile.auditList.archived": "Archived",
"user.profile.auditList.assigned": "Assigned",
"user.profile.auditList.corrected": "Corrected record",
Expand All @@ -2005,6 +2018,8 @@
"user.profile.auditList.reInstatedToInProgress": "Reinstated to in progress",
"user.profile.auditList.reInstatedToInReview": "Reinstated to ready for review",
"user.profile.auditList.reInstatedToUpdate": "Reinstated to requires updates",
"user.profile.auditList.rejectedCorrectedAuditAction": "Rejected correction request",
"user.profile.auditList.requestedCorrectionAuditAction": "Requested correction",
"user.profile.auditList.retrieved": "Retrieved",
"user.profile.auditList.sentForApproval": "Sent for approval",
"user.profile.auditList.showMore": "Show next {pageSize} of {totalItems}",
Expand Down Expand Up @@ -2620,6 +2635,10 @@
"correction.certificate.corrector.idCheckVerify": "Vérifié",
"correction.certificate.corrector.idCheckWithoutVerify": "L'identité ne correspond pas",
"correction.certificate.corrector.otherIdCheck": "Avez-vous vérifié leur preuve d'identification ?",
"correction.correctionForApprovalDialog.actions.cancel": "Annuler",
"correction.correctionForApprovalDialog.actions.send": "Confirmer",
"correction.correctionForApprovalDialog.description": "Le greffier sera informé de cette demande de correction et un enregistrement de cette demande sera effectué",
"correction.correctionForApprovalDialog.title": "Envoyer la correction de l'enregistrement pour approbation ?",
"correction.corrector.anotherAgent": "Un autre agent d'enregistrement ou un agent de terrain",
"correction.corrector.birth.note": "Note : Si l'enfant a atteint l'âge légal (18 ans), il est le seul à pouvoir demander une modification de son acte de naissance.",
"correction.corrector.bride": "Mariée",
Expand Down Expand Up @@ -2660,12 +2679,15 @@
"correction.summary.idCheck": "Contrôle d'identité",
"correction.summary.idCheckForCorrection": "Correct sans pièce d'identité ?",
"correction.summary.item": "Point",
"correction.summary.office": "Bureau",
"correction.summary.original": "Original",
"correction.summary.proofOfPayment": "Preuve de paiement",
"correction.summary.proofOfPaymentRequired": "Une preuve de paiement est requise",
"correction.summary.reasonForRequest": "Raison de la demande",
"correction.summary.requestedBy": "Demandée par",
"correction.summary.requestedOn": "Demandé le",
"correction.summary.required": "Nécessaire pour la correction",
"correction.summary.submitter": "Déposant",
"correction.summary.supportingDocuments": "Documents à l'appui",
"correction.summary.title": "Résumé de la correction",
"correction.summary.totalPaymentLabel": "Total {currency}",
Expand Down Expand Up @@ -3883,12 +3905,16 @@
"register.form.modal.desc.deleteDeclarationConfirm": "Êtes-vous certain de vouloir supprimer ce projet de formulaire de déclaration? Veuillez noter que cette action ne peut pas être annulée.",
"register.form.modal.desc.exitWithoutSavingDeclarationConfirm": "Vous avez des modifications non enregistrées sur votre formulaire de déclaration. Voulez-vous vraiment quitter sans enregistrer ?",
"register.form.modal.desc.exitWithoutSavingModalForCorrection": "Êtes-vous sûr de vouloir quitter ? Les corrections que vous avez apportées ne seront pas sauvegardées.",
"register.form.modal.desc.saveCorrectionConfirm": "Le déclarant sera informé de cette correction et un procès-verbal de cette décision sera enregistré",
"register.form.modal.desc.saveCorrectionReject": "Cette décision sera notifiée au déclarant et un procès-verbal de cette décision sera enregistré",
"register.form.modal.desc.saveDeclarationConfirm": "Toutes les données saisies seront conservées en toute sécurité pour de futures modifications. Êtes-vous prêt à enregistrer les modifications apportées à ce formulaire de déclaration?",
"register.form.modal.desc.validateConfirmation": "Cette déclaration sera envoyée pour approbation avant l'enregistrement.",
"register.form.modal.submitDescription": "En cliquant sur Soumettre, vous confirmez que l'informateur a lu et revu les informations et qu'il comprend que ces informations seront partagées avec les autorités de l'état civil.",
"register.form.modal.title.deleteDeclarationConfirm": "Supprimer le brouillon?",
"register.form.modal.title.exitWithoutSavingDeclarationConfirm": "Quitter sans enregistrer les modifications?",
"register.form.modal.title.exitWithoutSavingModalForCorrection": "Quitter l'enregistrement correct ?",
"register.form.modal.title.saveCorrectionConfirm": "Approuver la correction ?",
"register.form.modal.title.saveCorrectionReject": "Rejeter la correction ?",
"register.form.modal.title.saveDeclarationConfirm": "Enregistrer et quitter?",
"register.form.modal.title.submitConfirmation": "{completeDeclaration, select, true {Envoyer une déclaration pour examen ?} other {Envoyer une déclaration incomplète ?}}",
"register.form.modal.title.validateConfirmation": "Envoyer pour approbation ?",
Expand Down Expand Up @@ -3968,6 +3994,7 @@
"review.rejection.form.commentInstruction": "Veuillez fournir des instructions spécifiques sur ce qui doit être mis à jour par le travailleur de la santé pour rectifier correctement la déclaration",
"review.rejection.form.commentLabel": "Commentaires ou instructions à l'intention de l'agent de santé pour rectifier la déclaration",
"review.rejection.form.instruction": "Veuillez décrire les mises à jour nécessaires à cet enregistrement pour le suivi de l'action.",
"review.rejection.form.reasonLabel": "Raison",
"review.rejection.form.reasons": "Raison(s) du rejet :",
"review.rejection.form.reasons.duplicate": "Déclaration en double",
"review.rejection.form.reasons.markDuplicate": "Marquer comme duplicata",
Expand Down Expand Up @@ -4106,6 +4133,7 @@
"user.profile.audit.description.validated": "Déclaration envoyée pour approbation",
"user.profile.audit.description.waiting_validation": "Déclaration envoyée pour la validation du système externe",
"user.profile.audit.list.noDataFound": "Aucun audit à afficher",
"user.profile.auditList.approvedCorrectionAuditAction": "Demande de correction approuvée",
"user.profile.auditList.archived": "Archivé",
"user.profile.auditList.assigned": "Assigné",
"user.profile.auditList.corrected": "dossier corrigé",
Expand All @@ -4121,6 +4149,8 @@
"user.profile.auditList.reInstatedToInProgress": "Réintégré dans les travaux en cours",
"user.profile.auditList.reInstatedToInReview": "Réintégré à en révision",
"user.profile.auditList.reInstatedToUpdate": "Réintégré pour demander des mises à jour",
"user.profile.auditList.rejectedCorrectedAuditAction": "Demande de correction rejetée",
"user.profile.auditList.requestedCorrectionAuditAction": "Correction demandée",
"user.profile.auditList.retrieved": "Récupéré",
"user.profile.auditList.sentForApproval": "Envoyé pour approbation",
"user.profile.auditList.showMore": "Afficher le prochain {pageSize} de {totalItems",
Expand Down
6 changes: 3 additions & 3 deletions src/data-seeding/certificates/source/BirthCertificate.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/data-seeding/certificates/source/DeathCertificate.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions src/data-seeding/certificates/source/MarriageCertificate.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading