ICU-6098 merge r24264:24276 from trunk

X-SVN-Rev: 24277
diff --git a/readme.html b/readme.html
index 2a190f8..ee87b0f 100644
--- a/readme.html
+++ b/readme.html
@@ -30,9 +30,9 @@
 
   <body>
     <h1>International Components for Unicode<br />
-     <abbr title="International Components for Unicode">ICU</abbr> 4.0 (draft)    ReadMe</h1>
+     <abbr title="International Components for Unicode">ICU</abbr> 4.0 (draft d03)    ReadMe</h1>
 
-    <p>Version: 2008 May 28<br />
+    <p>Version: 2008 June 20th<br />
      Copyright &copy; 1997-2008 International Business Machines Corporation and
     others. All Rights Reserved.</p>
     <!-- Remember that there is a copyright at the end too -->
@@ -514,7 +514,14 @@
       </tr>
 
       <tr>
-        <td>Windows XP</td>
+        <td>Windows Vista SP1 (32 bit)</td>
+
+        <td>Microsoft Visual C++ 2005 (8.0)</td>
+
+        <td>Reference platform</td>
+      </tr>
+      <tr>
+        <td>Windows Server 2003 (64 bit)</td>
 
         <td>Microsoft Visual C++ 2005 (8.0)</td>
 
@@ -522,35 +529,49 @@
       </tr>
 
       <tr>
-        <td>Red Hat Enterprise Linux 5</td>
+        <td>Red Hat Enterprise Linux 5 (x86, 32 bit)</td>
 
-        <td>gcc 4.1.1</td>
+        <td>gcc 4.1.2</td>
 
         <td>Reference platform</td>
       </tr>
 
       <tr>
+        <td>AIX 6.1 (Power, 64-bit)</td>
+
+        <td>IBM VisualAge 9</td>
+
+        <td>Reference platform</td>
+      </tr>
+
+      <tr>
+        <td>Solaris 10 (Sparc, 32-bit, SunOS 5.10)</td>
+
+        <td>Sun Studio 12 <!--(Sun C++ 5.8)--></td>
+
+        <td>Reference platform</td>
+      </tr>
+
+      <tr>
+        <td>HP-UX IIiv3 (Itanium, 64-bit)</td>
+
+        <td>aCC A.6.14</td>
+
+        <td>Reference platform</td>
+      </tr>
+      <tr>
         <td>AIX 5.3</td>
 
         <td>IBM XL C/C++ 8.0</td>
 
-        <td>Reference platform</td>
+        <td>Regularly tested</td>
       </tr>
-
       <tr>
-        <td>Solaris 10 (SunOS 5.10)</td>
+        <td>Windows XP</td>
 
-        <td>Sun Studio 11 (Sun C++ 5.8)</td>
+        <td>Microsoft Visual C++ 2005 (8.0)</td>
 
-        <td>Reference platform</td>
-      </tr>
-
-      <tr>
-        <td>HP-UX 11.23 (IA64)</td>
-
-        <td>aCC A.06.10</td>
-
-        <td>Reference platform</td>
+        <td>Regularly tested</td>
       </tr>
 
       <tr>
diff --git a/source/common/unicode/udraft.h b/source/common/unicode/udraft.h
index ee19839..5426adf 100644
--- a/source/common/unicode/udraft.h
+++ b/source/common/unicode/udraft.h
@@ -91,17 +91,6 @@
 #        define uregex_setTimeLimit uregex_setTimeLimit_DRAFT_API_DO_NOT_USE
 #        define uregex_useAnchoringBounds uregex_useAnchoringBounds_DRAFT_API_DO_NOT_USE
 #        define uregex_useTransparentBounds uregex_useTransparentBounds_DRAFT_API_DO_NOT_USE
