Merge branch 'master' into feature-40896/kennzeichnung_unruly_person

This commit is contained in:
Harald Bamberger
2024-09-26 16:16:24 +02:00
17 changed files with 584 additions and 324 deletions
+23 -1
View File
@@ -25373,7 +25373,7 @@ array(
'insertvon' => 'system'
)
)
),
),
array(
'app' => 'personalverwaltung',
'category' => 'gehaltsband',
@@ -30285,6 +30285,28 @@ array(
)
)
),
// Betriebsmittel end
array(
'app' => 'core',
'category' => 'uhstat',
'phrase' => 'unbekannt',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'unbekannt',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'unknown',
'description' => '',
'insertvon' => 'system'
)
)
)
);