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)

11 files changed, 16 insertions, 16 deletions

diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile
index c31f5bf..c06792c 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -63,12 +63,12 @@ LOCALES+=	it_CH.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+=	lv_LV.ISO8859-13
 LOCALES+=	lv_LV.UTF-8
-LOCALES+=	mn_Cyrl_MN.UTF-8
+LOCALES+=	mn_MN.UTF-8
 LOCALES+=	nb_NO.ISO8859-15
 LOCALES+=	nb_NO.UTF-8
 LOCALES+=	nl_BE.ISO8859-15
@@ -89,7 +89,7 @@ LOCALES+=	se_NO.UTF-8
 LOCALES+=	sk_SK.UTF-8
 LOCALES+=	sl_SI.ISO8859-2
 LOCALES+=	sl_SI.UTF-8
-LOCALES+=	sr_Latn_RS.UTF-8
+LOCALES+=	sr_RS.UTF-8@latin
 LOCALES+=	sv_FI.ISO8859-1
 LOCALES+=	sv_FI.ISO8859-15
 LOCALES+=	sv_FI.UTF-8
@@ -101,13 +101,13 @@ 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_Hans_CN.eucCN
-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_CN.eucCN
+LOCALES+=	zh_HK.UTF-8
+LOCALES+=	zh_TW.Big5
+LOCALES+=	zh_TW.UTF-8
 
 
 
@@ -160,8 +160,8 @@ SAME+=		en_CA.UTF-8 en_CA.US-ASCII
 SAME+=		en_CA.UTF-8 en_CA.ISO8859-15
 SAME+=		en_CA.UTF-8 en_CA.ISO8859-1
 SAME+=		en_GB.ISO8859-15 en_GB.ISO8859-1
-SAME+=		zh_Hant_HK.UTF-8 en_HK.UTF-8
-SAME+=		zh_Hant_HK.UTF-8 en_HK.ISO8859-1
+SAME+=		zh_HK.UTF-8 en_HK.UTF-8
+SAME+=		zh_HK.UTF-8 en_HK.ISO8859-1
 SAME+=		en_NZ.UTF-8 en_NZ.US-ASCII
 SAME+=		en_NZ.UTF-8 en_NZ.ISO8859-15
 SAME+=		en_NZ.UTF-8 en_NZ.ISO8859-1
@@ -197,11 +197,11 @@ SAME+=		nn_NO.ISO8859-15 nn_NO.ISO8859-1
 SAME+=		se_NO.UTF-8 nn_NO.UTF-8
 SAME+=		pt_BR.UTF-8 pt_BR.ISO8859-1
 SAME+=		ro_RO.UTF-8 ro_RO.ISO8859-2
-SAME+=		sr_Latn_RS.UTF-8 sr_Latn_RS.ISO8859-2
-SAME+=		sr_Latn_RS.UTF-8 sr_Cyrl_RS.UTF-8
-SAME+=		sr_Latn_RS.UTF-8 sr_Cyrl_RS.ISO8859-5
+SAME+=		sr_RS.UTF-8@latin sr_RS.ISO8859-2
+SAME+=		sr_RS.UTF-8@latin sr_RS.UTF-8
+SAME+=		sr_RS.UTF-8@latin sr_RS.ISO8859-5
 SAME+=		sv_SE.ISO8859-15 sv_SE.ISO8859-1
-SAME+=		zh_Hans_CN.GBK zh_Hans_CN.GB18030
+SAME+=		zh_CN.GBK zh_CN.GB18030
 SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 
 FILES=		${LOCALES:S/$/.out/}
diff --git a/share/monetdef/kk_Cyrl_KZ.UTF-8.src b/share/monetdef/kk_KZ.UTF-8.src
index a5dc90c..a5dc90c 100644
--- a/share/monetdef/kk_Cyrl_KZ.UTF-8.src
+++ b/share/monetdef/kk_KZ.UTF-8.src
diff --git a/share/monetdef/mn_Cyrl_MN.UTF-8.src b/share/monetdef/mn_MN.UTF-8.src
index 3706866..3706866 100644
--- a/share/monetdef/mn_Cyrl_MN.UTF-8.src
+++ b/share/monetdef/mn_MN.UTF-8.src
diff --git a/share/monetdef/sr_Latn_RS.UTF-8.src b/share/monetdef/sr_RS.UTF-8@latin.src
index c4dbd27..c4dbd27 100644
--- a/share/monetdef/sr_Latn_RS.UTF-8.src
+++ b/share/monetdef/sr_RS.UTF-8@latin.src
diff --git a/share/monetdef/zh_Hans_CN.GB2312.src b/share/monetdef/zh_CN.GB2312.src
index 98bbbf1..98bbbf1 100644
--- a/share/monetdef/zh_Hans_CN.GB2312.src
+++ b/share/monetdef/zh_CN.GB2312.src
diff --git a/share/monetdef/zh_Hans_CN.GBK.src b/share/monetdef/zh_CN.GBK.src
index 03faef2..03faef2 100644
--- a/share/monetdef/zh_Hans_CN.GBK.src
+++ b/share/monetdef/zh_CN.GBK.src
diff --git a/share/monetdef/zh_Hans_CN.UTF-8.src b/share/monetdef/zh_CN.UTF-8.src
index e1c1ce8..e1c1ce8 100644
--- a/share/monetdef/zh_Hans_CN.UTF-8.src
+++ b/share/monetdef/zh_CN.UTF-8.src
diff --git a/share/monetdef/zh_Hans_CN.eucCN.src b/share/monetdef/zh_CN.eucCN.src
index 1919a03..1919a03 100644
--- a/share/monetdef/zh_Hans_CN.eucCN.src
+++ b/share/monetdef/zh_CN.eucCN.src
diff --git a/share/monetdef/zh_Hant_HK.UTF-8.src b/share/monetdef/zh_HK.UTF-8.src
index faf104e..faf104e 100644
--- a/share/monetdef/zh_Hant_HK.UTF-8.src
+++ b/share/monetdef/zh_HK.UTF-8.src
diff --git a/share/monetdef/zh_Hant_TW.Big5.src b/share/monetdef/zh_TW.Big5.src
index 9c37150..9c37150 100644
--- a/share/monetdef/zh_Hant_TW.Big5.src
+++ b/share/monetdef/zh_TW.Big5.src
diff --git a/share/monetdef/zh_Hant_TW.UTF-8.src b/share/monetdef/zh_TW.UTF-8.src
index 80109b9..80109b9 100644
--- a/share/monetdef/zh_Hant_TW.UTF-8.src
+++ b/share/monetdef/zh_TW.UTF-8.src