Merge remote-tracking branch 'remotes/origin/vidp_2.1_bs' into moa-2.1-Snapshot

1 files changed, 51 insertions, 49 deletions

diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index 28315ded6..5e116a974 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -8,6 +8,7 @@ config.04=OpenSAML (PVP2 Login) can not be initialized
 config.05=Configuration file is not defined
 
 error.title=Error:
+error.login.internal=The error occurred during the processing. Please try again or contact Administrator.
 error.general.text=During the processing the error condition occured. Please try again or contact the administrator.
 errors.listOAs.noOA=There is no Online-Application found in the database.
 errors.edit.oa.oaid=There is no valid Online-Application ID transfered.
@@ -27,7 +28,7 @@ error.login=The login procedure was interrupted. Please try again.
 error.mail.send=The message could not be sent to the provided address.
 error.mail.verification=The verification procedure was interrupted due to the error. Please try again.
 error.editoa.mailverification=The administration of the Online-Applications is temporarly deactivated because the email address of user's account is not verified.
-error.CCEformpreview.notpossible="The preview could not be generated as due to internal error."
+error.bkuformpreview.notpossible="The preview could not be generated as due to internal error."
 error.oa.oauth.redirecturi=Redirect URL ist not valid URL
 error.oa.oauth.clientSecret=Client-Secret cannot be blank
 error.oa.oauth.keyname=Key-Name cannot be blank
@@ -97,7 +98,7 @@ webpages.mainpage.menu.general.adminrequests=Open requests
 webpages.moaconfig.save.success=MOA-ID has been successfully saved.
 webpages.moaconfig.header=General configuration
 webpages.oaconfig.general.publicURLPreFix=Public URL Prefix
-webpages.moaconfig.defaultCCEs.header=Default CCE
+webpages.moaconfig.defaultbkus.header=Default CCE
 webpages.moaconfig.slrequesttemplates.header=SecurityLayer Request Templates
 webpages.moaconfig.slrequesttemplates.local=Local CCE
 webpages.moaconfig.slrequesttemplates.handy=Mobile CCE
@@ -158,26 +159,26 @@ webpages.searchoa.header=Find Online-Application
 webpages.searchoa.search.friendlyname=Name of the Online-Applikation
 webpages.searchoa.butten.search=Search
 
-webpages.oaconfig.header=Configiration of the Online-Application
+webpages.oaconfig.header=Configuration of the Online-Application
 webpages.oaconfig.general.isActive=Online-Application is activated
-webpages.oaconfig.general.CCE.header=CCE configuration
-webpages.oaconfig.general.CCE.local=Local CCE
-webpages.oaconfig.general.CCE.online=Online CCE
-webpages.oaconfig.general.CCE.handy=Mobile CCE
-webpages.oaconfig.general.CCE.slversion=SecurityLayer Version
-webpages.oaconfig.general.CCE.keyboxidentifier=KeyBoxIdentifier
-webpages.oaconfig.general.CCE.legacy=SecurityLayerTemplates (Legacy Request)
-webpages.oaconfig.general.CCE.sltemplate.first=SecurityLayer Template
-webpages.oaconfig.general.CCE.sltemplate.second=SecurityLayer Template (WhiteList)
-webpages.oaconfig.general.CCE.sltemplate.third=SecurityLayer Template (WhiteList)
-
-webpages.oaconfig.general.CCE.delete=Remove
-webpages.oaconfig.general.CCE.CCEselection.header=CCE-Selection Template
-webpages.oaconfig.general.CCE.CCEselection.filename=File name
-webpages.oaconfig.general.CCE.CCEselection.upload=Upload new template
-webpages.oaconfig.general.CCE.sendassertion.header=Send-Assertion Template
-webpages.oaconfig.general.CCE.sendassertion.filename=File name
-webpages.oaconfig.general.CCE.sendassertion.upload=Upload new template
+webpages.oaconfig.general.bku.header=CCE configuration
+webpages.oaconfig.general.bku.local=Local CCE
+webpages.oaconfig.general.bku.online=Online CCE
+webpages.oaconfig.general.bku.handy=Mobile CCE
+webpages.oaconfig.general.bku.slversion=SecurityLayer Version
+webpages.oaconfig.general.bku.keyboxidentifier=KeyBoxIdentifier
+webpages.oaconfig.general.bku.legacy=SecurityLayerTemplates (Legacy Request)
+webpages.oaconfig.general.bku.sltemplate.first=SecurityLayer Template
+webpages.oaconfig.general.bku.sltemplate.second=SecurityLayer Template (WhiteList)
+webpages.oaconfig.general.bku.sltemplate.third=SecurityLayer Template (WhiteList)
+
+webpages.oaconfig.general.bku.delete=Remove
+webpages.oaconfig.general.bku.bkuselection.header=CCE-Selection Template
+webpages.oaconfig.general.bku.bkuselection.filename=File name
+webpages.oaconfig.general.bku.bkuselection.upload=Upload new template
+webpages.oaconfig.general.bku.sendassertion.header=Send-Assertion Template
+webpages.oaconfig.general.bku.sendassertion.filename=File name
+webpages.oaconfig.general.bku.sendassertion.upload=Upload new template
 
 webpages.oaconfig.general.identification=Unique identifier (PublicURLPrefix)
 webpages.oaconfig.general.mandate.header=Mandates
