diff --git a/locales/ar/LC_MESSAGES/messages.po b/locales/ar/LC_MESSAGES/messages.po
index 657205af2a090aac219937b8b833976263036510..8dbaa6a9b2b25f2d534f92a8a1006d9b36004b40 100644
--- a/locales/ar/LC_MESSAGES/messages.po
+++ b/locales/ar/LC_MESSAGES/messages.po
@@ -1058,7 +1058,7 @@ msgstr ""
 "أيضاً "
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
+msgid "Your session is valid for %remaining% seconds from now."
 msgstr "ستستمر جلستك ل٪عدد ثواني٪ ثانية تبدأ الان"
 
 msgid "Domain component (DC)"
diff --git a/locales/cs/LC_MESSAGES/messages.po b/locales/cs/LC_MESSAGES/messages.po
index 1f58c27e84d64864549361d48187eff2ebcc327e..213aeff8dc9012902289bc51047c1c73d3401821 100644
--- a/locales/cs/LC_MESSAGES/messages.po
+++ b/locales/cs/LC_MESSAGES/messages.po
@@ -318,9 +318,6 @@ msgstr "KontaktnĂ­ informace"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Neočekávaná vyjímka"
 
-msgid "{status:validfor}"
-msgstr "Vaše sezení je platné %SECONDS% sekund od teď."
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP Demo"
 
@@ -1072,8 +1069,8 @@ msgstr ""
 "zašlete mu tuto zprávu."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Vaše sezení je platné %SECONDS% sekund od teď."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Vaše sezení je platné %remaining% sekund od teď."
 
 msgid "Domain component (DC)"
 msgstr "Doména (DC)"
diff --git a/locales/da/LC_MESSAGES/messages.po b/locales/da/LC_MESSAGES/messages.po
index 1037383153cd70ac3cc2890eb6e05b495cc81b9e..58852f04679d3c7d4041072adcabce102723c8c7 100644
--- a/locales/da/LC_MESSAGES/messages.po
+++ b/locales/da/LC_MESSAGES/messages.po
@@ -322,9 +322,6 @@ msgstr "Kontaktoplysninger"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Unhandled exception"
 
-msgid "{status:validfor}"
-msgstr "Du har %SECONDS% tilbage af din session"
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 tjenesteudbyder-demo"
 
@@ -1109,8 +1106,8 @@ msgstr ""
 "rapportér så mange detaljer som muligt om fejlen"
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Du har %SECONDS% tilbage af din session"
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Du har %remaining% tilbage af din session"
 
 msgid "Domain component (DC)"
 msgstr "Domænekomponent"
diff --git a/locales/de/LC_MESSAGES/messages.po b/locales/de/LC_MESSAGES/messages.po
index 5093d0f4b29ce22b6c07d0d2dc7aea6761660618..be13ef1782b303f3dc984cf973fb25a3251f11f3 100644
--- a/locales/de/LC_MESSAGES/messages.po
+++ b/locales/de/LC_MESSAGES/messages.po
@@ -340,9 +340,6 @@ msgstr "Kontakt"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Nicht abgefangene Code-Exception"
 
-msgid "{status:validfor}"
-msgstr "Ihre Sitzung ist noch fĂĽr %SECONDS% gĂĽltig."
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP Demo Beispiel"
 
@@ -1139,8 +1136,8 @@ msgstr ""
 "obige Fehlermeldung mit."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Ihre Sitzung ist noch fĂĽr %SECONDS% gĂĽltig."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Ihre Sitzung ist noch fĂĽr %remaining% gĂĽltig."
 
 msgid "Domain component (DC)"
 msgstr "Domain-Komponente"
diff --git a/locales/el/LC_MESSAGES/messages.po b/locales/el/LC_MESSAGES/messages.po
index ee4679c65069a174e863a96152d64f2046d8cce6..19febce918a9325ab0aa346e604e812665f5a227 100644
--- a/locales/el/LC_MESSAGES/messages.po
+++ b/locales/el/LC_MESSAGES/messages.po
@@ -346,9 +346,6 @@ msgstr "Στοιχεία επικοινωνίας:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Ανεπίλυτη εξαίρεση"
 
-msgid "{status:validfor}"
-msgstr "Απομένουν %SECONDS% δευτερόλεπτα μέχρι τη λήξη της συνεδρίας σας."
-
 msgid "{status:header_saml20_sp}"
 msgstr "Δοκιμαστικός Παροχέας Υπηρεσιών SAML 2.0"
 
