From a3e728f5ccf9042da4e77bccf28562e4e55d840f Mon Sep 17 00:00:00 2001
From: Alexey Lukashov <Alexey.Lukashov@ext.ec.europa.eu>
Date: Fri, 12 May 2017 10:53:55 +0200
Subject: [PATCH 1/5] #169 add alpha and no-alpha cases

---
 espd-web/pom.xml                              |  2 +-
 .../espd/domain/SatisfiesAllCriterion.java    |  1 +
 .../views/criteriaTemplates/checkTemplate.jsp | 16 ++---
 .../resources/WEB-INF/views/espdTemplate.jsp  | 15 +++++
 .../resources/WEB-INF/views/print.jsp         | 36 ++++++-----
 .../WEB-INF/views/wizard/procedureForm.jsp    |  8 +--
 .../WEB-INF/views/wizard/selectionCA.jsp      | 22 +------
 .../WEB-INF/views/wizard/selectionEO.jsp      | 59 ++++++++++---------
 .../META-INF/resources/static/js/init.js      | 14 +----
 9 files changed, 86 insertions(+), 87 deletions(-)

diff --git a/espd-web/pom.xml b/espd-web/pom.xml
index 53269b2f9..ec4afaff0 100644
--- a/espd-web/pom.xml
+++ b/espd-web/pom.xml
@@ -183,7 +183,7 @@
                                     </includes>
                                 </bannedDependencies>
                                 <requireMavenVersion>
-                                    <version>[3.0.3,3.5.0)</version>
+                                    <version>[3.0.3,3.5.0]</version>
                                 </requireMavenVersion>
                                 <requireJavaVersion>
                                     <version>${java.version}</version>
diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/SatisfiesAllCriterion.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/SatisfiesAllCriterion.java
index 2ddfe5f97..7392b2468 100644
--- a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/SatisfiesAllCriterion.java
+++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/SatisfiesAllCriterion.java
@@ -45,4 +45,5 @@ public Boolean getAnswer() {
         // the satisfies all criterion has special behaviour so the default value should be null
         return this.answer;
     }
+
 }
diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/checkTemplate.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/checkTemplate.jsp
index 0ebaec01e..b9da737ec 100644
--- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/checkTemplate.jsp
+++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/checkTemplate.jsp
@@ -42,17 +42,19 @@
 <div class="checkbox criteria-row-check">
 	<div class="form-group" style="margin-bottom: 0px;">
 		<div class="col-md-12">
-		    <label>
-		        <c:if test="${is_always_checked}">
-		            <form:checkbox path="${field}.exists" checked="checked" onclick="return false"/>
-		        </c:if>
-		        <c:if test="${!is_always_checked}">
+			<label class="checkbox-inline">
+				<c:if test="${is_always_checked}">
+					<form:checkbox path="${field}.exists" checked="checked" disabled="true"/>
+				</c:if>
+				<c:if test="${!is_always_checked}">
 					<form:checkbox path="${field}.exists"/>
-		        </c:if>
+				</c:if>
 				<b>${span18n[title_code]}</b>
 			</label>
 		    <c:if test="${not empty description_code}">
-		        <span class="small" data-i18n="${description_code}"><s:message code='${description_code}'/></span>
+		    	<p>
+		        	<span class="small" data-i18n="${description_code}"><s:message code='${description_code}'/></span>
+		        </p>
 		    </c:if>
     	</div>
 		<c:if test="${hasCriterion == true}">
diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp
index e5e614b46..aa47adf11 100644
--- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp
+++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/espdTemplate.jsp
@@ -33,6 +33,21 @@
 
 		<script>
 			var pageLanguage = "${pageContext.response.locale}".toLowerCase();
