diff options
author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-07-07 17:24:33 +0200 |
---|---|---|
committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-07-07 17:24:33 +0200 |
commit | 26a2ba4a0c171fb9cdf9ea2c769576b1062480eb (patch) | |
tree | 81eba1f7a442e7a121c2d1b783b1926a42e2a553 /id/ConfigWebTool/src/main/resources | |
parent | 8b8ea32ebd30b542a9b4ea1c797078377443f251 (diff) | |
parent | b6b155c4d55a31a13d189f50831fb7fa8c504b90 (diff) | |
download | moa-id-spss-26a2ba4a0c171fb9cdf9ea2c769576b1062480eb.tar.gz moa-id-spss-26a2ba4a0c171fb9cdf9ea2c769576b1062480eb.tar.bz2 moa-id-spss-26a2ba4a0c171fb9cdf9ea2c769576b1062480eb.zip |
Merge branch 'moa-2.1-Snapshot' into authnrequest_signrequest_split
Diffstat (limited to 'id/ConfigWebTool/src/main/resources')
-rw-r--r-- | id/ConfigWebTool/src/main/resources/applicationResources_de.properties | 1 | ||||
-rw-r--r-- | id/ConfigWebTool/src/main/resources/applicationResources_en.properties | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties index 5b7f2cc01..e4e7a0b63 100644 --- a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties +++ b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties @@ -295,6 +295,7 @@ webpages.oaconfig.saml1.provideCertificate=Zertifikat \u00FCbertragen webpages.oaconfig.saml1.provideFullMandateData=Vollst\u00E4ndige Vollmacht \u00FCbertragen webpages.oaconfig.saml1.useCondition=Usecondition webpages.oaconfig.saml1.conditionLength=ConditionLength +webpages.oaconfig.saml1.provideAllErrors=Fehlermeldungen an OA \u00FCbertragen webpages.oaconfig.protocols.pvp2.header=PVP2.x Konfiguration webpages.oaconfig.pvp2.reload=PVP2.x konfiguration neu laden diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties index cc6e98964..dcf36103b 100644 --- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties +++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties @@ -293,6 +293,7 @@ webpages.oaconfig.saml1.provideCertificate=Transfer certificate webpages.oaconfig.saml1.provideFullMandateData=Transfer complete mandate data webpages.oaconfig.saml1.useCondition=Use condition webpages.oaconfig.saml1.conditionLength=Condition length +webpages.oaconfig.saml1.provideAllErrors=Transfer errors to application webpages.oaconfig.protocols.pvp2.header=PVP2.x configuration webpages.oaconfig.pvp2.reload=Load new PVP2.x configuration |