diff --git a/modules/core/lib/Auth/Process/WarnShortSSOInterval.php b/modules/core/lib/Auth/Process/WarnShortSSOInterval.php
index d5c7fc40a8b2de6eb4cb215dc9fd5c36ef1af8fa..f30c0216691197b3ba282108f96878bee1990d20 100644
--- a/modules/core/lib/Auth/Process/WarnShortSSOInterval.php
+++ b/modules/core/lib/Auth/Process/WarnShortSSOInterval.php
@@ -52,7 +52,7 @@ class WarnShortSSOInterval extends Auth\ProcessingFilter
 
         // Save state and redirect
         $id = Auth\State::saveState($state, 'core:short_sso_interval');
-        $url = Module::getModuleURL('core/short_sso_interval.php');
+        $url = Module::getModuleURL('core/short_sso_interval');
         $httpUtils = new Utils\HTTP();
         $httpUtils->redirectTrustedURL($url, ['StateId' => $id]);
     }
diff --git a/modules/core/locales/af/LC_MESSAGES/core.po b/modules/core/locales/af/LC_MESSAGES/core.po
index f3f4a18f6c989c161aa5d823def137fe78ea5c4b..4d11fa991e7cec696eab927be8b3ba954dbb2d22 100644
--- a/modules/core/locales/af/LC_MESSAGES/core.po
+++ b/modules/core/locales/af/LC_MESSAGES/core.po
@@ -15,18 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Ons het ontdek dat daar slegs 'n paar sekondes was sedert jy laas "
-"geverifieer het met die diensverskaffer en neem dus aan dat daar 'n "
-"probleem is met hierdie SP."
-
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Te kort interval tussen enkel aanmeldings(single sign on) op die gebeure."
-
-msgid "{core:short_sso_interval:retry}"
-msgstr "Probeer weer aanmeld"
-
 msgid "Retry login"
 msgstr "Probeer weer aanmeld"
 
diff --git a/modules/core/locales/ar/LC_MESSAGES/core.po b/modules/core/locales/ar/LC_MESSAGES/core.po
index 92a2278d09422e6e8f090c681192bf701eabeeff..e18c055b5dde7493b0eecb246579e809d28d0b78 100644
--- a/modules/core/locales/ar/LC_MESSAGES/core.po
+++ b/modules/core/locales/ar/LC_MESSAGES/core.po
@@ -28,11 +28,6 @@ msgstr "استخدام أزرار الرجوع للخلف و الامام بمت
 msgid "{core:frontpage:login_as_admin}"
 msgstr "سجل دخول المشرف"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"يبدو انك قد قمت بتصديق الدخول عدة مرات لمقدم هذه الخدمة خلال الثواني "
-"القليلة الماضية مما يقودنا للاعتقاد بوجود مشكلة ما بهذا ال SP "
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "استخدام SimpleSAMLphp كمقدم خدمة"
 
@@ -119,15 +114,6 @@ msgstr "لم نستطع تحديد المعلومات المفقودة للطل
 msgid "{core:frontpage:show_metadata}"
 msgstr "اظهر البيانات الوصفية/ الميتاداتا"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "فترات قصيرة جداً بين محاولات تسجيل الدخول الموحد "
-
-msgid "{core:frontpage:intro}"
-msgstr ""
-"<strong>Congratulations</strong>, لقد قمت بإنزال SimpleSAMLphp بنجاح. هذه"
-" هي صفحة البداية حيث ستجد روابط لاختبار الأمثلة، التشخيص، البيانات "
-"الوصفية/الميتاداتا و الكتيبات التعريفية"
-
 msgid "{core:frontpage:required}"
 msgstr "مطلوب"
 
@@ -191,9 +177,6 @@ msgstr "استخدام SimpleSAMLphp ك IdP لتطبيقات قوقل التعل
 msgid "{core:frontpage:tools}"
 msgstr "الأدوات "
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "اعد تسجيل الدخول"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "استنكار"
 
diff --git a/modules/core/locales/cs/LC_MESSAGES/core.po b/modules/core/locales/cs/LC_MESSAGES/core.po
index e184f129485e354e457328956564d7986a44558d..6950fe3c0fd0ced172ea4fe6972b5b3f73743d62 100644
--- a/modules/core/locales/cs/LC_MESSAGES/core.po
+++ b/modules/core/locales/cs/LC_MESSAGES/core.po
@@ -28,12 +28,6 @@ msgstr "Použitím tlačítek zpět a vpřed ve webvém prohlížeči."
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Příhlásit se jako administrátor"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Zjistili jsme, že uběhlo pouze pár sekund od Vašeho minulého priřhlášení "
-"pomocí service providera a proto předpokládáme, že nastala chyba v tom "
-"SP."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "PouĹľitĂ­ SimpleSAMLphp jako SP"
 
@@ -122,9 +116,6 @@ msgstr "Nebylo možné najít stavovou informaci pro současný požadavek."
 msgid "{core:frontpage:show_metadata}"
 msgstr "Zobraz metadata"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Příliš krátký interval mezi událostmi jednoho prihlášení."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Blahopřejeme</strong>, máte správně nainstalovan SimpleSAMLphp. "
@@ -195,9 +186,6 @@ msgstr "SimpleSAMLphp jako IdP pro Google Apps for Education"
 msgid "{core:frontpage:tools}"
 msgstr "Nástroje"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Přihlašte se znovu."
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Zastaralé"
 
diff --git a/modules/core/locales/da/LC_MESSAGES/core.po b/modules/core/locales/da/LC_MESSAGES/core.po
index 55774ea8c39b8bdc5d26fef672e21a6928ba823a..fba900d6e0d2ce220e801a4782e8dd8d65c4be91 100644
--- a/modules/core/locales/da/LC_MESSAGES/core.po
+++ b/modules/core/locales/da/LC_MESSAGES/core.po
@@ -29,12 +29,6 @@ msgstr "Brug frem- og tilbage-knappen i browseren."
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Login som administrator"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Vi har opdaget at det kun er fĂĄ sekunder siden du sidst autentificerede "
-"dig op mod denne service. Vi antager derfor at der er et problem med "
-"services."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "SimpleSAMLphp som en tjenesteudbyder (SP)"
 
