Merge branch 'nightlybuild' into feature/ms_proxy_before_refactoring

# Conflicts:
#	build_reporting/pom.xml
#	modules/authmodule-eIDAS-v2/pom.xml

1 files changed, 9 insertions, 0 deletions

diff --git a/basicConfig/properties/messages.properties b/basicConfig/properties/messages.properties
index f5bba0d5..63e0169c 100644
--- a/basicConfig/properties/messages.properties
+++ b/basicConfig/properties/messages.properties
@@ -141,12 +141,21 @@ gui.otherlogin.inserternp.third.prefix=Attention: If you think you already have
 gui.otherlogin.inserternp.third.postfix=, to arrange a manual assignment of your personal data.
 
 
+module.eidasauth.matching.00=Matching failed, because find more than one ZMR entries with one eIDAS personal-identifier
+module.eidasauth.matching.01=Matching failed, because of an ZMR communication error. Reason: {0}
+module.eidasauth.matching.02=Matching failed, because ZMR response contains historic information which is not supported.
+module.eidasauth.matching.03=Matching failed in workflow step: {0} with error: {1}
+module.eidasauth.matching.04=An error occurred while loading your data from official registers. Please contact the suppot.  
+module.eidasauth.matching.11=Matching failed, because of an ERnP communication error. Reason: {0}
+module.eidasauth.matching.12=Matching failed, because ERnP response contains historic information which is not supported.
 module.eidasauth.matching.21=Matching be using residence information failed by missing input information. Add all required information.
 module.eidasauth.matching.22=Can not find an unique match by using residence information. Provide more or other data, use another method for matching.
 module.eidasauth.matching.23=Matching be using ID Austria was canceled. Use another method for matching.
 module.eidasauth.matching.24=Matching be using ID Austria not possible. Use another method for matching.
 module.eidasauth.matching.25=Matching be using alternative eIDAS authentication not possible. Provide more or other data, or use another method for matching.
+module.eidasauth.matching.26=Matching be using alternative eIDAS authentication not possible, because Name or Country not matched. Provide more or other data or use another method for matching.
 module.eidasauth.matching.29=Matching be using other information failed. Provide more or other data, or use another method for matching.
+module.eidasauth.matching.99=Matching failed, because of an unexpected processing error. Reason: {0}
 
 
 ##Austrian Residency page