From: Niklas Laxström <niklas.laxstrom@gmail.com>
Date: Sun, 3 Feb 2013 08:55:36 +0000 (+0000)
Subject: Drop parenthesis from no/nb/nn to match CLDR
X-Git-Tag: 1.31.0-rc.0~20788^2
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=03fc651c4792e5e698594833a2eaf85cc71e7234;p=lhc%2Fweb%2Fwiklou.git

Drop parenthesis from no/nb/nn to match CLDR

Causes inconsistencies when displaying these language
names together in one of these languages, because
MW version is preferred for the autonym while
rest comes from CLDR if available.

Change-Id: Ice6a05f351147efb973fb04bbc339ccad961dde4
---

diff --git a/languages/Names.php b/languages/Names.php
index 9944ef09a6..ed7089d341 100644
--- a/languages/Names.php
+++ b/languages/Names.php
@@ -265,7 +265,7 @@
 	'nah' => 'Nāhuatl',		# Nahuatl, en:Wikipedia writes Nahuatlahtolli, while another form is Náhuatl
 	'nan' => 'Bân-lâm-gú', # Min-nan -- (bug 8217) nan instead of zh-min-nan, http://www.sil.org/iso639-3/codes.asp?order=639_3&letter=n
 	'nap' => 'Nnapulitano',	# Neapolitan
-	'nb' => "norsk (bokmål)\xE2\x80\x8E",		# Norwegian (Bokmal)
+	'nb' => "norsk bokmål",		# Norwegian (Bokmal)
 	'nds' => 'Plattdüütsch',	# Low German ''or'' Low Saxon
 	'nds-nl' => 'Nedersaksies',	# aka Nedersaksisch: Dutch Low Saxon
 	'ne' => 'नेपाली',	# Nepali
@@ -274,8 +274,8 @@
 	'niu' => 'Niuē',	# Niuean
 	'nl' => 'Nederlands',	# Dutch
 	'nl-informal' => "Nederlands (informeel)\xE2\x80\x8E",	# Dutch (informal address ("je"))
-	'nn' => "norsk (nynorsk)\xE2\x80\x8E",	# Norwegian (Nynorsk)
-	'no' => "norsk (bokmål)\xE2\x80\x8E",		# Norwegian (falls back to nb).
+	'nn' => "norsk nynorsk",	# Norwegian (Nynorsk)
+	'no' => "norsk bokmål",		# Norwegian (falls back to nb).
 	'nov' => 'Novial',		# Novial
 	'nrm' => 'Nouormand',	# Norman
 	'nso' => 'Sesotho sa Leboa',	# Northern Sotho