diff options
author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-06-10 11:08:32 +0200 |
---|---|---|
committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-06-10 11:08:32 +0200 |
commit | c553525294ffe87bc05a5b1b100f86ddf0aa2d84 (patch) | |
tree | 714bfe6587fafc3e27122371d1324aa9497c9b36 /id/ConfigWebTool/src/main/resources | |
parent | c1ee833c415bcce3d7173f0beec0c1ffcd6c6529 (diff) | |
parent | 8dcf7e74a19986c234888b8b93eda5cbddf8ac76 (diff) | |
download | moa-id-spss-c553525294ffe87bc05a5b1b100f86ddf0aa2d84.tar.gz moa-id-spss-c553525294ffe87bc05a5b1b100f86ddf0aa2d84.tar.bz2 moa-id-spss-c553525294ffe87bc05a5b1b100f86ddf0aa2d84.zip |
Merge branch 'moa-2.1-Snapshot' into dokumentservice
Diffstat (limited to 'id/ConfigWebTool/src/main/resources')
-rw-r--r-- | id/ConfigWebTool/src/main/resources/applicationResources_de.properties | 3 | ||||
-rw-r--r-- | id/ConfigWebTool/src/main/resources/applicationResources_en.properties | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties index 1f0819edf..f379a7a34 100644 --- a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties +++ b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties @@ -35,8 +35,11 @@ error.oa.oauth.clientSecret=Client-Secret darf nicht leer sein error.oa.oauth.keyname=Key-Name darf nicht leer sein error.oa.oauth.keystore=Keystore darf nicht leer sein und muss eine richtige URL sein. + mail.userrequest.subject=Accountanforderung MOA-ID 2.x Konfigurationstool +webpages.slo.error=Der Abmeldevorgang bei allen Online-Applikationen war nicht erfolgreich. Bitte schlie \u00dfen Sie aus Sicherheitsgr\u00FCnden ihren Browser. +webpages.slo.success=Sie wurden erfolgreich bei allen Online-Applikationen abgemeldet. webpages.error.header=Es ist ein Fehler aufgetreten webpages.index.header=Willkommen bei der MOA-ID 2.x Konfigurationsapplikation diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties index 7733be5d0..398df94a5 100644 --- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties +++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties @@ -38,6 +38,9 @@ error.oa.oauth.keystore=Keystore cannot be blank and has to be provided in the f mail.userrequest.subject=Requesting accounts - MOA-ID 2.x Config Tool +webpages.slo.error=LogOut process finished with an error. For security reasons, please close your browser. +webpages.slo.success=LogOut process finished successful + webpages.error.header=The error occured webpages.index.header=Welcome to MOA-ID 2.x Configuration webpages.index.desciption.head=In order to use this service you should log in |