Merge "Fix interpretation of "A-type" password hashes"

diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 9059e79..58ae23b 100644 (file)
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -201,6 +201,8 @@ changes to languages because of Phabricator reports.
 * (T146744) Livvi-Karelian (olo) namespace messages created thanks to translator Ilja.mos.
 * Karelian (krl), thanks to translators Flrn, Ilja.mos, Likopiän tyttö, Mashoi7, Matma Rex,
   Ontoi, Theunitedstatesofme, and Varvana.
+* Gorontalo (gor), thanks to translators Ilham, Lukman Tomayahu, Marwan Mohamad, Matma Rex,
+  NoiX180, and Zhoelyakin.
 
 === Other changes in 1.28 ===
 * (T128697) Improved handling of large diffs.

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 5b0bc8a..82ddee0 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3407,6 +3407,7 @@ HTML
         *
         * @param Title $title
         * @param string $format Output format, valid values are any function of a Message object
+        * @param Language|string|null $langcode Language code or Language object.
         * @return string
         */
        public static function getCopyrightWarning( $title, $format = 'plain', $langcode = null ) {

diff --git a/languages/data/Names.php b/languages/data/Names.php
index c00463b..0557455 100644 (file)
--- a/languages/data/Names.php
+++ b/languages/data/Names.php
@@ -174,6 +174,7 @@ class Names {
                'gom' => 'गोंयची कोंकणी / Gõychi Konknni', # Goan Konkani
                'gom-deva' => 'गोंयची कोंकणी', # Goan Konkani (Devanagari script)
                'gom-latn' => 'Gõychi Konknni', # Goan Konkani (Latin script)
+               'gor' => 'Bahasa Hulontalo', # Gorontalo
                'got' => '𐌲𐌿𐍄𐌹𐍃𐌺', # Gothic
                'grc' => 'Ἀρχαία ἑλληνικὴ', # Ancient Greek
                'gsw' => 'Alemannisch', # Alemannic