diff --git a/modules/saml/locales/af/LC_MESSAGES/saml.po b/modules/saml/locales/af/LC_MESSAGES/saml.po
index f6da1b6e3407320ccf2f7583ea72c02fa4bc4d1d..b4784dc622e73c30e33c27963d236e89147f4fdf 100644
--- a/modules/saml/locales/af/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/af/LC_MESSAGES/saml.po
@@ -15,14 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Jou verifikasie konteks is nie deur die diens aanvaar nie. Waarskynlik te"
-" swak of nie twee-faktor nie."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Verkeerde verifikasie konteks"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/ar/LC_MESSAGES/saml.po b/modules/saml/locales/ar/LC_MESSAGES/saml.po
index bec147afbf4e89dc20a53208570ec24b45c08861..90c2e0bd85607e77add1ff370e4b71598b1f48c9 100644
--- a/modules/saml/locales/ar/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/ar/LC_MESSAGES/saml.po
@@ -16,14 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"طريقة التحقق التي استخدمتها غير مقبولة لمقدم الخدمة, غالبا هي أقل من "
-"متطلبات مقدم الخدمة الذي قد يطلب تحققاأكثر تعقيدا"
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "طريقة التحقق المستخدمة غير صحيحة"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/cs/LC_MESSAGES/saml.po b/modules/saml/locales/cs/LC_MESSAGES/saml.po
index 26507e10a86bcce3bf4f5a5bfd363db8d739b96e..1b27d675a3ddb7abd9a3e1f6ada0edb459b28d68 100644
--- a/modules/saml/locales/cs/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/cs/LC_MESSAGES/saml.po
@@ -16,14 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Váš autentizační kontext není touto službou akceptován. Pravděpodobné "
-"příliš snadné nebo nedvoufaktorové."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Ĺ patnĂ˝ autentizaÄŤnĂ­ kontext"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/da/LC_MESSAGES/saml.po b/modules/saml/locales/da/LC_MESSAGES/saml.po
index 639b885f32118578718b7d2d7a8d620987acb704..c57ca75db10fea6b682747b1b6585575fde01e9d 100644
--- a/modules/saml/locales/da/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/da/LC_MESSAGES/saml.po
@@ -15,14 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Din authentication context er ikke accepteret at denne tjeneste. "
-"Formentlig for svag eller manglende 2-faktor login."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Forkert authentication context"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/de/LC_MESSAGES/saml.po b/modules/saml/locales/de/LC_MESSAGES/saml.po
index 8af4bc5c187691442248aeede304025f79ef276a..4fe850caa3f8738a92c409dddedbfde46b56cb52 100644
--- a/modules/saml/locales/de/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/de/LC_MESSAGES/saml.po
@@ -15,14 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Ihr Authentifizierungskontext wird von diesem Dienst nicht akzeptiert. "
-"Wahrscheinlich ist er zu schwach oder nicht Zwei-Faktor."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Falscher Authentifizierungskontext"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/el/LC_MESSAGES/saml.po b/modules/saml/locales/el/LC_MESSAGES/saml.po
index a94f13c0ef174fe320c369b7a2ca5428599af6ec..857e3052867e45c7e889214546e487f7e26b5e6b 100644
--- a/modules/saml/locales/el/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/el/LC_MESSAGES/saml.po
@@ -15,15 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Η μέθοδος ταυτοποίησής σας δεν είναι αποδεκτή σε αυτή την υπηρεσία. "
-"Πιθανώς είναι πολύ αδύναμη, π.χ. δεν χρησιμοποιήθηκε επαλήθευση δύο "
-"βημάτων."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Εσφαλμένη μέθοδος ταυτοποίησης"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/en/LC_MESSAGES/saml.po b/modules/saml/locales/en/LC_MESSAGES/saml.po
index 1135a05db2b383a5b6a216e6e0f6000bc696e522..789141e6a15d63ded0c3cbe22a9049140f6efb0d 100644
--- a/modules/saml/locales/en/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/en/LC_MESSAGES/saml.po
@@ -15,24 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:proxy:invalid_idp_description}"
-msgstr ""
-"You already have a valid session with an identity provider "
-"(<em>%IDP%</em>) that is not accepted by <em>%SP%</em>. Would you like to"
-" log out from your existing session and log in again with another "
-"identity provider?"
-
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Your authentication context is not accepted at this service. Probably too"
-" weak or not two-factor."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Wrong authentication context"
-
-msgid "{saml:proxy:invalid_idp}"
-msgstr "Invalid Identity Provider"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/es/LC_MESSAGES/saml.po b/modules/saml/locales/es/LC_MESSAGES/saml.po
index 220d47e1f5ccf811b9fbe902d39e8a3faf9adc6b..6608ec0e2b811d628e1ca4b2d0ab68354a6d28b3 100644
--- a/modules/saml/locales/es/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/es/LC_MESSAGES/saml.po
@@ -15,23 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:proxy:invalid_idp_description}"
-msgstr ""
-"Ya existe una sesión válida con un proveedor de identidad "
-"(<em>%IDP%</em>) que <em>%SP%</em> no acepta. ÂżDesea cerrar su sesiĂłn "
-"actual e iniciar una nueva con otro proveedor de identidad?"
-
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Este servicio no acepta el contexto de su autenticaciĂłn. Probablemente es"
-" demasiado débil o no está usando un segundo factor de autenticación."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Contexto de autenticaciĂłn incorrecto"
-
-msgid "{saml:proxy:invalid_idp}"
-msgstr "Proveedor de Identidad inválido"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/et/LC_MESSAGES/saml.po b/modules/saml/locales/et/LC_MESSAGES/saml.po
index df8e79af1707dbb1393d6d51fa7c46bd6fc00bb3..fe687a778713142632bc39c67172e95404be2f73 100644
--- a/modules/saml/locales/et/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/et/LC_MESSAGES/saml.po
@@ -15,14 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"See teenus ei aktsepteeri sinu autentimiskonteksti. Tõenäoliselt on see "
-"liiga nõrk või pole kaheastmeline."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Vale autentimiskontekst"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/eu/LC_MESSAGES/saml.po b/modules/saml/locales/eu/LC_MESSAGES/saml.po
index 4d720458eb36b0743a1b627dcbe1fcdf0ea88c2a..35bd35fac2cec7687e83d1d72976847b733d7c25 100644
--- a/modules/saml/locales/eu/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/eu/LC_MESSAGES/saml.po
@@ -15,14 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Zerbitzu honek ez du onartzen zure kautotze testuingurua. Ziurrenik "
-"ahulegia da edo ez da bi faktoredun kautotzea. "
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Kautotze testu inguru okerra"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/fr/LC_MESSAGES/saml.po b/modules/saml/locales/fr/LC_MESSAGES/saml.po
index 95115fb0f0a9a380c680d7eee4cb120cbd5d015a..e27fc4d17644b9f13f8eff0f59a412526928cf9e 100644
--- a/modules/saml/locales/fr/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/fr/LC_MESSAGES/saml.po
@@ -15,14 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Votre contexte d'authentification n'est pas accepté pour ce service. "
-"Probablement trop faible ou pas forte."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Contexte d'authentification érroné"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/hr/LC_MESSAGES/saml.po b/modules/saml/locales/hr/LC_MESSAGES/saml.po
index e631359f227dc2f2fd3f97f478409a329fe80e92..e534f31dcde161172bbe6c6b3c2e8be6fc6306b9 100644
--- a/modules/saml/locales/hr/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/hr/LC_MESSAGES/saml.po
@@ -16,15 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Odabrana usluga ne prihvaća vaš autentikacijski kontekst. Najvjerojatnije"
-" zato što vaš autentikacijski servis ne zadovoljava razinu sigurnosti "
-"koju odabrana usluga zahtijeva."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Neispravan autentikacijski kontekst"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/hu/LC_MESSAGES/saml.po b/modules/saml/locales/hu/LC_MESSAGES/saml.po
index 88e17c85599a67e871dde66234a5b5026d452d79..c9c73fb526de0efb94cc0c2173ed108ef0f9f210 100644
--- a/modules/saml/locales/hu/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/hu/LC_MESSAGES/saml.po
@@ -15,15 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"A mód, ahogyan azonosított téged a személyazonosság szolgáltatód, nem "
-"elfogadott ennél a szolgáltatásnál. Valószínűleg túl gyenge, vagy nem "
-"kétfaktoros."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Elutasított azonosítási mód"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/id/LC_MESSAGES/saml.po b/modules/saml/locales/id/LC_MESSAGES/saml.po
index 3a40d2aba49c09e57613d96e57b7e431c5355c15..783bf54f6d4eda1f9442fab278846dc7d3621489 100644
--- a/modules/saml/locales/id/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/id/LC_MESSAGES/saml.po
@@ -15,14 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Konteks otentikasi Anda tidak tersedia pada layanan ini. Mungkin terlalu "
-"lemah atau bukan keamanan-ganda."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Konteks otentikasi keliru"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/it/LC_MESSAGES/saml.po b/modules/saml/locales/it/LC_MESSAGES/saml.po
index 071512dc202887634837711ce381552dc31a8873..1965371798e992ff0901a0b65b29cc7ed1639033 100644
--- a/modules/saml/locales/it/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/it/LC_MESSAGES/saml.po
@@ -15,14 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Il tuo contesto di autenticazione non è accettato da questo servizio. "
-"Probabilmente troppo debole o non a due fattori."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Contesto di autenticazione errato"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/lt/LC_MESSAGES/saml.po b/modules/saml/locales/lt/LC_MESSAGES/saml.po
index f67874f1716a89a135331fccc1034dcddd57d97b..c5e1f277db076b0c0e488274dc12303f3c0f71be 100644
--- a/modules/saml/locales/lt/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/lt/LC_MESSAGES/saml.po
@@ -16,14 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Jūsų autentikacijos kontekstas šioje paslaugoje nepriimamas. Greičiausiai"
-" jis yra per silpnas arba ne dviejĹł faktoriĹł."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Neteisingas autentifikacijos kontekstas"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/nl/LC_MESSAGES/saml.po b/modules/saml/locales/nl/LC_MESSAGES/saml.po
index 1f681802f7b4d47707f5a72549174559f9b87bea..484a5c26278a4f78b93d72d97506add6537e263e 100644
--- a/modules/saml/locales/nl/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/nl/LC_MESSAGES/saml.po
@@ -15,14 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Uw authenticatiecontext wordt niet geaccepteerd door deze dienst. "
-"Wellicht is deze de zwak of niet twee-factor."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Verkeerde authenticatiecontext"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/nn/LC_MESSAGES/saml.po b/modules/saml/locales/nn/LC_MESSAGES/saml.po
index 965218e8f79ed68e36e8a493b13677b9b1d84420..ff8c97cfbe59bde7349269fe2f0b4547d8ccf436 100644
--- a/modules/saml/locales/nn/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/nn/LC_MESSAGES/saml.po
@@ -15,15 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Du prøver å logga inn med ein innloggingsmetode som ikkje er støtta i "
-"tenesta. Truleg er autentiseringsnivĂĄiet for lĂĄgt, eller tenesta krav "
-"tofaktor-innlogging."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Feil innloggingsmetode"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/ro/LC_MESSAGES/saml.po b/modules/saml/locales/ro/LC_MESSAGES/saml.po
index e775f478498f346bed882246f1a63d5627cad09e..dfd159a19c19e51de4409ba692da72ac450839f6 100644
--- a/modules/saml/locales/ro/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/ro/LC_MESSAGES/saml.po
@@ -16,15 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Contextul de autentificare folosit nu este acceptat pentru acest "
-"serviciu. Probabil contextul de autentificare este prea slab/simplu sau "
-"nu este de tipul cu 2 factori de autentificare."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Context de autentificare greșit"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/ru/LC_MESSAGES/saml.po b/modules/saml/locales/ru/LC_MESSAGES/saml.po
index e6e6858a9f89f155b2109c3392b137162f7e5a71..4cf76abc51994d5f8f04f4dacac4dce46473eb2d 100644
--- a/modules/saml/locales/ru/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/ru/LC_MESSAGES/saml.po
@@ -16,14 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Ваш контекст аутентификации не принят данным сервисом. Либо слишком "
-"слабый, либо не двух-факторный."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Неправильный контекст аутентификации"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/sr/LC_MESSAGES/saml.po b/modules/saml/locales/sr/LC_MESSAGES/saml.po
index 5e3321429741158f922a4f8927cc9e4fa5f12b30..065db69a7b818e9af9e54e7b18981a265fe6ed6d 100644
--- a/modules/saml/locales/sr/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/sr/LC_MESSAGES/saml.po
@@ -16,14 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Vaš kontekst za autentifikaciju nije podržan od strane ovog servisa. "
-"Verovatno je previše slab, ili nije autentifikacija sa dva faktora."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Pogrešan kontekst za autentifikaciju"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/st/LC_MESSAGES/saml.po b/modules/saml/locales/st/LC_MESSAGES/saml.po
index 2be6a3e5942c71ff21c27ed8ffc6bf30ff0f4b38..dd846159feaa04eca304098e244957cd373f6f67 100644
--- a/modules/saml/locales/st/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/st/LC_MESSAGES/saml.po
@@ -24,15 +24,5 @@ msgstr ""
 "(<em>%IDP%</em>) ya sa amohelweng ke<em>%SP%</em>. Na o ka lakatsa ho "
 "tswa sesheneng ya hao e teng mme o kene ka mofani wa boitsebiso e mong?"
 
