Merge branch 'feature/eidasnode_v2.6' into feature/ms_proxy_before_refactoring

# Conflicts:
#	basicConfig/templates/error_message.html
#	modules/core_common_webapp/src/main/java/at/asitplus/eidas/specific/core/builder/AuthenticationDataBuilder.java

1 files changed, 42 insertions, 13 deletions

diff --git a/basicConfig/properties/messages.properties b/basicConfig/properties/messages.properties
index 63e0169c..8d2b692c 100644
--- a/basicConfig/properties/messages.properties
+++ b/basicConfig/properties/messages.properties
@@ -4,14 +4,14 @@ gui.general.language.selection.de=Deutsch
 gui.general.language.selection.en=English
 
 ##Errorpage template
-gui.errorpage.msg.title=Authentication error arise
+gui.errorpage.msg.title=Authentication error
 gui.errorpage.msg.information=The authentication stops on account of a process error:
 gui.errorpage.msg.errorcode=Error    Code:
 gui.errorpage.msg.errormsg=Error Message:
 gui.errorpage.msg.stacktrace=Stacktrace:
 
 ##Country-Selection page
-gui.countryselection.title=eIDAS-Login Countryselection
+gui.countryselection.title=eIDAS-Login country selection
 gui.countryselection.logo.bmi.alt=Logo BMI
 gui.countryselection.link.bmi=Mainpage BMI
 gui.countryselection.header1=Federal Ministry of Internal Affairs
@@ -71,7 +71,7 @@ gui.countryselection.country.pt=Portugal
 gui.countryselection.country.pt.logo.alt=Portugal-eID
 gui.countryselection.country.si=Slovenia
 gui.countryselection.country.si.logo.alt=Slovenia-eID
-gui.countryselection.country.es=SSpain
+gui.countryselection.country.es=Spain
 gui.countryselection.country.es.logo.alt=Spain-eID
 
 gui.countryselection.country.bg=Bulgaria
@@ -82,10 +82,12 @@ gui.countryselection.country.fi=Finland
 gui.countryselection.country.fi.logo.alt=Finland-eID
 gui.countryselection.country.fr=France
 gui.countryselection.country.fr.logo.alt=France-eID
-gui.countryselection.country.gr=Greece
-gui.countryselection.country.gr.logo.alt=Greece-eID
+gui.countryselection.country.el=Greece
+gui.countryselection.country.el.logo.alt=Greece-eID
 gui.countryselection.country.hu=Hungary
 gui.countryselection.country.hu.logo.alt=Hungary-eID
+gui.countryselection.country.ie=Ireland
+gui.countryselection.country.ie.logo.alt=Ireland-eID
 gui.countryselection.country.ir=Ireland
 gui.countryselection.country.ir.logo.alt=Ireland-eID
 gui.countryselection.country.lu=Luxembourg
@@ -100,25 +102,51 @@ gui.countryselection.country.sk=Slovakia
 gui.countryselection.country.sk.logo.alt=Slovakia-eID
 gui.countryselection.country.se=Sweden
 gui.countryselection.country.se.logo.alt=Sweden-eID
-gui.countryselection.country.uk=United Kingdom
-gui.countryselection.country.uk.logo.alt=United Kingdom-eID
-
-gui.countryselection.country.ie=Ireland
-gui.countryselection.country.ie.logo.alt=Ireland-eID
 gui.countryselection.country.sw=Sweden
 gui.countryselection.country.sw.logo.alt=Sweden-eID
+gui.countryselection.country.uk=United Kingdom
+gui.countryselection.country.uk.logo.alt=United Kingdom-eID
 
 gui.countryselection.country.testcountry=TestCountry
 gui.countryselection.country.testcountry.logo.alt=Testcountry-eID
-gui.countryselection.country.eu.validation=EC Validation-Service
-gui.countryselection.country.eu.logo.alt=EC Validation-Service
-
 
 gui.countryselection.mode.prod=Production
 gui.countryselection.mode.qs=QS
 gui.countryselection.mode.test=Test
 gui.countryselection.mode.dev=Development
 
+# images
+gui.countryselection.country.be.img = /img/countries/Belgium-EU_.png
+gui.countryselection.country.bg.img = /img/countries/Bulgaria-EU_.png
+gui.countryselection.country.hr.img = /img/countries/Croatia-EU_.png
+gui.countryselection.country.cy.img = /img/countries/Cyprus-EU_.png
+gui.countryselection.country.cz.img = /img/countries/CzechRepublic-EU_.png
+gui.countryselection.country.dk.img = /img/countries/Denmark-EU_.png
+gui.countryselection.country.ee.img = /img/countries/Estonia-EU_.png
+gui.countryselection.country.fi.img = /img/countries/Finland-EU_.png
+gui.countryselection.country.fr.img = /img/countries/France-EU_.png
+gui.countryselection.country.de.img = /img/countries/germany-eu_.png
+gui.countryselection.country.el.img = /img/countries/Greece-EU_.png
+gui.countryselection.country.hu.img = /img/countries/Hungary-EU_.png
+gui.countryselection.country.is.img = /img/countries/Iceland.png
+gui.countryselection.country.ie.img = /img/countries/Ireland-EU_.png
+gui.countryselection.country.it.img = /img/countries/Italy-EU_.png
+gui.countryselection.country.lv.img = /img/countries/Latvia-EU_.png
+gui.countryselection.country.lt.img = /img/countries/Lithuania-EU_.png
+gui.countryselection.country.lu.img = /img/countries/Luxembourg-EU_.png
+gui.countryselection.country.mt.img = /img/countries/Malta-EU_.png
+gui.countryselection.country.po.img = /img/countries/Poland-EU_.png
+gui.countryselection.country.pt.img = /img/countries/Portugal-EU_.png
+gui.countryselection.country.ro.img = /img/countries/Romania-EU_.png
+gui.countryselection.country.sk.img = /img/countries/Slovakia-EU_.png
+gui.countryselection.country.si.img = /img/countries/Slovenia-EU_.png
+gui.countryselection.country.es.img = /img/countries/Spain-EU_.png
+gui.countryselection.country.se.img = /img/countries/Sweden-EU_.png
+gui.countryselection.country.nl.img = /img/countries/TheNetherlands-EU_.png
+gui.countryselection.country.uk.img = /img/countries/UnitedKingdom-EU_.png
+
+
+##### Matching operations
 ##Other Login Methods page
 gui.otherlogin.title=eIDAS-Login Other Login Methods
 gui.otherlogin.header.selection=Personal data not found
@@ -183,3 +211,4 @@ gui.residency.input.municipality=Municipality
 gui.residency.input.village=Village
 gui.residency.input.street=Street
 gui.residency.input.number=Number
+