@@ -1185,8 +1182,8 @@ msgstr ""
 "αυτής της υπηρεσίας συμπεριλαμβάνοντας το παραπάνω μήνυμα σφάλματος."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Απομένουν %SECONDS% δευτερόλεπτα μέχρι τη λήξη της συνεδρίας σας."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Απομένουν %remaining% δευτερόλεπτα μέχρι τη λήξη της συνεδρίας σας."
 
 msgid "Domain component (DC)"
 msgstr "Συστατικό Τομέα (DC)"
diff --git a/locales/en/LC_MESSAGES/messages.po b/locales/en/LC_MESSAGES/messages.po
index be62029f06c07ae661be56638b063fcd25ee233f..f37021e139597bd4c3c79790b2f0c3c9618d255b 100644
--- a/locales/en/LC_MESSAGES/messages.po
+++ b/locales/en/LC_MESSAGES/messages.po
@@ -354,9 +354,6 @@ msgstr "Contact information:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Unhandled exception"
 
-msgid "{status:validfor}"
-msgstr "Your session is valid for %SECONDS% seconds from now."
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP Demo Example"
 
@@ -1207,8 +1204,8 @@ msgstr ""
 "login service, and send them the error message above."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Your session is valid for %SECONDS% seconds from now."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Your session is valid for %remaining% seconds from now."
 
 msgid "Domain component (DC)"
 msgstr "Domain component (DC)"
diff --git a/locales/es/LC_MESSAGES/messages.po b/locales/es/LC_MESSAGES/messages.po
index c68754ea35cc5241cf60f8fe8575c633818c82ab..94e0ff261660f64c36bf78e9afbcbad6fe974789 100644
--- a/locales/es/LC_MESSAGES/messages.po
+++ b/locales/es/LC_MESSAGES/messages.po
@@ -341,9 +341,6 @@ msgstr "InformaciĂłn de contacto:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "ExcepciĂłn no controlada"
 
-msgid "{status:validfor}"
-msgstr "Su sesión será valida durante %SECONDS% segundos."
-
 msgid "{status:header_saml20_sp}"
 msgstr "Ejemplo de SAML 2.0 SP"
 
@@ -1176,8 +1173,8 @@ msgstr ""
 "anterior."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Su sesión será valida durante %SECONDS% segundos."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Su sesión será valida durante %remaining% segundos."
 
 msgid "Domain component (DC)"
 msgstr "Componente de dominio (DC)"
diff --git a/locales/et/LC_MESSAGES/messages.po b/locales/et/LC_MESSAGES/messages.po
index f0010796e41d6321f9184d42551d729b6d07eb5d..7f07a8edc0749e01d88c53063350e51a6302b902 100644
--- a/locales/et/LC_MESSAGES/messages.po
+++ b/locales/et/LC_MESSAGES/messages.po
@@ -325,9 +325,6 @@ msgstr "Kontaktinfo:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Käsitlemata tõrge"
 
-msgid "{status:validfor}"
-msgstr "Sinu sessioon kehtib veel %SECONDS% sekundit."
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP demonäide"
 
@@ -1088,8 +1085,8 @@ msgstr ""
 "administraatoriga ja saada talle ĂĽlalolev veateade."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Sinu sessioon kehtib veel %SECONDS% sekundit."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Sinu sessioon kehtib veel %remaining% sekundit."
 
 msgid "Domain component (DC)"
 msgstr "Domeeni komponent (DC)"
diff --git a/locales/eu/LC_MESSAGES/messages.po b/locales/eu/LC_MESSAGES/messages.po
index ff123121eed50ab4eaaff7bd7e329277a9031a2f..45b9b42e7af09324fad74a86143357c865172c90 100644
--- a/locales/eu/LC_MESSAGES/messages.po
+++ b/locales/eu/LC_MESSAGES/messages.po
@@ -328,9 +328,6 @@ msgstr "Harremanetarako informazioa:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Kudeatu gabeko salbuespena"
 
-msgid "{status:validfor}"
-msgstr "Zure saioa %SECONDS% segundoz izango da baliagarri."
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP Adibidea"
 
@@ -1098,8 +1095,8 @@ msgstr ""
 "administratzailearekin eta bidal iezaiozu lehenagoko errore mezua. "
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Zure saioa %SECONDS% segundoz izango da baliagarri."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Zure saioa %remaining% segundoz izango da baliagarri."
 
 msgid "Domain component (DC)"
 msgstr "Domeinuaren osagaia (DC)"
diff --git a/locales/fi/LC_MESSAGES/messages.po b/locales/fi/LC_MESSAGES/messages.po
index 6d1706d3ed2b08e6ec744cf9ae63e7c25276f5ad..b0aca721d9f64e9e678b5bcad843c20cd073e862 100644
--- a/locales/fi/LC_MESSAGES/messages.po
+++ b/locales/fi/LC_MESSAGES/messages.po
@@ -239,9 +239,6 @@ msgstr "Yhteystiedot"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Käsittelemätön poikkeus"
 