@@ -126,9 +120,6 @@ msgstr "Tilstandsinformation for igangværende request kan ikke findes"
 msgid "{core:frontpage:show_metadata}"
 msgstr "Vis metadata"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "For kort interval mellem single sign on hændelse."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Tillykke</strong>, du har nu installeret SimpleSAMLphp. Dette er "
@@ -199,9 +190,6 @@ msgstr "SimpleSAMLphp som en IdP for Google Apps for Education"
 msgid "{core:frontpage:tools}"
 msgstr "Værktøjer"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Login igen"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Under udfasning"
 
diff --git a/modules/core/locales/de/LC_MESSAGES/core.po b/modules/core/locales/de/LC_MESSAGES/core.po
index e754e1bf96d5af8dcb123d70daefbeafde10993b..577720f50a88fa616335fb350776e5eacb535dcf 100644
--- a/modules/core/locales/de/LC_MESSAGES/core.po
+++ b/modules/core/locales/de/LC_MESSAGES/core.po
@@ -29,12 +29,6 @@ msgstr "Das Benutzen der Zurück- und Vorwärts-Schaltflächen im Web-Browser."
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Als Administrator anmelden"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Wir haben festgestellt, dass seit Ihrer letzten Anmeldung bei diesem "
-"Diensteanbieter nur wenige Sekunden vergangen sind. Deswegen gehen wir "
-"davon aus, dass es ein Problem mit diesem Anbieter gibt."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "SimpleSAMLphp als Service Provider benutzen"
 
@@ -123,9 +117,6 @@ msgstr ""
 msgid "{core:frontpage:show_metadata}"
 msgstr "Metadaten zeigen"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Zu kurzes Intervall zwischen generellen Anmeldeereignissen."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>GlĂĽckwunsch</strong>, Sie haben erfolgreich SimpleSAMLphp "
@@ -200,9 +191,6 @@ msgstr "SimpleSAMLphp als IdP fĂĽr Google Apps fĂĽr Education verwernden"
 msgid "{core:frontpage:tools}"
 msgstr "Werkzeuge"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Versuche Anmeldung erneut"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Veraltet"
 
diff --git a/modules/core/locales/el/LC_MESSAGES/core.po b/modules/core/locales/el/LC_MESSAGES/core.po
index 94f346f5acb1f3fb5232b08576074a73ec07e4d2..dc15a2b7601180dff49d6befee5bbe1b706586db 100644
--- a/modules/core/locales/el/LC_MESSAGES/core.po
+++ b/modules/core/locales/el/LC_MESSAGES/core.po
@@ -29,12 +29,6 @@ msgstr "Μεταβήκατε πίσω και εμπρός στο ιστορικ
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Είσοδος ως διαχειριστής"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Έχουν περάσει μόλις λίγα δευτερόλεπτα από την τελευταία φορά που "
-"συνδεθήκατε σε αυτόν τον πάροχο υπηρεσιών, γεγονός που μπορεί να "
-"υποδηλώνει πρόβλημα με τον συγκεκριμένο πάροχο."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "Χρήση SimpleSAMLphp για Παρόχους Υπηρεσιών"
 
@@ -139,9 +133,6 @@ msgstr ""
 msgid "{core:frontpage:show_metadata}"
 msgstr "Εμφάνιση μεταδεδομένων"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Σύντομο χρονικό διάστημα μεταξύ διαδοχικών συνδέσεων."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Συγχαρητήρια</strong>, έχετε εγκαταστήσει με επιτυχία το "
@@ -219,9 +210,6 @@ msgstr "Το SimpleSAMLphp ως Πάροχος Ταυτότητας για Googl
 msgid "{core:frontpage:tools}"
 msgstr "Εργαλεία"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Επανάληψη σύνδεσης"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Υπό απόσυρση"
 
diff --git a/modules/core/locales/en/LC_MESSAGES/core.po b/modules/core/locales/en/LC_MESSAGES/core.po
index ccf052f5c5b83806e9ddce788c9ca5797ae504be..81e8b4c845cfb8b1fa0e60a84766790f1bdfbfe8 100644
--- a/modules/core/locales/en/LC_MESSAGES/core.po
+++ b/modules/core/locales/en/LC_MESSAGES/core.po
@@ -30,12 +30,6 @@ msgstr "Using the back and forward buttons in the web browser."
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Login as administrator"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"We have detected that there is only a few seconds since you last "
-"authenticated with this service provider, and therefore assume that there"
-" is a problem with this SP."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "Using SimpleSAMLphp as a Service Provider"
 
@@ -160,9 +154,6 @@ msgstr "We were unable to locate the state information for the current request."
 msgid "{core:frontpage:show_metadata}"
 msgstr "Show metadata"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Too short interval between single sign on events."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Congratulations</strong>, you have successfully installed "
@@ -236,9 +227,6 @@ msgstr "SimpleSAMLphp as an IdP for Google Apps for Education"
 msgid "{core:frontpage:tools}"
 msgstr "Tools"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Retry login"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Deprecated"
 
diff --git a/modules/core/locales/es/LC_MESSAGES/core.po b/modules/core/locales/es/LC_MESSAGES/core.po
index b013532e8f18600b37156d0a24440784d6002259..704a0529e581394827b4ceb13af875c71099342b 100644
--- a/modules/core/locales/es/LC_MESSAGES/core.po
+++ b/modules/core/locales/es/LC_MESSAGES/core.po
@@ -29,12 +29,6 @@ msgstr "Usando los botones atrás y adelante de su navegador web."
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Entrar como administrador"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Se ha detectado que han transcurrido solo unos segundos desde que fue "
-"autenticado por última vez en este servicio, por lo que se asumirá que "
-"existe un problema con este SP."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "Empleo de SimpleSAMLphp como Service Provider"
 
