Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

added cookie policy to supportive material
2024-06-21 17:33:25 +03:00 · 2024-06-21 17:32:59 +03:00
25 changed files with 357 additions and 549 deletions
--- a/backend/core/src/main/java/org/opencdmp/commons/enums/SupportiveMaterialFieldType.java
+++ b/backend/core/src/main/java/org/opencdmp/commons/enums/SupportiveMaterialFieldType.java
@ -10,7 +10,8 @@ public enum SupportiveMaterialFieldType implements DatabaseEnum<Short> {
    About((short) 1),
    Glossary((short) 2),
    TermsOfService((short) 3),
-    UserGuide((short) 4);
+    UserGuide((short) 4),
+    CookiePolicy((short) 5);

    private final Short value;

--- a/backend/core/src/main/java/org/opencdmp/service/storage/StorageFileProperties.java
+++ b/backend/core/src/main/java/org/opencdmp/service/storage/StorageFileProperties.java
@ -90,6 +90,8 @@ public class StorageFileProperties {
 		private String languageNamePattern;
 		private String faq;
 		private String faqNamePattern;
+		private String cookiePolicy;
+		private String cookiePolicyNamePattern;

 		public String getLocalizedNameLanguageKey() {
 			return localizedNameLanguageKey;
@ -194,6 +196,22 @@ public class StorageFileProperties {
 		public void setFaqNamePattern(String faqNamePattern) {
 			this.faqNamePattern = faqNamePattern;
 		}
+
+		public String getCookiePolicy() {
+			return cookiePolicy;
+		}
+
+		public void setCookiePolicy(String cookiePolicy) {
+			this.cookiePolicy = cookiePolicy;
+		}
+
+		public String getCookiePolicyNamePattern() {
+			return cookiePolicyNamePattern;
+		}
+
+		public void setCookiePolicyNamePattern(String cookiePolicyNamePattern) {
+			this.cookiePolicyNamePattern = cookiePolicyNamePattern;
+		}
 	}

 	public static class StaticFilesConfig{
--- a/backend/core/src/main/java/org/opencdmp/service/storage/StorageFileService.java
+++ b/backend/core/src/main/java/org/opencdmp/service/storage/StorageFileService.java
@ -36,6 +36,10 @@ public interface StorageFileService extends ApplicationListener<ApplicationReady

 	byte[] getSupportiveMaterial(SupportiveMaterialFieldType type, String language);

+	byte[] getCookiePolicy(String language);
+
+	void setCookiePolicy(String language, byte[] payload);
+
 	byte[] getUserGuide(String language);

 	void setUserGuide(String language, byte[] payload);
--- a/backend/core/src/main/java/org/opencdmp/service/storage/StorageFileServiceImpl.java
+++ b/backend/core/src/main/java/org/opencdmp/service/storage/StorageFileServiceImpl.java
@ -359,10 +359,22 @@ public class StorageFileServiceImpl implements StorageFileService {
            case UserGuide -> {
                return this.getUserGuide(language);
            }
+            case CookiePolicy -> {
+                return this.getCookiePolicy(language);
+            }
            default -> throw new InternalError("unknown type: " + type);
        }
    }

+    @Override
+    public byte[] getCookiePolicy(String language) {
+        return this.getLocalized(this.config.getMaterialFiles().getCookiePolicy(), this.config.getMaterialFiles().getCookiePolicyNamePattern(), language);
+    }
+
+    @Override
+    public void setCookiePolicy(String language, byte[] payload) {
+        this.setLocalized(this.config.getMaterialFiles().getCookiePolicy(), this.config.getMaterialFiles().getCookiePolicyNamePattern(), language, payload);
+    }

    @Override
    public byte[] getUserGuide(String language) {
--- a/backend/web/src/main/resources/config/storage-devel.yml
+++ b/backend/web/src/main/resources/config/storage-devel.yml
@ -9,3 +9,4 @@ storage:
      glossary: backend/web/src/main/resources/material/glossary/
      faq: backend/web/src/main/resources/material/faq/
      language: dmp-frontend/src/assets/i18n/
+      cookiePolicy: backend/web/src/main/resources/material/cookie-policy/
--- a/backend/web/src/main/resources/config/storage.yml
+++ b/backend/web/src/main/resources/config/storage.yml
@ -22,3 +22,4 @@ storage:
      glossaryNamePattern: "Glossary_{lang}.html"
      faqNamePattern: "Faq_{lang}.html"
      languageNamePattern: "{lang}.json"
+      cookiePolicyNamePattern: "CookiePolicy_{lang}.html"
--- a/backend/web/src/main/resources/material/cookie-policy/CookiePolicy_en.html
+++ b/backend/web/src/main/resources/material/cookie-policy/CookiePolicy_en.html
@ -0,0 +1,115 @@
+<html>
+
+	<head>
+		<meta content="text/html; charset=UTF-8" http-equiv="content-type">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-KK94CHFLLe+nY2dmCWGMq91rCGa5gtU4mk92HdvYe+M/SXH301p5ILy+dN9+nJOZ" crossorigin="anonymous">
+		
+		<link rel="preconnect" href="https://fonts.googleapis.com">
+		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+		<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300&display=swap" rel="stylesheet">
+		<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+
+		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ENjdO4Dr2bkBIFxQpeoTz1HIcje39Wm4jDKdf19U8gI4ddQ3GYNS7NTKfAdVQSZe" crossorigin="anonymous"></script>
+		<style type="text/css">			
+			h1 {
+				text-align: center;
+				margin: 2rem 0 1rem 0;
+				font-size: 3.3125rem;
+				line-height: 1.15;
+				font-weight: 300;
+				color: rgba(0,0,0,.87);
+			}
+			
+			ol {
+				padding-left: 2.5rem;
+			}
+			
+			a {
+				color: #6aa4d9;
+				text-decoration: none;
+				background-color: transparent;
+			}
+			
+			a:hover {
+				color: #2e75b6;
+			}
+			
+			p a {
+				color: #23bcba;
+			}
+			
+			@media (min-width: 576px) {
+				.container {
+					max-width:540px
+				}
+			}
+
+			@media (min-width: 768px) {
+				.container {
+					max-width:720px
+				}
+			}
+
+			@media (min-width: 992px) {
+				.container {
+					max-width:960px
+				}
+			}
+
+			@media (min-width: 1244px) {
+				.container {
+					max-width:1204px!important
+				}
+			}
+			
+			body {
+				font-family: Roboto,Helvetica,Arial,sans-serif;
+				font-size: 1rem;
+				font-weight: 300;
+				line-height: 1.5;
+				color: #212121;
+				text-align: left;
+				background: transparent;
+			}
+		</style>
+	</head>
+
+	<body>
+		<div class="container">
+			<div class="row">
+				<div class="col-md-12">
+					<h1>Cookie Policy</h1>
+				</div>
+			</div>
+			<div class="row">
+				<div class="col-md-12">
+					<p><span>ARGOS </span><span>(&quot;us&quot;, &quot;we&quot;, &quot;our&quot;) uses cookies. By using ARGOS, you consent to the use of cookies.</span></p>
+					<p><span>Our Cookies Policy explains what cookies are, how we use cookies, how third-parties we may partner with may use cookies on ARGOS, your choices regarding cookies and further information about cookies.</span></p>
+					<p><span></span></p>
+					<br />
+					<p><strong>What are cookies</strong></p>
+					<p><span>Cookies are small pieces of text sent by your web browser by a website you visit. A cookie file is stored in your web browser and allows ARGOS or a third-party to recognize you and make your next visit easier and ARGOS more useful to you.</span></p>
+					<p><span>Cookies can be &quot;persistent&quot; or &quot;session&quot; cookies.</span></p>
+					<br />
+					<p><strong>How Argos uses cookies</strong></p>
+					<p><span>When you use and access ARGOS, we may place cookies files in your web browser. </span></p>
+					<p><span>We use cookies for the following purposes: to enable certain functions of ARGOS and to provide analytics.</span></p>
+					<p><span>We use both session and persistent cookies on ARGOS and we use different types of cookies to run the Service: </span></p>
+					<p><span>1. Essential cookies. We may use essential cookies to authenticate users and prevent fraudulent use of user accounts.</span></p>
+					<p><span>2. Performance cookies. We use performance cookies to count visits and traffic sources, so we can measure and improve the performance of Argos, for example by analysing patterns of user behaviour in order to enhance user experience or by identifying areas of the website which may require maintenance. All information these cookies collect is anonymous.</span></p>
+					<p><span>&nbsp;3. Third-party cookies. Apart from our own cookies, we may use cookies from sources that Argos and OpenAIRE (Argos provider) makes use of for Argos to properly function and validate input and output. Third-party cookies are also used to report usage statistics of Argos.</span></p>
+					<p><span></span></p>
+					<br />
+					<p><strong>What are your choices regarding cookies</strong></p>
+					<p><span>If you&#39;d like to delete cookies or instruct your web browser to delete or refuse cookies, please visit the help pages of your web browser.</span></p>
+					<p><span>Please note, however, that if you delete cookies or refuse to accept them, you might not be able to use all of the features we offer, you may not be able to store your preferences, and some of our pages might not display properly.</span></p>
+					<p><span>Please contact OpenAIRE&rsquo;s Data Protection Officer for further </span><span>information on the cookies that we use and their purposes</span><span>: </span><span class="c5"><a href="mailto:dpo@openaire.eu">dpo&#64;openaire.eu</a></span><span>&nbsp;</span></p>
+					<p><span></span></p>
+					<p><span>Last updated: 16/06/2020</span></p>
+				</div>
+			</div>
+		</div>
+	</body>
+
+</html>
--- a/dmp-frontend/src/app/core/common/enum/supportive-material-field-type.ts
+++ b/dmp-frontend/src/app/core/common/enum/supportive-material-field-type.ts
@ -3,5 +3,6 @@ export enum SupportiveMaterialFieldType {
    About = 1,
    Glossary = 2,
    TermsOfService = 3,
-    UserGuide = 4
+    UserGuide = 4,
+    CookiePolicy = 5
 }
--- a/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts
+++ b/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts
@ -203,6 +203,7 @@ export class EnumUtils {
 			case SupportiveMaterialFieldType.Glossary: return this.language.instant('FOOTER.GLOSSARY');
 			case SupportiveMaterialFieldType.TermsOfService: return this.language.instant('FOOTER.TERMS-OF-SERVICE');
 			case SupportiveMaterialFieldType.UserGuide: return this.language.instant('FOOTER.GUIDE');
+			case SupportiveMaterialFieldType.CookiePolicy: return this.language.instant('FOOTER.COOKIE-POLICY');
 		}
 	}

--- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.html
+++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.html
@ -1,34 +1,5 @@
-<div class="container cookies-policy-component">
+<div class="container-fluid">
 	<div class="row">
-		<div class="col-md-12">
-			<h1>{{ 'COOKIES-POLICY.TITLE' | translate}}</h1>
-		</div>
-	</div>
-	<div class="row">
-		<div class="col-md-12">
-			<p><span>ARGOS </span><span>(&quot;us&quot;, &quot;we&quot;, &quot;our&quot;) uses cookies. By using ARGOS, you consent to the use of cookies.</span></p>
-			<p><span>Our Cookies Policy explains what cookies are, how we use cookies, how third-parties we may partner with may use cookies on ARGOS, your choices regarding cookies and further information about cookies.</span></p>
-			<p><span></span></p>
-			<br />
-			<p><strong>What are cookies</strong></p>
-			<p><span>Cookies are small pieces of text sent by your web browser by a website you visit. A cookie file is stored in your web browser and allows ARGOS or a third-party to recognize you and make your next visit easier and ARGOS more useful to you.</span></p>
-			<p><span>Cookies can be &quot;persistent&quot; or &quot;session&quot; cookies.</span></p>
-			<br />
-			<p><strong>How Argos uses cookies</strong></p>
-			<p><span>When you use and access ARGOS, we may place cookies files in your web browser. </span></p>
-			<p><span>We use cookies for the following purposes: to enable certain functions of ARGOS and to provide analytics.</span></p>
-			<p><span>We use both session and persistent cookies on ARGOS and we use different types of cookies to run the Service: </span></p>
-			<p><span>1. Essential cookies. We may use essential cookies to authenticate users and prevent fraudulent use of user accounts.</span></p>
-			<p><span>2. Performance cookies. We use performance cookies to count visits and traffic sources, so we can measure and improve the performance of Argos, for example by analysing patterns of user behaviour in order to enhance user experience or by identifying areas of the website which may require maintenance. All information these cookies collect is anonymous.</span></p>
-			<p><span>&nbsp;3. Third-party cookies. Apart from our own cookies, we may use cookies from sources that Argos and OpenAIRE (Argos provider) makes use of for Argos to properly function and validate input and output. Third-party cookies are also used to report usage statistics of Argos.</span></p>
-			<p><span></span></p>
-			<br />
-			<p><strong>What are your choices regarding cookies</strong></p>
-			<p><span>If you&#39;d like to delete cookies or instruct your web browser to delete or refuse cookies, please visit the help pages of your web browser.</span></p>
-			<p><span>Please note, however, that if you delete cookies or refuse to accept them, you might not be able to use all of the features we offer, you may not be able to store your preferences, and some of our pages might not display properly.</span></p>
-			<p><span>Please contact OpenAIRE&rsquo;s Data Protection Officer for further </span><span>information on the cookies that we use and their purposes</span><span>: </span><span class="c5"><a href="mailto:dpo@openaire.eu">dpo&#64;openaire.eu</a></span><span>&nbsp;</span></p>
-			<p><span></span></p>
-			<p><span>Last updated: 16/06/2020</span></p>
-		</div>
+		<iframe *ngIf="cookiePolicyHTMLUrl" class="iframe" [src]="cookiePolicyHTMLUrl"></iframe>
 	</div>
 </div>
--- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.scss
+++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.scss
@ -1,13 +1,6 @@
-h1 {
-	text-align: center;
-	margin: 2rem 0 1rem 0;
-}
-
-img {
-	height: 150px;
+.iframe {
 	width: 100%;
-}
-
-.cookies-policy-component {
-	margin-top: 80px;
+	height: calc(100vh - 80px);
+	margin: 0px;
+	border: none;
 }
--- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.ts
+++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/cookies-policy/cookies-policy.component.ts
@ -1,15 +1,34 @@
 import { Component, OnInit } from '@angular/core';
+import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
+import { SupportiveMaterialFieldType } from '@app/core/common/enum/supportive-material-field-type';
+import { LanguageService } from '@app/core/services/language/language.service';
+import { SupportiveMaterialService } from '@app/core/services/supportive-material/supportive-material.service';
+import { BaseComponent } from '@common/base/base.component';
+import { takeUntil } from 'rxjs';

@Component({
-  selector: 'app-cookies-policy',
-  templateUrl: './cookies-policy.component.html',
-  styleUrls: ['./cookies-policy.component.scss']
+	selector: 'app-cookies-policy',
+	templateUrl: './cookies-policy.component.html',
+	styleUrls: ['./cookies-policy.component.scss']
 })
-export class CookiesPolicyComponent implements OnInit {
+export class CookiesPolicyComponent extends BaseComponent implements OnInit {

-  constructor() { }
+	cookiePolicyHTMLUrl: SafeResourceUrl;
+	sanitizedGuideUrl: any;

-  ngOnInit() {
-  }
+	constructor(
+		private supportiveMaterialService: SupportiveMaterialService,
+		private languageService: LanguageService,
+		private sanitizer: DomSanitizer,
+	) { super(); }
+
+	ngOnInit() {
+		this.supportiveMaterialService.getPayload(SupportiveMaterialFieldType.CookiePolicy, this.languageService.getCurrentLanguage())
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(response => { //TODO HANDLE-ERRORS
+				const blob = new Blob([response.body], { type: 'text/html' });
+				this.cookiePolicyHTMLUrl = this.sanitizer.bypassSecurityTrustResourceUrl((window.URL ? URL : webkitURL).createObjectURL(blob));
+			});
+	}

 }
--- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.scss
+++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.scss
@ -1,13 +1,3 @@
-h1 {
-	text-align: center;
-	margin: 2rem 0 1rem 0;
-}
-
-img {
-	height: 150px;
-	width: 100%;
-}
-
 .iframe {
 	width: 100%;
 	height: calc(100vh - 80px);
--- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts
+++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts
@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { SafeResourceUrl, DomSanitizer } from '@angular/platform-browser';
+import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { SupportiveMaterialFieldType } from '@app/core/common/enum/supportive-material-field-type';
 import { LanguageService } from '@app/core/services/language/language.service';
@ -7,17 +7,17 @@ import { AnalyticsService } from '@app/core/services/matomo/analytics-service';
 import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
 import { SupportiveMaterialService } from '@app/core/services/supportive-material/supportive-material.service';
 import { BaseComponent } from '@common/base/base.component';
-import { TranslateService, LangChangeEvent } from '@ngx-translate/core';
+import { LangChangeEvent, TranslateService } from '@ngx-translate/core';
 import { takeUntil } from 'rxjs/operators';

@Component({
-  selector: 'app-terms',
-  templateUrl: './terms.component.html',
-  styleUrls: ['./terms.component.scss']
+	selector: 'app-terms',
+	templateUrl: './terms.component.html',
+	styleUrls: ['./terms.component.scss']
 })
 export class TermsComponent extends BaseComponent implements OnInit {

-  termsHTMLUrl: SafeResourceUrl;
+	termsHTMLUrl: SafeResourceUrl;
 	sanitizedGuideUrl: any;

 	constructor(
--- a/dmp-frontend/src/assets/i18n/baq.json
+++ b/dmp-frontend/src/assets/i18n/baq.json
@ -447,8 +447,7 @@
 				"USERS": {
 					"NAME": "Name",
 					"ROLE": "Role"
-				},
-				"ERRORS": {}
+				}
 			},
 			"PAGE-INFO": {
 				"PAGE-NAME": "Kapituluaren Izena",
@ -471,14 +470,12 @@
 				"SECTION-DESCRIPTION-HINT": "Idatzi atalari buruzko deskribapen laburra.",
 				"SECTION": "Atala"
 			},
-			"PAGES": {},
 			"FORM": {
 				"TITLE": "Formularioaren Deskribapena",
 				"SECTION": {
 					"FIELDS": {
 						"DESCRIPTION": "Deskribapena"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"COMPOSITE-FIELD": {
 					"FIELDS": {
@ -491,8 +488,7 @@
 						"MULTIPLICITY-TABLEVIEW": "Sarrerak taulan ikusi",
 						"SEMANTICS": "Semantika",
 						"EXPORT": "Esportazioan gehitu"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"FIELD": {
 					"FIELDS": {
@ -537,8 +533,7 @@
 						"FIELD-EXTERNAL-DATASETS-TITLE": "Kanpo Datu-multzoen Datuak",
 						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Sarrera Markagailuaren Testua",
 						"FIELD-LICENSES-TITLE": "Lizentzien Datuak",
-						"EXTERNAL-DATASET-TYPE-NAME": "Mota",
-						"EXTERNAL-DATASET-TYPES": {}
+						"EXTERNAL-DATASET-TYPE-NAME": "Mota"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "Gutxienez iturri bat eman behar da.",
@ -576,9 +571,6 @@
 						"ELEMENT-HIDDEN-FROM-ELEMENT": "Elementu honek ezkutatu egiten du ikusgaitasun-araua aplikatu nahi zaion sarrerako elementu edo jatorrizko elementu bat."
 					}
 				},
-				"FORM-VALIDATION": {
-					"ERROR-MESSAGES": {}
-				},
 				"TABLE-OF-CONTENTS": {
 					"ERROR-MESSAGES": {
 						"GENERIC-GRAD-AND-DROP-ERROR": "Invalid action.",
@ -628,7 +620,6 @@
 				"MORE": "Gehiago.."
 			}
 		},
-		"FEEDBACK-MESSAGES": {},
 		"ERRORS": {
 			"INVALID-VISIBILITY-RULES": {
 				"MESSAGE-START": "Baliozkoak ez diren ikusgaitasun-arauak hauteman dira hemen ",
@ -821,7 +812,6 @@
 			"TITLE": "Description is locked",
 			"MESSAGE": "Somebody else is modifying the description at this moment. If you would like to modify or view it, please come back later."
 		},
-		"FINALISE-POPUP": {},
 		"ROLES": {
 			"ALL-SECTIONS": "All Sections"
 		},
@ -1008,7 +998,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Ezabatu",
 			"EDIT": "Editatu",
@ -1044,7 +1033,6 @@
 			"CLEAR-ALL-FILTERS": "clear all filters",
 			"SEARCH-FILTER-BTN": "Filter Results"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1065,7 +1053,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1086,7 +1073,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1107,7 +1093,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1132,7 +1117,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1153,7 +1137,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete"
 		}
@ -1172,7 +1155,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1199,8 +1181,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"NOTIFICATION-SERVICE": {
 		"INAPP-NOTIFICATION-LISTING": {
@ -1218,7 +1199,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1248,7 +1228,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete",
 				"EDIT": "Edit"
@ -1318,7 +1297,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1394,8 +1372,7 @@
 			"ADD-SOURCE": "Add Source",
 			"REMOVE-SOURCE": "Remove Source",
 			"SUBMIT-FIELDS": "Update Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"EXTERNAL-FETCHER-SOURCE-EDITOR": {
 		"FIELDS": {
@ -1455,8 +1432,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"PREFILLING-SOURCE-EDITOR": {
 		"TITLE-EDIT-PREFILLING-SOURCE": "Editing Prefilling Source",
@ -1480,8 +1456,7 @@
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field",
 			"SUBMIT-FIELDS": "Submit Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"REFERENCE-EDITOR": {
 		"TITLE-EDIT-REFERENCE": "Editing Reference",
@ -1504,8 +1479,7 @@
 			"DELETE": "Delete",
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"DMP-BLUEPRINT-EDITOR": {
 		"TITLE": {
@ -1538,7 +1512,6 @@
 			"DESCRIPTION-TEMPLATE-LABEL": "Label",
 			"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
 			"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
-			"EXTERNAL-AUTOCOMPLETE": {},
 			"PREFILLING-SOURCES": "Prefilling Sources"
 		},
 		"ACTIONS": {
@ -1732,7 +1705,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit",
@ -1778,7 +1750,6 @@
 		"EXTERNAL-SOURCE": "Source",
 		"INTERNAL-SOURCE": "Internal"
 	},
-	"TENANT-CHOOSE-DIALOG": {},
 	"TYPES": {
 		"ANNOTATION-PROTECTION-TYPE": {
 			"PRIVATE": "Hidden",
@ -2013,7 +1984,8 @@
 		"GLOSSARY": "Glosarioa",
 		"TERMS-OF-SERVICE": "Zerbitzuaren Baldintzak",
 		"ABOUT": "Honi buruz",
-		"PRIVACY-POLICY": "Pribatutasun-politika"
+		"PRIVACY-POLICY": "Pribatutasun-politika",
+		"COOKIE-POLICY": "Cookie Policy"
 	},
 	"GLOSSARY": {
 		"TITLE": "Glosarioa",
@ -2034,7 +2006,6 @@
 	"OPENSOURCE-LICENCES": {
 		"TITLE": "Lizentzia irekiak"
 	},
-	"TERMS-OF-SERVICE": {},
 	"COOKIES-POLICY": {
 		"TITLE": "Cookie-politika"
 	},
@ -2114,8 +2085,8 @@
 			"ROLES": "Roles"
 		},
 		"ACTIONS": {
-			"REMOVE-USER":"Remove User",
-			"INVITE":"Invite"
+			"REMOVE-USER": "Remove User",
+			"INVITE": "Invite"
 		},
 		"USERS-REQUIRED": "Required at leat on user"
 	},
@ -2126,10 +2097,10 @@
 		},
 		"UNLINK-ACCOUNT": {
 			"TITLE": "Bereizi nahi duzun kontua egiaztatu",
-			"MESSAGE": "Ekintza hau berresteko e-mail bat bidali zaizu zure kontu nagusira. Behin onartuta, {{accountToBeUnlinked}} kontuak zure egungo ARGOS profilera konektatuta egoteari utziko dio."
+			"MESSAGE": "Ekintza hau berresteko e-mail bat bidali zaizu zure kontu nagusira. Behin onartuta, {{accountToBeUnlinked}} kontuak zure egungo {{ APP_NAME_CAPS }} profilera konektatuta egoteari utziko dio."
 		},
 		"UNLINK-ACCOUNT-DIALOG": {
-			"MESSAGE": "\"Konfirmatu\" sakatzean, kontu honetatik egindako ARGOS jardueraren transferentzia onartzen duzu zure ARGOS kontu nagusira, azken hau izango da lehenengo agertuko dena. Deslotutako kontuarekin berriro sartzen saiatzen bazara, zure ARGOS esperientzia zerotik hasi ahal izango duzu, hutsik dagoen aginte-panel batean.",
+			"MESSAGE": "\"Konfirmatu\" sakatzean, kontu honetatik egindako {{ APP_NAME_CAPS }} jardueraren transferentzia onartzen duzu zure {{ APP_NAME_CAPS }} kontu nagusira, azken hau izango da lehenengo agertuko dena. Deslotutako kontuarekin berriro sartzen saiatzen bazara, zure {{ APP_NAME_CAPS }} esperientzia zerotik hasi ahal izango duzu, hutsik dagoen aginte-panel batean.",
 			"CONFIRM": "Konfirmatu",
 			"CANCEL": "Ezeztatu"
 		},
--- a/dmp-frontend/src/assets/i18n/de.json
+++ b/dmp-frontend/src/assets/i18n/de.json
@ -447,8 +447,7 @@
 				"USERS": {
 					"NAME": "Name",
 					"ROLE": "Role"
-				},
-				"ERRORS": {}
+				}
 			},
 			"PAGE-INFO": {
 				"PAGE-NAME": "Chapter Name",
@ -471,14 +470,12 @@
 				"SECTION-DESCRIPTION-HINT": "Write a brief desciption of what the section is about.",
 				"SECTION": "Section"
 			},
-			"PAGES": {},
 			"FORM": {
 				"TITLE": "Form Description",
 				"SECTION": {
 					"FIELDS": {
 						"DESCRIPTION": "Description"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"COMPOSITE-FIELD": {
 					"FIELDS": {
@ -491,8 +488,7 @@
 						"MULTIPLICITY-TABLEVIEW": "View inputs in table",
 						"SEMANTICS": "Semantics",
 						"EXPORT": "Include in Export"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"FIELD": {
 					"FIELDS": {
@ -537,8 +533,7 @@
 						"FIELD-EXTERNAL-DATASETS-TITLE": "External Datasets Data",
 						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Input placeholder",
 						"FIELD-LICENSES-TITLE": "Licenses Data",
-						"EXTERNAL-DATASET-TYPE-NAME": "Type",
-						"EXTERNAL-DATASET-TYPES": {}
+						"EXTERNAL-DATASET-TYPE-NAME": "Type"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "At least one source must be provided.",
@ -576,9 +571,6 @@
 						"ELEMENT-HIDDEN-FROM-ELEMENT": "This element hides the element or a parent element of the input you are trying to apply visibility rule from."
 					}
 				},
-				"FORM-VALIDATION": {
-					"ERROR-MESSAGES": {}
-				},
 				"TABLE-OF-CONTENTS": {
 					"ERROR-MESSAGES": {
 						"GENERIC-GRAD-AND-DROP-ERROR": "Invalid action.",
@ -628,7 +620,6 @@
 				"MORE": "More.."
 			}
 		},
-		"FEEDBACK-MESSAGES": {},
 		"ERRORS": {
 			"INVALID-VISIBILITY-RULES": {
 				"MESSAGE-START": "There were invalid visibilty rules detected in ",
@ -821,7 +812,6 @@
 			"TITLE": "Description is locked",
 			"MESSAGE": "Somebody else is modifying the description at this moment. If you would like to modify or view it, please come back later."
 		},
-		"FINALISE-POPUP": {},
 		"ROLES": {
 			"ALL-SECTIONS": "All Sections"
 		},
@ -1008,7 +998,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Bearbeiten",
@ -1044,7 +1033,6 @@
 			"CLEAR-ALL-FILTERS": "clear all filters",
 			"SEARCH-FILTER-BTN": "Filter Results"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1065,7 +1053,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1086,7 +1073,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1107,7 +1093,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1132,7 +1117,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1153,7 +1137,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete"
 		}
@ -1172,7 +1155,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1199,8 +1181,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"NOTIFICATION-SERVICE": {
 		"INAPP-NOTIFICATION-LISTING": {
@ -1218,7 +1199,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1248,7 +1228,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete",
 				"EDIT": "Edit"
@ -1318,7 +1297,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1394,8 +1372,7 @@
 			"ADD-SOURCE": "Add Source",
 			"REMOVE-SOURCE": "Remove Source",
 			"SUBMIT-FIELDS": "Update Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"EXTERNAL-FETCHER-SOURCE-EDITOR": {
 		"FIELDS": {
@ -1455,8 +1432,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"PREFILLING-SOURCE-EDITOR": {
 		"TITLE-EDIT-PREFILLING-SOURCE": "Editing Prefilling Source",
@ -1480,8 +1456,7 @@
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field",
 			"SUBMIT-FIELDS": "Submit Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"REFERENCE-EDITOR": {
 		"TITLE-EDIT-REFERENCE": "Editing Reference",
@ -1504,8 +1479,7 @@
 			"DELETE": "Delete",
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"DMP-BLUEPRINT-EDITOR": {
 		"TITLE": {
@ -1538,7 +1512,6 @@
 			"DESCRIPTION-TEMPLATE-LABEL": "Label",
 			"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
 			"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
-			"EXTERNAL-AUTOCOMPLETE": {},
 			"PREFILLING-SOURCES": "Prefilling Sources"
 		},
 		"ACTIONS": {
@ -1732,7 +1705,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit",
@ -1778,7 +1750,6 @@
 		"EXTERNAL-SOURCE": "Source",
 		"INTERNAL-SOURCE": "Internal"
 	},
-	"TENANT-CHOOSE-DIALOG": {},
 	"TYPES": {
 		"ANNOTATION-PROTECTION-TYPE": {
 			"PRIVATE": "Hidden",
@ -2013,7 +1984,8 @@
 		"GLOSSARY": "Glossar",
 		"TERMS-OF-SERVICE": "Nutzungsbedingungen",
 		"ABOUT": "About",
-		"PRIVACY-POLICY": "Datenschutzrichtlinie"
+		"PRIVACY-POLICY": "Datenschutzrichtlinie",
+		"COOKIE-POLICY": "Cookie Policy"
 	},
 	"GLOSSARY": {
 		"TITLE": "Glossar",
@ -2034,7 +2006,6 @@
 	"OPENSOURCE-LICENCES": {
 		"TITLE": "Opensource licences"
 	},
-	"TERMS-OF-SERVICE": {},
 	"COOKIES-POLICY": {
 		"TITLE": "Cookies Policy"
 	},
@ -2114,8 +2085,8 @@
 			"ROLES": "Roles"
 		},
 		"ACTIONS": {
-			"REMOVE-USER":"Remove User",
-			"INVITE":"Invite"
+			"REMOVE-USER": "Remove User",
+			"INVITE": "Invite"
 		},
 		"USERS-REQUIRED": "Required at leat on user"
 	},
@ -2126,10 +2097,10 @@
 		},
 		"UNLINK-ACCOUNT": {
 			"TITLE": "Verify account to be unlinked",
-			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current ARGOS profile."
+			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current {{ APP_NAME_CAPS }} profile."
 		},
 		"UNLINK-ACCOUNT-DIALOG": {
-			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your ARGOS activity performed from this account to your main ARGOS account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your ARGOS experience from scratch, in an empty dashboard.",
+			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your {{ APP_NAME_CAPS }} activity performed from this account to your main {{ APP_NAME_CAPS }} account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your {{ APP_NAME_CAPS }} experience from scratch, in an empty dashboard.",
 			"CONFIRM": "Confirm",
 			"CANCEL": "Cancel"
 		},
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@ -447,8 +447,7 @@
 				"USERS": {
 					"NAME": "Name",
 					"ROLE": "Role"
-				},
-				"ERRORS": {}
+				}
 			},
 			"PAGE-INFO": {
 				"PAGE-NAME": "Chapter Name",
@ -471,14 +470,12 @@
 				"SECTION-DESCRIPTION-HINT": "Write a brief description of what the section is about.",
 				"SECTION": "Section"
 			},
-			"PAGES": {},
 			"FORM": {
 				"TITLE": "Form Description",
 				"SECTION": {
 					"FIELDS": {
 						"DESCRIPTION": "Description"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"COMPOSITE-FIELD": {
 					"FIELDS": {
@ -491,8 +488,7 @@
 						"MULTIPLICITY-TABLEVIEW": "View inputs in table",
 						"SEMANTICS": "Semantics",
 						"EXPORT": "Include in Export"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"FIELD": {
 					"FIELDS": {
@ -537,8 +533,7 @@
 						"FIELD-EXTERNAL-DATASETS-TITLE": "External Datasets Data",
 						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Input placeholder Text",
 						"FIELD-LICENSES-TITLE": "Licenses Data",
-						"EXTERNAL-DATASET-TYPE-NAME": "Type",
-						"EXTERNAL-DATASET-TYPES": {}
+						"EXTERNAL-DATASET-TYPE-NAME": "Type"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "At least one source must be provided.",
@ -576,9 +571,6 @@
 						"ELEMENT-HIDDEN-FROM-ELEMENT": "This element hides the element or a parent element of the input you are trying to apply visibility rule from."
 					}
 				},
-				"FORM-VALIDATION": {
-					"ERROR-MESSAGES": {}
-				},
 				"TABLE-OF-CONTENTS": {
 					"ERROR-MESSAGES": {
 						"GENERIC-GRAD-AND-DROP-ERROR": "Invalid action.",
@ -628,7 +620,6 @@
 				"MORE": "More.."
 			}
 		},
-		"FEEDBACK-MESSAGES": {},
 		"ERRORS": {
 			"INVALID-VISIBILITY-RULES": {
 				"MESSAGE-START": "There were invalid visibility rules detected in ",
@ -821,7 +812,6 @@
 			"TITLE": "Description is locked",
 			"MESSAGE": "Somebody else is modifying the description at this moment. If you would like to modify or view it, please come back later."
 		},
-		"FINALISE-POPUP": {},
 		"ROLES": {
 			"ALL-SECTIONS": "All Sections"
 		},
@ -1008,7 +998,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit",
@ -1044,7 +1033,6 @@
 			"CLEAR-ALL-FILTERS": "clear all filters",
 			"SEARCH-FILTER-BTN": "Filter Results"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1065,7 +1053,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1086,7 +1073,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1107,7 +1093,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1132,7 +1117,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1153,7 +1137,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete"
 		}
@ -1172,7 +1155,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1199,8 +1181,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"NOTIFICATION-SERVICE": {
 		"INAPP-NOTIFICATION-LISTING": {
@ -1218,7 +1199,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1248,7 +1228,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete",
 				"EDIT": "Edit"
@ -1318,7 +1297,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1394,8 +1372,7 @@
 			"ADD-SOURCE": "Add Source",
 			"REMOVE-SOURCE": "Remove Source",
 			"SUBMIT-FIELDS": "Update Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"EXTERNAL-FETCHER-SOURCE-EDITOR": {
 		"FIELDS": {
@ -1455,8 +1432,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"PREFILLING-SOURCE-EDITOR": {
 		"TITLE-EDIT-PREFILLING-SOURCE": "Editing Prefilling Source",
@ -1480,8 +1456,7 @@
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field",
 			"SUBMIT-FIELDS": "Submit Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"REFERENCE-EDITOR": {
 		"TITLE-EDIT-REFERENCE": "Editing Reference",
@ -1504,8 +1479,7 @@
 			"DELETE": "Delete",
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"DMP-BLUEPRINT-EDITOR": {
 		"TITLE": {
@ -1538,7 +1512,6 @@
 			"DESCRIPTION-TEMPLATE-LABEL": "Label",
 			"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
 			"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
-			"EXTERNAL-AUTOCOMPLETE": {},
 			"PREFILLING-SOURCES": "Prefilling Sources"
 		},
 		"ACTIONS": {
@ -1732,7 +1705,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit",
@ -1778,7 +1750,6 @@
 		"EXTERNAL-SOURCE": "Source",
 		"INTERNAL-SOURCE": "Internal"
 	},
-	"TENANT-CHOOSE-DIALOG": {},
 	"TYPES": {
 		"ANNOTATION-PROTECTION-TYPE": {
 			"PRIVATE": "Hidden",
@ -2013,7 +1984,8 @@
 		"GLOSSARY": "Glossary",
 		"TERMS-OF-SERVICE": "Terms Of Service",
 		"ABOUT": "About",
-		"PRIVACY-POLICY": "Privacy Policy"
+		"PRIVACY-POLICY": "Privacy Policy",
+		"COOKIE-POLICY": "Cookie Policy"
 	},
 	"GLOSSARY": {
 		"TITLE": "Glossary",
@ -2034,7 +2006,6 @@
 	"OPENSOURCE-LICENCES": {
 		"TITLE": "Opensource licenses"
 	},
-	"TERMS-OF-SERVICE": {},
 	"COOKIES-POLICY": {
 		"TITLE": "Cookies Policy"
 	},
@ -2114,8 +2085,8 @@
 			"ROLES": "Roles"
 		},
 		"ACTIONS": {
-			"REMOVE-USER":"Remove User",
-			"INVITE":"Invite"
+			"REMOVE-USER": "Remove User",
+			"INVITE": "Invite"
 		},
 		"USERS-REQUIRED": "Required at leat on user"
 	},
--- a/dmp-frontend/src/assets/i18n/es.json
+++ b/dmp-frontend/src/assets/i18n/es.json
@ -447,8 +447,7 @@
 				"USERS": {
 					"NAME": "Name",
 					"ROLE": "Role"
-				},
-				"ERRORS": {}
+				}
 			},
 			"PAGE-INFO": {
 				"PAGE-NAME": "Nombre del capítulo",
@ -471,14 +470,12 @@
 				"SECTION-DESCRIPTION-HINT": "Escribir una pequeña descripción de lo que trata la sección.",
 				"SECTION": "Sección"
 			},
-			"PAGES": {},
 			"FORM": {
 				"TITLE": "Formulario de descripción",
 				"SECTION": {
 					"FIELDS": {
 						"DESCRIPTION": "Descripción"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"COMPOSITE-FIELD": {
 					"FIELDS": {
@ -491,8 +488,7 @@
 						"MULTIPLICITY-TABLEVIEW": "View inputs in table",
 						"SEMANTICS": "Semantics",
 						"EXPORT": "Include in Export"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"FIELD": {
 					"FIELDS": {
@ -537,8 +533,7 @@
 						"FIELD-EXTERNAL-DATASETS-TITLE": "Datos de Datasets externos",
 						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Introduzca marcador del texto",
 						"FIELD-LICENSES-TITLE": "Licenses Data",
-						"EXTERNAL-DATASET-TYPE-NAME": "Tipo",
-						"EXTERNAL-DATASET-TYPES": {}
+						"EXTERNAL-DATASET-TYPE-NAME": "Tipo"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "Debe proporcionar al menos una fuente.",
@ -576,9 +571,6 @@
 						"ELEMENT-HIDDEN-FROM-ELEMENT": "Estos elementos esconden el elemento o un elemento padre de la entrada que está intentando para aplicar la visibilidad de la regla."
 					}
 				},
-				"FORM-VALIDATION": {
-					"ERROR-MESSAGES": {}
-				},
 				"TABLE-OF-CONTENTS": {
 					"ERROR-MESSAGES": {
 						"GENERIC-GRAD-AND-DROP-ERROR": "Invalid action.",
@ -628,7 +620,6 @@
 				"MORE": "More.."
 			}
 		},
-		"FEEDBACK-MESSAGES": {},
 		"ERRORS": {
 			"INVALID-VISIBILITY-RULES": {
 				"MESSAGE-START": "Se han detectado reglas inválidas de visibilidad ",
@ -821,7 +812,6 @@
 			"TITLE": "Description is locked",
 			"MESSAGE": "Somebody else is modifying the description at this moment. If you would like to modify or view it, please come back later."
 		},
-		"FINALISE-POPUP": {},
 		"ROLES": {
 			"ALL-SECTIONS": "All Sections"
 		},
@ -1008,7 +998,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Borrar",
 			"EDIT": "Editar",
@ -1044,7 +1033,6 @@
 			"CLEAR-ALL-FILTERS": "clear all filters",
 			"SEARCH-FILTER-BTN": "Filter Results"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1065,7 +1053,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1086,7 +1073,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1107,7 +1093,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1132,7 +1117,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1153,7 +1137,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete"
 		}
@ -1172,7 +1155,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1199,8 +1181,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"NOTIFICATION-SERVICE": {
 		"INAPP-NOTIFICATION-LISTING": {
@ -1218,7 +1199,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1248,7 +1228,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete",
 				"EDIT": "Edit"
@ -1318,7 +1297,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1394,8 +1372,7 @@
 			"ADD-SOURCE": "Add Source",
 			"REMOVE-SOURCE": "Remove Source",
 			"SUBMIT-FIELDS": "Update Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"EXTERNAL-FETCHER-SOURCE-EDITOR": {
 		"FIELDS": {
@ -1455,8 +1432,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"PREFILLING-SOURCE-EDITOR": {
 		"TITLE-EDIT-PREFILLING-SOURCE": "Editing Prefilling Source",
@ -1480,8 +1456,7 @@
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field",
 			"SUBMIT-FIELDS": "Submit Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"REFERENCE-EDITOR": {
 		"TITLE-EDIT-REFERENCE": "Editing Reference",
@ -1504,8 +1479,7 @@
 			"DELETE": "Delete",
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"DMP-BLUEPRINT-EDITOR": {
 		"TITLE": {
@ -1538,7 +1512,6 @@
 			"DESCRIPTION-TEMPLATE-LABEL": "Label",
 			"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
 			"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
-			"EXTERNAL-AUTOCOMPLETE": {},
 			"PREFILLING-SOURCES": "Prefilling Sources"
 		},
 		"ACTIONS": {
@ -1732,7 +1705,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit",
@ -1778,7 +1750,6 @@
 		"EXTERNAL-SOURCE": "Source",
 		"INTERNAL-SOURCE": "Internal"
 	},
-	"TENANT-CHOOSE-DIALOG": {},
 	"TYPES": {
 		"ANNOTATION-PROTECTION-TYPE": {
 			"PRIVATE": "Hidden",
@ -2013,7 +1984,8 @@
 		"GLOSSARY": "Glosario",
 		"TERMS-OF-SERVICE": "Términos del servicio",
 		"ABOUT": "Acerca de",
-		"PRIVACY-POLICY": "Política de privacidad"
+		"PRIVACY-POLICY": "Política de privacidad",
+		"COOKIE-POLICY": "Cookie Policy"
 	},
 	"GLOSSARY": {
 		"TITLE": "Glosario",
@ -2034,7 +2006,6 @@
 	"OPENSOURCE-LICENCES": {
 		"TITLE": "Licencias de código abierto"
 	},
-	"TERMS-OF-SERVICE": {},
 	"COOKIES-POLICY": {
 		"TITLE": "Política de cookies"
 	},
@ -2114,8 +2085,8 @@
 			"ROLES": "Roles"
 		},
 		"ACTIONS": {
-			"REMOVE-USER":"Remove User",
-			"INVITE":"Invite"
+			"REMOVE-USER": "Remove User",
+			"INVITE": "Invite"
 		},
 		"USERS-REQUIRED": "Required at leat on user"
 	},
@ -2126,10 +2097,10 @@
 		},
 		"UNLINK-ACCOUNT": {
 			"TITLE": "Verify account to be unlinked",
-			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current ARGOS profile."
+			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current {{ APP_NAME_CAPS }} profile."
 		},
 		"UNLINK-ACCOUNT-DIALOG": {
-			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your ARGOS activity performed from this account to your main ARGOS account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your ARGOS experience from scratch, in an empty dashboard.",
+			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your {{ APP_NAME_CAPS }} activity performed from this account to your main {{ APP_NAME_CAPS }} account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your {{ APP_NAME_CAPS }} experience from scratch, in an empty dashboard.",
 			"CONFIRM": "Confirm",
 			"CANCEL": "Cancel"
 		},
--- a/dmp-frontend/src/assets/i18n/gr.json
+++ b/dmp-frontend/src/assets/i18n/gr.json
@ -447,8 +447,7 @@
 				"USERS": {
 					"NAME": "Name",
 					"ROLE": "Role"
-				},
-				"ERRORS": {}
+				}
 			},
 			"PAGE-INFO": {
 				"PAGE-NAME": "Chapter Name",
@ -471,14 +470,12 @@
 				"SECTION-DESCRIPTION-HINT": "Write a brief description of what the section is about.",
 				"SECTION": "Section"
 			},
-			"PAGES": {},
 			"FORM": {
 				"TITLE": "Φόρμα Περιγραφής",
 				"SECTION": {
 					"FIELDS": {
 						"DESCRIPTION": "Περιγραφή"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"COMPOSITE-FIELD": {
 					"FIELDS": {
@ -491,8 +488,7 @@
 						"MULTIPLICITY-TABLEVIEW": "View inputs in table",
 						"SEMANTICS": "Semantics",
 						"EXPORT": "Include in Export"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"FIELD": {
 					"FIELDS": {
@ -537,8 +533,7 @@
 						"FIELD-EXTERNAL-DATASETS-TITLE": "External Datasets Data",
 						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Input placeholder Text",
 						"FIELD-LICENSES-TITLE": "Licenses Data",
-						"EXTERNAL-DATASET-TYPE-NAME": "Type",
-						"EXTERNAL-DATASET-TYPES": {}
+						"EXTERNAL-DATASET-TYPE-NAME": "Type"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "At least one source must be provided.",
@ -576,9 +571,6 @@
 						"ELEMENT-HIDDEN-FROM-ELEMENT": "This element hides the element or a parent element of the input you are trying to apply visibility rule from."
 					}
 				},
-				"FORM-VALIDATION": {
-					"ERROR-MESSAGES": {}
-				},
 				"TABLE-OF-CONTENTS": {
 					"ERROR-MESSAGES": {
 						"GENERIC-GRAD-AND-DROP-ERROR": "Invalid action.",
@ -628,7 +620,6 @@
 				"MORE": "More.."
 			}
 		},
-		"FEEDBACK-MESSAGES": {},
 		"ERRORS": {
 			"INVALID-VISIBILITY-RULES": {
 				"MESSAGE-START": "There were invalid visibility rules detected in ",
@ -821,7 +812,6 @@
 			"TITLE": "Description is locked",
 			"MESSAGE": "Somebody else is modifying the description at this moment. If you would like to modify or view it, please come back later."
 		},
-		"FINALISE-POPUP": {},
 		"ROLES": {
 			"ALL-SECTIONS": "All Sections"
 		},
@ -1008,7 +998,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Επεξεργασία",
@ -1044,7 +1033,6 @@
 			"CLEAR-ALL-FILTERS": "clear all filters",
 			"SEARCH-FILTER-BTN": "Filter Results"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1065,7 +1053,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1086,7 +1073,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1107,7 +1093,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1132,7 +1117,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1153,7 +1137,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete"
 		}
@ -1172,7 +1155,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1199,8 +1181,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"NOTIFICATION-SERVICE": {
 		"INAPP-NOTIFICATION-LISTING": {
@ -1218,7 +1199,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1248,7 +1228,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete",
 				"EDIT": "Edit"
@ -1318,7 +1297,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1394,8 +1372,7 @@
 			"ADD-SOURCE": "Add Source",
 			"REMOVE-SOURCE": "Remove Source",
 			"SUBMIT-FIELDS": "Update Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"EXTERNAL-FETCHER-SOURCE-EDITOR": {
 		"FIELDS": {
@ -1455,8 +1432,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"PREFILLING-SOURCE-EDITOR": {
 		"TITLE-EDIT-PREFILLING-SOURCE": "Editing Prefilling Source",
@ -1480,8 +1456,7 @@
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field",
 			"SUBMIT-FIELDS": "Submit Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"REFERENCE-EDITOR": {
 		"TITLE-EDIT-REFERENCE": "Editing Reference",
@ -1504,8 +1479,7 @@
 			"DELETE": "Delete",
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"DMP-BLUEPRINT-EDITOR": {
 		"TITLE": {
@ -1538,7 +1512,6 @@
 			"DESCRIPTION-TEMPLATE-LABEL": "Label",
 			"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
 			"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
-			"EXTERNAL-AUTOCOMPLETE": {},
 			"PREFILLING-SOURCES": "Prefilling Sources"
 		},
 		"ACTIONS": {
@ -1732,7 +1705,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit",
@ -1778,7 +1750,6 @@
 		"EXTERNAL-SOURCE": "Source",
 		"INTERNAL-SOURCE": "Internal"
 	},
-	"TENANT-CHOOSE-DIALOG": {},
 	"TYPES": {
 		"ANNOTATION-PROTECTION-TYPE": {
 			"PRIVATE": "Hidden",
@ -2013,7 +1984,8 @@
 		"GLOSSARY": "Γλωσσάριο",
 		"TERMS-OF-SERVICE": "Όροι Χρήσης",
 		"ABOUT": "Σχετικά με το {{ APP_NAME }}",
-		"PRIVACY-POLICY": "Πολιτική Απορρήτου"
+		"PRIVACY-POLICY": "Πολιτική Απορρήτου",
+		"COOKIE-POLICY": "Cookie Policy"
 	},
 	"GLOSSARY": {
 		"TITLE": "Γλωσσάριο",
@ -2034,7 +2006,6 @@
 	"OPENSOURCE-LICENCES": {
 		"TITLE": "Άδειες Ανοικτού Λογισμικού"
 	},
-	"TERMS-OF-SERVICE": {},
 	"COOKIES-POLICY": {
 		"TITLE": "Cookies Policy"
 	},
@ -2114,8 +2085,8 @@
 			"ROLES": "Roles"
 		},
 		"ACTIONS": {
-			"REMOVE-USER":"Remove User",
-			"INVITE":"Invite"
+			"REMOVE-USER": "Remove User",
+			"INVITE": "Invite"
 		},
 		"USERS-REQUIRED": "Required at leat on user"
 	},
@ -2126,10 +2097,10 @@
 		},
 		"UNLINK-ACCOUNT": {
 			"TITLE": "Verify account to be unlinked",
-			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current ARGOS profile."
+			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current {{ APP_NAME_CAPS }} profile."
 		},
 		"UNLINK-ACCOUNT-DIALOG": {
-			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your ARGOS activity performed from this account to your main ARGOS account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your ARGOS experience from scratch, in an empty dashboard.",
+			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your {{ APP_NAME_CAPS }} activity performed from this account to your main {{ APP_NAME_CAPS }} account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your {{ APP_NAME_CAPS }} experience from scratch, in an empty dashboard.",
 			"CONFIRM": "Confirm",
 			"CANCEL": "Cancel"
 		},
--- a/dmp-frontend/src/assets/i18n/hr.json
+++ b/dmp-frontend/src/assets/i18n/hr.json
@ -447,8 +447,7 @@
 				"USERS": {
 					"NAME": "Name",
 					"ROLE": "Role"
-				},
-				"ERRORS": {}
+				}
 			},
 			"PAGE-INFO": {
 				"PAGE-NAME": "Naziv poglavlja",
@ -471,14 +470,12 @@
 				"SECTION-DESCRIPTION-HINT": "Napišite kratki opis onoga o čemu se radi u ovom odjeljku.",
 				"SECTION": "Odjeljak"
 			},
-			"PAGES": {},
 			"FORM": {
 				"TITLE": "Opis predloška",
 				"SECTION": {
 					"FIELDS": {
 						"DESCRIPTION": "Opis"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"COMPOSITE-FIELD": {
 					"FIELDS": {
@ -491,8 +488,7 @@
 						"MULTIPLICITY-TABLEVIEW": "Pogledajte unose u tablici",
 						"SEMANTICS": "Semantics",
 						"EXPORT": "Uključi u izvoz"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"FIELD": {
 					"FIELDS": {
@ -537,8 +533,7 @@
 						"FIELD-EXTERNAL-DATASETS-TITLE": "Podaci o vanjskim podacima (skupovima podataka)",
 						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Primjer unosa",
 						"FIELD-LICENSES-TITLE": "Licencirani podaci",
-						"EXTERNAL-DATASET-TYPE-NAME": "Vrsta",
-						"EXTERNAL-DATASET-TYPES": {}
+						"EXTERNAL-DATASET-TYPE-NAME": "Vrsta"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "Mora biti naveden barem jedan izvor.",
@ -576,9 +571,6 @@
 						"ELEMENT-HIDDEN-FROM-ELEMENT": "Ovaj element skriva dio ili nadređeni dio unosa na kojeg želite primjeniti pravilo vidljivosti."
 					}
 				},
-				"FORM-VALIDATION": {
-					"ERROR-MESSAGES": {}
-				},
 				"TABLE-OF-CONTENTS": {
 					"ERROR-MESSAGES": {
 						"GENERIC-GRAD-AND-DROP-ERROR": "Invalid action.",
@ -628,7 +620,6 @@
 				"MORE": "Više.."
 			}
 		},
-		"FEEDBACK-MESSAGES": {},
 		"ERRORS": {
 			"INVALID-VISIBILITY-RULES": {
 				"MESSAGE-START": "Neka pravila za prikaza nisu valjana",
@ -821,7 +812,6 @@
 			"TITLE": "Description is locked",
 			"MESSAGE": "Somebody else is modifying the description at this moment. If you would like to modify or view it, please come back later."
 		},
-		"FINALISE-POPUP": {},
 		"ROLES": {
 			"ALL-SECTIONS": "All Sections"
 		},
@ -1008,7 +998,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Izbriši",
 			"EDIT": "Uredi",
@ -1044,7 +1033,6 @@
 			"CLEAR-ALL-FILTERS": "clear all filters",
 			"SEARCH-FILTER-BTN": "Filter Results"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1065,7 +1053,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1086,7 +1073,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1107,7 +1093,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1132,7 +1117,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1153,7 +1137,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete"
 		}
@ -1172,7 +1155,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1199,8 +1181,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"NOTIFICATION-SERVICE": {
 		"INAPP-NOTIFICATION-LISTING": {
@ -1218,7 +1199,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1248,7 +1228,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete",
 				"EDIT": "Edit"
@ -1318,7 +1297,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1394,8 +1372,7 @@
 			"ADD-SOURCE": "Add Source",
 			"REMOVE-SOURCE": "Remove Source",
 			"SUBMIT-FIELDS": "Update Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"EXTERNAL-FETCHER-SOURCE-EDITOR": {
 		"FIELDS": {
@ -1455,8 +1432,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"PREFILLING-SOURCE-EDITOR": {
 		"TITLE-EDIT-PREFILLING-SOURCE": "Editing Prefilling Source",
@ -1480,8 +1456,7 @@
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field",
 			"SUBMIT-FIELDS": "Submit Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"REFERENCE-EDITOR": {
 		"TITLE-EDIT-REFERENCE": "Editing Reference",
@ -1504,8 +1479,7 @@
 			"DELETE": "Delete",
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"DMP-BLUEPRINT-EDITOR": {
 		"TITLE": {
@ -1538,7 +1512,6 @@
 			"DESCRIPTION-TEMPLATE-LABEL": "Label",
 			"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
 			"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
-			"EXTERNAL-AUTOCOMPLETE": {},
 			"PREFILLING-SOURCES": "Prefilling Sources"
 		},
 		"ACTIONS": {
@ -1732,7 +1705,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit",
@ -1778,7 +1750,6 @@
 		"EXTERNAL-SOURCE": "Source",
 		"INTERNAL-SOURCE": "Internal"
 	},
-	"TENANT-CHOOSE-DIALOG": {},
 	"TYPES": {
 		"ANNOTATION-PROTECTION-TYPE": {
 			"PRIVATE": "Hidden",
@ -2013,7 +1984,8 @@
 		"GLOSSARY": "Rječnik",
 		"TERMS-OF-SERVICE": "Uvjeti korištenja",
 		"ABOUT": "O {{ APP_NAME }}u",
-		"PRIVACY-POLICY": "Politika privatnosti"
+		"PRIVACY-POLICY": "Politika privatnosti",
+		"COOKIE-POLICY": "Cookie Policy"
 	},
 	"GLOSSARY": {
 		"TITLE": "Rječnik",
@ -2034,7 +2006,6 @@
 	"OPENSOURCE-LICENCES": {
 		"TITLE": "Politika kolačića"
 	},
-	"TERMS-OF-SERVICE": {},
 	"COOKIES-POLICY": {
 		"TITLE": "Licencije otvorenog koda"
 	},
@ -2114,8 +2085,8 @@
 			"ROLES": "Roles"
 		},
 		"ACTIONS": {
-			"REMOVE-USER":"Remove User",
-			"INVITE":"Invite"
+			"REMOVE-USER": "Remove User",
+			"INVITE": "Invite"
 		},
 		"USERS-REQUIRED": "Required at leat on user"
 	},
@ -2126,10 +2097,10 @@
 		},
 		"UNLINK-ACCOUNT": {
 			"TITLE": "Verify account to be unlinked",
-			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current ARGOS profile."
+			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current {{ APP_NAME_CAPS }} profile."
 		},
 		"UNLINK-ACCOUNT-DIALOG": {
-			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your ARGOS activity performed from this account to your main ARGOS account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your ARGOS experience from scratch, in an empty dashboard.",
+			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your {{ APP_NAME_CAPS }} activity performed from this account to your main {{ APP_NAME_CAPS }} account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your {{ APP_NAME_CAPS }} experience from scratch, in an empty dashboard.",
 			"CONFIRM": "Confirm",
 			"CANCEL": "Cancel"
 		},
--- a/dmp-frontend/src/assets/i18n/pl.json
+++ b/dmp-frontend/src/assets/i18n/pl.json
@ -447,8 +447,7 @@
 				"USERS": {
 					"NAME": "Name",
 					"ROLE": "Role"
-				},
-				"ERRORS": {}
+				}
 			},
 			"PAGE-INFO": {
 				"PAGE-NAME": "Nazwa rozdziału",
@ -471,14 +470,12 @@
 				"SECTION-DESCRIPTION-HINT": "Opisz krótko treść sekcji.",
 				"SECTION": "Sekcja"
 			},
-			"PAGES": {},
 			"FORM": {
 				"TITLE": "Opis formularza",
 				"SECTION": {
 					"FIELDS": {
 						"DESCRIPTION": "Opis"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"COMPOSITE-FIELD": {
 					"FIELDS": {
@ -491,8 +488,7 @@
 						"MULTIPLICITY-TABLEVIEW": "View inputs in table",
 						"SEMANTICS": "Semantics",
 						"EXPORT": "Uwzględnij w eksporcie"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"FIELD": {
 					"FIELDS": {
@ -537,8 +533,7 @@
 						"FIELD-EXTERNAL-DATASETS-TITLE": "Dane zewnętrznych zbiorów danych",
 						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Wprowadź tekst zastępczy",
 						"FIELD-LICENSES-TITLE": "Dane licencji",
-						"EXTERNAL-DATASET-TYPE-NAME": "Typ",
-						"EXTERNAL-DATASET-TYPES": {}
+						"EXTERNAL-DATASET-TYPE-NAME": "Typ"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "Należy podać co najmniej jedno źródło.",
@ -576,9 +571,6 @@
 						"ELEMENT-HIDDEN-FROM-ELEMENT": "Ten element ukrywa element lub element nadrzędny danych wejściowych, z których próbujesz zastosować regułę widoczności."
 					}
 				},
-				"FORM-VALIDATION": {
-					"ERROR-MESSAGES": {}
-				},
 				"TABLE-OF-CONTENTS": {
 					"ERROR-MESSAGES": {
 						"GENERIC-GRAD-AND-DROP-ERROR": "Invalid action.",
@ -628,7 +620,6 @@
 				"MORE": "Więcej..."
 			}
 		},
-		"FEEDBACK-MESSAGES": {},
 		"ERRORS": {
 			"INVALID-VISIBILITY-RULES": {
 				"MESSAGE-START": "Wykryto nieprawidłowe reguły widoczności w ",
@ -821,7 +812,6 @@
 			"TITLE": "Description is locked",
 			"MESSAGE": "Somebody else is modifying the description at this moment. If you would like to modify or view it, please come back later."
 		},
-		"FINALISE-POPUP": {},
 		"ROLES": {
 			"ALL-SECTIONS": "All Sections"
 		},
@ -1008,7 +998,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Usuń",
 			"EDIT": "Edytuj",
@ -1044,7 +1033,6 @@
 			"CLEAR-ALL-FILTERS": "clear all filters",
 			"SEARCH-FILTER-BTN": "Filter Results"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1065,7 +1053,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1086,7 +1073,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1107,7 +1093,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1132,7 +1117,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1153,7 +1137,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete"
 		}
@ -1172,7 +1155,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1199,8 +1181,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"NOTIFICATION-SERVICE": {
 		"INAPP-NOTIFICATION-LISTING": {
@ -1218,7 +1199,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1248,7 +1228,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete",
 				"EDIT": "Edit"
@ -1318,7 +1297,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1394,8 +1372,7 @@
 			"ADD-SOURCE": "Add Source",
 			"REMOVE-SOURCE": "Remove Source",
 			"SUBMIT-FIELDS": "Update Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"EXTERNAL-FETCHER-SOURCE-EDITOR": {
 		"FIELDS": {
@ -1455,8 +1432,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"PREFILLING-SOURCE-EDITOR": {
 		"TITLE-EDIT-PREFILLING-SOURCE": "Editing Prefilling Source",
@ -1480,8 +1456,7 @@
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field",
 			"SUBMIT-FIELDS": "Submit Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"REFERENCE-EDITOR": {
 		"TITLE-EDIT-REFERENCE": "Editing Reference",
@ -1504,8 +1479,7 @@
 			"DELETE": "Delete",
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"DMP-BLUEPRINT-EDITOR": {
 		"TITLE": {
@ -1538,7 +1512,6 @@
 			"DESCRIPTION-TEMPLATE-LABEL": "Label",
 			"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
 			"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
-			"EXTERNAL-AUTOCOMPLETE": {},
 			"PREFILLING-SOURCES": "Prefilling Sources"
 		},
 		"ACTIONS": {
@ -1732,7 +1705,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit",
@ -1778,7 +1750,6 @@
 		"EXTERNAL-SOURCE": "Source",
 		"INTERNAL-SOURCE": "Internal"
 	},
-	"TENANT-CHOOSE-DIALOG": {},
 	"TYPES": {
 		"ANNOTATION-PROTECTION-TYPE": {
 			"PRIVATE": "Hidden",
@ -2013,7 +1984,8 @@
 		"GLOSSARY": "Słowniczek",
 		"TERMS-OF-SERVICE": "Warunki świadczenia usług",
 		"ABOUT": "O",
-		"PRIVACY-POLICY": "Polityka prywatności"
+		"PRIVACY-POLICY": "Polityka prywatności",
+		"COOKIE-POLICY": "Cookie Policy"
 	},
 	"GLOSSARY": {
 		"TITLE": "Słowinczek",
@ -2034,7 +2006,6 @@
 	"OPENSOURCE-LICENCES": {
 		"TITLE": "Licencje Open-source"
 	},
-	"TERMS-OF-SERVICE": {},
 	"COOKIES-POLICY": {
 		"TITLE": "Polityka plików cookie"
 	},
@ -2114,8 +2085,8 @@
 			"ROLES": "Roles"
 		},
 		"ACTIONS": {
-			"REMOVE-USER":"Remove User",
-			"INVITE":"Invite"
+			"REMOVE-USER": "Remove User",
+			"INVITE": "Invite"
 		},
 		"USERS-REQUIRED": "Required at leat on user"
 	},
@ -2126,10 +2097,10 @@
 		},
 		"UNLINK-ACCOUNT": {
 			"TITLE": "Verify account to be unlinked",
-			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current ARGOS profile."
+			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current {{ APP_NAME_CAPS }} profile."
 		},
 		"UNLINK-ACCOUNT-DIALOG": {
-			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your ARGOS activity performed from this account to your main ARGOS account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your ARGOS experience from scratch, in an empty dashboard.",
+			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your {{ APP_NAME_CAPS }} activity performed from this account to your main {{ APP_NAME_CAPS }} account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your {{ APP_NAME_CAPS }} experience from scratch, in an empty dashboard.",
 			"CONFIRM": "Confirm",
 			"CANCEL": "Cancel"
 		},
--- a/dmp-frontend/src/assets/i18n/pt.json
+++ b/dmp-frontend/src/assets/i18n/pt.json
@ -447,8 +447,7 @@
 				"USERS": {
 					"NAME": "Name",
 					"ROLE": "Role"
-				},
-				"ERRORS": {}
+				}
 			},
 			"PAGE-INFO": {
 				"PAGE-NAME": "Nome do capítulo",
@ -471,14 +470,12 @@
 				"SECTION-DESCRIPTION-HINT": "Escreva uma breve descrição do que se trata na secção.",
 				"SECTION": "Secção"
 			},
-			"PAGES": {},
 			"FORM": {
 				"TITLE": "Descrição do Formulário",
 				"SECTION": {
 					"FIELDS": {
 						"DESCRIPTION": "Descrição"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"COMPOSITE-FIELD": {
 					"FIELDS": {
@ -491,8 +488,7 @@
 						"MULTIPLICITY-TABLEVIEW": "View inputs in table",
 						"SEMANTICS": "Semantics",
 						"EXPORT": "Include in Export"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"FIELD": {
 					"FIELDS": {
@ -537,8 +533,7 @@
 						"FIELD-EXTERNAL-DATASETS-TITLE": "Dados dos Datasets Externos",
 						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Texto de Entrada",
 						"FIELD-LICENSES-TITLE": "Licenses Data",
-						"EXTERNAL-DATASET-TYPE-NAME": "Type",
-						"EXTERNAL-DATASET-TYPES": {}
+						"EXTERNAL-DATASET-TYPE-NAME": "Type"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "Deve ser fornecida pelo menos uma fonte.",
@ -576,9 +571,6 @@
 						"ELEMENT-HIDDEN-FROM-ELEMENT": "Este elemento esconde o elemento, ou um elemento subordinador, do input a partir do qual está a tentar aplicar a regra de visibilidade."
 					}
 				},
-				"FORM-VALIDATION": {
-					"ERROR-MESSAGES": {}
-				},
 				"TABLE-OF-CONTENTS": {
 					"ERROR-MESSAGES": {
 						"GENERIC-GRAD-AND-DROP-ERROR": "Invalid action.",
@ -628,7 +620,6 @@
 				"MORE": "Mais.."
 			}
 		},
-		"FEEDBACK-MESSAGES": {},
 		"ERRORS": {
 			"INVALID-VISIBILITY-RULES": {
 				"MESSAGE-START": "Foram detetadas regras de visibilidade inválidas em ",
@ -821,7 +812,6 @@
 			"TITLE": "Description is locked",
 			"MESSAGE": "Somebody else is modifying the description at this moment. If you would like to modify or view it, please come back later."
 		},
-		"FINALISE-POPUP": {},
 		"ROLES": {
 			"ALL-SECTIONS": "All Sections"
 		},
@ -1008,7 +998,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Eliminar",
 			"EDIT": "Editar",
@ -1044,7 +1033,6 @@
 			"CLEAR-ALL-FILTERS": "clear all filters",
 			"SEARCH-FILTER-BTN": "Filter Results"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1065,7 +1053,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1086,7 +1073,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1107,7 +1093,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1132,7 +1117,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1153,7 +1137,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete"
 		}
@ -1172,7 +1155,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1199,8 +1181,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"NOTIFICATION-SERVICE": {
 		"INAPP-NOTIFICATION-LISTING": {
@ -1218,7 +1199,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1248,7 +1228,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete",
 				"EDIT": "Edit"
@ -1318,7 +1297,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1394,8 +1372,7 @@
 			"ADD-SOURCE": "Add Source",
 			"REMOVE-SOURCE": "Remove Source",
 			"SUBMIT-FIELDS": "Update Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"EXTERNAL-FETCHER-SOURCE-EDITOR": {
 		"FIELDS": {
@ -1455,8 +1432,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"PREFILLING-SOURCE-EDITOR": {
 		"TITLE-EDIT-PREFILLING-SOURCE": "Editing Prefilling Source",
@ -1480,8 +1456,7 @@
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field",
 			"SUBMIT-FIELDS": "Submit Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"REFERENCE-EDITOR": {
 		"TITLE-EDIT-REFERENCE": "Editing Reference",
@ -1504,8 +1479,7 @@
 			"DELETE": "Delete",
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"DMP-BLUEPRINT-EDITOR": {
 		"TITLE": {
@ -1538,7 +1512,6 @@
 			"DESCRIPTION-TEMPLATE-LABEL": "Label",
 			"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
 			"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
-			"EXTERNAL-AUTOCOMPLETE": {},
 			"PREFILLING-SOURCES": "Prefilling Sources"
 		},
 		"ACTIONS": {
@ -1732,7 +1705,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit",
@ -1778,7 +1750,6 @@
 		"EXTERNAL-SOURCE": "Source",
 		"INTERNAL-SOURCE": "Internal"
 	},
-	"TENANT-CHOOSE-DIALOG": {},
 	"TYPES": {
 		"ANNOTATION-PROTECTION-TYPE": {
 			"PRIVATE": "Hidden",
@ -2013,7 +1984,8 @@
 		"GLOSSARY": "Glossário",
 		"TERMS-OF-SERVICE": "Condições do Serviço",
 		"ABOUT": "Sobre",
-		"PRIVACY-POLICY": "Política de Privacidade"
+		"PRIVACY-POLICY": "Política de Privacidade",
+		"COOKIE-POLICY": "Cookie Policy"
 	},
 	"GLOSSARY": {
 		"TITLE": "Glossário",
@ -2034,7 +2006,6 @@
 	"OPENSOURCE-LICENCES": {
 		"TITLE": "Licenças Opensource"
 	},
-	"TERMS-OF-SERVICE": {},
 	"COOKIES-POLICY": {
 		"TITLE": "Política de Cookies"
 	},
@ -2114,8 +2085,8 @@
 			"ROLES": "Roles"
 		},
 		"ACTIONS": {
-			"REMOVE-USER":"Remove User",
-			"INVITE":"Invite"
+			"REMOVE-USER": "Remove User",
+			"INVITE": "Invite"
 		},
 		"USERS-REQUIRED": "Required at leat on user"
 	},
@ -2126,10 +2097,10 @@
 		},
 		"UNLINK-ACCOUNT": {
 			"TITLE": "Verify account to be unlinked",
-			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current ARGOS profile."
+			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current {{ APP_NAME_CAPS }} profile."
 		},
 		"UNLINK-ACCOUNT-DIALOG": {
-			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your ARGOS activity performed from this account to your main ARGOS account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your ARGOS experience from scratch, in an empty dashboard.",
+			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your {{ APP_NAME_CAPS }} activity performed from this account to your main {{ APP_NAME_CAPS }} account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your {{ APP_NAME_CAPS }} experience from scratch, in an empty dashboard.",
 			"CONFIRM": "Confirm",
 			"CANCEL": "Cancel"
 		},
--- a/dmp-frontend/src/assets/i18n/sk.json
+++ b/dmp-frontend/src/assets/i18n/sk.json
@ -447,8 +447,7 @@
 				"USERS": {
 					"NAME": "Name",
 					"ROLE": "Role"
-				},
-				"ERRORS": {}
+				}
 			},
 			"PAGE-INFO": {
 				"PAGE-NAME": "Chapter Name",
@ -471,14 +470,12 @@
 				"SECTION-DESCRIPTION-HINT": "Write a brief desciption of what the section is about.",
 				"SECTION": "Section"
 			},
-			"PAGES": {},
 			"FORM": {
 				"TITLE": "Formulár opisu",
 				"SECTION": {
 					"FIELDS": {
 						"DESCRIPTION": "Opis"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"COMPOSITE-FIELD": {
 					"FIELDS": {
@ -491,8 +488,7 @@
 						"MULTIPLICITY-TABLEVIEW": "View inputs in table",
 						"SEMANTICS": "Semantics",
 						"EXPORT": "Include in Export"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"FIELD": {
 					"FIELDS": {
@ -537,8 +533,7 @@
 						"FIELD-EXTERNAL-DATASETS-TITLE": "External Datasets Data",
 						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Input placeholder Text",
 						"FIELD-LICENSES-TITLE": "Licenses Data",
-						"EXTERNAL-DATASET-TYPE-NAME": "Type",
-						"EXTERNAL-DATASET-TYPES": {}
+						"EXTERNAL-DATASET-TYPE-NAME": "Type"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "At least one source must be provided.",
@ -576,9 +571,6 @@
 						"ELEMENT-HIDDEN-FROM-ELEMENT": "This element hides the element or a parent element of the input you are trying to apply visibility rule from."
 					}
 				},
-				"FORM-VALIDATION": {
-					"ERROR-MESSAGES": {}
-				},
 				"TABLE-OF-CONTENTS": {
 					"ERROR-MESSAGES": {
 						"GENERIC-GRAD-AND-DROP-ERROR": "Invalid action.",
@ -628,7 +620,6 @@
 				"MORE": "More.."
 			}
 		},
-		"FEEDBACK-MESSAGES": {},
 		"ERRORS": {
 			"INVALID-VISIBILITY-RULES": {
 				"MESSAGE-START": "There were invalid visibilty rules detected in ",
@ -821,7 +812,6 @@
 			"TITLE": "Description is locked",
 			"MESSAGE": "Somebody else is modifying the description at this moment. If you would like to modify or view it, please come back later."
 		},
-		"FINALISE-POPUP": {},
 		"ROLES": {
 			"ALL-SECTIONS": "All Sections"
 		},
@ -1008,7 +998,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Editovať",
@ -1044,7 +1033,6 @@
 			"CLEAR-ALL-FILTERS": "clear all filters",
 			"SEARCH-FILTER-BTN": "Filter Results"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1065,7 +1053,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1086,7 +1073,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1107,7 +1093,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1132,7 +1117,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1153,7 +1137,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete"
 		}
@ -1172,7 +1155,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1199,8 +1181,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"NOTIFICATION-SERVICE": {
 		"INAPP-NOTIFICATION-LISTING": {
@ -1218,7 +1199,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1248,7 +1228,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete",
 				"EDIT": "Edit"
@ -1318,7 +1297,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1394,8 +1372,7 @@
 			"ADD-SOURCE": "Add Source",
 			"REMOVE-SOURCE": "Remove Source",
 			"SUBMIT-FIELDS": "Update Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"EXTERNAL-FETCHER-SOURCE-EDITOR": {
 		"FIELDS": {
@ -1455,8 +1432,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"PREFILLING-SOURCE-EDITOR": {
 		"TITLE-EDIT-PREFILLING-SOURCE": "Editing Prefilling Source",
@ -1480,8 +1456,7 @@
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field",
 			"SUBMIT-FIELDS": "Submit Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"REFERENCE-EDITOR": {
 		"TITLE-EDIT-REFERENCE": "Editing Reference",
@ -1504,8 +1479,7 @@
 			"DELETE": "Delete",
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"DMP-BLUEPRINT-EDITOR": {
 		"TITLE": {
@ -1538,7 +1512,6 @@
 			"DESCRIPTION-TEMPLATE-LABEL": "Label",
 			"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
 			"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
-			"EXTERNAL-AUTOCOMPLETE": {},
 			"PREFILLING-SOURCES": "Prefilling Sources"
 		},
 		"ACTIONS": {
@ -1732,7 +1705,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit",
@ -1778,7 +1750,6 @@
 		"EXTERNAL-SOURCE": "Source",
 		"INTERNAL-SOURCE": "Internal"
 	},
-	"TENANT-CHOOSE-DIALOG": {},
 	"TYPES": {
 		"ANNOTATION-PROTECTION-TYPE": {
 			"PRIVATE": "Hidden",
@ -2013,7 +1984,8 @@
 		"GLOSSARY": "Glosár",
 		"TERMS-OF-SERVICE": "Podmienky používania",
 		"ABOUT": "O nástroji",
-		"PRIVACY-POLICY": "Zásady ochrany súkromných údajov"
+		"PRIVACY-POLICY": "Zásady ochrany súkromných údajov",
+		"COOKIE-POLICY": "Cookie Policy"
 	},
 	"GLOSSARY": {
 		"TITLE": "Glosár",
@ -2034,7 +2006,6 @@
 	"OPENSOURCE-LICENCES": {
 		"TITLE": "Open source licencie"
 	},
-	"TERMS-OF-SERVICE": {},
 	"COOKIES-POLICY": {
 		"TITLE": "Zásady používania súborov cookies"
 	},
@ -2114,8 +2085,8 @@
 			"ROLES": "Roles"
 		},
 		"ACTIONS": {
-			"REMOVE-USER":"Remove User",
-			"INVITE":"Invite"
+			"REMOVE-USER": "Remove User",
+			"INVITE": "Invite"
 		},
 		"USERS-REQUIRED": "Required at leat on user"
 	},
@ -2126,10 +2097,10 @@
 		},
 		"UNLINK-ACCOUNT": {
 			"TITLE": "Verify account to be unlinked",
-			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current ARGOS profile."
+			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current {{ APP_NAME_CAPS }} profile."
 		},
 		"UNLINK-ACCOUNT-DIALOG": {
-			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your ARGOS activity performed from this account to your main ARGOS account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your ARGOS experience from scratch, in an empty dashboard.",
+			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your {{ APP_NAME_CAPS }} activity performed from this account to your main {{ APP_NAME_CAPS }} account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your {{ APP_NAME_CAPS }} experience from scratch, in an empty dashboard.",
 			"CONFIRM": "Confirm",
 			"CANCEL": "Cancel"
 		},
--- a/dmp-frontend/src/assets/i18n/sr.json
+++ b/dmp-frontend/src/assets/i18n/sr.json
@ -447,8 +447,7 @@
 				"USERS": {
 					"NAME": "Name",
 					"ROLE": "Role"
-				},
-				"ERRORS": {}
+				}
 			},
 			"PAGE-INFO": {
 				"PAGE-NAME": "Chapter Name",
@ -471,14 +470,12 @@
 				"SECTION-DESCRIPTION-HINT": "Write a brief desciption of what the section is about.",
 				"SECTION": "Section"
 			},
-			"PAGES": {},
 			"FORM": {
 				"TITLE": "Opis obrazca",
 				"SECTION": {
 					"FIELDS": {
 						"DESCRIPTION": "Opis"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"COMPOSITE-FIELD": {
 					"FIELDS": {
@ -491,8 +488,7 @@
 						"MULTIPLICITY-TABLEVIEW": "View inputs in table",
 						"SEMANTICS": "Semantics",
 						"EXPORT": "Include in Export"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"FIELD": {
 					"FIELDS": {
@ -537,8 +533,7 @@
 						"FIELD-EXTERNAL-DATASETS-TITLE": "External Datasets Data",
 						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Input placeholder Text",
 						"FIELD-LICENSES-TITLE": "Licenses Data",
-						"EXTERNAL-DATASET-TYPE-NAME": "Type",
-						"EXTERNAL-DATASET-TYPES": {}
+						"EXTERNAL-DATASET-TYPE-NAME": "Type"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "At least one source must be provided.",
@ -576,9 +571,6 @@
 						"ELEMENT-HIDDEN-FROM-ELEMENT": "This element hides the element or a parent element of the input you are trying to apply visibility rule from."
 					}
 				},
-				"FORM-VALIDATION": {
-					"ERROR-MESSAGES": {}
-				},
 				"TABLE-OF-CONTENTS": {
 					"ERROR-MESSAGES": {
 						"GENERIC-GRAD-AND-DROP-ERROR": "Invalid action.",
@ -628,7 +620,6 @@
 				"MORE": "More.."
 			}
 		},
-		"FEEDBACK-MESSAGES": {},
 		"ERRORS": {
 			"INVALID-VISIBILITY-RULES": {
 				"MESSAGE-START": "There were invalid visibilty rules detected in ",
@ -821,7 +812,6 @@
 			"TITLE": "Description is locked",
 			"MESSAGE": "Somebody else is modifying the description at this moment. If you would like to modify or view it, please come back later."
 		},
-		"FINALISE-POPUP": {},
 		"ROLES": {
 			"ALL-SECTIONS": "All Sections"
 		},
@ -1008,7 +998,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Uredite",
@ -1044,7 +1033,6 @@
 			"CLEAR-ALL-FILTERS": "clear all filters",
 			"SEARCH-FILTER-BTN": "Filter Results"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1065,7 +1053,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1086,7 +1073,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1107,7 +1093,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1132,7 +1117,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1153,7 +1137,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete"
 		}
@ -1172,7 +1155,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1199,8 +1181,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"NOTIFICATION-SERVICE": {
 		"INAPP-NOTIFICATION-LISTING": {
@ -1218,7 +1199,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1248,7 +1228,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete",
 				"EDIT": "Edit"
@ -1318,7 +1297,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1394,8 +1372,7 @@
 			"ADD-SOURCE": "Add Source",
 			"REMOVE-SOURCE": "Remove Source",
 			"SUBMIT-FIELDS": "Update Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"EXTERNAL-FETCHER-SOURCE-EDITOR": {
 		"FIELDS": {
@ -1455,8 +1432,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"PREFILLING-SOURCE-EDITOR": {
 		"TITLE-EDIT-PREFILLING-SOURCE": "Editing Prefilling Source",
@ -1480,8 +1456,7 @@
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field",
 			"SUBMIT-FIELDS": "Submit Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"REFERENCE-EDITOR": {
 		"TITLE-EDIT-REFERENCE": "Editing Reference",
@ -1504,8 +1479,7 @@
 			"DELETE": "Delete",
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"DMP-BLUEPRINT-EDITOR": {
 		"TITLE": {
@ -1538,7 +1512,6 @@
 			"DESCRIPTION-TEMPLATE-LABEL": "Label",
 			"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
 			"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
-			"EXTERNAL-AUTOCOMPLETE": {},
 			"PREFILLING-SOURCES": "Prefilling Sources"
 		},
 		"ACTIONS": {
@ -1732,7 +1705,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit",
@ -1778,7 +1750,6 @@
 		"EXTERNAL-SOURCE": "Source",
 		"INTERNAL-SOURCE": "Internal"
 	},
-	"TENANT-CHOOSE-DIALOG": {},
 	"TYPES": {
 		"ANNOTATION-PROTECTION-TYPE": {
 			"PRIVATE": "Hidden",
@ -2013,7 +1984,8 @@
 		"GLOSSARY": "Rečnik",
 		"TERMS-OF-SERVICE": "Uslovi korišćenja",
 		"ABOUT": "Više o",
-		"PRIVACY-POLICY": "Politika privatnosti"
+		"PRIVACY-POLICY": "Politika privatnosti",
+		"COOKIE-POLICY": "Cookie Policy"
 	},
 	"GLOSSARY": {
 		"TITLE": "Rečnik",
@ -2034,7 +2006,6 @@
 	"OPENSOURCE-LICENCES": {
 		"TITLE": "Politika kolačića"
 	},
-	"TERMS-OF-SERVICE": {},
 	"COOKIES-POLICY": {
 		"TITLE": "Licence otvorenog koda"
 	},
@ -2114,8 +2085,8 @@
 			"ROLES": "Roles"
 		},
 		"ACTIONS": {
-			"REMOVE-USER":"Remove User",
-			"INVITE":"Invite"
+			"REMOVE-USER": "Remove User",
+			"INVITE": "Invite"
 		},
 		"USERS-REQUIRED": "Required at leat on user"
 	},
@ -2126,10 +2097,10 @@
 		},
 		"UNLINK-ACCOUNT": {
 			"TITLE": "Verify account to be unlinked",
-			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current ARGOS profile."
+			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current {{ APP_NAME_CAPS }} profile."
 		},
 		"UNLINK-ACCOUNT-DIALOG": {
-			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your ARGOS activity performed from this account to your main ARGOS account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your ARGOS experience from scratch, in an empty dashboard.",
+			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your {{ APP_NAME_CAPS }} activity performed from this account to your main {{ APP_NAME_CAPS }} account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your {{ APP_NAME_CAPS }} experience from scratch, in an empty dashboard.",
 			"CONFIRM": "Confirm",
 			"CANCEL": "Cancel"
 		},
--- a/dmp-frontend/src/assets/i18n/tr.json
+++ b/dmp-frontend/src/assets/i18n/tr.json
@ -447,8 +447,7 @@
 				"USERS": {
 					"NAME": "Name",
 					"ROLE": "Role"
-				},
-				"ERRORS": {}
+				}
 			},
 			"PAGE-INFO": {
 				"PAGE-NAME": "Chapter Name",
@ -471,14 +470,12 @@
 				"SECTION-DESCRIPTION-HINT": "Write a brief desciption of what the section is about.",
 				"SECTION": "Section"
 			},
-			"PAGES": {},
 			"FORM": {
 				"TITLE": "Form Tanımı",
 				"SECTION": {
 					"FIELDS": {
 						"DESCRIPTION": "Tanım"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"COMPOSITE-FIELD": {
 					"FIELDS": {
@ -491,8 +488,7 @@
 						"MULTIPLICITY-TABLEVIEW": "View inputs in table",
 						"SEMANTICS": "Semantics",
 						"EXPORT": "Include in Export"
-					},
-					"ACTIONS": {}
+					}
 				},
 				"FIELD": {
 					"FIELDS": {
@ -537,8 +533,7 @@
 						"FIELD-EXTERNAL-DATASETS-TITLE": "External Datasets Data",
 						"FIELD-EXTERNAL-DATASETS-PLACEHOLDER": "Input placeholder Text",
 						"FIELD-LICENSES-TITLE": "Licenses Data",
-						"EXTERNAL-DATASET-TYPE-NAME": "Type",
-						"EXTERNAL-DATASET-TYPES": {}
+						"EXTERNAL-DATASET-TYPE-NAME": "Type"
 					},
 					"ERROR-MESSAGES": {
 						"FIELD-OTHER-SOURCES-REQUIRED": "At least one source must be provided.",
@ -576,9 +571,6 @@
 						"ELEMENT-HIDDEN-FROM-ELEMENT": "This element hides the element or a parent element of the input you are trying to apply visibility rule from."
 					}
 				},
-				"FORM-VALIDATION": {
-					"ERROR-MESSAGES": {}
-				},
 				"TABLE-OF-CONTENTS": {
 					"ERROR-MESSAGES": {
 						"GENERIC-GRAD-AND-DROP-ERROR": "Invalid action.",
@ -628,7 +620,6 @@
 				"MORE": "More.."
 			}
 		},
-		"FEEDBACK-MESSAGES": {},
 		"ERRORS": {
 			"INVALID-VISIBILITY-RULES": {
 				"MESSAGE-START": "There were invalid visibilty rules detected in ",
@ -821,7 +812,6 @@
 			"TITLE": "Description is locked",
 			"MESSAGE": "Somebody else is modifying the description at this moment. If you would like to modify or view it, please come back later."
 		},
-		"FINALISE-POPUP": {},
 		"ROLES": {
 			"ALL-SECTIONS": "All Sections"
 		},
@ -1008,7 +998,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Sil",
 			"EDIT": "Hizmetler",
@ -1044,7 +1033,6 @@
 			"CLEAR-ALL-FILTERS": "clear all filters",
 			"SEARCH-FILTER-BTN": "Filter Results"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1065,7 +1053,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1086,7 +1073,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1107,7 +1093,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1132,7 +1117,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1153,7 +1137,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete"
 		}
@ -1172,7 +1155,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit"
@ -1199,8 +1181,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"NOTIFICATION-SERVICE": {
 		"INAPP-NOTIFICATION-LISTING": {
@ -1218,7 +1199,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1248,7 +1228,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete",
 				"EDIT": "Edit"
@ -1318,7 +1297,6 @@
 				"CANCEL": "Cancel",
 				"APPLY-FILTERS": "Apply filters"
 			},
-			"CONFIRM-DELETE-DIALOG": {},
 			"ACTIONS": {
 				"DELETE": "Delete"
 			}
@ -1394,8 +1372,7 @@
 			"ADD-SOURCE": "Add Source",
 			"REMOVE-SOURCE": "Remove Source",
 			"SUBMIT-FIELDS": "Update Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"EXTERNAL-FETCHER-SOURCE-EDITOR": {
 		"FIELDS": {
@ -1455,8 +1432,7 @@
 			"SAVE": "Save",
 			"CANCEL": "Cancel",
 			"DELETE": "Delete"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"PREFILLING-SOURCE-EDITOR": {
 		"TITLE-EDIT-PREFILLING-SOURCE": "Editing Prefilling Source",
@ -1480,8 +1456,7 @@
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field",
 			"SUBMIT-FIELDS": "Submit Fields"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"REFERENCE-EDITOR": {
 		"TITLE-EDIT-REFERENCE": "Editing Reference",
@ -1504,8 +1479,7 @@
 			"DELETE": "Delete",
 			"ADD-FIELD": "Add Field",
 			"REMOVE-FIELD": "Remove Field"
-		},
-		"CONFIRM-DELETE-DIALOG": {}
+		}
 	},
 	"DMP-BLUEPRINT-EDITOR": {
 		"TITLE": {
@ -1538,7 +1512,6 @@
 			"DESCRIPTION-TEMPLATE-LABEL": "Label",
 			"DESCRIPTION-TEMPLATE-MIN-MULTIPLICITY": "Min Multiplicity",
 			"DESCRIPTION-TEMPLATE-MAX-MULTIPLICITY": "Max Multiplicity",
-			"EXTERNAL-AUTOCOMPLETE": {},
 			"PREFILLING-SOURCES": "Prefilling Sources"
 		},
 		"ACTIONS": {
@ -1732,7 +1705,6 @@
 			"CANCEL": "Cancel",
 			"APPLY-FILTERS": "Apply filters"
 		},
-		"CONFIRM-DELETE-DIALOG": {},
 		"ACTIONS": {
 			"DELETE": "Delete",
 			"EDIT": "Edit",
@ -1778,7 +1750,6 @@
 		"EXTERNAL-SOURCE": "Source",
 		"INTERNAL-SOURCE": "Internal"
 	},
-	"TENANT-CHOOSE-DIALOG": {},
 	"TYPES": {
 		"ANNOTATION-PROTECTION-TYPE": {
 			"PRIVATE": "Hidden",
@ -2013,7 +1984,8 @@
 		"GLOSSARY": "Sözlük",
 		"TERMS-OF-SERVICE": "Kullanım Şartları",
 		"ABOUT": "Hakkında",
-		"PRIVACY-POLICY": "Gizlilik Politikası"
+		"PRIVACY-POLICY": "Gizlilik Politikası",
+		"COOKIE-POLICY": "Cookie Policy"
 	},
 	"GLOSSARY": {
 		"TITLE": "Sözlük",
@ -2034,7 +2006,6 @@
 	"OPENSOURCE-LICENCES": {
 		"TITLE": "Açık Kaynak Kodu"
 	},
-	"TERMS-OF-SERVICE": {},
 	"COOKIES-POLICY": {
 		"TITLE": "Çerez Politikası"
 	},
@ -2114,8 +2085,8 @@
 			"ROLES": "Roles"
 		},
 		"ACTIONS": {
-			"REMOVE-USER":"Remove User",
-			"INVITE":"Invite"
+			"REMOVE-USER": "Remove User",
+			"INVITE": "Invite"
 		},
 		"USERS-REQUIRED": "Required at leat on user"
 	},
@ -2126,10 +2097,10 @@
 		},
 		"UNLINK-ACCOUNT": {
 			"TITLE": "Verify account to be unlinked",
-			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current ARGOS profile."
+			"MESSAGE": "An email to verify this action has been sent to your main account. Once accepted, {{accountToBeUnlinked}} will be no longer connected to your current {{ APP_NAME_CAPS }} profile."
 		},
 		"UNLINK-ACCOUNT-DIALOG": {
-			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your ARGOS activity performed from this account to your main ARGOS account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your ARGOS experience from scratch, in an empty dashboard.",
+			"MESSAGE": "By clicking \"Confirm\", you accept the transfer of your {{ APP_NAME_CAPS }} activity performed from this account to your main {{ APP_NAME_CAPS }} account, which is the one that is listed first. By logging in again with the unlinked account, you will be able to start your {{ APP_NAME_CAPS }} experience from scratch, in an empty dashboard.",
 			"CONFIRM": "Confirm",
 			"CANCEL": "Cancel"
 		},
Author	SHA1	Message	Date
Diamantis Tziotzios	094d3c6ccc	Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring	2024-06-21 17:33:25 +03:00
Diamantis Tziotzios	c8d5143ccf	added cookie policy to supportive material	2024-06-21 17:32:59 +03:00