-msgid "{status:validfor}"
-msgstr "Istuntosi on vielä voimassa %SECONDS% sekuntia"
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP esimerkki"
 
@@ -804,8 +801,8 @@ msgstr ""
 " yllä oleva virheilmoitus."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Istuntosi on vielä voimassa %SECONDS% sekuntia"
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Istuntosi on vielä voimassa %remaining% sekuntia"
 
 msgid "Domain component (DC)"
 msgstr "Domain-osio"
diff --git a/locales/fr/LC_MESSAGES/messages.po b/locales/fr/LC_MESSAGES/messages.po
index cb8bd91da8ae45b0706832219d9fd9412d862071..17fc2be1ff45cfb4966c3136fa167ab0f48e11db 100644
--- a/locales/fr/LC_MESSAGES/messages.po
+++ b/locales/fr/LC_MESSAGES/messages.po
@@ -336,9 +336,6 @@ msgstr "Coordonnées :"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Exception non gérée"
 
-msgid "{status:validfor}"
-msgstr "Votre session est encore valide pour %SECONDS% secondes."
-
 msgid "{status:header_saml20_sp}"
 msgstr "Exemple de démonstration de SP SAML 2.0"
 
@@ -1127,8 +1124,8 @@ msgstr ""
 "ce service d'identification et envoyez lui le message d'erreur."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Votre session est encore valide pour %SECONDS% secondes."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Votre session est encore valide pour %remaining% secondes."
 
 msgid "Domain component (DC)"
 msgstr "Fragment de domaine (DC)"
diff --git a/locales/he/LC_MESSAGES/messages.po b/locales/he/LC_MESSAGES/messages.po
index 05975ac5118c76eea43fc3f623c2fb2c76e49dde..e41778c93676e54717b242f10a55e03156dfb53a 100644
--- a/locales/he/LC_MESSAGES/messages.po
+++ b/locales/he/LC_MESSAGES/messages.po
@@ -311,9 +311,6 @@ msgstr "צור קשר"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "חריגה לא מטופלת "
 
-msgid "{status:validfor}"
-msgstr "השיחה שלך ברת-תוקף לעוד %SECONDS% שניות מעכשיו."
-
 msgid "{status:header_saml20_sp}"
 msgstr "הדגמת דוגמה לס\"ש מסוג SAML 2.0"
 
@@ -1052,8 +1049,8 @@ msgstr ""
 "צור קשר עם מנהל המערכת של שירות ההתחברות הזה, ושלח לו את השגיאה למעלה."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "השיחה שלך ברת-תוקף לעוד %SECONDS% שניות מעכשיו."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "השיחה שלך ברת-תוקף לעוד %remaining% שניות מעכשיו."
 
 msgid "Domain component (DC)"
 msgstr "מרכיב מתחם (DC)"
diff --git a/locales/hr/LC_MESSAGES/messages.po b/locales/hr/LC_MESSAGES/messages.po
index 7e3e9bdc11e8f81e1e55fb7103aaf2d03daf908e..4fa026fc94b51c7adc1d5b00b53a42facb981b89 100644
--- a/locales/hr/LC_MESSAGES/messages.po
+++ b/locales/hr/LC_MESSAGES/messages.po
@@ -332,9 +332,6 @@ msgstr "Kontakt podaci:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Neobrađena iznimka"
 
-msgid "{status:validfor}"
-msgstr "Vaša sjednica bit će valjana još %SECONDS% sekundi."
-
 msgid "{status:header_saml20_sp}"
 msgstr "Primjer SAML 2.0 davatelja usluge"
 
@@ -1117,8 +1114,8 @@ msgstr ""
 "administratore ovog servisa i pošaljite im gore navedenu poruku o greški."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Vaša sjednica bit će valjana još %SECONDS% sekundi."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Vaša sjednica bit će valjana još %remaining% sekundi."
 
 msgid "Domain component (DC)"
 msgstr "Domenska komponenta (DC)"
diff --git a/locales/hu/LC_MESSAGES/messages.po b/locales/hu/LC_MESSAGES/messages.po
index 863e652e359086d7c345c11517a16ccd7490afa8..a68bbb8e8070006889cbff5dd3bdcbae93647ae7 100644
--- a/locales/hu/LC_MESSAGES/messages.po
+++ b/locales/hu/LC_MESSAGES/messages.po
@@ -325,9 +325,6 @@ msgstr "Elérési információk"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Kezeletlen kivétel"
 