-#        define uspoof_areConfusable uspoof_areConfusable_DRAFT_API_DO_NOT_USE
-#        define uspoof_areConfusableUTF8 uspoof_areConfusableUTF8_DRAFT_API_DO_NOT_USE
-#        define uspoof_check uspoof_check_DRAFT_API_DO_NOT_USE
-#        define uspoof_checkUTF8 uspoof_checkUTF8_DRAFT_API_DO_NOT_USE
-#        define uspoof_getAllowedLocales uspoof_getAllowedLocales_DRAFT_API_DO_NOT_USE
-#        define uspoof_getChecks uspoof_getChecks_DRAFT_API_DO_NOT_USE
-#        define uspoof_getSkeleton uspoof_getSkeleton_DRAFT_API_DO_NOT_USE
-#        define uspoof_getSkeletonUTF8 uspoof_getSkeletonUTF8_DRAFT_API_DO_NOT_USE
-#        define uspoof_open uspoof_open_DRAFT_API_DO_NOT_USE
-#        define uspoof_setAllowedLocales uspoof_setAllowedLocales_DRAFT_API_DO_NOT_USE
-#        define uspoof_setChecks uspoof_setChecks_DRAFT_API_DO_NOT_USE
 #    else
 #        define afkLanguageCode_4_0 afkLanguageCode_DRAFT_API_DO_NOT_USE
 #        define armiScriptCode_4_0 armiScriptCode_DRAFT_API_DO_NOT_USE
@@ -170,17 +159,6 @@
 #        define uregex_setTimeLimit_4_0 uregex_setTimeLimit_DRAFT_API_DO_NOT_USE
 #        define uregex_useAnchoringBounds_4_0 uregex_useAnchoringBounds_DRAFT_API_DO_NOT_USE
 #        define uregex_useTransparentBounds_4_0 uregex_useTransparentBounds_DRAFT_API_DO_NOT_USE
-#        define uspoof_areConfusableUTF8_4_0 uspoof_areConfusableUTF8_DRAFT_API_DO_NOT_USE
-#        define uspoof_areConfusable_4_0 uspoof_areConfusable_DRAFT_API_DO_NOT_USE
-#        define uspoof_checkUTF8_4_0 uspoof_checkUTF8_DRAFT_API_DO_NOT_USE
-#        define uspoof_check_4_0 uspoof_check_DRAFT_API_DO_NOT_USE
-#        define uspoof_getAllowedLocales_4_0 uspoof_getAllowedLocales_DRAFT_API_DO_NOT_USE
-#        define uspoof_getChecks_4_0 uspoof_getChecks_DRAFT_API_DO_NOT_USE
-#        define uspoof_getSkeletonUTF8_4_0 uspoof_getSkeletonUTF8_DRAFT_API_DO_NOT_USE
-#        define uspoof_getSkeleton_4_0 uspoof_getSkeleton_DRAFT_API_DO_NOT_USE
-#        define uspoof_open_4_0 uspoof_open_DRAFT_API_DO_NOT_USE
-#        define uspoof_setAllowedLocales_4_0 uspoof_setAllowedLocales_DRAFT_API_DO_NOT_USE
-#        define uspoof_setChecks_4_0 uspoof_setChecks_DRAFT_API_DO_NOT_USE
 #    endif /* U_DISABLE_RENAMING */
 
 #endif /* U_HIDE_DRAFT_API */
diff --git a/source/data/locales/en.txt b/source/data/locales/en.txt
index 7e208e3..a633b71 100644
--- a/source/data/locales/en.txt
+++ b/source/data/locales/en.txt
@@ -3188,7 +3188,7 @@
         VALENCIA{"Valencian"}
         XIANG{"Xiang or Hunanese"}
     }