@@ -135,9 +129,6 @@ msgstr "No podemos encontrar la informaciĂłn de estado para la solicitud actual"
 msgid "{core:frontpage:show_metadata}"
 msgstr "Ver metadatos"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Intervalo de tiempo muy corto entre eventos de sesiĂłn Ăşnica."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>&iexcl;Felicidades!</strong>, ha instalado SimpleSAMLphp con "
@@ -213,9 +204,6 @@ msgstr "SimpleSAMLphp como IdP para Google Apps for Education"
 msgid "{core:frontpage:tools}"
 msgstr "Herramientas"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Reintente autenticaciĂłn"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Obsoleto"
 
diff --git a/modules/core/locales/et/LC_MESSAGES/core.po b/modules/core/locales/et/LC_MESSAGES/core.po
index 2272b7746a1fb7d82d05db446f97e42462d62470..c730b047498646b8aa345bda31abd427240141b2 100644
--- a/modules/core/locales/et/LC_MESSAGES/core.po
+++ b/modules/core/locales/et/LC_MESSAGES/core.po
@@ -27,12 +27,6 @@ msgstr "brauseri edasi-tagasi nuppude kasutamisest"
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Logi sisse administraatorina"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Tuvastasime, et sinu viimasest autentimisest selle teenusepakkujaga on "
-"möödunud ainult mõned sekundid ja seepärast arvame, et sellega "
-"teenusepakkujaga on probleeme."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "SimpleSAMLphp kasutamine teenusepakkujana"
 
@@ -119,9 +113,6 @@ msgstr "Aktiivse päringu olekuinfo leidmine ei õnnestunud."
 msgid "{core:frontpage:show_metadata}"
 msgstr "Näita metaandmeid"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Liiga lĂĽhike intervall ĂĽhekordse sisselogimise sĂĽndmuste vahel."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Palju õnne!</strong> Oled edukalt paigaldanud SimpleSAMLphp. See "
@@ -193,9 +184,6 @@ msgstr "SimpleSAMLphp IdP-na Google Apps for Educationis"
 msgid "{core:frontpage:tools}"
 msgstr "Tööriistad"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Proovi uuesti logida"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Vananenud"
 
diff --git a/modules/core/locales/eu/LC_MESSAGES/core.po b/modules/core/locales/eu/LC_MESSAGES/core.po
index dbd39c0bdadf945f4099ed6d80af116346ea6237..f2cf6c3063a9d73159b137f4d71b7f603298c86b 100644
--- a/modules/core/locales/eu/LC_MESSAGES/core.po
+++ b/modules/core/locales/eu/LC_MESSAGES/core.po
@@ -29,12 +29,6 @@ msgstr "Zure web nabigatzaileko atzera eta aurrera botoiak erabiltzen."
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Sartu administratzaile bezala"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Azken aldiz zerbitzu honetan kautotu zinenetik segundu gutxi batzu "
-"besterik ez direla igaro antzeman dugu, beraz ZH honekin arazoren bat "
-"dagoela hartuko dugu. "
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "SimpleSAMLphp erabili Identificadore hornitzaile moduan"
 
@@ -123,9 +117,6 @@ msgstr "Ez dugu aurkitu egoeraren informaziorik eskaera honentzat."
 msgid "{core:frontpage:show_metadata}"
 msgstr "Ikusi metadatuak"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Denbora tarte oso motza saio bakarreko gertaeren artean."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>&iexcl;Zorionak!</strong> SimpleSAMLphp zuzen instalatu duzu. Hau"
@@ -199,9 +190,6 @@ msgstr "SimpleSAMLphp Hezkuntzarako Google Apps-entzako IdP moduan"
 msgid "{core:frontpage:tools}"
 msgstr "Tresnak"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Saiatu berriro kautotzen"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Zaharkitua"
 
diff --git a/modules/core/locales/fr/LC_MESSAGES/core.po b/modules/core/locales/fr/LC_MESSAGES/core.po
index e7176f1daed48b5f05c6ba3a93e308a28673180c..6907b49961c9f40f7fc3b705392a15d6999337bc 100644
--- a/modules/core/locales/fr/LC_MESSAGES/core.po
+++ b/modules/core/locales/fr/LC_MESSAGES/core.po
@@ -29,11 +29,6 @@ msgstr "Utilisation des boutons avance et retour dans le navigateur."
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Connexion en tant qu'administrateur"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Il ne s'est écoulé que quelques secondes depuis votre authentification "
-"précédente, ce qui est la marque d'un dysfonctionnement de ce SP."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "Utilisation de SimpleSAMLphp comme fournisseur de service"
 
@@ -120,9 +115,6 @@ msgstr "Nous ne pouvons pas trouver l'information d'Ă©tat pour la demande couran
 msgid "{core:frontpage:show_metadata}"
 msgstr "Afficher les métadonnées"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Connexions uniques trop proches dans le temps."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Félicitations</strong>, vous avez installé SimpleSAMLphp. Cette "
@@ -199,9 +191,6 @@ msgstr "SimpleSAMLphp comme IdP pour les <i>Google Apps for Education</i>"
 msgid "{core:frontpage:tools}"
 msgstr "Outils"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "RĂ©-essayez de vous connecter"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Obsolète"
 
diff --git a/modules/core/locales/he/LC_MESSAGES/core.po b/modules/core/locales/he/LC_MESSAGES/core.po
index 051fa1edc71bcfcf2e36ee9541b45b23b544cad0..0eee159b2987eea22652027256bddf716a21ea3b 100644
--- a/modules/core/locales/he/LC_MESSAGES/core.po
+++ b/modules/core/locales/he/LC_MESSAGES/core.po
@@ -27,11 +27,6 @@ msgstr "שימוש בכפתורי הבא והקודם בדפדפן."
 msgid "{core:frontpage:login_as_admin}"
 msgstr "כנס כמנהל מערכת"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"גילינו שעברו רק מספר שניות מאז שהיזדהת בפעם האחרונה עם ספק השרות הזה, "
-"ולכן אנחנו מניחים שישנה בעייה עם ס\"הש."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "שימוש ב SimpleSAMLphp כספק שרותים"
 