-msgid "{status:validfor}"
-msgstr "Az ön munkamenete még %SECONDS% másodpercig érvényes"
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP próba példa"
 
@@ -1085,8 +1082,8 @@ msgstr ""
 "szolgáltatás adminisztrátorát, és küldje el neki a fenti hibaüzenetet!"
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Az ön munkamenete még %SECONDS% másodpercig érvényes"
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Az ön munkamenete még %remaining% másodpercig érvényes"
 
 msgid "Domain component (DC)"
 msgstr "Domain összetevő (DC)"
diff --git a/locales/id/LC_MESSAGES/messages.po b/locales/id/LC_MESSAGES/messages.po
index 5a678b68a7ee5fe34ca2c54dfde2809885d8f97b..ebb63139f0b3aaf390e8d6d84793d3fae21e29fb 100644
--- a/locales/id/LC_MESSAGES/messages.po
+++ b/locales/id/LC_MESSAGES/messages.po
@@ -328,9 +328,6 @@ msgstr "Informasi Kontak"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Exception yang tidak tertangani"
 
-msgid "{status:validfor}"
-msgstr "Session anda valid untuk %SECONDS% detik dari sekarang."
-
 msgid "{status:header_saml20_sp}"
 msgstr "Contoh Demo SAML 2.0 SP"
 
@@ -1102,8 +1099,8 @@ msgstr ""
 "ini, dan kirimkan kepada mereka pesan error diatas."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Session anda valid untuk %SECONDS% detik dari sekarang."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Session anda valid untuk %remaining% detik dari sekarang."
 
 msgid "Domain component (DC)"
 msgstr "Domain component(DC)"
diff --git a/locales/it/LC_MESSAGES/messages.po b/locales/it/LC_MESSAGES/messages.po
index f34a236f7e11cfb95882f45177adf69589583035..09bd8cdcc80a7b08a725717ffc9972f5a0403c9a 100644
--- a/locales/it/LC_MESSAGES/messages.po
+++ b/locales/it/LC_MESSAGES/messages.po
@@ -336,9 +336,6 @@ msgstr "Informazioni di contatto:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Eccezione non gestita"
 
-msgid "{status:validfor}"
-msgstr "La tua sessione è valida per ulteriori %SECONDS% secondi."
-
 msgid "{status:header_saml20_sp}"
 msgstr "Demo di SAML 2.0 SP"
 
@@ -1125,8 +1122,8 @@ msgstr ""
 "riportato qui sopra."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "La tua sessione è valida per ulteriori %SECONDS% secondi."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "La tua sessione è valida per ulteriori %remaining% secondi."
 
 msgid "Domain component (DC)"
 msgstr "Componente di dominio (DC)"
diff --git a/locales/ja/LC_MESSAGES/messages.po b/locales/ja/LC_MESSAGES/messages.po
index a8250f4eebf41ae3606e6b859d35e2ab83537a94..b7b05102edd447c038ccb85433ad52c9ec653e20 100644
--- a/locales/ja/LC_MESSAGES/messages.po
+++ b/locales/ja/LC_MESSAGES/messages.po
@@ -298,9 +298,6 @@ msgstr "連絡先:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "未処理例外"
 
-msgid "{status:validfor}"
-msgstr "セッションは今から %SECONDS% 秒間有効です"
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP デモ例"
 
@@ -1009,8 +1006,8 @@ msgid ""
 msgstr "このエラーは恐らく未知の問題かSimpleSAMLphpの設定ミスです。ログインサービスの管理者に上記のエラーメッセージを連絡して下さい。"
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "セッションは今から %SECONDS% 秒間有効です"
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "セッションは今から %remaining% 秒間有効です"
 
 msgid "Domain component (DC)"
 msgstr "ドメイン名"
diff --git a/locales/lt/LC_MESSAGES/messages.po b/locales/lt/LC_MESSAGES/messages.po
index f75442d392314c8b7e37c60a83cafbd58d793545..21800557c05a53beb1e7757a9d824f4cc478d55e 100644
--- a/locales/lt/LC_MESSAGES/messages.po
+++ b/locales/lt/LC_MESSAGES/messages.po
@@ -322,9 +322,6 @@ msgstr "Kontaktai:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "NeĹľinoma klaida"
 
-msgid "{status:validfor}"
-msgstr "Jūsų sesija galioja %SECONDS% sekundžių, skaičiuojant nuo šio momento."
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP DemonstracinÄ—s versijos Pavyzdys"
 
