Merge remote-tracking branch 'remotes/origin/development' into 3388_sormas-to-sormas-send-back

# Conflicts:
#	sormas-backend/src/test/java/de/symeda/sormas/backend/caze/CaseFacadeEjbPseudonymizationTest.java

Author: lgal

sormas-api/src/main/java/de/symeda/sormas/api/bagexport/BAGExportCaseDto.java

@@ -560,6 +560,9 @@ public interface Captions {
 	String Country_externalId = "Country.externalId";
 	String Country_isoCode = "Country.isoCode";
 	String Country_unoCode = "Country.unoCode";
+	String countryActiveCountries = "countryActiveCountries";
+	String countryAllCountries = "countryAllCountries";
+	String countryArchivedCountries = "countryArchivedCountries";
 	String creationDate = "creationDate";
 	String dashboardAlive = "dashboardAlive";
 	String dashboardApplyCustomFilter = "dashboardApplyCustomFilter";

sormas-api/src/main/java/de/symeda/sormas/api/bagexport/BAGExportContactDto.java

@@ -99,7 +99,7 @@ actionDeselectAll=Deselect all
 actionDiscard=Discard
 actionGenerate=Generate
 actionImport=Import
-actionImportAllCountries=Import all countries
+actionImportAllCountries=Import default countries
 actionLogout=Logout
 actionNewEntry=New entry
 actionOkay=Okay
@@ -1332,6 +1332,10 @@ PrescriptionExport.caseUuid=Case ID
 PrescriptionExport.caseName=Case name
 
 # Country
+countryActiveCountries=Active countries
+countryArchivedCountries=Archived countries
+countryAllCountries=All countries
+
 Country.archived=Archived
 Country.externalId=External ID
 Country.defaultName=Default name

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java

@@ -96,7 +96,7 @@ actionDeselectAll=Keine auswählen
 actionDiscard=Abbrechen
 actionGenerate=Erstellen
 actionImport=Importieren
-actionImportAllCountries=Alle Länder importieren
+actionImportAllCountries=Import default countries
 actionLogout=Abmelden
 actionNewEntry=Neuer Eintrag
 actionOkay=Okay

sormas-api/src/main/resources/captions.properties

@@ -96,7 +96,7 @@ actionDeselectAll=Keine auswählen
 actionDiscard=Verwerfen
 actionGenerate=Erstellen
 actionImport=Import
-actionImportAllCountries=Alle Länder importieren
+actionImportAllCountries=Import default countries
 actionLogout=Abmelden
 actionNewEntry=Neuer Eintrag
 actionOkay=Okay

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

@@ -96,7 +96,7 @@ actionDeselectAll=Deselect all
 actionDiscard=Discard
 actionGenerate=Generate
 actionImport=Import
-actionImportAllCountries=Import all countries
+actionImportAllCountries=Import default countries
 actionLogout=Logout
 actionNewEntry=New entry
 actionOkay=Okay

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

@@ -96,7 +96,7 @@ actionDeselectAll=De-seleccionar todo
 actionDiscard=Descartar
 actionGenerate=Generar
 actionImport=Importar
-actionImportAllCountries=Import all countries
+actionImportAllCountries=Import default countries
 actionLogout=Salir
 actionNewEntry=Nueva entrada
 actionOkay=OK

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

@@ -96,7 +96,7 @@ actionDeselectAll=Deselect all
 actionDiscard=Discard
 actionGenerate=Generate
 actionImport=Import
-actionImportAllCountries=Import all countries
+actionImportAllCountries=Import default countries
 actionLogout=Logout
 actionNewEntry=New entry
 actionOkay=Okay

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

@@ -96,7 +96,7 @@ actionDeselectAll=Deselect all
 actionDiscard=Discard
 actionGenerate=Generate
 actionImport=Import
-actionImportAllCountries=Import all countries
+actionImportAllCountries=Import default countries
 actionLogout=Logout
 actionNewEntry=New entry
 actionOkay=Okay