+			
+			function dataShow() {
+				var elems = $(this).attr("data-target-show").split(";")
+				for (i in elems) {
+					$(elems[i]).fadeIn();
+				}
+			}
+									
+			function dataHide() {
+				var elems = $(this).attr("data-target-hide").split(";")
+				for (i in elems) {
+					$(elems[i]).hide();
+				}
+			}
+			
 
 			$(function () {
 				validator(defaultValidators, "required", "${i18n['validator_required']}");
diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp
index 6ba2cf00e..a2032332f 100644
--- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp
+++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp
@@ -352,21 +352,29 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc
 	            	<h4 class="panel-title">${span18n['all_selection_switch']}</h4>
 	            </div>
 	            <div id="eo-satisfies-all-section" class="collapse in">
-	                <div class="espd-panel-body panel-body">
-                        ${span18n['crit_selection_ca_declares_that']}
-                        <div class="checkbox">
-	                        <label>
-	                        	<c:if test="${espd.selectionSatisfiesAll.exists}">
-									<input type="checkbox" class="checktoggle" checked="checked"/>
-	                        	</c:if>
-	                        	<c:if test="${!espd.selectionSatisfiesAll.exists}">
-									<input type="checkbox" class="checktoggle"/>
-	                        	</c:if>
-	                        	
-	                            ${span18n['crit_selection_satisfies_all_criteria']}
-	                        </label>
+                    <div class="espd-panel-body panel-body">
+                        <strong>${span18n['crit_selection_eo_declares_that']}</strong>
+                        <span data-i18n="crit_selection_eo_declares_that_tooltip" data-toggle="tooltip" title="${i18n['crit_selection_eo_declares_that_tooltip']}"></span>
+
+	                    <div class="row criteria-row-form">
+	                        <div class="col-md-5 criteria-row-check-left">
+	                            <div class="form-group">
+	                                <div class="col-md-12">
+	                                    <strong>${span18n['crit_selection_eo_satisfies_all_criteria']}</strong>
+	                                </div>
+	                            </div>
+	                        </div>
+	                        <div class="col-md-7 criteria-row-check-right">
+	                            <div class="col-md-12">
+	                                <div class="form-group">
+	                                    ${span18n["crit_your_answer"]}
+	                                    <form:radiobutton path="selectionSatisfiesAll.answer" value="true"/>${span18n["yes"]}
+	                                    <form:radiobutton path="selectionSatisfiesAll.answer" value="false"/>${span18n["no"]}
+	                                </div>
+	                            </div>
+	                        </div>
 	                    </div>
-	                </div>
+                    </div>
 	            </div>
 	        </div>
        </c:if>
diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/procedureForm.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/procedureForm.jsp
index bca11b717..88097b5c5 100644
--- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/procedureForm.jsp
+++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/procedureForm.jsp
@@ -197,10 +197,8 @@
                     <div class="form-group">
                         <label class="control-label col-md-6">${span18n['createeo_if_proc_reserved']}</label>
                         <div class="col-md-6">
-                            <form:radiobutton path="procurementReserved.answer" value="true"
-                                              data-target-show="#disworkers-form"/>${span18n["yes"]}
-                            <form:radiobutton path="procurementReserved.answer" value="false"
-                                              data-target-hide="#disworkers-form"/>${span18n["no"]}
+                            <form:radiobutton path="procurementReserved.answer" value="true" data-target-show="#disworkers-form"/>${span18n["yes"]}
+                            <form:radiobutton path="procurementReserved.answer" value="false" data-target-hide="#disworkers-form"/>${span18n["no"]}
                         </div>
                     </div>
                 </div>
@@ -211,7 +209,7 @@
                             <form:textarea rows="1" cssClass="form-control" path="procurementReserved.doubleValue1"
                                            number="true"/>
                         </div>
-                    </div>
+                    </div>s
                     <div class="form-group">
                         <label class="control-label col-md-6">${span18n['createeo_disworkers_details']}</label>
                         <div class="col-md-6">
diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionCA.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionCA.jsp
index c4f1587a6..cab271241 100644
--- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionCA.jsp
+++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionCA.jsp
@@ -31,16 +31,6 @@
 
 <%request.setAttribute("selectionCA", eu.europa.ec.grow.espd.xml.CriteriaTemplates.selectionCA);%>
 
-<script>
-    $(function () {
-		$("input[name='usealpha']").change(function(){
-			if(this.value == false || this.value == "false") {
-				$('#usealpha-checkbox').attr('checked', false);
-			}
-		});
-    });
-</script>
-
 <tiles:importAttribute name="flow"/>
 
 <c:set var="usealpha" value="${espd.selectionSatisfiesAll != null && espd.selectionSatisfiesAll.exists}"/>
@@ -66,14 +56,8 @@
                     ${span18n['createcasel_alert']}
   
 					<label class="control-label">${span18n['question_to_use_alpha']}</label>
-					<c:if test="${usealpha}">
-						<input name="usealpha" data-target-show="#ca-selection-criteria" data-target-hide="#alpha-criterion" type="radio" value="false">${span18n['yes']}
-						<input name="usealpha" data-target-show="#alpha-criterion" data-target-hide="#ca-selection-criteria" type="radio" value="true" checked="checked">${span18n['no']}
-					</c:if>
-					<c:if test="${!usealpha}">
-						<input name="usealpha" data-target-show="#ca-selection-criteria" data-target-hide="#alpha-criterion" type="radio" value="false" checked="checked">${span18n['yes']}
-						<input name="usealpha" data-target-show="#alpha-criterion" data-target-hide="#ca-selection-criteria" type="radio" value="true">${span18n['no']}
-					</c:if>
+					<form:radiobutton name="usealpha" path="selectionSatisfiesAll.exists" data-target-show="#ca-selection-criteria" data-target-hide="#alpha-criterion" value="false"/>${span18n['yes']}
+					<form:radiobutton name="usealpha" path="selectionSatisfiesAll.exists" data-target-show="#alpha-criterion" data-target-hide="#ca-selection-criteria" value="true"/>${span18n['no']}
         </div>
 
         <div id="alpha-criterion" class="panel panel-espd" style="${usealpha?'':'display:none'}">
@@ -86,7 +70,7 @@
                         <span data-i18n="crit_selection_declares_that_tooltip" data-toggle="tooltip" title="${i18n['crit_selection_declares_that_tooltip']}"></span>
 	                    <div class="checkbox">
 	                        <label>
-	                            <form:checkbox id="usealpha-checkbox" path="selectionSatisfiesAll.exists" class="checktoggle" value="true"/>
+	                            <input type="checkbox" checked="checked" disabled readonly/>
 	                            ${span18n['crit_selection_satisfies_all_criteria']}
 	                        </label>
 	                    </div>
diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp
index 75b60a4df..94ea79082 100644
--- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp
+++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp
@@ -40,6 +40,8 @@
 
 <%request.setAttribute("selectionEO", eu.europa.ec.grow.espd.xml.CriteriaTemplates.selectionEO);%>
 
+<c:set var="usealpha" value="${espd.selectionSatisfiesAll != null && espd.selectionSatisfiesAll.exists}"/>
+
 <tiles:importAttribute name="flow"/>
 
 <script>
@@ -131,7 +133,7 @@
         	}
         %>
         
-        <c:if test="${espd.selectionSatisfiesAll != null && espd.selectionSatisfiesAll.exists}">
+        <c:if test="${usealpha}">
             <div class="panel panel-espd">
                 <div class="panel-heading" data-toggle="collapse" data-target="#eo-satisfies-all-section">
                     <h4 class="panel-title">${span18n['all_selection_switch']}</h4>
@@ -139,37 +141,38 @@
                 <div id="eo-satisfies-all-section" class="collapse in">
                     <div class="espd-panel-body panel-body">
                         <strong>${span18n['crit_selection_eo_declares_that']}</strong>
-                        <span data-i18n="crit_selection_eo_declares_that_tooltip" data-toggle="tooltip" title="${i18n['crit_selection_eo_satisfies_all_criteria']}"></span>
-                    </div>
-                    <div class="row criteria-row-form">
-                        <div class="col-md-5 criteria-row-check-left">
-                            <div class="form-group">
-                                <div class="col-md-12">
-                                    <strong>${span18n['crit_selection_eo_satisfies_all_criteria']}</strong>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-7 criteria-row-check-right">
-                            <div class="col-md-12">
-                                <div class="form-group">
-                                    ${span18n["crit_your_answer"]}
-                                    <form:radiobutton path="selectionSatisfiesAll.answer" value="true" data-target-hide="${'#'}eo-satisfies-all-form"/>${span18n["yes"]}
-                                    <form:radiobutton path="selectionSatisfiesAll.answer" value="false" data-target-show="${'#'}eo-satisfies-all-form"/>${span18n["no"]}
-                                </div>
-                            </div>
-                        </div>
+                        <span data-i18n="crit_selection_eo_declares_that_tooltip" data-toggle="tooltip" title="${i18n['crit_selection_eo_declares_that_tooltip']}"></span>
+
+	                    <div class="row criteria-row-form">
+	                        <div class="col-md-5 criteria-row-check-left">
+	                            <div class="form-group">
+	                                <div class="col-md-12">
+	                                    <strong>${span18n['crit_selection_eo_satisfies_all_criteria']}</strong>
+	                                </div>
+	                            </div>
+	                        </div>
+	                        <div class="col-md-7 criteria-row-check-right">
+	                            <div class="col-md-12">
+	                                <div class="form-group">
+	                                    ${span18n["crit_your_answer"]}
+	                                    <form:radiobutton path="selectionSatisfiesAll.answer" value="true"/>${span18n["yes"]}
+	                                    <form:radiobutton path="selectionSatisfiesAll.answer" value="false"/>${span18n["no"]}
+	                                </div>
+	                            </div>
+	                        </div>
+	                    </div>
                     </div>
                 </div>
             </div>
         </c:if>
-
-        <div id="eo-satisfies-all-form" class="${espd['selectionSatisfiesAll'].answer ? 'collapse' : ''}">
-  
-			<tiles:insertDefinition name="topLevelCriteriaTemplate">
-				<tiles:putAttribute name="topLevelCriteriaList" value="${selectionEO}"/>
-			</tiles:insertDefinition>
-
-		</div>
+        
+		<c:if test="${!usealpha}">
+	        <div id="eo-satisfies-all-form">
+				<tiles:insertDefinition name="topLevelCriteriaTemplate">
+					<tiles:putAttribute name="topLevelCriteriaList" value="${selectionEO}"/>
+				</tiles:insertDefinition>
+			</div>
+        </c:if>
         
         <tiles:insertDefinition name="footerButtons">
             <tiles:putAttribute name="prev" value="exclusion"/>
diff --git a/espd-web/src/main/resources/META-INF/resources/static/js/init.js b/espd-web/src/main/resources/META-INF/resources/static/js/init.js
index 7b244ef62..00231df3a 100644
--- a/espd-web/src/main/resources/META-INF/resources/static/js/init.js
+++ b/espd-web/src/main/resources/META-INF/resources/static/js/init.js
@@ -36,19 +36,7 @@ function validator(validators, name, text) {
 
 var defaultValidators = {};
 
-function dataShow() {
-	var elems = $(this).attr("data-target-show").split(";")
-	for (i in elems) {
-		$(elems[i]).fadeIn();
-	}
-}
-						
-function dataHide() {
-	var elems = $(this).attr("data-target-hide").split(";")
-	for (i in elems) {
-		$(elems[i]).hide();
-	}
-}
+
 
 function language(code) {
     var flags = [];

From 6eb85e111552bfef6fb4d0ae70c3aa20039042d1 Mon Sep 17 00:00:00 2001
From: Alexey Lukashov <Alexey.Lukashov@ext.ec.europa.eu>
Date: Fri, 12 May 2017 15:57:36 +0200
Subject: [PATCH 2/5] #169 add 3rd case for alpha

---
 .../ec/grow/espd/domain/EspdDocument.java     | 24 ++++++---
 .../enums/criteria/SelectionCriterion.java    |  1 -
 .../common/exporting/UblCriteriaTemplate.java |  2 +-
 .../WEB-INF/views/wizard/selectionCA.jsp      |  5 +-
 .../WEB-INF/views/wizard/selectionEO.jsp      | 50 ++++++++++++++++---
 5 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/EspdDocument.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/EspdDocument.java
index 8700d8abd..ddc3ee34b 100644
--- a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/EspdDocument.java
+++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/EspdDocument.java
@@ -145,14 +145,26 @@ public class EspdDocument {
 
 	private List<CriterionType> ublCriteria;
 
-	public final boolean atLeastOneSelectionCriterionWasSelected() {
-		boolean atLeastOnePresent = false;
-		for (SelectionCriterion ccvCriterion :
-				SelectionCriterion.values()) {
+	public final boolean getAtLeastOneSelectionCriterionWasSelected() {
+		for (SelectionCriterion ccvCriterion : SelectionCriterion.values()) {
 			EspdCriterion espdCriterion = readCriterionFromEspd(ccvCriterion);
-			atLeastOnePresent = atLeastOnePresent | (espdCriterion != null && espdCriterion.getExists());
+			if(espdCriterion != null && espdCriterion.getExists()) {
+				return true;
+			}
 		}
-		return atLeastOnePresent;
+		return false;
+	}
+
+	public final boolean getAllSelectionCriterionWasSelectedExceptAlpha() {
+		for (SelectionCriterion ccvCriterion : SelectionCriterion.values()) {
+			if(!SelectionCriterion.ALL_SELECTION_CRITERIA_SATISFIED.getUuid().equals(ccvCriterion.getUuid())) {
+				EspdCriterion espdCriterion = readCriterionFromEspd(ccvCriterion);
+				if(espdCriterion == null || !espdCriterion.getExists()) {
+					return false;
+				}
+			}
+		}
+		return true;
 	}
 
 	/**
diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/criteria/SelectionCriterion.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/criteria/SelectionCriterion.java
index 263114193..1bfd78606 100644
--- a/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/criteria/SelectionCriterion.java
+++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/domain/enums/criteria/SelectionCriterion.java
@@ -122,5 +122,4 @@ public CcvLegislation getLegislation() {
     public CcvCriterionType getCriterionType() {
         return this.criterionType;
     }
-
 }
diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/xml/common/exporting/UblCriteriaTemplate.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/xml/common/exporting/UblCriteriaTemplate.java
index b4150388d..840a05f2c 100644
--- a/espd-web/src/main/java/eu/europa/ec/grow/espd/xml/common/exporting/UblCriteriaTemplate.java
+++ b/espd-web/src/main/java/eu/europa/ec/grow/espd/xml/common/exporting/UblCriteriaTemplate.java
@@ -75,7 +75,7 @@ private List<CriterionType> addExclusionCriteria(EspdDocument espdDocument) {
 	private List<CriterionType> addSelectionCriteria(EspdDocument espdDocument) {
 
 		List<CriterionType> criterionTypes = new ArrayList<>(SelectionCriterion.values().length + 1);
-		if (!espdDocument.atLeastOneSelectionCriterionWasSelected()) {
+		if (!espdDocument.getAtLeastOneSelectionCriterionWasSelected()) {
 			// Option 3:
 			// CA selects no selection criteria -> EO sees all selection criteria (including "All selection criteria")
 			for (SelectionCriterion criterion : SelectionCriterion.values()) {
diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionCA.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionCA.jsp
index cab271241..85f54ec3c 100644
--- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionCA.jsp
+++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionCA.jsp
@@ -52,9 +52,8 @@
                 <span data-i18n="createcasel_header"><s:message code="createcasel_header"/></span>
             </h2>
         </div>
-        <div class="alert alert-espd-info-dotted"
+        <div class="alert alert-espd-info-dotted">
                     ${span18n['createcasel_alert']}
-  
 					<label class="control-label">${span18n['question_to_use_alpha']}</label>
 					<form:radiobutton name="usealpha" path="selectionSatisfiesAll.exists" data-target-show="#ca-selection-criteria" data-target-hide="#alpha-criterion" value="false"/>${span18n['yes']}
 					<form:radiobutton name="usealpha" path="selectionSatisfiesAll.exists" data-target-show="#alpha-criterion" data-target-hide="#ca-selection-criteria" value="true"/>${span18n['no']}
@@ -78,7 +77,7 @@
             </div>
         </div>
         
-        <div class="tab-pane active" id="ca-selection-criteria" style="${usealpha?'display:none':''}">
+        <div id="ca-selection-criteria" class="tab-pane active" style="${usealpha?'display:none':''}">
 			<tiles:insertDefinition name="topLevelCriteriaTemplate">
 				<tiles:putAttribute name="topLevelCriteriaList" value="${selectionCA}"/>
 			</tiles:insertDefinition>
diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp
index 94ea79082..31f1ce314 100644
--- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp
+++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp
@@ -40,7 +40,17 @@
 
 <%request.setAttribute("selectionEO", eu.europa.ec.grow.espd.xml.CriteriaTemplates.selectionEO);%>
 
-<c:set var="usealpha" value="${espd.selectionSatisfiesAll != null && espd.selectionSatisfiesAll.exists}"/>
+
+
+<%-- Alpha criterion selected --%>
+<c:set var="use_alpha" value="${espd.selectionSatisfiesAll.exists}"/>
+
+<%-- Alpha criterion not selected but other selection criteria exists --%>
+<c:set var="use_atod" value="${espd.atLeastOneSelectionCriterionWasSelected && !espd.selectionSatisfiesAll.exists }"/>
+
+<%-- Both options when no selection and no alpha selecter OR all selection and alpha selected or not selected --%>
+<c:set var="use_both" value="${(!espd.atLeastOneSelectionCriterionWasSelected && espd.selectionSatisfiesAll.exists == false) || espd.allSelectionCriterionWasSelectedExceptAlpha}"/>
+
 
 <tiles:importAttribute name="flow"/>
 
@@ -133,8 +143,20 @@
         	}
         %>
         
-        <c:if test="${usealpha}">
-            <div class="panel panel-espd">
+        <c:if test="${use_both}">
+			<div class="alert alert-espd-info-dotted">
+				${span18n['createcasel_alert']}
+				<label class="control-label">${span18n['question_to_use_alpha']}</label>
+				<form:radiobutton name="usealpha" path="selectionSatisfiesAll.exists" data-target-show="#eo-selection-criteria" data-target-hide="#alpha-criterion" value="false"/>${span18n['yes']}
+				<form:radiobutton name="usealpha" path="selectionSatisfiesAll.exists" data-target-show="#alpha-criterion" data-target-hide="#eo-selection-criteria" value="true"/>${span18n['no']}
+			</div>
+        </c:if>
+        
+        
+
+		<c:if test="${use_both || use_alpha}">
+		
+            <div id="alpha-criterion"  class="panel panel-espd" style="${use_both?(espd.selectionSatisfiesAll.exists ? '' : 'display:none'):''}">
                 <div class="panel-heading" data-toggle="collapse" data-target="#eo-satisfies-all-section">
                     <h4 class="panel-title">${span18n['all_selection_switch']}</h4>
                 </div>
@@ -166,17 +188,33 @@
             </div>
         </c:if>
         
-		<c:if test="${!usealpha}">
-	        <div id="eo-satisfies-all-form">
+		<c:if test="${use_both || use_atod}">
+	        <div id="eo-selection-criteria" style="${use_both?(espd.selectionSatisfiesAll.exists ? 'display:none' : ''):''}">
 				<tiles:insertDefinition name="topLevelCriteriaTemplate">
 					<tiles:putAttribute name="topLevelCriteriaList" value="${selectionEO}"/>
 				</tiles:insertDefinition>
 			</div>
         </c:if>
         
+                    <div class="alert alert-espd-info-dotted">
+	<h1>DEBUGGY:</h1>
+	selectionSatisfiesAll.exists : ${espd.selectionSatisfiesAll.exists} <br>
+	atLeastOneSelectionCriterionWasSelected : ${espd.atLeastOneSelectionCriterionWasSelected} <br>
+	allSelectionCriterionWasSelectedExceptAlpha : ${espd.allSelectionCriterionWasSelectedExceptAlpha} <br><br>
+	use_alpha : ${use_alpha} <br>
+	use_atod : ${use_atod} <br>
+	use_both : ${use_both} <br>
+</div>
+        
         <tiles:insertDefinition name="footerButtons">
             <tiles:putAttribute name="prev" value="exclusion"/>
             <tiles:putAttribute name="next" value="finish"/>
         </tiles:insertDefinition>
+        
+
     </div>
-</form:form>
\ No newline at end of file
+    
+
+</form:form>
+
+

From 3024b8e8f8aab952a983619a2f626d7f0d996a65 Mon Sep 17 00:00:00 2001
From: lukasal <lukasal@S-CI-RDS-0048.net1.cec.eu.int>
Date: Wed, 17 May 2017 14:30:10 +0200
Subject: [PATCH 3/5] # WARNING: head commit changed in the meantime

ip
---
 .../euCriteriaListTemplate.jsp                |  8 ++--
 .../resources/WEB-INF/views/print.jsp         | 42 +++++++++----------
 .../WEB-INF/views/wizard/selectionEO.jsp      | 10 -----
 .../main/resources/i18n/messages.properties   |  9 ----
 .../resources/i18n/messages_bg.properties     |  9 +++-
 .../resources/i18n/messages_cs.properties     |  9 +++-
 .../resources/i18n/messages_da.properties     |  9 +++-
 .../resources/i18n/messages_de.properties     |  9 +++-
 .../resources/i18n/messages_el.properties     |  9 +++-
 .../resources/i18n/messages_en.properties     | 15 ++++---
 .../resources/i18n/messages_es.properties     |  9 +++-
 .../resources/i18n/messages_et.properties     |  9 +++-
 .../resources/i18n/messages_fi.properties     |  9 +++-
 .../resources/i18n/messages_fr.properties     |  9 +++-
 .../resources/i18n/messages_hr.properties     |  9 +++-
 .../resources/i18n/messages_hu.properties     |  9 +++-
 .../resources/i18n/messages_it.properties     |  9 +++-
 .../resources/i18n/messages_lt.properties     |  9 +++-
 .../resources/i18n/messages_lv.properties     |  9 +++-
 .../resources/i18n/messages_mt.properties     |  9 +++-
 .../resources/i18n/messages_nl.properties     |  9 +++-
 .../resources/i18n/messages_no.properties     |  9 +++-
 .../resources/i18n/messages_pl.properties     |  9 +++-
 .../resources/i18n/messages_pt.properties     |  9 +++-
 .../resources/i18n/messages_ro.properties     |  9 +++-
 .../resources/i18n/messages_sk.properties     |  9 +++-
 .../resources/i18n/messages_sl.properties     |  9 +++-
 .../resources/i18n/messages_sv.properties     |  9 +++-
 28 files changed, 216 insertions(+), 75 deletions(-)

diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/euCriteriaListTemplate.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/euCriteriaListTemplate.jsp
index 2d6b3fad3..a02334614 100644
--- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/euCriteriaListTemplate.jsp
+++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/criteriaTemplates/euCriteriaListTemplate.jsp
@@ -36,12 +36,12 @@
 <tiles:importAttribute name="disableTooltips"/>
 <tiles:importAttribute name="criteriaList"/>
 
-<c:set var="atLeastOneCriterionExists" value="false"/>
+<c:set var="atLeastOneCriterionExists" value="${false}"/>
 <c:forEach var="criterion" items="${criteriaList}">
-    <c:set var="atLeastOneCriterionExists" value="${atLeastOneCriterionExists || espd[criterion.field].exists}"/>
+    <c:set var="atLeastOneCriterionExists" value="${atLeastOneCriterionExists || (espd[criterion.field].exists == true)}"/>
 </c:forEach>
-<c:if test="${agent eq 'ca'}">
-    <c:set var="atLeastOneCriterionExists" value="true"/>
+<c:if test="${(agent eq 'ca') && printingjsp != true}">
+    <c:set var="atLeastOneCriterionExists" value="${true}"/>
 </c:if>
 <c:if test="${atLeastOneCriterionExists}">
     <div class="panel panel-espd">
diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp
index a2032332f..ba67479c6 100644
--- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp
+++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/print.jsp
@@ -307,28 +307,26 @@ request.setAttribute("qualityAssuranceListEO", CriteriaTemplates.qualityAssuranc
 		<tiles:insertDefinition name="topLevelCriteriaTemplate">
 			<tiles:putAttribute name="topLevelCriteriaList" value="${exclusionEO}"/>
 		</tiles:insertDefinition>
-
-        <div class="panel panel-espd">
-            <div class="panel-heading" data-toggle="collapse" data-target="#ca-insolvency-section">
-                <h4 class="panel-title">${span18n['crit_top_title_purely_national']}</h4>
-            </div>
-            <div id="ca-insolvency-section" class="collapse in">
-                <div class="espd-panel-body panel-body">
-                    <span data-i18n="crit_eu_main_breaching_obligations" style="font-weight: bold;">
-                        <s:message code='crit_eu_main_purely_national'/>
-                    </span>
-                    <c:if test="${espd.purelyNationalGrounds != null && espd.purelyNationalGrounds.exists}">
-                        <tiles:insertDefinition name="exclusionFormTemplate">
-                            <tiles:putAttribute name="field" value="purelyNationalGrounds"/>
-                            <tiles:putAttribute name="title_code" value="crit_eu_title_purely_national"/>
-                            <tiles:putAttribute name="description_code" value="crit_eu_text_purely_national"/>
-                            <tiles:putAttribute name="selfCleaning" value="false"/>
-	              	    	<tiles:putAttribute name="hasCriterion" value="false"/>
-                        </tiles:insertDefinition>
-                    </c:if>
-                </div>
-            </div>
-        </div>
+		
+ 		<c:if test="${espd.purelyNationalGrounds != null && espd.purelyNationalGrounds.exists}">
+	        <div class="panel panel-espd">
+	            <div class="panel-heading" data-toggle="collapse" data-target="#ca-insolvency-section">
+	                <h4 class="panel-title">${span18n['crit_top_title_purely_national']}</h4>
+	            </div>
+	            <div id="ca-insolvency-section" class="collapse in">
+	                <div class="espd-panel-body panel-body">
+	                    <b>${span18n['crit_eu_main_purely_national']}</b>
+	                    <tiles:insertDefinition name="exclusionFormTemplate">
+	                        <tiles:putAttribute name="field" value="purelyNationalGrounds"/>
+	                        <tiles:putAttribute name="title_code" value="crit_eu_title_purely_national"/>
+	                        <tiles:putAttribute name="description_code" value="crit_eu_text_purely_national"/>
+	                        <tiles:putAttribute name="selfCleaning" value="false"/>
+		                	<tiles:putAttribute name="hasCriterion" value="false"/>
+	                    </tiles:insertDefinition>
+	                </div>
+	            </div>
+	        </div>
+        </c:if>
     </div>
 
 	<%-- SELECTION --%>
diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp
index 31f1ce314..96a8fcab8 100644
--- a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp
+++ b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/wizard/selectionEO.jsp
@@ -196,16 +196,6 @@
 			</div>
         </c:if>
         
-                    <div class="alert alert-espd-info-dotted">
-	<h1>DEBUGGY:</h1>
-	selectionSatisfiesAll.exists : ${espd.selectionSatisfiesAll.exists} <br>
-	atLeastOneSelectionCriterionWasSelected : ${espd.atLeastOneSelectionCriterionWasSelected} <br>
-	allSelectionCriterionWasSelectedExceptAlpha : ${espd.allSelectionCriterionWasSelectedExceptAlpha} <br><br>
-	use_alpha : ${use_alpha} <br>
-	use_atod : ${use_atod} <br>
-	use_both : ${use_both} <br>
-</div>
-        
         <tiles:insertDefinition name="footerButtons">
             <tiles:putAttribute name="prev" value="exclusion"/>
             <tiles:putAttribute name="next" value="finish"/>
diff --git a/espd-web/src/main/resources/i18n/messages.properties b/espd-web/src/main/resources/i18n/messages.properties
index cdddeb657..ead146af0 100644
--- a/espd-web/src/main/resources/i18n/messages.properties
+++ b/espd-web/src/main/resources/i18n/messages.properties
@@ -209,12 +209,3 @@ currency_ZWD=ZWD (Zimbabwe Dollar)
 createeo_eo_consortium_name=Consortium Name
 
 ok=OK
-
-information_for_country_in_ecertis=Information for {0} on e-Certis
-more_information=More information
-less_information=Less information
-
-# for crit_information_available_electronically text was replaced
-crit_information_available_electronically=Is this information freely available electronically from an EU Member State database?
-
-question_to_use_alpha=Do you want to use the selection criteria from A to D?
\ No newline at end of file
diff --git a/espd-web/src/main/resources/i18n/messages_bg.properties b/espd-web/src/main/resources/i18n/messages_bg.properties
index a2a3817fc..c226d3a24 100644
--- a/espd-web/src/main/resources/i18n/messages_bg.properties
+++ b/espd-web/src/main/resources/i18n/messages_bg.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Необхо
 crit_selection_suitability_service_contracts_membership_main=За поръчки за услуги: необходимо е членство в определена организация
 crit_selection_technical_allowance_of_checks_description=За комплексни стоки или услуги, или по изключение за стоки или услуги, които са със специално предназначение: Икономическият оператор ще позволи ли извършването на проверки на неговия производствен или технически капацитет и когато е необходимо, на средствата за проучване и изследване, с които разполага, както и на мерките за контрол на качеството? Проверката се извършва от възлагащия орган или, при съгласие от негова страна, от негово име от компетентен официален орган на държавата, в която е установен доставчикът на стоки или услуги.
 crit_selection_technical_allowance_of_checks_main=Допускане на проверки
-crit_selection_technical_average_annual_manpower_description=Средната годишна численост на състава на икономическия оператор и броят на  ръководния персонал през последните три години е, както следва:
 crit_selection_technical_average_annual_manpower_main=Средна годишна численост на състава
 crit_selection_technical_educational_professional_qualifications_description=Доставчикът на услугата или самият изпълнител и/или ръководният му състав (в зависимост от изискванията, посочени в обявлението или в документацията за обществената поръчка) притежават следната образователна и професионална квалификация:
 crit_selection_technical_educational_professional_qualifications_main=Образователна и професионална квалификация
@@ -670,3 +669,11 @@ zip_instructions=Настоящото представлява кратка до
   \r\n\r\nespd.XML: XML файлът е файл, който може да бъде разчетен от нашата система за ЕЕДОП или от други съвместими с нея системи за ЕЕДОП. Предимството да се използва еЕЕДОП във формат XML е, че купувачите и дружествата могат да използват файла повторно за други процедури в бъдеще. XML файлът следва да се изпрати заедно с документацията за обществената поръчка (от възлагащия орган за дружествата) или като част от офертата (от съответното дружество за възлагащия орган).\
   \r\n\r\nespd.PDF: PDF файлът е четим от човек еЕЕДОП файл. За него също препоръчваме, както за XML файла, да се изпрати заедно с документацията за обществената поръчка (от възлагащия орган за дружествата) или като част от офертата (от съответното дружество за възлагащия орган) като референтен документ.\
   \r\n\r\nАко имате въпроси относно файловете, моля, не се колебайте да се свържете с нас чрез електронна поща на адрес: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Информация за {0} в системата e-Certis
+more_information=Повече информация
+less_information=По-малко информация
+question_to_use_alpha=Желаете ли да използвате критериите за подбор от А до Г?
+
+crit_selection_technical_average_annual_manpower_description=Средната годишна численост на състава на икономическия оператор през последните три години е, както следва:
+crit_information_available_electronically=Тази информация достъпна ли е безплатно за органите от база данни в държава — членка на ЕС?
diff --git a/espd-web/src/main/resources/i18n/messages_cs.properties b/espd-web/src/main/resources/i18n/messages_cs.properties
index 2fdd00496..55a444bf5 100644
--- a/espd-web/src/main/resources/i18n/messages_cs.properties
+++ b/espd-web/src/main/resources/i18n/messages_cs.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Je k poskyto
 crit_selection_suitability_service_contracts_membership_main=Veřejné zakázky / zakázky na služby: potřeba členství v určité organizaci
 crit_selection_technical_allowance_of_checks_description=Dodávky složitých výrobků nebo služeb nebo výrobků a služeb výjimečně požadovaných pro zvláštní účel: Umožní hospodářský subjekt kontrolu svých výrobních kapacit nebo technické způsobilosti a případně i kontrolu studijních a výzkumných prostředků, které má k dispozici, a opatření kontroly kvality? Kontrolu provádí veřejný zadavatel nebo jeho jménem a s jeho souhlasem příslušný úřední orgán země, v níž má dodavatel nebo poskytovatel služeb své sídlo.
 crit_selection_technical_allowance_of_checks_main=Umožnění kontroly
-crit_selection_technical_average_annual_manpower_description=Průměrný roční počet zaměstnanců hospodářského subjektu a počet jeho vedoucích pracovníků za poslední tři roky činí:
 crit_selection_technical_average_annual_manpower_main=Průměrný roční počet zaměstnanců
 crit_selection_technical_educational_professional_qualifications_description=Uvedené vzdělání a odbornou kvalifikaci má sám poskytovatel služeb nebo zhotovitel a/nebo (v závislosti na požadavcích v příslušném oznámení nebo zadávací dokumentaci) jeho vedoucí pracovníci.
 crit_selection_technical_educational_professional_qualifications_main=Vzdělání a odborná kvalifikace
@@ -670,3 +669,11 @@ zip_instructions=Toto je stručná dokumentace týkající se souborů jednotné
   \r\n\r\nespd.XML: Soubor XML je soubor, který je pro naši službu jednotného osvědčení nebo jiné kompatibilní služby jednotného osvědčení srozumitelný. Výhoda používání elektronického jednotného osvědčení ve formě souboru XML spočívá v tom, že jej kupující a podniky mohou v budoucnosti znovu použít pro jiná řízení. Mělo by být odesíláno společně se zadávací dokumentací (od veřejného zadavatele podnikům) nebo jako součást nabídky (z podniku veřejnému zadavateli).\
   \r\n\r\nespd.PDF: Soubor PDF je soubor elektronického jednotného osvědčení čitelný pro člověka. Zde také doporučujeme používat jej vedle formátu XML se zadávací dokumentací (od veřejného zadavatele podnikům) nebo jako součást nabídky (z podniku veřejnému zadavateli) jakožto referenční dokument.\
   \r\n\r\nMáte-li otázky týkající se souborů, kontaktujte nás na této e-mailové adrese: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Informace pro: {0} v e-Certis
+more_information=Více informací
+less_information=Méně informací
+question_to_use_alpha=Chcete použít kvalifikační kritéria pro výběr od A do D?
+
+crit_selection_technical_average_annual_manpower_description=Průměrný roční počet zaměstnanců hospodářského subjektu za poslední tři roky činí:
+crit_information_available_electronically=Je tato informace orgánům bezplatně k dispozici z databáze členského státu EU?
diff --git a/espd-web/src/main/resources/i18n/messages_da.properties b/espd-web/src/main/resources/i18n/messages_da.properties
index e08e84a79..c23230e70 100644
--- a/espd-web/src/main/resources/i18n/messages_da.properties
+++ b/espd-web/src/main/resources/i18n/messages_da.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Er det nødv
 crit_selection_suitability_service_contracts_membership_main=For så vidt angår tjenesteydelseskontrakter: medlemskab af en bestemt organisation nødvendigt
 crit_selection_technical_allowance_of_checks_description=For komplekse produkter eller tjenesteydelser, der skal leveres, eller undtagelsesvis for produkter eller tjenesteydelser, som kræves til et særligt formål: Vil den økonomiske aktør tillade, at der foretages kontrol af dennes produktionskapacitet eller tekniske formåen og, om nødvendigt, af de undersøgelses- og forskningsfaciliteter, som denne råder over, og af kvalitetskontrolforanstaltningerne? Kontrollen skal foretages af den ordregivende myndighed eller, hvis denne indvilliger heri, på dennes vegne af et kompetent officielt organ i det land, hvor leverandøren eller tjenesteyderen er etableret.
 crit_selection_technical_allowance_of_checks_main=Tilladelse til kontrol
-crit_selection_technical_average_annual_manpower_description=Den økonomiske aktørs årlige gennemsnitlige antal beskæftigede og antallet af ledende medarbejdere gennem de sidste tre år var som følger:
 crit_selection_technical_average_annual_manpower_main=Årlige gennemsnitlige antal beskæftigede
 crit_selection_technical_educational_professional_qualifications_description=Følgende uddannelsesmæssige og faglige kvalifikationer indehaves af tjenesteyderen eller leverandøren selv, og/eller (afhængigt af, hvilke krav der er fastsat i den relevante meddelelse eller i udbudsdokumenterne) af de ledende medarbejdere.
 crit_selection_technical_educational_professional_qualifications_main=Uddannelsesmæssige og faglige kvalifikationer
@@ -670,3 +669,11 @@ zip_instructions=Dette er en kort dokumentation for de ESPD-filer, som De finder
   \r\n\r\nespd.XML: XML-filen er en fil, som vores ESPD-tjeneste eller andre kompatible ESPD-tjenester kan forstå. Fordelen ved at anvende en XML-fil som eESPD er, at købere og virksomheder kan genanvende den til andre procedurer i fremtiden. Den bør sendes sammen med udbudsdokumenterne (fra en myndighed til virksomheder) eller som led i buddet (fra en virksomhed til en myndighed).\
   \r\n\r\nespd.PDF: PDF-filen er en menneskeligt læsbar fil af eESPD. Vi foreslår ligeledes her, at den anvendes tillige med XML-formatet sammen med udbudsdokumenterne (fra en myndighed til virksomheder) eller som led i buddet (fra en virksomhed til en myndighed).\
   \r\n\r\nHvis De har spørgsmål vedrørende filerne, er De velkommen til at kontakte os på følgende e-mailadresse: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Oplysninger til {0} om e-Certis
+more_information=Flere oplysninger
+less_information=Færre oplysninger
+question_to_use_alpha=Ønsker De at anvende udvælgelseskriterierne A-D?
+
+crit_selection_technical_average_annual_manpower_description=Den økonomiske aktørs årlige gennemsnitlige antal beskæftigede gennem de sidste tre år var som følger:
+crit_information_available_electronically=Er disse oplysninger gratis tilgængelige for myndighederne fra en EU-medlemsstats database?
diff --git a/espd-web/src/main/resources/i18n/messages_de.properties b/espd-web/src/main/resources/i18n/messages_de.properties
index a7d1cb163..d02c61ac2 100644
--- a/espd-web/src/main/resources/i18n/messages_de.properties
+++ b/espd-web/src/main/resources/i18n/messages_de.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Ist die Mitg
 crit_selection_suitability_service_contracts_membership_main=Bei Dienstleistungsaufträgen: Mitgliedschaft in einer bestimmten Organisation erforderlich
 crit_selection_technical_allowance_of_checks_description=Wenn die zu liefernden Waren oder die zu erbringenden Dienstleistungen komplexer Art sind oder – ausnahmsweise – wenn sie einem besonderen Zweck dienen sollen: Der Wirtschaftsteilnehmer wird Kontrollen gestatten, die seine Produktionskapazität bzw. seine technische Leistungsfähigkeit und erforderlichenfalls seine Untersuchungs- und Forschungsmöglichkeiten sowie die von ihm für die Qualitätskontrolle getroffenen Vorkehrungen betreffen. Die Kontrollen werden vom öffentlichen Auftraggeber oder – mit dessen Einwilligung – in seinem Namen von einer zuständigen amtlichen Stelle des Landes, in dem der Lieferant oder Dienstleister ansässig ist, vorgenommen.
 crit_selection_technical_allowance_of_checks_main=Gestatten von Kontrollen
-crit_selection_technical_average_annual_manpower_description=Die durchschnittliche jährliche Beschäftigtenzahl des Wirtschaftsteilnehmers und die Zahl seiner Führungskräfte in den letzten drei Jahren beliefen sich auf:
 crit_selection_technical_average_annual_manpower_main=Durchschnittliche jährliche Beschäftigtenzahl
 crit_selection_technical_educational_professional_qualifications_description=Über die folgenden Ausbildungsnachweise und Bescheinigungen über die berufliche Befähigung verfügen der Dienstleister oder der Unternehmer selbst und/oder (in Abhängigkeit von den in der einschlägigen Bekanntmachung oder in den Auftragsunterlagen genannten Anforderungen) seine Führungskräfte:
 crit_selection_technical_educational_professional_qualifications_main=Ausbildungsnachweise und Bescheinigungen über die berufliche Befähigung
@@ -670,3 +669,11 @@ zip_instructions=Dies ist eine Kurzdokumentation über die EEE-Dateien, die Sie
   \r\n\r\neee.XML: Diese XML-Datei ist eine Datei, die unser EEE-Dienst oder ein anderer kompatibler ESPD-Dienst verarbeiten kann. Wenn für die eEEE eine XML-Datei verwendet wird, so hat dies den Vorteil, dass sie Beschaffer und Unternehmen für künftige Verfahren wiederverwenden können. Sie sollte mit den Auftragsunterlagen (einer Behörde für ein Unternehmen) oder als Teil des Angebots (eines Unternehmens für eine Behörde) mitgeschickt werden.\
   \r\n\r\neee.PDF: Die PDF-Datei enthält die eEEE in einer vom Menschen lesbaren Form. Ferner wird vorschlagen, dass sie zusammen mit dem XML-Format mit den Auftragsunterlagen (einer Behörde für ein Unternehmen) oder als Teil des Angebots (eines Unternehmens für eine Behörde) verwendet wird.\
   \r\n\r\nBei Fragen zu den Dateien können Sie uns jederzeit per E-Mail unter grow-espd@ec.europa.eu kontaktieren.
+
+information_for_country_in_ecertis=Informationen für {0} auf e-Certis
+more_information=Mehr Informationen
+less_information=Weniger Informationen
+question_to_use_alpha=Möchten Sie die Auswahlkriterien A bis D verwenden?
+
+crit_selection_technical_average_annual_manpower_description=Die durchschnittliche jährliche Beschäftigtenzahl des Wirtschaftsteilnehmers in den vergangenen drei Jahren belief sich auf:
+crit_information_available_electronically=Können diese Informationen von den Behörden kostenfrei in der Datenbank eines EU-Mitgliedstaats abgefragt werden?
diff --git a/espd-web/src/main/resources/i18n/messages_el.properties b/espd-web/src/main/resources/i18n/messages_el.properties
index 3009902c7..08e708b25 100644
--- a/espd-web/src/main/resources/i18n/messages_el.properties
+++ b/espd-web/src/main/resources/i18n/messages_el.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Χρειάζ
 crit_selection_suitability_service_contracts_membership_main=Για τις συμβάσεις υπηρεσιών: απαιτείται η ιδιότητα μέλους συγκεκριμένου οργανισμού
 crit_selection_technical_allowance_of_checks_description=Για σύνθετα προϊόντα ή υπηρεσίες που παρέχονται ή, κατ’ εξαίρεση, για προϊόντα ή υπηρεσίες που πρέπει να ανταποκρίνονται σε κάποιον ιδιαίτερο σκοπό: Ο οικονομικός φορέας θα επιτρέπει τη διενέργεια ελέγχων όσον αφορά το παραγωγικό δυναμικό ή τις τεχνικές ικανότητες του οικονομικού φορέα και, εφόσον κρίνεται αναγκαίο, όσον αφορά τα μέσα μελέτης και έρευνας που αυτός διαθέτει καθώς και τα μέτρα που λαμβάνει για τον έλεγχο της ποιότητας; Ο έλεγχος πρόκειται να διενεργείται από την αναθέτουσα αρχή ή, εφόσον αυτή συγκατατεθεί, εξ ονόματός της από αρμόδιο επίσημο οργανισμό της χώρας όπου είναι εγκατεστημένος ο προμηθευτής ή ο πάροχος υπηρεσιών.
 crit_selection_technical_allowance_of_checks_main=Αποδοχή ελέγχων
-crit_selection_technical_average_annual_manpower_description=Το μέσο ετήσιο εργατοϋπαλληλικό δυναμικό του οικονομικού φορέα και ο αριθμός των διευθυντικών στελεχών του κατά τα τελευταία τρία έτη ήταν τα εξής:
 crit_selection_technical_average_annual_manpower_main=Μέσο ετήσιο εργατοϋπαλληλικό δυναμικό
 crit_selection_technical_educational_professional_qualifications_description=Ο πάροχος της υπηρεσίας ή ο ίδιος ο ανάδοχος και/ή (ανάλογα με τις απαιτήσεις που καθορίζονται στη σχετική προκήρυξη ή στα έγγραφα σύναψης της σύμβασης) το διευθυντικό του προσωπικό διαθέτει τα παρακάτω εκπαιδευτικά και επαγγελματικά προσόντα του.
 crit_selection_technical_educational_professional_qualifications_main=Τίτλοι σπουδών και επαγγελματικών προσόντων
@@ -670,3 +669,11 @@ zip_instructions=Σύντομη παρουσίαση των αρχείων το
   \r\n\r\nespd.XML: Το αρχείο XML είναι αρχείο που η υπηρεσία μας ΕΕΕΠ ή άλλες συμβατές υπηρεσίες ΕΕΕΠ μπορούν να κατανοήσουν. Το πλεονέκτημα της χρήσης του eΕΕΕΠ με τη μορφή αρχείου XML έγκειται στο ότι οι αγοραστές και οι εταιρείες μπορούν να το χρησιμοποιήσουν εκ νέου σε άλλες διαδικασίες στο μέλλον. Θα πρέπει να αποστέλλεται μαζί με τα έγγραφα της προμήθειας (από την αναθέτουσα αρχή σε εταιρείες) ή στο πλαίσιο της προσφοράς (από εταιρεία στην αναθέτουσα αρχή).\
   \r\n\r\nespd.PDF: Το αρχείο PDF είναι αρχείο του eΕΕΕΠ σε μορφή αναγνώσιμη από άνθρωπο. Προτείνουμε, και σε αυτή την περίπτωση, να χρησιμοποιείται παράλληλα με το μορφότυπο XML, με τα έγγραφα της προμήθειας (από την αναθέτουσα αρχή σε εταιρείες) ή στο πλαίσιο της προσφοράς (από εταιρεία στην αναθέτουσα αρχή) ως έγγραφο αναφοράς.\
   \r\n\r\nΕάν έχετε ερωτήσεις σχετικά με τα αρχεία μη διστάσετε να έρθετε σε επαφή μαζί μας μέσω ηλεκτρονικού ταχυδρομείου στη διεύθυνση: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Πληροφορίες για {0} στο e-Certis
+more_information=Περισσότερες πληροφορίες
+less_information=Λιγότερες πληροφορίες
+question_to_use_alpha=Θέλετε να χρησιμοποιήσετε τα κριτήρια επιλογής από το Α έως το D;
+
+crit_selection_technical_average_annual_manpower_description=Το μέσο ετήσιο εργατικό δυναμικό του οικονομικού φορέα για τα τελευταία τρία έτη:
+crit_information_available_electronically=Είναι οι πληροφορίες αυτές διαθέσιμες δωρεάν για τις αρχές από τη βάση δεδομένων κράτους μέλους της ΕΕ;
diff --git a/espd-web/src/main/resources/i18n/messages_en.properties b/espd-web/src/main/resources/i18n/messages_en.properties
index 927e9a769..bd9489b01 100644
--- a/espd-web/src/main/resources/i18n/messages_en.properties
+++ b/espd-web/src/main/resources/i18n/messages_en.properties
@@ -1,4 +1,4 @@
-      #
+#
 #
 # Copyright 2016 EUROPEAN COMMISSION
 #
@@ -378,7 +378,6 @@ createeo_vat=VAT number, if applicable:
 createeosel_alert=The economic operator should only provide information where the selection criteria concerned have been required by the contracting authority or contracting entity in the relevant notice or in the procurement documents referred to in the notice.
 crit_amount=Amount
 crit_amount_concerned=Amount concerned
-crit_average_turnover=Average turnover
 crit_code=Reference/Code
 crit_country_member_state=Country or Member State concerned
 crit_date=Date
@@ -387,7 +386,6 @@ crit_date_of_conviction_or_decision=Please indicate the date of conviction or de
 crit_decision_final_and_binding=If this breach of obligations was established through a judicial or administrative decision, was this decision final and binding?
 crit_description=Description
 crit_do_you_allow_checks=Do you allow checks?
-crit_end_date=End date
 crit_eu_main_breaching_obligations=Article 57(4) of Directive 2014/24/EU sets out the following reasons for exclusion
 crit_eu_main_breaching_obligations_eo=Article 57(4) of Directive 2014/24/EU sets out the following reasons for exclusion
 crit_eu_main_purely_national=Do the purely national grounds of exclusion, which are specified in the relevant notice or in the procurement documents, apply?
@@ -452,7 +450,6 @@ crit_eu_tooltip_guilty_misconduct_eo=Where applicable, see definitions in nation
 crit_explain_certificates_independent_environmental_description=If not, please explain why and specify which other means of proof concerning the environmental management systems or standards can be provided:
 crit_explain_certificates_independent_quality_description=If not, please explain why and specify which other means of proof concerning the quality assurance scheme can be provided:
 crit_explain_supply_contracts_quality_description=If not, please explain why and state which other means of proof can be provided:
-crit_issuer=Issuer
 crit_length_period_exclusion=Length of the period of exclusion
 crit_number=Number
 crit_number_of_years=Number of years
@@ -517,7 +514,6 @@ crit_selection_suitability_service_contracts_membership_description=Is a particu
 crit_selection_suitability_service_contracts_membership_main=For service contracts: membership of particular organisation needed
 crit_selection_technical_allowance_of_checks_description=For complex products or services to be supplied or, exceptionally, for products or services which are required for a special purpose: The economic operator will allow checks to be conducted on the production capacities or the technical capacity of the economic operator and, where necessary, on the means of study and research which are available to it and on the quality control measures? The check is to be performed by the contracting authority or, in case the latter consents to this, on its behalf by a competent official body of the country in which the supplier or service provider is established.
 crit_selection_technical_allowance_of_checks_main=Allowance of checks
-crit_selection_technical_average_annual_manpower_description=The economic operator's average annual manpower and the number of managerial staff for the last three years were as follows:
 crit_selection_technical_average_annual_manpower_main=Average annual manpower
 crit_selection_technical_educational_professional_qualifications_description=The following educational and professional qualifications are held by the service provider or the contractor itself, and/or (depending on the requirements set out in the relevant notice or the procurement documents) by its managerial staff.
 crit_selection_technical_educational_professional_qualifications_main=Educational and professional qualifications
@@ -553,7 +549,6 @@ crit_selection_technical_work_contracts_performance_works_description=For public
 crit_selection_technical_work_contracts_performance_works_main=For works contracts: performance of works of the specified type
 crit_selection_technical_work_contracts_technicians_description=In the case of public works contracts, the economic operator will be able to call on the following technicians or technical bodies to carry out the work:
 crit_selection_technical_work_contracts_technicians_main=For works contracts: technicians or technical bodies to carry out the work
-crit_start_date=Start date
 crit_taken_self_cleaning_measures=Have you taken measures to demonstrate your reliability ("Self-Cleaning")
 crit_taxes_eo_fulfilled_obligations=Has the economic operator fulfilled its obligations by paying or entering into a binding arrangement with a view to paying the taxes or social security contributions due, including, where applicable, any interest accrued or fines?
 crit_taxes_length_period_of_exclusion=In case of a conviction, insofar as established directly therein, the length of the period of exclusion
@@ -675,3 +670,11 @@ zip_instructions=This is a short documentation of the ESPD files that you find i
   \r\n\r\nespd.XML: The XML file is a file that our ESPD service or other compatible ESPD services can understand. The advantage of using the eESPD as a XML file is that buyers and companies can reuse it for other procedures in the future. It should be sent together with the procurement documents (from authority to companies) or as part of the bid (company to authority).\
   \r\n\r\nespd.PDF: The PDF file is a human readable file of the eESPD. We suggest here as well that it is used alongside the XML format with the procurement documents (from authority to companies) or as part of the bid (company to authority) as a reference document.\
   \r\n\r\nIf you have questions about the files please do not hesitate to get in contact with us through the following email address: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Information for {0} on e-Certis
+more_information=More information
+less_information=Less information
+question_to_use_alpha=Do you want to use the selection criteria from A to D?
+
+crit_information_available_electronically=Is this information available at no cost to the authorities from an EU Member State database?
+crit_selection_technical_average_annual_manpower_description=The economic operator's average annual manpower for the last three years were as follows:
\ No newline at end of file
diff --git a/espd-web/src/main/resources/i18n/messages_es.properties b/espd-web/src/main/resources/i18n/messages_es.properties
index 00ad0b55e..9355c2ed9 100644
--- a/espd-web/src/main/resources/i18n/messages_es.properties
+++ b/espd-web/src/main/resources/i18n/messages_es.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=¿Es preciso
 crit_selection_suitability_service_contracts_membership_main=Cuando se trate de contratos de servicios: necesidad de estar afiliado a una determinada organización
 crit_selection_technical_allowance_of_checks_description=Cuando los productos o servicios que se vayan a suministrar sean complejos o, excepcionalmente, en el caso de productos o servicios que sean necesarios para un fin particular: ¿Autorizará el operador económico que se verifiquen su capacidad de producción o su capacidad técnica y, en su caso, los medios de estudio e investigación de que dispone, así como las medidas de control de la calidad que aplicará? La verificación será efectuada por el poder adjudicador o, en su nombre, cuando este así lo autorice, por un organismo oficial competente del país en el que esté establecido el proveedor de suministros o de servicios.
 crit_selection_technical_allowance_of_checks_main=Autorización de verificaciones
-crit_selection_technical_average_annual_manpower_description=La plantilla media anual del operador económico y el número de directivos durante los tres últimos años fueron los siguientes:
 crit_selection_technical_average_annual_manpower_main=Plantilla media anual
 crit_selection_technical_educational_professional_qualifications_description=El propio proveedor de servicios o contratista y/o (dependiendo de los requisitos fijados en el anuncio pertinente o los pliegos de la contratación) su personal directivo tienen los siguientes títulos de estudios y profesionales.
 crit_selection_technical_educational_professional_qualifications_main=Títulos de estudios y profesionales
@@ -670,3 +669,11 @@ zip_instructions=Esto es una breve documentación de los ficheros DEUC que encon
   \r\n\r\nespd.XML: El fichero XML es uno que nuestro servicio DEUC u otros servicios compatibles DEUC pueden comprender. La ventaja de utilizar el DEUC electrónico como fichero XML es que los compradores y las empresas pueden reutilizarlo para otros procedimientos en el futuro. Debe enviarse junto con los documentos de contratación (del poder adjudicador a las empresas) o como parte de la oferta (de la empresa al poder adjudicador).\
   \r\n\r\nespd.PDF: El fichero PDF es un fichero del DEUC electrónico para lectura humana. También en este caso sugerimos utilizarlo junto con el formato XML con los documentos de contratación (del poder adjudicador a las empresas) o como parte de la oferta (de la empresa al poder adjudicador), como documento de referencia.\
   \r\n\r\nSi tiene preguntas sobre los ficheros, no dude en ponerse en contacto con nosotros a través del buzón funcional en la siguiente dirección: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Información sobre {0} en e-Certis
+more_information=Más información
+less_information=Menos información
+question_to_use_alpha=¿Quiere usar los criterios de selección de A a D?
+
+crit_selection_technical_average_annual_manpower_description=La plantilla media anual del operador económico durante los tres últimos años fue la siguiente:
+crit_information_available_electronically=Esta información, ¿está disponible sin costes para las autoridades en una base de datos de un Estado miembro de la UE?
diff --git a/espd-web/src/main/resources/i18n/messages_et.properties b/espd-web/src/main/resources/i18n/messages_et.properties
index 195710229..ddbc5abcf 100644
--- a/espd-web/src/main/resources/i18n/messages_et.properties
+++ b/espd-web/src/main/resources/i18n/messages_et.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Kas ettevõt
 crit_selection_suitability_service_contracts_membership_main=Teenuslepingute puhul: vajalik kuulumine teatavasse organisatsiooni
 crit_selection_technical_allowance_of_checks_description=Tarnitavate komplekssete toodete või osutatavate komplekssete teenuste puhul või erandjuhul eriotstarbeliste toodete või teenuste puhul: Ettevõtja lubab kontrollida ettevõtja tootmisvõimsust või tehnilist suutlikkust ning vajaduse korral teadusuuringute vahendeid, mis on ettevõtjale kättesaadavad, ja ettevõtja kasutatavaid kvaliteedikontrolli meetmeid. Kontrolli teostab avaliku sektori hankija või tema nõusolekul tegutsev selle riigi pädev asutus, kus tarnija või teenuseosutaja asub.
 crit_selection_technical_allowance_of_checks_main=Kontrollimiste lubamine
-crit_selection_technical_average_annual_manpower_description=Ettevõtja aasta keskmine töötajate ja juhtkonna liikmete arv viimase kolme aasta jooksul:
 crit_selection_technical_average_annual_manpower_main=Aasta keskmine töötajate arv
 crit_selection_technical_educational_professional_qualifications_description=Järgmine haridus ja kutsekvalifikatsioon on olemas teenuseosutajal või töövõtjal endal ja/või (sõltuvalt asjaomases teates või teates viidatud hankedokumentides esitatud nõuetest) ettevõtja juhtkonnal.
 crit_selection_technical_educational_professional_qualifications_main=Haridus- ja kutsekvalifikatsioonid
@@ -670,3 +669,11 @@ zip_instructions=Siin on ZIP-kaustas olevate Euroopa ühtse hankedokumendi faili
   \r\n\r\nespd.XML: XML-fail on meie Euroopa ühtse hankedokumendi teenuse või muude ühilduvate Euroopa ühtse hankedokumendi teenuste jaoks loetav fail. Euroopa ühtse elektroonilise hankedokumendi XML-failina salvestamise eelis on, et ostjad ja äriühingud saavad seda hiljem muudes menetlustes uuesti kasutada. See tuleks saata koos hankedokumentidega (hankijalt äriühingutele) või pakkumuse osana (äriühingult hankijale).\
   \r\n\r\nespd.PDF: PDF-fail on Euroopa ühtse elektroonilise hankedokumendi inimloetav väljund. Soovitame lisaks XML-vormingus failile saata koos hankedokumentidega (hankijalt äriühingutele) või pakkumuse osana (äriühingult hankijale) viitedokumendina ka see fail.\
   \r\n\r\nKui teil on failide kohta küsimusi, võite meiega alati ühendust võtta järgmisel e-posti aadressil: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Teave {0} kohta e-Certis andmebaasis
+more_information=Rohkem teavet
+less_information=Vähem teavet
+question_to_use_alpha=Kas te soovite kasutada valikukriteeriume A–D?
+
+crit_selection_technical_average_annual_manpower_description=Ettevõtja aasta keskmine töötajate arv viimase kolme aasta jooksul:
+crit_information_available_electronically=Kas see teave on ametiasutustele ELi liikmesriigi andmebaasist tasuta kättesaadav?
diff --git a/espd-web/src/main/resources/i18n/messages_fi.properties b/espd-web/src/main/resources/i18n/messages_fi.properties
index 971500a73..d765a56e8 100644
--- a/espd-web/src/main/resources/i18n/messages_fi.properties
+++ b/espd-web/src/main/resources/i18n/messages_fi.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Tarvitaanko
 crit_selection_suitability_service_contracts_membership_main=Palveluhankintasopimukset: tietyn organisaation jäsenyys
 crit_selection_technical_allowance_of_checks_description=Monitahoisten tuotteiden tai palvelujen toimittamisen tai poikkeuksellisesti erityistarkoitusta varten tarvittavien tuotteiden tai palvelujen osalta: Salliiko talouden toimija tuotantokapasiteettinsa tai teknisen suorituskykynsä tarkastukset sekä tarvittaessa käytössään olevien tutkimus- ja kehitysjärjestelmien sekä soveltamiensa laadunvalvontatoimenpiteiden tarkastukset? Tarkastuksen tekee hankintaviranomainen tai, jos hankintaviranomainen tähän suostuu, tarkastuksen tekee tavarantoimittajan tai palveluntarjoajan sijoittautumismaan toimivaltainen virallinen elin hankintaviranomaisen puolesta.
 crit_selection_technical_allowance_of_checks_main=Tarkastusten salliminen
-crit_selection_technical_average_annual_manpower_description=Talouden toimijan keskimääräinen vuosittainen työvoima ja johtohenkilöstön lukumäärä kolmena viime vuotena:
 crit_selection_technical_average_annual_manpower_main=Keskimääräinen vuosittainen työvoima
 crit_selection_technical_educational_professional_qualifications_description=Palveluntarjoajalla tai urakoitsijalla itsellään ja/tai (asiaa koskevassa ilmoituksessa tai hankinta-asiakirjoissa asetetuista vaatimuksista riippuen) sen johtohenkilöstöllä on seuraava koulutus ja ammatillinen pätevyys.
 crit_selection_technical_educational_professional_qualifications_main=Koulutus ja ammattipätevyys
@@ -670,3 +669,11 @@ zip_instructions=Tämä on lyhyt luettelo hankinta-asiakirjatiedostoista, jotka
   \r\n\r\nespd.XML: XML-tiedosto on tiedosto, jonka tämä hankinta-asiakirjapalvelu tai muut yhteensopivat hankinta-asiakirjapalvelut pystyvät lukemaan. XML-tiedostomuodon käytössä sähköisenä yhteisen eurooppalaisen hankinta-asiakirjan tiedostomuotona on etuna se, että ostajat ja yritykset voivat käyttää sitä uudelleen muissa menettelyissä myöhemmin. Se pitäisi lähettää yhdessä hankinta-asiakirjojen kanssa (viranomaiselta yrityksille) tai osana tarjousta (yritykseltä viranomaiselle).\
   \r\n\r\nespd.PDF: PDF-tiedosto on ihmisen luettavissa oleva versio sähköisestä yhteisestä eurooppalaisesta hankinta-asiakirjasta. Ehdotamme, että PDF-tiedostoa käytetään XML-tiedoston ohella yhdessä hankinta-asiakirjojen kanssa (viranomaiselta yrityksille) tai osana tarjousta (yritykseltä viranomaiselle) viiteasiakirjana.\
   \r\n\r\nJos teillä on kysyttävää näistä tiedostoista, ottakaa yhteyttä sähköpostilla osoitteeseen: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Tietoja {0} e-Certisissä
+more_information=Enemmän tietoja
+less_information=Vähemmän tietoja
+question_to_use_alpha=Haluatko käyttää valintaperusteita A–D?
+
+crit_selection_technical_average_annual_manpower_description=Talouden toimijan keskimääräinen vuosittainen työvoima kolmena viime vuotena:
+crit_information_available_electronically=Saavatko viranomaiset nämä tiedot ilmaiseksi jonkin EU:n jäsenvaltion tietokannasta?
diff --git a/espd-web/src/main/resources/i18n/messages_fr.properties b/espd-web/src/main/resources/i18n/messages_fr.properties
index 5718c1c34..a34f7fd35 100644
--- a/espd-web/src/main/resources/i18n/messages_fr.properties
+++ b/espd-web/src/main/resources/i18n/messages_fr.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Est-il néce
 crit_selection_suitability_service_contracts_membership_main=Pour les marchés de services: nécessité de disposer du statut de membre d’une organisation spécifique
 crit_selection_technical_allowance_of_checks_description=Pour les produits ou services à fournir qui sont complexes ou, exceptionnellement, pour les produits ou services qui doivent répondre à un but particulier: L’opérateur économique permettra la réalisation de contrôles portant sur ses capacités de production ou sur sa capacité technique et, si nécessaire, sur les moyens d’étude et de recherche dont il dispose ainsi que sur les mesures de contrôle de la qualité. Le contrôle sera effectué par le pouvoir adjudicateur ou, si ce dernier y consent, en son nom, par un organisme officiel compétent du pays dans lequel le fournisseur ou le prestataire de services est établi.
 crit_selection_technical_allowance_of_checks_main=Autorisation de réaliser des contrôles
-crit_selection_technical_average_annual_manpower_description=Les effectifs moyens annuels de l’opérateur économique et le nombre de gestionnaires pendant les trois dernières années sont les suivants:
 crit_selection_technical_average_annual_manpower_main=Effectifs moyens annuels
 crit_selection_technical_educational_professional_qualifications_description=Les titres d’études et professionnels suivants sont détenus par le prestataire de services ou le contractant lui-même, et/ou (selon les exigences fixées dans l’avis pertinent ou dans les documents de marché) par son personnel d’encadrement.
 crit_selection_technical_educational_professional_qualifications_main=Titres d’études et professionnels
@@ -670,3 +669,11 @@ zip_instructions=Voici quelques brèves informations sur les fichiers DUME conte
   \r\n\r\nespd.XML: Le fichier XML est un fichier que notre service DUME ou d’autres services compatibles DUME peuvent comprendre. L’avantage d’utiliser l’eDUME avec un fichier XML est que les acheteurs et les sociétés pourront le réutiliser plus tard pour d’autres procédures. Il convient de l’envoyer avec les documents de marché (du pouvoir adjudicateur pour les sociétés) ou en tant que partie de l’offre (de la société au pouvoir adjudicateur).\
   \r\n\r\nespd.PDF: Le fichier PDF est un fichier de l’eDUME lisible par l’homme. Nous suggérons que ce fichier aussi soit utilisé parallèlement au format XML avec les documents de marché (du pouvoir adjudicateur pour les sociétés) ou en tant que partie de l’offre (de la société au pouvoir adjudicateur) en tant que document de référence.\
   \r\n\r\nSi vous avez des questions sur ces fichiers, n’hésitez pas à prendre contact avec nous en utilisant l’adresse électronique suivante: grow-espd@ec.europa.eu
+
+information_for_country_in_ecertis=Informations sur {0} dans e-Certis
+more_information=Plus d’informations
+less_information=Moins d’informations
+question_to_use_alpha=Souhaitez-vous utiliser les critères de sélection A à D? 
+
+crit_selection_technical_average_annual_manpower_description=Les effectifs moyens annuels de l’opérateur économique pour les trois dernières années s’établissaient comme suit:
+crit_information_available_electronically=Les pouvoirs adjudicateurs peuvent-ils accéder gratuitement à ces informations dans une base de données d’un État membre de l’UE?
diff --git a/espd-web/src/main/resources/i18n/messages_hr.properties b/espd-web/src/main/resources/i18n/messages_hr.properties
index a4cb4ad38..076f9e8d1 100644
--- a/espd-web/src/main/resources/i18n/messages_hr.properties
+++ b/espd-web/src/main/resources/i18n/messages_hr.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Je li potreb
 crit_selection_suitability_service_contracts_membership_main=Za ugovore o uslugama: potrebno članstvo u određenoj organizaciji
 crit_selection_technical_allowance_of_checks_description=Za složene proizvode ili usluge koji se trebaju isporučiti ili, iznimno, za proizvode ili usluge potrebne za posebnu svrhu: Gospodarski subjekt dopustit će provođenje provjera proizvodnih ili tehničkih kapaciteta gospodarskog subjekta i, prema potrebi, provjera načina analize i istraživanja kojima raspolaže te mjera za kontrolu kvalitete. Javni naručitelj provodi provjeru ili ako potonji na to pristane, u tu svrhu imenuje službeno tijelo države u kojoj dobavljač ili pružatelj usluga ima poslovni nastan.
 crit_selection_technical_allowance_of_checks_main=Dopuštenje za provođenje provjera
-crit_selection_technical_average_annual_manpower_description=prosječni godišnji broj radnika gospodarskog subjekta i broj upravljačkog osoblja za posljednje tri godine iznosio je:
 crit_selection_technical_average_annual_manpower_main=Prosječni godišnji broj radnika
 crit_selection_technical_educational_professional_qualifications_description=Pružatelj usluge ili ugovorni izvođač, i/ili njegovo upravljačko osoblje (ovisno o zahtjevima navedenim u u odgovarajućoj obavijesti ili dokumentaciji o nabavi), posjeduju sljedeće obrazovne i profesionalne kvalifikacije.
 crit_selection_technical_educational_professional_qualifications_main=Obrazovne i profesionalne kvalifikacije
@@ -670,3 +669,11 @@ zip_instructions=Ovo je kratka dokumentacija o ESPD datotekama koje se nalaze u
   \r\n\r\nespd.XML: Usluga ESPD ili druge kompatibilne usluge mogu pročitati XML datoteku. Prednost uporabe eESPD-a kao XML datoteke je u tome što ju kupci i poduzeća mogu u budućnosti ponovno upotrijebiti za druge postupke. Trebalo bi je poslati zajedno s dokumentima u vezi s nabavom (naručitelj je treba uputiti poduzećima) ili u okviru ponude (poduzeće je treba uputiti naručiteljima).\
   \r\n\r\nespd.PDF: PDF datoteka je datoteka sustava eESPD koju korisnik može pročitati. Preporučujemo da se upotrebljava kao referentni dokument uz datoteku u formatu XML kada je riječ o dokumentima u vezi s nabavom (naručitelj ih šalje poduzećima) ili u okviru ponude (poduzeće je šalje naručitelju). \
   \r\n\r\nAko imate pitanja u vezi s datotekama, slobodno nam se obratite putem sljedeće adrese e-pošte: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Informacije za {0} na e-Certisu
+more_information=Više informacija
+less_information=Manje informacija
+question_to_use_alpha=Želite li koristiti kriterije za odabir gospodarskog subjekta od A do D? 
+
+crit_selection_technical_average_annual_manpower_description=Prosječni godišnji broj radnika gospodarskog subjekta u posljednje tri godine:
+crit_information_available_electronically=Je li ova informacija dostupna javnim naručiteljima besplatno iz neke baze podataka države članice EU?
diff --git a/espd-web/src/main/resources/i18n/messages_hu.properties b/espd-web/src/main/resources/i18n/messages_hu.properties
index 348c23a29..9445ebdfe 100644
--- a/espd-web/src/main/resources/i18n/messages_hu.properties
+++ b/espd-web/src/main/resources/i18n/messages_hu.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=A gazdasági
 crit_selection_suitability_service_contracts_membership_main=Szolgáltatásnyújtásra irányuló szerződések esetében: meghatározott szervezet tagjának kell-e lenni?
 crit_selection_technical_allowance_of_checks_description=Összetett leszállítandó termékek vagy teljesítendő szolgáltatások, vagy – rendkívüli esetben – különleges célra szolgáló termékek vagy szolgáltatások esetében: A gazdasági szereplő lehetővé teszi termelési vagy műszaki kapacitásaira, és amennyiben szükséges, a rendelkezésére álló tanulmányi és kutatási eszközökre és minőség-ellenőrzési intézkedéseire vonatkozó vizsgálatok elvégzését. A vizsgálatot az ajánlatkérő szerv vagy – amennyiben az utóbbi ezt jóváhagyja – nevében a szállító/szolgáltató székhelye szerinti ország egy erre illetékes hivatalos szerve végezheti el.
 crit_selection_technical_allowance_of_checks_main=Vizsgálatok lehetővé tétele
-crit_selection_technical_average_annual_manpower_description=A gazdasági szereplő átlagos éves statisztikai állományi létszáma és vezetői létszáma az utolsó három évre vonatkozóan a következő volt:
 crit_selection_technical_average_annual_manpower_main=Átlagos statisztikai állományi létszám
 crit_selection_technical_educational_professional_qualifications_description=A szolgáltató vagy maga a vállalkozó, és/vagy (a vonatkozó hirdetményben vagy a közbeszerzési dokumentumokban foglalt követelményektől függően) annak vezetői személyzete a következő iskolai végzettséggel és szakképzettséggel rendelkeznek:
 crit_selection_technical_educational_professional_qualifications_main=Iskolai végzettség és szakképzettség
@@ -670,3 +669,11 @@ zip_instructions=Ez a ZIP mappában található ESPD-fájlokról szóló rövid
   \r\n\r\nespd.XML: Az XML-fájl az ESPD-szolgáltatás vagy más, kompatibilis ESPD-szolgáltatások számára olvasható fájltípus. Az eESPD-fájl XML-fájlként való használatának előnye, hogy azt így a beszerzők és a vállalkozások a jövőben más eljárásokban is újrahasznosíthatják. Az XML-fájl a közbeszerzési dokumentumokkal együtt (az ajánlatkérő szerv részéről a vállalkozásoknak), illetve az ajánlat részeként továbbítandó (a vállalkozások részéről az ajánlatkérő szervnek).\
   \r\n\r\nespd.PDF: A PDF-fájl az eESPD felhasználó számára olvasható változata. A PDF-fájt ajánlott referenciadokumentumként az XML-fájllal együtt mellékelni a közbeszerzési dokumentumokhoz (az ajánlatkérő szerv részéről a vállalkozásoknak), illetve az ajánlathoz (a vállalkozások részéről az ajánlatkérő szervnek).\
   \r\n\r\nAmennyiben kérdésük van a fájlokkal kapcsolatban, kérjük, keressenek meg bennünket az alábbi e-mail-címen: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Tájékoztatás {0} számára az e-Certis-ről
+more_information=Bővebb információk
+less_information=Információk elrejtése
+question_to_use_alpha=Alkalmazni kívánja az A–D szakasz kiválasztási szempontjait?
+
+crit_selection_technical_average_annual_manpower_description=A gazdasági szereplő átlagos éves statisztikai állományi létszáma az utolsó három évre vonatkozóan a következő volt:
+crit_information_available_electronically=Ez az információ díjmentesen elérhető a hatóságok számára valamely uniós tagállam adatbázisában?
diff --git a/espd-web/src/main/resources/i18n/messages_it.properties b/espd-web/src/main/resources/i18n/messages_it.properties
index 25e447de6..402b1f4e5 100644
--- a/espd-web/src/main/resources/i18n/messages_it.properties
+++ b/espd-web/src/main/resources/i18n/messages_it.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=È richiesta
 crit_selection_suitability_service_contracts_membership_main=Per gli appalti di servizi: obbligo di appartenenza a una particolare organizzazione
 crit_selection_technical_allowance_of_checks_description=Per la fornitura di prodotti o la prestazione di servizi complessi o, eccezionalmente, di prodotti o servizi richiesti per una finalità particolare L'operatore economico consentirà l'esecuzione di verifiche delle sue capacità di produzione o strutture tecniche e, se necessario, degli strumenti di studio e di ricerca di cui egli dispone, nonché delle misure adottate per garantire la qualità? La verifica è eseguita dall'amministrazione aggiudicatrice o, se essa acconsente, per suo conto da un organismo ufficiale competente del paese in cui è stabilito il fornitore o il prestatore dei servizi.
 crit_selection_technical_allowance_of_checks_main=Esecuzione di verifiche
-crit_selection_technical_average_annual_manpower_description=L'organico medio annuo dell'operatore economico e il numero dei dirigenti negli ultimi tre anni sono stati i seguenti:
 crit_selection_technical_average_annual_manpower_main=Organico medio annuo
 crit_selection_technical_educational_professional_qualifications_description=Indicare i titoli di studio e professionali di cui sono in possesso lo stesso prestatore di servizi o imprenditore e/o (in funzione dei requisiti richiesti nell'avviso o bando pertinente o nei documenti di gara) i suoi dirigenti.
 crit_selection_technical_educational_professional_qualifications_main=Titoli di studio e professionali
@@ -670,3 +669,11 @@ zip_instructions=Precisazioni sui file relativi al DGUE che si trovano in questa
   \r\n\r\nespd.XML: il file XML è un file che può essere compreso dal nostro servizio DGUE o da altri servizi DGUE compatibili. Il vantaggio di usare il DGUE elettronico nel formato XML è che gli acquirenti e le imprese possono riutilizzarlo in futuro per altre procedure di appalto. Questo file andrebbe spedito insieme ai documenti di gara (dall'amministrazione aggiudicatrice alle imprese) o nel contesto di un'offerta (da un'impresa all'amministrazione aggiudicatrice).\
   \r\n\r\nespd.PDF: questo file PDF è una versione del DGUE elettronico leggibile per un utente umano. Anche in questo caso consigliamo di usarlo in parallelo al formato XML insieme ai documenti di gara (trasmessi dall'amministrazione aggiudicatrice alle imprese) o nel contesto di un'offerta (trasmessa da un'impresa all'amministrazione aggiudicatrice).\
   \r\n\r\nPer qualsiasi domanda sui file rivolgersi al nostro servizio al seguente indirizzo e-mail: grow-espd@ec.europa.eu
+
+information_for_country_in_ecertis=Informazioni relative a {0} su e-Certis
+more_information=Mostra più informazioni
+less_information=Mostra meno informazioni
+question_to_use_alpha=Vuoi usare i criteri di selezione da A a D?
+
+crit_selection_technical_average_annual_manpower_description=L'organico medio annuo dell'operatore economico negli ultimi tre anni è il seguente:
+crit_information_available_electronically=Queste informazioni sono disponibili gratuitamente per le autorità in una banca dati di uno Stato membro UE?
diff --git a/espd-web/src/main/resources/i18n/messages_lt.properties b/espd-web/src/main/resources/i18n/messages_lt.properties
index 3203eee88..d1551fdd5 100644
--- a/espd-web/src/main/resources/i18n/messages_lt.properties
+++ b/espd-web/src/main/resources/i18n/messages_lt.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Ar reikia na
 crit_selection_suitability_service_contracts_membership_main=Paslaugų pirkimo sutarčių atveju: reikalinga narystė konkrečioje organizacijoje
 crit_selection_technical_allowance_of_checks_description=Jei tiektini produktai arba teiktinos paslaugos yra sudėtingi arba, išimtiniais atvejais, jie yra skirti specialiam tikslui: ar ekonominės veiklos vykdytojas leis atlikti jo gamybos pajėgumų arba techninio pajėgumo ir, kai reikia, jam prieinamų tyrimų ir mokslinių tyrimų priemonių bei kokybės kontrolės priemonių patikrą? Patikrą turi atlikti perkančioji organizacija arba, jei ji sutinka, jos vardu šalies, kurioje įsisteigęs produktų tiekėjas ar paslaugų teikėjas, kompetentinga oficiali įstaiga.
 crit_selection_technical_allowance_of_checks_main=Leidimas atlikti patikrą
-crit_selection_technical_average_annual_manpower_description=Ekonominės veiklos vykdytojo vadovaujančiojo personalo skaičius praėjusiais trejais metais buvo toks:
 crit_selection_technical_average_annual_manpower_main=Vidutinis metinis darbuotojų skaičius
 crit_selection_technical_educational_professional_qualifications_description=Toliau nurodytą išsilavinimą ir profesinę kvalifikaciją turi pats paslaugos teikėjas ar rangovas ir (arba) (priklausomai nuo atitinkamame skelbime ar pirkimo dokumentuose nustatytų reikalavimų) jo vadovaujantysis personalas.
 crit_selection_technical_educational_professional_qualifications_main=Išsilavinimas ir profesinė kvalifikacija
@@ -670,3 +669,11 @@ zip_instructions=Tai – trumpas EBVPD rinkmenų, kurias rasite šiame ZIP aplan
   \r\n\r\nespd.XML: XML rinkmena – tai mūsų EBVPD paslaugoms arba kitoms su EBVPD suderinamoms paslaugoms suprantama rinkmena. Naudojimosi e. EBVPD kaip XML rinkmenos pranašumas yra tai, kad pirkėjai ir bendrovės galės ją panaudoti kitoms procedūroms ateityje. Ji turėtų būti siunčiama kartu su viešųjų pirkimų dokumentais (organizacija bendrovei) arba kaip pasiūlymo dalis (bendrovė organizacijai).\
   \r\n\r\nespd.PDF: PDF rinkmena – tai žmonėms suprantama e. EBVPD rinkmena. Taip pat siūlome naudoti  ją kaip informacinį dokumentą kartu su XML formatu teikiant viešųjų pirkimų dokumentus (organizacija bendrovei) arba kaip pasiūlymo dalį (bendrovė organizacijai).\
   \r\n\r\nJei turite klausimų apie rinkmenas, nedvejodami susisiekite su mumis šiuo e. pašto adresu: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis={0} skirta informacija apie „e-Certis“
+more_information=Rodyti daugiau informacijos
+less_information=Rodyti mažiau informacijos 
+question_to_use_alpha=Ar norite naudoti A–D atrankos kriterijus?
+
+crit_selection_technical_average_annual_manpower_description=Ekonominės veiklos vykdytojo vidutinis metinis darbuotojų skaičius praėjusiais trejais metais buvo toks:
+crit_information_available_electronically=Ar ši informacija ES valstybės narės duomenų bazėje nemokamai prieinama valdžios institucijoms?
diff --git a/espd-web/src/main/resources/i18n/messages_lv.properties b/espd-web/src/main/resources/i18n/messages_lv.properties
index 06b5c4ade..c39034b4c 100644
--- a/espd-web/src/main/resources/i18n/messages_lv.properties
+++ b/espd-web/src/main/resources/i18n/messages_lv.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Vai ekonomik
 crit_selection_suitability_service_contracts_membership_main=Attiecībā uz pakalpojumu līgumiem: nepieciešama dalība noteiktā organizācijā
 crit_selection_technical_allowance_of_checks_description=Attiecībā uz piegādājamajiem sarežģītiem izstrādājumiem vai sniedzamiem sarežģītiem pakalpojumiem, vai – izņēmuma kārtā – attiecībā uz izstrādājumiem vai pakalpojumiem, kas paredzēti īpašam mērķim: Vai ekonomikas dalībnieks ļaus veikt pārbaudes attiecībā uz ekonomikas dalībnieka ražošanas jaudām vai tehnisko jaudu un vajadzības gadījumā arī attiecībā uz tam pieejamajiem mācību un pētniecības līdzekļiem, kā arī attiecībā uz kvalitātes kontroles pasākumiem? Pārbaudi veic līgumslēdzēja iestāde vai gadījumā, ja līgumslēdzēja iestāde piekrīt, pārbaudi tās vārdā var veikt tās valsts kompetentā oficiālā iestāde, kurā piegādātājs vai pakalpojumu sniedzējs ir reģistrēts.
 crit_selection_technical_allowance_of_checks_main=Atļauja veikt pārbaudes
-crit_selection_technical_average_annual_manpower_description=Ekonomikas dalībnieka vidējais gadā nodarbināto skaits un vadības personāla skaits pēdējo trīs gadu laikā bija šāds:
 crit_selection_technical_average_annual_manpower_main=Vidējais gada laikā nodarbināto skaits:
 crit_selection_technical_educational_professional_qualifications_description=Pakalpojuma sniedzējam vai pašam darbuzņēmējam un/vai (atkarībā no attiecīgajā paziņojumā vai iepirkuma procedūras dokumentos noteiktajām prasībām) tā vadības personālam ir šādi izglītību vai profesionālo kvalifikāciju apliecinoši dokumenti.
 crit_selection_technical_educational_professional_qualifications_main=Izglītību vai profesionālo kvalifikāciju apliecinoši dokumenti
@@ -670,3 +669,11 @@ zip_instructions=Šajā ZIP mapē atrodamo ESPD datņu īss apraksts.\
   \r\n\r\nespd.XML: XML datne ir datne, kuru spēj nolasīt mūsu ESPD pakalpojums vai cits saderīgs ESPD pakalpojums. // .. mūsu ... saprotama datne Priekšrocība XML datnes izmantošanai eESPD ir tāda, ka pircēji un uzņēmumi to nākotnē var atkal izmantot citās procedūrās. Tā būtu jānosūta kopā ar iepirkuma procedūras dokumentiem (iestāde uzņēmumiem) vai kā piedāvājuma daļa (uzņēmums iestādei).\
   \r\n\r\nespd.PDF: PDF datne ir eESPD datne cilvēklasāmā formā. Mēs iesakām to izmantot par atsauces dokumentu kopā ar XML formāta datni iepirkuma procedūras dokumentos (iestāde uzņēmumam) vai kā piedāvājuma daļu (uzņēmums iestādei).\
   \r\n\r\nJa jums ir jautājumi par datnēm, lūdzu, sazinieties ar mums, izmantojot šādu e-pasta adresi: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Informācija [kam] {0} e-Certis reģistrā
+more_information=Vairāk informācijas
+less_information=Mazāk informācijas
+question_to_use_alpha=Vai vēlaties izmantot atlases kritērijus no A līdz D?
+
+crit_selection_technical_average_annual_manpower_description=Ekonomikas dalībnieka vidējais gada laikā nodarbināto personu skaits pēdējo trīs gadu laikā bija šāds:
+crit_information_available_electronically=Vai šī informācija no ES dalībvalsts datubāzes iestādēm ir pieejama bez maksas?
diff --git a/espd-web/src/main/resources/i18n/messages_mt.properties b/espd-web/src/main/resources/i18n/messages_mt.properties
index 363328d2e..8a4530b1c 100644
--- a/espd-web/src/main/resources/i18n/messages_mt.properties
+++ b/espd-web/src/main/resources/i18n/messages_mt.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Hemm bżonn
 crit_selection_suitability_service_contracts_membership_main=Għal kuntratti ta’ servizz: sħubija f'organizzazzjoni partikolari meħtieġa
 crit_selection_technical_allowance_of_checks_description=Għal prodotti jew servizzi kumplessi li għandhom jiġu fornuti jew, eċċezzjonalment, għal prodotti jew servizzi li huma meħtieġa għal għan speċjali: L-operatur ekonomiku se jippermetti kontrolli li għandhom jitwettqu fuq il-kapaċitajiet tal-produzzjoni jew il-kapaċità teknika tal-operatur ekonomiku u, meta jkun neċessarju, fuq il-mezzi ta' studju u riċerka li huma disponibbli għalih u fuq il-miżuri ta' kontroll tal-kwalità? Il-kontroll għandu jsir mill-awtorità kontraenti jew, f'każ li din tal-aħħar tagħti l-kunsens tagħha għal dan, f’isimha minn korp uffiċjali kompetenti tal-pajjiż fejn huwa stabbilit il-fornitur jew il-fornitur tas-servizz.
 crit_selection_technical_allowance_of_checks_main=Kontrolli permessi
-crit_selection_technical_average_annual_manpower_description=Il-manodopera annwali medja tal-operatur ekonomiku u l-għadd tal-persunal maniġerjali fl-aħħar tliet snin kienu kif ġej:
 crit_selection_technical_average_annual_manpower_main=Manodopera annwali medja
 crit_selection_technical_educational_professional_qualifications_description=Il-fornitur tas-servizz jew il-kuntrattur innifsu għandu l-kwalifiki edukattivi u professjonali li ġejjin, u/jew (skont ir-rekwiżiti stabbiliti fl-avviż rilevanti jew id-dokumenti għall-akkwist mill-persunal maniġerjali tiegħu.
 crit_selection_technical_educational_professional_qualifications_main=Kwalifiki edukattivi u professjonali
@@ -670,3 +669,11 @@ zip_instructions=Din hija dokumentazzjoni qasira tal-fajls tal-ESPD li tista’
   \r\n\r\nespd.XML: Il-fajl XML huwa fajl li s-servizz tal-ESPD tagħna jew servizzi tal-ESPD kompatibbli jistgħu jifhmuh. Il-vantaġġ li jintuża l-eESPD bħala fajl XML huwa li x-xerrejja u l-kumpaniji jistgħu jerġgħu jużawh għal proċeduri oħra fil-ġejjieni. Għandu jintbagħat mad-dokumenti ta’ akkwist (mill-awtoritajiet għall-kumpaniji) jew bħala parti mill-offerta (mill-kumpanija għall-awtorità).\
   \r\n\r\nespd.PDF: Il-fajl PDF huwa fajl tal-eESPD li jista’ jinqara mill-bniedem. Nissuġġerixxu wkoll li dan jintuża flimkien mal-format XML bid-dokumenti ta’ akkwist (mill-awtorità għall-kumpaniji) jew bħala parti minn offerta (mill-kumpanija għall-awtorità) bħala dokument ta’ referenza.\
   \r\n\r\nJekk għandek xi mistoqsijiet dwar il-fajls tiddejjaqx tkellimna permezz ta’ dan l-indirizz tal-posta elettronika: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Informazzjoni għal {0} dwar e-Certis
+more_information=Iktar informazzjoni
+less_information=Inqas informazzjoni
+question_to_use_alpha=Trid tuża l-kriterji tal-għażla minn A sa D?
+
+crit_selection_technical_average_annual_manpower_description=Il-manodopera annwali medja tal-operatur ekonomiku għall-aħħar tliet snin kienet kif ġej:
+crit_information_available_electronically=Din l-informazzjoni hija disponibbli bla spejjeż għall-awtoritajiet minn bażi tad-dejta ta' Stat Membru tal-UE?
diff --git a/espd-web/src/main/resources/i18n/messages_nl.properties b/espd-web/src/main/resources/i18n/messages_nl.properties
index 028da8fd9..9067f410c 100644
--- a/espd-web/src/main/resources/i18n/messages_nl.properties
+++ b/espd-web/src/main/resources/i18n/messages_nl.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Moet de onde
 crit_selection_suitability_service_contracts_membership_main=Voor een opdracht voor diensten: lidmaatschap van bepaalde organisatie
 crit_selection_technical_allowance_of_checks_description=In het geval van complexe producten of diensten of wanneer deze bij wijze van uitzondering aan een bijzonder doel moeten beantwoorden: Zal de ondernemer controle van zijn technische of productiecapaciteit toelaten en zo nodig van zijn mogelijkheden inzake ontwerpen en onderzoek en de maatregelen om de kwaliteit te waarborgen? De controle moet worden verricht door de aanbestedende dienst zelf of, indien deze laatste daarmee instemt, namens deze door een bevoegd officieel orgaan van het land waar de leverancier of dienstverlener is gevestigd.
 crit_selection_technical_allowance_of_checks_main=Toelating van controle
-crit_selection_technical_average_annual_manpower_description=De gemiddelde jaarlijkse personeelsbezetting en het aantal leidinggevenden van de ondernemer waren de afgelopen drie jaar als volgt:
 crit_selection_technical_average_annual_manpower_main=Gemiddelde jaarlijkse personeelsbezetting
 crit_selection_technical_educational_professional_qualifications_description=Over de volgende onderwijs- en beroepskwalificaties beschikt de dienstverlener of de aannemer zelf, en/of (al naargelang de vereisten in de betreffende aankondiging of de aanbestedingsstukken) de leidinggevenden van de onderneming.
 crit_selection_technical_educational_professional_qualifications_main=Onderwijs- en beroepskwalificaties
@@ -670,3 +669,11 @@ zip_instructions=Dit is beknopte documentatie over de UEA-bestanden die u in dez
   \r\n\r\nespd.XML: Het XML-bestand is een bestand dat door onze UEA-webdienst of andere compatibele UEA-diensten kan worden gelezen. Het voordeel van het gebruik van het e-UEA als XML-bestand is dat kopers en ondernemingen het later voor andere procedures kunnen hergebruiken. Het moet samen met de aanbestedingsdocumenten (van aanbestedende dienst naar onderneming) of als onderdeel van de inschrijving (van onderneming naar aanbestedende dienst) worden verzonden.\
   \r\n\r\nespd.PDF: Het pdf-bestand is een voor mensen leesbare versie van het e-UEA. Ook hier stellen wij voor dat u het naast het XML-bestand samen met de aanbestedingsdocumenten (van aanbestedende dienst naar onderneming) of als onderdeel van de inschrijving (van onderneming naar aanbestedende dienst) als referentiedocument gebruikt.\
   \r\n\r\nAls u vragen over de bestanden heeft, aarzel dan niet contact met ons op te nemen via het volgende e-mailadres: grow-espd@ec.europa.eu
+
+information_for_country_in_ecertis=Informatie voor {0} over e-Certis
+more_information=Meer informatie
+less_information=Minder informatie
+question_to_use_alpha=Wilt u de selectiecriteria van A tot en met D gebruiken?
+
+crit_selection_technical_average_annual_manpower_description=De gemiddelde jaarlijkse personeelsbezetting van de ondernemer was de afgelopen drie jaar als volgt:
+crit_information_available_electronically=Zijn deze gegevens voor de aanbestedende diensten kosteloos beschikbaar uit een databank van een EU-lidstaat?
diff --git a/espd-web/src/main/resources/i18n/messages_no.properties b/espd-web/src/main/resources/i18n/messages_no.properties
index e6d82f5ee..a6630691a 100644
--- a/espd-web/src/main/resources/i18n/messages_no.properties
+++ b/espd-web/src/main/resources/i18n/messages_no.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Er det nødv
 crit_selection_suitability_service_contracts_membership_main=Ved tjenestekontrakter: Medlemskap i en bestemt organisasjon nødvendig
 crit_selection_technical_allowance_of_checks_description=For varer eller tjenester som er kompliserte,  eller som unntaksvis skal benyttes til et spesielt formål: Vil leverandøren tillate, at det foretas kontroll  av leverandørens produksjonskapasitet eller tekniske kapasitet og, hvor det er nødvendig, av de undersøkelses- og forskningsfasiliteter som leverandøren råder over, og av kvalitetskontrolltiltak? Kontrollen skal foretas av oppdragsgiveren eller oppdragsgiver kan overlate det til et kompetent offentlige organ i den staten leverandøren er etablert.
 crit_selection_technical_allowance_of_checks_main=Tillatelse til kontroll
-crit_selection_technical_average_annual_manpower_description=Leverandørens gjennomsnittlige årlige arbeidsstyrke i løpet av de siste tre årene var som følger:
 crit_selection_technical_average_annual_manpower_main=Gjennomsnittlige årlige arbeidsstyrke
 crit_selection_technical_educational_professional_qualifications_description=Følgende utdanning og faglige kvalifikasjoner besittes av leverandøren og/eller (avhengig av hvilke krav som er fastsatt i kunngjøringen eller i anskaffelsesdokumenterne) av de ledende medarbeiderne:
 crit_selection_technical_educational_professional_qualifications_main=Utdanning og faglige kvalifikasjoner
@@ -666,9 +665,15 @@ tooltip_ce_ref_buyer=Norske oppdragsgivere skal velge "Jeg er offentlig oppdrags
 error_ted_notice_not_supported=Du forsøker å laste opp feil fil
 tools=Verktøy
 createca_ted_reception_id=Midlertidig TED nummer
-
 zip_instructions=Kort informasjon om hvilke filer du finner i ZIP-mappa.\
   \r\n\r\nespd.XML: XML er et format som den europeiske ESPD-tjenesten og andre kompatible ESPD-tjenester kan lese/tolke. Fordelen med å bruke XML er at oppdragsgivere og leverandører kan gjenbruke filer.
   \r\n\r\nespd.PDF: PDF er et ordinær lesbart format.
   \r\n\r\nHar du spørsmål, se på https://www.anskaffelser.no/digitalisering/espd eller ta kontakt med espd@difi.no
 
+information_for_country_in_ecertis=Informasjon for {0} fra e-Certis
+more_information=Mer informasjon
+less_information=Mindre informasjon
+question_to_use_alpha=Ønsker du å bruke kvalifikasjonskravene fra A til D?
+
+crit_selection_technical_average_annual_manpower_description=Leverandørens gjennomsnittlige årlige arbeidsstyrke i løpet av de siste tre årene har vært som følger:
+crit_information_available_electronically=Er disse opplysningene mulig for oppdragsgiver å innhente kostnadsfritt i en database i en EØS-stat?
diff --git a/espd-web/src/main/resources/i18n/messages_pl.properties b/espd-web/src/main/resources/i18n/messages_pl.properties
index 9559bbaf4..6bf79b2f8 100644
--- a/espd-web/src/main/resources/i18n/messages_pl.properties
+++ b/espd-web/src/main/resources/i18n/messages_pl.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Czy konieczn
 crit_selection_suitability_service_contracts_membership_main=W przypadku zamówień na usługi: konieczne bycie członkiem określonej organizacji
 crit_selection_technical_allowance_of_checks_description=W odniesieniu do produktów lub usług o złożonym charakterze, które mają zostać dostarczone, lub – wyjątkowo – w odniesieniu do produktów lub usług o szczególnym przeznaczeniu: Czy wykonawca zezwoli na przeprowadzenie kontroli swoich zdolności produkcyjnych lub zdolności technicznych, a w razie konieczności także dostępnych mu środków naukowych i badawczych, jak również środków kontroli jakości? Kontrolę ma przeprowadzać instytucja zamawiająca lub – w przypadku gdy instytucja ta wyrazi na to zgodę – w jej imieniu, właściwy organ urzędowy państwa, w którym dostawca lub usługodawca ma siedzibę.
 crit_selection_technical_allowance_of_checks_main=możliwość przeprowadzania kontroli
-crit_selection_technical_average_annual_manpower_description=Wielkość średniego rocznego zatrudnienia u wykonawcy oraz liczebność kadry kierowniczej w ostatnich trzech latach są następujące:
 crit_selection_technical_average_annual_manpower_main=średnie roczne zatrudnienie
 crit_selection_technical_educational_professional_qualifications_description=Sam usługodawca lub wykonawca oraz/lub jego kadra kierownicza (w zależności od wymogów określonych w stosownym ogłoszeniu lub dokumentach zamówienia) posiada następujące wykształcenie i kwalifikacje zawodowe.
 crit_selection_technical_educational_professional_qualifications_main=wykształcenie i kwalifikacje zawodowe
@@ -670,3 +669,11 @@ zip_instructions=Oto krótka dokumentacja plików ESPD, którą znajdą Państwo
   \r\n\r\nespd.XML: Plik XML to plik, które może zostać odczytany przez nasz serwis ESPD lub inne kompatybilne serwisy ESPD. Zaleta korzystania z eESPD jako pliku XML polega na tym, że nabywcy i przedsiębiorstwa mogą wykorzystać go ponownie do celów innych postępowań w przyszłości. Należy przesyłać go razem z dokumentami zamówienia (od zamawiającego do przedsiębiorstw) lub w ramach oferty (od przedsiębiorstw do zamawiającego).\
   \r\n\r\nespd.PDF: Plik PDF to plik eESPD w postaci czytelnej dla człowieka. Proponujemy również w tym miejscu, aby wykorzystywać go obok formatu XML przy dokumentach zamówienia (od zamawiającego do przedsiębiorstw) lub w ramach oferty (od przedsiębiorstw do zamawiającego) jako dokument referencyjny.\
   \r\n\r\nJeżeli mają Państwo pytania dotyczące plików, prosimy o kontaktowanie się z nami za pośrednictwem następującego adresu e-mail: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Informacje dotyczące {0} w e-Certis
+more_information=Pokaż więcej informacji
+less_information=Pokaż mniej informacji
+question_to_use_alpha=Czy chcesz wykorzystać kryteria kwalifikacji od A do D?
+
+crit_selection_technical_average_annual_manpower_description=Średnie roczne zatrudnienie u wykonawcy w ostatnich trzech latach było następujące:
+crit_information_available_electronically=Czy informacje te mogą zostać bezpłatnie uzyskane przez instytucje z bazy danych państwa członkowskiego UE?
diff --git a/espd-web/src/main/resources/i18n/messages_pt.properties b/espd-web/src/main/resources/i18n/messages_pt.properties
index 44418b8f9..f6d5067a2 100644
--- a/espd-web/src/main/resources/i18n/messages_pt.properties
+++ b/espd-web/src/main/resources/i18n/messages_pt.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=É necessár
 crit_selection_suitability_service_contracts_membership_main=Para os contratos de serviços: necessidade de ser membro de uma determinada organização
 crit_selection_technical_allowance_of_checks_description=Em relação ao fornecimento de produtos ou serviços complexos ou, excecionalmente, a produtos ou serviços que se destinam a um fim específico: o operador económico irá autorizar a realização de controlos das suas capacidades de produção ou da sua capacidade técnica e, se for caso disso, dos meios de estudo e de investigação de que dispõe e das medidas de controlo da qualidade? O controlo será efetuado pela autoridade contratante ou, quando esta o autorizar, em seu nome, por um organismo oficial competente do país onde o fornecedor ou o prestador de serviços estiver estabelecido.
 crit_selection_technical_allowance_of_checks_main=Autorização de controlos
-crit_selection_technical_average_annual_manpower_description=O número médio anual de trabalhadores e quadros de gestão do operador económico nos últimos três anos foi de:
 crit_selection_technical_average_annual_manpower_main=Número médio de trabalhadores
 crit_selection_technical_educational_professional_qualifications_description=O próprio prestador de serviços ou contratante e/ou (consoante os requisitos definidos no anúncio relevante ou na documentação relativa ao concurso) os respetivos quadros de gestão possuem as seguintes habilitações académicas e profissionais.
 crit_selection_technical_educational_professional_qualifications_main=Habilitações académicas e profissionais
@@ -670,3 +669,11 @@ zip_instructions=O presente documento constitui uma síntese dos ficheiros DEUCP
   \r\n\r\nespd.XML: O ficheiro XML é um que o nosso serviço DEUCP ou outros serviços compatíveis DEUCP podem compreender. A vantagem de utilizar o eDEUCP como um ficheiro XML é que tanto os compradores como as empresas podem voltar a utilizá-lo para outros procedimentos no futuro. Deve ser enviado juntamente com os documentos do concurso (da entidade adjudicante para as empresas) ou como parte integrante da proposta (da empresa para a entidade adjudicante).\
   \r\n\r\nespd.PDF: O ficheiro PDF é um ficheiro do eDEUCP apto à leitura humana . Também neste caso sugerimos que seja utilizado em paralelo com o formato XML com os documentos do concurso (da entidade adjudicante para as empresas) ou como parte integrante da proposta (da empresa para a entidade adjudicante) como documento de referência.\
   \r\n\r\nSe tem questões sobre os ficheiros não hesite em contacto connosco via correio eletrónico para o seguinte endereço: grow-espd@ec.europa.eu
+
+information_for_country_in_ecertis=Informações para o {0} no e-Certis
+more_information=Mais informações
+less_information=Menos informações
+question_to_use_alpha=Pretende usar os critérios de seleção de A a D?
+
+crit_selection_technical_average_annual_manpower_description=O efetivo médio anual do operador económico nos últimos três anos foi o seguinte:
+crit_information_available_electronically=Estas informações estão acessíveis gratuitamente às autoridades contratantes a partir de uma base de dados de um Estado-membro da EU?
diff --git a/espd-web/src/main/resources/i18n/messages_ro.properties b/espd-web/src/main/resources/i18n/messages_ro.properties
index c17fe924e..100a52336 100644
--- a/espd-web/src/main/resources/i18n/messages_ro.properties
+++ b/espd-web/src/main/resources/i18n/messages_ro.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Operatorul e
 crit_selection_suitability_service_contracts_membership_main=Pentru contractele de achiziție de servicii: apartenența la organizația specifică este necesară
 crit_selection_technical_allowance_of_checks_description=Pentru produsele sau serviciile complexe care urmează să fie furnizate sau, în mod excepțional, pentru produsele sau serviciile necesare cu un scop anume: Operatorul economic va permite efectuarea de verificări ale capacităților de producție sau ale capacității tehnice a operatorului economic și, dacă este necesar, ale mijloacelor de studiu și de cercetare de care dispune și ale măsurilor de control al calității? Vă rugăm să rețineți că, în cazul în care operatorul economic a decis să subcontracteze o parte din contract și se bazează pe capacitățile subcontractantului pentru executarea părții respective, trebuie să completați un DEAU separat pentru astfel de subcontractanți.
 crit_selection_technical_allowance_of_checks_main=Permiterea controalelor
-crit_selection_technical_average_annual_manpower_description=Efectivele medii anuale de personal ale operatorului economic și numărul membrilor personalului de conducere din ultimii trei ani au fost după cum urmează:
 crit_selection_technical_average_annual_manpower_main=Efectivele medii anuale de personal
 crit_selection_technical_educational_professional_qualifications_description=Următoarele calificări educaționale și profesionale sunt deținute de prestatorul de servicii sau de contractantul însuși și/sau (în funcție de cerințele stabilite în anunțul relevant sau în documentele procedurii de achiziție de către personalul său de conducere.
 crit_selection_technical_educational_professional_qualifications_main=Diplome de studii și calificări profesionale
@@ -670,3 +669,11 @@ zip_instructions=Aceasta este o scurtă documentare pentru fișierele DEAU pe ca
   \r\n\r\nespd.XML: Fișierul XML este un fișier pe care serviciul nostru DEAU sau alte servicii compatibile cu DEAU îl pot înțelege. Avantajul de a utiliza eDEAU ca fișier XML este acela că achizitorii și societățile pot să-l reutilizeze pentru alte proceduri viitoare. Acesta ar trebui să fie trimis împreună cu documentele de achiziție (de la autoritate la întreprinderi) sau ca parte a ofertei (societate sau autoritate).\
   \r\n\r\nespd.PDF: Fișierul PDF este un fișier în formă lizibilă pentru om a eDEAU. Propunem aici și utilizarea acestuia în paralel cu formatul XML cu documentele de achiziție (de la autoritate la întreprinderi) sau ca parte a ofertei (societate sau autoritate), ca document de referință.\
   \r\n\r\nÎn cazul în care aveți întrebări cu privire la fișiere, vă rugăm să nu ezitați să luați legătura cu noi prin intermediul adresei e-mail: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Informații pentru {0} în e-Certis
+more_information=Informații suplimentare
+less_information=Mai puține informații
+question_to_use_alpha=Sunteți sigur că doriți să utilizați criteriile de selecție de la A la D?
+
+crit_selection_technical_average_annual_manpower_description=Efectivele medii anuale de personal ale operatorului economic din ultimii trei ani au fost după cum urmează:
+crit_information_available_electronically=Aceste informații sunt disponibile gratuit pentru autorități, dintr-o bază de date națională a unui stat membru UE?
diff --git a/espd-web/src/main/resources/i18n/messages_sk.properties b/espd-web/src/main/resources/i18n/messages_sk.properties
index b5057b997..67bf97c20 100644
--- a/espd-web/src/main/resources/i18n/messages_sk.properties
+++ b/espd-web/src/main/resources/i18n/messages_sk.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Je na to, ab
 crit_selection_suitability_service_contracts_membership_main=V prípade zákaziek na poskytnutie služieb: potrebné členstvo v konkrétnej organizácii
 crit_selection_technical_allowance_of_checks_description=V prípade zložitých výrobkov alebo služieb, ktoré majú byť dodané alebo poskytnuté, alebo výnimočne v prípade výrobkov alebo služieb, ktoré sú požadované na osobitný účel: Umožní hospodársky subjekt vykonanie kontrol výrobných kapacít alebo technickej spôsobilosti hospodárskeho subjektu a v prípade potreby študijných a výskumných prostriedkov, ktoré má k dispozícii, ako aj opatrení kontroly kvality? Kontrolu má vykonať verejný obstarávateľ alebo v prípade, že verejný obstarávateľ vyjadrí súhlas, v jeho mene príslušný úradný orgán štátu, v ktorom má poskytovateľ služieb alebo dodávateľ sídlo.
 crit_selection_technical_allowance_of_checks_main=Umožnenie vykonania kontrol
-crit_selection_technical_average_annual_manpower_description=Ročný priemerný počet zamestnancov a počet riadiacich pracovníkov hospodárskeho subjektu za posledné tri roky je takýto:
 crit_selection_technical_average_annual_manpower_main=Ročný priemerný počet zamestnancov
 crit_selection_technical_educational_professional_qualifications_description=Samotný poskytovateľ služieb alebo zhotoviteľ a/alebo (v závislosti od požiadaviek uvedených v príslušnom oznámení alebo v súťažných podkladoch) jeho riadiaci pracovníci musia mať takéto vzdelanie a odbornú kvalifikáciu.
 crit_selection_technical_educational_professional_qualifications_main=Vzdelanie a odborná kvalifikácia
@@ -670,3 +669,11 @@ zip_instructions=Toto je krátka dokumentácia týkajúca sa súborov jednotnéh
   \r\n\r\nespd.XML: Súbor XML je súbor, ktorý je zrozumiteľný pre našu službu jednotného európskeho dokumentu pre obstarávanie alebo pre iné kompatibilné služby jednotného európskeho dokumentu pre obstarávanie. Výhodou používania elektronického jednotného európskeho dokumentu pre obstarávanie vo forme súboru XML je, že kupujúci aj podniky ho v budúcnosti môžu opätovne použiť na ďalšie postupy obstarávania. Mal by sa zasielať spolu so súťažnými podkladmi (verejného obstarávateľa určenými podnikom) alebo ako súčasť ponuky (podniku určenej verejnému obstarávateľovi).\
   \r\n\r\nespd.PDF: Súbor PDF je ľudským okom čitateľný súbor elektronického jednotného európskeho dokumentu pre obstarávanie. Aj tu odporúčame, aby sa používal spolu s formátom XML so súťažnými podkladmi (verejného obstarávateľa určenými podnikom) alebo ako súčasť ponuky (podniku určenej verejnému obstarávateľovi) ako referenčný dokument.\
   \r\n\r\nAk máte akékoľvek otázky týkajúce sa súborov, kontaktujte nás na tejto e-mailovej adrese: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Informácie o systéme e-Certis {0}
+more_information=Viac informácií
+less_information=Menej informácií
+question_to_use_alpha=Chcete použiť výberové kritériá A až D?
+
+crit_selection_technical_average_annual_manpower_description=Ročný priemerný počet zamestnancov hospodárskeho subjektu za posledné tri roky je takýto:
+crit_information_available_electronically=Sú tieto informácie dostupné bezplatne pre orgány z databázy členského štátu EÚ?
diff --git a/espd-web/src/main/resources/i18n/messages_sl.properties b/espd-web/src/main/resources/i18n/messages_sl.properties
index a5e5ee6a5..4f2c482f5 100644
--- a/espd-web/src/main/resources/i18n/messages_sl.properties
+++ b/espd-web/src/main/resources/i18n/messages_sl.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Ali je v dr
 crit_selection_suitability_service_contracts_membership_main=Za naročila storitev: potrebno članstvo določene organizacije
 crit_selection_technical_allowance_of_checks_description=Za kompleksne proizvode ali storitve, ki jih je treba dobaviti oziroma zagotoviti, ali izjemoma za proizvode ali storitve, ki so potrebni za posebne namene: Ali bo gospodarski subjekt dovolil preglede proizvodnih zmogljivosti ali tehničnih zmogljivosti gospodarskega subjekta ter po potrebi preglede sredstev za študije in raziskave, ki jih ima na razpolago, ter ukrepov za nadzor kakovosti? Pregled bo opravil javni naročnik ali, če bo javni naročnik s tem soglašal, v njegovem imenu pristojni uradni organ države, v kateri ima dobavitelj ali ponudnik storitev svoj sedež.
 crit_selection_technical_allowance_of_checks_main=Dovoljenje za preglede
-crit_selection_technical_average_annual_manpower_description=Povprečno letno število zaposlenih gospodarskega subjekta in število vodstvenih delavcev v zadnjih treh letih:
 crit_selection_technical_average_annual_manpower_main=Povprečno letno število zaposlenih
 crit_selection_technical_educational_professional_qualifications_description=Ponudnik storitev ali sam izvajalec in/ali (glede na zahteve iz ustreznega obvestila ali dokumentacije v zvezi z oddajo javnega naročila) njegovi vodstveni delavci hranijo naslednja dokazila o izobrazbi in strokovni usposobljenosti.
 crit_selection_technical_educational_professional_qualifications_main=Izobrazba in strokovna usposobljenost
@@ -670,3 +669,11 @@ zip_instructions=To je kratek pregled datotek ESPD, ki jih boste našli v tej ma
   \r\n\r\nespd.XML: Datoteka XML je datoteka, katero je možno obdelati v okviru storitve ESPD ali druge storitve združljive z ESPD. Prednost uporabe elektronskega dokumenta eESPD kot datoteke XML je, da jo kupci in podjetja lahko ponovno uporabijo za druge postopke v prihodnosti. Treba jo je poslati skupaj z dokumentacijo v zvezi z oddajo javnega naročila (javni naročnik podjetju) ali kot del ponudbe (podjetje javnemu naročniku).\
   \r\n\r\nespd.PDF: Datoteka PDF je elektronski dokument eESPD v človeku berljivi obliki. Tudi tu predlagamo, da se uporablja kot referenčni dokument skupaj s formatom XML z dokumentacijo v zvezi z oddajo javnega naročila (javni naročnik podjetju) ali kot del ponudbe (podjetje javnemu naročniku).\
   \r\n\r\nČe imate vprašanja o datotekah, nam pišite na e-naslov: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Informacije za {0} e-Certis
+more_information=Več informacij
+less_information=Manj informacij
+question_to_use_alpha=Ali želite uporabiti pogoje za sodelovanje od A do D?
+
+crit_selection_technical_average_annual_manpower_description=Povprečno letno število zaposlenih gospodarskega subjekta v zadnjih treh letih:
+crit_information_available_electronically=Ali so te informacije organom brezplačno dostopne iz podatkovne zbirke države članice EU?
diff --git a/espd-web/src/main/resources/i18n/messages_sv.properties b/espd-web/src/main/resources/i18n/messages_sv.properties
index 686886e5f..284491d26 100644
--- a/espd-web/src/main/resources/i18n/messages_sv.properties
+++ b/espd-web/src/main/resources/i18n/messages_sv.properties
@@ -513,7 +513,6 @@ crit_selection_suitability_service_contracts_membership_description=Krävs medle
 crit_selection_suitability_service_contracts_membership_main=För tjänsteavtal: krav på medlemskap i viss organisation
 crit_selection_technical_allowance_of_checks_description=För komplexa varor eller tjänster som ska levereras eller, i undantagsfall, för varor eller tjänster som är avsedda för ett särskilt ändamål: Kommer den ekonomiska aktören att tillåta kontroller av sin produktionskapacitet eller tekniska kapacitet och, vid behov, av sina tillgängliga undersöknings- och forskningsresurser och av dess metoder för kvalitetskontroll? Kontrollen ska göras av den upphandlande myndigheten eller på dennas vägnar av ett behörigt offentligt organ i det land där leverantören eller tjänsteleverantören är etablerad.
 crit_selection_technical_allowance_of_checks_main=Tillåtelse till kontroller
-crit_selection_technical_average_annual_manpower_description=Antal anställda i medeltal och personer i ledningsfunktion hos den ekonomiska aktören under de senaste tre åren var följande:
 crit_selection_technical_average_annual_manpower_main=Antal anställda i medeltal per år:
 crit_selection_technical_educational_professional_qualifications_description=Följande utbildnings- och yrkeskvalifikationer innehas av tjänsteleverantören eller entreprenören själv och/eller (beroende på kraven i meddelandet eller i upphandlingsdokumenten) ledande personer i företaget:
 crit_selection_technical_educational_professional_qualifications_main=Utbildnings- och yrkeskvalifikationer
@@ -670,3 +669,11 @@ zip_instructions=Detta är en kort beskrivning av de upphandlingsdokumentfiler s
   \r\n\r\nespd.XML: XML-filen är en fil som vår tjänst för det europeiska enhetliga upphandlingsdokumentet eller en annan kompatibel tjänst kan förstå. Fördelen med att använda det elektroniska upphandlingsdokumentet (eESPD) i XML-format är att köpare och företag kan återanvända XML-filen för andra förfaranden senare. Den bör skickas tillsammans med upphandlingsdokumenten (från myndighet till företag) eller som en del av anbudet (företag till myndighet).\
   \r\n\r\nespd.PDF: PDF-filen är det elektroniska upphandlingsdokumentet i ett format som är läsbart för människor. Vi föreslår att den används i tillägg till XML-formatet tillsammans med upphandlingsdokumenten (från myndighet till företag) eller som en del av anbudet (företag till myndighet), som referensdokument.\
   \r\n\r\nOm du har frågor om filerna får du gärna kontakta oss på följande e-postadress: grow-espd@ec.europa.eu.
+
+information_for_country_in_ecertis=Information för {0} i e-Certis
+more_information=Mer information
+less_information=Mindre information
+question_to_use_alpha=Vill du använda urvalskriterierna A–D?
+
+crit_selection_technical_average_annual_manpower_description=Den ekonomiska aktörens antal anställda i medeltal per år för de senaste tre åren var följande:
+crit_information_available_electronically=Finns denna information tillgänglig kostnadsfritt för myndigheterna i en EU-medlemsstats databas?

From c94de2e368c6d24efd7250f3fd43aa376457b102 Mon Sep 17 00:00:00 2001
From: lukasal <lukasal@S-CI-RDS-0136.net1.cec.eu.int>
Date: Wed, 17 May 2017 14:44:46 +0200
Subject: [PATCH 4/5] #160 #169 release notes for 2017.03.03

---
 espd-docs/pom.xml                              | 2 +-
 espd-docs/src/main/asciidoc/configuration.adoc | 2 +-
 espd-docs/src/main/asciidoc/espd.adoc          | 4 ++--
 espd-docs/src/main/asciidoc/installation.adoc  | 2 +-
 espd-docs/src/main/asciidoc/releaseNotes.adoc  | 8 ++++++++
 espd-web/pom.xml                               | 2 +-
 pom.xml                                        | 2 +-
 7 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/espd-docs/pom.xml b/espd-docs/pom.xml
index aaf68d31b..356d04486 100644
--- a/espd-docs/pom.xml
+++ b/espd-docs/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>espd</artifactId>
         <groupId>eu.europa.ec.grow.espd</groupId>
-        <version>2017.03.02</version>
+        <version>2017.03.03</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/espd-docs/src/main/asciidoc/configuration.adoc b/espd-docs/src/main/asciidoc/configuration.adoc
index 58d5a9c42..78e0020df 100644
--- a/espd-docs/src/main/asciidoc/configuration.adoc
+++ b/espd-docs/src/main/asciidoc/configuration.adoc
@@ -2,7 +2,7 @@
 :homepage: https://ec.europa.eu/espd[ESPD]
 :espd: https://ec.europa.eu/espd[ESPD]
 :edm: https://github.com/ESPD/ESPD-EDM[ESPD-EDM]
-:appVersion: 2017.03.02
+:appVersion: 2017.03.03
 :maven: https://maven.apache.org[Maven]
 :tomcat: https://tomcat.apache.org[Tomcat]
 :springBoot: http://projects.spring.io/spring-boot/[Spring Boot]
diff --git a/espd-docs/src/main/asciidoc/espd.adoc b/espd-docs/src/main/asciidoc/espd.adoc
index 2d8eb3f7d..5f9ca4ec9 100644
--- a/espd-docs/src/main/asciidoc/espd.adoc
+++ b/espd-docs/src/main/asciidoc/espd.adoc
@@ -3,12 +3,12 @@
 Alexey Lukashov +
 Virgiliu Ratoi
 
-v2017.03.02, 04-05-2017
+v2017.03.03, 17-05-2017
 
 :sourcedir: ../java/eu/europa/ec/grow/espd
 :homepage: https://ec.europa.eu/espd[ESPD]
 :espd: https://ec.europa.eu/espd[ESPD]
-:appVersion: 2017.03.02
+:appVersion: 2017.03.03
 :maven: https://maven.apache.org[Maven 3]
 :tomcat: https://tomcat.apache.org[Tomcat 7+]
 :springBoot: http://projects.spring.io/spring-boot/[Spring Boot]
diff --git a/espd-docs/src/main/asciidoc/installation.adoc b/espd-docs/src/main/asciidoc/installation.adoc
index e3dbc9f37..93ad2ec10 100644
--- a/espd-docs/src/main/asciidoc/installation.adoc
+++ b/espd-docs/src/main/asciidoc/installation.adoc
@@ -1,7 +1,7 @@
 :sourcedir: ../java/eu/europa/ec/grow/espd
 :homepage: https://ec.europa.eu/espd[ESPD]
 :espd: https://ec.europa.eu/espd[ESPD]
-:appVersion: 2017.03.02
+:appVersion: 2017.03.03
 :maven: https://maven.apache.org[Maven]
 :tomcat: https://tomcat.apache.org[Tomcat]
 :springBoot: http://projects.spring.io/spring-boot/[Spring Boot]
diff --git a/espd-docs/src/main/asciidoc/releaseNotes.adoc b/espd-docs/src/main/asciidoc/releaseNotes.adoc
index 7e57c9ce4..2ab14ac21 100644
--- a/espd-docs/src/main/asciidoc/releaseNotes.adoc
+++ b/espd-docs/src/main/asciidoc/releaseNotes.adoc
@@ -1,5 +1,13 @@
 == Release notes
 
+=== 2017.03.02 (5th of May 2017)
+
+==== Enhancement
+
+* https://github.com/ESPD/ESPD-Service/issues/160[EO can only 'alpha' criterion when CA selects 'alpha']
+* https://github.com/ESPD/ESPD-Service/issues/169[shows the YES if selecting NO in part IV Selection Criteria]
+
+
 === 2017.03.02 (5th of May 2017)
 
 ==== Bug
diff --git a/espd-web/pom.xml b/espd-web/pom.xml
index ec4afaff0..159348339 100644
--- a/espd-web/pom.xml
+++ b/espd-web/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>espd</artifactId>
         <groupId>eu.europa.ec.grow.espd</groupId>
-        <version>2017.03.02</version>
+        <version>2017.03.03</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>espd-web</artifactId>
diff --git a/pom.xml b/pom.xml
index f9a0d504a..15a7cf117 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <groupId>eu.europa.ec.grow.espd</groupId>
     <artifactId>espd</artifactId>
     <packaging>pom</packaging>
-    <version>2017.03.02</version>
+    <version>2017.03.03</version>
     <modules>
         <module>espd-web</module>
         <module>espd-docs</module>

From a8abd7812e7ca2de604342f375e023d14b8d9404 Mon Sep 17 00:00:00 2001
From: lukasal <lukasal@S-CI-RDS-0136.net1.cec.eu.int>
Date: Wed, 17 May 2017 14:50:05 +0200
Subject: [PATCH 5/5] #160 #169 release date update

---
 espd-docs/src/main/asciidoc/releaseNotes.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/espd-docs/src/main/asciidoc/releaseNotes.adoc b/espd-docs/src/main/asciidoc/releaseNotes.adoc
index 2ab14ac21..87b1d843e 100644
--- a/espd-docs/src/main/asciidoc/releaseNotes.adoc
+++ b/espd-docs/src/main/asciidoc/releaseNotes.adoc
@@ -1,6 +1,6 @@
 == Release notes
 
-=== 2017.03.02 (5th of May 2017)
+=== 2017.03.03 (17th of May 2017)
 
 ==== Enhancement