@@ -1096,8 +1093,8 @@ msgstr ""
 "nusiųskite žemiau rodomą klaidos pranešimą."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Jūsų sesija galioja %SECONDS% sekundžių, skaičiuojant nuo šio momento."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Jūsų sesija galioja %remaining% sekundžių, skaičiuojant nuo šio momento."
 
 msgid "Domain component (DC)"
 msgstr "Domeno komponentas"
diff --git a/locales/lv/LC_MESSAGES/messages.po b/locales/lv/LC_MESSAGES/messages.po
index 9250283d961dbe548c9e9ff41911c2f248956cd4..5317a60aee60d42cf7d9b9fc2b44f5dd7333077c 100644
--- a/locales/lv/LC_MESSAGES/messages.po
+++ b/locales/lv/LC_MESSAGES/messages.po
@@ -318,9 +318,6 @@ msgstr "Kontaktinformācija"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Nezināma kļūda"
 
-msgid "{status:validfor}"
-msgstr "Sesija ir derīga %SECONDS% sekundes no šī brīža."
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP demonstrācijas piemērs"
 
@@ -1082,8 +1079,8 @@ msgstr ""
 "SimpleSAMLphp konfigurācijas. Nosūtiet administratoram kļūdas ziņojumu."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Sesija ir derīga %SECONDS% sekundes no šī brīža."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Sesija ir derīga %remaining% sekundes no šī brīža."
 
 msgid "Domain component (DC)"
 msgstr "Domēns (DC)"
diff --git a/locales/nb/LC_MESSAGES/messages.po b/locales/nb/LC_MESSAGES/messages.po
index aaa30d73096a701bca36c0898f43927e8fd51869..9d61c68b8e951413e9fb70e74ec251a78d4d4d7e 100644
--- a/locales/nb/LC_MESSAGES/messages.po
+++ b/locales/nb/LC_MESSAGES/messages.po
@@ -322,9 +322,6 @@ msgstr "Kontaktinformasjon:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "UhĂĄndtert feil"
 
-msgid "{status:validfor}"
-msgstr "Din sesjon er gyldig i %SECONDS% sekunder fra nĂĄ."
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP Demo Eksempel"
 
@@ -1106,8 +1103,8 @@ msgstr ""
 "av denne tjenesten og rapporter sĂĄ mye som mulig angĂĄende feilen."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Din sesjon er gyldig i %SECONDS% sekunder fra nĂĄ."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Din sesjon er gyldig i %remaining% sekunder fra nĂĄ."
 
 msgid "Domain component (DC)"
 msgstr "Navneledd (DC)"
diff --git a/locales/nl/LC_MESSAGES/messages.po b/locales/nl/LC_MESSAGES/messages.po
index ef2a72db21b22e90121b1cc099966fa87f23c38d..8b6a7144778cf367aa1c7596557bd2536727c526 100644
--- a/locales/nl/LC_MESSAGES/messages.po
+++ b/locales/nl/LC_MESSAGES/messages.po
@@ -342,9 +342,6 @@ msgstr "Contactinformatie"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Onverwachte foutmelding"
 
-msgid "{status:validfor}"
-msgstr "Uw sessie is nog %SECONDS% seconden geldig vanaf dit moment."
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP Demo"
 
@@ -1159,8 +1156,8 @@ msgstr ""
 "van deze authenticatiedienst, en geef bovenstaande melding door."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Uw sessie is nog %SECONDS% seconden geldig vanaf dit moment."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Uw sessie is nog %remaining% seconden geldig vanaf dit moment."
 
 msgid "Domain component (DC)"
 msgstr "Domeincomponent"
diff --git a/locales/nn/LC_MESSAGES/messages.po b/locales/nn/LC_MESSAGES/messages.po
index 9e623c9a7fd231b9c3e592a08529e9ce0ed95a6f..db1f898d8b12eb8644f3c73db25fb9bba93dd6ae 100644
--- a/locales/nn/LC_MESSAGES/messages.po
+++ b/locales/nn/LC_MESSAGES/messages.po
@@ -324,9 +324,6 @@ msgstr "Kontaktinformasjon:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Feilsituasjon som ikkje er riktig handtert"
 
-msgid "{status:validfor}"
-msgstr "Din sesjon er gyldig i %SECONDS% sekund frĂĄ no."
-
 msgid "{status:header_saml20_sp}"
 msgstr "Demonstrasjon av SAML 2.0 SP"
 
@@ -1112,8 +1109,8 @@ msgstr ""
 "detaljar om feilen."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Din sesjon er gyldig i %SECONDS% sekund frĂĄ no."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Din sesjon er gyldig i %remaining% sekund frĂĄ no."
 
 msgid "Domain component (DC)"
 msgstr "Namneledd (DC)"
