Merge branch 'development' of https://github.com/hzi-braunschweig/SORMAS-Project into development

Author: Martin Wahnschaffe

sormas-api/src/main/resources/captions_de-CH.properties

@@ -124,7 +124,7 @@ actionLeaveBulkEditMode=Massenbearbeitungsmodus deaktivieren
 actionDiscardChanges=Änderungen abbrechen
 actionSaveChanges=Änderungen speichern
 actionBackToNationOverview=Zurück zur Nationalübersicht
-actionSettings=Einstellungen
+actionSettings=User Settings
 actionNewForm=Neues Formular
 actionOverwrite=Überschreiben
 
@@ -214,6 +214,7 @@ campaignDashboardChartWidth=Breite in %
 campaignDashboardChartHeight=Höhe in %
 campaignDashboardOrder=Verfügung
 campaignSearch=Kampagne suchen
+campaignDiagramGroupBy=Group by
 
 Campaign=Kampagne
 Campaign.name=Name
@@ -226,6 +227,7 @@ Campaign.edit=Bearbeiten
 Campaign.area=Gebiet
 Campaign.region=Kanton
 Campaign.district=Bezirk
+Campaign.community=Community
 
 CampaignFormData.campaign = Kampagne
 CampaignFormData.campaignFormMeta = Formular
@@ -883,6 +885,8 @@ Event.eventStatus=Ereignisstatus
 Event.participantCount=Teilnehmer
 Event.eventType=Ereignistyp
 Event.informationSource=Informationsquelle
+Event.meansOfTransport=Means of transport
+Event.meansOfTransportDetails=Means of transport details
 Event.numberOfPendingTasks=Ausstehende Aufgaben
 Event.reportDateTime=Meldedatum
 Event.reportingUser=Meldender Nutzer
@@ -919,6 +923,9 @@ EventAction.actionStatus=Aktionsstatus
 EventAction.actionPriority=Aktionspriorität
 EventAction.actionReplyingUser=Auf die Aktion antwortender Benutzer
 
+# Event action export
+EventActionExport.eventDate=Date of event
+
 #Event export
 
 # EventParticipant
@@ -1840,6 +1847,11 @@ TreatmentExport.caseName=Fall Name
 userNewUser=Neuer Nutzer
 userResetPassword=Neues Passwort erstellen
 userUpdatePasswordConfirmation=Passwort wirklich erneuern?
+sync=Sync
+syncUsers=Sync Users
+syncErrors=%d Error(s)
+syncSuccessful=%d Synced
+syncProcessed=%d/%d Processed
 
 User=Benutzer
 User.active=Aktiv?
@@ -1854,6 +1866,7 @@ User.userEmail=E-Mail
 User.userName=Benutzername
 User.userRoles=Benutzerrollen
 User.address=Adresse
+User.uuid=UUID
 
 # Views
 View.actions=Aktionsverzeichnis
@@ -2034,3 +2047,5 @@ patientDiaryRegistrationError=Person konnte nicht im Symptomtagebuch registriert
 patientDiaryPersonNotExportable=Die Person kann nicht in das Symptomtagebuch exportiert werden. Die Person benötigt ein gültiges Geburtsdatum und entweder eine gültige Telefonnummer oder E-Mail Adresse.
 
 showPlacesOnMap=Anzeigen
+
+changeUserEmail=Change user email

sormas-api/src/main/resources/captions_de-DE.properties

@@ -124,7 +124,7 @@ actionLeaveBulkEditMode=Massenbearbeitungsmodus deaktivieren
 actionDiscardChanges=Änderungen verwerfen
 actionSaveChanges=Änderungen speichern
 actionBackToNationOverview=Zurück zur Nationalübersicht
-actionSettings=Einstellungen
+actionSettings=Benutzereinstellungen
 actionNewForm=Neues Formular
 actionOverwrite=Überschreiben
 
@@ -214,6 +214,7 @@ campaignDashboardChartWidth=Breite in %
 campaignDashboardChartHeight=Höhe in %
 campaignDashboardOrder=Verfügung
 campaignSearch=Kampagne suchen
+campaignDiagramGroupBy=Group by
 
 Campaign=Kampagne
 Campaign.name=Name
@@ -226,6 +227,7 @@ Campaign.edit=Bearbeiten
 Campaign.area=Gebiet
 Campaign.region=Bundesland
 Campaign.district=Landkreis/Kreisfreie Stadt
+Campaign.community=Community
 
 CampaignFormData.campaign = Kampagne
 CampaignFormData.campaignFormMeta = Formular
@@ -883,6 +885,8 @@ Event.eventStatus=Ereignisstatus
 Event.participantCount=Teilnehmer
 Event.eventType=Ereignistyp
 Event.informationSource=Informationsquelle
+Event.meansOfTransport=Transportmittel
+Event.meansOfTransportDetails=Transportmittel Details
 Event.numberOfPendingTasks=Ausstehende Aufgaben
 Event.reportDateTime=Meldedatum
 Event.reportingUser=Meldender Nutzer
