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

backend/core/src/main/java/org/opencdmp/authorization/authorizationcontentresolver/AuthorizationContentResolver.java

@@ -9,9 +9,9 @@ import java.util.UUID;
 public interface AuthorizationContentResolver {
 	List<String> getPermissionNames();
 
-	AffiliatedResource dmpAffiliation(UUID id);
+	AffiliatedResource planAffiliation(UUID id);
 
-	Map<UUID, AffiliatedResource> dmpsAffiliation(List<UUID> ids);
+	Map<UUID, AffiliatedResource> plansAffiliation(List<UUID> ids);
 
 	AffiliatedResource descriptionTemplateAffiliation(UUID id);
 

backend/core/src/main/java/org/opencdmp/authorization/authorizationcontentresolver/AuthorizationContentResolverImpl.java

@@ -53,11 +53,11 @@ public class AuthorizationContentResolverImpl implements AuthorizationContentRes
 	}
 
 	@Override
-	public AffiliatedResource dmpAffiliation(UUID id) {
+	public AffiliatedResource planAffiliation(UUID id) {
-		return this.dmpsAffiliation(List.of(id)).getOrDefault(id, new AffiliatedResource());
+		return this.plansAffiliation(List.of(id)).getOrDefault(id, new AffiliatedResource());
 	}
 	@Override
-	public Map<UUID, AffiliatedResource> dmpsAffiliation(List<UUID> ids){
+	public Map<UUID, AffiliatedResource> plansAffiliation(List<UUID> ids){
 		UUID userId = this.userScope.getUserIdSafe();
 		Map<UUID, AffiliatedResource> affiliatedResources = new HashMap<>();
 		for (UUID id : ids){

backend/core/src/main/java/org/opencdmp/model/actionconfirmation/ActionConfirmation.java

@@ -31,7 +31,7 @@ public class ActionConfirmation {
 	public static final String _userInviteToTenantRequest = "userInviteToTenantRequest";
 
 	private PlanInvitation planInvitation;
-	public static final String _dmpInvitation = "dmpInvitation";
+	public static final String _planInvitation = "planInvitation";
 
 	private Instant expiresAt;
 	public static final String _expiresAt = "expiresAt";
@@ -79,11 +79,11 @@ public class ActionConfirmation {
 		this.status = status;
 	}
 
-	public PlanInvitation getDmpInvitation() {
+	public PlanInvitation getPlanInvitation() {
 		return planInvitation;
 	}
 
-	public void setDmpInvitation(PlanInvitation planInvitation) {
+	public void setPlanInvitation(PlanInvitation planInvitation) {
 		this.planInvitation = planInvitation;
 	}
 

backend/core/src/main/java/org/opencdmp/model/builder/actionconfirmation/ActionConfirmationBuilder.java

@@ -62,7 +62,7 @@ public class ActionConfirmationBuilder extends BaseBuilder<ActionConfirmation, A
         FieldSet mergeAccountConfirmationFields = fields.extractPrefixed(this.asPrefix(ActionConfirmation._mergeAccountConfirmation));
         FieldSet removeCredentialRequestFields = fields.extractPrefixed(this.asPrefix(ActionConfirmation._removeCredentialRequest));
         FieldSet userInviteToTenantRequestFields = fields.extractPrefixed(this.asPrefix(ActionConfirmation._userInviteToTenantRequest));
-        FieldSet dmpInvitationFields = fields.extractPrefixed(this.asPrefix(ActionConfirmation._dmpInvitation));
+        FieldSet planInvitationFields = fields.extractPrefixed(this.asPrefix(ActionConfirmation._planInvitation));
 
         FieldSet userFields = fields.extractPrefixed(this.asPrefix(ActionConfirmation._createdBy));
         Map<UUID, User> userMap = this.collectUsers(userFields, data);
@@ -85,7 +85,7 @@ public class ActionConfirmationBuilder extends BaseBuilder<ActionConfirmation, A
                     }
                     case PlanInvitation -> {
                         PlanInvitationEntity dmpInvitation = this.xmlHandlingService.fromXmlSafe(PlanInvitationEntity.class, d.getData());
-                        m.setDmpInvitation(this.builderFactory.builder(PlanInvitationBuilder.class).authorize(this.authorize).build(dmpInvitationFields, dmpInvitation));
+                        m.setPlanInvitation(this.builderFactory.builder(PlanInvitationBuilder.class).authorize(this.authorize).build(planInvitationFields, dmpInvitation));
                     }
                     case RemoveCredential -> {
                         RemoveCredentialRequestEntity emailConfirmation = this.xmlHandlingService.fromXmlSafe(RemoveCredentialRequestEntity.class, d.getData());

backend/core/src/main/java/org/opencdmp/model/builder/plan/PlanBuilder.java

@@ -113,7 +113,7 @@ public class PlanBuilder extends BaseBuilder<Plan, PlanEntity> {
         Map<UUID, DefinitionEntity> definitionEntityMap = !planPropertiesFields.isEmpty() ? this.collectPlanBlueprintDefinitions(data) : null;
 
         Set<String> authorizationFlags = this.extractAuthorizationFlags(fields, Plan._authorizationFlags, this.authorizationContentResolver.getPermissionNames());
-        Map<UUID, AffiliatedResource>  affiliatedResourceMap = authorizationFlags == null || authorizationFlags.isEmpty() ? null : this.authorizationContentResolver.dmpsAffiliation(data.stream().map(PlanEntity::getId).collect(Collectors.toList()));
+        Map<UUID, AffiliatedResource>  affiliatedResourceMap = authorizationFlags == null || authorizationFlags.isEmpty() ? null : this.authorizationContentResolver.plansAffiliation(data.stream().map(PlanEntity::getId).collect(Collectors.toList()));
         
         for (PlanEntity d : data) {
             Plan m = new Plan();

backend/core/src/main/java/org/opencdmp/query/ActionConfirmationQuery.java

@@ -259,7 +259,7 @@ public class ActionConfirmationQuery extends QueryBase<ActionConfirmationEntity>
         else if (item.match(ActionConfirmation._expiresAt)) return ActionConfirmationEntity._expiresAt;
         else if (item.prefix(ActionConfirmation._mergeAccountConfirmation)) return ActionConfirmationEntity._data;
         else if (item.prefix(ActionConfirmation._removeCredentialRequest)) return ActionConfirmationEntity._data;
-        else if (item.prefix(ActionConfirmation._dmpInvitation)) return ActionConfirmationEntity._data;
+        else if (item.prefix(ActionConfirmation._planInvitation)) return ActionConfirmationEntity._data;
         else if (item.prefix(ActionConfirmation._createdBy)) return ActionConfirmationEntity._createdById;
         else if (item.match(ActionConfirmation._createdBy)) return ActionConfirmationEntity._createdById;
         else if (item.match(ActionConfirmation._createdAt)) return ActionConfirmationEntity._createdAt;

backend/core/src/main/java/org/opencdmp/service/deposit/DepositServiceImpl.java

@@ -270,7 +270,7 @@ public class DepositServiceImpl implements DepositService {
 
     @Override
     public EntityDoi deposit(DepositRequest planDepositModel) throws Exception {
-        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.dmpAffiliation(planDepositModel.getPlanId())), Permission.DepositPlan);
+        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.planAffiliation(planDepositModel.getPlanId())), Permission.DepositPlan);
         //GK: First get the right client
         DepositClient depositClient = this.getDepositClient(planDepositModel.getRepositoryId());
         if (depositClient == null) throw new MyNotFoundException(this.messageSource.getMessage("General_ItemNotFound", new Object[]{planDepositModel.getRepositoryId(), DepositClient.class.getSimpleName()}, LocaleContextHolder.getLocale()));

backend/core/src/main/java/org/opencdmp/service/description/DescriptionServiceImpl.java

@@ -235,10 +235,10 @@ public class DescriptionServiceImpl implements DescriptionService {
 
         if (!planDescriptionTemplate.getDescriptionTemplateGroupId().equals(descriptionTemplateEntity.getGroupId())) throw new MyValidationException(this.errors.getInvalidDescriptionTemplate().getCode(), this.errors.getInvalidDescriptionTemplate().getMessage());
 
-        PlanEntity dmp = this.entityManager.find(PlanEntity.class, data.getPlanId(), true);
+        PlanEntity plan = this.entityManager.find(PlanEntity.class, data.getPlanId(), true);
-        if (dmp == null) throw new MyNotFoundException(this.messageSource.getMessage("General_ItemNotFound", new Object[]{data.getPlanId(), Plan.class.getSimpleName()}, LocaleContextHolder.getLocale()));
+        if (plan == null) throw new MyNotFoundException(this.messageSource.getMessage("General_ItemNotFound", new Object[]{data.getPlanId(), Plan.class.getSimpleName()}, LocaleContextHolder.getLocale()));
 
-        if (dmp.getStatus().equals(PlanStatus.Finalized) && isUpdate) throw new MyValidationException(this.errors.getDmpIsFinalized().getCode(), this.errors.getDmpIsFinalized().getMessage());
+        if (plan.getStatus().equals(PlanStatus.Finalized) && isUpdate) throw new MyValidationException(this.errors.getDmpIsFinalized().getCode(), this.errors.getDmpIsFinalized().getMessage());
 
         data.setLabel(model.getLabel());
         data.setStatus(model.getStatus());
@@ -334,9 +334,9 @@ public class DescriptionServiceImpl implements DescriptionService {
         if (existingUsers == null || existingUsers.size() <= 1){
             return;
         }
-        for (PlanUserEntity dmpUser : existingUsers) {
+        for (PlanUserEntity planUser : existingUsers) {
-            if (!dmpUser.getUserId().equals(this.userScope.getUserIdSafe())){
+            if (!planUser.getUserId().equals(this.userScope.getUserIdSafe())){
-                UserEntity user = this.queryFactory.query(UserQuery.class).disableTracking().ids(dmpUser.getUserId()).first();
+                UserEntity user = this.queryFactory.query(UserQuery.class).disableTracking().ids(planUser.getUserId()).first();
                 if (user == null || user.getIsActive().equals(IsActive.Inactive)) throw new MyValidationException(this.errors.getDmpInactiveUser().getCode(), this.errors.getDmpInactiveUser().getMessage());
                 this.createDescriptionNotificationEvent(description, user, isUpdate);
             }
@@ -425,7 +425,7 @@ public class DescriptionServiceImpl implements DescriptionService {
 
     @Override
     public Description persistStatus(DescriptionStatusPersist model, FieldSet fields) throws IOException, InvalidApplicationException {
-        logger.debug(new MapLogEntry("persisting data dmp").And("model", model).And("fields", fields));
+        logger.debug(new MapLogEntry("persisting data").And("model", model).And("fields", fields));
 
         this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.descriptionAffiliation(model.getId())), Permission.EditDescription);
 

backend/core/src/main/java/org/opencdmp/service/lock/LockServiceImpl.java

@@ -85,7 +85,7 @@ public class LockServiceImpl implements LockService {
     public Lock persist(LockPersist model, FieldSet fields) throws MyForbiddenException, MyValidationException, MyApplicationException, MyNotFoundException, InvalidApplicationException {
         logger.debug(new MapLogEntry("persisting data").And("model", model).And("fields", fields));
 
-        AffiliatedResource affiliatedResourceDmp = this.authorizationContentResolver.dmpAffiliation(model.getTarget());
+        AffiliatedResource affiliatedResourceDmp = this.authorizationContentResolver.planAffiliation(model.getTarget());
         AffiliatedResource affiliatedResourceDescription = this.authorizationContentResolver.descriptionAffiliation(model.getTarget());
         AffiliatedResource affiliatedResourceDescriptionTemplate = this.authorizationContentResolver.descriptionTemplateAffiliation(model.getTarget());
         this.authorizationService.authorizeAtLeastOneForce(List.of(affiliatedResourceDmp, affiliatedResourceDescription, affiliatedResourceDescriptionTemplate), Permission.EditLock);
@@ -174,7 +174,7 @@ public class LockServiceImpl implements LockService {
     public void deleteAndSave(UUID id, UUID target) throws MyForbiddenException, InvalidApplicationException {
         logger.debug("deleting : {}", id);
 
-        AffiliatedResource affiliatedResourceDmp = this.authorizationContentResolver.dmpAffiliation(target);
+        AffiliatedResource affiliatedResourceDmp = this.authorizationContentResolver.planAffiliation(target);
         AffiliatedResource affiliatedResourceDescription = this.authorizationContentResolver.descriptionAffiliation(target);
         AffiliatedResource affiliatedResourceDescriptionTemplate = this.authorizationContentResolver.descriptionTemplateAffiliation(target);
         this.authorizationService.authorizeAtLeastOneForce(List.of(affiliatedResourceDmp, affiliatedResourceDescription, affiliatedResourceDescriptionTemplate), Permission.DeleteLock);

backend/core/src/main/java/org/opencdmp/service/plan/PlanServiceImpl.java

@@ -229,7 +229,7 @@ public class PlanServiceImpl implements PlanService {
     public Plan persist(PlanPersist model, FieldSet fields) throws MyForbiddenException, MyValidationException, MyApplicationException, MyNotFoundException, InvalidApplicationException, JAXBException, IOException {
         
         Boolean isUpdate = this.conventionService.isValidGuid(model.getId());
-        if (isUpdate) this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.dmpAffiliation(model.getId())), Permission.EditPlan);
+        if (isUpdate) this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.planAffiliation(model.getId())), Permission.EditPlan);
         else this.authorizationService.authorizeForce(Permission.NewPlan);
         
         PlanEntity data = this.patchAndSave(model);
@@ -349,7 +349,7 @@ public class PlanServiceImpl implements PlanService {
     public void deleteAndSave(UUID id) throws MyForbiddenException, InvalidApplicationException, IOException {
         logger.debug("deleting dmp: {}", id);
 
-        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.dmpAffiliation(id)), Permission.DeletePlan);
+        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.planAffiliation(id)), Permission.DeletePlan);
         
         PlanEntity data = this.entityManager.find(PlanEntity.class, id);
         if (data == null) throw new MyNotFoundException(this.messageSource.getMessage("General_ItemNotFound", new Object[]{id, Plan.class.getSimpleName()}, LocaleContextHolder.getLocale()));
@@ -385,7 +385,7 @@ public class PlanServiceImpl implements PlanService {
     @Override
     public Plan createNewVersion(NewVersionPlanPersist model, FieldSet fields) throws MyForbiddenException, MyValidationException, MyApplicationException, MyNotFoundException, InvalidApplicationException, IOException {
         logger.debug(new MapLogEntry("persisting data bew version").And("model", model).And("fields", fields));
-        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.dmpAffiliation( model.getId())), Permission.CreateNewVersionPlan);
+        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.planAffiliation( model.getId())), Permission.CreateNewVersionPlan);
 
         PlanEntity oldPlanEntity = this.entityManager.find(PlanEntity.class, model.getId(), true);
         if (oldPlanEntity == null) throw new MyNotFoundException(this.messageSource.getMessage("General_ItemNotFound", new Object[]{model.getId(), Plan.class.getSimpleName()}, LocaleContextHolder.getLocale()));
@@ -673,7 +673,7 @@ public class PlanServiceImpl implements PlanService {
 
     @Override
     public Plan buildClone(ClonePlanPersist model, FieldSet fields) throws MyForbiddenException, MyValidationException, MyApplicationException, MyNotFoundException, IOException, InvalidApplicationException {
-        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.dmpAffiliation( model.getId())), Permission.ClonePlan);
+        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.planAffiliation( model.getId())), Permission.ClonePlan);
 
         PlanEntity existingPlanEntity = this.queryFactory.query(PlanQuery.class).disableTracking().authorize(AuthorizationFlags.AllExceptPublic).ids(model.getId()).firstAs(fields);
         if (!this.conventionService.isValidGuid(model.getId()) || existingPlanEntity == null)
@@ -769,7 +769,7 @@ public class PlanServiceImpl implements PlanService {
 
     @Override
     public List<PlanUser> assignUsers(UUID planId, List<PlanUserPersist> model, FieldSet fieldSet, boolean disableDelete) throws InvalidApplicationException, IOException {
-        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.dmpAffiliation(planId)), Permission.AssignPlanUsers);
+        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.planAffiliation(planId)), Permission.AssignPlanUsers);
         
         if (!disableDelete && (model == null || model.stream().noneMatch(x-> x.getUser() != null && PlanUserRole.Owner.equals(x.getRole())))) throw new MyApplicationException("At least one owner required");
 
@@ -834,7 +834,7 @@ public class PlanServiceImpl implements PlanService {
 
     @Override
     public Plan removeUser(PlanUserRemovePersist model, FieldSet fields) throws InvalidApplicationException, IOException {
-        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.dmpAffiliation(model.getPlanId())), Permission.AssignPlanUsers);
+        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.planAffiliation(model.getPlanId())), Permission.AssignPlanUsers);
         PlanEntity data = this.entityManager.find(PlanEntity.class, model.getPlanId(), true);
         if (data == null) throw new MyNotFoundException(this.messageSource.getMessage("General_ItemNotFound", new Object[]{model.getId(), Plan.class.getSimpleName()}, LocaleContextHolder.getLocale()));
 
@@ -875,7 +875,7 @@ public class PlanServiceImpl implements PlanService {
             if (data == null) throw new MyNotFoundException(this.messageSource.getMessage("General_ItemNotFound", new Object[]{model.getId(), Plan.class.getSimpleName()}, LocaleContextHolder.getLocale()));
             if (!this.conventionService.hashValue(data.getUpdatedAt()).equals(model.getHash())) throw new MyValidationException(this.errors.getHashConflict().getCode(), this.errors.getHashConflict().getMessage());
             if (model.getStatus() != null && model.getStatus() == PlanStatus.Finalized && data.getStatus() != PlanStatus.Finalized) {
-                this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.dmpAffiliation(model.getId())), Permission.FinalizePlan);
+                this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.planAffiliation(model.getId())), Permission.FinalizePlan);
                 data.setStatus(model.getStatus());
                 data.setFinalizedAt(Instant.now());
             }
@@ -1138,7 +1138,7 @@ public class PlanServiceImpl implements PlanService {
     }
 
     public void finalize(UUID id, List<UUID> descriptionIds) throws MyForbiddenException, MyValidationException, MyApplicationException, MyNotFoundException, InvalidApplicationException, IOException {
-        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.dmpAffiliation(id)), Permission.FinalizePlan);
+        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.planAffiliation(id)), Permission.FinalizePlan);
         PlanEntity dmp = this.queryFactory.query(PlanQuery.class).authorize(AuthorizationFlags.AllExceptPublic).ids(id).isActive(IsActive.Active).first();
 
         if (dmp == null){
@@ -1194,7 +1194,7 @@ public class PlanServiceImpl implements PlanService {
     }
 
     public void undoFinalize(UUID id, FieldSet fields) throws MyForbiddenException, MyValidationException, MyApplicationException, MyNotFoundException, InvalidApplicationException {
-        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.dmpAffiliation(id)), Permission.UndoFinalizePlan);
+        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.planAffiliation(id)), Permission.UndoFinalizePlan);
         PlanEntity dmp = this.queryFactory.query(PlanQuery.class).authorize(AuthorizationFlags.AllExceptPublic).ids(id).isActive(IsActive.Active).firstAs(fields);
 
         if (dmp == null) throw new MyNotFoundException(this.messageSource.getMessage("General_ItemNotFound", new Object[]{id, Plan.class.getSimpleName()}, LocaleContextHolder.getLocale()));