-msgid "{saml:proxy:invalid_idp_description}"
-msgstr ""
-"O se ntse o na le seshene e sebetsang ho mofani wa boitsebiso "
-"(<em>%IDP%</em>) ya sa amohelweng ke<em>%SP%</em>. Na o ka lakatsa ho "
-"tswa sesheneng ya hao e teng mme o kene ka mofani wa boitsebiso e mong?"
-
 msgid "Invalid Identity Provider"
 msgstr "Mofani wa Boitsebiso ha Nepahala"
-
-msgid "{saml:proxy:invalid_idp}"
-msgstr "Mofani wa Boitsebiso ha Nepahala"
-
diff --git a/modules/saml/locales/sv/LC_MESSAGES/saml.po b/modules/saml/locales/sv/LC_MESSAGES/saml.po
index fd74c563e3f99d41f37625e4278d76aec8e088b6..d2384cc4d5cd66fefc8b6a20f555617e658cd31a 100644
--- a/modules/saml/locales/sv/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/sv/LC_MESSAGES/saml.po
@@ -15,14 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr ""
-"Din autentiseringsteknik är inte godkänd av denna tjänst, troligen är den"
-" för svag eller är inte en två-faktorsteknik."
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "Felaktig autentiseringsteknik"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/xh/LC_MESSAGES/saml.po b/modules/saml/locales/xh/LC_MESSAGES/saml.po
index 9d730336dab3a073592c50950914d90703d0a959..d7a99ed4ea15cb8b810c3ec205e3287c1c755ca2 100644
--- a/modules/saml/locales/xh/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/xh/LC_MESSAGES/saml.po
@@ -14,10 +14,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-msgid "{saml:proxy:invalid_idp}"
+msgid "Invalid Identity Provider"
 msgstr "Isiboneleli Sesazisi Esingasebenziyo"
 
