From ef25b727ea67b4aaaf3c13cbba345c92d495b22b Mon Sep 17 00:00:00 2001
From: Peter Edberg <pedberg@unicode.org>
Date: Wed, 3 Sep 2014 05:52:50 +0000
Subject: [PATCH] ICU-11173 CLDR tags/release-26-d02 into ICU4C trunk, fixes
 more ldml2icu conversion bugs

X-SVN-Rev: 36323
---
 icu4c/source/data/build.xml                 |  1 +
 icu4c/source/data/lang/fi.txt               |  8 +++----
 icu4c/source/data/misc/supplementalData.txt |  2 +-
 icu4c/source/data/zone/fi.txt               | 24 +++++++--------------
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/icu4c/source/data/build.xml b/icu4c/source/data/build.xml
index 19ec235467f..55671f1f360 100644
--- a/icu4c/source/data/build.xml
+++ b/icu4c/source/data/build.xml
@@ -124,6 +124,7 @@
 		  <remap sourcePath="/Types" targetDir="lang" />
 		  <remap sourcePath="/Types%short" targetDir="lang" />
 		  <remap sourcePath="/Variants" targetDir="lang" />
+		  <remap sourcePath="/Variants%secondary" targetDir="lang" />
 		  <remap sourcePath="/codePatterns" targetDir="lang" />
 		  <remap sourcePath="/localeDisplayPattern" targetDir="lang" />
 		  <remap sourcePath="/Countries" targetDir="region" />
diff --git a/icu4c/source/data/lang/fi.txt b/icu4c/source/data/lang/fi.txt
index 6cacea216df..7943fd16c39 100644
--- a/icu4c/source/data/lang/fi.txt
+++ b/icu4c/source/data/lang/fi.txt
@@ -989,10 +989,7 @@ fi{
         BOONT{"englannin boontling-murre"}
         EMODENG{"varhaisnykyenglanti"}
         FONIPA{"kansainvälinen foneettinen aakkosto IPA"}
-        FONUPA{
-            "uralilainen foneettinen aakkosto UPA",
-            "suomalais-ugrilainen tarkekirjoitus",
-        }
+        FONUPA{"uralilainen foneettinen aakkosto UPA"}
         FONXSAMP{"foneettinen X-SAMPA-merkistö"}
         HEPBURN{"japanin Hepburn-latinaistus"}
         HOGNORSK{"norjan högnorsk"}
@@ -1036,6 +1033,9 @@ fi{
         VALLADER{"reoromaanin vallader-muoto"}
         WADEGILE{"kiinan Wade-Giles-latinaistus"}
     }
+    Variants%secondary{
+        FONUPA{"suomalais-ugrilainen tarkekirjoitus"}
+    }
     Version{"2.1.8.9"}
     codePatterns{
         language{"kieli: {0}"}
diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt
index cbe32377e91..29afa394785 100644
--- a/icu4c/source/data/misc/supplementalData.txt
+++ b/icu4c/source/data/misc/supplementalData.txt
@@ -10390,7 +10390,7 @@ supplementalData:table(nofallback){
         }
         PS{
             {
-                code{"970"}
+                code%limitedAvailability{"970"}
             }
             {
                 code{"972"}
diff --git a/icu4c/source/data/zone/fi.txt b/icu4c/source/data/zone/fi.txt
index 37330f99126..f5fbd929b63 100644
--- a/icu4c/source/data/zone/fi.txt
+++ b/icu4c/source/data/zone/fi.txt
@@ -319,10 +319,8 @@ fi{
             ec{"Glace Bay"}
         }
         "America:Godthab"{
-            ec{
-                "Nuuk",
-                "Godthåb",
-            }
+            ec{"Nuuk"}
+            ec%secondary{"Godthåb"}
         }
         "America:Goose_Bay"{
             ec{"Goose Bay"}
@@ -550,10 +548,8 @@ fi{
             ec{"São Paulo"}
         }
         "America:Scoresbysund"{
-            ec{
-                "Ittoqqortoormiit",
-                "Scoresbysund",
-            }
+            ec{"Ittoqqortoormiit"}
+            ec%secondary{"Scoresbysund"}
         }
         "America:Sitka"{
             ec{"Sitka"}
@@ -583,10 +579,8 @@ fi{
             ec{"Tegucigalpa"}
         }
         "America:Thule"{
-            ec{
-                "Thule",
-                "Qaanaaq",
-            }
+            ec{"Thule"}
+            ec%secondary{"Qaanaaq"}
         }
         "America:Thunder_Bay"{
             ec{"Thunder Bay"}
@@ -1041,10 +1035,8 @@ fi{
             ec{"Malta"}
         }
         "Europe:Mariehamn"{
-            ec{
-                "Maarianhamina",
-                "Mariehamn",
-            }
+            ec{"Maarianhamina"}
+            ec%secondary{"Mariehamn"}
         }
         "Europe:Minsk"{
             ec{"Minsk"}