nls: remove some obsolete Norwegian and Yugoslavian locale names

They have not existed in glibc for more than fifteen years.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>

3 files changed, 2 insertions, 45 deletions

diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
index d1d49aaf..fda9af88 100644
--- a/nls/compose.dir.pre
+++ b/nls/compose.dir.pre
@@ -195,12 +195,8 @@ iso8859-1/Compose:		nl_NL.ISO8859-1
 iso8859-15/Compose:		nl_NL.ISO8859-15
 iso8859-1/Compose:		nn_NO.ISO8859-1
 iso8859-15/Compose:		nn_NO.ISO8859-15
-iso8859-1/Compose:		no_NO.ISO8859-1
-iso8859-15/Compose:		no_NO.ISO8859-15
 iso8859-1/Compose:		nr_ZA.ISO8859-1
 iso8859-15/Compose:		nso_ZA.ISO8859-15
-iso8859-1/Compose:		ny_NO.ISO8859-1
-iso8859-15/Compose:		ny_NO.ISO8859-15
 iso8859-1/Compose:		oc_FR.ISO8859-1
 iso8859-15/Compose:		oc_FR.ISO8859-15
 iso8859-1/Compose:		pd_DE.ISO8859-1
@@ -221,13 +217,9 @@ microsoft-cp1251/Compose:	ru_RU.CP1251
 microsoft-cp1251/Compose:	ru_UA.CP1251
 koi8-u/Compose:			ru_UA.KOI8-U
 iso8859-1/Compose:		rw_RW.ISO8859-1
-iso8859-2/Compose:		sh_YU.ISO8859-2
 iso8859-2/Compose:		sk_SK.ISO8859-2
 iso8859-2/Compose:		sl_SI.ISO8859-2
 iso8859-2/Compose:		sq_AL.ISO8859-2
-iso8859-2/Compose:		sr_YU.ISO8859-2
-microsoft-cp1251/Compose:	sr_YU.CP1251
-iso8859-5/Compose:		sr_YU.ISO8859-5
 iso8859-1/Compose:		ss_ZA.ISO8859-1
 iso8859-1/Compose:		st_ZA.ISO8859-1
 iso8859-1/Compose:		sv_FI.ISO8859-1
@@ -411,10 +403,8 @@ en_US.UTF-8/Compose:		ne_NP.UTF-8
 en_US.UTF-8/Compose:		nl_BE.UTF-8
 en_US.UTF-8/Compose:		nl_NL.UTF-8
 en_US.UTF-8/Compose:		nn_NO.UTF-8
-en_US.UTF-8/Compose:		no_NO.UTF-8
 en_US.UTF-8/Compose:		nr_ZA.UTF-8
 en_US.UTF-8/Compose:		nso_ZA.UTF-8
-en_US.UTF-8/Compose:		ny_NO.UTF-8
 en_US.UTF-8/Compose:		oc_FR.UTF-8
 en_US.UTF-8/Compose:		or_IN.UTF-8
 en_US.UTF-8/Compose:		pa_IN.UTF-8
@@ -435,14 +425,12 @@ en_US.UTF-8/Compose:		sd_IN.UTF-8
 en_US.UTF-8/Compose:		sd_IN.UTF-8@devanagari
 en_US.UTF-8/Compose:		se_NO.UTF-8
 en_US.UTF-8/Compose:		sh_BA.UTF-8
-en_US.UTF-8/Compose:		sh_YU.UTF-8
 en_US.UTF-8/Compose:		si_LK.UTF-8
 en_US.UTF-8/Compose:		sk_SK.UTF-8
 en_US.UTF-8/Compose:		sl_SI.UTF-8
 en_US.UTF-8/Compose:		sq_AL.UTF-8
 en_US.UTF-8/Compose:		sr_ME.UTF-8
 en_US.UTF-8/Compose:		sr_RS.UTF-8
-en_US.UTF-8/Compose:		sr_YU.UTF-8
 en_US.UTF-8/Compose:		ss_ZA.UTF-8
 en_US.UTF-8/Compose:		st_ZA.UTF-8
 en_US.UTF-8/Compose:		sv_FI.UTF-8
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index b9669f10..9df93021 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -862,17 +862,6 @@ nn_NO.ISO_8859-1:				nn_NO.ISO8859-1
 nn_NO.iso885915:				nn_NO.ISO8859-15
 nn_NO.ISO-8859-15:				nn_NO.ISO8859-15
 nn_NO.utf8:					nn_NO.UTF-8
-no:						no_NO.ISO8859-1
-no_NO:						no_NO.ISO8859-1
-no_NO.88591:					no_NO.ISO8859-1
-no_NO.88591.en:					no_NO.ISO8859-1
-no_NO.iso88591:					no_NO.ISO8859-1
-no_NO.ISO-8859-1:				no_NO.ISO8859-1
-no_NO.ISO8859-1@bokmal:				no_NO.ISO8859-1
-no_NO.ISO8859-1@nynorsk:			no_NO.ISO8859-1
-no_NO.iso885915:				no_NO.ISO8859-15
-no_NO.ISO-8859-15:				no_NO.ISO8859-15
-no_NO.utf8:					no_NO.UTF-8
 nr:						nr_ZA.ISO8859-1
 nr_ZA:						nr_ZA.ISO8859-1
 nr_ZA.iso88591:					nr_ZA.ISO8859-1
@@ -881,12 +870,6 @@ nso:						nso_ZA.ISO8859-15
 nso_ZA:						nso_ZA.ISO8859-15
 nso_ZA.iso885915:				nso_ZA.ISO8859-15
 nso_ZA.utf8:					nso_ZA.UTF-8
