blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

phrases update merge conflict

Browse Source
This commit is contained in:
ma0068
2024-03-05 16:36:43 +01:00
parent 7bec7016c3
commit 5b795c2ccf
1 changed files with 52 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/phrasesupdate.php
+52 -29
View File
@@ -24506,60 +24506,83 @@ array(
)
),
//TODO(Manu) finish merge
/* 'phrase' => 'firma_zusatz',
'phrases' => array(
//TODO(Manu) location missing!
array(
'app' => 'core',
'category' => 'person',
'phrase' => 'standort',
'phrase' => 'firma_zusatz',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Firmenzusatz',
<<<<<<< HEAD
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'add.company info',
<<<<<<< HEAD
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'person',
'phrase' => 'firma',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Firma',
<<<<<<< HEAD
'text' => 'location',
<<<<<<< HEAD
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'company',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'person',
'phrase' => 'adresse_new',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Adresse anlegen',
<<<<<<< HEAD
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'create address',
<<<<<<< HEAD
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'person',
'phrase' => 'adresse_edit',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Adresse bearbeiten',
<<<<<<< HEAD
'text' => 'edit address',
<<<<<<< HEAD
'category' => 'person',
'phrase' => 'adresse_delete',
'phrases' => array(
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'German',
'text' => 'Adresse löschen',
<<<<<<< HEAD
'text' => 'delete address',
*/
'sprache' => 'English',
'text' => 'edit address',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'person',