1 files changed, 12 insertions, 12 deletions
diff --git a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
index cf4faa84..84dbcd77 100644
--- a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
@@ -9,7 +9,7 @@
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
       </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
+      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
@@ -19,29 +19,29 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">suni.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Södertörns högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Södertörn University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Södertörns högskola</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for Södertörn University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.sh.se/</mdui:InformationURL>
+        <mdui:Description xml:lang="sv">Identity Provider för Södertörns högskola</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Södertörn University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Södertörns högskola</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">https://www.sh.se/english/sodertorn-university</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="118" width="604">https://www.sh.se/webdav/files/System/resources/graphics/logo-SH.svg</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://www.sh.se/</mdui:InformationURL>
         <mdui:Logo xml:lang="en" height="118" width="604">https://www.sh.se/webdav/files/System/resources/graphics/logo-SH.svg</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.sh.se/</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="sv" height="118" width="604">https://www.sh.se/webdav/files/System/resources/graphics/logo-SH.svg</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.sh.se/english/sodertorn-university</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.sh.se/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC3jCCAcagAwIBAgIQIkwNwJfVWptHttTrpB3rNDANBgkqhkiG9w0BAQsFADArMSkwJwYDVQQDEyBBREZTIEVuY3J5cHRpb24gLSBpZHAtdjIuc3VuaS5zZTAeFw0xOTAzMTkxMTA5NDlaFw0yOTAzMTYxMTA5NDlaMCsxKTAnBgNVBAMTIEFERlMgRW5jcnlwdGlvbiAtIGlkcC12Mi5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqMlb2IIsV9GO1iS5FLuhJsrLbnWd/0OXt1Wj14ezOxF53BwgLtV41SM0pkKt3z8UHD2zREc7xNsTitbPAkgTPclxFzGB+mtKUEzAwgrexEJ9JH6jTdVGP2OBKFhUAu/HRE5o650rZnhk2nB9sIw70EucHdjVuNe05SZRCmZAQ4HfoDXmk8ErJD31vD/JZLgtrErEM0biIr9d/5q5iSla0AQu57pkQe8WPw+HDvKMDpUZlRGq+lnk5DtMb4RC80aMA5isvKwtK0JszB+QFCLoUJN6BQHfK+Rx96htlaQjRwBvTv5zEhMPO2q+nlaAifRAtxlpYUPm2TgnZi+DCwXH/QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCjrunhaobr/YVPRa+19IYgA6fnatRHqaT+oScinTHqErsi6j9ixyK2WvVAMnjIa4miu/6HK6Vg7l7/RcsOXUJt+YFQYV+sPM/O6BbqZPDgF6tHVFBFiR378WMmgDttm8w5aVQu1JlE3fqY3iswuas6lIoKV6g3PQC3IzspJbIb6B3euzmcZ3G1rOWod5tN3laEMgknqJgrl5qQs641bEZa76quQEFC8cEEN/neudh4pWdWjHbmjRqOum3E4uzB6raOzKDuSAI3OxITFlAHoPxsHxr4QbmRaVmq1b00hVS+BVjNbFO73mtnq5rQOl/cUj+gJ3k4oG1fWOMV0t/Q0p0p</ds:X509Certificate>