-ny:						ny_NO.ISO8859-1
-ny_NO:						ny_NO.ISO8859-1
-ny_NO.88591:					ny_NO.ISO8859-1
-ny_NO.ISO_8859-1:				ny_NO.ISO8859-1
-ny_NO.iso885915:				ny_NO.ISO8859-15
-no@nynorsk:					ny_NO.ISO8859-1
 nynorsk:					nn_NO.ISO8859-1
 oc:						oc_FR.ISO8859-1
 oc_FR:						oc_FR.ISO8859-1
@@ -1230,8 +1213,6 @@ japanese.sjis:					ja_JP.SJIS
 korean:						ko_KR.eucKR
 korean.euc:					ko_KR.eucKR
 lithuanian:					lt_LT.ISO8859-13
-norwegian:					no_NO.ISO8859-1
-norwegian.iso88591:				no_NO.ISO8859-1
 polish:						pl_PL.ISO8859-2
 portuguese:					pt_PT.ISO8859-1
 portuguese.iso88591:				pt_PT.ISO8859-1
@@ -1342,8 +1323,8 @@ Lithuanian_Lithuania.1257:			lt_LT.ISO8859-13
 Latvian_Latvia.1257:				lv_LV.ISO8859-13
 Dutch_Belgium.1252:				nl_BE.ISO8859-1
 Dutch_Netherlands.1252:				nl_NL.ISO8859-1
-Norwegian (Nynorsk)_Norway.1252:		no_NO.ISO8859-1
-Norwegian (Bokmål)_Norway.1252:			no_NO.ISO8859-1
+Norwegian (Nynorsk)_Norway.1252:		nn_NO.ISO8859-1
+Norwegian (Bokmål)_Norway.1252:			nb_NO.ISO8859-1
 Polish_Poland.1250:				pl_PL.ISO8859-2
 Portuguese_Brazil.1252:				pt_BR.ISO8859-1
 Portuguese_Portugal.1252:			pt_PT.ISO8859-1
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index 4df9a97e..3721a80d 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -196,12 +196,8 @@ iso8859-1/XLC_LOCALE:			nl_NL.ISO8859-1
 iso8859-15/XLC_LOCALE:			nl_NL.ISO8859-15
 iso8859-1/XLC_LOCALE:			nn_NO.ISO8859-1
 iso8859-1/XLC_LOCALE:			nn_NO.ISO8859-15
-iso8859-1/XLC_LOCALE:			no_NO.ISO8859-1
-iso8859-1/XLC_LOCALE:			no_NO.ISO8859-15
 iso8859-1/XLC_LOCALE:			nr_ZA.ISO8859-1
 iso8859-15/XLC_LOCALE:			nso_ZA.ISO8859-15
-iso8859-1/XLC_LOCALE:			ny_NO.ISO8859-1
-iso8859-1/XLC_LOCALE:			ny_NO.ISO8859-15
 iso8859-1/XLC_LOCALE:			oc_FR.ISO8859-1
 iso8859-15/XLC_LOCALE:			oc_FR.ISO8859-15
 iso8859-1/XLC_LOCALE:			pd_DE.ISO8859-1
@@ -222,13 +218,9 @@ koi8-r/XLC_LOCALE:			ru_RU.KOI8-R
 microsoft-cp1251/XLC_LOCALE:		ru_UA.CP1251
 koi8-u/XLC_LOCALE:			ru_UA.KOI8-U
 iso8859-1/XLC_LOCALE:			rw_RW.ISO8859-1
-iso8859-2/XLC_LOCALE:			sh_YU.ISO8859-2
 iso8859-2/XLC_LOCALE:			sk_SK.ISO8859-2
 iso8859-2/XLC_LOCALE:			sl_SI.ISO8859-2
 iso8859-2/XLC_LOCALE:			sq_AL.ISO8859-2
-iso8859-2/XLC_LOCALE:			sr_YU.ISO8859-2
-iso8859-5/XLC_LOCALE:			sr_YU.ISO8859-5
-microsoft-cp1251/XLC_LOCALE:		sr_YU.CP1251
 iso8859-1/XLC_LOCALE:			ss_ZA.ISO8859-1
 iso8859-1/XLC_LOCALE:			st_ZA.ISO8859-1
 iso8859-1/XLC_LOCALE:			sv_FI.ISO8859-1
@@ -413,10 +405,8 @@ en_US.UTF-8/XLC_LOCALE:			ne_NP.UTF-8
 en_US.UTF-8/XLC_LOCALE:			nl_BE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			nl_NL.UTF-8
 en_US.UTF-8/XLC_LOCALE:			nn_NO.UTF-8
-en_US.UTF-8/XLC_LOCALE:			no_NO.UTF-8
 en_US.UTF-8/XLC_LOCALE:			nr_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			nso_ZA.UTF-8
-en_US.UTF-8/XLC_LOCALE:			ny_NO.UTF-8
 en_US.UTF-8/XLC_LOCALE:			oc_FR.UTF-8
 en_US.UTF-8/XLC_LOCALE:			or_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			pa_IN.UTF-8
@@ -437,7 +427,6 @@ en_US.UTF-8/XLC_LOCALE:			sd_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sd_IN.UTF-8@devanagari
 en_US.UTF-8/XLC_LOCALE:			se_NO.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sh_BA.UTF-8
-en_US.UTF-8/XLC_LOCALE:			sh_YU.UTF-8
 en_US.UTF-8/XLC_LOCALE:			si_LK.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sk_SK.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sl_SI.UTF-8
@@ -445,7 +434,6 @@ en_US.UTF-8/XLC_LOCALE:			sq_AL.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sr_ME.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sr_RS.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sr_RS.UTF-8@latin
-en_US.UTF-8/XLC_LOCALE:			sr_YU.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ss_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			st_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sv_FI.UTF-8