-msgid "{saml:proxy:invalid_idp_description}"
+msgid ""
+"You already have a valid session with an identity provider "
+"(<em>%IDP%</em>) that is not accepted by <em>%SP%</em>. Would you like to"
+" log out from your existing session and log in again with another "
+"identity provider?"
 msgstr ""
 "Sele unayo iseshoni esebenzayo nomboneleli wesazisi (<em>%IDP%</em>) "
 "engamkelwanga yi-<em>%SP%</em>. Ingaba ungathanda ukuphuma kwiseshoni "
diff --git a/modules/saml/locales/zh-tw/LC_MESSAGES/saml.po b/modules/saml/locales/zh-tw/LC_MESSAGES/saml.po
index 1865d97b91b295d249c95d6e6b0317f595eed5cd..ef13d57eb7cc01cf23a5c47925cadab9b4989bc5 100644
--- a/modules/saml/locales/zh-tw/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/zh-tw/LC_MESSAGES/saml.po
@@ -15,12 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr "您的驗證碼無法被接受。可能是強度太弱或是未使用兩段式驗證。"
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "錯誤驗證碼"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/zh/LC_MESSAGES/saml.po b/modules/saml/locales/zh/LC_MESSAGES/saml.po
index 7b36728ec8e21a19c4bdb4220e29b61830765859..c1d7df37abb87d05403db5838c8bb2fe01ad2c19 100644
--- a/modules/saml/locales/zh/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/zh/LC_MESSAGES/saml.po
@@ -15,12 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{saml:wrong_authncontextclassref:description}"
-msgstr "此服务不接受您的验证上下文。可能因为验证太弱或非双因素验证。"
-
-msgid "{saml:wrong_authncontextclassref:header}"
-msgstr "错误的验证上下文"
-
 msgid ""
 "Your authentication context is not accepted at this service. Probably too"
 " weak or not two-factor."