@@ -919,6 +923,9 @@ EventAction.actionStatus=Aktionsstatus
 EventAction.actionPriority=Aktionspriorität
 EventAction.actionReplyingUser=Auf die Aktion reagierender Benutzer
 
+# Event action export
+EventActionExport.eventDate=Datum des Ereignisses
+
 #Event export
 
 # EventParticipant
@@ -1840,6 +1847,11 @@ TreatmentExport.caseName=Fall Name
 userNewUser=Neuer Nutzer
 userResetPassword=Neues Passwort erstellen
 userUpdatePasswordConfirmation=Passwort wirklich erneuern?
+sync=Synchronisieren
+syncUsers=Benutzer synchronisieren
+syncErrors=%d Fehler
+syncSuccessful=%d synchronisiert
+syncProcessed=%d/%d verarbeitet
 
 User=Benutzer
 User.active=Aktiv?
@@ -1854,6 +1866,7 @@ User.userEmail=E-Mail
 User.userName=Benutzername
 User.userRoles=Benutzerrollen
 User.address=Adresse
+User.uuid=UUID
 
 # Views
 View.actions=Aktionsverzeichnis
@@ -2034,3 +2047,5 @@ patientDiaryRegistrationError=Person konnte nicht im Symptomtagebuch registriert
 patientDiaryPersonNotExportable=Die Person kann nicht in das Symptomtagebuch exportiert werden. Die Person benötigt ein gültiges Geburtsdatum und entweder eine gültige Telefonnummer oder E-Mail Adresse.
 
 showPlacesOnMap=Anzeigen
+
+changeUserEmail=Benutzer-E-Mail ändern

sormas-api/src/main/resources/captions_en-AF.properties

@@ -124,7 +124,7 @@ actionLeaveBulkEditMode=Leave bulk edit mode
 actionDiscardChanges=Discard changes
 actionSaveChanges=Save changes
 actionBackToNationOverview=Back to Nation Overview
-actionSettings=Settings
+actionSettings=User Settings
 actionNewForm=New Form
 actionOverwrite=Overwrite
 
@@ -214,6 +214,7 @@ campaignDashboardChartWidth=Width in %
 campaignDashboardChartHeight=Height in %
 campaignDashboardOrder=Order
 campaignSearch=Search Campaign
+campaignDiagramGroupBy=Group by
 
 Campaign=Campaign
 Campaign.name=Name
@@ -226,6 +227,7 @@ Campaign.edit=Edit
 Campaign.area=Region
 Campaign.region=Province
 Campaign.district=District
+Campaign.community=Community
 
 CampaignFormData.campaign = Campaign
 CampaignFormData.campaignFormMeta = Form
@@ -883,6 +885,8 @@ Event.eventStatus=Event status
 Event.participantCount=Participants
 Event.eventType=Event type
 Event.informationSource=Source of information
+Event.meansOfTransport=Means of transport
+Event.meansOfTransportDetails=Means of transport details
 Event.numberOfPendingTasks=Pending tasks
 Event.reportDateTime=Date of report
 Event.reportingUser=Reporting user
@@ -919,6 +923,9 @@ EventAction.actionStatus=Action status
 EventAction.actionPriority=Action priority
 EventAction.actionReplyingUser=Action replying user
 
+# Event action export
+EventActionExport.eventDate=Date of event
+
 #Event export
 
 # EventParticipant
@@ -1840,6 +1847,11 @@ TreatmentExport.caseName=Case name
 userNewUser=New user
 userResetPassword=Create new password
 userUpdatePasswordConfirmation=Really update password?
+sync=Sync
+syncUsers=Sync Users
+syncErrors=%d Error(s)
+syncSuccessful=%d Synced
+syncProcessed=%d/%d Processed
 
 User=User
 User.active=Active?
@@ -1854,6 +1866,7 @@ User.userEmail=Email
 User.userName=User name
 User.userRoles=User roles
 User.address=Address
+User.uuid=UUID
 
 # Views
 View.actions=Action Directory
@@ -2034,3 +2047,5 @@ patientDiaryRegistrationError=Could not register person in the patient diary.
 patientDiaryPersonNotExportable=Cannot export the person to the patient diary. The person needs a valid birthdate and either a valid phone number or email address.
 
 showPlacesOnMap=Show
+
+changeUserEmail=Change user email

sormas-api/src/main/resources/captions_es-CU.properties

@@ -124,7 +124,7 @@ actionLeaveBulkEditMode=Salir del modo de edición masiva
 actionDiscardChanges=Descartar cambios
 actionSaveChanges=Guardar cambios
 actionBackToNationOverview=Volver al Resumen Nacional
-actionSettings=Ajustes
+actionSettings=Preferencias de usuario
 actionNewForm=Nuevo formulario
 actionOverwrite=Sobrescribir
 
@@ -214,6 +214,7 @@ campaignDashboardChartWidth=Ancho en %
 campaignDashboardChartHeight=Altura en %
 campaignDashboardOrder=Pedido
 campaignSearch=Buscar campaña
+campaignDiagramGroupBy=Group by
 
 Campaign=Campaña
 Campaign.name=Nombre