@@ -1432,7 +1432,7 @@ public class PlanServiceImpl implements PlanService {
 
 
     private List<PlanUserPersist>  inviteUserOrAssignUsers(UUID id, List<PlanUserPersist> users, boolean persistUsers) throws InvalidApplicationException, JAXBException, IOException {
-        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.dmpAffiliation(id)), Permission.InvitePlanUsers);
+        this.authorizationService.authorizeAtLeastOneForce(List.of(this.authorizationContentResolver.planAffiliation(id)), Permission.InvitePlanUsers);
 
         PlanEntity dmp = this.queryFactory.query(PlanQuery.class).disableTracking().ids(id).first();
         if (dmp == null){
@@ -1717,10 +1717,10 @@ public class PlanServiceImpl implements PlanService {
 
 
     private List<PlanDescriptionTemplateImportExport> planDescriptionTemplatesToExport(PlanEntity data){
-        List<PlanDescriptionTemplateEntity> dmpDescriptionTemplateEntities = this.queryFactory.query(PlanDescriptionTemplateQuery.class).disableTracking().authorize(AuthorizationFlags.All).planIds(data.getId()).isActive(IsActive.Active).collect();
+        List<PlanDescriptionTemplateEntity> planDescriptionTemplateEntities = this.queryFactory.query(PlanDescriptionTemplateQuery.class).disableTracking().authorize(AuthorizationFlags.All).planIds(data.getId()).isActive(IsActive.Active).collect();
-        if (!this.conventionService.isListNullOrEmpty(dmpDescriptionTemplateEntities)) {
+        if (!this.conventionService.isListNullOrEmpty(planDescriptionTemplateEntities)) {
             List<PlanDescriptionTemplateImportExport> planDescriptionTemplateImportExports = new LinkedList<>();
-            for (PlanDescriptionTemplateEntity descriptionTemplateEntity : dmpDescriptionTemplateEntities) {
+            for (PlanDescriptionTemplateEntity descriptionTemplateEntity : planDescriptionTemplateEntities) {
                 planDescriptionTemplateImportExports.add(this.planDescriptionTemplateToExport(descriptionTemplateEntity));
             }
             return planDescriptionTemplateImportExports;
@@ -2011,11 +2011,11 @@ public class PlanServiceImpl implements PlanService {
             List<UserEntity> users = this.queryFactory.query(UserQuery.class).disableTracking().ids(planXml.getUsers().stream().map(PlanUserImportExport::getId).filter(Objects::nonNull).distinct().toList()).isActive(IsActive.Active).collect();
             List<UUID> userIds = users == null ? new ArrayList<>() : users.stream().map(UserEntity::getId).collect(Collectors.toList());
 
-            List<PlanUserPersist> dmpUsers = new ArrayList<>();
+            List<PlanUserPersist> planUsers = new ArrayList<>();
             for (PlanUserImportExport user : planXml.getUsers()) {
-                dmpUsers.add(this.xmlPlanUserToPersist(user, userIds));
+                planUsers.add(this.xmlPlanUserToPersist(user, userIds));
             }
-            return dmpUsers.stream().filter(Objects::nonNull).collect(Collectors.toList());
+            return planUsers.stream().filter(Objects::nonNull).collect(Collectors.toList());
         }
         return null;
     }
@@ -2074,14 +2074,14 @@ public class PlanServiceImpl implements PlanService {
             default -> throw new MyApplicationException("Unrecognized Type " + model.getAccessType().getValue());
         }
         persist.setLanguage(model.getLanguage());
-        persist.setUsers(this.commonModelToDmpUsersPersist(model));
+        persist.setUsers(this.commonModelToPlanUsersPersist(model));
-        persist.setBlueprint(this.commonModelDmpBlueprintToPersist(model));
+        persist.setBlueprint(this.commonModelPlanBlueprintToPersist(model));
         persist.setDescriptionTemplates(this.commonModelPlanDescriptionTemplatesToPersist(model)); //TODO maybe we should create templates if not exists
-        persist.setProperties(this.commonModelDmpPropertiesToPersist(model));
+        persist.setProperties(this.commonModelPlanPropertiesToPersist(model));
 
         this.validatorFactory.validator(PlanPersist.PlanPersistValidator.class).validateForce(persist);
         Plan plan = this.persist(persist, BaseFieldSet.build(fields, Plan._id, Plan._hash));
-        if (plan == null) throw new MyApplicationException("Error creating dmp");
+        if (plan == null) throw new MyApplicationException("Error creating plan");
 
         if (!this.conventionService.isListNullOrEmpty(model.getDescriptions())){
             for (DescriptionModel description: model.getDescriptions()){
@@ -2116,7 +2116,7 @@ public class PlanServiceImpl implements PlanService {
         return persist;
     }
     
-    private UUID commonModelDmpBlueprintToPersist(DmpModel planXml) throws JAXBException, InvalidApplicationException, ParserConfigurationException, IOException, TransformerException, InstantiationException, IllegalAccessException, SAXException {
+    private UUID commonModelPlanBlueprintToPersist(DmpModel planXml) throws JAXBException, InvalidApplicationException, ParserConfigurationException, IOException, TransformerException, InstantiationException, IllegalAccessException, SAXException {
         if (planXml.getDmpBlueprint() != null){
             PlanBlueprintEntity planBlueprintEntity = this.queryFactory.query(PlanBlueprintQuery.class).disableTracking().ids(planXml.getDmpBlueprint().getId()).first();
             if (planBlueprintEntity == null) planBlueprintEntity = this.queryFactory.query(PlanBlueprintQuery.class).disableTracking().groupIds(planXml.getDmpBlueprint().getGroupId()).versionStatuses(PlanBlueprintVersionStatus.Current).isActive(IsActive.Active).statuses(PlanBlueprintStatus.Finalized).first();
@@ -2130,28 +2130,28 @@ public class PlanServiceImpl implements PlanService {
         return null;
     }
 
-    private PlanPropertiesPersist commonModelDmpPropertiesToPersist(DmpModel commonModel) {
+    private PlanPropertiesPersist commonModelPlanPropertiesToPersist(DmpModel commonModel) {
         if (commonModel == null || commonModel.getProperties() == null) return null;
 
         PlanPropertiesPersist persist = new PlanPropertiesPersist();
-        persist.setContacts(this.commonModelToDmpContactPersist(commonModel.getProperties()));
+        persist.setContacts(this.commonModelToPlanContactPersist(commonModel.getProperties()));
-        persist.setPlanBlueprintValues(this.commonModelToDmpBlueprintValuePersist(commonModel));
+        persist.setPlanBlueprintValues(this.commonModelToPlanBlueprintValuePersist(commonModel));
 
         return persist;
     }  
     
-    private List<PlanContactPersist> commonModelToDmpContactPersist(DmpPropertiesModel commonModel){
+    private List<PlanContactPersist> commonModelToPlanContactPersist(DmpPropertiesModel commonModel){
         if (!this.conventionService.isListNullOrEmpty(commonModel.getContacts())) {
             List<PlanContactPersist> contacts = new ArrayList<>();
             for (DmpContactModel contact : commonModel.getContacts()) {
-                contacts.add(this.commonModelDmpContactToPersist(contact));
+                contacts.add(this.commonModelPlanContactToPersist(contact));
             }
             return contacts;
         }
         return null;
     }
 
-    private Map<UUID, PlanBlueprintValuePersist> commonModelToDmpBlueprintValuePersist(DmpModel commonModel){
+    private Map<UUID, PlanBlueprintValuePersist> commonModelToPlanBlueprintValuePersist(DmpModel commonModel){
         if (commonModel.getDmpBlueprint() != null && commonModel.getDmpBlueprint().getDefinition() != null && !this.conventionService.isListNullOrEmpty(commonModel.getDmpBlueprint().getDefinition().getSections())) {
             Map<UUID, PlanBlueprintValuePersist> dmpBlueprintValues = new HashMap<>();
             List<SectionModel> sections = commonModel.getDmpBlueprint().getDefinition().getSections();
@@ -2164,14 +2164,14 @@ public class PlanServiceImpl implements PlanService {
                                 ReferenceTypeFieldModel referenceField = (ReferenceTypeFieldModel) field;
                                 List<DmpReferenceModel> dmpReferencesByField = commonModel.getReferences().stream().filter(x -> x.getData() != null && x.getData().getBlueprintFieldId().equals(referenceField.getId())).collect(Collectors.toList());
                                 if (!this.conventionService.isListNullOrEmpty(dmpReferencesByField)){
-                                    dmpBlueprintValues.put(referenceField.getId(), this.commonModelDmpReferenceFieldToDmpBlueprintValuePersist(referenceField, dmpReferencesByField));
+                                    dmpBlueprintValues.put(referenceField.getId(), this.commonModelPlanReferenceFieldToPlanBlueprintValuePersist(referenceField, dmpReferencesByField));
                                 }
                             } else {
                                 // custom fields
                                 if (field.getCategory().equals(org.opencdmp.commonmodels.enums.DmpBlueprintFieldCategory.Extra) && commonModel.getProperties() != null && !this.conventionService.isListNullOrEmpty(commonModel.getProperties().getDmpBlueprintValues())){
                                     DmpBlueprintValueModel dmpBlueprintValueModel = commonModel.getProperties().getDmpBlueprintValues().stream().filter(x -> x.getFieldId().equals(field.getId())).findFirst().orElse(null);
                                     ExtraFieldModel extraFieldModel = (ExtraFieldModel) field;
-                                    if (dmpBlueprintValueModel != null) dmpBlueprintValues.put(dmpBlueprintValueModel.getFieldId(), this.commonModelDmpBlueprintValueToPersist(dmpBlueprintValueModel, extraFieldModel));
+                                    if (dmpBlueprintValueModel != null) dmpBlueprintValues.put(dmpBlueprintValueModel.getFieldId(), this.commonModelPlanBlueprintValueToPersist(dmpBlueprintValueModel, extraFieldModel));
                                 }
                             }
                         }
@@ -2183,8 +2183,8 @@ public class PlanServiceImpl implements PlanService {
         return null;
     }
     
-    private PlanBlueprintValuePersist commonModelDmpReferenceFieldToDmpBlueprintValuePersist(ReferenceTypeFieldModel model, List<DmpReferenceModel> dmpReferences) {
+    private PlanBlueprintValuePersist commonModelPlanReferenceFieldToPlanBlueprintValuePersist(ReferenceTypeFieldModel model, List<DmpReferenceModel> planReferences) {
-        if (model == null || this.conventionService.isListNullOrEmpty(dmpReferences) || model.getReferenceType() == null)
+        if (model == null || this.conventionService.isListNullOrEmpty(planReferences) || model.getReferenceType() == null)
             return null;
 
         ReferenceTypeEntity referenceTypeEntity = this.queryFactory.query(ReferenceTypeQuery.class).ids(model.getReferenceType().getId()).first();//TODO: optimize
@@ -2196,18 +2196,18 @@ public class PlanServiceImpl implements PlanService {
         persist.setFieldId(model.getId());
         if (model.getMultipleSelect()){
             List<ReferencePersist> references = new ArrayList<>();
-            for (DmpReferenceModel dmpReference : dmpReferences) {
+            for (DmpReferenceModel planReference : planReferences) {
-                references.add(this.commonDmpReferenceToReferencePersist(dmpReference.getReference(), referenceTypeEntity));
+                references.add(this.commonPlanReferenceToReferencePersist(planReference.getReference(), referenceTypeEntity));
             }
             persist.setReferences(references);
         } else {
-            persist.setReference(this.commonDmpReferenceToReferencePersist(dmpReferences.getFirst().getReference(), referenceTypeEntity));
+            persist.setReference(this.commonPlanReferenceToReferencePersist(planReferences.getFirst().getReference(), referenceTypeEntity));
         }
 
         return persist;
     }
 
-    private ReferencePersist commonDmpReferenceToReferencePersist(ReferenceModel model, ReferenceTypeEntity referenceTypeEntity) {
+    private ReferencePersist commonPlanReferenceToReferencePersist(ReferenceModel model, ReferenceTypeEntity referenceTypeEntity) {
         if (!referenceTypeEntity.getCode().equals(model.getType().getCode())) throw new MyApplicationException("Invalid reference for field " + model.getId());
 
         if (this.conventionService.isNullOrEmpty(model.getLabel()) && this.conventionService.isNullOrEmpty(model.getReference())) throw new MyApplicationException("Dmp Reference without label and reference id ");
@@ -2239,7 +2239,7 @@ public class PlanServiceImpl implements PlanService {
         return persist;
     }
 
-    private PlanBlueprintValuePersist commonModelDmpBlueprintValueToPersist(DmpBlueprintValueModel commonModel, ExtraFieldModel extraFieldModel) {
+    private PlanBlueprintValuePersist commonModelPlanBlueprintValueToPersist(DmpBlueprintValueModel commonModel, ExtraFieldModel extraFieldModel) {
         if (commonModel == null || extraFieldModel == null)
             return null;
         PlanBlueprintValuePersist persist = new PlanBlueprintValuePersist();
@@ -2255,14 +2255,14 @@ public class PlanServiceImpl implements PlanService {
         return persist;
     }
 
-    private List<PlanUserPersist> commonModelToDmpUsersPersist(DmpModel commonModel){
+    private List<PlanUserPersist> commonModelToPlanUsersPersist(DmpModel commonModel){
         if (!this.conventionService.isListNullOrEmpty(commonModel.getUsers())) {
             List<UserEntity> users = this.queryFactory.query(UserQuery.class).disableTracking().ids(commonModel.getUsers().stream().map(DmpUserModel::getUser).filter(Objects::nonNull).map(UserModel::getId).filter(Objects::nonNull).distinct().toList()).isActive(IsActive.Active).collect();
             List<UUID> userIds = users == null ? new ArrayList<>() : users.stream().map(UserEntity::getId).collect(Collectors.toList());
 
             List<PlanUserPersist> dmpUsers = new ArrayList<>();
             for (DmpUserModel user : commonModel.getUsers()) {
-                dmpUsers.add(this.commonModelDmpUserToPersist(user, userIds));
+                dmpUsers.add(this.commonModelPlanUserToPersist(user, userIds));
             }
             return dmpUsers;
         }
@@ -2270,7 +2270,7 @@ public class PlanServiceImpl implements PlanService {
     }
 
 
-    private PlanUserPersist commonModelDmpUserToPersist(DmpUserModel commonModel, List<UUID> userIds) {
+    private PlanUserPersist commonModelPlanUserToPersist(DmpUserModel commonModel, List<UUID> userIds) {
         if (commonModel == null)
             return null;
 
@@ -2293,7 +2293,7 @@ public class PlanServiceImpl implements PlanService {
         return null;
     }
 
-    private PlanContactPersist commonModelDmpContactToPersist(DmpContactModel commonModel) {
+    private PlanContactPersist commonModelPlanContactToPersist(DmpContactModel commonModel) {
         if (commonModel == null)
             return null;
 

backend/web/src/main/java/org/opencdmp/controllers/LockController.java

@@ -172,7 +172,7 @@ public class LockController {
     @Transactional
     @GetMapping("target/lock/{id}/{targetType}")
     public boolean lock(@PathVariable("id") UUID targetId, @PathVariable("targetType") int targetType) throws Exception {
-        AffiliatedResource affiliatedResourceDmp = this.authorizationContentResolver.dmpAffiliation(targetId);
+        AffiliatedResource affiliatedResourceDmp = this.authorizationContentResolver.planAffiliation(targetId);
         AffiliatedResource affiliatedResourceDescription = this.authorizationContentResolver.descriptionAffiliation(targetId);
         AffiliatedResource affiliatedResourceDescriptionTemplate = this.authorizationContentResolver.descriptionTemplateAffiliation(targetId);
         this.authService.authorizeAtLeastOneForce(List.of(affiliatedResourceDmp, affiliatedResourceDescription, affiliatedResourceDescriptionTemplate), Permission.EditLock);
@@ -188,7 +188,7 @@ public class LockController {
     @Transactional
     @GetMapping("target/touch/{id}")
     public boolean touch(@PathVariable("id") UUID targetId) throws Exception {
-        AffiliatedResource affiliatedResourceDmp = this.authorizationContentResolver.dmpAffiliation(targetId);
+        AffiliatedResource affiliatedResourceDmp = this.authorizationContentResolver.planAffiliation(targetId);
         AffiliatedResource affiliatedResourceDescription = this.authorizationContentResolver.descriptionAffiliation(targetId);
         AffiliatedResource affiliatedResourceDescriptionTemplate = this.authorizationContentResolver.descriptionTemplateAffiliation(targetId);
         this.authService.authorizeAtLeastOneForce(List.of(affiliatedResourceDmp, affiliatedResourceDescription, affiliatedResourceDescriptionTemplate), Permission.EditLock);
@@ -203,7 +203,7 @@ public class LockController {
     @Transactional
     @DeleteMapping("target/unlock/{id}")
     public boolean unlock(@PathVariable("id") UUID targetId) throws Exception {
-        AffiliatedResource affiliatedResourceDmp = this.authorizationContentResolver.dmpAffiliation(targetId);
+        AffiliatedResource affiliatedResourceDmp = this.authorizationContentResolver.planAffiliation(targetId);
         AffiliatedResource affiliatedResourceDescription = this.authorizationContentResolver.descriptionAffiliation(targetId);
         AffiliatedResource affiliatedResourceDescriptionTemplate = this.authorizationContentResolver.descriptionTemplateAffiliation(targetId);
         this.authService.authorizeAtLeastOneForce(List.of(affiliatedResourceDmp, affiliatedResourceDescription, affiliatedResourceDescriptionTemplate), Permission.EditLock);

dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts

@@ -146,7 +146,7 @@ export class EnumUtils {
 			case DescriptionTemplateFieldType.SELECT: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-TYPE.SELECT');
 			case DescriptionTemplateFieldType.BOOLEAN_DECISION: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-TYPE.BOOLEAN-DECISION');
 			case DescriptionTemplateFieldType.RADIO_BOX: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-TYPE.RADIO-BOX');
-			case DescriptionTemplateFieldType.INTERNAL_ENTRIES_DMPS: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-TYPE.INTERNAL-PLAN-ENTITIES-DMPS');
+			case DescriptionTemplateFieldType.INTERNAL_ENTRIES_DMPS: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-TYPE.INTERNAL-PLAN-ENTITIES-PLANS');
 			case DescriptionTemplateFieldType.INTERNAL_ENTRIES_DESCRIPTIONS: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-TYPE.INTERNAL-PLAN-ENTITIES-DESCRIPTIONS');
 			case DescriptionTemplateFieldType.CHECK_BOX: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-TYPE.CHECKBOX');
 			case DescriptionTemplateFieldType.FREE_TEXT: return this.language.instant('TYPES.DESCRIPTION-TEMPLATE-FIELD-TYPE.FREE-TEXT');

dmp-frontend/src/app/ui/dashboard/dashboard.component.ts

@@ -206,7 +206,7 @@ export class DashboardComponent extends BaseComponent implements OnInit {
 	}
 
 	public setDashboardImportFileText(): void {
-		const importFileText = this.language.instant('DASHBOARD.TOUR-GUIDE.IMPORT-DMP');
+		const importFileText = this.language.instant('DASHBOARD.TOUR-GUIDE.IMPORT-PLAN');
 		this.dashboardTour.steps[1].title = importFileText;
 	}
 

dmp-frontend/src/app/ui/plan/overview/plan-overview.component.ts

@@ -148,7 +148,7 @@ export class PlanOverviewComponent extends BaseComponent implements OnInit {
 							this.checkLockStatus(this.dmp.id);
 							// this.setIsUserOwner();
 							// const breadCrumbs = [];
-							// breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.MY-DMPS'), url: "/plans" });
+							// breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.MY-PLANS'), url: "/plans" });
 							// breadCrumbs.push({ parentComponentName: 'PlanListingComponent', label: this.dmp.label, url: '/plans/overview/' + this.dmp.id });
 							// this.breadCrumbs = observableOf(breadCrumbs);
 						}, (error: any) => {

dmp-frontend/src/app/ui/sidebar/sidebar.component.ts

@@ -86,7 +86,7 @@ export class SidebarComponent implements OnInit {
 			routes: [],
 		}
 
-		if (this.authentication.hasPermission(AppPermission.ViewMyPlanPage)) this.dmpItems.routes.push({ path: '/plans', title: 'SIDE-BAR.MY-DMPS', icon: 'library_books', routeType: RouteType.System });
+		if (this.authentication.hasPermission(AppPermission.ViewMyPlanPage)) this.dmpItems.routes.push({ path: '/plans', title: 'SIDE-BAR.MY-PLANS', icon: 'library_books', routeType: RouteType.System });
 		if (this.authentication.hasPermission(AppPermission.ViewMyDescriptionPage)) this.dmpItems.routes.push({ path: '/descriptions', title: 'SIDE-BAR.MY-DESCRIPTIONS', icon: 'dns', routeType: RouteType.System });
 		this.groupMenuItems.push(this.dmpItems);
 
@@ -95,7 +95,7 @@ export class SidebarComponent implements OnInit {
 			routes: [],
 		}
 
-		if (this.authentication.hasPermission(AppPermission.ViewPublicDmpPage)) this.descriptionItems.routes.push({ path: '/explore-plans', title: 'SIDE-BAR.PUBLIC-DMPS', icon: 'library_books', routeType: RouteType.System });
+		if (this.authentication.hasPermission(AppPermission.ViewPublicDmpPage)) this.descriptionItems.routes.push({ path: '/explore-plans', title: 'SIDE-BAR.PUBLIC-PLANS', icon: 'library_books', routeType: RouteType.System });
 		if (this.authentication.hasPermission(AppPermission.ViewPublicDescriptionPage)) this.descriptionItems.routes.push({ path: '/explore-descriptions', title: 'SIDE-BAR.PUBLIC-DESC', icon: 'dns', routeType: RouteType.System });
 		this.groupMenuItems.push(this.descriptionItems);
 
@@ -104,7 +104,7 @@ export class SidebarComponent implements OnInit {
 			routes: [],
 		}
 		if (!this.isAuthenticated()) {
-			this.publicItems.routes.push({ path: '/explore-plans', title: 'SIDE-BAR.PUBLIC-DMPS', icon: 'library_books', routeType: RouteType.System });
+			this.publicItems.routes.push({ path: '/explore-plans', title: 'SIDE-BAR.PUBLIC-PLANS', icon: 'library_books', routeType: RouteType.System });
 			this.publicItems.routes.push({ path: '/explore-descriptions', title: 'SIDE-BAR.PUBLIC-DESC', icon: 'dns', routeType: RouteType.System });
 		}
 		this.groupMenuItems.push(this.publicItems);

dmp-frontend/src/assets/i18n/baq.json

@@ -113,7 +113,7 @@
 			}
 		},
 		"PLAN-TO-DESCRIPTION-DIALOG": {
-			"FROM-DMP": "Modu egokian sortu da zure",
+			"FROM-PLAN": "Modu egokian sortu da zure",
 			"PLAN": "DKPa",
 			"TO-DESCRIPTION": "Hona transferituko zaizu",
 			"DATASET": "Datu-multzoa",
@@ -286,11 +286,11 @@
 		"GENERAL": "OROKORRA",
 		"DASHBOARD": "Aginte-panela",
 		"PLAN": "DATUAK KUDEATZEKO PLANAK",
-		"MY-DMPS": "Nire DPKak",
+		"MY-PLANS": "Nire DPKak",
 		"DESCRIPTIONS": "DATU-MULTZOAK",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "ARGITARATUTA",
-		"PUBLIC-DMPS": "DKP Publikoak",
+		"PUBLIC-PLANS": "DKP Publikoak",
 		"PUBLIC-DESC": "Datu-multzo Publikoak Desk.",
 		"ADMIN": "ADMIN",
 		"DESCRIPTION-TEMPLATES": "Description Templates",
@@ -920,7 +920,7 @@
 		"TITLE-ADD-DESCRIPTION": "Adding Description",
 		"TITLE-EDIT-DESCRIPTION": "Editing Description",
 		"TITLE-PREVIEW-DESCRIPTION": "Previewing Description",
-		"TO-DMP": "Previewing Description",
+		"TO-PLAN": "Previewing Description",
 		"UNSAVED-CHANGES": "(unsaved changes)",
 		"PLAN": "Plan",
 		"TOC": {
@@ -1885,7 +1885,7 @@
 			"SELECT": "Select",
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
-			"INTERNAL-PLAN-ENTITIES-DMPS": "Internal Plans",
+			"INTERNAL-PLAN-ENTITIES-PLANS": "Internal Plans",
 			"INTERNAL-PLAN-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
@@ -2119,7 +2119,7 @@
 		"INFO-TEXT": "{{ APP_NAME_CAPS }} zerbitzu irekia eta hedagarria da, Datuak Kudeatzeko Planen kudeaketa, baliozkotzea, monitorizazioa eta mantenketa sinplifikatzen dituena. Eragileei (ikertzaileak, kudeatzaileak, ikuskatzaileak, etab.) prozesagarriak diren DKPak sortzeko aukera ematen die, azpiegitura desberdinen artean libreki truka daitezkeenak, datuen kudeaketa prozesuko alderdi espezifikoak gauzatzeko, datuen jabeen asmoen eta konpromisoaren arabera.",
 		"INFO-PLAN-TEXT": "Datuak Kudeatzeko Plana (DKP) dokumentu bizia da eta ikerketa baten bizialdian zehar eta ondoren sortzen edota berrerabiltzen diren datu-multzoak deskribatzen ditu. DKPen xedea da, ikertzaileei funtsezko informazioa ematea beraien ikerketa emaitzak berrekoiztu, birbanatu eta berrerabiltzeko, horrela, haien baliozkotasuna eta ustiapena bermatuz.",
 		"NEW-QUESTION": "Berria zara DKPekin? Bisitatu",
-		"START-YOUR-FIRST-DMP": "Hasi zure lehen DKP",
+		"START-YOUR-FIRST-PLAN": "Hasi zure lehen DKP",
 		"OPEN-AIR-GUIDE": "OpenAIRE’ren Ikertzaileentzako Gida",
 		"LEARN-MORE": "bat sortzeko moduari buruz gehiago jakiteko!",
 		"PLANS": "DKPak",
@@ -2127,7 +2127,7 @@
 		"PUBLIC-USAGE": "Erabilera publikoa",
 		"DESCRIPTIONS": "Descriptions",
 		"DESCRIPTIONS-DASHBOARD-TEXT": "Datu-multzoak",
-		"PUBLIC-DMPS": "DKP Publikoak",
+		"PUBLIC-PLANS": "DKP Publikoak",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Erlazionatutako Erakundeak",
 		"DRAFTS": "Zirriborroak",
@@ -2143,7 +2143,7 @@
 		"TOUR-GUIDE": {
 			"PLAN": "Hau da zure aginte-panela. Parte hartu duzun edo zuk zeuk sortutako DKP guztiak ikusi eta editatu ditzakezu.",
 			"START-NEW": "Sortu zure DKPa Hasi DKP berria aukerarekin.",
-			"IMPORT-DMP": "DKP bat inportatu dezakezu",
+			"IMPORT-PLAN": "DKP bat inportatu dezakezu",
 			"START-WIZARD": "edo berri bat sortu hemen {{ APP_NAME }}.",
 			"DESCRIPTION": "This is your dashboard. You can view and edit all Descriptions that you have either contributed to or created yourself.",
 			"NEW-DESCRIPTION": "With Add Description you can describe new items anytime in the research process.",
@@ -2242,7 +2242,7 @@
 		"FINALISE-TITLE": "Datu-multzoen zirriborro hauetakoren bat amaitu bahi duzu?",
 		"VALIDATION": {
 			"AT-LEAST-ONE-DESCRPIPTION-FINALISED": "You need to have at least one Description Finalized",
-			"INVALID-DMP": "This Plan can not be finalized "
+			"INVALID-PLAN": "This Plan can not be finalized "
 		},
 		"IMPACT": "Ekintza honek zure DKPa amaitutzat emango du eta ezingo duzu berriro editatu.",
 		"PUBLIC-PLAN-MESSAGE": "After finalizing your Plan, it'll be published and be publicly available to the {{ APP_NAME_CAPS }} tool.",

dmp-frontend/src/assets/i18n/de.json

@@ -113,7 +113,7 @@
 			}
 		},
 		"PLAN-TO-DESCRIPTION-DIALOG": {
-			"FROM-DMP": "You have successfully created your",
+			"FROM-PLAN": "You have successfully created your",
 			"PLAN": "PLAN",
 			"TO-DESCRIPTION": "You will be transferred to the",
 			"DATASET": "Dataset",
@@ -286,11 +286,11 @@
 		"GENERAL": "ALLGEMEINES",
 		"DASHBOARD": "Startseite",
 		"PLAN": "DATENMANAGEMENTPLÄNE",
-		"MY-DMPS": "Meine DMPs",
+		"MY-PLANS": "Meine DMPs",
 		"DESCRIPTIONS": "DATENSATZBESCHREIBUNG",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "VERÖFFENTLICHT",
-		"PUBLIC-DMPS": "Veröffentlichte DMPs",
+		"PUBLIC-PLANS": "Veröffentlichte DMPs",
 		"PUBLIC-DESC": "Public Descriptions",
 		"ADMIN": "ADMINISTRATOR",
 		"DESCRIPTION-TEMPLATES": "Description Templates",
@@ -920,7 +920,7 @@
 		"TITLE-ADD-DESCRIPTION": "Adding Description",
 		"TITLE-EDIT-DESCRIPTION": "Editing Description",
 		"TITLE-PREVIEW-DESCRIPTION": "Previewing Description",
-		"TO-DMP": "Previewing Description",
+		"TO-PLAN": "Previewing Description",
 		"UNSAVED-CHANGES": "(unsaved changes)",
 		"PLAN": "Plan",
 		"TOC": {
@@ -1885,7 +1885,7 @@
 			"SELECT": "Select",
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
-			"INTERNAL-PLAN-ENTITIES-DMPS": "Internal Plans",
+			"INTERNAL-PLAN-ENTITIES-PLANS": "Internal Plans",
 			"INTERNAL-PLAN-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
@@ -2119,7 +2119,7 @@
 		"INFO-TEXT": "{{ APP_NAME_CAPS }} ist ein offener, erweiterbarer Dienst, der die Verwaltung, Validierung, Überwachung und Aktualisierung von Datenmanagementplänen vereinfacht. Er ermöglicht es Akteuren (Forschern, Managern, Betreuern usw.), praktisch umsetzbare DMPs zu erstellen, die uneingeschränkt zwischen Infrastruktursystemen ausgetauscht werden können, um bestimmte Aspekte des Datenmanagementprozesses in Übereinstimmung mit den Absichten und dem Engagement der Dateneigentümer durchzuführen.",
 		"INFO-PLAN-TEXT": "A Data Management Plan (DMP) is a living document describing the datasets that are generated and/ or re-used during and after a research lifetime. DMPs aim to provide researchers with essential information to re-produce, re-distribute and re-purpose research results thus assuring for their validity and exploitation.",
 		"NEW-QUESTION": "New with DMPs? Visit",
-		"START-YOUR-FIRST-DMP": "Start your first DMP",
+		"START-YOUR-FIRST-PLAN": "Start your first DMP",
 		"OPEN-AIR-GUIDE": "OpenAIRE’s Guide for Researchers",
 		"LEARN-MORE": "to learn more about how to create one!",
 		"PLANS": "DMPs",
@@ -2127,7 +2127,7 @@
 		"PUBLIC-USAGE": "Public Usage",
 		"DESCRIPTIONS": "Descriptions",
 		"DESCRIPTIONS-DASHBOARD-TEXT": "Datasets",
-		"PUBLIC-DMPS": "Public DMPs",
+		"PUBLIC-PLANS": "Public DMPs",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Related Organisations",
 		"DRAFTS": "Drafts",
@@ -2143,7 +2143,7 @@
 		"TOUR-GUIDE": {
 			"PLAN": "This is your dashboard. You can view and edit all DMPs that you have either contributed to or created yourself.",
 			"START-NEW": "Create your DMP with Start new DMP.",
-			"IMPORT-DMP": "You can import a DMP",
+			"IMPORT-PLAN": "You can import a DMP",
 			"START-WIZARD": "or create new in {{ APP_NAME }}.",
 			"DESCRIPTION": "This is your dashboard. You can view and edit all Descriptions that you have either contributed to or created yourself.",
 			"NEW-DESCRIPTION": "With Add Description you can describe new items anytime in the research process.",
@@ -2242,7 +2242,7 @@
 		"FINALISE-TITLE": "Möchten Sie einen der folgenden Entwürfe für Datensatzbeschreibungen fertigstellen?",
 		"VALIDATION": {
 			"AT-LEAST-ONE-DESCRPIPTION-FINALISED": "You need to have at least one Description Finalized",
-			"INVALID-DMP": "This Plan can not be finalized "
+			"INVALID-PLAN": "This Plan can not be finalized "
 		},
 		"IMPACT": "Mit dieser Aktion wird Ihr DMP fertiggestellt und Sie werden ihn nicht erneut bearbeiten können.",
 		"PUBLIC-PLAN-MESSAGE": "After finalizing your Plan, it'll be published and be publicly available to the {{ APP_NAME_CAPS }} tool.",

dmp-frontend/src/assets/i18n/en.json

@@ -113,7 +113,7 @@
 			}
 		},
 		"PLAN-TO-DESCRIPTION-DIALOG": {
-			"FROM-DMP": "You have successfully created your",
+			"FROM-PLAN": "You have successfully created your",
 			"PLAN": "Plan",
 			"TO-DESCRIPTION": "You will be transferred to the",
 			"DESCRIPTION": "Description",
@@ -286,11 +286,11 @@
 		"GENERAL": "GENERAL",
 		"DASHBOARD": "Home",
 		"PLAN": "PLANS",
-		"MY-DMPS": "My Plans",
+		"MY-PLANS": "My Plans",
 		"DESCRIPTIONS": "DESCRIPTIONS",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "PUBLISHED",
-		"PUBLIC-DMPS": "Public Plans",
+		"PUBLIC-PLANS": "Public Plans",
 		"PUBLIC-DESC": "Public Descriptions",
 		"ADMIN": "ADMIN",
 		"DESCRIPTION-TEMPLATES": "Description Templates",
@@ -920,7 +920,7 @@
 		"TITLE-ADD-DESCRIPTION": "Adding Description",
 		"TITLE-EDIT-DESCRIPTION": "Editing Description",
 		"TITLE-PREVIEW-DESCRIPTION": "Previewing Description",
-		"TO-DMP": "Previewing Description",
+		"TO-PLAN": "Previewing Description",
 		"UNSAVED-CHANGES": "(unsaved changes)",
 		"PLAN": "Plan",
 		"TOC": {
@@ -1885,7 +1885,7 @@
 			"SELECT": "Select",
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
-			"INTERNAL-PLAN-ENTITIES-DMPS": "Internal Plans",
+			"INTERNAL-PLAN-ENTITIES-PLANS": "Internal Plans",
 			"INTERNAL-PLAN-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
@@ -2119,7 +2119,7 @@
 		"INFO-TEXT": "{{ APP_NAME_CAPS }} is an open extensible service that simplifies the management, validation, monitoring and maintenance and of Plans. It allows actors (researchers, managers, supervisors etc) to create actionable Plans that may be freely exchanged among infrastructures for carrying out specific aspects of the Data management process in accordance with the intentions and commitment of Data owners.",
 		"INFO-PLAN-TEXT": "A Plan (DMP) is a living document describing the items that are generated and/ or re-used during and after a research lifetime. Plans aim to provide researchers with essential information to re-produce, re-distribute and re-purpose research results thus assuring for their validity and exploitation.",
 		"NEW-QUESTION": "New with Plans? Visit",
-		"START-YOUR-FIRST-DMP": "Start your first Plan",
+		"START-YOUR-FIRST-PLAN": "Start your first Plan",
 		"OPEN-AIR-GUIDE": "OpenAIRE’s Guide for Researchers",
 		"LEARN-MORE": "to learn more about how to create one!",
 		"PLANS": "Plans",
@@ -2127,7 +2127,7 @@
 		"PUBLIC-USAGE": "Public Usage",
 		"DESCRIPTIONS": "Descriptions",
 		"DESCRIPTIONS-DASHBOARD-TEXT": "Descriptions",
-		"PUBLIC-DMPS": "Public Plans",
+		"PUBLIC-PLANS": "Public Plans",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Related Organizations",
 		"DRAFTS": "Drafts",
@@ -2143,7 +2143,7 @@
 		"TOUR-GUIDE": {
 			"PLAN": "This is your dashboard. You can view and edit all Plans that you have either contributed to or created yourself.",
 			"START-NEW": "Create your Plan with Start new Plan.",
-			"IMPORT-DMP": "You can import a Plan",
+			"IMPORT-PLAN": "You can import a Plan",
 			"START-WIZARD": "or create new in {{ APP_NAME }}.",
 			"DESCRIPTION": "This is your dashboard. You can view and edit all Descriptions that you have either contributed to or created yourself.",
 			"NEW-DESCRIPTION": "With Add Description you can describe new items anytime in the research process.",
@@ -2242,7 +2242,7 @@
 		"FINALISE-TITLE": "Do you want to finalize any of the following Draft Descriptions?",
 		"VALIDATION": {
 			"AT-LEAST-ONE-DESCRPIPTION-FINALISED": "You need to have at least one Description Finalized",
-			"INVALID-DMP": "This Plan can not be finalized "
+			"INVALID-PLAN": "This Plan can not be finalized "
 		},
 		"IMPACT": "This action will finalize your Plan, and you won't be able to edit it again.",
 		"PUBLIC-PLAN-MESSAGE": "After finalizing your Plan, it'll be published and be publicly available to the {{ APP_NAME_CAPS }} tool.",

dmp-frontend/src/assets/i18n/es.json

@@ -113,7 +113,7 @@
 			}
 		},
 		"PLAN-TO-DESCRIPTION-DIALOG": {
-			"FROM-DMP": "Ha creado correctamente su",
+			"FROM-PLAN": "Ha creado correctamente su",
 			"PLAN": "PGD",
 			"TO-DESCRIPTION": "Será transferido al",
 			"DATASET": "Dataset",
@@ -286,11 +286,11 @@
 		"GENERAL": "GENERAL",
 		"DASHBOARD": "Inicio",
 		"PLAN": "PLAN DE GESTIÓN DE DATOS",
-		"MY-DMPS": "Mis PGDs",
+		"MY-PLANS": "Mis PGDs",
 		"DESCRIPTIONS": "DESCRIPCIONES DEL DATASET",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "PUBLICADO",
-		"PUBLIC-DMPS": "PGDs publicado",
+		"PUBLIC-PLANS": "PGDs publicado",
 		"PUBLIC-DESC": "Public Descriptions",
 		"ADMIN": "ADMINISTRADOR",
 		"DESCRIPTION-TEMPLATES": "Description Templates",
@@ -920,7 +920,7 @@
 		"TITLE-ADD-DESCRIPTION": "Adding Description",
 		"TITLE-EDIT-DESCRIPTION": "Editing Description",
 		"TITLE-PREVIEW-DESCRIPTION": "Previewing Description",
-		"TO-DMP": "Previewing Description",
+		"TO-PLAN": "Previewing Description",
 		"UNSAVED-CHANGES": "(unsaved changes)",
 		"PLAN": "Plan",
 		"TOC": {
@@ -1885,7 +1885,7 @@
 			"SELECT": "Select",
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
-			"INTERNAL-PLAN-ENTITIES-DMPS": "Internal Plans",
+			"INTERNAL-PLAN-ENTITIES-PLANS": "Internal Plans",
 			"INTERNAL-PLAN-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
@@ -2119,7 +2119,7 @@
 		"INFO-TEXT": "{{ APP_NAME_CAPS }} es un servicio extensible y abierto que simplifica la gestión, validación, monitorización y mantenimiento de los Plan de Gestión de Datos. Permite a los participantes (investigadores, gestores, supervisores, etc) crear un PGDs visible que puede ser compartido libremente entre distintas infraestructuras para llevar a cabo aspectos específicos del proceso de Gestión de Datos de acuerdo con los propósitos y el compromiso de los propietarios de los datos.",
 		"INFO-PLAN-TEXT": "Un plan de gestión de datos (PGD) es un documento vivo que describe los datasets generados y/o reutilizados durante y tras la finalización de la investigación. Los PGDs se crean para proveer a los investigadores de la información escencial para reproducir, redistribuir y reutilizar con nuevos propósitos los resultados de la investigación, de forma que se asegure su validez y explotación",
 		"NEW-QUESTION": "¿Nuevo con los PGDs? Visite",
-		"START-YOUR-FIRST-DMP": "Iniciar su primer PGD",
+		"START-YOUR-FIRST-PLAN": "Iniciar su primer PGD",
 		"OPEN-AIR-GUIDE": "Guida de OpenAIRE para investigadores",
 		"LEARN-MORE": "¡para saber más sobre como crear uno!",
 		"PLANS": "PGDs",
@@ -2127,7 +2127,7 @@
 		"PUBLIC-USAGE": "Public Usage",
 		"DESCRIPTIONS": "Descriptions",
 		"DESCRIPTIONS-DASHBOARD-TEXT": "Descripciones de los datasets",
-		"PUBLIC-DMPS": "PGDs públicos",
+		"PUBLIC-PLANS": "PGDs públicos",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Organizaciones relacionadas",
 		"DRAFTS": "Borradores",
@@ -2143,7 +2143,7 @@
 		"TOUR-GUIDE": {
 			"PLAN": "Esta es su consola, puede ver y editar todos los PGD en los que ha participado o creado.",
 			"START-NEW": "Cree su PGD con la opción Iniciar nuevo PGD.",
-			"IMPORT-DMP": "Puede importar un PGD",
+			"IMPORT-PLAN": "Puede importar un PGD",
 			"START-WIZARD": "o crear uno nuevo en {{ APP_NAME }}.",
 			"DESCRIPTION": "This is your dashboard. You can view and edit all Descriptions that you have either contributed to or created yourself.",
 			"NEW-DESCRIPTION": "With Add Description you can describe new items anytime in the research process.",
@@ -2242,7 +2242,7 @@
 		"FINALISE-TITLE": "¿Quiere finalizar alguno de los siguiente borradores de descripción de dataset?",
 		"VALIDATION": {
 			"AT-LEAST-ONE-DESCRPIPTION-FINALISED": "You need to have at least one Description Finalized",
-			"INVALID-DMP": "This Plan can not be finalized "
+			"INVALID-PLAN": "This Plan can not be finalized "
 		},
 		"IMPACT": "Esta acción finaliza su PGD, y no podrá editarla otra vez. ",
 		"PUBLIC-PLAN-MESSAGE": "After finalizing your Plan, it'll be published and be publicly available to the {{ APP_NAME_CAPS }} tool.",

dmp-frontend/src/assets/i18n/gr.json

@@ -113,7 +113,7 @@
 			}
 		},
 		"PLAN-TO-DESCRIPTION-DIALOG": {
-			"FROM-DMP": "Δημιουργήσατε με επιτυχία το Σχέδιο Διαχείρισης Δεδομένων σας",
+			"FROM-PLAN": "Δημιουργήσατε με επιτυχία το Σχέδιο Διαχείρισης Δεδομένων σας",
 			"PLAN": "Σχέδιο Διαχείρισης Δεδομένων",
 			"TO-DESCRIPTION": "Θα μεταφερθείτε στο",
 			"DATASET": "Σύνολο Δεδομένων",
@@ -286,11 +286,11 @@
 		"GENERAL": "ΓΕΝΙΚΑ",
 		"DASHBOARD": "Αρχική",
 		"PLAN": "ΣΧΕΔΙΑ ΔΙΑΧΕΙΡΙΣΗΣ ΔΕΔΟΜΕΝΩΝ",
-		"MY-DMPS": "Τα δικά μου Σχέδια Διαχείρισης Δεδομένων",
+		"MY-PLANS": "Τα δικά μου Σχέδια Διαχείρισης Δεδομένων",
 		"DESCRIPTIONS": "ΠΕΡΙΓΡΑΦΕΣ ΣΥΝΟΛΟΥ ΔΕΔΟΜΕΝΩΝ",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "ΔΗΜΟΣΙΕΥΜΕΝΑ",
-		"PUBLIC-DMPS": "Δημοσιευμένα Σχέδια Διαχείρισης Δεδομένων",
+		"PUBLIC-PLANS": "Δημοσιευμένα Σχέδια Διαχείρισης Δεδομένων",
 		"PUBLIC-DESC": "Public Descriptions",
 		"ADMIN": "ΔΙΑΧΕΙΡΙΣΤΗΣ",
 		"DESCRIPTION-TEMPLATES": "Description Templates",
@@ -920,7 +920,7 @@
 		"TITLE-ADD-DESCRIPTION": "Adding Description",
 		"TITLE-EDIT-DESCRIPTION": "Editing Description",
 		"TITLE-PREVIEW-DESCRIPTION": "Previewing Description",
-		"TO-DMP": "Previewing Description",
+		"TO-PLAN": "Previewing Description",
 		"UNSAVED-CHANGES": "(unsaved changes)",
 		"PLAN": "Plan",
 		"TOC": {
@@ -1885,7 +1885,7 @@
 			"SELECT": "Select",
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
-			"INTERNAL-PLAN-ENTITIES-DMPS": "Internal Plans",
+			"INTERNAL-PLAN-ENTITIES-PLANS": "Internal Plans",
 			"INTERNAL-PLAN-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
@@ -2119,7 +2119,7 @@
 		"INFO-TEXT": "Το {{ APP_NAME_CAPS }} είναι μια ανοικτή επεκτάσιμη υπηρεσία που απλοποιεί τη διαχείριση, την επικύρωση, την παρακολούθηση και τη συντήρηση των Σχεδίων Διαχείρισης Δεδομένων. Επιτρέπει στους φορείς (ερευνητές, υπεύθυνους έρευνας, διευθυντές κλπ.) να δημιουργούν ζωντανά Σχέδια Διαχείρισης Δεδομένων που μπορούν να ανταλλάσσονται ελεύθερα μεταξύ των υποδομών για τη διεξαγωγή συγκεκριμένων πτυχών της διαδικασίας διαχείρισης Δεδομένων, σύμφωνα με τις προθέσεις και τη δέσμευση των κατόχων Δεδομένων.",
 		"INFO-PLAN-TEXT": "Ένα Σχέδιο Διαχείρισης Δεδομένων είναι ένα ζωντανό αρχείο που περιγραφεί τα σύνολα δεδομένων που έχουν παραχθεί ή και επαναχρησιμοποιηθεί κατά τη διάρκεια και μετά του κύκλου ζωής της έρευνας. Τα Σχέδια Διαχείρισης Δεδομένων έχουν ως στόχο να παρέχουν στους ερευνητές τις αναγκαίες πληροφορίες για την αναπαραγωγή, επαναδιανομή και ανακατεύθυνση του σκοπού των ερευνητικών αποτελεσμάτων ώστε να εξασφαλίζεται η εγκυρότητα και η εκμετάλλευσή τους.",
 		"NEW-QUESTION": "Νέος με τα DMP; Επισκέψου",
-		"START-YOUR-FIRST-DMP": "Ξεκινήστε το πρώτο σας DMP",
+		"START-YOUR-FIRST-PLAN": "Ξεκινήστε το πρώτο σας DMP",
 		"OPEN-AIR-GUIDE": "Οδηγός για ερευνητές του OpenAIRE",
 		"LEARN-MORE": "για να μάθετε περισσότερα για το πώς να δημιουργήσετε ένα!",
 		"PLANS": "Σχέδια Διαχείρισης Δεδομένων",
@@ -2127,7 +2127,7 @@
 		"PUBLIC-USAGE": "Δημόσια Χρήση",
 		"DESCRIPTIONS": "Descriptions",
 		"DESCRIPTIONS-DASHBOARD-TEXT": "Περιγραφές Συνόλου Δεδομένων",
-		"PUBLIC-DMPS": "Δημόσια Σχέδια Διαχείρισης Δεδομένων",
+		"PUBLIC-PLANS": "Δημόσια Σχέδια Διαχείρισης Δεδομένων",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Σχετικοί Οργανισμοί",
 		"DRAFTS": "Προσχέδια",
@@ -2143,7 +2143,7 @@
 		"TOUR-GUIDE": {
 			"PLAN": "This is your dashboard. You can view and edit all DMPs that you have either contributed to or created yourself.",
 			"START-NEW": "Create your DMP with Start new DMP.",
-			"IMPORT-DMP": "You can import a DMP",
+			"IMPORT-PLAN": "You can import a DMP",
 			"START-WIZARD": "or create new in {{ APP_NAME }}.",
 			"DESCRIPTION": "This is your dashboard. You can view and edit all Descriptions that you have either contributed to or created yourself.",
 			"NEW-DESCRIPTION": "With Add Description you can describe new items anytime in the research process.",
@@ -2242,7 +2242,7 @@
 		"FINALISE-TITLE": "Θέλετε να οριστικοποιήσετε κάποια από τις ακόλουθες Περιγραφές Συνόλων Δεδομένων;",
 		"VALIDATION": {
 			"AT-LEAST-ONE-DESCRPIPTION-FINALISED": "You need to have at least one Description Finalized",
-			"INVALID-DMP": "This Plan can not be finalized "
+			"INVALID-PLAN": "This Plan can not be finalized "
 		},
 		"IMPACT": "Αυτή η επιλογή θα οριστικοποιήσει το Σχέδιο Διαχείρισης Δεδομένων σας και δε θα μπορείτε να το επεξεργαστείτε ξανά σε αυτήν την έκδοση.",
 		"PUBLIC-PLAN-MESSAGE": "After finalizing your Plan, it'll be published and be publicly available to the {{ APP_NAME_CAPS }} tool.",

dmp-frontend/src/assets/i18n/hr.json

@@ -113,7 +113,7 @@
 			}
 		},
 		"PLAN-TO-DESCRIPTION-DIALOG": {
-			"FROM-DMP": "Uspješno ste kreirali",
+			"FROM-PLAN": "Uspješno ste kreirali",
 			"PLAN": "PLAN",
 			"TO-DESCRIPTION": "Preusmjeravanje na",
 			"DATASET": "uređivanje",
@@ -286,11 +286,11 @@
 		"GENERAL": "OPĆENITO",
 		"DASHBOARD": "Početak",
 		"PLAN": "PLANOVI UPRAVLJANJA PODACIMA",
-		"MY-DMPS": "Moji Planovi",
+		"MY-PLANS": "Moji Planovi",
 		"DESCRIPTIONS": "OPISI SKUPOVA PODATAKA",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "OBJAVLJENO",
-		"PUBLIC-DMPS": "Javno dostupni Planovi",
+		"PUBLIC-PLANS": "Javno dostupni Planovi",
 		"PUBLIC-DESC": "Public Descriptions",
 		"ADMIN": "ADMINISTRATOR",
 		"DESCRIPTION-TEMPLATES": "Description Templates",
@@ -920,7 +920,7 @@
 		"TITLE-ADD-DESCRIPTION": "Adding Description",
 		"TITLE-EDIT-DESCRIPTION": "Editing Description",
 		"TITLE-PREVIEW-DESCRIPTION": "Previewing Description",
-		"TO-DMP": "Previewing Description",
+		"TO-PLAN": "Previewing Description",
 		"UNSAVED-CHANGES": "(unsaved changes)",
 		"PLAN": "Plan",
 		"TOC": {
@@ -1885,7 +1885,7 @@
 			"SELECT": "Select",
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
-			"INTERNAL-PLAN-ENTITIES-DMPS": "Internal Plans",
+			"INTERNAL-PLAN-ENTITIES-PLANS": "Internal Plans",
 			"INTERNAL-PLAN-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
@@ -2119,7 +2119,7 @@
 		"INFO-TEXT": "{{ APP_NAME_CAPS }} je otvorena modularna aplikacija koja pojednostavljuje izradu Planova upravljanja podacima (eng. Data Management Plan), kao i njihovu provjeru, praćenje i održavanje. Uz pomoć {{ APP_NAME_CAPS }}a, svi sudionici u istraživanju (istraživači, administratori, nadzorna tijela i drugi) mogu izraditi primjenjive Planove koji se mogu slobodno razmjenjivati kroz različite infrastrukture radi provođenja određenih dijelova procesa upravljanja podacima u skladu s namjerama i obvezama vlasnika podataka.",
 		"INFO-PLAN-TEXT": "Plan upravljanja podacima (eng. Data Management Plan, skraćeno DMP) je živi dokument koji opisuje skupove podataka prikupljene ili korištene tijekom i nakon istraživanja. Planovi sadrže osnovne informacije o mogućnostima za ponovnu upotrebu i naknadnu distribuciju rezultata istraživanja, kao i za njihovo korištenje u novim kontekstima, čime se potvrđuje njihova valjanost i osigurava njihovo ponovno korištenje.",
 		"NEW-QUESTION": "Potrebna Vam je pomoć pri izradi Plana upravljanja podacima? Posjetite",
-		"START-YOUR-FIRST-DMP": "Započnite Vaš prvi Plan upravljanja podacima",
+		"START-YOUR-FIRST-PLAN": "Započnite Vaš prvi Plan upravljanja podacima",
 		"OPEN-AIR-GUIDE": "OpenAIRE Upute za istraživače",
 		"LEARN-MORE": "kako biste naučili kako izraditi vlastiti Plan!",
 		"PLANS": "Planovi upravljanja podacima",
@@ -2127,7 +2127,7 @@
 		"PUBLIC-USAGE": "Javna upotreba",
 		"DESCRIPTIONS": "Descriptions",
 		"DESCRIPTIONS-DASHBOARD-TEXT": "Opisi skupova podataka",
-		"PUBLIC-DMPS": "Javno dostupni Planovi",
+		"PUBLIC-PLANS": "Javno dostupni Planovi",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Povezane ustanove",
 		"DRAFTS": "Nacrti",
@@ -2143,7 +2143,7 @@
 		"TOUR-GUIDE": {
 			"PLAN": "Ovo je Vaša kontrolna ploča. Ovdje možete pregledavati i uređivati sve Planove upravljanja podacima kojima ste doprinijeli ili koje ste sami izradili.",
 			"START-NEW": "Izradite svoj Plan upravljanja podacima pritiskom na Započni novi Plan upravljanja podacima.",
-			"IMPORT-DMP": "Plan možete uvesti",
+			"IMPORT-PLAN": "Plan možete uvesti",
 			"START-WIZARD": "ili stvoriti novi u {{ APP_NAME }}u.",
 			"DESCRIPTION": "This is your dashboard. You can view and edit all Descriptions that you have either contributed to or created yourself.",
 			"NEW-DESCRIPTION": "With Add Description you can describe new items anytime in the research process.",
@@ -2242,7 +2242,7 @@
 		"FINALISE-TITLE": "Želite li završiti kreiranje radnih verzija skupova podataka?",
 		"VALIDATION": {
 			"AT-LEAST-ONE-DESCRPIPTION-FINALISED": "You need to have at least one Description Finalized",
-			"INVALID-DMP": "This Plan can not be finalized "
+			"INVALID-PLAN": "This Plan can not be finalized "
 		},
 		"IMPACT": "Ovim korakom se završava proces kreiranja Plana upravljanja podacima, više ga nećete moći uređivati.",
 		"PUBLIC-PLAN-MESSAGE": "After finalizing your Plan, it'll be published and be publicly available to the {{ APP_NAME_CAPS }} tool.",

dmp-frontend/src/assets/i18n/pl.json

@@ -113,7 +113,7 @@
 			}
 		},
 		"PLAN-TO-DESCRIPTION-DIALOG": {
-			"FROM-DMP": "Utworzyłeś swój",
+			"FROM-PLAN": "Utworzyłeś swój",
 			"PLAN": "PLAN",
 			"TO-DESCRIPTION": "Zostaniesz przeniesiony do",
 			"DATASET": "Zbioru danych",
@@ -286,11 +286,11 @@
 		"GENERAL": "OGÓLNY",
 		"DASHBOARD": "Strona główna",
 		"PLAN": "PLANY ZARZĄDZANIA DANYMI",
-		"MY-DMPS": "Moje DMPs",
+		"MY-PLANS": "Moje DMPs",
 		"DESCRIPTIONS": "ZBIÓR DANYCH",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "OPUBLIKOWANE",
-		"PUBLIC-DMPS": "Publiczne DMPs",
+		"PUBLIC-PLANS": "Publiczne DMPs",
 		"PUBLIC-DESC": "Public Descriptions",
 		"ADMIN": "ADMINISTRATOR",
 		"DESCRIPTION-TEMPLATES": "Description Templates",
@@ -920,7 +920,7 @@
 		"TITLE-ADD-DESCRIPTION": "Adding Description",
 		"TITLE-EDIT-DESCRIPTION": "Editing Description",
 		"TITLE-PREVIEW-DESCRIPTION": "Previewing Description",
-		"TO-DMP": "Previewing Description",
+		"TO-PLAN": "Previewing Description",
 		"UNSAVED-CHANGES": "(unsaved changes)",
 		"PLAN": "Plan",
 		"TOC": {
@@ -1885,7 +1885,7 @@
 			"SELECT": "Select",
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
-			"INTERNAL-PLAN-ENTITIES-DMPS": "Internal Plans",
+			"INTERNAL-PLAN-ENTITIES-PLANS": "Internal Plans",
 			"INTERNAL-PLAN-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
@@ -2119,7 +2119,7 @@
 		"INFO-TEXT": "{{ APP_NAME_CAPS }} to otwarta, rozszerzalna usługa, która ułatwia zarządzanie, walidację, monitorowanie i konserwację oraz plany zarządzania danymi. Umożliwia podmiotom (naukowcom, menedżerom, nadzorcom itp.) tworzenie praktycznych DMP, które mogą być swobodnie wymieniane między infrastrukturami do realizacji określonych aspektów procesu zarządzania danymi zgodnie z intencjami i zaangażowaniem właścicieli danych.",
 		"INFO-PLAN-TEXT": "Plan zarządzania danymi (DMP) to żywy dokument opisujący zbiory danych, które są generowane i/lub ponownie wykorzystywane w trakcie badań i po ich zakończeniu. DMP mają na celu dostarczenie naukowcom niezbędnych informacji do ponownego tworzenia, redystrybucji i zmiany przeznaczenia wyników badań, zapewniając w ten sposób ich ważność i wykorzystanie.",
 		"NEW-QUESTION": "Nowy w DMP? Odwiedź",
-		"START-YOUR-FIRST-DMP": "Uruchom swój pierwszy DMP",
+		"START-YOUR-FIRST-PLAN": "Uruchom swój pierwszy DMP",
 		"OPEN-AIR-GUIDE": "Przewodnik dla badaczy OpenAIRE",
 		"LEARN-MORE": "aby dowiedzieć się więcej o tym, jak je stworzyć!",
 		"PLANS": "PLAN",
@@ -2127,7 +2127,7 @@
 		"PUBLIC-USAGE": "Użytek publiczny",
 		"DESCRIPTIONS": "Descriptions",
 		"DESCRIPTIONS-DASHBOARD-TEXT": "Zbiory danych",
-		"PUBLIC-DMPS": "Publiczne DMP",
+		"PUBLIC-PLANS": "Publiczne DMP",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Organizacje powiązane",
 		"DRAFTS": "Wersje robocze",
@@ -2143,7 +2143,7 @@
 		"TOUR-GUIDE": {
 			"PLAN": "To jest twój pulpit nawigacyjny. Możesz przeglądać i edytować wszystkie utworzone lub współtworzone przez ciebie DMP.",
 			"START-NEW": "Utwórz swój DMP za pomocą funkcji Uruchom nowy DMP.",
-			"IMPORT-DMP": "Możesz zaimportować DMP",
+			"IMPORT-PLAN": "Możesz zaimportować DMP",
 			"START-WIZARD": "lub utwórz nowy w {{ APP_NAME }}.",
 			"DESCRIPTION": "This is your dashboard. You can view and edit all Descriptions that you have either contributed to or created yourself.",
 			"NEW-DESCRIPTION": "With Add Description you can describe new items anytime in the research process.",
@@ -2242,7 +2242,7 @@
 		"FINALISE-TITLE": "Czy chcesz sfinalizować którykolwiek z następujących roboczych zestawów danych?",
 		"VALIDATION": {
 			"AT-LEAST-ONE-DESCRPIPTION-FINALISED": "You need to have at least one Description Finalized",
-			"INVALID-DMP": "This Plan can not be finalized "
+			"INVALID-PLAN": "This Plan can not be finalized "
 		},
 		"IMPACT": "Ta akcja/to działanie/ta funkcja? sfinalizuje twój DMP i nie będziesz mógł go ponownie edytować.",
 		"PUBLIC-PLAN-MESSAGE": "After finalizing your Plan, it'll be published and be publicly available to the {{ APP_NAME_CAPS }} tool.",

dmp-frontend/src/assets/i18n/pt.json

@@ -113,7 +113,7 @@
 			}
 		},
 		"PLAN-TO-DESCRIPTION-DIALOG": {
-			"FROM-DMP": "Criou com sucesso o seu",
+			"FROM-PLAN": "Criou com sucesso o seu",
 			"PLAN": "PGD",
 			"TO-DESCRIPTION": "Será transferido para o editor de",
 			"DATASET": "Datasets",
@@ -286,11 +286,11 @@
 		"GENERAL": "GERAL",
 		"DASHBOARD": "Início",
 		"PLAN": "PLANOS DE GESTÃO DE DADOS",
-		"MY-DMPS": "Os meus PGDs",
+		"MY-PLANS": "Os meus PGDs",
 		"DESCRIPTIONS": "Datasets",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "PUBLICADOS",
-		"PUBLIC-DMPS": "PGDs públicos",
+		"PUBLIC-PLANS": "PGDs públicos",
 		"PUBLIC-DESC": "Public Descriptions",
 		"ADMIN": "Administrador",
 		"DESCRIPTION-TEMPLATES": "Description Templates",
@@ -920,7 +920,7 @@
 		"TITLE-ADD-DESCRIPTION": "Adding Description",
 		"TITLE-EDIT-DESCRIPTION": "Editing Description",
 		"TITLE-PREVIEW-DESCRIPTION": "Previewing Description",
-		"TO-DMP": "Previewing Description",
+		"TO-PLAN": "Previewing Description",
 		"UNSAVED-CHANGES": "(unsaved changes)",
 		"PLAN": "Plan",
 		"TOC": {
@@ -1885,7 +1885,7 @@
 			"SELECT": "Select",
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
-			"INTERNAL-PLAN-ENTITIES-DMPS": "Internal Plans",
+			"INTERNAL-PLAN-ENTITIES-PLANS": "Internal Plans",
 			"INTERNAL-PLAN-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
@@ -2119,7 +2119,7 @@
 		"INFO-TEXT": "O {{ APP_NAME_CAPS }} é um serviço aberto e extensível que simplifica a gestão, validação, monitorização e manutenção de Planos de Gestão de Dados (PGDs). Permite aos intervenientes (investigadores, gestores, coordenadores, investigadores principais, entre outros) criar PGDs acionáveis por máquina, que podem ser livremente trocados entre infraestruturas para a execução de aspetos específicos no processo de gestão de dados, de acordo com as intenções e o compromisso dos proprietários dos dados.",
 		"INFO-PLAN-TEXT": "Um Plano de Gestão de Dados (PGD) é um documento dinâmico que descreve os conjuntos de dados que são gerados e/ou reutilizados durante e após a vida útil de uma investigação. Os PGD visam fornecer aos investigadores informações essenciais para a reprodução, redistribuição e redefinição dos resultados da investigação, assegurando assim a sua validade e qualidade.",
 		"NEW-QUESTION": "Novo nos Planos de Gestão de Dados? Visite",
-		"START-YOUR-FIRST-DMP": "Começar o seu primeiro PGD",
+		"START-YOUR-FIRST-PLAN": "Começar o seu primeiro PGD",
 		"OPEN-AIR-GUIDE": "Guia OpenAIRE para Investigadores",
 		"LEARN-MORE": "para saber mais sobre como criar um Plano de Gestão de Dados!",
 		"PLANS": "PGDs",
@@ -2127,7 +2127,7 @@
 		"PUBLIC-USAGE": "Uso Público",
 		"DESCRIPTIONS": "Descriptions",
 		"DESCRIPTIONS-DASHBOARD-TEXT": "",
-		"PUBLIC-DMPS": "PGDs Públicos",
+		"PUBLIC-PLANS": "PGDs Públicos",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Organizações Relacionadas",
 		"DRAFTS": "Rascunhos",
@@ -2143,7 +2143,7 @@
 		"TOUR-GUIDE": {
 			"PLAN": "Aqui pode visualizar e editar todos os PGDs para os quais tenha contribuído ou criado.",
 			"START-NEW": "Crie o seu PGD através do botão “Criar novo PGD”.",
-			"IMPORT-DMP": "Aqui pode importar um PGD pré-existente...",
+			"IMPORT-PLAN": "Aqui pode importar um PGD pré-existente...",
 			"START-WIZARD": "... ou criar um novo no {{ APP_NAME }}!",
 			"DESCRIPTION": "This is your dashboard. You can view and edit all Descriptions that you have either contributed to or created yourself.",
 			"NEW-DESCRIPTION": "With Add Description you can describe new items anytime in the research process.",
@@ -2242,7 +2242,7 @@
 		"FINALISE-TITLE": "Pretende finalizar algum destes Datasets em rascunho?",
 		"VALIDATION": {
 			"AT-LEAST-ONE-DESCRPIPTION-FINALISED": "You need to have at least one Description Finalized",
-			"INVALID-DMP": "This Plan can not be finalized "
+			"INVALID-PLAN": "This Plan can not be finalized "
 		},
 		"IMPACT": "Esta ação finalizará o seu PGD, não sendo possível a sua edição.",
 		"PUBLIC-PLAN-MESSAGE": "After finalizing your Plan, it'll be published and be publicly available to the {{ APP_NAME_CAPS }} tool.",

dmp-frontend/src/assets/i18n/sk.json

@@ -113,7 +113,7 @@
 			}
 		},
 		"PLAN-TO-DESCRIPTION-DIALOG": {
-			"FROM-DMP": "You have successfully created your",
+			"FROM-PLAN": "You have successfully created your",
 			"PLAN": "PLAN",
 			"TO-DESCRIPTION": "You will be transferred to the",
 			"DATASET": "Dataset",
@@ -286,11 +286,11 @@
 		"GENERAL": "VŠEOBECNÉ INFORMÁCIE",
 		"DASHBOARD": "Domov",
 		"PLAN": "PLÁNY MANAŽMENTU DÁT",
-		"MY-DMPS": "Moje DMP",
+		"MY-PLANS": "Moje DMP",
 		"DESCRIPTIONS": "SÚBORY DÁT",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "PUBLIKOVANÉ",
-		"PUBLIC-DMPS": "Verejné DMP",
+		"PUBLIC-PLANS": "Verejné DMP",
 		"PUBLIC-DESC": "Public Descriptions",
 		"ADMIN": "ADMIN",
 		"DESCRIPTION-TEMPLATES": "Description Templates",
@@ -920,7 +920,7 @@
 		"TITLE-ADD-DESCRIPTION": "Adding Description",
 		"TITLE-EDIT-DESCRIPTION": "Editing Description",
 		"TITLE-PREVIEW-DESCRIPTION": "Previewing Description",
-		"TO-DMP": "Previewing Description",
+		"TO-PLAN": "Previewing Description",
 		"UNSAVED-CHANGES": "(unsaved changes)",
 		"PLAN": "Plan",
 		"TOC": {
@@ -1885,7 +1885,7 @@
 			"SELECT": "Select",
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
-			"INTERNAL-PLAN-ENTITIES-DMPS": "Internal Plans",
+			"INTERNAL-PLAN-ENTITIES-PLANS": "Internal Plans",
 			"INTERNAL-PLAN-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
@@ -2119,7 +2119,7 @@
 		"INFO-TEXT": "{{ APP_NAME_CAPS }} je otvorený, rozširovateľný nástroj, ktorý zjednodušuje manažment, validovanie, monitorovanie a údržbu plánov manažmentu dát (DMP, z angl. Data Management Plan). Umožňuje aktérom (výskumníkom, manažérom, supervízorom apod.) vytvárať strojovo spracovateľné DMP, ktoré sa môžu voľne vymieňať medzi infraštuktúrami na realizáciu konkrétnych aspektov procesu manažmentu dát v súlade so zámermi a záväzkami vlastníkov dát.",
 		"INFO-PLAN-TEXT": "Plán manažmentu dát (DMP, z angl. Data Managment Plan) je živý dokument definujúci súbory dát, ktoré sú vygenerované a/alebo znovu používané počas výskumného projektu a po jeho ukončení. Cieľom DMP je poskytnúť výskumným pracovníkom dôležité informácie tak, aby mohli opätovne vytvoriť, opätovne distribuovať a opätovne použiť výskumné výsledky, čím sa zaistí validácia a lepšie využite dát.",
 		"NEW-QUESTION": "Nový používateľ DMP? Navštívte",
-		"START-YOUR-FIRST-DMP": "Začať prvý DMP",
+		"START-YOUR-FIRST-PLAN": "Začať prvý DMP",
 		"OPEN-AIR-GUIDE": "Príručka OpenAIRE pre výskumných pracovníkov,",
 		"LEARN-MORE": "poskytne viac informácií o vytvorení DMP.",
 		"PLANS": "PLAN",
@@ -2127,7 +2127,7 @@
 		"PUBLIC-USAGE": "Verejné použitie",
 		"DESCRIPTIONS": "Descriptions",
 		"DESCRIPTIONS-DASHBOARD-TEXT": "Súbory dát",
-		"PUBLIC-DMPS": "Verejné DMP",
+		"PUBLIC-PLANS": "Verejné DMP",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Ďalšie organizácie",
 		"DRAFTS": "Návrhy",
@@ -2143,7 +2143,7 @@
 		"TOUR-GUIDE": {
 			"PLAN": "This is your dashboard. You can view and edit all DMPs that you have either contributed to or created yourself.",
 			"START-NEW": "Create your DMP with Start new DMP.",
-			"IMPORT-DMP": "You can import a DMP",
+			"IMPORT-PLAN": "You can import a DMP",
 			"START-WIZARD": "or create new in {{ APP_NAME }}.",
 			"DESCRIPTION": "This is your dashboard. You can view and edit all Descriptions that you have either contributed to or created yourself.",
 			"NEW-DESCRIPTION": "With Add Description you can describe new items anytime in the research process.",
@@ -2242,7 +2242,7 @@
 		"FINALISE-TITLE": "Chcete dokončiť niektorý z nasledujúcich návrhov súborov dát?",
 		"VALIDATION": {
 			"AT-LEAST-ONE-DESCRPIPTION-FINALISED": "You need to have at least one Description Finalized",
-			"INVALID-DMP": "This Plan can not be finalized "
+			"INVALID-PLAN": "This Plan can not be finalized "
 		},
 		"IMPACT": "Týmto krokom dokončíte svoj DMP a nebudete ho môcť znovu editovať.",
 		"PUBLIC-PLAN-MESSAGE": "After finalizing your Plan, it'll be published and be publicly available to the {{ APP_NAME_CAPS }} tool.",

dmp-frontend/src/assets/i18n/sr.json

@@ -113,7 +113,7 @@
 			}
 		},
 		"PLAN-TO-DESCRIPTION-DIALOG": {
-			"FROM-DMP": "Uspešno ste kreirali",
+			"FROM-PLAN": "Uspešno ste kreirali",
 			"PLAN": "PLAN",
 			"TO-DESCRIPTION": "Preusmeravanje na",
 			"DATASET": "uređivanje",
@@ -286,11 +286,11 @@
 		"GENERAL": "OPŠTE",
 		"DASHBOARD": "Početak",
 		"PLAN": "PLANOVI UPRAVLJANJA PODACIMA",
-		"MY-DMPS": "Moji Planovi",
+		"MY-PLANS": "Moji Planovi",
 		"DESCRIPTIONS": "SKUPOVI PODATAKA",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "OBJAVLJENO",
-		"PUBLIC-DMPS": "Javno dostupni Planovi",
+		"PUBLIC-PLANS": "Javno dostupni Planovi",
 		"PUBLIC-DESC": "Public Descriptions",
 		"ADMIN": "ADMINISTRATOR",
 		"DESCRIPTION-TEMPLATES": "Description Templates",
@@ -920,7 +920,7 @@
 		"TITLE-ADD-DESCRIPTION": "Adding Description",
 		"TITLE-EDIT-DESCRIPTION": "Editing Description",
 		"TITLE-PREVIEW-DESCRIPTION": "Previewing Description",
-		"TO-DMP": "Previewing Description",
+		"TO-PLAN": "Previewing Description",
 		"UNSAVED-CHANGES": "(unsaved changes)",
 		"PLAN": "Plan",
 		"TOC": {
@@ -1885,7 +1885,7 @@
 			"SELECT": "Select",
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
-			"INTERNAL-PLAN-ENTITIES-DMPS": "Internal Plans",
+			"INTERNAL-PLAN-ENTITIES-PLANS": "Internal Plans",
 			"INTERNAL-PLAN-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
@@ -2119,7 +2119,7 @@
 		"INFO-TEXT": "{{ APP_NAME_CAPS }} je otvorena modularna aplikacija koja omogućava jednostavno upravljanje planovima upravljanja podacima (eng. Data Management Plan), kao i njihovu proveru, praćenje i održavanje. Uz pomoć {{ APP_NAME }}a, svi akteri u istraživanju (istraživači, rukovodioci, nadzorni organi i drugi) mogu da napišu primenljive planove koji se mogu slobodno razmenjivati kroz različite infrastrukture radi realizacije određenih elemenata procesa upravljanja podacima u skladu sa namerama i obavezama vlasnika podataka.",
 		"INFO-PLAN-TEXT": "Plan upravljanja podacima (eng. Data Management Plan, skraćeno DMP) je živi dokument koji opisuje skupove podataka proizvedene ili korišćene tokom i posle istraživačkog ciklusa. Planovi daju osnovne informacije o mogućnostima za replikaciju i naknadnu distribuciju rezultata istraživanja, kao i za njihovo korišćenje u novim kontekstima, čime se potvrđuje njihova validnost i obezbeđuje njihovo ponovno korišćenje u istu ili druge svrhe.",
 		"NEW-QUESTION": "Nemate iskustvo u kreiranju plana upravljanja podacima? Posetite",
-		"START-YOUR-FIRST-DMP": "Započnite Vaš prvi plan upravljanja podacima",
+		"START-YOUR-FIRST-PLAN": "Započnite Vaš prvi plan upravljanja podacima",
 		"OPEN-AIR-GUIDE": "OpenAIRE vodič za istraživače",
 		"LEARN-MORE": "kako biste naučili kako da kreirate plan upravljanja podacima (eng. Data Management Plan)!",
 		"PLANS": "Planovi upravljanja podacima",
@@ -2127,7 +2127,7 @@
 		"PUBLIC-USAGE": "Javna upotreba",
 		"DESCRIPTIONS": "Descriptions",
 		"DESCRIPTIONS-DASHBOARD-TEXT": "Skupovi podataka",
-		"PUBLIC-DMPS": "Javno dostupni Planovi",
+		"PUBLIC-PLANS": "Javno dostupni Planovi",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Povezane institucije",
 		"DRAFTS": "Radne verzije",
@@ -2143,7 +2143,7 @@
 		"TOUR-GUIDE": {
 			"PLAN": "This is your dashboard. You can view and edit all DMPs that you have either contributed to or created yourself.",
 			"START-NEW": "Create your DMP with Start new DMP.",
-			"IMPORT-DMP": "You can import a DMP",
+			"IMPORT-PLAN": "You can import a DMP",
 			"START-WIZARD": "or create new in {{ APP_NAME }}.",
 			"DESCRIPTION": "This is your dashboard. You can view and edit all Descriptions that you have either contributed to or created yourself.",
 			"NEW-DESCRIPTION": "With Add Description you can describe new items anytime in the research process.",
@@ -2242,7 +2242,7 @@
 		"FINALISE-TITLE": "Da li želite da završite kreiranje sledećih radnih verzija skupova podataka?",
 		"VALIDATION": {
 			"AT-LEAST-ONE-DESCRPIPTION-FINALISED": "You need to have at least one Description Finalized",
-			"INVALID-DMP": "This Plan can not be finalized "
+			"INVALID-PLAN": "This Plan can not be finalized "
 		},
 		"IMPACT": "Ovim korakom se završava proces kreiranja plana upravljanja podacima i posle toga nećete biti u mogućnosti da ga menjate.",
 		"PUBLIC-PLAN-MESSAGE": "After finalizing your Plan, it'll be published and be publicly available to the {{ APP_NAME_CAPS }} tool.",

dmp-frontend/src/assets/i18n/tr.json

@@ -113,7 +113,7 @@
 			}
 		},
 		"PLAN-TO-DESCRIPTION-DIALOG": {
-			"FROM-DMP": "Başarıyla oluşturdunuz",
+			"FROM-PLAN": "Başarıyla oluşturdunuz",
 			"PLAN": "VYP",
 			"TO-DESCRIPTION": "Yönlendireleceksiniz",
 			"DATASET": "Veri Seti",
@@ -286,11 +286,11 @@
 		"GENERAL": "GENEL",
 		"DASHBOARD": "Ev",
 		"PLAN": "VERİ YÖNETİM PLANLARI",
-		"MY-DMPS": "VYP'larım",
+		"MY-PLANS": "VYP'larım",
 		"DESCRIPTIONS": "Veri Setleri",
 		"MY-DESCRIPTIONS": "My Descriptions",
 		"PUBLIC": "YAYINLANDI",
-		"PUBLIC-DMPS": "Yayınlanmış VYP'ları",
+		"PUBLIC-PLANS": "Yayınlanmış VYP'ları",
 		"PUBLIC-DESC": "Public Descriptions",
 		"ADMIN": "ADMIN",
 		"DESCRIPTION-TEMPLATES": "Description Templates",
@@ -920,7 +920,7 @@
 		"TITLE-ADD-DESCRIPTION": "Adding Description",
 		"TITLE-EDIT-DESCRIPTION": "Editing Description",
 		"TITLE-PREVIEW-DESCRIPTION": "Previewing Description",
-		"TO-DMP": "Previewing Description",
+		"TO-PLAN": "Previewing Description",
 		"UNSAVED-CHANGES": "(unsaved changes)",
 		"PLAN": "Plan",
 		"TOC": {
@@ -1885,7 +1885,7 @@
 			"SELECT": "Select",
 			"BOOLEAN-DECISION": "Boolean Decision",
 			"RADIO-BOX": "Radio Box",
-			"INTERNAL-PLAN-ENTITIES-DMPS": "Internal Plans",
+			"INTERNAL-PLAN-ENTITIES-PLANS": "Internal Plans",
 			"INTERNAL-PLAN-ENTITIES-DESCRIPTIONS": "Internal Descriptions",
 			"CHECKBOX": "Checkbox",
 			"FREE-TEXT": "Free Text",
@@ -2119,7 +2119,7 @@
 		"INFO-TEXT": "{{ APP_NAME_CAPS }} is an open extensible service that simplifies the management, validation, monitoring and maintenance and of Data Management Plans. It allows actors (researchers, managers, supervisors etc) to create actionable DMPs that may be freely exchanged among infrastructures for carrying out specific aspects of the Data management process in accordance with the intentions and commitment of Data owners.",
 		"INFO-PLAN-TEXT": "Bir Veri Yönetim Planı (VYP), bir araştırma ömrü boyunca ve öğrenim ve / veya yeniden kullanılan veri setlerini açıklayan canlı bir belgedir. VYP'ler, araştırmacılara araştırma sonuçları yeniden yeniden dağıtmak ve yeniden kullanım için gerekli bilgileri sağlamayı ve böylece tekrar geçerliliğini ve kullanılmasını sağlamayı amaçlamaktadır.",
 		"NEW-QUESTION": "İlk VYP'niz mi? Daha fazla bilgi için gözat",
-		"START-YOUR-FIRST-DMP": "İlk VYP'ni Başlat",
+		"START-YOUR-FIRST-PLAN": "İlk VYP'ni Başlat",
 		"OPEN-AIR-GUIDE": "Araştırmacılar için OpenAIRE Rehberi",
 		"LEARN-MORE": "Nasıl yapılacağı hakkında daha fazla bilgi için gözat!",
 		"PLANS": "VYP'ları",
@@ -2127,7 +2127,7 @@
 		"PUBLIC-USAGE": "Genel Kullanım",
 		"DESCRIPTIONS": "Descriptions",
 		"DESCRIPTIONS-DASHBOARD-TEXT": "Veri Setleri",
-		"PUBLIC-DMPS": "Herkese açık VYP'ler",
+		"PUBLIC-PLANS": "Herkese açık VYP'ler",
 		"PUBLIC-DESCRIPTIONS": "Public Descriptions",
 		"RELATED-ORGANISATIONS": "Bağlantılı Kurumlar",
 		"DRAFTS": "Taslaklar",
@@ -2143,7 +2143,7 @@
 		"TOUR-GUIDE": {
 			"PLAN": "This is your dashboard. You can view and edit all DMPs that you have either contributed to or created yourself.",
 			"START-NEW": "Create your DMP with Start new DMP.",
-			"IMPORT-DMP": "You can import a DMP",
+			"IMPORT-PLAN": "You can import a DMP",
 			"START-WIZARD": "or create new in {{ APP_NAME }}.",
 			"DESCRIPTION": "This is your dashboard. You can view and edit all Descriptions that you have either contributed to or created yourself.",
 			"NEW-DESCRIPTION": "With Add Description you can describe new items anytime in the research process.",
@@ -2242,7 +2242,7 @@
 		"FINALISE-TITLE": "Aşağıdaki Taslak Veri Setlerinden herhangi birini sonlandırmak istiyor musunuz?",
 		"VALIDATION": {
 			"AT-LEAST-ONE-DESCRPIPTION-FINALISED": "You need to have at least one Description Finalized",
-			"INVALID-DMP": "This Plan can not be finalized "
+			"INVALID-PLAN": "This Plan can not be finalized "
 		},
 		"IMPACT": "Bu işlem VYP'nızı sonlandıracak ve onu tekrar düzenleyemeyeceksiniz.",
 		"PUBLIC-PLAN-MESSAGE": "After finalizing your Plan, it'll be published and be publicly available to the {{ APP_NAME_CAPS }} tool.",