diff --git a/locales/pl/LC_MESSAGES/messages.po b/locales/pl/LC_MESSAGES/messages.po
index f507fd60004113aa568df9a3c6aa5c7727eea401..effaefea660a215ba3de662843b9d3d7b8bb4ea0 100644
--- a/locales/pl/LC_MESSAGES/messages.po
+++ b/locales/pl/LC_MESSAGES/messages.po
@@ -320,9 +320,6 @@ msgstr "Informacje kontaktowe:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Nieobsługiwany błąd"
 
-msgid "{status:validfor}"
-msgstr "Twoja sesja jest jeszcze waĹĽna przez %SECONDS% sekund"
-
 msgid "{status:header_saml20_sp}"
 msgstr "Przykładowe Demo SAML 2.0 SP"
 
@@ -1058,8 +1055,8 @@ msgstr ""
 " i wyślij mu powyższy błąd."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Twoja sesja jest jeszcze waĹĽna przez %SECONDS% sekund"
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Twoja sesja jest jeszcze waĹĽna przez %remaining% sekund"
 
 msgid "Domain component (DC)"
 msgstr "Składnik nazwy domenowej (DC)"
diff --git a/locales/pt-br/LC_MESSAGES/messages.po b/locales/pt-br/LC_MESSAGES/messages.po
index f511dd7bdc23150e4cec4c65e7af88a09b60acec..ffedac4f79006742bf94e2cc660c4b42d6063bbf 100644
--- a/locales/pt-br/LC_MESSAGES/messages.po
+++ b/locales/pt-br/LC_MESSAGES/messages.po
@@ -336,9 +336,6 @@ msgstr "Informações de Contato"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Exceção não tratada"
 
-msgid "{status:validfor}"
-msgstr "Sua sessão é válida por %SECONDS% segundos a partir de agora."
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP Exemplo"
 
@@ -1092,8 +1089,8 @@ msgstr ""
 " a mensagem de erro acima."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Sua sessão é válida por %SECONDS% segundos a partir de agora."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Sua sessão é válida por %remaining% segundos a partir de agora."
 
 msgid "Domain component (DC)"
 msgstr "Componente do DomĂ­nio (DC)"
diff --git a/locales/pt/LC_MESSAGES/messages.po b/locales/pt/LC_MESSAGES/messages.po
index c14ea158ca955a324c291da8d4c7d32e1a9694d4..cab5dff1973dd341adc4eea22369446f110a905a 100644
--- a/locales/pt/LC_MESSAGES/messages.po
+++ b/locales/pt/LC_MESSAGES/messages.po
@@ -301,9 +301,6 @@ msgstr "Contactos:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Excepção não tratada"
 
-msgid "{status:validfor}"
-msgstr "A sua sessão é válida por %SECONDS% segundos."
-
 msgid "{status:header_saml20_sp}"
 msgstr "Exemplo de demonstração do SP SAML 2.0"
 
@@ -1005,8 +1002,8 @@ msgstr ""
 "serviço de login, e comunique a mensagem de erro."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "A sua sessão é válida por %SECONDS% segundos."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "A sua sessão é válida por %remaining% segundos."
 
 msgid "Domain component (DC)"
 msgstr "Componente de domĂ­nio"
diff --git a/locales/ro/LC_MESSAGES/messages.po b/locales/ro/LC_MESSAGES/messages.po
index c012e57d8cea39c6d2040de49a32d8048cc882fa..d4d896f9b0b9dfb262da6fdb2ded0deeff923d23 100644
--- a/locales/ro/LC_MESSAGES/messages.po
+++ b/locales/ro/LC_MESSAGES/messages.po
@@ -334,9 +334,6 @@ msgstr "Informații de contact:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Excepție netratată"
 
-msgid "{status:validfor}"
-msgstr "Sesiunea dumneavoastră mai este validă încă %SECONDS%."
-
 msgid "{status:header_saml20_sp}"
 msgstr "Exemplu demonstrativ de furnizor de servicii SAML 2.0"
 
@@ -1132,8 +1129,8 @@ msgstr ""
 "mai sus."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Sesiunea dumneavoastră mai este validă încă %SECONDS%."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Sesiunea dumneavoastră mai este validă încă %remaining%."
 
 msgid "Domain component (DC)"
 msgstr "Componenta de domeniu (DC)"
