From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 21 Feb 2018 11:42:23 +0000 (+0000)
Subject: Merge "Fix English name for lb"
X-Git-Tag: 1.31.0-rc.0~553
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22sites_tous%22%29%20.%20%22?a=commitdiff_plain;h=e81a7da6c000384b97319c269ffd1e67afcb8ea8;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix English name for lb"
---

e81a7da6c000384b97319c269ffd1e67afcb8ea8
diff --combined languages/data/Names.php
index 22398754d9,7bdf2fe3c7..2252645c42
--- a/languages/data/Names.php
+++ b/languages/data/Names.php
@@@ -148,7 -148,6 +148,7 @@@ class Names 
  		'en-gb' => 'British English', # British English
  		'eo' => 'Esperanto', # Esperanto
  		'es' => 'español', # Spanish
 +		'es-formal' => 'español (formal)', # Spanish formal address
  		'et' => 'eesti', # Estonian
  		'eu' => 'euskara', # Basque
  		'ext' => 'estremeñu', # Extremaduran
@@@ -261,7 -260,7 +261,7 @@@
  		'ky' => 'Кыргызча', # Kirghiz
  		'la' => 'Latina', # Latin
  		'lad' => 'Ladino', # Ladino
- 		'lb' => 'Lëtzebuergesch', # Luxemburguish
+ 		'lb' => 'Lëtzebuergesch', # Luxembourgish
  		'lbe' => 'лакку', # Lak
  		'lez' => 'лезги', # Lezgi
  		'lfn' => 'Lingua Franca Nova', # Lingua Franca Nova