+          <ds:X509Certificate>MIIFLDCCAxSgAwIBAgIQee1t7SOaTr9OMpwIKBDZqjANBgkqhkiG9w0BAQsFADArMSkwJwYDVQQDDCBBREZTIEVuY3J5cHRpb24gLSBpZHAtdjIuc3VuaS5zZTAeFw0yMjEwMDcwOTE0NTBaFw0zMjEwMDcwOTI0NDlaMCsxKTAnBgNVBAMMIEFERlMgRW5jcnlwdGlvbiAtIGlkcC12Mi5zdW5pLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA30JzoNDJ59tZQ1EYiS3CiQXvdnGEX/9izwVyxohinq8yJZZi88iMKWr+lDstEyr6+Yv+Wwin6AVst0i5z6/QRXo7CMmKxyUso889+DTVXqRc11J3CgPNA3NXywScxmn9wtpqZnrUlVvt25ni6TJRSQ0A07nQOeFiwLKE9YzwGFmpolmCDtzP5Qs/SOZiXliJkoM1szoNqRD2I+75bVdbih2kyvqdz3yFpEK4V6ugSyXWFTvFSQ7do5B3UWPXyz2aNvgAgNeBWiQKkHBnaRgCM3UnpsveWcHJQ30JG4CzI7BuNYY+CDf77L8xPF/2k2KkiSXtzK7n5X8sv8wbPDSUFRpZwJ3ETGTH4YsgfeOn7o21dtmpQZ1Bp3lsN62DTnuoXxJn4d52yyisdCLzFCSu+iVf8rIpgQaaoCzOPPwgyTQdt6JhAptv2fAOHcHmtSGIYwhyTktVkPab/2T6jWzTGP4MaOdws5TiC/gNCvRzJDkytSMPPU9/j8P2rxhNTB7Hf6KuJ5QIru7t8yYPCgRWLqcPmbKHGb+LVEdnqnwRjmrgWOoGBbJ4Y7mJKYC8hneakVSLzEfEwLtPRtbUHMO9fBKq4bTAqBixpyREa0E4aFMIBCLC7OyQwJgGjS3tvrVCqacvcm7CwXgMpmqXGUmXxISm/Bq589m0KNaSiV5lKL0CAwEAAaNMMEowDgYDVR0PAQH/BAQDAgWgMBkGA1UdEQQSMBCCDmlkcC12Mi5zdW5pLnNlMB0GA1UdDgQWBBSzmykJFiylMot5ukddVq3b9iSnLDANBgkqhkiG9w0BAQsFAAOCAgEA0topMjULA9bz9w89XcLTWtzT+9XvOi8B2pMO7xX255AIU0aTGvt5BpA6wAa1RLBgNmhDwko8mv0HymVFMNC3ibA47Mys0JgaSupPeJNO4clvWTPLn+g+54p1zFtenRFDgJlhsuFHHwHQ26IWt29zfFNors74SA+Bf/MTO2oQj3HjFKnoM25DNXGalpKNrhudvt6gVHoQZfq1YOfZmyyU1b4g6no11/ymS5hwoQYktl3aiJnV+8d6mzC9Uf0ByoL99B6nghtzrBfiA7y3g+z9jDHMJ0o9tbQ8lff2r/TtclKyx8LZ8U4U67h+BZdmjCAyN2BdjFm/ToLr8+r/J6ZVDExGZSufkQFOdNcxiK7c2t7hDPueGUJcwLuBxVltGPjhp7dDE62QBdlRNVMACA/ApeXgs+9fm358xxF5iRzjFOtNi+BPvUDI+/EoiidzGwLe/FCiy0ZsFdjjcN+R95o8ewx0laU644fkbCBg/N2k84aZmO687g5+HGZxqRLLGLupTUIcWwdWn9xYLCriYP4Kxs0ozvVG28AOYiQwILStgxSG+906J+AdoaZN+i+ALaPfU5xS9lVKpvzOOHT/dMPkKqwTtN0MZ7t/nN5NwDaiUmAXh0qDx0jZBzdOPR/Ff6Fpbak22ezlmT20hAO3E5KD7ra6VY92IANcnbxIIpUqcP0=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC2DCCAcCgAwIBAgIQbkY9lWXDKI1D4sdF+i8NgDANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIFNpZ25pbmcgLSBpZHAtdjIuc3VuaS5zZTAeFw0xOTAzMTkxMTA5NDhaFw0yOTAzMTYxMTA5NDhaMCgxJjAkBgNVBAMTHUFERlMgU2lnbmluZyAtIGlkcC12Mi5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA39GVqOrXOHszgzr/gu9b/qbpUvPyib4KHoPULNewurYFJIZn4zwPwkJlh6cVgzOhzxoj9GS64tWmVF7+6ycG+XER6m6qNmCgcWTWBhEgiBl9208h831RndRK06TwxRbWL1WdxQ00v6II+s35AO9CN9HYHZoQMH8ga/LEnOlGNXhHoPbaec4WfKAWfWXqy/eei9P4YeKWkefuKjhUkD3twZ+9S6b7rHMvf4gOvnIL4+dOOzlgrIzSBSEJeW2kHTVkuLfUsjIqWu51hM/9+LW1mHV16Ewx1DVqff2N/9h+xxtZHDjaHr/Haa1YW9HjgtPzaUxKKcJUS/r1cGp8oILUsQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAmfCcEwPUaq04Wgs3SS+OYtbiJQp2twSlY6rPSeVSVU5c4F9Epefjw0VEHMZupg5ZV6NRtHV0S5znx3yRe1w/hqCSphgQcfyPUcx/a4+lO4XM0glPJ9W/PkzjgiylPuCvrtVk1n15iC7xudxtb29B4IRL0l4NNJJhKzva1ZnGB+joC1p9xuuswgm1RWK+dgyyRAicps9ynpVMMZZ8uZCTMmawE2NfrTUcEhs4JSWpZBFaWLN25gaR4yHZlk1itL7SByWSM7pFCIKKcbjc5T67il7mZOSmChfBcgm5mGtgkj1xd+E/X+FPtQkzS9aX17hw94G/3O6iTV2t9EcDQvRvl</ds:X509Certificate>
+          <ds:X509Certificate>MIIFJjCCAw6gAwIBAgIQUUXuefnktadNfa0IUttldjANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1BREZTIFNpZ25pbmcgLSBpZHAtdjIuc3VuaS5zZTAeFw0yMjEwMDcwOTE1MTJaFw0zMjEwMDcwOTI1MTJaMCgxJjAkBgNVBAMMHUFERlMgU2lnbmluZyAtIGlkcC12Mi5zdW5pLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArm6IgvxtMFUJmgfL8QxY7oiy8EnbFPm9wosYvToTB7F5N3Vl8NUQY1f+gGDmXQOs+Bi43I/KbdKm5YyHdAardlrxM2JhYheL3Us8/917qGsMAuKhPfRsUpbg+wTQApRXOyk4/7sIYYUntmsHDK75sJ7ZrwXgCpyPlLw3P9W8C8f5U6KsxKFTBojgxPdjxoihHyJIE5CutVdB1dvPGtNoj6yyccdW3fKkwycCeImMRAzR/6wUMEHoQZKRkYmlbeXcgPRPNm5wfpXKVVtO7ViXiSYTdHg8/+o0PjD2wcKDRTJMei6h/J7I1F6+8l4xia6MQlHpkE0X0NB/TKiX0ibofHfpZBie1GY11+qfGh5YrElVdp9asNavrH/jD5f1z/2rOYE+z2/u9T2gK4iwkfj0HmDkWiPT44HF97mbOOiHrCofgrPGrRUcUuga7hFR+C9PTntM2BZSEAULZ0Sd+49hzBfNA0rTF3XKyceewOQPWWDozAh7OZ8F9OJpsdxdPKaEXVqKfQvjFrk4fqgNuUWB20Iz0LeVq4DunoUKrWFFCPRjzFr5wI5ZnzJ9IvSDxYb1oeHPq0vHnPaEsmIcL58aTIH0FGve4973pbY+hwexoYBaCgaoHFhzCFxRW16p8lA4oBMOYMnzodQiIXPYXyA9qQQgYxQ56r6DUmwT4iew2lkCAwEAAaNMMEowDgYDVR0PAQH/BAQDAgWgMBkGA1UdEQQSMBCCDmlkcC12Mi5zdW5pLnNlMB0GA1UdDgQWBBQJPnTTXlchD+zhTtnU2A4In9olajANBgkqhkiG9w0BAQsFAAOCAgEAGjPn+rajgsVnc2+biPE0oplQ2T6evv8nD6G27s6hoxg9ClcTFvAS5p/9F/JaV+kYvWlZ7ZcqNlW1nOvhe17dikcVDqUGg/2AbFpvZSqgE1gglOMCD+RuHnaJqU0z76+tavwrGoG/jWrVEUBM93ZUwDsc3SlXzGgeqdwP7ItDOzPKcp6Ufb8Qsn50WLaCfTxwPYS2kiW9uhbg1wfAcKqqqAz4E4MpMTRCMy9qYpuMbggp93z/WR+p/cjQy0OJL5XHeMb/bP1huNga6LOJnCy7YJ9xBLEOx1k1EWFBT8A+49s9LXWAcpS5aYg+Z3QaLg1u9JUbVpxYq7/xbbwiBtVcE779l9P262yTfsBdUiO7IoepeQ6iY8kBgdjkZM1QTp6UI/VJ6+KDJhPqTHiXDAHlxIVu4aIJJoVyCzrR1JGuF+d77piISosXp7gXwuVSrOtwHmXGI6FRaNU5fzjbq+OlRdd+kSKoRRrgJTW3sZ7pA/TFy9J/kJAWJEGzHyKhe781eG39CVPt5W/zJs8rdbwlHgb1ltVO7FBhgxKWYV5Hs6OKFSxbcRDJPi7babNsGz6iJXhc05KfSJedfbPHkoNxaS+PdUeHYSyaeH2d/9qMOhYa+fNZJQFkxASYE/FxDpI4gu6GYV5YtLBb0O+XjS3wQCqm19ajAGHZRmho/NuoyBk=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -55,12 +55,12 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Södertörns högskola</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Södertörn University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Södertörns högskola</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Södertörns högskola</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Södertörn University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.sh.se</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="sv">Södertörns högskola</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.sh.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.sh.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Tomas</md:GivenName>