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=93275ee71386ba8ad8b1df431adc3342e4b13f2b

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

diff --git a/languages/data/Names.php b/languages/data/Names.php
index 19ff2a4ffb..8970b40f4e 100644
--- a/languages/data/Names.php
+++ b/languages/data/Names.php
@@ -314,7 +314,7 @@ class Names {
 		'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