From: Fomafix <fomafix@googlemail.com>
Date: Thu, 9 Mar 2017 08:11:38 +0000 (+0100)
Subject: Rename autonym for 'no' from 'norsk bokmål' to 'norsk'
X-Git-Tag: 1.31.0-rc.0~2422^2
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=0d82d154476bbc6adbd015072c6c90616ea8cdea;p=lhc%2Fweb%2Fwiklou.git

Rename autonym for 'no' from 'norsk bokmål' to 'norsk'

* 'no' is the language code for the macro language Norwegian with the
  autonym 'norsk'.
* 'nb' is the language code for the language Norwegian Bokmål with the
  autonym 'norsk bokmål'.
* 'nn' is the language code for the language Norwegian Nynorsk with the
  autonym 'norsk nynorsk'.

'no' falls back to 'nb'.

Change-Id: Ieff4ff4ecdce20ce65a818612af90815121d70d3
---

diff --git a/languages/data/Names.php b/languages/data/Names.php
index 1c350d065d..725fffea4d 100644
--- a/languages/data/Names.php
+++ b/languages/data/Names.php
@@ -311,7 +311,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