aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-05-09 12:10:28 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-05-09 12:10:28 +0200
commitbb06ad890498e2428c3f4268ae2f732a0f75bd77 (patch)
treed5a422144d55c96a0e87965ecc6ce036080d7133 /id/ConfigWebTool/src
parentc44e10f563cae97ce3c4a64f7ba3e8777e131a0d (diff)
parenta6d06a04fdd2caaebb387be3d85107658c08f345 (diff)
downloadmoa-id-spss-bb06ad890498e2428c3f4268ae2f732a0f75bd77.tar.gz
moa-id-spss-bb06ad890498e2428c3f4268ae2f732a0f75bd77.tar.bz2
moa-id-spss-bb06ad890498e2428c3f4268ae2f732a0f75bd77.zip
merge VIDP updates to Snapshot branch
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java
Diffstat (limited to 'id/ConfigWebTool/src')
-rw-r--r--id/ConfigWebTool/src/main/resources/applicationResources_en.properties2
1 files changed, 1 insertions, 1 deletions
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index 4163cbc37..4d76ec1ac 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -219,7 +219,7 @@ webpages.oaconfig.menu.vidp.hidden=Hide VIDP configuration
webpages.oaconfig.menu.stork=STORK configuration
-webpages.oaconfig.protocols.header=Authentication logs
+webpages.oaconfig.protocols.header=Authentication protocols
webpages.oaconfig.general.BKUSelection.button.show=Show configuration of login window
webpages.oaconfig.general.BKUSelection.button.hidden=Hide configuration of login window