diff --git a/modules/saml/locales/zu/LC_MESSAGES/saml.po b/modules/saml/locales/zu/LC_MESSAGES/saml.po
index 9265c08238697f2cb3464c56903451a99aea559f..01c57914e5f0c9c765d9217ff4b602e5bb3168eb 100644
--- a/modules/saml/locales/zu/LC_MESSAGES/saml.po
+++ b/modules/saml/locales/zu/LC_MESSAGES/saml.po
@@ -14,10 +14,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-msgid "{saml:proxy:invalid_idp}"
+msgid "Invalid Identity Provider"
 msgstr "Umhlinzeki Kamazisi Ongalungile"
 
-msgid "{saml:proxy:invalid_idp_description}"
+msgid ""
+"You already have a valid session with an identity provider "
+"(<em>%IDP%</em>) that is not accepted by <em>%SP%</em>. Would you like to"
+" log out from your existing session and log in again with another "
+"identity provider?"
 msgstr ""
 "Kakade uneseshini evumelekile nomhlinzeki kamazisi (<em>%IDP%</em>) "
 "engamukelwa okuthi <em>%SP%</em>. Ungathanda ukuphuma kuseshini yakho "
diff --git a/modules/saml/templates/proxy/invalid_session.twig b/modules/saml/templates/proxy/invalid_session.twig
index c970efabfa76c4b24389b0c8d4fdf90b987fc9f4..f9acc7a9881e7b12c7b5ff432b80b091ee6dc6c7 100644
--- a/modules/saml/templates/proxy/invalid_session.twig
+++ b/modules/saml/templates/proxy/invalid_session.twig
@@ -2,11 +2,11 @@
 {% extends "base.twig" %}
 
 {% block content %}