@@ -116,9 +111,6 @@ msgstr "לא הצלחנו לאתר את מידע המצב לבקשה הנוכח
 msgid "{core:frontpage:show_metadata}"
 msgstr "הראה מטא-נתונים"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "פרק זמן קצר מידי בין ארועי כניסה יחידה."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>מזל טוב</strong>,SimpleSAMLphp. התקנת הבהצלחה את זה דף ההתחלה של "
@@ -189,9 +181,6 @@ msgstr "SimpleSAMLphp כס\"ז לשירותי גוגל להשכלה"
 msgid "{core:frontpage:tools}"
 msgstr "כלים"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "נסה שוב להתחבר"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "פג תוקף"
 
diff --git a/modules/core/locales/hr/LC_MESSAGES/core.po b/modules/core/locales/hr/LC_MESSAGES/core.po
index bde651ca09ee0330f3c34429f134932674ea6554..8efa3124567ddaaaa3eb4e56b8b82f167375c5d7 100644
--- a/modules/core/locales/hr/LC_MESSAGES/core.po
+++ b/modules/core/locales/hr/LC_MESSAGES/core.po
@@ -32,12 +32,6 @@ msgstr ""
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Prijavite se kao administrator"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Sustav je utvrdio da je prošlo tek nekoliko sekundi otkad ste se zadnji "
-"put autentificirali za pristup ovoj aplikaciji te stoga pretpostavljamo "
-"da se javio problem kod davatelja usluge."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr ""
 "Kako iskoristiti SimpleSAMLphp kao autentifikacijski modul u aplikacijama"
@@ -130,9 +124,6 @@ msgstr "Ne možemo pronaći podatak o stanju aktualnog zahtjeva."
 msgid "{core:frontpage:show_metadata}"
 msgstr "PrikaĹľi metapodatke"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Prekratak interval između uzastopnih SSO prijava."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Čestitamo</strong>, uspješno ste instalirali SimpleSAMLphp. Ovo "
@@ -211,9 +202,6 @@ msgstr "SimpleSAMLphp kao autentifikacijski servis za Google Apps for Education"
 msgid "{core:frontpage:tools}"
 msgstr "Alati"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Pokušaj se prijaviti ponovo"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Zastarjelo"
 
diff --git a/modules/core/locales/hu/LC_MESSAGES/core.po b/modules/core/locales/hu/LC_MESSAGES/core.po
index dc3deec548b234f6532a6560c9b7cedadad31935..00eb95057f934729ec7af51e6013fa6959eac009 100644
--- a/modules/core/locales/hu/LC_MESSAGES/core.po
+++ b/modules/core/locales/hu/LC_MESSAGES/core.po
@@ -29,12 +29,6 @@ msgstr "Használja a böngésző előre, ill. vissza gombjait"
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Bejelentkezés adminisztrátorként"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Mindössze néhány másodperc telt el az SP-hez történő, legutóbbi "
-"azonosítás óta. Ez nem normális működés, úgy tűnik, valami probléma "
-"lépett fel az SP-nél."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "SimpleSAMLphp használata mint alkalmazásszolgáltató(SP)"
 
@@ -123,9 +117,6 @@ msgstr "Nem lehet beazonosítani a kéréshez tartozó állapotinformációt."
 msgid "{core:frontpage:show_metadata}"
 msgstr "Mutasd a metaadatokat"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Túl kevés idő telt el a belépési kísérletek között."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Gratulálunk</strong>, a SimpleSAMLphp sikeresen települt. Ez a "
@@ -198,9 +189,6 @@ msgstr "SimpleSAMLphp mint IdP a Google Apps for Education programok számára"
 msgid "{core:frontpage:tools}"
 msgstr "Eszközök"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Újbóli belépés"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Kivezetés alatt álló opció - használata ellenjavallt"
 
diff --git a/modules/core/locales/id/LC_MESSAGES/core.po b/modules/core/locales/id/LC_MESSAGES/core.po
index d7e96438f31a32bb6c17d52221a78504d950ee3e..4ab97e6c897a691b8cfa1d25b1769776c7d1be20 100644
--- a/modules/core/locales/id/LC_MESSAGES/core.po
+++ b/modules/core/locales/id/LC_MESSAGES/core.po
@@ -29,12 +29,6 @@ msgstr "Menggunakan tombol back dan forward pada browser web."
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Login sebagai administrator"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Kami telah mendeteksi kalau beberapa detik yang lalu sejak autentifikasi "
-"yang anda lakukan pada service provider ini, dan oleh karena itu "
-"diasumsikan ada masalah dengan SP ini"
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "Menggunakan SimpleSAMLphp sebagai Service Provider"
 
@@ -119,9 +113,6 @@ msgstr "Kita tidak dapat menemukan informasi kondisi/state dari request saat ini
 msgid "{core:frontpage:show_metadata}"
 msgstr "Perlihatkan metadata"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Interval yang terlalu pendek antara event single sign on."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Selamat</strong>, Anda telah berhasil melakukan instalasi "
@@ -201,9 +192,6 @@ msgstr "SimpleSAMLphp sebagai IdP untuk Google Apps for Education"
 msgid "{core:frontpage:tools}"
 msgstr "Peralatan"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Coba login kembali"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Usang"
 
diff --git a/modules/core/locales/it/LC_MESSAGES/core.po b/modules/core/locales/it/LC_MESSAGES/core.po
index 36ba1b878fda8f049d3614b83fedcbf641de86e9..37c971af64f671fd23f0844fd7c8e385d35e700a 100644
--- a/modules/core/locales/it/LC_MESSAGES/core.po
+++ b/modules/core/locales/it/LC_MESSAGES/core.po
@@ -29,12 +29,6 @@ msgstr "Utilizzo i pulsanti avanti ed indietro del browser web."
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Accedi come amministratore"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"E' stato rilevato che sono passati solo alcuni secondi dalla tua ultima "
-"autenticazione con questo fornitore di servizio, quindi si può assumere "
-"che ci sia un problema con il Service Provider."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "Usare SimpleSAMLphp come Service Provider"
 