@@ -226,6 +227,7 @@ Campaign.edit=Editar
 Campaign.area=Zona
 Campaign.region=Provincia
 Campaign.district=Municipio
+Campaign.community=Área de salud
 
 CampaignFormData.campaign = Campaña
 CampaignFormData.campaignFormMeta = Formulario
@@ -883,6 +885,8 @@ Event.eventStatus=Estado del evento
 Event.participantCount=Participantes
 Event.eventType=Tipo de evento
 Event.informationSource=Fuente de información
+Event.meansOfTransport=Medios de transporte
+Event.meansOfTransportDetails=Detalles de los medios de transporte
 Event.numberOfPendingTasks=Tareas pendientes
 Event.reportDateTime=Fecha del informe
 Event.reportingUser=Usuario informante
@@ -919,6 +923,9 @@ EventAction.actionStatus=Estado de acción
 EventAction.actionPriority=Prioridad de acción
 EventAction.actionReplyingUser=Acción en respuesta a usuario
 
+# Event action export
+EventActionExport.eventDate=Fecha del evento
+
 #Event export
 
 # EventParticipant
@@ -1840,6 +1847,11 @@ TreatmentExport.caseName=Nombre del caso
 userNewUser=Nuevo usuario
 userResetPassword=Crear nueva contraseña
 userUpdatePasswordConfirmation=¿Realmente actualizar la contraseña?
+sync=Sincronizar
+syncUsers=Sincronizar usuarios
+syncErrors=%d error(es)
+syncSuccessful=%d sincronizados
+syncProcessed=%d/%d procesados
 
 User=Usuario
 User.active=¿Activo?
@@ -1854,6 +1866,7 @@ User.userEmail=Correo electrónico
 User.userName=Nombre de usuario
 User.userRoles=Roles de usuario
 User.address=Dirección
+User.uuid=UUID
 
 # Views
 View.actions=Directorio de acciones
@@ -2034,3 +2047,5 @@ patientDiaryRegistrationError=No se pudo registrar a la persona en el diario de
 patientDiaryPersonNotExportable=No se puede exportar la persona al diario de pacientes. La persona necesita una fecha de nacimiento válida y un número telefónico o dirección de correo electrónico válidos.
 
 showPlacesOnMap=Mostrar
+
+changeUserEmail=Cambiar correo electrónico de usuario

sormas-api/src/main/resources/captions_es-EC.properties

@@ -124,7 +124,7 @@ actionLeaveBulkEditMode=Salir del modo de edición masiva
 actionDiscardChanges=Descartar cambios
 actionSaveChanges=Guardar cambios
 actionBackToNationOverview=Regresar al Resumen Nacional
-actionSettings=Ajustes
+actionSettings=User Settings
 actionNewForm=New Form
 actionOverwrite=Overwrite
 
@@ -214,6 +214,7 @@ campaignDashboardChartWidth=Width in %
 campaignDashboardChartHeight=Height in %
 campaignDashboardOrder=Order
 campaignSearch=Search Campaign
+campaignDiagramGroupBy=Group by
 
 Campaign=Campaign
 Campaign.name=Name
@@ -226,6 +227,7 @@ Campaign.edit=Edit
 Campaign.area=Area
 Campaign.region=Region
 Campaign.district=District
+Campaign.community=Community
 
 CampaignFormData.campaign = Campaign
 CampaignFormData.campaignFormMeta = Form
@@ -883,6 +885,8 @@ Event.eventStatus=Estado de evento
 Event.participantCount=Participants
 Event.eventType=Tipo de evento
 Event.informationSource=Fuente de información
+Event.meansOfTransport=Means of transport
+Event.meansOfTransportDetails=Means of transport details
 Event.numberOfPendingTasks=Tareas pendientes
 Event.reportDateTime=Fecha del informe
 Event.reportingUser=Usuario informante
@@ -919,6 +923,9 @@ EventAction.actionStatus=Action status
 EventAction.actionPriority=Action priority
 EventAction.actionReplyingUser=Action replying user
 
+# Event action export
+EventActionExport.eventDate=Date of event
+
 #Event export
 
 # EventParticipant
@@ -1840,6 +1847,11 @@ TreatmentExport.caseName=Nombre del caso
 userNewUser=Nuevo usuario
 userResetPassword=Crear nueva contraseña
 userUpdatePasswordConfirmation=¿Actualizar realmente la contraseña?
+sync=Sync
+syncUsers=Sync Users
+syncErrors=%d Error(s)
+syncSuccessful=%d Synced
+syncProcessed=%d/%d Processed
 
 User=Usuario
 User.active=¿Activo?
@@ -1854,6 +1866,7 @@ User.userEmail=Email
 User.userName=Nombre de usuario
 User.userRoles=Roles de usuario
 User.address=Address
+User.uuid=UUID
 
 # Views
 View.actions=Action Directory
@@ -2034,3 +2047,5 @@ patientDiaryRegistrationError=Could not register person in the patient diary.
 patientDiaryPersonNotExportable=Cannot export the person to the patient diary. The person needs a valid birthdate and either a valid phone number or email address.
 
 showPlacesOnMap=Show
+
+changeUserEmail=Change user email