aboutsummaryrefslogtreecommitdiff
path: root/id/server/idserverlib/src/main/resources
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-02-26 16:36:18 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-02-26 16:36:18 +0100
commit0e38238f9e08b59d3feb47a38b172f82d7f90c64 (patch)
tree364a9fec31011c94031b3e33395ee64e2deb4fba /id/server/idserverlib/src/main/resources
parentcaee81b311e93720d4c1fe2b3de22cdcbb0fe74d (diff)
parente9825935e59a3e7855060531f228177aded5cb0a (diff)
downloadmoa-id-spss-0e38238f9e08b59d3feb47a38b172f82d7f90c64.tar.gz
moa-id-spss-0e38238f9e08b59d3feb47a38b172f82d7f90c64.tar.bz2
moa-id-spss-0e38238f9e08b59d3feb47a38b172f82d7f90c64.zip
Merge branch 'ap' into moa2_0_tlenz_bs_3
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
Diffstat (limited to 'id/server/idserverlib/src/main/resources')
-rw-r--r--id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties1
1 files changed, 1 insertions, 0 deletions
diff --git a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
index 0e252e981..4007eacdc 100644
--- a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
+++ b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
@@ -207,6 +207,7 @@ stork.09=Fehler beim \u00FCberpr\u00FCfen der STORK B\u00FCrgerInnen Signatur
stork.10=Fehler in der Verbindung zum SZR-Gateway
stork.11=Fehler beim Sammeln von StorkAttributen
stork.12=Konnte keine VIDP Konfiguration finden
+stork.13=Fehler beim Sammeln eines Attributes in einem AttributProviderPlugin
pvp2.00={0} ist kein gueltiger consumer service index
pvp2.01=Fehler beim kodieren der PVP2 Antwort