Skip to content

Commit fc3c515

Browse files
authored
Merge branch 'Bahmni-IPD-master' into tx-for-IPD
2 parents dadfd1e + c73136b commit fc3c515

File tree

5 files changed

+61
-1
lines changed

5 files changed

+61
-1
lines changed

.trivyignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,5 @@ CVE-2024-29180 #webpack-dev-middleware https://avd.aquasec.com/nvd/cve-2024-2918
6969
CVE-2022-37620 #html-minifier latest version 4.0.0 does not have a fix for the vulnerability kangax html-minifier REDoS vulnerability https://avd.aquasec.com/nvd/cve-2022-37620
7070
CVE-2024-29415 #node-ip: Incomplete fix for CVE-2023-42282 https://avd.aquasec.com/nvd/cve-2024-29415
7171
CVE-2024-38355 #Installed version 2.1.1 Fixed Version 2.5.1, 4.6.2 socket.io: Unhandled 'error' event https://avd.aquasec.com/nvd/cve-2024-38355
72+
CVE-2024-45590 #body-parser: Denial of Service Vulnerability in body-parser https://avd.aquasec.com/nvd/cve-2024-45590
73+
CVE-2024-45296 path-to-regexp: Backtracking regular expressions cause ReDoS https://avd.aquasec.com/nvd/cve-2024-45296
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"NO_FORM": "No se encontró ningún formulario para este paciente....",
3+
"DASHBOARD_TITLE_FORMS_2_DISPLAY_CONTROL_KEY": "Formularios de observación",
4+
"LOADING_MESSAGE": "Cargando... Espere por favor",
5+
"NO_ALLERGIES": "No se registraron alergias para este paciente.",
6+
"BACK_TO_ALLERGEN": "Volver a Alergias",
7+
"ALLERGIES_HEADING": "Alergias y reacciones",
8+
"ALLERGIES_DISPLAY_CONTROL_HEADING": "Alergias",
9+
"SEVERITY": "Gravedad",
10+
"SAVE": "Ahorrar",
11+
"CANCEL": "Cancelar",
12+
"NO_ALLERGENS_FOUND": "No se encontró ningún alérgeno",
13+
"SEARCH_ALLERGEN": "Buscar alérgeno",
14+
"REACTIONS": "Reacciones",
15+
"SEARCH_REACTION": "Reacción de búsqueda",
16+
"COMMON_REACTIONS": "Reacciones comunes",
17+
"ALLERGEN": "Alérgeno",
18+
"EDIT_FORM_ERROR_MESSAGE": "Ingrese un valor en los campos obligatorios o corrija el valor en los campos resaltados para continuar"
19+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"NO_FORM": "Nessun modulo trovato per questo paziente....",
3+
"DASHBOARD_TITLE_FORMS_2_DISPLAY_CONTROL_KEY": "Moduli di osservazione",
4+
"LOADING_MESSAGE": "Caricamento in corso... Attendere prego",
5+
"NO_ALLERGIES": "Nessuna allergia registrata per questo paziente.",
6+
"BACK_TO_ALLERGEN": "Torniamo alle allergie",
7+
"ALLERGIES_HEADING": "Allergie e reazioni",
8+
"ALLERGIES_DISPLAY_CONTROL_HEADING": "Allergie",
9+
"SEVERITY": "Gravità",
10+
"SAVE": "Salva",
11+
"CANCEL": "Cancellare",
12+
"NO_ALLERGENS_FOUND": "Nessun allergene trovato",
13+
"SEARCH_ALLERGEN": "Cerca allergene",
14+
"REACTIONS": "Reazione(i)",
15+
"SEARCH_REACTION": "Cerca reazione",
16+
"COMMON_REACTIONS": "Reazioni comuni",
17+
"ALLERGEN": "Allergene",
18+
"EDIT_FORM_ERROR_MESSAGE": "Inserisci un valore nei campi obbligatori o correggi il valore nei campi evidenziati per procedere"
19+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"NO_FORM": "Nenhum formulário encontrado para este paciente....",
3+
"DASHBOARD_TITLE_FORMS_2_DISPLAY_CONTROL_KEY": "Formulários de Observação",
4+
"LOADING_MESSAGE": "Carregando... Aguarde",
5+
"NO_ALLERGIES": "Nenhuma alergia registrada para este paciente.",
6+
"BACK_TO_ALLERGEN": "Voltar para Alergias",
7+
"ALLERGIES_HEADING": "Alergias e reações",
8+
"ALLERGIES_DISPLAY_CONTROL_HEADING": "Alergias",
9+
"SEVERITY": "Gravidade",
10+
"SAVE": "Salvar",
11+
"CANCEL": "Cancelar",
12+
"NO_ALLERGENS_FOUND": "Nenhum alérgeno encontrado",
13+
"SEARCH_ALLERGEN": "Pesquisar alérgeno",
14+
"REACTIONS": "Reação(ões)",
15+
"SEARCH_REACTION": "Reação de pesquisa",
16+
"COMMON_REACTIONS": "Reações Comuns",
17+
"ALLERGEN": "Alérgeno",
18+
"EDIT_FORM_ERROR_MESSAGE": "Insira um valor nos campos obrigatórios ou corrija o valor nos campos destacados para prosseguir"
19+
}

ui/app/i18n/adt/locale_fr.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,6 @@
6565
"EMPTY_WARD_MESSAGE": "Il n'y a pas de patients dans cette salle.",
6666
"BEDMANAGEMENT_DISPOSITION_ADMIT_PATIENT": "Admission d'un patient",
6767
"BEDMANAGEMENT_DISPOSITION_DISCHARGE_PATIENT": "Décharge du patient",
68-
"BEDMANAGEMENT_DISPOSITION_TRANSFER_PATIENT": "Transfert du patient"
68+
"BEDMANAGEMENT_DISPOSITION_TRANSFER_PATIENT": "Transfert du patient",
69+
"CARE_VIEW_LABEL": "Passer à la vue Soins"
6970
}

0 commit comments

Comments
 (0)