From b05cf08272854558c25302fc950ff5add85afa1a Mon Sep 17 00:00:00 2001
From: Mischa Salle <msalle@nikhef.nl>
Date: Wed, 10 Jun 2020 11:54:20 +0200
Subject: [PATCH] Replace several 'tags' with the English text

We can remove several tags, login:processing and admin:metaconv_selectfile, and
replace several others with their English text.
---
 lib/SimpleSAML/Error/ErrorCodes.php | 16 +++++++++++-----
 locales/el/LC_MESSAGES/messages.po  |  6 ------
 locales/en/LC_MESSAGES/messages.po  | 27 ---------------------------
 locales/nl/LC_MESSAGES/messages.po  | 26 +-------------------------
 locales/st/LC_MESSAGES/messages.po  | 24 ------------------------
 locales/xh/LC_MESSAGES/messages.po  | 19 +++++++++++--------
 locales/zu/LC_MESSAGES/messages.po  | 19 +++++++++++--------
 7 files changed, 34 insertions(+), 103 deletions(-)

diff --git a/lib/SimpleSAML/Error/ErrorCodes.php b/lib/SimpleSAML/Error/ErrorCodes.php
index e05d8c6cf..0b0fee216 100644
--- a/lib/SimpleSAML/Error/ErrorCodes.php
+++ b/lib/SimpleSAML/Error/ErrorCodes.php
@@ -24,7 +24,7 @@ class ErrorCodes
     {
         return [
             'ACSPARAMS' => Translate::noop('{errors:title_ACSPARAMS}'),
-            'ARSPARAMS' => Translate::noop('{errors:title_ARSPARAMS}'),
+            'ARSPARAMS' => Translate::noop('No SAML message provided'),
             'AUTHSOURCEERROR' => Translate::noop('{errors:title_AUTHSOURCEERROR}'),
             'BADREQUEST' => Translate::noop('{errors:title_BADREQUEST}'),
             'CASERROR' => Translate::noop('{errors:title_CASERROR}'),
@@ -36,7 +36,7 @@ class ErrorCodes
             'LDAPERROR' => Translate::noop('{errors:title_LDAPERROR}'),
             'LOGOUTINFOLOST' => Translate::noop('{errors:title_LOGOUTINFOLOST}'),
             'LOGOUTREQUEST' => Translate::noop('{errors:title_LOGOUTREQUEST}'),
-            'MEMCACHEDOWN' => Translate::noop('{errors:title_MEMCACHEDOWN}'),
+            'MEMCACHEDOWN' => Translate::noop('Cannot retrieve session data'),
             'METADATA' => Translate::noop('{errors:title_METADATA}'),
             'METADATANOTFOUND' => Translate::noop('{errors:title_METADATANOTFOUND}'),
             'NOACCESS' => Translate::noop('{errors:title_NOACCESS}'),
@@ -51,7 +51,7 @@ class ErrorCodes
             'PROCESSAUTHNREQUEST' => Translate::noop('{errors:title_PROCESSAUTHNREQUEST}'),
             'RESPONSESTATUSNOSUCCESS' => Translate::noop('{errors:title_RESPONSESTATUSNOSUCCESS}'),
             'SLOSERVICEPARAMS' => Translate::noop('{errors:title_SLOSERVICEPARAMS}'),
-            'SSOPARAMS' => Translate::noop('{errors:title_SSOPARAMS}'),
+            'SSOPARAMS' => Translate::noop('No SAML request provided'),
             'UNHANDLEDEXCEPTION' => Translate::noop('{errors:title_UNHANDLEDEXCEPTION}'),
             'UNKNOWNCERT' => Translate::noop('{errors:title_UNKNOWNCERT}'),
             'USERABORTED' => Translate::noop('{errors:title_USERABORTED}'),
@@ -82,7 +82,10 @@ class ErrorCodes
     {
         return [
             'ACSPARAMS' => Translate::noop('{errors:descr_ACSPARAMS}'),
-            'ARSPARAMS' => Translate::noop('{errors:descr_ARSPARAMS}'),
+            'ARSPARAMS' => Translate::noop(""
+                "You accessed the Artifact Resolution Service interface, but did not "
+                "provide a SAML ArtifactResolve message. Please note that this endpoint is"
+                " not intended to be accessed directly."),
             'AUTHSOURCEERROR' => Translate::noop('{errors:descr_AUTHSOURCEERROR}'),
             'BADREQUEST' => Translate::noop('{errors:descr_BADREQUEST}'),
             'CASERROR' => Translate::noop('{errors:descr_CASERROR}'),
@@ -109,7 +112,10 @@ class ErrorCodes
             'PROCESSAUTHNREQUEST' => Translate::noop('{errors:descr_PROCESSAUTHNREQUEST}'),
             'RESPONSESTATUSNOSUCCESS' => Translate::noop('{errors:descr_RESPONSESTATUSNOSUCCESS}'),
             'SLOSERVICEPARAMS' => Translate::noop('{errors:descr_SLOSERVICEPARAMS}'),
-            'SSOPARAMS' => Translate::noop('{errors:descr_SSOPARAMS}'),
+            'SSOPARAMS' => Translate::noop(""
+                "You accessed the Single Sign On Service interface, but did not provide a "
+                "SAML Authentication Request. Please note that this endpoint is not "
+                "intended to be accessed directly."),
             'UNHANDLEDEXCEPTION' => Translate::noop('{errors:descr_UNHANDLEDEXCEPTION}'),
             'UNKNOWNCERT' => Translate::noop('{errors:descr_UNKNOWNCERT}'),
             'USERABORTED' => Translate::noop('{errors:descr_USERABORTED}'),
diff --git a/locales/el/LC_MESSAGES/messages.po b/locales/el/LC_MESSAGES/messages.po
index 6c1e4cef5..e309ec9b6 100644
--- a/locales/el/LC_MESSAGES/messages.po
+++ b/locales/el/LC_MESSAGES/messages.po
@@ -200,9 +200,6 @@ msgstr "Προαιρετικά πεδία"
 msgid "{logout:return}"
 msgstr "Επιστροφή στην υπηρεσία"
 
-msgid "{errors:title_MEMCACHEDOWN}"
-msgstr "Δεν είναι δυνατή η ανάκτηση δεδομένων συνεδρίας"
-
 msgid "{admin:metadata_xmlurl}"
 msgstr "Διεύθυνση <a href=\"%METAURL%\">λήψης</a> μεταδεδομένων:"
 
@@ -305,9 +302,6 @@ msgstr ""
 "(sessions), σας συνιστούμε να <i>κλείσετε</i> το πρόγραμμα πλοήγησης (web"
 " browser)."
 
-msgid "{admin:metaconv_selectfile}"
-msgstr "ή επιλέξτε αρχείο"
-
 msgid "{admin:metadata_xmlformat}"
 msgstr "Μεταδεδομένα σε μορφή xml SAML 2.0:"
 
diff --git a/locales/en/LC_MESSAGES/messages.po b/locales/en/LC_MESSAGES/messages.po
index f6edd046e..6f556b72c 100644
--- a/locales/en/LC_MESSAGES/messages.po
+++ b/locales/en/LC_MESSAGES/messages.po
@@ -44,9 +44,6 @@ msgstr "State information lost"
 msgid "{login:username}"
 msgstr "Username"
 
-msgid "{login:processing}"
-msgstr "Processing..."
-
 msgid "Back"
 msgstr "Back"
 
@@ -91,9 +88,6 @@ msgstr "Unable to locate metadata for %ENTITYID%"
 msgid "{admin:metadata_metadata}"
 msgstr "Metadata"
 
-msgid "{errors:title_SSOPARAMS}"
-msgstr "No SAML request provided"
-
 msgid "{errors:report_text}"
 msgstr ""
 "Optionally enter your email address, for the administrators to be able "
@@ -196,9 +190,6 @@ msgstr ""
 "The parameters sent to the discovery service were not according to "
 "specifications."
 
-msgid "{errors:title_ARSPARAMS}"
-msgstr "No SAML message provided"
-
 msgid "{errors:descr_CREATEREQUEST}"
 msgstr "An error occurred when trying to create the SAML request."
 
@@ -208,9 +199,6 @@ msgstr "Optional fields"
 msgid "{logout:return}"
 msgstr "Return to service"
 
-msgid "{errors:title_MEMCACHEDOWN}"
-msgstr "Cannot retrieve session data"
-
 msgid "{admin:metadata_xmlurl}"
 msgstr "You can <a href=\"%METAURL%\">get the metadata xml on a dedicated URL</a>:"
 
@@ -312,9 +300,6 @@ msgstr ""
 "logout</i>. To ensure that all your sessions are closed, you are "
 "encouraged to <i>close your webbrowser</i>."
 
-msgid "{admin:metaconv_selectfile}"
-msgstr "or select a file:"
-
 msgid "{admin:metadata_xmlformat}"
 msgstr "In SAML 2.0 Metadata XML format:"
 
@@ -500,12 +485,6 @@ msgstr "Send e-mail to help desk"
 msgid "{login:help_desk_link}"
 msgstr "Help desk homepage"
 
-msgid "{errors:descr_ARSPARAMS}"
-msgstr ""
-"You accessed the Artifact Resolution Service interface, but did not "
-"provide a SAML ArtifactResolve message. Please note that this endpoint is"
-" not intended to be accessed directly."
-
 msgid "{login:remember_me}"
 msgstr "Remember me"
 
@@ -627,12 +606,6 @@ msgstr ""
 msgid "{disco:selectidp_full}"
 msgstr "Please select the identity provider where you want to authenticate:"
 
-msgid "{errors:descr_SSOPARAMS}"
-msgstr ""
-"You accessed the Single Sign On Service interface, but did not provide a "
-"SAML Authentication Request. Please note that this endpoint is not "
-"intended to be accessed directly."
-
 msgid "{errors:descr_NOTFOUNDREASON}"
 msgstr "The given page was not found. The reason was: %REASON%  The URL was: %URL%"
 
diff --git a/locales/nl/LC_MESSAGES/messages.po b/locales/nl/LC_MESSAGES/messages.po
index b07253fe9..fc25143ae 100644
--- a/locales/nl/LC_MESSAGES/messages.po
+++ b/locales/nl/LC_MESSAGES/messages.po
@@ -44,9 +44,6 @@ msgstr "Toestandsinformatie verloren"
 msgid "{login:username}"
 msgstr "Gebruikersnaam"
 
-msgid "{login:processing}"
-msgstr "Bezig te verwerken..."
-
 msgid "Back"
 msgstr "Terug"
 
@@ -91,9 +88,6 @@ msgstr "Kan geen metadata vinden voor %ENTITYID%"
 msgid "{admin:metadata_metadata}"
 msgstr "Metadata"
 
-msgid "{errors:title_SSOPARAMS}"
-msgstr "Geen SAML request opgegeven"
-
 msgid "{errors:report_text}"
 msgstr ""
 "Voeg desgewenst je e-mailadres toe, zodat de beheerders contact kunnen "
@@ -195,7 +189,7 @@ msgstr ""
 "De parameters die naar de discovery service zijn gestuurd, zijn niet "
 "correct volgens de specificatie."
 
-msgid "{errors:title_ARSPARAMS}"
+msgid "No SAML message provided"
 msgstr "Geen SAML bericht opgegeven"
 
 msgid "{errors:descr_CREATEREQUEST}"
@@ -207,9 +201,6 @@ msgstr "Optionele velden"
 msgid "{logout:return}"
 msgstr "Terug naar service"
 
-msgid "{errors:title_MEMCACHEDOWN}"
-msgstr "Kan sessie data niet ophalen"
-
 msgid "{admin:metadata_xmlurl}"
 msgstr ""
 "U kunt <a href=\"%METAURL%\">deze directe URL gebruiken</a> om de "
@@ -315,9 +306,6 @@ msgstr ""
 "voor uitloggen</i>. Om er zeker van te zijn dat al je sessies zijn "
 "beëindigd, kun je het beste <i>je webbrowser afsluiten</i>."
 
-msgid "{admin:metaconv_selectfile}"
-msgstr "of kies een file:"
-
 msgid "{admin:metadata_xmlformat}"
 msgstr "In SAML 2.0 Metadata XML formaat:"
 
@@ -505,12 +493,6 @@ msgstr "Stuur een e-mail naar de helpdesk"
 msgid "{login:help_desk_link}"
 msgstr "Helpdesk homepage"
 
-msgid "{errors:descr_ARSPARAMS}"
-msgstr ""
-"Je hebt het Artifact Resolution Service interface aangeroepen, maar stuurde "
-"geen SAML ArtifactResolve bericht mee. Merk op dat dit 'endpoint' niet "
-"bedoeld is om direct benaderd te worden."
-
 msgid "{login:remember_me}"
 msgstr "Onthoud mij"
 
@@ -630,12 +612,6 @@ msgstr ""
 msgid "{disco:selectidp_full}"
 msgstr "Selecteer de Identity Provider waar je wil authenticeren:"
 
-msgid "{errors:descr_SSOPARAMS}"
-msgstr ""
-"Je hebt het Single Sign On interface aangeroepen, maar stuurde geen SAML "
-"Authentication Request mee. Merk op dat dit 'endpoint' niet bedoeld is om"
-" direct benaderd te worden."
-
 msgid "{errors:descr_NOTFOUNDREASON}"
 msgstr ""
 "De opgegeven pagina kon niet worden gevonden. De oorzaak is: %REASON%. De"
diff --git a/locales/st/LC_MESSAGES/messages.po b/locales/st/LC_MESSAGES/messages.po
index 43dcdfc6e..a862b0803 100644
--- a/locales/st/LC_MESSAGES/messages.po
+++ b/locales/st/LC_MESSAGES/messages.po
@@ -108,12 +108,6 @@ msgstr ""
 msgid "{login:contact_info}"
 msgstr "Tlhahisoleseding ya boikopanyo:"
 
-msgid "{errors:descr_ARSPARAMS}"
-msgstr ""
-"O fihletse kopano ya Tshebeletso ya Tlhakiso ya Athifekte, empa ha o a "
-"fana ka molaetsa wa SAML ArtifactResolve. Ka kopo lemoha hore ntlha ena "
-"ya bofelo ha e a rerelwa ho fihlellwa ka kotloloho."
-
 msgid "{errors:descr_GENERATEAUTHNRESPONSE}"
 msgstr ""
 "Ha mofani enwa wa boitsebiso a leka ho theha karabelo ya netefatso, phoso"
@@ -189,12 +183,6 @@ msgstr "Tlaleha diphoso"
 msgid "Select"
 msgstr "Kgetha"
 
-msgid "{errors:descr_SSOPARAMS}"
-msgstr ""
-"O fihletse tshebeletsano ya Tshaeno ya Hang, empa ha o a fan aka Kopo ya "
-"Netefatso ya SAML. Ka kopo lemoha hore ntlha ena ya bofelo ha e a rerelwa"
-" ho fihlellwa ka kotloloho."
-
 msgid "Format"
 msgstr "Fomata"
 
@@ -585,9 +573,6 @@ msgstr "Phoso ho thehweng ha kopo"
 msgid "We did not accept the response sent from the Identity Provider."
 msgstr "Ha re a amohela karabelo ho tswa ho Mofani wa Boitsebiso."
 
-msgid "{errors:title_SSOPARAMS}"
-msgstr "Ha ho kopo ya SAML e fanweng"
-
 msgid ""
 "You have chosen <b>%HOMEORG%</b> as your home organization. If this is "
 "wrong you may choose another one."
@@ -758,9 +743,6 @@ msgstr ""
 msgid "Authentication failed: your browser did not send any certificate"
 msgstr "Netefatso e hlolehile: sebadi sa hao ha se a romela setifikeiti sa letho"
 
-msgid "{login:processing}"
-msgstr "E a sebetsa..."
-
 msgid "Send e-mail to help desk"
 msgstr "Romela imeile ho ba deske ya thuso"
 
@@ -1026,9 +1008,6 @@ msgstr "Phoso e hlahile ha e leka ho sebetsa Kopo ya Ho Tswa."
 msgid "{errors:title_LOGOUTREQUEST}"
 msgstr "Phoso ho sebetseng Kopo ya Ho Tswa"
 
-msgid "{errors:title_ARSPARAMS}"
-msgstr "Ha ho molaetsa wa SAML o fanweng"
-
 #, python-format
 msgid "Your session is valid for %SECONDS% seconds from now."
 msgstr ""
@@ -1110,9 +1089,6 @@ msgstr ""
 "Tlhahisoleeding ya porofensi e lahlehile, mmeha ho tsela ya ho qala kopo "
 "botjha"
 
-msgid "{errors:title_MEMCACHEDOWN}"
-msgstr "Ha e a kgona ho fumana datha ya seshene"
-
 msgid "Username"
 msgstr "Lebitso la mosebedisi"
 
diff --git a/locales/xh/LC_MESSAGES/messages.po b/locales/xh/LC_MESSAGES/messages.po
index eb159b6de..72dd81286 100644
--- a/locales/xh/LC_MESSAGES/messages.po
+++ b/locales/xh/LC_MESSAGES/messages.po
@@ -35,7 +35,7 @@ msgstr ""
 msgid "{errors:descr_NOSTATE}"
 msgstr "Inkcazelo yobume ilahlekile, yaye akukho ndlela yokuqalisa isicelo"
 
-msgid "{errors:title_SSOPARAMS}"
+msgid "No SAML request provided"
 msgstr "Akukho sicelo se-SAML sinikelweyo"
 
 msgid "{errors:descr_CASERROR}"
@@ -207,7 +207,10 @@ msgstr "Hayi, rhoxisa"
 msgid "{status:header_diagnostics}"
 msgstr "Uhlalutyo lwe-SimpleSAMLphp"
 
-msgid "{errors:descr_SSOPARAMS}"
+msgid ""
+"You accessed the Single Sign On Service interface, but did not provide a "
+"SAML Authentication Request. Please note that this endpoint is not "
+"intended to be accessed directly."
 msgstr ""
 "Ufikelele i-intafeyisi ye-Single Sign On Service, kodwa awukhange unikele"
 " iMpendulo Yongqinisiso ye-SAML. Nceda uqaphele ukuba le ndawo yokuphela "
@@ -396,9 +399,6 @@ msgstr ""
 "Uye wakhetha u-<b>%HOMEORG%</b> njengombutho wakho wekhaya. Ukuba oku "
 "akuchanekanga usenokukhetha omnye."
 
-msgid "{login:processing}"
-msgstr "Iyaprosesa..."
-
 msgid "{logout:default_link_text}"
 msgstr "Buyela emva kwikhasi lofakelo le-SimpleSAMLphp"
 
@@ -458,13 +458,16 @@ msgstr ""
 "Ungqinisiso lusilele: ibhrawuza yakho ayithumelanga nasiphi na "
 "isatifikethi"
 
-msgid "{errors:descr_ARSPARAMS}"
+msgid ""
+"You accessed the Artifact Resolution Service interface, but did not "
+"provide a SAML ArtifactResolve message. Please note that this endpoint is"
+" not intended to be accessed directly."
 msgstr ""
 "Ufikelele i-intafeyisi ye-Artifact Resolution Service, kodwa awukhange "
 "unikrele umyalezo we-SAML ArtifactResolve. Nceda uqaphele ukuba le ndawo "
 "yokuphela ayilungiselelwanga ukuba ifikelelwe ngokuthe ngqo."
 
-msgid "{errors:title_MEMCACHEDOWN}"
+msgid "Cannot retrieve session data"
 msgstr "Ayikwazi ukubuyisela ingcombolo yeseshoni"
 
 msgid "{status:some_error_occurred}"
@@ -473,7 +476,7 @@ msgstr "Kwenzeke impazamo ethile"
 msgid "{errors:errorreport_text}"
 msgstr "Ingxelo yempazamo ithunyelwe kubalawuli."
 
-msgid "{errors:title_ARSPARAMS}"
+msgid "No SAML message provided"
 msgstr "Akukho myalezo we-SAML unikelweyo"
 
 msgid "{login:help_desk_email}"
diff --git a/locales/zu/LC_MESSAGES/messages.po b/locales/zu/LC_MESSAGES/messages.po
index e9a14aafe..6bd75d091 100644
--- a/locales/zu/LC_MESSAGES/messages.po
+++ b/locales/zu/LC_MESSAGES/messages.po
@@ -36,7 +36,7 @@ msgstr ""
 "Ulwazi lwesifunda lulahlekile, futhi ayikho indlela yokuqala kabusha "
 "isicelo"
 
-msgid "{errors:title_SSOPARAMS}"
+msgid "No SAML request provided"
 msgstr "Asikho isicelo se-SAML esinikeziwe"
 
 msgid "{errors:descr_CASERROR}"
@@ -210,7 +210,10 @@ msgstr "Cha, khansela"
 msgid "{status:header_diagnostics}"
 msgstr "Ukuhlonzwa Kwe-SimpleSAMLphp"
 
-msgid "{errors:descr_SSOPARAMS}"
+msgid ""
+"You accessed the Single Sign On Service interface, but did not provide a "
+"SAML Authentication Request. Please note that this endpoint is not "
+"intended to be accessed directly."
 msgstr ""
 "Ufinyelele ukusebenzisana Kwesevisi Yokubhalisa Okukodwa, kodwa awuzange "
 "uhlinzeke Ngempendulo Yokuqinisekisa ye-SAML. Sicela uphawule ukuthi "
@@ -402,9 +405,6 @@ msgstr ""
 "Ukhethe okuthi <b>%HOMEORG%</b> njengenhlangano yakho yasekhaya. Uma "
 "lokhu kungalungile ungase ukhethe enye."
 
-msgid "{login:processing}"
-msgstr "Iyacubungula..."
-
 msgid "{logout:default_link_text}"
 msgstr "Buyela emuva ekhasini lokufaka le-SimpleSAMLphp"
 
@@ -464,13 +464,16 @@ msgstr ""
 "Ukuqinisekisa kuhlulekile: isiphequluli sakho asizange sithumele noma "
 "yisiphi isitifiketi"
 
-msgid "{errors:descr_ARSPARAMS}"
+msgid ""
+"You accessed the Artifact Resolution Service interface, but did not "
+"provide a SAML ArtifactResolve message. Please note that this endpoint is"
+" not intended to be accessed directly."
 msgstr ""
 "Ufinyelele ukusebenzisana Kwesevisi Yokucaciswa Kobuciko, kodwa awuzange "
 "uhlinzeke umlayezo we-SAML ArtifactResolve. Sicela uphawule ukuthi "
 "isiphetho asihloselwe ukufinyelelwa ngokuqondile."
 
-msgid "{errors:title_MEMCACHEDOWN}"
+msgid "Cannot retrieve session data"
 msgstr "Ayikwazi ukubuyisela idatha yeseshini"
 
 msgid "{status:some_error_occurred}"
@@ -479,7 +482,7 @@ msgstr "Kuvele iphutha elithile"
 msgid "{errors:errorreport_text}"
 msgstr "Umbiko wephutha uthunyelwe kubalawuli."
 
-msgid "{errors:title_ARSPARAMS}"
+msgid "No SAML message provided"
 msgstr "Awukho umlayezo we-SAML onikeziwe"
 
 msgid "{login:help_desk_email}"
-- 
GitLab