@@ -220,23 +221,23 @@ webpages.oaconfig.menu.stork=STORK configuration
 
 webpages.oaconfig.protocols.header=Authentication logs
 
-webpages.oaconfig.general.CCESelection.button.show=Show configuration of login window
-webpages.oaconfig.general.CCESelection.button.hidden=Hide configuration of login window
-webpages.oaconfig.general.CCESelection.header=Configuration of form
-webpages.oaconfig.general.CCESelection.isOnlyMandateLoginAllowed=Allow mandated login only
-webpages.oaconfig.general.CCESelection.backgroundcolor=Background color of CCE-Auswahl
-webpages.oaconfig.general.CCESelection.frontcolor=Foreground color of CCE-Auswahl
-webpages.oaconfig.general.CCESelection.header.backgroundcolor=Background color of header
-webpages.oaconfig.general.CCESelection.header.frontcolor=Foreground color of header
-webpages.oaconfig.general.CCESelection.header.text=Header text
-webpages.oaconfig.general.CCESelection.header.button.background=Background color of button
-webpages.oaconfig.general.CCESelection.header.button.background.focus=Background color of button (focus)
-webpages.oaconfig.general.CCESelection.header.button.front=Foreground color of buton
-webpages.oaconfig.general.CCESelection.redirectTarget=Targetparameter
-webpages.oaconfig.general.CCESelection.fonttype=Form font type
-webpages.oaconfig.general.CCESelection.fonttype.list=Form font type list
-webpages.oaconfig.general.CCESelection.header.applet.height=Height of applet
-webpages.oaconfig.general.CCESelection.header.applet.width=Width of applet
+webpages.oaconfig.general.BKUSelection.button.show=Show configuration of login window
+webpages.oaconfig.general.BKUSelection.button.hidden=Hide configuration of login window
+webpages.oaconfig.general.BKUSelection.header=Configuration of form
+webpages.oaconfig.general.BKUSelection.isOnlyMandateLoginAllowed=Allow mandated login only
+webpages.oaconfig.general.BKUSelection.backgroundcolor=Background color of CCE-Auswahl
+webpages.oaconfig.general.BKUSelection.frontcolor=Foreground color of CCE-Auswahl
+webpages.oaconfig.general.BKUSelection.header.backgroundcolor=Background color of header
+webpages.oaconfig.general.BKUSelection.header.frontcolor=Foreground color of header
+webpages.oaconfig.general.BKUSelection.header.text=Header text
+webpages.oaconfig.general.BKUSelection.header.button.background=Background color of button
+webpages.oaconfig.general.BKUSelection.header.button.background.focus=Background color of button (focus)
+webpages.oaconfig.general.BKUSelection.header.button.front=Foreground color of buton
+webpages.oaconfig.general.BKUSelection.redirectTarget=Targetparameter
+webpages.oaconfig.general.BKUSelection.fonttype=Form font type
+webpages.oaconfig.general.BKUSelection.fonttype.list=Form font type list
+webpages.oaconfig.general.BKUSelection.header.applet.height=Height of applet
+webpages.oaconfig.general.BKUSelection.header.applet.width=Width of applet
 
 webpages.oaconfig.sso.header=Single Sign-On
 webpages.oaconfig.sso.singlelogouturl=Single Log-Out URL
@@ -380,12 +381,12 @@ validation.general.slrequest.filename.valid=File name of provided SecurityLayer
 validation.general.slrequest.file.valid=The provided SecurityLayer Transformation could not be loaded.
 
 validation.general.aditionalauthblocktext=The additional text for AuthBlock contains forbidden characters. The following characters are not allowed\: {0}
