From 5b795c2ccf1ec96abf770f276da356519801d518 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 5 Mar 2024 16:36:43 +0100
Subject: [PATCH] phrases update merge conflict

---
 system/phrasesupdate.php | 81 ++++++++++++++++++++++++++--------------
 1 file changed, 52 insertions(+), 29 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9200b48a3..2d862f608 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -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',