@@ -123,9 +117,6 @@ msgstr ""
 msgid "{core:frontpage:show_metadata}"
 msgstr "Mostra metadati"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "L'intervallo tra le autenticazioni è troppo breve."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Congratulazioni</strong>, hai installato SimpleSAMLphp con "
@@ -202,9 +193,6 @@ msgstr "SimpleSAMLphp come IdP per Google Apps for Education"
 msgid "{core:frontpage:tools}"
 msgstr "Strumenti"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Riprovare a connettersi"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Deprecato"
 
diff --git a/modules/core/locales/ja/LC_MESSAGES/core.po b/modules/core/locales/ja/LC_MESSAGES/core.po
index bacbb205357e94f3714ce5c1d58df249baf43a96..d50d6a3c74c2fe7f7f37a685e44bba3978a186d4 100644
--- a/modules/core/locales/ja/LC_MESSAGES/core.po
+++ b/modules/core/locales/ja/LC_MESSAGES/core.po
@@ -30,9 +30,6 @@ msgstr "WEBブラウザの戻るや次へのボタンを使用します。"
 msgid "{core:frontpage:login_as_admin}"
 msgstr "管理者としてログイン"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr "このサービスプロバイダで最後に認証されてから数秒しか経過していないことが検出されたため、このSPに問題があると思われます。"
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "SimpleSAMLphpをサービスプロバイダとして使用する"
 
@@ -152,9 +149,6 @@ msgstr "現在のリクエストから状態情報を特定することが出来
 msgid "{core:frontpage:show_metadata}"
 msgstr "メタデータを表示"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "シングルサインオンイベントの間隔が短すぎます。"
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>おめでとう</strong>、あなたはSimpleSAMLphpのインストールに成功しました。このページは設定を行うためのスタートページです。"
@@ -220,9 +214,6 @@ msgstr "SimpleSAMLphpをGoogle Apps for Educationの為のIdPとして設定"
 msgid "{core:frontpage:tools}"
 msgstr "ツール"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "ログインを再試行"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "非推奨"
 
diff --git a/modules/core/locales/lt/LC_MESSAGES/core.po b/modules/core/locales/lt/LC_MESSAGES/core.po
index 524ce9c3e7623836f8477ce419ada065e5841d24..938ecdb309a946d63b565b6685fb27324f12e469 100644
--- a/modules/core/locales/lt/LC_MESSAGES/core.po
+++ b/modules/core/locales/lt/LC_MESSAGES/core.po
@@ -30,12 +30,6 @@ msgstr "Back (Atgal) ir Forward (Pirmyn) mygtukų naudojimas interneto naršykl
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Prisijungti administratoriaus teisÄ—mis"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Mes nustatėme, kad praėjo tik kelios sekundės nuo Jūsų autentiškumo "
-"patvirtimo šiam paslaugos teikėjui, dėl to manome, kad yra nesklandumų su"
-" SP."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "SimpleSAMLphp naudojimas kaip paslaugos teikÄ—jÄ…"
 
@@ -120,9 +114,6 @@ msgstr "Nepavyko nustatyti būsenos informacijos šiai užklausai."
 msgid "{core:frontpage:show_metadata}"
 msgstr "Parodyti metaduomenis"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Per trumpas intervalas tarp prisijungimĹł prie paslaugĹł."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Sveikiname</strong>, JĹ«s sÄ—kmingai ÄŻdiegÄ—te SimpleSAMLphp. Tai "
@@ -198,9 +189,6 @@ msgstr "SimpleSAMLphp kaip IdP skirtas \"Google Apps for Education\""
 msgid "{core:frontpage:tools}"
 msgstr "Įrankiai"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Prisijunkite iš naujo"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Nebepalaikoma"
 
diff --git a/modules/core/locales/lv/LC_MESSAGES/core.po b/modules/core/locales/lv/LC_MESSAGES/core.po
index a4cd732698e0a07131acb3feb043a51116ad5717..ab079855522411c70be4bffc724974db7bd550d2 100644
--- a/modules/core/locales/lv/LC_MESSAGES/core.po
+++ b/modules/core/locales/lv/LC_MESSAGES/core.po
@@ -28,11 +28,6 @@ msgstr "Interneta pārlūka pogu Uz priekšu un Atpakaļ lietošana."
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Pieslēgties kā administrators"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Pēc pēdējās autentifikācijas ir pagājušas tikai dažas sekundes, tādēļ, "
-"iespējams, ir problēma ar servisa piegādātāju."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "Izmanto SimpleSAMLphp kā servisa piegādātāju"
 
@@ -117,9 +112,6 @@ msgstr "Nav iespējams atrast stāvokļa informāciju šim pieprasījumam."
 msgid "{core:frontpage:show_metadata}"
 msgstr "Rādīt metadatus"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Pārāk mazs intervāls starp pieslēgšanās notikumiem."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Apsveicu</strong>, Jūs esat veiksmīgi uzinstalējis "
@@ -190,9 +182,6 @@ msgstr "SimpleSAMLphp kā IdP priekš Google Apps for Education"
 msgid "{core:frontpage:tools}"
 msgstr "RÄ«ki"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Mēģināt pieslēgties vēlreiz"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Atcelts"
 
diff --git a/modules/core/locales/nb/LC_MESSAGES/core.po b/modules/core/locales/nb/LC_MESSAGES/core.po
index 17d6f92be35d98648b12a0e8951a99afd8459738..b65203320ab1da99ccf6e9ef3672bc0d7339ebde 100644
--- a/modules/core/locales/nb/LC_MESSAGES/core.po
+++ b/modules/core/locales/nb/LC_MESSAGES/core.po
@@ -27,12 +27,6 @@ msgstr "Bruk av \"frem\"- og \"tilbake\"-knappene i nettleseren."
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Login som administrator"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Vi har detektert at det er bare noen fĂĄ sekunder siden du sist ble "
-"autentisert pĂĄ denne tjenesten, og derfor antar vi at det er et problem "
-"med oppsettet av denne tjenesten."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "Bruk SimpleSAMLphp som Service Provider"
 
