fix merge issues

Author: YljaR

src/i18n/en/translation.json

@@ -1,13 +1,20 @@
 {
   "cardTitle": "AI Act Implementation Tool",
   "description1": "With a maximum of 7 questions, you can already make a well-founded assessment of whether a data-driven application qualifies as an AI system or as an impactful algorithm. Fill out the dynamic questionnaire. Soon, additional questionnaires will be available for risk classification of AI systems.",
+<<<<<<< HEAD
   "description2": "This open-source template is tailored to requirements of the AI Act and Dutch soft law frameworks, such as:",
   "framework1_text": "Algorithm Framework",
   "framework1_author": "by the Audit Dienst Rijk (ADR)",
   "framework2_text": "Algorithm Framework",
   "framework2_author": "by the Ministry of the Interior and Kingdom Relations",
   "framework3_text": "Impact Assessment Human Rights and Algorithms",
   "framework3_author": "by the Ministry of the Interior...",
+=======
+  "description2": "This open-source template is tailored to the definition of AI in the EU ",
+  "source1": "AI Act",
+  "description2_1": " and the definition of High Impact Algorithm in the ",
+  "source2": "Algorithm Registery guidance by the Dutch Ministry of the Interior",
+>>>>>>> 586ecd5ebd0901a80b7d545cdec8be67f486e67d
   "feedback": "Help develop and share feedback via",
   "startButton": "Start",
   "or": "or",

src/i18n/nl/translation.json

@@ -1,6 +1,7 @@
 {
   "cardTitle": "AI-verordening implementatie tool",
   "description1": "Aan de hand van maximaal 7 vragen kun je al een gedegen inschatting maken of een datagedreven toepassing een AI-systeem of impactvol algoritme betreft. Vul de dynamische vragenlijst in. Binnenkort komen meer dynamische vragenlijsten beschikbaar voor onder meer risicoclassificatie van AI-systemen.",
+<<<<<<< HEAD
   "description2": "Deze tool is gebaseerd op eisen uit de AI-verordening en Nederlandse soft law kaders, zoals:",
   "framework1_text": "Onderzoekskader Algoritmes",
   "framework1_author": "van de Audit Dienst Rijk (ADR)",
@@ -9,6 +10,13 @@
   "framework3_text": "Impact Assessment Mensenrechten en Algoritmes",
   "framework3_author": "van het Binnenlandse Zaken...",
   "feedback": "Help mee ontwikkelen en deel feedback middels",
+=======
+  "description2": "Deze open-source template is afgestemd op de definitie van AI uit de ",
+  "source1": "AI-verordening",
+  "description2_1": " en de definitie van impactvol algoritme uit de ",
+  "source2": "Handreiking Algoritme Register van het Ministerie van Binnenlandse Zaken en Koningkrijksrelaties",
+  "feedback": "Help mee ontwikkelen, deel feedback middels",
+>>>>>>> 586ecd5ebd0901a80b7d545cdec8be67f486e67d
   "startButton": "Start",
   "or": "of",
   "copy": "Kopiëren",