-    Version{"1.195"}
+    Version{"1.196"}
     calendar{
         gregorian{
             AmPmMarkers{
@@ -3550,6 +3550,7 @@
         "meta:Africa_Southern"{
             lg{"South Africa Time"}
             ls{"South Africa Standard Time"}
+            sg{"SAT"}
         }
         "meta:Africa_Western"{
             ld{"West Africa Summer Time"}
@@ -3564,11 +3565,13 @@
             ld{"Alaska Daylight Time"}
             lg{"Alaska Time"}
             ls{"Alaska Standard Time"}
+            sg{"AKT"}
         }
         "meta:Alaska_Hawaii"{
             ld{"Alaska-Hawaii Daylight Time"}
             lg{"Alaska-Hawaii Time"}
             ls{"Alaska-Hawaii Standard Time"}
+            sg{"AHT"}
         }
         "meta:Almaty"{
             ld{"Almaty Summer Time"}
@@ -3583,24 +3586,28 @@
             ld{"Central Daylight Time"}
             lg{"Central Time"}
             ls{"Central Standard Time"}
+            sg{"CT"}
         }
         "meta:America_Eastern"{
             cu:int{1}
             ld{"Eastern Daylight Time"}
             lg{"Eastern Time"}
             ls{"Eastern Standard Time"}
+            sg{"ET"}
         }
         "meta:America_Mountain"{
             cu:int{1}
             ld{"Mountain Daylight Time"}
             lg{"Mountain Time"}
             ls{"Mountain Standard Time"}
+            sg{"MT"}
         }
         "meta:America_Pacific"{
             cu:int{1}
             ld{"Pacific Daylight Time"}
             lg{"Pacific Time"}
             ls{"Pacific Standard Time"}
+            sg{"PT"}
         }
         "meta:Anadyr"{
             ld{"Anadyr Summer Time"}
@@ -3618,6 +3625,9 @@
             ld{"Arabian Daylight Time"}
             lg{"Arabian Time"}
             ls{"Arabian Standard Time"}
+            sd{"ADT (Arabian)"}
+            sg{"AT (Arabian)"}
+            ss{"AST (Arabian)"}
         }
         "meta:Argentina"{
             ld{"Argentina Summer Time"}
@@ -3641,26 +3651,31 @@
             ld{"Atlantic Daylight Time"}
             lg{"Atlantic Time"}
             ls{"Atlantic Standard Time"}
+            sg{"AT"}
         }
         "meta:Australia_Central"{
             ld{"Australian Central Daylight Time"}
             lg{"Central Australia Time"}
             ls{"Australian Central Standard Time"}
+            sg{"ACT"}
         }
         "meta:Australia_CentralWestern"{
             ld{"Australian Central Western Daylight Time"}
             lg{"Australian Central Western Time"}
             ls{"Australian Central Western Standard Time"}
+            sg{"ACWT"}
         }
         "meta:Australia_Eastern"{
             ld{"Australian Eastern Daylight Time"}
             lg{"Eastern Australia Time"}
             ls{"Australian Eastern Standard Time"}
+            sg{"AET"}
         }
         "meta:Australia_Western"{
             ld{"Australian Western Daylight Time"}
             lg{"Western Australia Time"}
             ls{"Australian Western Standard Time"}
+            sg{"AWT"}
         }
         "meta:Azerbaijan"{
             ld{"Azerbaijan Summer Time"}
@@ -3681,6 +3696,7 @@
             ld{"Bering Daylight Time"}
             lg{"Bering Time"}
             ls{"Bering Standard Time"}
+            sg{"BT (Bering)"}
         }
         "meta:Bhutan"{
             ls{"Bhutan Time"}
@@ -3706,6 +3722,7 @@
         "meta:Chamorro"{
             lg{"Chamorro Time"}
             ls{"Chamorro Standard Time"}
+            sg{"ChT"}
         }
         "meta:Changbai"{
             ls{"Changbai Time"}
@@ -3843,6 +3860,7 @@
         "meta:Gulf"{
             lg{"Gulf Time"}
             ls{"Gulf Standard Time"}
+            sg{"GT"}
         }
         "meta:Guyana"{
             ls{"Guyana Time"}
@@ -3895,6 +3913,7 @@
             ld{"Japan Daylight Time"}
             lg{"Japan Time"}
             ls{"Japan Standard Time"}
+            sg{"JT"}
         }
         "meta:Kamchatka"{
             ld{"Petropavlovsk-Kamchatski Summer Time"}
@@ -3922,6 +3941,7 @@
             ld{"Korean Daylight Time"}
             lg{"Korean Time"}
             ls{"Korean Standard Time"}
+            sg{"KT"}
         }
         "meta:Kosrae"{
             ls{"Kosrae Time"}
@@ -3953,6 +3973,7 @@
             ld{"Lord Howe Daylight Time"}
             lg{"Lord Howe Time"}
             ls{"Lord Howe Standard Time"}
+            sg{"LHT"}
         }
         "meta:Macau"{
             ld{"Macau Summer Time"}
@@ -4009,11 +4030,13 @@
             ld{"New Zealand Daylight Time"}
             lg{"New Zealand Time"}
             ls{"New Zealand Standard Time"}
+            sg{"NZT"}
         }
         "meta:Newfoundland"{
             ld{"Newfoundland Daylight Time"}
             lg{"Newfoundland Time"}
             ls{"Newfoundland Standard Time"}
+            sg{"NT"}
         }
         "meta:Niue"{
             ls{"Niue Time"}
@@ -4065,6 +4088,7 @@
             ld{"Pierre and Miquelon Daylight Time"}
             lg{"Pierre and Miquelon Time"}
             ls{"Pierre and Miquelon Standard Time"}
+            sg{"PMT"}
         }
         "meta:Pitcairn"{
             ls{"Pitcairn Time"}
@@ -4214,6 +4238,7 @@
             ld{"Yukon Daylight Time"}
             lg{"Yukon Time"}
             ls{"Yukon Standard Time"}
+            sg{"YT"}
         }
         fallbackFormat{"{1} ({0})"}
         gmtFormat{"GMT{0}"}
diff --git a/source/data/locales/root.txt b/source/data/locales/root.txt
index 7dc220a..93c6f5c 100644
--- a/source/data/locales/root.txt
+++ b/source/data/locales/root.txt
@@ -73,7 +73,7 @@
         297,
         210,
     }
-    Version{"1.160"}
+    Version{"1.161"}
     calendar{
         buddhist{
             AmPmMarkers{
@@ -1452,7 +1452,6 @@
             ss{"EAT"}
         }
         "meta:Africa_Southern"{
-            sg{"SAT"}
             ss{"SAST"}
         }
         "meta:Africa_Western"{
@@ -1465,12 +1464,10 @@
         }
         "meta:Alaska"{
             sd{"AKDT"}
-            sg{"AKT"}
             ss{"AKST"}
         }
         "meta:Alaska_Hawaii"{
             sd{"AHDT"}
-            sg{"AHT"}
             ss{"AHST"}
         }
         "meta:Almaty"{
@@ -1483,22 +1480,18 @@
         }
         "meta:America_Central"{
             sd{"CDT"}
-            sg{"CT"}
             ss{"CST"}
         }
         "meta:America_Eastern"{
             sd{"EDT"}
-            sg{"ET"}
             ss{"EST"}
         }
         "meta:America_Mountain"{
             sd{"MDT"}
-            sg{"MT"}
             ss{"MST"}
         }
         "meta:America_Pacific"{
             sd{"PDT"}
-            sg{"PT"}
             ss{"PST"}
         }
         "meta:Anadyr"{
@@ -1515,7 +1508,6 @@
         }
         "meta:Arabian"{
             sd{"ADT (SA)"}
-            sg{"AT (SA)"}
             ss{"AST (SA)"}
         }
         "meta:Argentina"{
@@ -1535,27 +1527,22 @@
         }
         "meta:Atlantic"{
             sd{"ADT"}
-            sg{"AT"}
             ss{"AST"}
         }
         "meta:Australia_Central"{
             sd{"ACDT"}
-            sg{"ACT"}
             ss{"ACST"}
         }
         "meta:Australia_CentralWestern"{
             sd{"ACWDT"}
-            sg{"ACWT"}
             ss{"ACWST"}
         }
         "meta:Australia_Eastern"{
             sd{"AEDT"}
-            sg{"AET"}
             ss{"AEST"}
         }
         "meta:Australia_Western"{
             sd{"AWDT"}
-            sg{"AWT"}
             ss{"AWST"}
         }
         "meta:Azerbaijan"{
@@ -1575,7 +1562,6 @@
         }
         "meta:Bering"{
             sd{"BDT (Bering)"}
-            sg{"BT (Bering)"}
             ss{"BST (Bering)"}
         }
         "meta:Bhutan"{
@@ -1600,7 +1586,6 @@
             ss{"CVT"}
         }
         "meta:Chamorro"{
-            sg{"ChT"}
             ss{"ChST"}
         }
         "meta:Changbai"{
@@ -1616,7 +1601,6 @@
         }
         "meta:China"{
             sd{"CDT (CN)"}
-            sg{"CT (CN)"}
             ss{"CST (CN)"}
         }
         "meta:Choibalsan"{
@@ -1729,7 +1713,6 @@
             ss{"GST (GU)"}
         }
         "meta:Gulf"{
-            sg{"GT"}
             ss{"GST"}
         }
         "meta:Guyana"{
@@ -1778,7 +1761,6 @@
         }
         "meta:Japan"{
             sd{"JDT"}
-            sg{"JT"}
             ss{"JST"}
         }
         "meta:Kamchatka"{
@@ -1803,7 +1785,6 @@
         }
         "meta:Korea"{
             sd{"KDT"}
-            sg{"KT"}
             ss{"KST"}
         }
         "meta:Kosrae"{
@@ -1834,7 +1815,6 @@
         }
         "meta:Lord_Howe"{
             sd{"LHDT"}
-            sg{"LHT"}
             ss{"LHST"}
         }
         "meta:Macau"{
@@ -1889,12 +1869,10 @@
         }
         "meta:New_Zealand"{
             sd{"NZDT"}
-            sg{"NZT"}
             ss{"NZST"}
         }
         "meta:Newfoundland"{
             sd{"NDT"}
-            sg{"NT"}
             ss{"NST"}
         }
         "meta:Niue"{
@@ -1945,7 +1923,6 @@
         }
         "meta:Pierre_Miquelon"{
             sd{"PMDT"}
-            sg{"PMT"}
             ss{"PMST"}
         }
         "meta:Pitcairn"{
@@ -2093,7 +2070,6 @@
         }
         "meta:Yukon"{
             sd{"YDT"}
-            sg{"YT"}
             ss{"YST"}
         }
         fallbackFormat{"{1} ({0})"}
diff --git a/source/data/mappings/convrtrs.txt b/source/data/mappings/convrtrs.txt
index 8810944..a7febe1 100644
--- a/source/data/mappings/convrtrs.txt
+++ b/source/data/mappings/convrtrs.txt
@@ -677,7 +677,7 @@
                         ibm-1363 # Leave untagged because this isn't the default
                         KS_C_5601-1987 { IANA* }
                         KS_C_5601-1989 { IANA }
-                        KSC_5601 { MIME IANA }
+                        KSC_5601 { IANA }
                         csKSC56011987 { IANA }
                         korean { IANA }
                         iso-ir-149 { IANA }
@@ -697,7 +697,7 @@
                         windows-949 { JAVA* WINDOWS* }
                         KS_C_5601-1987 { WINDOWS }
                         KS_C_5601-1989 { WINDOWS }
-                        KSC_5601 { WINDOWS } # Needed by iso-2022
+                        KSC_5601 { MIME WINDOWS } # Needed by iso-2022
                         csKSC56011987 { WINDOWS }
                         korean { WINDOWS }
                         iso-ir-149 { WINDOWS }
diff --git a/source/data/misc/supplementalData.txt b/source/data/misc/supplementalData.txt
index 5e0c637..256e07e 100644
--- a/source/data/misc/supplementalData.txt
+++ b/source/data/misc/supplementalData.txt
@@ -9299,7 +9299,6 @@
             "meta:Africa_Eastern_ET"{"Africa/Addis_Ababa"}
             "meta:Africa_Eastern_KM"{"Indian/Comoro"}
             "meta:Africa_Eastern_MG"{"Indian/Antananarivo"}
-            "meta:Africa_Eastern_SD"{"Africa/Khartoum"}
             "meta:Africa_Eastern_SO"{"Africa/Mogadishu"}
             "meta:Africa_Eastern_TZ"{"Africa/Dar_es_Salaam"}
             "meta:Africa_Eastern_UG"{"Africa/Kampala"}
@@ -9470,7 +9469,6 @@
             "meta:GMT_CI"{"Africa/Abidjan"}
             "meta:GMT_GB"{"Europe/London"}
             "meta:GMT_GH"{"Africa/Accra"}
-            "meta:GMT_GL"{"America/Danmarkshavn"}
             "meta:GMT_GM"{"Africa/Banjul"}
             "meta:GMT_GN"{"Africa/Conakry"}
             "meta:GMT_GW"{"Africa/Bissau"}
diff --git a/source/test/intltest/plurfmts.cpp b/source/test/intltest/plurfmts.cpp
index 6b8aee98..92514d2 100644
--- a/source/test/intltest/plurfmts.cpp
+++ b/source/test/intltest/plurfmts.cpp
@@ -35,7 +35,7 @@
     switch (index) {
         TESTCASE(0, pluralFormatBasicTest);
         TESTCASE(1, pluralFormatUnitTest);
-        // TESTCASE(2, pluralFormatLocaleTest);
+        TESTCASE(2, pluralFormatLocaleTest);
         default: name = "";
             break;
     }