From 3f2118db882eb3c80792d943e28c55d7bd6277f3 Mon Sep 17 00:00:00 2001
From: giacomocerre <cerre.giacomo93@gmail.com>
Date: Thu, 8 Jul 2021 10:23:48 +0200
Subject: [PATCH] Update translations

---
 src/assets/i18n/en.json | 19 ++++++++++++++++++-
 src/assets/i18n/it.json | 19 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 686e2c0f8..97e245e99 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -103,6 +103,7 @@
     "msPart": "Manuscript part",
     "origPlace": "Origin place",
     "origDate": "Origin date",
+<<<<<<< HEAD
     "selectMsDesc": "Select MsDesc",
     "thumbnails": "Thumbnails",
     "firstPage": "First page",
@@ -172,5 +173,21 @@
     "moreInfoAboutApp": "More info about the apparatus entry",
     "omit": "omit.",
     "wit": "Wit:",
-    "xml": "XML"
+    "xml": "XML",
+    "annotate": "Annotation",
+    "highlight": "Highlight",
+    "annotatorNote": "Note",
+    "noteTitle": "Title",
+    "noteBody": "Enter the note",
+    "noteCancel": "Cancel",
+    "noteSave": "Save"
+=======
+    "annotate": "Annotation",
+    "highlight": "Highlight",
+    "annotatorNote": "Note",
+    "noteTitle": "Title",
+    "noteBody": "Enter the note",
+    "noteCancel": "Cancel",
+    "noteSave": "Save"
+>>>>>>> 2a7566d (Update translations)
 }
\ No newline at end of file
diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
index c599b88e2..c5065773b 100644
--- a/src/assets/i18n/it.json
+++ b/src/assets/i18n/it.json
@@ -102,6 +102,7 @@
     "msPart": "Parte del manoscritto",
     "origPlace": "Luogo di origine",
     "origDate": "Data di origine",
+<<<<<<< HEAD
     "selectMsDesc": "Seleziona MsDesc",
     "thumbnails": "Miniature",
     "firstPage": "Prima pagina",
@@ -171,5 +172,21 @@
     "moreInfoAboutApp": "Maggiori informazioni per l'entrata d'apparato",
     "omit": "omit.",
     "wit": "Wit:",
-    "xml": "XML"
+    "xml": "XML",
+    "annotate": "Annotazione",
+    "highlight": "Evidenziazione",
+    "annotatorNote":"Nota",
+    "noteTitle": "Titlo",
+    "noteBody": "Iserisci la nota",
+    "noteCancel": "Cancella",
+    "noteSave": "Salva"
+=======
+    "annotate": "Annotazione",
+    "highlight": "Evidenziazione",
+    "annotatorNote":"Nota",
+    "noteTitle": "Titlo",
+    "noteBody": "Iserisci la nota",
+    "noteCancel": "Cancella",
+    "noteSave": "Salva"
+>>>>>>> 2a7566d (Update translations)
 }
\ No newline at end of file