Commit 799ac01f authored by Chrysanthi Lagodimou's avatar Chrysanthi Lagodimou
Browse files

include changes from rebase

parent 06bfa11f
......@@ -206,9 +206,9 @@ de:
rejected: Abgelehnt
user:
role:
superadmin: 'Superadmin'
social_worker: 'Sozialarbeiter'
department_manager: 'Standort Leiter'
superadmin: Superadmin
social_worker: Sozialarbeiter
department_manager: Standort Leiter
"yes": 'Ja'
"no": 'Nein'
required:
......
......@@ -128,9 +128,9 @@ en:
rejected: Rejected
user:
role:
superadmin: 'Superadmin'
social_worker: 'Social worker'
department_manager: 'Departement manager'
superadmin: Superadmin
social_worker: Social worker
department_manager: Department manager
"yes": 'Yes'
"no": 'No'
required:
......@@ -160,8 +160,8 @@ en:
basic: Basic
role:
superadmin: superadmin
social_worker: social_worker
department_manager: department_manager
social_worker: social worker
department_manager: department manager
times:
morning: morning
afternoon: afternoon
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment