From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 10 Aug 2017 19:21:27 +0000 (+0000)
Subject: Merge "Rename autonym for 'no' from 'norsk bokmål' to 'norsk'"
X-Git-Tag: 1.31.0-rc.0~2422
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=d5a7166771613dfe4ed9fb75fa5efeced6134bd1;hp=-c

Merge "Rename autonym for 'no' from 'norsk bokmål' to 'norsk'"
---

d5a7166771613dfe4ed9fb75fa5efeced6134bd1
diff --combined languages/data/Names.php
index 19ff2a4ffb,725fffea4d..8970b40f4e
--- a/languages/data/Names.php
+++ b/languages/data/Names.php
@@@ -71,7 -71,6 +71,7 @@@ class Names 
  		'as' => 'অসমীয়া', # Assamese
  		'ase' => 'American sign language', # American sign language
  		'ast' => 'asturianu', # Asturian
 +		'atj' => 'Atikamekw', # Atikamekw
  		'av' => 'авар', # Avar
  		'avk' => 'Kotava', # Kotava
  		'awa' => 'अवधी', # Awadhi
@@@ -115,7 -114,7 +115,7 @@@
  		'cho' => 'Choctaw', # Choctaw
  		'chr' => 'ᏣᎳᎩ', # Cherokee
  		'chy' => 'Tsetsêhestâhese', # Cheyenne
 -		'ckb' => 'کوردیی ناوەندی', # Central Kurdish
 +		'ckb' => 'کوردی', # Central Kurdish
  		'co' => 'corsu', # Corsican
  		'cps' => 'Capiceño', # Capiznon
  		'cr' => 'Nēhiyawēwin / ᓀᐦᐃᔭᐍᐏᐣ', # Cree
@@@ -132,7 -131,6 +132,7 @@@
  		'de-at' => 'Österreichisches Deutsch', # Austrian German
  		'de-ch' => 'Schweizer Hochdeutsch', # Swiss Standard German
  		'de-formal' => "Deutsch (Sie-Form)\xE2\x80\x8E", # German - formal address ("Sie")
 +		'din' => 'Thuɔŋjäŋ', # Dinka
  		'diq' => 'Zazaki', # Zazaki
  		'dsb' => 'dolnoserbski', # Lower Sorbian
  		'dtp' => 'Dusun Bundu-liwan', # Central Dusun
@@@ -222,7 -220,6 +222,7 @@@
  		'kab' => 'Taqbaylit', # Kabyle
  		'kbd' => 'Адыгэбзэ', # Kabardian
  		'kbd-cyrl' => 'Адыгэбзэ', # Kabardian (Cyrillic)
 +		'kbp' => 'Kabɩyɛ', # Kabiyè
  		'kg' => 'Kongo', # Kongo, (FIXME!) should probaly be KiKongo or KiKoongo
  		'khw' => 'کھوار', # Khowar
  		'ki' => 'Gĩkũyũ', # Gikuyu
@@@ -314,7 -311,7 +314,7 @@@
  		'nl' => 'Nederlands', # Dutch
  		'nl-informal' => "Nederlands (informeel)\xE2\x80\x8E", # Dutch (informal address ("je"))
  		'nn' => 'norsk nynorsk', # Norwegian (Nynorsk)
- 		'no' => 'norsk bokmål', # Norwegian (falls back to nb).
+ 		'no' => 'norsk', # Norwegian macro language (falls back to nb).
  		'nov' => 'Novial', # Novial
  		'nrm' => 'Nouormand', # Norman
  		'nso' => 'Sesotho sa Leboa', # Northern Sotho
@@@ -383,8 -380,6 +383,8 @@@
  		'si' => 'සිංහල', # Sinhalese
  		'simple' => 'Simple English', # Simple English
  		'sk' => 'slovenčina', # Slovak
 +		'skr' => 'سرائیکی', # Saraiki (multiple scripts - defaults to Arabic)
 +		'skr-arab' => 'سرائیکی', # Saraiki (Arabic script)
  		'sl' => 'slovenščina', # Slovenian
  		'sli' => 'Schläsch', # Lower Selisian
  		'sm' => 'Gagana Samoa', # Samoan