Posixify the locales name for variants

For all locales with variants:
- if no ambiguity on the locale (only one variant) just use the regular name
- if ambiguity, pick one as default and append @<variant> to the others
  respecting POSIX

As a result:
- All the 3 components locales added recently are renamed to the usual 2
  components version for all but sr_RS.UTF-8
- Set sr_RS.UTF-8 to the cyrillic variant
- Add sr_RS.UTF-8@latin
- Remove the symlinks aliases they were created to represent the 2 components
  version as aliasas and are now useless
- Update the OptionalObsoleteFiles.inc and ObsoleteFiles.inc to reflect those
  changes

Discussed with:	ache@
Approved by:	re@ (gjb)

12 files changed, 19 insertions, 19 deletions

diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index ab8a7ad..4c0e6d9 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -41,13 +41,13 @@ LOCALES+=	it_IT.UTF-8
 LOCALES+=	ja_JP.SJIS
 LOCALES+=	ja_JP.UTF-8
 LOCALES+=	ja_JP.eucJP
-LOCALES+=	kk_Cyrl_KZ.UTF-8
+LOCALES+=	kk_KZ.UTF-8
 LOCALES+=	ko_KR.UTF-8
 LOCALES+=	ko_KR.eucKR
 LOCALES+=	lt_LT.UTF-8
 LOCALES+=	lv_LV.ISO8859-13
 LOCALES+=	lv_LV.UTF-8
-LOCALES+=	mn_Cyrl_MN.UTF-8
+LOCALES+=	mn_MN.UTF-8
 LOCALES+=	nb_NO.UTF-8
 LOCALES+=	nl_NL.UTF-8
 LOCALES+=	nn_NO.UTF-8
@@ -63,9 +63,9 @@ LOCALES+=	ru_RU.UTF-8
 LOCALES+=	se_NO.UTF-8
 LOCALES+=	sk_SK.ISO8859-2
 LOCALES+=	sk_SK.UTF-8
-LOCALES+=	sr_Cyrl_RS.ISO8859-5
-LOCALES+=	sr_Cyrl_RS.UTF-8
-LOCALES+=	sr_Latn_RS.UTF-8
+LOCALES+=	sr_RS.ISO8859-5
+LOCALES+=	sr_RS.UTF-8
+LOCALES+=	sr_RS.UTF-8@latin
 LOCALES+=	sv_SE.UTF-8
 LOCALES+=	tr_TR.ISO8859-9
 LOCALES+=	tr_TR.UTF-8
@@ -73,12 +73,12 @@ LOCALES+=	uk_UA.CP1251
 LOCALES+=	uk_UA.ISO8859-5
 LOCALES+=	uk_UA.KOI8-U
 LOCALES+=	uk_UA.UTF-8
-LOCALES+=	zh_Hans_CN.GB2312
-LOCALES+=	zh_Hans_CN.GBK
-LOCALES+=	zh_Hans_CN.UTF-8
-LOCALES+=	zh_Hant_HK.UTF-8
-LOCALES+=	zh_Hant_TW.Big5
-LOCALES+=	zh_Hant_TW.UTF-8
+LOCALES+=	zh_CN.GB2312
+LOCALES+=	zh_CN.GBK
+LOCALES+=	zh_CN.UTF-8
+LOCALES+=	zh_HK.UTF-8
+LOCALES+=	zh_TW.Big5
+LOCALES+=	zh_TW.UTF-8
 
 
 
@@ -95,7 +95,7 @@ SAME+=		ar_SA.UTF-8 ar_MA.UTF-8
 SAME+=		ar_SA.UTF-8 ar_JO.UTF-8
 SAME+=		ar_SA.UTF-8 ar_EG.UTF-8
 SAME+=		ar_SA.UTF-8 ar_AE.UTF-8
-SAME+=		sr_Cyrl_RS.UTF-8 bg_BG.UTF-8
+SAME+=		sr_RS.UTF-8 bg_BG.UTF-8
 SAME+=		es_MX.ISO8859-1 es_ES.ISO8859-15
 SAME+=		es_MX.ISO8859-1 es_ES.ISO8859-1
 SAME+=		es_MX.ISO8859-1 es_AR.ISO8859-1
@@ -178,11 +178,11 @@ SAME+=		fr_FR.UTF-8 fr_CA.ISO8859-1
 SAME+=		fr_FR.UTF-8 fr_BE.UTF-8
 SAME+=		fr_FR.UTF-8 fr_BE.ISO8859-15
 SAME+=		fr_FR.UTF-8 fr_BE.ISO8859-1
