aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/resources
diff options
context:
space:
mode:
authorAlexander Marsalek <amarsalek@iaik.tugraz.at>2014-07-08 10:55:12 +0200
committerAlexander Marsalek <amarsalek@iaik.tugraz.at>2014-07-08 10:55:12 +0200
commit487db6041f9c215e7d6cb93ed1d5b93ebb607ee3 (patch)
treec9302a52902d025c48105a87c9f43d5c2793bf92 /id/ConfigWebTool/src/main/resources
parent9d07e7a6dcd66c0ebff241e4f0113b787fcbcffb (diff)
parent49daddb4b7296311aa68fc717dfcb35005e16b3e (diff)
downloadmoa-id-spss-487db6041f9c215e7d6cb93ed1d5b93ebb607ee3.tar.gz
moa-id-spss-487db6041f9c215e7d6cb93ed1d5b93ebb607ee3.tar.bz2
moa-id-spss-487db6041f9c215e7d6cb93ed1d5b93ebb607ee3.zip
Merge branch 'moa-2.1-Snapshot' into authnrequest_signrequest_split
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
Diffstat (limited to 'id/ConfigWebTool/src/main/resources')
-rw-r--r--id/ConfigWebTool/src/main/resources/applicationResources_de.properties1
-rw-r--r--id/ConfigWebTool/src/main/resources/applicationResources_en.properties1
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 e4e7a0b63..2c71d86a5 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
@@ -453,6 +453,7 @@ validation.general.testcredentials.oid.valid=Die Testdaten OID {0} ist ung\u00FC
validation.stork.cpeps.cc=CPEPS L\u00E4ndercode folgt nicht ISO 3166-2
validation.stork.cpeps.empty=CPEPS Konfiguration ist unvollst\u00E4ndig
validation.stork.cpeps.url=CPEPS URL ist ung\u00FCltig
+validation.stork.cpeps.duplicate=L\u00E4ndercodes sind nicht eindeutig
validation.stork.requestedattributes=STORK Attribute sind fehlerhaft. Bsp.: attr1, attr2
validation.stork.qaa.outofrange=G\u00FCltige QAA Werte sind 1, 2, 3, und 4
validation.stork.attributes.empty=Es muss mindestens ein Attribut definiert sein
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index dcf36103b..a494ef089 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -450,6 +450,7 @@ validation.general.testcredentials.oid.valid=The OID {0} for test credentials is
validation.stork.cpeps.cc=CPEPS country code is not based on 3166-2
validation.stork.cpeps.empty=CPEPS configuration is incomplete
validation.stork.cpeps.url=CPEPS URL is invalid
+validation.stork.cpeps.duplicate=Country codes are not unique
validation.stork.requestedattributes=STORK attributes are incorrect. Example: attr1, attr2
validation.stork.qaa.outofrange=Valid QAA values are 1, 2, 3, and 4
validation.stork.attributes.empty=Only one attribute can be provided