Merge "Revert "Remove invalid language code "bh" (alias of "bho")""

diff --combined RELEASE-NOTES-1.26
index 61e04b8,0b3f29c..6f1120e
--- 1/RELEASE-NOTES-1.26
--- 2/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@@ -13,8 -13,6 +13,8 @@@ production
  === New features in 1.26 ===
  * Change tags can now be hidden in the interface by disabling the associated
    "tag-<id>" interface message.
 +* ':' (colon) is now invalid in usernames for new accounts. Existing accounts
 +  are not affected.
  
  ==== External libraries ====
  
@@@ -37,9 -35,6 +37,6 @@@ MediaWiki supports over 350 languages. 
  regularly. Below only new and removed languages are listed, as well as
  changes to languages because of Bugzilla reports.
  
- * BREAKING CHANGE (T91240): Language code "bh" is not valid in ISO 639 and
-   was removed, so it will no longer alias to "bho". If you used "bh" as your
-   wiki's $wgLanguageCode, you must update your configuration.
  
  === Other changes in 1.26 ===
  * ChangeTags::tagDescription() will return false if the interface message
@@@ -52,10 -47,6 +49,10 @@@ by default for the ContentHandler base 
  and it's derivative classes (everything in core). For Content types that
  do not support direct editing, an alternative mechanism should be provided
  for editing, such as action overrides or specific api modules.
 +* mediaWiki.confirmCloseWindow now returns an object of functions, instead of
 +one function. The callback can't be called directly any more. The callback function
 +is replaced with confirmCloseWindow.release().
 +* Removed maintenance script deleteImageMemcached.php.
  
  == Compatibility ==
  

diff --combined languages/Names.php
index 88d95f2,12059ae..ddd40f1
--- 1/languages/Names.php
--- 2/languages/Names.php
+++ b/languages/Names.php
@@@ -62,10 -62,9 +62,10 @@@
        'ast' => 'asturianu',   # Asturian
        'av' => 'авар',     # Avar
        'avk' => 'Kotava', # Kotava
 +      'awa' => 'अवधी',        # Awadhi
        'ay' => 'Aymar aru',    # Aymara
        'az' => 'azərbaycanca',        # Azerbaijani
 -      'azb' => 'تورکجه',        # South Azerbaijani
 +      'azb' => 'تۆرکجه',        # South Azerbaijani
        'ba' => 'башҡортса',   # Bashkir
        'bar' => 'Boarisch',    # Bavarian (Austro-Bavarian and South Tyrolean)
        'bat-smg' => 'žemaitėška', # Samogitian (deprecated code, 'sgs' in ISO 693-3 since 2010-06-30 )
@@@ -78,6 -77,7 +78,7 @@@
        'be-x-old' => "беларуская (тарашкевіца)\xE2\x80\x8E",      # (be-tarask compat)
        'bg' => 'български',   # Bulgarian
        'bgn' => 'بلوچی رخشانی', # Western Balochi
+       'bh' => 'भोजपुरी',        # Bihari macro language. Falls back to Bhojpuri (bho)
        'bho' => 'भोजपुरी',       # Bhojpuri
        'bi' => 'Bislama',              # Bislama
        'bjn' => 'Bahasa Banjar',       # Banjarese
@@@ -85,7 -85,7 +86,7 @@@
        'bn' => 'বাংলা',      # Bengali
        'bo' => 'བོད་ཡིག',        # Tibetan
        'bpy' => 'বিষ্ণুপ্রিয়া মণিপুরী',       # Bishnupriya Manipuri
 -      'bqi' => 'بختياري',      # Bakthiari
 +      'bqi' => 'بختیاری',      # Bakthiari
        'br' => 'brezhoneg',    # Breton
        'brh' => 'Bráhuí',    # Brahui
        'bs' => 'bosanski',             # Bosnian
@@@ -101,7 -101,7 +102,7 @@@
        'cho' => 'Choctaw',             # Choctaw
        'chr' => 'ᏣᎳᎩ', # Cherokee
        'chy' => 'Tsetsêhestâhese',   # Cheyenne
 -      'ckb' => 'کوردی',  # Sorani. The name actually says "Kurdi" (Kurdish).
 +      'ckb' => 'کوردیی ناوەندی', # Central Kurdish
        'co' => 'corsu',                # Corsican
        'cps' => 'Capiceño', # Capiznon
        'cr' => 'Nēhiyawēwin / ᓀᐦᐃᔭᐍᐏᐣ',                # Cree
@@@ -248,7 -248,7 +249,7 @@@
        'lmo' => 'lumbaart',    # Lombard
        'ln' => 'lingála',             # Lingala
        'lo' => 'ລາວ',    # Laotian
 -      'lrc' => 'لوری',    # Northern Luri
 +      'lrc' => 'لوری مینجایی',     # Northern Luri
        'loz' => 'Silozi', # Lozi
        'lt' => 'lietuvių',    # Lithuanian
        'ltg' => 'latgaļu',    # Latgalian