-SAME+=		sr_Latn_RS.UTF-8 sr_Latn_RS.ISO8859-2
-SAME+=		sr_Latn_RS.UTF-8 sl_SI.UTF-8
-SAME+=		sr_Latn_RS.UTF-8 sl_SI.ISO8859-2
-SAME+=		sr_Latn_RS.UTF-8 hr_HR.UTF-8
-SAME+=		sr_Latn_RS.UTF-8 hr_HR.ISO8859-2
+SAME+=		sr_RS.UTF-8@latin sr_RS.ISO8859-2
+SAME+=		sr_RS.UTF-8@latin sl_SI.UTF-8
+SAME+=		sr_RS.UTF-8@latin sl_SI.ISO8859-2
+SAME+=		sr_RS.UTF-8@latin hr_HR.UTF-8
+SAME+=		sr_RS.UTF-8@latin hr_HR.ISO8859-2
 SAME+=		hu_HU.UTF-8 hu_HU.ISO8859-2
 SAME+=		is_IS.ISO8859-15 is_IS.ISO8859-1
 SAME+=		it_IT.ISO8859-15 it_IT.ISO8859-1
@@ -200,8 +200,8 @@ SAME+=		pt_PT.ISO8859-15 pt_BR.ISO8859-1
 SAME+=		pt_PT.UTF-8 pt_BR.UTF-8
 SAME+=		ro_RO.UTF-8 ro_RO.ISO8859-2
 SAME+=		se_NO.UTF-8 se_FI.UTF-8
-SAME+=		zh_Hans_CN.GBK zh_Hans_CN.GB18030
-SAME+=		zh_Hans_CN.GBK zh_Hans_CN.eucCN
+SAME+=		zh_CN.GBK zh_CN.GB18030
+SAME+=		zh_CN.GBK zh_CN.eucCN
 SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 
 FILES=		${LOCALES:S/$/.out/}
diff --git a/share/msgdef/kk_Cyrl_KZ.UTF-8.src b/share/msgdef/kk_KZ.UTF-8.src
index 80f5bfa..80f5bfa 100644
--- a/share/msgdef/kk_Cyrl_KZ.UTF-8.src
+++ b/share/msgdef/kk_KZ.UTF-8.src
diff --git a/share/msgdef/mn_Cyrl_MN.UTF-8.src b/share/msgdef/mn_MN.UTF-8.src
index 4051025..4051025 100644
--- a/share/msgdef/mn_Cyrl_MN.UTF-8.src
+++ b/share/msgdef/mn_MN.UTF-8.src
diff --git a/share/msgdef/sr_Cyrl_RS.ISO8859-5.src b/share/msgdef/sr_RS.ISO8859-5.src
index 21d5a5e..21d5a5e 100644
--- a/share/msgdef/sr_Cyrl_RS.ISO8859-5.src
+++ b/share/msgdef/sr_RS.ISO8859-5.src
diff --git a/share/msgdef/sr_Cyrl_RS.UTF-8.src b/share/msgdef/sr_RS.UTF-8.src
index 1e4662c..1e4662c 100644
--- a/share/msgdef/sr_Cyrl_RS.UTF-8.src
+++ b/share/msgdef/sr_RS.UTF-8.src
diff --git a/share/msgdef/sr_Latn_RS.UTF-8.src b/share/msgdef/sr_RS.UTF-8@latin.src
index cc22eaa..cc22eaa 100644
--- a/share/msgdef/sr_Latn_RS.UTF-8.src
+++ b/share/msgdef/sr_RS.UTF-8@latin.src
diff --git a/share/msgdef/zh_Hans_CN.GB2312.src b/share/msgdef/zh_CN.GB2312.src
index 0dcd3e2..0dcd3e2 100644
--- a/share/msgdef/zh_Hans_CN.GB2312.src
+++ b/share/msgdef/zh_CN.GB2312.src
diff --git a/share/msgdef/zh_Hans_CN.GBK.src b/share/msgdef/zh_CN.GBK.src
index c81391c..c81391c 100644
--- a/share/msgdef/zh_Hans_CN.GBK.src
+++ b/share/msgdef/zh_CN.GBK.src
diff --git a/share/msgdef/zh_Hans_CN.UTF-8.src b/share/msgdef/zh_CN.UTF-8.src
index 14f5b1a..14f5b1a 100644
--- a/share/msgdef/zh_Hans_CN.UTF-8.src
+++ b/share/msgdef/zh_CN.UTF-8.src
diff --git a/share/msgdef/zh_Hant_HK.UTF-8.src b/share/msgdef/zh_HK.UTF-8.src
index 53c58af..53c58af 100644
--- a/share/msgdef/zh_Hant_HK.UTF-8.src
+++ b/share/msgdef/zh_HK.UTF-8.src
diff --git a/share/msgdef/zh_Hant_TW.Big5.src b/share/msgdef/zh_TW.Big5.src
index 964f9ed..964f9ed 100644
--- a/share/msgdef/zh_Hant_TW.Big5.src
+++ b/share/msgdef/zh_TW.Big5.src
diff --git a/share/msgdef/zh_Hant_TW.UTF-8.src b/share/msgdef/zh_TW.UTF-8.src
index 40deaaf..40deaaf 100644
--- a/share/msgdef/zh_Hant_TW.UTF-8.src
+++ b/share/msgdef/zh_TW.UTF-8.src