@@ -121,9 +115,6 @@ msgstr "Vi kunne ikke finne tilstandsinformasjonen for denne forespørselen."
 msgid "{core:frontpage:show_metadata}"
 msgstr "Vis metadata"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "For kort intervall imellom innloggingsforespørsler"
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Gratulerer</strong>, du har nĂĄ installert SimpleSAMLphp. Dette er"
@@ -197,9 +188,6 @@ msgstr "SimpleSAMLphp som identitetstjeneste for Google Apps for Education"
 msgid "{core:frontpage:tools}"
 msgstr "Verktøy"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Forsøk å logge inn på nytt"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Utdatert"
 
diff --git a/modules/core/locales/nl/LC_MESSAGES/core.po b/modules/core/locales/nl/LC_MESSAGES/core.po
index df3e6ae4c7cb245f2de0d273b97b9ce19455ba79..b923b495b3ceb2ca949902d95895d69207021b1f 100644
--- a/modules/core/locales/nl/LC_MESSAGES/core.po
+++ b/modules/core/locales/nl/LC_MESSAGES/core.po
@@ -30,12 +30,6 @@ msgstr "Login als beheerder"
 msgid "{core:frontpage:logout}"
 msgstr "Uitloggen"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"We hebben waargenomen dat u slechts een paar seconden geleden al "
-"aangemeld bent bij deze serviceprovider, daarom nemen we aan dat er een "
-"probleem is met deze SP."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "Gebruik SimpleSAMLphp als Service Provider"
 
@@ -139,9 +133,6 @@ msgstr ""
 msgid "{core:frontpage:show_metadata}"
 msgstr "Toon metadata"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Te kort interval tussen single sign on pogingen"
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Gefeliciteerd</strong>, SimpleSAMLphp is succesvol geĂŻnstalleerd."
@@ -219,9 +210,6 @@ msgstr "SimpleSAMLphp als een Identity Provider voor Google Apps for Education"
 msgid "{core:frontpage:tools}"
 msgstr "Gereedschap"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Inloggen opnieuw proberen"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Verouderd"
 
diff --git a/modules/core/locales/nn/LC_MESSAGES/core.po b/modules/core/locales/nn/LC_MESSAGES/core.po
index 5b93cfd2094e436136f4f7502758d552dcd6da00..d4c45c7d9f0e19789d00d462e35e7b144590c969 100644
--- a/modules/core/locales/nn/LC_MESSAGES/core.po
+++ b/modules/core/locales/nn/LC_MESSAGES/core.po
@@ -27,12 +27,6 @@ msgstr "Bruk av \"fram\"- og \"attende\"-knappane i nettlesaren."
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Innlogga som administrator"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Vi har merka at det kun er nokon fĂĄ sekund sidan du sist vart logga inn "
-"pĂĄ denne tenesta, og derfor trur vi at det er eit problem med oppsettet "
-"av denne tjenesta."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "Bruk SimpleSAMLphp som Service Provider"
 
@@ -121,9 +115,6 @@ msgstr "Vi kunne ikkje finne tilstandsinformasjonen for denne forespørselen."
 msgid "{core:frontpage:show_metadata}"
 msgstr "Vis metadata"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "For kort intervall mellom innloggingsforespørslar"
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Gratulerer</strong>, du har installert SimpleSAMLphp. Dette er "
@@ -197,9 +188,6 @@ msgstr "SimpleSAMLphp som IdP for Google Apps for Education"
 msgid "{core:frontpage:tools}"
 msgstr "Verktøy"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Prøv å logge inn på nytt"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Utfasa"
 
diff --git a/modules/core/locales/pt/LC_MESSAGES/core.po b/modules/core/locales/pt/LC_MESSAGES/core.po
index e25f232e52687c67fa755e33b237ada7ae00a63e..ebc6bcaac72bf5b0ffce53f0ea56a4b687e8ec6a 100644
--- a/modules/core/locales/pt/LC_MESSAGES/core.po
+++ b/modules/core/locales/pt/LC_MESSAGES/core.po
@@ -21,11 +21,6 @@ msgstr "PHP info"
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Entrar como administrador"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Foi detectada uma repetição de autenticação neste serviço em poucos "
-"segundos. Este SP pode ter um problema."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "Usar o SimpleSAMLphp como um fornecedor de serviço (SP)"
 
@@ -104,9 +99,6 @@ msgstr "Autenticação"
 msgid "{core:frontpage:show_metadata}"
 msgstr "Mostrar meta-dados"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Intervalo entre eventos de single sign on demasiado curto."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Parabéns</strong>, o software SimpleSAMLphp foi instalado com "
@@ -166,9 +158,6 @@ msgstr ""
 msgid "{core:frontpage:tools}"
 msgstr "Ferramentas"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Tentar de novo"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Descontinuado"
 
diff --git a/modules/core/locales/ro/LC_MESSAGES/core.po b/modules/core/locales/ro/LC_MESSAGES/core.po
index fb368a4c272d1eb3094c2473548ac7e1101c85c9..c1877b52dce9a709f05e5dfb4dd53caa624d5272 100644
--- a/modules/core/locales/ro/LC_MESSAGES/core.po
+++ b/modules/core/locales/ro/LC_MESSAGES/core.po
@@ -28,12 +28,6 @@ msgstr "Utilizarea butoanelor \"înainte\" sau \"înapoi\" din browser."
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Autentificare ca adminstrator"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"A fost detectat faptul că v-ați autentificat în urmă cu doar câteva "
-"secunde cu acest furnizor de servicii, se va considera că există o "
-"problemă cu acest furnizor de servicii."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "Utilizarea SimpleSAMLphp ca furnizor de servicii"
 
@@ -128,9 +122,6 @@ msgstr ""
 msgid "{core:frontpage:show_metadata}"
 msgstr "Vizualizare metadate"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Interval prea scurt între evenimentele <i>single sign-on</i>."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Felciitări</strong>, ați instalat cu succes SimpleSAMLphp. "
@@ -205,9 +196,6 @@ msgstr "Furnizor de identitate cu SimpleSAMLphp pentru GoogleApps în educație"
 msgid "{core:frontpage:tools}"
 msgstr "Unelte"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Încercați din nou"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Depreciate"
 
