diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
| commit | b53085c02cf81855379eb460206ee5a45abc9163 (patch) | |
| tree | 5040fae56dcafd89049c7be8accdb89892e433b9 /swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml index 8b7384c9..44463383 100644 --- a/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml +++ b/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml @@ -15,14 +15,14 @@ <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csc.fi</shibmd:Scope> <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">funet.fi</shibmd:Scope> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName> <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName> - <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description> + <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName> + <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName> <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description> <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description> - <mdui:Logo height="16" width="16">https://idp.csc.fi/img/csc16.png</mdui:Logo> + <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description> <mdui:Logo height="256" width="256">https://idp.csc.fi/idp/img/csc.jpg</mdui:Logo> + <mdui:Logo height="16" width="16">https://idp.csc.fi/img/csc16.png</mdui:Logo> <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL> <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL> <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL> |