diff --git a/locales/ru/LC_MESSAGES/messages.po b/locales/ru/LC_MESSAGES/messages.po
index 4148ad38fb55acbb21d7330401c3ae3078d8a43c..6f09f7098bb906e1f7421bb001935daa1c5a682f 100644
--- a/locales/ru/LC_MESSAGES/messages.po
+++ b/locales/ru/LC_MESSAGES/messages.po
@@ -338,9 +338,6 @@ msgstr "Контактная информация"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Необрабатываемое исключение"
 
-msgid "{status:validfor}"
-msgstr "Ваша сессия действительна в течение следующих %SECONDS% секунд."
-
 msgid "{status:header_saml20_sp}"
 msgstr "Демо пример сервис провайдера SAML 2.0 SP"
 
@@ -1141,8 +1138,8 @@ msgstr ""
 "этого сервиса и отправьте ему вышеуказанное сообщение об ошибке."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Ваша сессия действительна в течение следующих %SECONDS% секунд."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Ваша сессия действительна в течение следующих %remaining% секунд."
 
 msgid "Domain component (DC)"
 msgstr "Компонент домена (DC)"
diff --git a/locales/sl/LC_MESSAGES/messages.po b/locales/sl/LC_MESSAGES/messages.po
index 55607c6d71d456601e4449248202edc7f7f3484e..8d7d980dbb2147384a95e0fe3672c90b2148abef 100644
--- a/locales/sl/LC_MESSAGES/messages.po
+++ b/locales/sl/LC_MESSAGES/messages.po
@@ -318,9 +318,6 @@ msgstr "Kontakt"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Nedefinirana izjema."
 
-msgid "{status:validfor}"
-msgstr "Vaša trenutna seja je veljavna še %SECONDS% sekund."
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP Demo primer"
 
@@ -1076,8 +1073,8 @@ msgstr ""
 "ja. Obrnite se na skrbnika in mu posredujte to napako."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Vaša trenutna seja je veljavna še %SECONDS% sekund."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Vaša trenutna seja je veljavna še %remaining% sekund."
 
 msgid "Domain component (DC)"
 msgstr "Domenska komponenta (DC)"
diff --git a/locales/sr/LC_MESSAGES/messages.po b/locales/sr/LC_MESSAGES/messages.po
index dc6e00551f209ba20c47ec5b8d8ada81ae7a1e50..621196a699fb6b387c7868cd1d840f110cee52ec 100644
--- a/locales/sr/LC_MESSAGES/messages.po
+++ b/locales/sr/LC_MESSAGES/messages.po
@@ -331,9 +331,6 @@ msgstr "Kontakt podaci:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Neobrađena greška"
 
-msgid "{status:validfor}"
-msgstr "Vaša sesija će biti validna još %SECONDS% sekundi."
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP Demo Primer"
 
@@ -1115,8 +1112,8 @@ msgstr ""
 " pošaljite mu poruku o grešci prikazanu iznad."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Vaša sesija će biti validna još %SECONDS% sekundi."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Vaša sesija će biti validna još %remaining% sekundi."
 
 msgid "Domain component (DC)"
 msgstr "Domenska komponenta (DC)"
diff --git a/locales/sv/LC_MESSAGES/messages.po b/locales/sv/LC_MESSAGES/messages.po
index e9cd592c9f17c840e505adaf7fb6bf2036a5861a..60b19841115a9148deb352b9ad5c646646d3e069 100644
--- a/locales/sv/LC_MESSAGES/messages.po
+++ b/locales/sv/LC_MESSAGES/messages.po
@@ -333,9 +333,6 @@ msgstr "Kontaktinformation:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Ohanterat undantag"
 
-msgid "{status:validfor}"
-msgstr "Din session är giltig för %SECONDS% sekunder från nu."
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP demoexempel"
 
@@ -1112,8 +1109,8 @@ msgstr ""
 "meddela dem ovanstĂĄende felmeddelande."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Din session är giltig för %SECONDS% sekunder från nu."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Din session är giltig för %remaining% sekunder från nu."
 
 msgid "Domain component (DC)"
 msgstr "Domännamnskomponent"
diff --git a/locales/tr/LC_MESSAGES/messages.po b/locales/tr/LC_MESSAGES/messages.po
index b2f9d463de44c8470732c4880cc5dd84d329b106..a939c1d92ffbb5f73a50358c415c18bcaaa8627f 100644
--- a/locales/tr/LC_MESSAGES/messages.po
+++ b/locales/tr/LC_MESSAGES/messages.po
@@ -305,9 +305,6 @@ msgstr "Ä°letiĹźim bilgileri:"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "Beklenmeyen durum"
 
-msgid "{status:validfor}"
-msgstr "Oturumunuz, şu andan itibaren %SECONDS% saniyeliğine geçerlidir."
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP Demo Ă–rneÄźi"
 