diff --git a/modules/core/locales/ru/LC_MESSAGES/core.po b/modules/core/locales/ru/LC_MESSAGES/core.po
index 0885a764ae36828f8de3cdc027219a573449ffb9..029937cbb3eda28de93ba1ba394c5f3e6b196351 100644
--- a/modules/core/locales/ru/LC_MESSAGES/core.po
+++ b/modules/core/locales/ru/LC_MESSAGES/core.po
@@ -28,12 +28,6 @@ msgstr "Используйте клавиши \"Вперед\" \"Назад\" в
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Войти как администратор"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Мы обнаружили, что прошло только несколько секунд с момента последней "
-"аутентификации с этим поставщиком услуг, и, следовательно, предположили, "
-"что существует проблема с этим поставщиком услуг."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "Использование SimpleSAMLphp в качестве Поставщика Услуг (SP)"
 
@@ -128,9 +122,6 @@ msgstr "Не удалось определить информацию о сос
 msgid "{core:frontpage:show_metadata}"
 msgstr "Показать метаданные"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Очень короткий промежуток времени между единым входом в событиях."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Поздравляем</strong>, Вы успешно установили SimpleSAMLphp. Это "
@@ -203,9 +194,6 @@ msgstr "SimpleSAMLphp в качестве IdP для Google Apps for Education"
 msgid "{core:frontpage:tools}"
 msgstr "Инструменты"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Повторить попытку входа"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Устаревшие"
 
diff --git a/modules/core/locales/sl/LC_MESSAGES/core.po b/modules/core/locales/sl/LC_MESSAGES/core.po
index 5a695f4f2762fed4a32eb3bbc64db0951ad89eaf..2329c96289dfe7db7e971106245cea9a167a1039 100644
--- a/modules/core/locales/sl/LC_MESSAGES/core.po
+++ b/modules/core/locales/sl/LC_MESSAGES/core.po
@@ -28,11 +28,6 @@ msgstr "Uporaba gumbov \"nazaj\" ali \"naprej\" v spletnem brskalniku."
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Prijavi se kot administrator"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Sistem je zaznal naslednje, od predhodnje in te prijave je poteklo le "
-"nekaj sekund, zato sklepa na teĹľave ponudnika storitve (SP)."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "Uporabi SimpleSAMLphp za SP"
 
@@ -117,9 +112,6 @@ msgstr "Informacije o stanju trenutne zahteve ni bilo moÄŤ najti."
 msgid "{core:frontpage:show_metadata}"
 msgstr "PrikaĹľi metapodatke"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Prekratek interval med dogodki enotne prijave."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Čestitamo!</strong> Uspešno ste namestili SimpleSAMLphp. Na tej "
@@ -194,9 +186,6 @@ msgstr "SimpleSAMLphp IdP za Google Apps for Education"
 msgid "{core:frontpage:tools}"
 msgstr "Orodja"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Ponovna prijava"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Neustrezen"
 
diff --git a/modules/core/locales/sr/LC_MESSAGES/core.po b/modules/core/locales/sr/LC_MESSAGES/core.po
index 6166bf75e2864c3229626c6b4724fe1b54bd1c43..697a5d457f475e01602935c208ea97bd881d4313 100644
--- a/modules/core/locales/sr/LC_MESSAGES/core.po
+++ b/modules/core/locales/sr/LC_MESSAGES/core.po
@@ -32,12 +32,6 @@ msgstr ""
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Prijavite se kao administrator"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Prošlo tek nekoliko sekundi otkad ste se zadnji put autentifikovali za "
-"pristup ovoj aplikaciji te stoga pretpostavljamo da se javio problem kod "
-"davaoca servisa."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr ""
 "Kako iskoristiti SimpleSAMLphp kao autentifikacioni modul kod Davaoca "
@@ -128,9 +122,6 @@ msgstr "Ne možemo pronaći informacije o stanju aktuelnog zahteva."
 msgid "{core:frontpage:show_metadata}"
 msgstr "PrikaĹľi metapodatke"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "Prekratak interval između uzastopnih SSO prijava."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Čestitamo</strong>, uspešno ste instalirali SimpleSAMLphp. Ovo je"
@@ -205,9 +196,6 @@ msgstr "SimpleSAMLphp kao autentifikacioni servis za Google Apps for Education"
 msgid "{core:frontpage:tools}"
 msgstr "Alati"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Pokušaj se prijaviti ponovo"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Zastarelo"
 
diff --git a/modules/core/locales/sv/LC_MESSAGES/core.po b/modules/core/locales/sv/LC_MESSAGES/core.po
index 75ef6eef6271254e584c531a98c7703518053925..83c415818ad5b4ac85df644e331e46e03eae5a1b 100644
--- a/modules/core/locales/sv/LC_MESSAGES/core.po
+++ b/modules/core/locales/sv/LC_MESSAGES/core.po
@@ -27,12 +27,6 @@ msgstr "Användning av framåt- och bakåtknappar i webbläsaren."
 msgid "{core:frontpage:login_as_admin}"
 msgstr "Logga in som administratör"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr ""
-"Vi har upptäckt att det bara vara några få sekunder sedan du senast "
-"loggade in mot denna tjänst (service provider) och därför antar vi att "
-"det är ett problem med denna tjänst."
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "Använda SimpleSAMLphp som Service Provider"
 
@@ -121,9 +115,6 @@ msgstr "Hittar inte tillståndsinformationen för aktuell förfrågan."
 msgid "{core:frontpage:show_metadata}"
 msgstr "Visa metadata"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "För kort intervall mellan inloggningar."
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>Gratulerar</strong>, du har framgĂĄngsrikt installerat "
@@ -196,9 +187,6 @@ msgstr "SimpleSAMLphp som IdP för Google Apps for Education"
 msgid "{core:frontpage:tools}"
 msgstr "Verktyg"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "Försök med inloggningen igen"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "Ej längre giltig"
 