-    <h2>{{ '{saml:proxy:invalid_idp}'|trans }}</h2>
-    <p>{{ '{saml:proxy:invalid_idp_description}'|trans({"%IDP%": idp_name, "%SP%": sp_name}, "app")|raw</p>
+    <h2>{{ 'Invalid Identity Provider'|trans }}</h2>
+    <p>{{ 'You already have a valid session with an identity provider (<em>%IDP%</em>) that is not accepted by <em>%SP%</em>. Would you like to log out from your existing session and log in again with another identity provider?'|trans({"%IDP%": idp_name, "%SP%": sp_name}, "app")|raw</p>
     <form method="post" action="?">
         <input type="hidden" name="AuthState" value="{{ AuthState|escape('html') }}" />
-        <input type="submit" name="continue" value="{{ '{general:yes_continue}'|trans }}" />
-        <input type="submit" name="cancel" value="{{ '{general:no_cancel}'|trans }}" />
+        <input type="submit" name="continue" value="{{ 'Yes, continue'|trans }}" />
+        <input type="submit" name="cancel" value="{{ 'No, cancel'|trans }}" />
     </form>
 {% endblock %}
diff --git a/modules/saml/templates/sp/wrong_authncontextclassref.twig b/modules/saml/templates/sp/wrong_authncontextclassref.twig
index 5a5012c87407efe0f5f5259756c596f795d75472..92895c444916a2a3f365cdcde875f63a005d1c1e 100644
--- a/modules/saml/templates/sp/wrong_authncontextclassref.twig
+++ b/modules/saml/templates/sp/wrong_authncontextclassref.twig
@@ -2,6 +2,6 @@
 {% extends "base.twig" %}
 
 {% block content %}
-    <h2>{{ '{saml:wrong_authncontextclassref:header}'|trans|escape('html') }}</h2>
-    <p>{{ '{saml:wrong_authncontextclassref:description}'|trans|escape('html') }}</p>
+    <h2>{{ 'Wrong authentication context'|trans }}</h2>
+    <p>{{ 'Your authentication context is not accepted at this service. Probably too weak or not two-factor.'|trans }}</p>
 {% endblock %}