Merge pull request #2227 from simplesamlphp/feature/adfs-upgrade

monkeyiq · tvdijen · commit 1abfec174393 · 2024-10-26T09:34:45.000+02:00
Disconnect ADFS-module from SimpleSAMLphp
diff --git a/modules/core/locales/en_LS/LC_MESSAGES/core.po b/modules/core/locales/en_LS/LC_MESSAGES/core.po
@@ -2,6 +2,7 @@ msgid ""
 msgstr ""
 "X-Domain: core\n"
 
+<<<<<<< HEAD
 msgid "A service has requested you to authenticate yourself. Please enter your username and password in the form below."
 msgstr ""
 
@@ -35,12 +36,24 @@ msgstr "Kgutlela leqepheng le fetileng ebe o leka hape."
 msgid "Help! I don't remember my password."
 msgstr ""
 
+=======
+msgid "Close the web browser, and try again."
+msgstr "Kwala sebadi sa webe, ebe o leka hape."
+
+msgid "Cookies may be disabled in the web browser."
+msgstr "Dikhuki di ka nna tsa kwalwa sebading sa webe."
+
+msgid "Go back to the previous page and try again."
+msgstr "Kgutlela leqepheng le fetileng ebe o leka hape."
+
+>>>>>>> ec4de5bf0 (Merge pull request #2227 from simplesamlphp/feature/adfs-upgrade)
 msgid "If this problem persists, you can report it to the system administrators."
 msgstr "Haeba bothata bona bo phehella, o ka bo tlaleha ho batsamaisi ba sistimi."
 
 msgid "If you are a developer who is deploying a single sign-on solution, you have a problem with the metadata configuration. Verify that metadata is configured correctly on both the identity provider and service provider."
 msgstr "Haeba o mohlahisi ya sebedisang tharollo ya ho saena hang, o na le bothata ka phetolo ya metadata. Netefatsa hore metadata e hlophiswe ka ho nepahala ho bobedi mofani wa boitsebiso le mofani wa tshebeletso."
 
+<<<<<<< HEAD
 msgid "If you are a developer who is deploying a single sign-on solution, you have are trying to reach an endpoint using the wrong HTTP-method."
 msgstr ""
 
@@ -74,12 +87,24 @@ msgstr ""
 msgid "No, only %SP%"
 msgstr ""
 
+=======
+msgid "If you are a user who received this error after following a link on a site, you should report this error to the owner of that site."
+msgstr "Haeba o le mosebedisi ya fumaneng phoso ena kamora ho latela lehokela le setsing, o tlameha ho tlaleha phoso ena ho monga setsi."
+
+msgid "Incorrect Attributes"
+msgstr "Makgabane a Fosahetseng"
+
+msgid "Missing cookie"
+msgstr "Khukhi e siyo"
+
+>>>>>>> ec4de5bf0 (Merge pull request #2227 from simplesamlphp/feature/adfs-upgrade)
 msgid "One or more of the attributes supplied by your identity provider did not contain the expected number of values."
 msgstr "E le nngwe kapa ho feta ya makgabane a fanweng ke wena ke mofani wa boitsebiso wa hao ha e na lenane le nepahetseng la dipalo."
 
 msgid "Opened the web browser with tabs saved from the previous session."
 msgstr "O butse sebadi sa webe ka di-tab tse bolokilweng sesheneng e fetileng."
 
+<<<<<<< HEAD
 msgid "Organization"
 msgstr ""
 
@@ -98,24 +123,30 @@ msgstr ""
 msgid "Remember my username"
 msgstr ""
 
+=======
+>>>>>>> ec4de5bf0 (Merge pull request #2227 from simplesamlphp/feature/adfs-upgrade)
 msgid "Report this error"
 msgstr "Tlaleha phoso ena"
 
 msgid "Retry"
 msgstr "Khukhi e siyo"
 
+<<<<<<< HEAD
 msgid "Retry login"
 msgstr ""
 
 msgid "SimpleSAMLphp"
 msgstr ""
 
+=======
+>>>>>>> ec4de5bf0 (Merge pull request #2227 from simplesamlphp/feature/adfs-upgrade)
 msgid "State information lost"
 msgstr "Tlhahisoleseding ya provense e lahlehile"
 
 msgid "Suggestions for resolving this problem:"
 msgstr "Ditlhahiso bakeng sa ho rarolla bothata bona:"
 
+<<<<<<< HEAD
 msgid "The authentication procesd has failed."
 msgstr ""
 
@@ -137,12 +168,18 @@ msgstr "Makgabane a nang le mathata ke:"
 msgid "There was an issue while signing you in."
 msgstr ""
 
+=======
+msgid "The problematic attribute(s) are:"
+msgstr "Makgabane a nang le mathata ke:"
+
+>>>>>>> ec4de5bf0 (Merge pull request #2227 from simplesamlphp/feature/adfs-upgrade)
 msgid "This error may be caused by:"
 msgstr "Phoso ena e ka bakwa ke:"
 
 msgid "This is most likely a configuration problem on either the service provider or identity provider."
 msgstr "Bona ke bothata bo ka kgonahalang ka ho fetisisa ho mofani wa tshebeletso kapa mofani wa tshebeletso."
 
+<<<<<<< HEAD
 msgid "This is the front page of the SimpleSAMLphp authentication software. There's not much to see here."
 msgstr ""
 
@@ -194,3 +231,17 @@ msgstr ""
 
 msgid "logout is not supported"
 msgstr ""
+=======
+msgid "Using the back and forward buttons in the web browser."
+msgstr "Ho sebedisa dikonopo tsa pele le morao sebading sa webo."
+
+msgid "We were unable to locate the state information for the current request."
+msgstr "Ha re kgone ho fumana tlhahisoleseding ka provenseng bakeng sa kopo ya ha jwale."
+
+msgid "You appear to have disabled cookies in your browser. Please check the settings in your browser, and try again."
+msgstr "O bonahala o kwetse dikhukhi sebading sa hao. Ka kopo hlahloba disetting sebading sa hao."
+
+#, python-format
+msgid "got %GOT% values, want %WANT%"
+msgstr "o fumane dipalo tse %GOT%, o batla tse %WANT%"
+>>>>>>> ec4de5bf0 (Merge pull request #2227 from simplesamlphp/feature/adfs-upgrade)
diff --git a/modules/saml/locales/en_LS/LC_MESSAGES/saml.po b/modules/saml/locales/en_LS/LC_MESSAGES/saml.po
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 msgid ""
 msgstr ""
 "X-Domain: saml\n"
@@ -38,3 +39,33 @@ msgstr "O se ntse o na le seshene e sebetsang ho mofani wa boitsebiso (<em>%IDP%
 
 msgid "Your authentication context is not accepted at this service. Probably too weak or not two-factor."
 msgstr ""
+=======
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2019-12-12 13:23+0200\n"
+"PO-Revision-Date: 2019-12-12 13:23+0200\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+
+msgid ""
+"You already have a valid session with an identity provider "
+"(<em>%IDP%</em>) that is not accepted by <em>%SP%</em>. Would you like to"
+" log out from your existing session and log in again with another "
+"identity provider?"
+msgstr ""
+"O se ntse o na le seshene e sebetsang ho mofani wa boitsebiso "
+"(<em>%IDP%</em>) ya sa amohelweng ke<em>%SP%</em>. Na o ka lakatsa ho "
+"tswa sesheneng ya hao e teng mme o kene ka mofani wa boitsebiso e mong?"
+
+msgid "Invalid Identity Provider"
+msgstr "Mofani wa Boitsebiso ha Nepahala"
+>>>>>>> ec4de5bf0 (Merge pull request #2227 from simplesamlphp/feature/adfs-upgrade)
diff --git a/src/SimpleSAML/Locale/Language.php b/src/SimpleSAML/Locale/Language.php
@@ -121,6 +121,29 @@ private function getInstalledLanguages(): array
             'language.available',
             [self::FALLBACKLANGUAGE],
         );
+
+        // @deprecated - remove entire if-block in a new major release
+        if (array_intersect(['pt-br', 'st', 'zh-tw'], $configuredAvailableLanguages)) {
+            Logger::warning(
+                "Deprecated locales found in `language.available`. "
+                . "Please replace 'pt-br' with 'pt_BR',"
+                . " and 'st' with 'en_LS',"
+                . " and 'zh-tw' with 'zh_TW'.",
+            );
+
+            if (($i = array_search('pt-br', $configuredAvailableLanguages)) !== false) {
+                $configuredAvailableLanguages[$i] = 'pt_BR';
+            }
+
+            if (($i = array_search('st', $configuredAvailableLanguages)) !== false) {
+                $configuredAvailableLanguages[$i] = 'en_LS';
+            }
+
+            if (($i = array_search('zh-tw', $configuredAvailableLanguages)) !== false) {
+                $configuredAvailableLanguages[$i] = 'zh_TW';
+            }
+        }
+
         $availableLanguages = [];
         foreach ($configuredAvailableLanguages as $code) {
             if (Locales::exists($code)) {
