Merge remote-tracking branch 'origin/development' into qu-auto/SORQA-462

SORMAS-Foundation · Oct 17, 2022 · 607186b · 607186b
2 parents f80f304 + f998253
commit 607186b
Show file tree

Hide file tree

Showing 133 changed files with 857 additions and 231 deletions.
diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.76.0-SNAPSHOT</version>
+		<version>1.77.0-SNAPSHOT</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/utils/InfoProvider.java b/sormas-api/src/main/java/de/symeda/sormas/api/utils/InfoProvider.java
@@ -77,7 +77,7 @@ static String createLastCommitHistoryUrl(String gitRemoteOriginUrl, String commi
 	 * @return
 	 */
 	public String getMinimumRequiredVersion() {
-		return "1.74.0";
+		return "1.76.0";
 	}
 
 	/**

diff --git a/sormas-api/src/main/resources/captions_ar-SA.properties b/sormas-api/src/main/resources/captions_ar-SA.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_cs-CZ.properties b/sormas-api/src/main/resources/captions_cs-CZ.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Zahodit a pokračovat
 actionNext=Další
 actionYesAll=Ano vše
 actionNoAll=Ne vše
+actionOkAndGoToMerge = Dobře a pokračovat v slučování
+actionOkAndGoToContactDirectory = Dobře, a pokračovat v kontaktním adresáři
+actionOkAndGoToContactDetails = Dobře a pokračovat v kontaktu
+actionOkAndGoToPersonDirectory = Dobře, a pokračovat v osobním adresáři
 activityAsCaseFlightNumber=Číslo letu
 ActivityAsCase=Aktivita jako případ
 ActivityAsCase.startDate=Začátek aktivity

diff --git a/sormas-api/src/main/resources/captions_de-CH.properties b/sormas-api/src/main/resources/captions_de-CH.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Verwerfen und fortfahren
 actionNext=Weiter
 actionYesAll=Alle ja
 actionNoAll=Alle nein
+actionOkAndGoToMerge = Okay, weiter zur Zusammenführungsübersicht
+actionOkAndGoToContactDirectory = Okay, weiter zum Kontaktverzeichnis
+actionOkAndGoToContactDetails = Okay, weiter zum Kontakt
+actionOkAndGoToPersonDirectory = Okay, und weiter zum Personenverzeichnis
 activityAsCaseFlightNumber=Flugnummer
 ActivityAsCase=Betreuung/Unterbringung/Tätigkeit in Einrichtung
 ActivityAsCase.startDate=Start der Aktivität

diff --git a/sormas-api/src/main/resources/captions_de-DE.properties b/sormas-api/src/main/resources/captions_de-DE.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Verwerfen und fortfahren
 actionNext=Weiter
 actionYesAll=Alle ja
 actionNoAll=Alle nein
+actionOkAndGoToMerge = Okay, weiter zur Zusammenführungsübersicht
+actionOkAndGoToContactDirectory = Okay, weiter zum Kontaktverzeichnis
+actionOkAndGoToContactDetails = Okay, weiter zum Kontakt
+actionOkAndGoToPersonDirectory = Okay, weiter zum Personenverzeichnis
 activityAsCaseFlightNumber=Flugnummer
 ActivityAsCase=Betreuung/Unterbringung/Tätigkeit in Einrichtung
 ActivityAsCase.startDate=Start der Aktivität

diff --git a/sormas-api/src/main/resources/captions_en-AF.properties b/sormas-api/src/main/resources/captions_en-AF.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_en-GH.properties b/sormas-api/src/main/resources/captions_en-GH.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_en-NG.properties b/sormas-api/src/main/resources/captions_en-NG.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_es-CU.properties b/sormas-api/src/main/resources/captions_es-CU.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Descartar y continuar
 actionNext=Siguiente
 actionYesAll=Sí a todo
 actionNoAll=No a todo
+actionOkAndGoToMerge = Aceptar y abrir el resumen de combinación
+actionOkAndGoToContactDirectory = Aceptar y abrir el directorio de contactos
+actionOkAndGoToContactDetails = Aceptar y abrir el contacto
+actionOkAndGoToPersonDirectory = Aceptar y abrir el directorio de personas
 activityAsCaseFlightNumber=Número de vuelo
 ActivityAsCase=Actividad como caso
 ActivityAsCase.startDate=Inicio de la actividad

diff --git a/sormas-api/src/main/resources/captions_es-EC.properties b/sormas-api/src/main/resources/captions_es-EC.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_es-ES.properties b/sormas-api/src/main/resources/captions_es-ES.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_fa-AF.properties b/sormas-api/src/main/resources/captions_fa-AF.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_fi-FI.properties b/sormas-api/src/main/resources/captions_fi-FI.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_fil-PH.properties b/sormas-api/src/main/resources/captions_fil-PH.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_fj-FJ.properties b/sormas-api/src/main/resources/captions_fj-FJ.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_fr-CH.properties b/sormas-api/src/main/resources/captions_fr-CH.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Numéro de vol
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Début de l'activité

diff --git a/sormas-api/src/main/resources/captions_fr-FR.properties b/sormas-api/src/main/resources/captions_fr-FR.properties
@@ -47,7 +47,7 @@ to=À
 total=Total
 notSpecified=Non spécifié
 creationDate=Date de création
-changeDate=Date of last change
+changeDate=Date de dernière modification
 notAvailableShort=ND
 inaccessibleValue=Confidentiel
 numberOfCharacters=Nombre de caractères\: %d / %d
@@ -56,12 +56,12 @@ reportingUser=Rapport fait par
 notTestedYet=Pas encore testé
 latestPathogenTest=Dernier test de pathogène\:
 unknown=Inconnu
-diseaseVariantDetails=Disease variant details
+diseaseVariantDetails=Détails de variant de maladie
 unassigned=Non assigné
 assign=Affecter
 assignToMe=Me l'assigner
-endOfProcessingDate=End of processing date
-dearchiveReason=De-archive reason
+endOfProcessingDate=Date de fin de traitement
+dearchiveReason=Raison de désarchivage
 deletionReason=Reason for deletion
 otherDeletionReason=Reason for deletion details
 requiredUserRights=Needed user rights
@@ -104,12 +104,12 @@ Action.lastModifiedBy=Dernière modification par
 Action.actionMeasure=Mesure
 # Actions
 actionApplyDateFilter=Appliquer le filtre de date
-actionArchiveInfrastructure=Archive
-actionArchiveCoreEntity=Archive
+actionArchiveInfrastructure=Archiver
+actionArchiveCoreEntity=Archiver
 actionAssignNewEpidNumber=Assigner un nouveau numéro d'épi
 actionBack=Retour
 actionSend=Envoyer
-actionApply=Apply
+actionApply=Appliquer
 actionCancel=Annuler
 actionClear=Supprimer
 actionClearAll=Tout supprimer
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Numéro de vol
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Début de l'activité
@@ -253,12 +257,12 @@ areaArchivedAreas=Zones archivées
 areaAllAreas=Toutes les zones
 Area.archived=Archivé
 Area.externalId=ID externe
-years=years
-months=months
-days=days
+years=années
+months=mois
+days=jours
 # Bulk actions
 bulkActions=Actions groupées
-bulkEditAssignee=Edit assignee
+bulkEditAssignee=Editer le responsable
 bulkCancelFollowUp=Annuler le suivi
 bulkCaseClassification=Modifier la classification des cas
 bulkCaseOutcome=Modifier l'issue des cas
@@ -275,7 +279,7 @@ bulkEventStatus=Modifier la catégorie des événements
 bulkEventType=Modifier le type des événements
 bulkFacility=Changer d'établissement
 bulkInvestigationStatus=Modifier le statut des enquêtes
-bulkLinkToEvent=Link to event
+bulkLinkToEvent=Lien vers l'événement
 bulkLostToFollowUp=Trace perdue
 bulkSurveillanceOfficer=Modifier l'agent de surveillance
 bulkTaskStatus=Changer le statut de la tâche

diff --git a/sormas-api/src/main/resources/captions_hi-IN.properties b/sormas-api/src/main/resources/captions_hi-IN.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_hr-HR.properties b/sormas-api/src/main/resources/captions_hr-HR.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_it-CH.properties b/sormas-api/src/main/resources/captions_it-CH.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_it-IT.properties b/sormas-api/src/main/resources/captions_it-IT.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_ja-JP.properties b/sormas-api/src/main/resources/captions_ja-JP.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_ne-NP.properties b/sormas-api/src/main/resources/captions_ne-NP.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_nl-NL.properties b/sormas-api/src/main/resources/captions_nl-NL.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_no-NO.properties b/sormas-api/src/main/resources/captions_no-NO.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_pl-PL.properties b/sormas-api/src/main/resources/captions_pl-PL.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_ps-AF.properties b/sormas-api/src/main/resources/captions_ps-AF.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_pt-PT.properties b/sormas-api/src/main/resources/captions_pt-PT.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity

diff --git a/sormas-api/src/main/resources/captions_ro-RO.properties b/sormas-api/src/main/resources/captions_ro-RO.properties
@@ -180,6 +180,10 @@ actionDiscardAndContinue=Discard and continue
 actionNext=Next
 actionYesAll=Yes all
 actionNoAll=No all
+actionOkAndGoToMerge = Okay, and continue to merge overview
+actionOkAndGoToContactDirectory = Okay, and continue to contact directory
+actionOkAndGoToContactDetails = Okay, and continue to contact
+actionOkAndGoToPersonDirectory = Okay, and continue to person directory
 activityAsCaseFlightNumber=Flight number
 ActivityAsCase=Activity as case
 ActivityAsCase.startDate=Start of activity