From 71e0fa1a252ccc9ae7f758ca8e7a8a22825bb752 Mon Sep 17 00:00:00 2001
From: Martin Dougiamas <martin@moodle.com>
Date: Wed, 9 Jun 2010 06:35:18 +0000
Subject: [PATCH] Shortened some of the language names in English, menus look
 ridiculous otherwise

---
 lang/en/iso6392.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/lang/en/iso6392.php b/lang/en/iso6392.php
index 7c5f6dcd583..b80f28c777a 100644
--- a/lang/en/iso6392.php
+++ b/lang/en/iso6392.php
@@ -49,7 +49,7 @@ $string['ang'] = 'English, Old (ca.450-1100)';
 $string['anp'] = 'Angika';
 $string['apa'] = 'Apache languages';
 $string['ara'] = 'Arabic';
-$string['arc'] = 'Official Aramaic (700-300 BCE); Imperial Aramaic (700-300 BCE)';
+$string['arc'] = 'Official Aramaic (700-300 BCE)';
 $string['arg'] = 'Aragonese';
 $string['hye'] = 'Armenian';
 $string['arn'] = 'Mapudungun; Mapuche';
@@ -57,7 +57,7 @@ $string['arp'] = 'Arapaho';
 $string['art'] = 'Artificial languages';
 $string['arw'] = 'Arawak';
 $string['asm'] = 'Assamese';
-$string['ast'] = 'Asturian; Bable; Leonese; Asturleonese';
+$string['ast'] = 'Asturian';
 $string['ath'] = 'Athapascan languages';
 $string['aus'] = 'Australian languages';
 $string['ava'] = 'Avaric';
@@ -113,7 +113,7 @@ $string['chn'] = 'Chinook jargon';
 $string['cho'] = 'Choctaw';
 $string['chp'] = 'Chipewyan; Dene Suline';
 $string['chr'] = 'Cherokee';
-$string['chu'] = 'Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic';
+$string['chu'] = 'Church Slavic; Old Slavonic';
 $string['chv'] = 'Chuvash';
 $string['chy'] = 'Cheyenne';
 $string['cmc'] = 'Chamic languages';
@@ -203,7 +203,7 @@ $string['haw'] = 'Hawaiian';
 $string['heb'] = 'Hebrew';
 $string['her'] = 'Herero';
 $string['hil'] = 'Hiligaynon';
-$string['him'] = 'Himachali languages; Western Pahari languages';
+$string['him'] = 'Himachali; Western Pahari';
 $string['hin'] = 'Hindi';
 $string['hit'] = 'Hittite';
 $string['hmn'] = 'Hmong; Mong';
@@ -221,7 +221,7 @@ $string['ijo'] = 'Ijo languages';
 $string['iku'] = 'Inuktitut';
 $string['ile'] = 'Interlingue; Occidental';
 $string['ilo'] = 'Iloko';
-$string['ina'] = 'Interlingua (International Auxiliary Language Association)';
+$string['ina'] = 'Interlingua (IALA)';
 $string['inc'] = 'Indic languages';
 $string['ind'] = 'Indonesian';
 $string['ine'] = 'Indo-European languages';
@@ -276,12 +276,12 @@ $string['lao'] = 'Lao';
 $string['lat'] = 'Latin';
 $string['lav'] = 'Latvian';
 $string['lez'] = 'Lezghian';
-$string['lim'] = 'Limburgan; Limburger; Limburgish';
+$string['lim'] = 'Limburgan';
 $string['lin'] = 'Lingala';
 $string['lit'] = 'Lithuanian';
 $string['lol'] = 'Mongo';
 $string['loz'] = 'Lozi';
-$string['ltz'] = 'Luxembourgish; Letzeburgesch';
+$string['ltz'] = 'Luxembourgish';
 $string['lua'] = 'Luba-Lulua';
 $string['lub'] = 'Luba-Katanga';
 $string['lug'] = 'Ganda';
@@ -330,25 +330,25 @@ $string['nai'] = 'North American Indian languages';
 $string['nap'] = 'Neapolitan';
 $string['nau'] = 'Nauru';
 $string['nav'] = 'Navajo; Navaho';
-$string['nbl'] = 'Ndebele, South; South Ndebele';
-$string['nde'] = 'Ndebele, North; North Ndebele';
+$string['nbl'] = 'Ndebele, South';
+$string['nde'] = 'Ndebele, North';
 $string['ndo'] = 'Ndonga';
-$string['nds'] = 'Low German; Low Saxon; German, Low; Saxon, Low';
+$string['nds'] = 'German Low (Saxon)';
 $string['nep'] = 'Nepali';
 $string['new'] = 'Nepal Bhasa; Newari';
 $string['nia'] = 'Nias';
 $string['nic'] = 'Niger-Kordofanian languages';
 $string['niu'] = 'Niuean';
-$string['nno'] = 'Norwegian Nynorsk; Nynorsk, Norwegian';
-$string['nob'] = 'Bokmål, Norwegian; Norwegian Bokmål';
+$string['nno'] = 'Norwegian Nynorsk';
+$string['nob'] = 'Norwegian Bokmål';
 $string['nog'] = 'Nogai';
 $string['non'] = 'Norse, Old';
 $string['nor'] = 'Norwegian';
 $string['nqo'] = 'N\'Ko';
-$string['nso'] = 'Pedi; Sepedi; Northern Sotho';
+$string['nso'] = 'Pedi';
 $string['nub'] = 'Nubian languages';
-$string['nwc'] = 'Classical Newari; Old Newari; Classical Nepal Bhasa';
-$string['nya'] = 'Chichewa; Chewa; Nyanja';
+$string['nwc'] = 'Classical Newari';
+$string['nya'] = 'Chichewa';
 $string['nym'] = 'Nyamwezi';
 $string['nyn'] = 'Nyankole';
 $string['nyo'] = 'Nyoro';
@@ -388,7 +388,7 @@ $string['roh'] = 'Romansh';
 $string['rom'] = 'Romany';
 $string['ron'] = 'Romanian; Moldavian; Moldovan';
 $string['run'] = 'Rundi';
-$string['rup'] = 'Aromanian; Arumanian; Macedo-Romanian';
+$string['rup'] = 'Aromanian';
 $string['rus'] = 'Russian';
 $string['sad'] = 'Sandawe';
 $string['sag'] = 'Sango';
@@ -511,4 +511,4 @@ $string['znd'] = 'Zande languages';
 $string['zul'] = 'Zulu';
 $string['zun'] = 'Zuni';
 $string['zxx'] = 'No linguistic content';
-$string['zza'] = 'Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki';
+$string['zza'] = 'Zaza';