@@ -1006,8 +1003,8 @@ msgstr ""
 "iletişim kurun ve yukarıdaki hata mesajını gönderin."
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "Oturumunuz, şu andan itibaren %SECONDS% saniyeliğine geçerlidir."
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "Oturumunuz, şu andan itibaren %remaining% saniyeliğine geçerlidir."
 
 msgid "Domain component (DC)"
 msgstr "Alan bileĹźeni"
diff --git a/locales/xh/LC_MESSAGES/messages.po b/locales/xh/LC_MESSAGES/messages.po
index 46368da9b27ce4506e1a9b4da8925b9f7debc114..6edb108f7a29b506eb88f8daa17fd45f85955446 100644
--- a/locales/xh/LC_MESSAGES/messages.po
+++ b/locales/xh/LC_MESSAGES/messages.po
@@ -86,9 +86,6 @@ msgstr "Kufunyenwe isicelo esibi"
 msgid "{login:login_button}"
 msgstr "Ngena"
 
-msgid "{status:validfor}"
-msgstr "Iseshoni yakho iza kusebenza kangangemizuzu e-%SECONDS% ukususela ngoku."
-
 msgid "{status:header_shib}"
 msgstr "Idemo ye-Shibboleth"
 
diff --git a/locales/zh-tw/LC_MESSAGES/messages.po b/locales/zh-tw/LC_MESSAGES/messages.po
index ae447689a0d94d3f3b2782a9dcad46f56dff7bf5..a98f913bd9377f1d068fe656c785c6e7d92e0ed2 100644
--- a/locales/zh-tw/LC_MESSAGES/messages.po
+++ b/locales/zh-tw/LC_MESSAGES/messages.po
@@ -299,9 +299,6 @@ msgstr "聯絡資訊："
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "不可預期的例外"
 
-msgid "{status:validfor}"
-msgstr "您的 session 從現在起還有 %SECONDS% 有效。"
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP 展示範例"
 
@@ -1041,8 +1038,8 @@ msgid ""
 msgstr "這個問題可能是因為 SimpleSAMLphp 的某些例外的行為或無效設定。連絡這個登入服務的管理員，以及傳送這些錯誤訊息。"
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "您的 session 從現在起還有 %SECONDS% 有效。"
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "您的 session 從現在起還有 %remaining% 有效。"
 
 msgid "Domain component (DC)"
 msgstr "Domain component (DC)"
diff --git a/locales/zh/LC_MESSAGES/messages.po b/locales/zh/LC_MESSAGES/messages.po
index 029cef0413a2680cb13b1c6c9a57589c9ad3d4e0..43db64309fc9eaaaa7044e6e446141debbc23364 100644
--- a/locales/zh/LC_MESSAGES/messages.po
+++ b/locales/zh/LC_MESSAGES/messages.po
@@ -288,9 +288,6 @@ msgstr "联系方式"
 msgid "{errors:title_UNHANDLEDEXCEPTION}"
 msgstr "未处理的异常"
 
-msgid "{status:validfor}"
-msgstr "你的会话在%SECONDS%秒内有效"
-
 msgid "{status:header_saml20_sp}"
 msgstr "SAML 2.0 SP演示案例"
 
@@ -994,8 +991,8 @@ msgid ""
 msgstr "这个错误可能是由于一些意想不到的行为或者是SimpleSAMLphp的配置错误导致的，请联系这个登录服务器的管理员并把上面的错误消息发送给他们"
 
 #, python-format
-msgid "Your session is valid for %SECONDS% seconds from now."
-msgstr "你的会话在%SECONDS%秒内有效"
+msgid "Your session is valid for %remaining% seconds from now."
+msgstr "你的会话在%remaining%秒内有效"
 
 msgid "Domain component (DC)"
 msgstr "Opened the web browser with tabs saved from the previous session.域组件（DC）"
diff --git a/locales/zu/LC_MESSAGES/messages.po b/locales/zu/LC_MESSAGES/messages.po
index 52b41aa0fffb73d3b659d36d34888a4375695f9f..86e9543a7497162c52a2a3a8c49e2c2752774a96 100644
--- a/locales/zu/LC_MESSAGES/messages.po
+++ b/locales/zu/LC_MESSAGES/messages.po
@@ -87,9 +87,6 @@ msgstr "Kutholwe umlayezo ongalungile"
 msgid "{login:login_button}"
 msgstr "Ngena"
 
-msgid "{status:validfor}"
-msgstr "Iseshini yakho isebenza imizuzwana engu-%SECONDS% ukusuka manje."
-
 msgid "{status:header_shib}"
 msgstr "Idemo ye-Shibboleth"