-validation.general.CCE.handy.empty=URL for Mobile-CCE is blank.
-validation.general.CCE.handy.valid=URL for Mobile-CCE has invalid format.
-validation.general.CCE.local.empty=URL for local CCE is blank.
-validation.general.CCE.local.valid=URL for local CCE has invalid format.
-validation.general.CCE.online.empty=URL for Online-CCE is blank.
-validation.general.CCE.online.valid=URL for Online-CCE has invalid format.
+validation.general.bku.handy.empty=URL for Mobile-CCE is blank.
+validation.general.bku.handy.valid=URL for Mobile-CCE has invalid format.
+validation.general.bku.local.empty=URL for local CCE is blank.
+validation.general.bku.local.valid=URL for local CCE has invalid format.
+validation.general.bku.online.empty=URL for Online-CCE is blank.
+validation.general.bku.online.valid=URL for Online-CCE has invalid format.
 validation.general.oafriendlyname.empty=There is no name for Online-Application provided.
 validation.general.oafriendlyname.valid=The name of Online-Application contains forbidden characters. The following characters are not allowed\: {0}
 validation.general.keyboxidentifier.empty=There is no KeyBoxIdentifier selected.
@@ -413,9 +414,9 @@ validation.general.oaidentifier.valid=The unique identifier for the Online-Appli
 validation.general.oaidentifier.notunique=The selected unique identifier is already available. Registration of the Online-Application was not possible.
 validation.general.stork.sptarget=STORK SP-Target is blank.
 validation.general.stork.sptargetsize=The Definition of STORK SP-Target is incorrect: too many characters.
-validation.general.CCEselection.filename.valid=The file name of CCE-selection template contains forbidden characters. The following characters are not allowed\: {0}
-validation.general.CCEselection.file.valid=The CCE-selection template could not be loaded.
-validation.general.CCEselection.file.selected=Only one CCE-selection template can be provided.
+validation.general.bkuselection.filename.valid=The file name of CCE-selection template contains forbidden characters. The following characters are not allowed\: {0}
+validation.general.bkuselection.file.valid=The CCE-selection template could not be loaded.
+validation.general.bkuselection.file.selected=Only one CCE-selection template can be provided.
 validation.general.sendassertion.filename.valid=The file name of Send-Assertion Templates contains forbidden characters. The following characters are not allowed\: {0}
 validation.general.sendassertion.file.valid=Send-Assertion Templates could not be loaded.
 validation.general.sendassertion.file.selected=Only one Send-Assertion Template can be provided.
@@ -428,6 +429,7 @@ validation.stork.requestedattributes=STORK attributes are incorrect. Example: at
 validation.stork.qaa.outofrange=Valid QAA values are 1, 2, 3, and 4
 validation.stork.attributes.empty=Only one attribute can be provided
 validation.stork.ap.url.valid=Invalid URL of AttributeProvider
+validation.stork.ap.name.empty=Invalid name of AttributeProvider
 validation.stork.ap.name.valid=Invalid Name of AttributeProvider
 validation.stork.ap.attributes.valid=Invalid attribute configuration for Attribute Provider Plugin. The field may not be blank und must be provided as csv.
 
@@ -443,8 +445,8 @@ validation.sso.logouturl.valid=URL for Single Log-Out Service has incorrect form
 
 validation.saml1.providestammzahl=ProvideSourcePIN cannot be combined with applications from private sector.
 
-validation.general.CCEselection.specialfeatures.valid=The special settings for the selection of CCE (Hide mandate login / compulsory required) could not be used in combination with SSO.
-validation.general.CCEselection.specialfeatures.combination=Required mandate based in combination with hidden checkfbox for selection of mandating is not possible.
+validation.general.bkuselection.specialfeatures.valid=The special settings for the selection of CCE (Hide mandate login / compulsory required) could not be used in combination with SSO.
+validation.general.bkuselection.specialfeatures.combination=Required mandate based in combination with hidden checkfbox for selection of mandating is not possible.
 validation.general.form.color.background=Background color for CCE selection contains invalid hexadecimal value. (e.g. \\\#FFFFFF)
 validation.general.form.color.front=Foreground color for CCE selection contains invalid hexadecimal value. (e.g. \\\#FFFFFF)
 validation.general.form.header.color.back=Background color for the caption of CCE selection contains no valid hexadecimal value. (e.g. \\\#FFFFFF)