diff --git a/modules/core/locales/zh-tw/LC_MESSAGES/core.po b/modules/core/locales/zh-tw/LC_MESSAGES/core.po
index 8ac2993628f16b197a19ea7f96f174dd723c079c..df5979049b42729fc9dc3ad2b75b015e5cb14800 100644
--- a/modules/core/locales/zh-tw/LC_MESSAGES/core.po
+++ b/modules/core/locales/zh-tw/LC_MESSAGES/core.po
@@ -27,9 +27,6 @@ msgstr "於網頁瀏覽器使用上一頁及下一頁。"
 msgid "{core:frontpage:login_as_admin}"
 msgstr "以管理員身分登入"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr "我們偵測到距離您最後一次驗證於這個服務提供者只有短短幾秒，而這可能是 SP 有點問題。"
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "使用 SimpleSAMLphp 做為服務提供者"
 
@@ -120,9 +117,6 @@ msgstr "我們無法找到關於這個請求的狀態資訊。"
 msgid "{core:frontpage:show_metadata}"
 msgstr "顯示詮釋資料"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "單一簽入事件間隔過短。"
-
 msgid "{core:frontpage:intro}"
 msgstr ""
 "<strong>恭喜你</strong>，您已經成功的安裝 "
@@ -192,9 +186,6 @@ msgstr "SimpleSAMLphp 做為 Google Apps 教育版的 IdP"
 msgid "{core:frontpage:tools}"
 msgstr "ĺ·Ąĺ…·"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "重試登入"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "棄置"
 
diff --git a/modules/core/locales/zh/LC_MESSAGES/core.po b/modules/core/locales/zh/LC_MESSAGES/core.po
index 5c21a433e6f9bb5c02be8025e466827fa61454ff..8d079e159c0471387cb1cf3eb5e4dc766c47b41f 100644
--- a/modules/core/locales/zh/LC_MESSAGES/core.po
+++ b/modules/core/locales/zh/LC_MESSAGES/core.po
@@ -27,9 +27,6 @@ msgstr "使用浏览器中的前进后退按钮"
 msgid "{core:frontpage:login_as_admin}"
 msgstr "作为管理员登录"
 
-msgid "{core:short_sso_interval:warning}"
-msgstr "我们检测到从你上一次连接到该服务提供者到本次连接中间间隔仅仅数秒的时间，我们猜测该SP可能有问题"
-
 msgid "{core:frontpage:link_doc_sp}"
 msgstr "正在使用SimpleSAMLphp作为服务提供者"
 
@@ -114,9 +111,6 @@ msgstr "我们无法定位当前请求的状态信息"
 msgid "{core:frontpage:show_metadata}"
 msgstr "显示元信息"
 
-msgid "{core:short_sso_interval:warning_header}"
-msgstr "单点登录事件之间间隔太短了"
-
 msgid "{core:frontpage:intro}"
 msgstr "<strong>恭喜你！</strong>,你已成功安装SimpleSAMLphp。这是你的开始页面,你在这里可以发现测试样例/诊断工具/元信息/甚至是相关文档的链接"
 
@@ -181,9 +175,6 @@ msgstr "SimpleSAMLphp作为Google Apps for Education的IdP"
 msgid "{core:frontpage:tools}"
 msgstr "ĺ·Ąĺ…·"
 
-msgid "{core:short_sso_interval:retry}"
-msgstr "重新尝试登陆"
-
 msgid "{core:frontpage:deprecated}"
 msgstr "已经超时"
 
diff --git a/modules/core/templates/short_sso_interval.twig b/modules/core/templates/short_sso_interval.twig
index f0a337851ef6a341ed5d65ff7e61666f38c07fca..2d3a01052001d1dd0d8f7bfe5f8cc1d008162b6d 100644
--- a/modules/core/templates/short_sso_interval.twig
+++ b/modules/core/templates/short_sso_interval.twig
@@ -2,15 +2,15 @@
 {% extends "base.twig" %}
 
 {% block content %}
-    <h1>{{ '{core:short_sso_interval:warning_header}'|trans }}</h1>
-    <form style="display: inline; margin: 0px; padding: 0px" action="{{ moduleURL('core/short_sso_interval.php') }}">
+    <h1>{{ 'Too short interval between single sign on events.'|trans }}</h1>
+    <form style="display: inline; margin: 0px; padding: 0px" action="{{ moduleURL('core/short_sso_interval') }}">
         {% for name, value in params %}
             <input type="hidden" name="{{ name|escape('html') }}" value="{{ value|escape('html') }}">
         {% endfor %}
-        <p>{{ '{core:short_sso_interval:warning}'|trans }}</p>
+        <p>{{ 'We have detected that there is only a few seconds since you last authenticated with this service provider, and therefore assume that there is a problem with this SP.'|trans }}</p>
         <div class="trackidtext">
-            <p>{{ '{errors:report_trackid}'|trans }}<span class="trackid">{{ trackId }}</span></p>
+            <p>{{ 'If you report this error, please also report this tracking number which makes it possible to locate your session in the logs available to the system administrator:'|trans }}<span class="trackid">{{ trackId }}</span></p>
         </div>
-        <input type="submit" name="continue" id="contbutton" value="'{core:short_sso_interval:retry}'|trans|escape('html') }}" autofocus>
+        <input type="submit" name="continue" id="contbutton" value="'Retry login'|trans|escape('html') }}" autofocus>
     </form>
 {% endblock %}
diff --git a/templates/error.twig b/templates/error.twig
index 580300c78764f85f5c6fe546c2b19efd1dfd0064..f3fa941b8e0b4761d527d292f2c3d05675d751f4 100644
--- a/templates/error.twig
+++ b/templates/error.twig
@@ -16,7 +16,7 @@
     {%- endif %}
 
     <div class="message-box">
-        <p>{{ '{errors:report_trackid}' | trans }}</p>
+        <p>{{ 'If you report this error, please also report this tracking number which makes it possible to locate your session in the logs available to the system administrator:' | trans }}</p>
         <div class="pure-button-group two-elements" role="group">
             <label class="pure-button hollow" disabled><pre id="trackid">{{ error.trackId }}</pre></label>
             <button data-clipboard-target="#trackid" id="btntrackid" class="pure-button clipboard-btn copy">